Rename many classes and header files to avoid conflicts with KDE4

20 files changed, 41 insertions, 41 deletions

diff --git a/kig/TODO b/kig/TODO
index ec313e58..3a80cba6 100644
--- a/kig/TODO
+++ b/kig/TODO
@@ -7,8 +7,8 @@
    many points as times you pressed escape ( or perhaps the times you
    pressed esc square or sth like that ).  Anyway, this is due to how
    Kig works with some strange Qt event loop stuff to make its modes
-   work, along with a strange way in kaccel of working.  I have a
-   patch against tdecore/kaccel.cpp that should fix it, but the real
+   work, along with a strange way in tdeaccel of working.  I have a
+   patch against tdecore/tdeaccel.cpp that should fix it, but the real
    fix is to get rid of the entire event loop stuff and think of a
    better way to manage all this. pino: seems pressing the stop button
    n times, where n are the times you pressed escape, cancel all the
diff --git a/kig/filters/drgeo-filter-chooser.cc b/kig/filters/drgeo-filter-chooser.cc
index 3369af92..81fab837 100644
--- a/kig/filters/drgeo-filter-chooser.cc
+++ b/kig/filters/drgeo-filter-chooser.cc
@@ -19,7 +19,7 @@
 #include "drgeo-filter-chooser.h"
 #include "drgeo-filter-chooser.moc"
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>
diff --git a/kig/filters/drgeo-filter-chooserbase.ui b/kig/filters/drgeo-filter-chooserbase.ui
index d173a46e..3cc334eb 100644
--- a/kig/filters/drgeo-filter-chooserbase.ui
+++ b/kig/filters/drgeo-filter-chooserbase.ui
@@ -133,7 +133,7 @@ Please select which to import:</string>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/kig/filters/exporter.cc b/kig/filters/exporter.cc
index 005342de..06babdfa 100644
--- a/kig/filters/exporter.cc
+++ b/kig/filters/exporter.cc
@@ -42,7 +42,7 @@
 #include <tqiconset.h>
 #include <tqtextstream.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 #include <kimageio.h>
 #include <klocale.h>
diff --git a/kig/kig/kig.cpp b/kig/kig/kig.cpp
index 79620ebc..5f92aaf7 100644
--- a/kig/kig/kig.cpp
+++ b/kig/kig/kig.cpp
@@ -24,7 +24,7 @@
 #include <tqevent.h>
 #include <tqtimer.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp
index 3e85d0b4..b62d4685 100644
--- a/kig/kig/kig_part.cpp
+++ b/kig/kig/kig_part.cpp
@@ -43,7 +43,7 @@
 #include <algorithm>
 #include <functional>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
@@ -51,13 +51,13 @@
 #include <kiconloader.h>
 #include <kinstance.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
 #include <kprinter.h>
 #include <kstandarddirs.h>
 #include <kstdaction.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <tdeparts/genericfactory.h>
 #include <tdeprint/kprintdialogpage.h>
 
diff --git a/kig/kig/kig_view.cpp b/kig/kig/kig_view.cpp
index f9d70f29..02b3869d 100644
--- a/kig/kig/kig_view.cpp
+++ b/kig/kig/kig_view.cpp
@@ -41,7 +41,7 @@
 #include <klocale.h>
 #include <kapplication.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 
 #include <cmath>
diff --git a/kig/misc/guiaction.h b/kig/misc/guiaction.h
index 6187dbe3..56ab6f73 100644
--- a/kig/misc/guiaction.h
+++ b/kig/misc/guiaction.h
@@ -26,7 +26,7 @@
 
 #include <tqstring.h>
 #include <tqcstring.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 class GUIAction;
 class KigPart;
diff --git a/kig/modes/construct_mode.cc b/kig/modes/construct_mode.cc
index eddac9e1..e9c13364 100644
--- a/kig/modes/construct_mode.cc
+++ b/kig/modes/construct_mode.cc
@@ -36,7 +36,7 @@
 #include "popup.h"
 
 #include <kcursor.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <algorithm>
 #include <functional>
diff --git a/kig/modes/dragrectmode.cc b/kig/modes/dragrectmode.cc
index 8091f8cb..29b00886 100644
--- a/kig/modes/dragrectmode.cc
+++ b/kig/modes/dragrectmode.cc
@@ -24,7 +24,7 @@
 
 #include <tqevent.h>
 #include <tqglobal.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 DragRectMode::DragRectMode( const TQPoint& start, KigPart& d, KigWidget& w )
   : KigMode( d ), mstart( start ), mnc( true ), mstartselected( true ),
diff --git a/kig/modes/label.cc b/kig/modes/label.cc
index c92dccf8..f8c82dfa 100644
--- a/kig/modes/label.cc
+++ b/kig/modes/label.cc
@@ -36,7 +36,7 @@
 
 #include <kcursor.h>
 #include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <tqtextedit.h>
 #include <kdebug.h>
