[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    solid proper includes patch (krazy2)
From:       "Armin Moradi" <feng.shaun () gmail ! com>
Date:       2009-01-17 21:36:17
Message-ID: 98ed80c00901171336h3efd1c9ua44922fc2cfdf131 () mail ! gmail ! com
[Download RAW message or body]

I have attached a patch for krazy2 problems for solid.

This patch contains fixes for proper include ordering and header
guards (total = 8 problems)

-- 
Armin
"Character is a muscle"

["solid_proper_include.patch" (text/x-patch)]

Index: solid/backends/hal/haldevice.cpp
===================================================================
--- solid/backends/hal/haldevice.cpp	(revision 910320)
+++ solid/backends/hal/haldevice.cpp	(working copy)
@@ -17,6 +17,8 @@
 
 */
 
+#include "haldevice.h"
+
 #include <QtCore/QDebug>
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusInterface>
@@ -26,7 +28,6 @@
 
 #include <solid/genericinterface.h>
 
-#include "haldevice.h"
 #include "haldeviceinterface.h"
 #include "halgenericinterface.h"
 #include "halprocessor.h"
Index: solid/backends/wmi/wmidevice.cpp
===================================================================
--- solid/backends/wmi/wmidevice.cpp	(revision 910320)
+++ solid/backends/wmi/wmidevice.cpp	(working copy)
@@ -17,11 +17,12 @@
 
 */
 
+#include "wmidevice.h"
+
 #include <QtCore/QDebug>
 
 #include <solid/genericinterface.h>
 
-#include "wmidevice.h"
 #include "wmideviceinterface.h"
 #include "wmigenericinterface.h"
 #include "wmiprocessor.h"
Index: solid/backends/wmi/wmimanager.cpp
===================================================================
--- solid/backends/wmi/wmimanager.cpp	(revision 910320)
+++ solid/backends/wmi/wmimanager.cpp	(working copy)
@@ -17,9 +17,10 @@
 
 */
 
+#include "wmimanager.h"
+
 #include <QtCore/QDebug>
 
-#include "wmimanager.h"
 #include "wmidevice.h"
 #include "wmideviceinterface.h"
 #include "wmiquery.h"
Index: examples/tutorial1/tutorial1.h
===================================================================
--- examples/tutorial1/tutorial1.h	(revision 910320)
+++ examples/tutorial1/tutorial1.h	(working copy)
@@ -16,3 +16,8 @@
     Boston, MA 02110-1301, USA.
 
 */
+
+#ifndef TUTORIAL1_H
+#define TUTORIAL1_H
+
+#endif
Index: examples/tutorial2/tutorial2.h
===================================================================
--- examples/tutorial2/tutorial2.h	(revision 910320)
+++ examples/tutorial2/tutorial2.h	(working copy)
@@ -17,3 +17,7 @@
 
 */
 
+#ifndef TUTORIAL2_H
+#define TUTORIAL2_H
+
+#endif // TUTORIAL2_H
Index: examples/tutorial3/tutorial3.h
===================================================================
--- examples/tutorial3/tutorial3.h	(revision 910320)
+++ examples/tutorial3/tutorial3.h	(working copy)
@@ -17,3 +17,7 @@
 
 */
 
+#ifndef TUTORIAL3_H
+#define TUTORIAL3_H
+
+#endif // TUTORIAL3_H
Index: examples/tutorial4/tutorial4.h
===================================================================
--- examples/tutorial4/tutorial4.h	(revision 910320)
+++ examples/tutorial4/tutorial4.h	(working copy)
@@ -17,3 +17,7 @@
 
 */
 
+#ifndef TUTORIAL4_H
+#define TUTORIAL4_H
+
+#endif // TUTORIAL4_h
Index: examples/tutorial5/tutorial5.h
===================================================================
--- examples/tutorial5/tutorial5.h	(revision 910320)
+++ examples/tutorial5/tutorial5.h	(working copy)
@@ -17,3 +17,7 @@
 
 */
 
+#ifndef TUTORIAL5_H
+#define TUTORIAL5_H
+
+#endif // TUTORIAL5_H

[prev in list] [next in list] [prev in thread] [next in thread]