[Uml-devel] KDE/kdesdk

[Laurent Montel]

SVN commit 652989 by mlaurent:

config.h --


 M  +1 -3      CMakeLists.txt  
 M  +0 -1      cervisia/misc.cpp  
 D             config.h.cmake  
 M  +0 -2      kbabel/catalogmanager/catmanlistitem.h  
 M  +0 -3      kbabel/common/libgettext/pofiles.ll  
 M  +0 -1      kbabel/commonui/cmdedit.h  
 M  +0 -1      kbabel/kbabel/gotodialog.h  
 M  +0 -2      kbabel/kbabel/kbabel.h  
 M  +0 -1      kbabel/kbabeldict/modules/dbsearchengine/database.h  
 M  +2 -4      kbugbuster/main.cpp  
 AM            kbugbuster/version.h   [License: no copyright]
 M  +0 -2      kcachegrind/kcachegrind/utils.cpp  
 M  +0 -1      kioslave/svn/ksvnd/ksvnd.cpp  
 M  +0 -1      kspy/spy.h  
 M  +0 -1      kuiviewer/kuiviewer.h  
 M  +0 -2      kuiviewer/quicreator.cpp  
 M  +0 -2      umbrello/umbrello/uml.h  
 M  +0 -2      umbrello/umbrello/umldoc.h  
 M  +0 -2      umbrello/umbrello/umlview.h  


--- trunk/KDE/kdesdk/CMakeLists.txt #652988:652989
@@ -18,13 +18,11 @@
 macro_optional_find_package(LibXslt)
 macro_optional_find_package(LibXml2)
 
-add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT3_SUPPORT -DHAVE_CONFIG_H=1)
+add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT3_SUPPORT)
 include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
 
 
 include (ConfigureChecks.cmake)
-configure_file (config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
-
 macro_optional_add_subdirectory(kate)
 if( UNIX )
 macro_optional_add_subdirectory(cervisia)
--- trunk/KDE/kdesdk/cervisia/misc.cpp #652988:652989
@@ -37,7 +37,6 @@
 #include <kuser.h>
 #include <kdebug.h>
 
-#include "config.h"
 #include "cvsserviceinterface.h"
 #include "progressdlg.h"
 
--- trunk/KDE/kdesdk/kbabel/catalogmanager/catmanlistitem.h #652988:652989
@@ -34,8 +34,6 @@
 #ifndef CATMANLISTITEM_H
 #define CATMANLISTITEM_H
 
-#include <config.h>
-
 #include <qstringlist.h>
 #include <q3listview.h>
 #include <qdatetime.h>
--- trunk/KDE/kdesdk/kbabel/common/libgettext/pofiles.ll #652988:652989
@@ -34,9 +34,6 @@
 %{
 #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 #652988:652989
@@ -33,7 +33,6 @@
 #ifndef CMDEDIT_H
 #define CMDEDIT_H
 
-#include <config.h>
 
 #include <qwidget.h>
 #include <qstringlist.h>
--- trunk/KDE/kdesdk/kbabel/kbabel/gotodialog.h #652988:652989
@@ -33,7 +33,6 @@
 #ifndef GOTODIALOG_H
 #define GOTODIALOG_H
 
-#include <config.h>
 
 #include <kdialog.h>
 #include <q3groupbox.h>
--- trunk/KDE/kdesdk/kbabel/kbabel/kbabel.h #652988:652989
@@ -35,8 +35,6 @@
 #ifndef KBABEL_H
 #define KBABEL_H
 
-#include <config.h>
-
 #include <kapplication.h>
 #include <kdeversion.h>
 #include <k3dockwidget.h>
--- trunk/KDE/kdesdk/kbabel/kbabeldict/modules/dbsearchengine/database.h #652988:652989
@@ -38,7 +38,6 @@
 #ifndef _DATABASE_H_
 #define _DATABASE_H_
 
-#include <config.h>
 
 #ifdef USE_DB_H_PATH
 #include USE_DB_H_PATH
--- trunk/KDE/kdesdk/kbugbuster/main.cpp #652988:652989
@@ -15,12 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <config.h>
-
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
 #include <klocale.h>
-
+#include "version.h"
 #include "gui/kbbmainwindow.h"
 #include "bugsystem.h"
 #include "kbbprefs.h"
@@ -42,7 +40,7 @@
 int main(int argc, char *argv[])
 {
     KAboutData aboutData( "kbugbuster", I18N_NOOP( "KBugBuster" ),
-        VERSION, description, KAboutData::License_GPL,
+        KBUGBUSTER_VERSION, description, KAboutData::License_GPL,
         I18N_NOOP("(c) 2001,2002,2003 the KBugBuster authors") );
     aboutData.addAuthor( "Martijn Klingens", 0, "klingens at kde.org" );
     aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher at kde.org" );
** trunk/KDE/kdesdk/kbugbuster/version.h #property svn:eol-style
   + native
--- trunk/KDE/kdesdk/kcachegrind/kcachegrind/utils.cpp #652988:652989
@@ -20,8 +20,6 @@
  * Utility classes for KCachegrind
  */
 
-#include <config.h>
-
 #include <config-kcachegrind.h>
 
 #ifdef HAVE_MMAP
--- trunk/KDE/kdesdk/kioslave/svn/ksvnd/ksvnd.cpp #652988:652989
@@ -26,7 +26,6 @@
 #include <qfile.h>
 #include <QTextStream>
 #include "ksvndadaptor.h"
-#include "config.h"
 
 #include "ksvnd.h"
 #include "commitdlg.h"
--- trunk/KDE/kdesdk/kspy/spy.h #652988:652989
@@ -18,7 +18,6 @@
 #ifndef SPY_H
 #define SPY_H
 
-#include <config.h>
 
 #include <kapplication.h>
 #include <qwidget.h>
--- trunk/KDE/kdesdk/kuiviewer/kuiviewer.h #652988:652989
@@ -23,7 +23,6 @@
 #ifndef KUIVIEWER_H
 #define KUIVIEWER_H
 
-#include <config.h>
 
 #include <kapplication.h>
 #include <kparts/mainwindow.h>
--- trunk/KDE/kdesdk/kuiviewer/quicreator.cpp #652988:652989
@@ -20,8 +20,6 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#include <config.h>
-
 #include <qpixmap.h>
 #include <qimage.h>
 #include "quicreator.h"
--- trunk/KDE/kdesdk/umbrello/umbrello/uml.h #652988:652989
@@ -12,8 +12,6 @@
 #ifndef UML_H
 #define UML_H
 
-#include <config.h>
-
 #include "umlnamespace.h"
 
 #include <qmap.h>
--- trunk/KDE/kdesdk/umbrello/umbrello/umldoc.h #652988:652989
@@ -12,8 +12,6 @@
 #ifndef UMLDOC_H
 #define UMLDOC_H
 
-#include <config.h>
-
 // system includes
 #include <typeinfo>
 
--- trunk/KDE/kdesdk/umbrello/umbrello/umlview.h #652988:652989
@@ -12,8 +12,6 @@
 #ifndef UMLVIEW_H
 #define UMLVIEW_H
 
-#include <config.h>
-
 // system includes
 #include <kurl.h>
 #include <qdom.h>