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

List:       kde-commits
Subject:    kdebase/kcontrol/background
From:       Daniel Molkentin <molkentin () kde ! org>
Date:       2003-01-10 11:22:04
[Download RAW message or body]

CVS commit by danimo: 

massive header cleanups - but enable-final still fails...


  M +4 -7      backgnd.h   1.20
  M +2 -2      bgdialogs.cpp   1.31
  M +6 -5      bgdialogs.h   1.8
  M +2 -1      bgrender.cc   1.34
  M +2 -2      bgrender.h   1.16
  M +4 -4      bgsettings.cc   1.31
  M +6 -6      bgsettings.h   1.15


--- kdebase/kcontrol/background/backgnd.h  #1.19:1.20
@@ -13,15 +13,12 @@
 #define __backgnd_Included__
 
-#include <qobject.h>
-#include <qstring.h>
-#include <qcolor.h>
-#include <qmap.h>
-#include <qevent.h>
 #include <qwidget.h>
 #include <qptrvector.h>
 
-#include <kcmodule.h>
 #include "bgdefaults.h"
 
+class QString;
+class QColor;
+class QEVent;
 class QCheckBox;
 class QListBox;

--- kdebase/kcontrol/background/bgdialogs.cpp  #1.30:1.31
@@ -725,5 +725,5 @@ void KMultiWallpaperDialog::slotAdd()
 void KMultiWallpaperDialog::slotRemove()
 {
-    for ( int i = 0; i <m_pListBox->count();)
+    for ( unsigned i = 0; i <m_pListBox->count();)
     {
         QListBoxItem * item = m_pListBox->item( i );

--- kdebase/kcontrol/background/bgdialogs.h  #1.7:1.8
@@ -13,10 +13,8 @@
 #define __BGDialogs_h_Included__
 
-#include <qmap.h>
-#include <qstring.h>
-#include <qevent.h>
-
 #include <kdialogbase.h>
 
+class QString;
+class QEvent;
 class QListView;
 class QListViewItem;
@@ -25,4 +23,7 @@ class QSpinBox;
 class QGroupBox;
 class QListBox;
+
+template <class QString, class QListViewItem> class QMap; 
+
 class KBackgroundProgram;
 class KBackgroundSettings;

--- kdebase/kcontrol/background/bgrender.cc  #1.33:1.34
@@ -16,4 +16,5 @@
 #include <qtimer.h>
 #include <qpainter.h>
+#include <qimage.h>
 
 #include <kapplication.h>

--- kdebase/kcontrol/background/bgrender.h  #1.15:1.16
@@ -14,5 +14,4 @@
 
 #include <qobject.h>
-#include <qstring.h>
 
 #include "bgsettings.h"
@@ -20,4 +19,5 @@
 class QSize;
 class QRect;
+class QString;
 class QImage;
 class QPixmap;

--- kdebase/kcontrol/background/bgsettings.cc  #1.30:1.31
@@ -14,11 +14,11 @@
 #include <unistd.h>
 
-#include <kconfig.h>
-
 #include <qdir.h>
+#include <qpixmap.h>
 
-#include <netwm.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
+
+#include <netwm.h>
 
 #include "bgdefaults.h"

--- kdebase/kcontrol/background/bgsettings.h  #1.14:1.15
@@ -13,13 +13,13 @@
 #define __BGSettings_h_Included__
 
-#include <qstring.h>
-#include <qmap.h>
-#include <qcolor.h>
-#include <qstringlist.h>
-#include <qimage.h>
 
+template <class QString, class T> class QMap;
 class KStandardDirs;
 class KSimpleConfig;
 class KConfig;
+class QString;
+class QStringList;
+class QColor;
+class QImage;
 
 /**


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