Skip to content

Commit 8b7ab57

Browse files
nyalldawsonnyalldawson
committedNov 18, 2015
Add some missing Q_OBJECT macros
(cherry-picked from ce5ed44)
·
final-2_12_3final-2_12_1
1 parent 5741925 commit 8b7ab57

File tree

7 files changed

+137
-129
lines changed

7 files changed

+137
-129
lines changed
 

‎src/plugins/geometry_checker/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@ SET (geometrychecker_HDRS
3939

4040
SET (geometrychecker_MOC_HDRS
4141
qgsgeometrychecker.h
42+
qgsgeometrycheckerplugin.h
4243
checks/qgsgeometryanglecheck.h
4344
checks/qgsgeometryareacheck.h
45+
checks/qgsgeometrycheck.h
4446
checks/qgsgeometrydegeneratepolygoncheck.h
4547
checks/qgsgeometryduplicatecheck.h
4648
checks/qgsgeometryduplicatenodescheck.h

‎src/plugins/geometry_checker/checks/qgsgeometrycheck.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ class QgsGeometryCheckPrecision
4141

4242
class QgsGeometryCheck : public QObject
4343
{
44+
Q_OBJECT
45+
4446
public:
4547
enum ChangeWhat { ChangeFeature, ChangePart, ChangeRing, ChangeNode };
4648
enum ChangeType { ChangeAdded, ChangeRemoved, ChangeChanged };

‎src/plugins/geometry_checker/qgsgeometrycheckerplugin.cpp

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,67 @@ void QgsGeometryCheckerPlugin::unload()
4444
mMenuAction = 0;
4545
mIface->removePluginVectorMenu( QApplication::translate( "QgsGeometryCheckerPlugin", "G&eometry Tools" ), mMenuAction );
4646
}
47+
48+
49+
//////////////////////////////////////////////////////////////////////////
50+
//
51+
//
52+
// THE FOLLOWING CODE IS AUTOGENERATED BY THE PLUGIN BUILDER SCRIPT
53+
// YOU WOULD NORMALLY NOT NEED TO MODIFY THIS, AND YOUR PLUGIN
54+
// MAY NOT WORK PROPERLY IF YOU MODIFY THIS INCORRECTLY
55+
//
56+
//
57+
//////////////////////////////////////////////////////////////////////////
58+
59+
60+
/**
61+
* Required extern functions needed for every plugin
62+
* These functions can be called prior to creating an instance
63+
* of the plugin class
64+
*/
65+
// Class factory to return a new instance of the plugin class
66+
QGISEXTERN QgisPlugin * classFactory( QgisInterface * theQgisInterfacePointer )
67+
{
68+
return new QgsGeometryCheckerPlugin( theQgisInterfacePointer );
69+
}
70+
// Return the name of the plugin - note that we do not user class members as
71+
// the class may not yet be insantiated when this method is called.
72+
QGISEXTERN QString name()
73+
{
74+
return sName;
75+
}
76+
77+
// Return the description
78+
QGISEXTERN QString description()
79+
{
80+
return sDescription;
81+
}
82+
83+
// Return the category
84+
QGISEXTERN QString category()
85+
{
86+
return sCategory;
87+
}
88+
89+
// Return the type (either UI or MapLayer plugin)
90+
QGISEXTERN int type()
91+
{
92+
return sPluginType;
93+
}
94+
95+
// Return the version number for the plugin
96+
QGISEXTERN QString version()
97+
{
98+
return sPluginVersion;
99+
}
100+
101+
QGISEXTERN QString icon()
102+
{
103+
return sPluginIcon;
104+
}
105+
106+
// Delete ourself
107+
QGISEXTERN void unload( QgisPlugin * thePluginPointer )
108+
{
109+
delete thePluginPointer;
110+
}

‎src/plugins/geometry_checker/qgsgeometrycheckerplugin.h

Lines changed: 2 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ class QgsGeometryCheckerDialog;
2727

2828
class QgsGeometryCheckerPlugin : public QObject, public QgisPlugin
2929
{
30+
Q_OBJECT
31+
3032
public:
3133
explicit QgsGeometryCheckerPlugin( QgisInterface* iface );
3234
void initGui() override;
@@ -46,68 +48,4 @@ static const QString sPluginVersion = QApplication::translate( "QgsGeometryCheck
4648
static const QgisPlugin::PLUGINTYPE sPluginType = QgisPlugin::UI;
4749
static const QString sPluginIcon = ":/geometrychecker/icons/geometrychecker.png";
4850

49-
50-
//////////////////////////////////////////////////////////////////////////
51-
//
52-
//
53-
// THE FOLLOWING CODE IS AUTOGENERATED BY THE PLUGIN BUILDER SCRIPT
54-
// YOU WOULD NORMALLY NOT NEED TO MODIFY THIS, AND YOUR PLUGIN
55-
// MAY NOT WORK PROPERLY IF YOU MODIFY THIS INCORRECTLY
56-
//
57-
//
58-
//////////////////////////////////////////////////////////////////////////
59-
60-
61-
/**
62-
* Required extern functions needed for every plugin
63-
* These functions can be called prior to creating an instance
64-
* of the plugin class
65-
*/
66-
// Class factory to return a new instance of the plugin class
67-
QGISEXTERN QgisPlugin * classFactory( QgisInterface * theQgisInterfacePointer )
68-
{
69-
return new QgsGeometryCheckerPlugin( theQgisInterfacePointer );
70-
}
71-
// Return the name of the plugin - note that we do not user class members as
72-
// the class may not yet be insantiated when this method is called.
73-
QGISEXTERN QString name()
74-
{
75-
return sName;
76-
}
77-
78-
// Return the description
79-
QGISEXTERN QString description()
80-
{
81-
return sDescription;
82-
}
83-
84-
// Return the category
85-
QGISEXTERN QString category()
86-
{
87-
return sCategory;
88-
}
89-
90-
// Return the type (either UI or MapLayer plugin)
91-
QGISEXTERN int type()
92-
{
93-
return sPluginType;
94-
}
95-
96-
// Return the version number for the plugin
97-
QGISEXTERN QString version()
98-
{
99-
return sPluginVersion;
100-
}
101-
102-
QGISEXTERN QString icon()
103-
{
104-
return sPluginIcon;
105-
}
106-
107-
// Delete ourself
108-
QGISEXTERN void unload( QgisPlugin * thePluginPointer )
109-
{
110-
delete thePluginPointer;
111-
}
112-
11351
#endif // QGS_GEOMETRY_CHECKER_PLUGIN_H

‎src/plugins/geometry_snapper/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ SET (geometrysnapper_UIS
2121
SET (geometrysnapper_MOC_HDRS
2222
qgsgeometrysnapper.h
2323
qgsgeometrysnapperdialog.h
24+
qgsgeometrysnapperplugin.h
2425
)
2526

2627
SET (geometrysnapper_RCCS

‎src/plugins/geometry_snapper/qgsgeometrysnapperplugin.cpp

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,67 @@ void QgsGeometrySnapperPlugin::unload()
4141
mMenuAction = 0;
4242
mIface->removePluginVectorMenu( QApplication::translate( "QgsGeometrySnapperPlugin", "G&eometry Tools" ), mMenuAction );
4343
}
44+
45+
46+
//////////////////////////////////////////////////////////////////////////
47+
//
48+
//
49+
// THE FOLLOWING CODE IS AUTOGENERATED BY THE PLUGIN BUILDER SCRIPT
50+
// YOU WOULD NORMALLY NOT NEED TO MODIFY THIS, AND YOUR PLUGIN
51+
// MAY NOT WORK PROPERLY IF YOU MODIFY THIS INCORRECTLY
52+
//
53+
//
54+
//////////////////////////////////////////////////////////////////////////
55+
56+
57+
/**
58+
* Required extern functions needed for every plugin
59+
* These functions can be called prior to creating an instance
60+
* of the plugin class
61+
*/
62+
// Class factory to return a new instance of the plugin class
63+
QGISEXTERN QgisPlugin * classFactory( QgisInterface * theQgisInterfacePointer )
64+
{
65+
return new QgsGeometrySnapperPlugin( theQgisInterfacePointer );
66+
}
67+
// Return the name of the plugin - note that we do not user class members as
68+
// the class may not yet be insantiated when this method is called.
69+
QGISEXTERN QString name()
70+
{
71+
return sName;
72+
}
73+
74+
// Return the description
75+
QGISEXTERN QString description()
76+
{
77+
return sDescription;
78+
}
79+
80+
// Return the category
81+
QGISEXTERN QString category()
82+
{
83+
return sCategory;
84+
}
85+
86+
// Return the type (either UI or MapLayer plugin)
87+
QGISEXTERN int type()
88+
{
89+
return sPluginType;
90+
}
91+
92+
// Return the version number for the plugin
93+
QGISEXTERN QString version()
94+
{
95+
return sPluginVersion;
96+
}
97+
98+
QGISEXTERN QString icon()
99+
{
100+
return sPluginIcon;
101+
}
102+
103+
// Delete ourself
104+
QGISEXTERN void unload( QgisPlugin * thePluginPointer )
105+
{
106+
delete thePluginPointer;
107+
}

‎src/plugins/geometry_snapper/qgsgeometrysnapperplugin.h

Lines changed: 2 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ static const QString sPluginIcon = ":/geometrysnapper/icons/geometrysnapper.png"
3333

3434
class QgsGeometrySnapperPlugin : public QObject, public QgisPlugin
3535
{
36+
Q_OBJECT
37+
3638
public:
3739
explicit QgsGeometrySnapperPlugin( QgisInterface* iface );
3840
void initGui() override;
@@ -44,69 +46,4 @@ class QgsGeometrySnapperPlugin : public QObject, public QgisPlugin
4446
QAction* mMenuAction;
4547
};
4648

47-
48-
49-
//////////////////////////////////////////////////////////////////////////
50-
//
51-
//
52-
// THE FOLLOWING CODE IS AUTOGENERATED BY THE PLUGIN BUILDER SCRIPT
53-
// YOU WOULD NORMALLY NOT NEED TO MODIFY THIS, AND YOUR PLUGIN
54-
// MAY NOT WORK PROPERLY IF YOU MODIFY THIS INCORRECTLY
55-
//
56-
//
57-
//////////////////////////////////////////////////////////////////////////
58-
59-
60-
/**
61-
* Required extern functions needed for every plugin
62-
* These functions can be called prior to creating an instance
63-
* of the plugin class
64-
*/
65-
// Class factory to return a new instance of the plugin class
66-
QGISEXTERN QgisPlugin * classFactory( QgisInterface * theQgisInterfacePointer )
67-
{
68-
return new QgsGeometrySnapperPlugin( theQgisInterfacePointer );
69-
}
70-
// Return the name of the plugin - note that we do not user class members as
71-
// the class may not yet be insantiated when this method is called.
72-
QGISEXTERN QString name()
73-
{
74-
return sName;
75-
}
76-
77-
// Return the description
78-
QGISEXTERN QString description()
79-
{
80-
return sDescription;
81-
}
82-
83-
// Return the category
84-
QGISEXTERN QString category()
85-
{
86-
return sCategory;
87-
}
88-
89-
// Return the type (either UI or MapLayer plugin)
90-
QGISEXTERN int type()
91-
{
92-
return sPluginType;
93-
}
94-
95-
// Return the version number for the plugin
96-
QGISEXTERN QString version()
97-
{
98-
return sPluginVersion;
99-
}
100-
101-
QGISEXTERN QString icon()
102-
{
103-
return sPluginIcon;
104-
}
105-
106-
// Delete ourself
107-
QGISEXTERN void unload( QgisPlugin * thePluginPointer )
108-
{
109-
delete thePluginPointer;
110-
}
111-
11249
#endif // QGS_GEOMETRY_SNAPPER_PLUGIN_H

0 commit comments

Comments
 (0)
Please sign in to comment.