Rename many classes and header files to avoid conflicts with KDE4

amor/amor.cpp

@@ -30,7 +30,7 @@
 
 #include <kdebug.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqtimer.h>
 #include <tqcursor.h>
 #include <tqvaluelist.h>

kmoon/kmoondlg.cpp

@@ -71,11 +71,11 @@ KMoonDlg::KMoonDlg(int a, bool n, bool m, TQWidget *parent, const char *name)
 
         connect(hemitoggle, TQT_SIGNAL(clicked()), TQT_SLOT(toggleHemi()));
 
-        masktoggle = new TQPushButton(hbox2);
+        mastdetoggle = new TQPushButton(hbox2);
-	masktoggle->setText(mask ? i18n("Switch Masking Off") :
+	mastdetoggle->setText(mask ? i18n("Switch Masking Off") :
 			    i18n("Switch Masking On"));
 
-        connect(masktoggle, TQT_SIGNAL(clicked()), TQT_SLOT(toggleMask()));
+        connect(mastdetoggle, TQT_SIGNAL(clicked()), TQT_SLOT(toggleMask()));
         topLayout->addWidget(vbox);
 
 	moon = new MoonWidget(page, "preview");
@@ -107,7 +107,7 @@ void KMoonDlg::toggleHemi() {
 void KMoonDlg::toggleMask() {
     moon->setMask(!moon->mask());
     mask = moon->mask();
-    masktoggle->setText(mask ? i18n("Switch Masking Off") :
+    mastdetoggle->setText(mask ? i18n("Switch Masking Off") :
 			i18n("Switch Masking On"));
 }
 

kmoon/kmoondlg.h

@@ -44,7 +44,7 @@ class KMoonDlg : public KDialogBase {
   bool north;
   bool mask;
   TQPushButton *hemitoggle;
-  TQPushButton *masktoggle;
+  TQPushButton *mastdetoggle;
   
  private slots:
   void help();

kodo/kodometer.h

@@ -44,9 +44,9 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <twin.h>
 
 #include <X11/Xlib.h>

kteatime/toplevel.cpp

@@ -47,9 +47,9 @@
 #include <knotifyclient.h>
 #include <knuminput.h>
 #include <kseparator.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdialogbase.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <knotifydialog.h>
 
 #include "tealist.h"

kweather/kweather.cpp

@@ -23,7 +23,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeconfig.h>
 #include <ksettings/dialog.h>
 #include <ksettings/dispatcher.h>

kweather/serviceconfigdata.ui

@@ -255,7 +255,7 @@
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>

kweather/serviceconfigwidget.cpp

@@ -26,7 +26,7 @@
 #include <tdeconfig.h>
 #include <kdialog.h>
 #include <kglobal.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>

kworldwatch/main.h

@@ -30,7 +30,7 @@
 ** Bug reports and questions can be sent to kde-devel@kde.org
 */
 #include <kuniqueapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 
 class MapWidget;