[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Oliver Kellogg]

SVN commit 659532 by okellogg:

fix duplicate includes (EBN Krazy #11)

 M  +0 -1      cmds/widget/cmd_changeFontSelection.cpp  
 M  +2 -2      codeimport/kdevcppparser/lookup.cpp  
 M  +2 -2      codeimport/kdevcppparser/urlutil.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/cmds/widget/cmd_changeFontSelection.cpp #659531:659532
@@ -11,7 +11,6 @@
 
 #include "cmd_changeFontSelection.h"
 
-#include "uml.h"
 // app includes
 #include "umlwidgetcontroller.h"
 #include "umlwidget.h"
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp #659531:659532
@@ -21,13 +21,13 @@
 
 // adapted to kdevelop by Roberto Raggi <roberto at kdevelop.org>
 
+#include "lookup.h"
+
 #include <kdebug.h>
 
 #include <stdio.h>
 #include <string.h>
 
-#include "lookup.h"
-
 const HashEntry* Lookup::findEntry( const struct HashTable *table,
                               const QChar *c, unsigned int len )
 {
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp #659531:659532
@@ -18,6 +18,8 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
+#include "urlutil.h"
+
 #include <qstringlist.h>
 
 #include <qdir.h>
@@ -28,8 +30,6 @@
 #include <limits.h>
 #include <stdlib.h>
 
-#include "urlutil.h"
-
 #include <kdeversion.h>
 #if (KDE_VERSION_MINOR==0) && (KDE_VERSION_MAJOR==3)
 #include <kdevkurl.h>