From a5430e4b98efd05937bd3bfe78c56eb826f145fa Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:19:22 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 kicker/applets/clock/analog.ui                 | 2 +-
 kicker/applets/clock/clock.cpp                 | 4 ++--
 kicker/applets/clock/digital.ui                | 2 +-
 kicker/applets/clock/fuzzy.ui                  | 4 ++--
 kicker/applets/clock/init.cpp                  | 4 ++--
 kicker/applets/clock/settings.ui               | 8 ++++----
 kicker/applets/clock/zone.cpp                  | 2 +-
 kicker/applets/launcher/quickbutton.cpp        | 2 +-
 kicker/applets/launcher/quictdelauncher.cpp    | 2 +-
 kicker/applets/media/mediaapplet.cpp           | 2 +-
 kicker/applets/media/mediumbutton.cpp          | 2 +-
 kicker/applets/media/mediumbutton.h            | 2 +-
 kicker/applets/media/preferencesdialog.cpp     | 2 +-
 kicker/applets/minipager/pagerapplet.cpp       | 2 +-
 kicker/applets/minipager/pagerbutton.cpp       | 6 +++---
 kicker/applets/naughty/NaughtyApplet.cpp       | 2 +-
 kicker/applets/run/runapplet.cpp               | 2 +-
 kicker/applets/systemtray/systemtrayapplet.cpp | 2 +-
 kicker/applets/trash/trashapplet.cpp           | 2 +-
 kicker/applets/trash/trashbutton.cpp           | 2 +-
 kicker/applets/trash/trashbutton.h             | 2 +-
 21 files changed, 29 insertions(+), 29 deletions(-)

(limited to 'kicker/applets')

diff --git a/kicker/applets/clock/analog.ui b/kicker/applets/clock/analog.ui
index 024caaefe..e7181c521 100644
--- a/kicker/applets/clock/analog.ui
+++ b/kicker/applets/clock/analog.ui
@@ -332,7 +332,7 @@
 </tabstops>
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
-    <include location="local" impldecl="in implementation">kfontrequester.h</include>
+    <include location="local" impldecl="in implementation">tdefontrequester.h</include>
 </includes>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 92420e652..58f6d9da1 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -45,10 +45,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kapplication.h>
 #include <kprocess.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstringhandler.h>
 #include <tdefiledialog.h>
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
 #include <kglobalsettings.h>
 #include <tdeconfigdialogmanager.h>
 #include <kcalendarsystem.h>
diff --git a/kicker/applets/clock/digital.ui b/kicker/applets/clock/digital.ui
index 1450e6f4f..7fad42834 100644
--- a/kicker/applets/clock/digital.ui
+++ b/kicker/applets/clock/digital.ui
@@ -289,7 +289,7 @@
 </tabstops>
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
-    <include location="local" impldecl="in implementation">kfontrequester.h</include>
+    <include location="local" impldecl="in implementation">tdefontrequester.h</include>
     <include location="local" impldecl="in implementation">digital.ui.h</include>
 </includes>
 <Q_SLOTS>
diff --git a/kicker/applets/clock/fuzzy.ui b/kicker/applets/clock/fuzzy.ui
index 28bcd7185..386315bc2 100644
--- a/kicker/applets/clock/fuzzy.ui
+++ b/kicker/applets/clock/fuzzy.ui
@@ -275,13 +275,13 @@
 </tabstops>
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
-    <include location="local" impldecl="in implementation">kfontrequester.h</include>
+    <include location="local" impldecl="in implementation">tdefontrequester.h</include>
 </includes>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
-    <includehint>kfontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
 </includehints>
 </UI>
diff --git a/kicker/applets/clock/init.cpp b/kicker/applets/clock/init.cpp
index 8cf336866..4285ff749 100644
--- a/kicker/applets/clock/init.cpp
+++ b/kicker/applets/clock/init.cpp
@@ -45,10 +45,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kapplication.h>
 #include <kprocess.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstringhandler.h>
 #include <tdefiledialog.h>
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
 #include <kglobalsettings.h>
 #include <tdeconfigdialogmanager.h>
 #include <kcalendarsystem.h>
diff --git a/kicker/applets/clock/settings.ui b/kicker/applets/clock/settings.ui
index 170a830f4..6f63694a4 100644
--- a/kicker/applets/clock/settings.ui
+++ b/kicker/applets/clock/settings.ui
@@ -497,7 +497,7 @@
 <includes>
     <include location="local" impldecl="in implementation">tqheader.h</include>
     <include location="local" impldecl="in implementation">kdialog.h</include>
-    <include location="local" impldecl="in implementation">kfontrequester.h</include>
+    <include location="local" impldecl="in implementation">tdefontrequester.h</include>
 </includes>
 <Q_SLOTS>
     <slot>configureType()</slot>
@@ -507,10 +507,10 @@
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
-    <includehint>kfontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
-    <includehint>kfontrequester.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp
index f8c2fc59a..3a313fbe8 100644
--- a/kicker/applets/clock/zone.cpp
+++ b/kicker/applets/clock/zone.cpp
@@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqfile.h>
 #include <tqtooltip.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <time.h>
 #include <stdlib.h> // for getenv()
diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index c66f4ceb8..199a7b750 100644
--- a/kicker/applets/launcher/quickbutton.cpp
+++ b/kicker/applets/launcher/quickbutton.cpp
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqpopupmenu.h>
 #include <tqtooltip.h>
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kickertip.h>
 #include <klocale.h>
 #include <kdesktopfile.h>
