summaryrefslogtreecommitdiff
path: root/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h')
-rw-r--r--src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h
index 956836ad..a6079a8e 100644
--- a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h
+++ b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h
@@ -70,11 +70,11 @@ QT_BEGIN_NAMESPACE
class SatelliteGypsyEngine
{
public:
- SatelliteGypsyEngine(QGeoSatelliteInfoSource* parent = 0);
+ SatelliteGypsyEngine(QGeoSatelliteInfoSource *parent = 0);
virtual ~SatelliteGypsyEngine();
// Glib symbols
virtual gulong eng_g_signal_connect(gpointer instance,
- const gchar* detailed_signal,
+ const gchar *detailed_signal,
GCallback c_handler,
gpointer data);
virtual guint eng_g_signal_handlers_disconnect_by_func(gpointer instance,
@@ -82,8 +82,8 @@ public:
gpointer data);
virtual void eng_g_free(gpointer mem);
// Gypsy symbols
- virtual GypsyControl* eng_gypsy_control_get_default (void);
- virtual char *eng_gypsy_control_create (GypsyControl *control, const char*device_name, GError **error);
+ virtual GypsyControl *eng_gypsy_control_get_default (void);
+ virtual char *eng_gypsy_control_create (GypsyControl *control, const char *device_name, GError **error);
virtual GypsyDevice *eng_gypsy_device_new (const char *object_path);
virtual GypsySatellite *eng_gypsy_satellite_new (const char *object_path);
virtual gboolean eng_gypsy_device_start (GypsyDevice *device, GError **error);
@@ -92,10 +92,10 @@ public:
virtual GPtrArray *eng_gypsy_satellite_get_satellites (GypsySatellite *satellite, GError **error);
virtual void eng_gypsy_satellite_free_satellite_array (GPtrArray *satellites);
// GConf symbols (mockability due to X11 requirement)
- virtual GConfClient* eng_gconf_client_get_default(void);
- virtual gchar* eng_gconf_client_get_string(GConfClient* client, const gchar* key, GError** err);
+ virtual GConfClient *eng_gconf_client_get_default(void);
+ virtual gchar *eng_gconf_client_get_string(GConfClient *client, const gchar *key, GError** err);
protected:
- QGeoSatelliteInfoSource* m_owner;
+ QGeoSatelliteInfoSource *m_owner;
};
class QGeoSatelliteInfoSourceGypsy : public QGeoSatelliteInfoSource
@@ -111,7 +111,7 @@ public slots:
virtual void startUpdates();
void stopUpdates();
void requestUpdate(int timeout = 5000);
- void satellitesChanged(GypsySatellite* satellite, GPtrArray* satellites);
+ void satellitesChanged(GypsySatellite *satellite, GPtrArray *satellites);
signals:
void satellitesInViewUpdated(const QList<QGeoSatelliteInfo> &satellites);
@@ -124,12 +124,12 @@ protected:
// Creates an engine which encapsulates all used symbols
// that we want to be also able to mock.
virtual void createEngine();
- SatelliteGypsyEngine* m_engine;
+ SatelliteGypsyEngine *m_engine;
private:
Q_DISABLE_COPY(QGeoSatelliteInfoSourceGypsy)
- GypsySatellite* m_satellite;
- GypsyDevice* m_device;
+ GypsySatellite *m_satellite;
+ GypsyDevice *m_device;
QTimer m_requestTimer;
bool m_updatesOngoing;
bool m_requestOngoing;