diff --git a/kig/modes/mode.cc b/kig/modes/mode.cc
index 76edc4f1..dbc6f7d6 100644
--- a/kig/modes/mode.cc
+++ b/kig/modes/mode.cc
@@ -22,7 +22,7 @@
 
 #include "../kig/kig_part.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 void KigMode::enableActions()
 {
diff --git a/kig/modes/normal.cc b/kig/modes/normal.cc
index c4dd7f4f..70123996 100644
--- a/kig/modes/normal.cc
+++ b/kig/modes/normal.cc
@@ -32,7 +32,7 @@
 #include "typesdialog.h"
 
 #include <kcursor.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcommand.h>
 #include <klocale.h>
 
diff --git a/kig/modes/popup.cc b/kig/modes/popup.cc
index b55adafb..042e379a 100644
--- a/kig/modes/popup.cc
+++ b/kig/modes/popup.cc
@@ -52,7 +52,7 @@
 #include <tqregexp.h>
 #include <tqvalidator.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcolordialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/kig/modes/popup.h b/kig/modes/popup.h
index d1fb89d5..16078c15 100644
--- a/kig/modes/popup.h
+++ b/kig/modes/popup.h
@@ -21,7 +21,7 @@
 #ifndef KIG_MODES_POPUP_H
 #define KIG_MODES_POPUP_H
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <vector>
 
diff --git a/kig/modes/typesdialog.h b/kig/modes/typesdialog.h
index c0333ecb..6e06bb79 100644
--- a/kig/modes/typesdialog.h
+++ b/kig/modes/typesdialog.h
@@ -27,7 +27,7 @@
 
 #include <tqpopupmenu.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
 
 class KigPart;
diff --git a/kig/modes/typesdialogbase.ui b/kig/modes/typesdialogbase.ui
index 0a74d56d..cc5cec92 100644
--- a/kig/modes/typesdialogbase.ui
+++ b/kig/modes/typesdialogbase.ui
@@ -328,7 +328,7 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kig/objects/polygon_imp.cc b/kig/objects/polygon_imp.cc
index 08215bfb..5c001df6 100644
--- a/kig/objects/polygon_imp.cc
+++ b/kig/objects/polygon_imp.cc
@@ -498,34 +498,34 @@ std::vector<Coordinate> computeConvexHull( const std::vector<Coordinate>& points
    */
 
   if ( points.size() < 3 ) return points;
-  std::vector<Coordinate> worklist = points;
+  std::vector<Coordinate> wortdelist = points;
   std::vector<Coordinate> result;
 
-  double ymin = worklist[0].y;
+  double ymin = wortdelist[0].y;
   uint imin = 0;
-  for ( uint i = 1; i < worklist.size(); ++i )
+  for ( uint i = 1; i < wortdelist.size(); ++i )
   {
-    if ( worklist[i].y < ymin )
+    if ( wortdelist[i].y < ymin )
     {
-      ymin = worklist[i].y;
+      ymin = wortdelist[i].y;
       imin = i;
     }
   }
 
-  // worklist[imin] is definitely on the convex hull, let's start from there
-  result.push_back( worklist[imin] );
-  Coordinate startpoint = worklist[imin];
-  Coordinate apoint = worklist[imin];
+  // wortdelist[imin] is definitely on the convex hull, let's start from there
+  result.push_back( wortdelist[imin] );
+  Coordinate startpoint = wortdelist[imin];
+  Coordinate apoint = wortdelist[imin];
   double aangle = 0.0;
 
-  while ( ! worklist.empty() )
+  while ( ! wortdelist.empty() )
   {
     int besti = -1;
     double anglemin = 10000.0;
-    for ( uint i = 0; i < worklist.size(); ++i )
+    for ( uint i = 0; i < wortdelist.size(); ++i )
     {
-      if ( worklist[i] == apoint ) continue;
-      Coordinate v = worklist[i] - apoint;
+      if ( wortdelist[i] == apoint ) continue;
+      Coordinate v = wortdelist[i] - apoint;
       double angle = std::atan2( v.y, v.x );
       while ( angle < aangle ) angle += 2*M_PI;
       if ( angle < anglemin )
@@ -536,14 +536,14 @@ std::vector<Coordinate> computeConvexHull( const std::vector<Coordinate>& points
     }
 
     if ( besti < 0 ) return result;   // this happens, e.g. if all points coincide
-    apoint = worklist[besti];
+    apoint = wortdelist[besti];
     aangle = anglemin;
     if ( apoint == startpoint )
     {
       return result;
     }
     result.push_back( apoint );
-    worklist.erase( worklist.begin() + besti, worklist.begin() + besti + 1 );
+    wortdelist.erase( wortdelist.begin() + besti, wortdelist.begin() + besti + 1 );
   }
   assert( false );
   return result;
diff --git a/kig/scripting/newscriptwizard.cc b/kig/scripting/newscriptwizard.cc
index c883a159..a9f83390 100644
--- a/kig/scripting/newscriptwizard.cc
+++ b/kig/scripting/newscriptwizard.cc
@@ -23,14 +23,14 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-//#include <kactionclasses.h>
-//#include <kactioncollection.h>
+//#include <tdeactionclasses.h>
+//#include <tdeactioncollection.h>
 // make it still work on old kde 3.1...
-#include <kaction.h>
+#include <tdeaction.h>
 //
 #include <kapplication.h>
 #include <kglobalsettings.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <ktextedit.h>
 #include <tdetexteditor/clipboardinterface.h>
 #include <tdetexteditor/dynwordwrapinterface.h>
diff --git a/kig/scripting/python_scripter.cc b/kig/scripting/python_scripter.cc
index 7e833d5c..81f377ac 100644
--- a/kig/scripting/python_scripter.cc
+++ b/kig/scripting/python_scripter.cc
@@ -539,12 +539,12 @@ void PythonScripter::saveErrors()
 
   object printexcfunc = d->mainnamespace[ "traceback" ].attr( "format_exception" );
 
-  list tracebacklist = extract<list>( printexcfunc( exctype, excvalue, exctraceback ) )();
+  list tracebactdelist = extract<list>( printexcfunc( exctype, excvalue, exctraceback ) )();
   str tracebackstr( "" );
   while ( true )
   {
     try {
-      str s = extract<str>( tracebacklist.pop() );
+      str s = extract<str>( tracebactdelist.pop() );
       tracebackstr += s;
     }
     catch( ... )