diff --git a/kicker/applets/launcher/quictdelauncher.cpp b/kicker/applets/launcher/quictdelauncher.cpp
index 15439f9c9..8a1c1c9dc 100644
--- a/kicker/applets/launcher/quictdelauncher.cpp
+++ b/kicker/applets/launcher/quictdelauncher.cpp
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqtooltip.h>
 
 #include <dcopclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kaboutapplication.h>
 #include <kaboutdata.h>
diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp
index b6e1e7995..f2aa6be2b 100644
--- a/kicker/applets/media/mediaapplet.cpp
+++ b/kicker/applets/media/mediaapplet.cpp
@@ -24,7 +24,7 @@
 #include <kaboutdata.h>
 #include <kaboutapplication.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 
 #include "mediaapplet.h"
diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp
index a180cfbd9..7f4118bf8 100644
--- a/kicker/applets/media/mediumbutton.cpp
+++ b/kicker/applets/media/mediumbutton.cpp
@@ -38,7 +38,7 @@
 #include <kipc.h>
 #include <kiconloader.h>
 #include <kurldrag.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <konq_operations.h>
 #include <konq_popupmenu.h>
diff --git a/kicker/applets/media/mediumbutton.h b/kicker/applets/media/mediumbutton.h
index 1bc6380c2..76e448b27 100644
--- a/kicker/applets/media/mediumbutton.h
+++ b/kicker/applets/media/mediumbutton.h
@@ -28,7 +28,7 @@
 #include <tqtimer.h>
 #include <tdefileitem.h>
 #include <kpanelapplet.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 
 class MediumButton : public PanelPopupButton
 {
diff --git a/kicker/applets/media/preferencesdialog.cpp b/kicker/applets/media/preferencesdialog.cpp
index bd1a21b0d..8fbd958fa 100644
--- a/kicker/applets/media/preferencesdialog.cpp
+++ b/kicker/applets/media/preferencesdialog.cpp
@@ -23,7 +23,7 @@
 #include <kmimetype.h>
 #include <tqvbox.h>
 #include <tqwhatsthis.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdefiledetailview.h>
 
 class MediumTypeItem : public TQCheckListItem
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index 6662d57d4..7ff922ed5 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <klocale.h>
 #include <kdebug.h>
 #include <kprocess.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <dcopclient.h>
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index eb1ba784c..78353abbf 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -590,9 +590,9 @@ void KMiniPagerButton::mouseMoveEvent(TQMouseEvent* e)
         bp.drawRect(0, 0, ww, wh);
         bp.fillRect(1, 1, ww - 2, wh - 2, colorGroup().background());
 
-        Task::List tasklist;
-        tasklist.append(m_currentWindow);
-        TaskDrag* drag = new TaskDrag(tasklist, this);
+        Task::List tastdelist;
+        tastdelist.append(m_currentWindow);
+        TaskDrag* drag = new TaskDrag(tastdelist, this);
         TQPoint offset(m_pager->clickPos.x() - (r.x() * w / dw),
                 m_pager->clickPos.y() - (r.y() * h / dh));
         drag->setPixmap(windowImage, offset);
diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp
index 4e3332768..c953ec637 100644
--- a/kicker/applets/naughty/NaughtyApplet.cpp
+++ b/kicker/applets/naughty/NaughtyApplet.cpp
@@ -32,7 +32,7 @@
 #include <kaboutapplication.h>
 #include <kaboutdata.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
 #include <tqpushbutton.h>
 
diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp
index 5f930190a..eec48637c 100644
--- a/kicker/applets/run/runapplet.cpp
+++ b/kicker/applets/run/runapplet.cpp
@@ -213,7 +213,7 @@ void RunApplet::run_command(const TQString& command)
 
     _filterData->setData( _input->currentText().stripWhiteSpace() );
     TQStringList filters;
-    filters << "kurisearchfilter" << "kshorturifilter";
+    filters << "kurisearchfilter" << "tdeshorturifilter";
     KURIFilter::self()->filterURI( *(_filterData), filters );
 
     _input->addToHistory(command);
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index 850e4a519..c1117fb2d 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <krun.h>
 #include <twinmodule.h>
 #include <kdialogbase.h>
-#include <kactionselector.h>
+#include <tdeactionselector.h>
 #include <kiconloader.h>
 #include <twin.h>
 
diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp
index 478ac01ec..3b7ae419a 100644
--- a/kicker/applets/trash/trashapplet.cpp
+++ b/kicker/applets/trash/trashapplet.cpp
@@ -24,7 +24,7 @@
 #include <kaboutdata.h>
 #include <kaboutapplication.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 
 #include "trashapplet.h"
diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp
index fe8ad3200..526048c59 100644
--- a/kicker/applets/trash/trashbutton.cpp
+++ b/kicker/applets/trash/trashbutton.cpp
@@ -24,7 +24,7 @@
 
 #include <klocale.h>
 #include <krun.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <tdeio/netaccess.h>
 
diff --git a/kicker/applets/trash/trashbutton.h b/kicker/applets/trash/trashbutton.h
index 15c5d598f..bbf596a0c 100644
--- a/kicker/applets/trash/trashbutton.h
+++ b/kicker/applets/trash/trashbutton.h
@@ -28,7 +28,7 @@
 #include <tqtimer.h>
 #include <tdefileitem.h>
 #include <kpanelapplet.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 
 class TrashButton : public PanelPopupButton
 {
-- 
cgit v1.2.1