[Kst] kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

fixincludes


  M +0 -1      debugdialog.ui   1.10
  M +1 -1      kst.h   1.89
  M +0 -1      kstdatadialog.ui   1.3
  M +3 -4      kstdoc.h   1.33
  M +1 -2      ksteventmonitorentry.cpp   1.21
  M +1 -1      kstviewwindow.h   1.19
  M +2 -2      plugincollection.cpp   1.17
  M +1 -1      pluginmanager.ui   1.12
  M +0 -1      vectorsavedialog.ui   1.3


--- kdeextragear-2/kst/kst/debugdialog.ui  #1.9:1.10
@@ -355,5 +355,4 @@
     <include location="local" impldecl="in implementation">kstdatacollection.h</include>
     <include location="local" impldecl="in implementation">kstversion.h</include>
-    <include location="global" impldecl="in implementation">klocale.h</include>
     <include location="local" impldecl="in implementation">debugdialog.ui.h</include>
 </includes>

--- kdeextragear-2/kst/kst/kst.h  #1.88:1.89
@@ -26,5 +26,5 @@
 
 // include files for KDE
-#include <kapp.h>
+#include <kapplication.h>
 #include <kmainwindow.h>
 #include <kaccel.h>

--- kdeextragear-2/kst/kst/kstdatadialog.ui  #1.2:1.3
@@ -113,5 +113,4 @@
 <includes>
     <include location="local" impldecl="in declaration">kstdataobject.h</include>
-    <include location="global" impldecl="in implementation">klocale.h</include>
     <include location="local" impldecl="in implementation">kstdatadialog.ui.h</include>
 </includes>

--- kdeextragear-2/kst/kst/kstdoc.h  #1.32:1.33
@@ -19,14 +19,13 @@
 #define KSTDOC_H
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 // include files for QT
 #include <qobject.h>
-#include <qstring.h>
 #include <qptrlist.h>
+#include <qstring.h>
+
+#include <kapplication.h>
 #include <kurl.h>
-#include <kapp.h>
 
 #include "kstobject.h"

--- kdeextragear-2/kst/kst/ksteventmonitorentry.cpp  #1.20:1.21
@@ -17,11 +17,10 @@
  ***************************************************************************/
 
+#include <assert.h>
 #include <ctype.h>
-#include <qtimer.h>
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <assert.h>
 
 // include files for Qt

--- kdeextragear-2/kst/kst/kstviewwindow.h  #1.18:1.19
@@ -24,5 +24,5 @@
 #include <kaccel.h>
 #include <kaction.h>
-#include <kapp.h>
+#include <kapplication.h>
 #include <klineeditdlg.h>
 #include <kmainwindow.h>

--- kdeextragear-2/kst/kst/plugincollection.cpp  #1.16:1.17
@@ -27,10 +27,10 @@
 #include <klibloader.h>
 #include <klocale.h>
+#include <kstandarddirs.h>
 #include <kstaticdeleter.h>
-#include <kstddirs.h>
 
-#include <qregexp.h>
 #include <qdir.h>
 #include <qfileinfo.h>
+#include <qregexp.h>
 
 PluginCollection *PluginCollection::_self = 0L;

--- kdeextragear-2/kst/kst/pluginmanager.ui  #1.11:1.12
@@ -203,5 +203,5 @@
     <include location="local" impldecl="in implementation">plugin.h</include>
     <include location="global" impldecl="in implementation">kglobal.h</include>
-    <include location="global" impldecl="in implementation">kstddirs.h</include>
+    <include location="global" impldecl="in implementation">kstandarddirs.h</include>
     <include location="global" impldecl="in implementation">qdir.h</include>
     <include location="global" impldecl="in implementation">qfileinfo.h</include>

--- kdeextragear-2/kst/kst/vectorsavedialog.ui  #1.2:1.3
@@ -115,5 +115,4 @@
     <include location="global" impldecl="in implementation">kfiledialog.h</include>
     <include location="global" impldecl="in implementation">kmessagebox.h</include>
-    <include location="global" impldecl="in implementation">klocale.h</include>
     <include location="local" impldecl="in implementation">kstdatacollection.h</include>
     <include location="local" impldecl="in implementation">kstvector.h</include>