[Uml-devel] KDE/kdesdk

[Dirk Mueller]

SVN commit 577486 by mueller:

- CONFIG_H wrappers. compile


 M  +0 -2      kapptemplate/kapp/app.h  
 M  +0 -2      kapptemplate/kpartapp/app.h  
 M  +0 -2      kbabel/catalogmanager/catmanlistitem.h  
 M  +0 -2      kbabel/common/libgettext/pofiles.cc  
 M  +0 -2      kbabel/commonui/cmdedit.h  
 M  +0 -2      kbabel/kbabel/gotodialog.h  
 M  +0 -2      kbabel/kbabel/kbabel.h  
 M  +0 -2      kbugbuster/main.cpp  
 M  +1 -1      kcachegrind/kcachegrind/configuration.cpp  
 M  +0 -2      kcachegrind/kcachegrind/utils.cpp  
 M  +0 -2      kspy/spy.h  
 M  +0 -2      kuiviewer/kuiviewer.h  
 M  +0 -2      umbrello/umbrello/uml.h  
 M  +0 -2      umbrello/umbrello/umldoc.h  
 M  +0 -2      umbrello/umbrello/umlview.h  


--- trunk/KDE/kdesdk/kapptemplate/kapp/app.h #577485:577486
@@ -6,9 +6,7 @@
 #ifndef ${APP_NAME_UC}_H
 #define ${APP_NAME_UC}_H
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <kapplication.h>
 #include <kmainwindow.h>
--- trunk/KDE/kdesdk/kapptemplate/kpartapp/app.h #577485:577486
@@ -3,9 +3,7 @@
 #ifndef ${APP_NAME_UC}_H
 #define ${APP_NAME_UC}_H
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <kapplication.h>
 #include <kparts/mainwindow.h>
--- trunk/KDE/kdesdk/kbabel/catalogmanager/catmanlistitem.h #577485:577486
@@ -34,9 +34,7 @@
 #ifndef CATMANLISTITEM_H
 #define CATMANLISTITEM_H
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <qstringlist.h>
 #include <q3listview.h>
--- trunk/KDE/kdesdk/kbabel/common/libgettext/pofiles.cc #577485:577486
@@ -466,9 +466,7 @@
 #line 35 "/home/col/prod/KDE4/kdesdk/kbabel/common/libgettext/pofiles.ll"
 #define YY_NO_UNPUT
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include "config-kbabel.h"
 
 #include <stdlib.h>
--- trunk/KDE/kdesdk/kbabel/commonui/cmdedit.h #577485:577486
@@ -33,9 +33,7 @@
 #ifndef CMDEDIT_H
 #define CMDEDIT_H
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <qwidget.h>
 #include <qstringlist.h>
--- trunk/KDE/kdesdk/kbabel/kbabel/gotodialog.h #577485:577486
@@ -33,9 +33,7 @@
 #ifndef GOTODIALOG_H
 #define GOTODIALOG_H
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <kdialog.h>
 #include <q3groupbox.h>
--- trunk/KDE/kdesdk/kbabel/kbabel/kbabel.h #577485:577486
@@ -35,9 +35,7 @@
 #ifndef KBABEL_H
 #define KBABEL_H
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <kapplication.h>
 #include <kdeversion.h>
--- trunk/KDE/kdesdk/kbugbuster/main.cpp #577485:577486
@@ -15,9 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
--- trunk/KDE/kdesdk/kcachegrind/kcachegrind/configuration.cpp #577485:577486
@@ -220,7 +220,7 @@
   count = colorConfig.readEntry("Count", 0);
   for (i=1;i<=count;i++) {
     QString n = colorConfig.readEntry(QString("Name%1").arg(i),QString());
-    QColor color = colorConfig.readColorEntry(QString("Color%1").arg(i));
+    QColor color = colorConfig.readEntry(QString("Color%1").arg(i), Qt::black);
 
     if (n.isEmpty()) continue;
 
--- trunk/KDE/kdesdk/kcachegrind/kcachegrind/utils.cpp #577485:577486
@@ -20,9 +20,7 @@
  * Utility classes for KCachegrind
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <config-kcachegrind.h>
 
--- trunk/KDE/kdesdk/kspy/spy.h #577485:577486
@@ -18,9 +18,7 @@
 #ifndef SPY_H
 #define SPY_H
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <kapplication.h>
 #include <qwidget.h>
--- trunk/KDE/kdesdk/kuiviewer/kuiviewer.h #577485:577486
@@ -23,9 +23,7 @@
 #ifndef KUIVIEWER_H
 #define KUIVIEWER_H
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <kapplication.h>
 #include <kparts/mainwindow.h>
--- trunk/KDE/kdesdk/umbrello/umbrello/uml.h #577485:577486
@@ -12,9 +12,7 @@
 #ifndef UML_H
 #define UML_H
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "umlnamespace.h"
 
--- trunk/KDE/kdesdk/umbrello/umbrello/umldoc.h #577485:577486
@@ -12,9 +12,7 @@
 #ifndef UMLDOC_H
 #define UMLDOC_H
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 // system includes
 #include <typeinfo>
--- trunk/KDE/kdesdk/umbrello/umbrello/umlview.h #577485:577486
@@ -12,9 +12,7 @@
 #ifndef UMLVIEW_H
 #define UMLVIEW_H
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 // system includes
 #include <kurl.h>