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

---
 kget/CMakeLists.txt                 |  2 +-
 kget/Makefile.am                    |  4 ++--
 kget/dlgAdvanced.cpp                |  4 ++--
 kget/dlgAutomation.cpp              | 12 ++++++------
 kget/dlgConnection.cpp              |  4 ++--
 kget/dlgIndividual.cpp              |  4 ++--
 kget/dlgLimits.cpp                  |  4 ++--
 kget/dlgPreferences.cpp             |  4 ++--
 kget/dlgSystem.cpp                  |  8 ++++----
 kget/dlgsystembase.ui               |  2 +-
 kget/dockindividual.cpp             |  2 +-
 kget/docking.cpp                    |  4 ++--
 kget/droptarget.cpp                 | 28 ++++++++++++++--------------
 kget/kget_plug_in/kget_linkview.cpp |  6 +++---
 kget/kget_plug_in/kget_linkview.h   |  4 ++--
 kget/kget_plug_in/kget_plug_in.cpp  |  4 ++--
 kget/logwindow.cpp                  |  8 ++++----
 kget/main.cpp                       | 32 ++++++++++++++++----------------
 kget/settings.cpp                   |  8 ++++----
 kget/tdemainwidget.cpp              | 10 +++++-----
 kget/tdemainwidget.h                |  8 ++++----
 kget/transfer.cpp                   | 12 ++++++------
 kget/transfer.h                     |  2 +-
 kget/transferlist.h                 |  2 +-
 24 files changed, 89 insertions(+), 89 deletions(-)

(limited to 'kget')

diff --git a/kget/CMakeLists.txt b/kget/CMakeLists.txt
index de86db18..2eceeaec 100644
--- a/kget/CMakeLists.txt
+++ b/kget/CMakeLists.txt
@@ -39,7 +39,7 @@ install( FILES kgetui.rc eventsrc DESTINATION ${DATA_INSTALL_DIR}/kget )
 tde_add_executable( kget AUTOMOC
   SOURCES
     getfilejob.cpp slaveevent.cpp slave.cpp transferlist.cpp
-    transfer.cpp settings.cpp logwindow.cpp kmainwidget.cpp tdefileio.cpp
+    transfer.cpp settings.cpp logwindow.cpp tdemainwidget.cpp tdefileio.cpp
     droptarget.cpp docking.cpp dlgconnectionbase.ui dlgautomationbase.ui
     dlglimitsbase.ui dlgadvancedbase.ui dlgdirectoriesbase.ui
     dlgsystembase.ui dlgSystem.cpp dlgPreferences.cpp dlgLimits.cpp
diff --git a/kget/Makefile.am b/kget/Makefile.am
index 959334b9..15c83ce7 100644
--- a/kget/Makefile.am
+++ b/kget/Makefile.am
@@ -8,7 +8,7 @@ kget_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_QT)
 kget_LDADD   = $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIBSOCKET)
 kget_SOURCES = getfilejob.cpp slaveevent.cpp slave.cpp transferlist.cpp \
                transfer.cpp settings.cpp logwindow.cpp \
-               kmainwidget.cpp tdefileio.cpp droptarget.cpp docking.cpp \
+               tdemainwidget.cpp tdefileio.cpp droptarget.cpp docking.cpp \
                dlgconnectionbase.ui dlgautomationbase.ui dlglimitsbase.ui \
                dlgadvancedbase.ui dlgdirectoriesbase.ui dlgsystembase.ui \
                dlgSystem.cpp dlgPreferences.cpp dlgLimits.cpp \
@@ -20,7 +20,7 @@ noinst_HEADERS = common.h \
                  dlgAdvanced.h dlgAutomation.h dlgConnection.h \
                  dlgDirectories.h dlgIndividual.h dlgLimits.h \
                  dlgPreferences.h dlgSystem.h docking.h droptarget.h \
-                 tdefileio.h kmainwidget.h logwindow.h settings.h \
+                 tdefileio.h tdemainwidget.h logwindow.h settings.h \
                  transfer.h transferlist.h version.h slave.h \
                  slaveevent.h http_defaults.h getfilejob.h dockindividual.h
 
diff --git a/kget/dlgAdvanced.cpp b/kget/dlgAdvanced.cpp
index 45cbe5c5..dc479fc2 100644
--- a/kget/dlgAdvanced.cpp
+++ b/kget/dlgAdvanced.cpp
@@ -33,7 +33,7 @@
 #include <tdeconfig.h>
 
 #include "settings.h"
-#include "kmainwidget.h"
+#include "tdemainwidget.h"
 #include "dlgAdvanced.h"
 
 
@@ -74,7 +74,7 @@ void DlgAdvanced::applyData()
     ksettings.b_showMain=cb_ShowMain->isChecked();
 
     if (ksettings.b_expertMode != cb_expertmode->isChecked()) {
-        kmain->slotToggleExpertMode();
+        tdemain->slotToggleExpertMode();
     }
 
     bool bIsKonquiEnable=cb_konqiIntegration->isChecked();
diff --git a/kget/dlgAutomation.cpp b/kget/dlgAutomation.cpp
index 779cacf3..97a299eb 100644
--- a/kget/dlgAutomation.cpp
+++ b/kget/dlgAutomation.cpp
@@ -38,7 +38,7 @@
 #include <klineedit.h>
 
 #include "settings.h"
-#include "kmainwidget.h"
+#include "tdemainwidget.h"
 #include "dlgAutomation.h"
 
 
@@ -106,12 +106,12 @@ void DlgAutomation::applyData()
     if (cb_autoSave->isChecked() != ksettings.b_autoSave || (uint) le_autoSave->value() != ksettings.autoSaveInterval) {
         ksettings.b_autoSave = cb_autoSave->isChecked();
         ksettings.autoSaveInterval = le_autoSave->value();
-        kmain->setAutoSave();
+        tdemain->setAutoSave();
     }
 
     if (cb_autoDisconnect->isChecked() != ksettings.b_autoDisconnect) {
-        kmain->slotToggleAutoDisconnect();
-        kmain->setAutoDisconnect();
+        tdemain->slotToggleAutoDisconnect();
+        tdemain->setAutoDisconnect();
     }
 
     ksettings.disconnectCommand = le_autoDisconnect->text();
@@ -120,11 +120,11 @@ void DlgAutomation::applyData()
     ksettings.disconnectTime = spins->dateTime().time();
 
     if (cb_autoShutdown->isChecked() != ksettings.b_autoShutdown) {
-        kmain->slotToggleAutoShutdown();
+        tdemain->slotToggleAutoShutdown();
     }
 
     if (cb_autoPaste->isChecked() != ksettings.b_autoPaste) {
-        kmain->slotToggleAutoPaste();
+        tdemain->slotToggleAutoPaste();
     }
 }
 
diff --git a/kget/dlgConnection.cpp b/kget/dlgConnection.cpp
index 5530953b..2908eda5 100644
--- a/kget/dlgConnection.cpp
+++ b/kget/dlgConnection.cpp
@@ -37,7 +37,7 @@
 #include <kcombobox.h>
 
 
-#include "kmainwidget.h"
+#include "tdemainwidget.h"
 #include "settings.h"
 #include "dlgConnection.h"
 
@@ -125,7 +125,7 @@ void DlgConnection::applyData()
     ksettings.linkNumber = le_linknum->value();
 
     if (cb_offlinemode->isChecked() != ksettings.b_offlineMode) {
-        kmain->slotToggleOfflineMode();
+        tdemain->slotToggleOfflineMode();
     }
 }
 
diff --git a/kget/dlgIndividual.cpp b/kget/dlgIndividual.cpp
index 9c70962b..d4e04297 100644
--- a/kget/dlgIndividual.cpp
+++ b/kget/dlgIndividual.cpp
@@ -39,9 +39,9 @@
 #include <kdatetimewidget.h>
 
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <krun.h>
 #include <tdeio/global.h>
 #include "common.h"
diff --git a/kget/dlgLimits.cpp b/kget/dlgLimits.cpp
index 8c6ded6d..6f1f08f0 100644
--- a/kget/dlgLimits.cpp
+++ b/kget/dlgLimits.cpp
@@ -33,7 +33,7 @@
 #include <kdialog.h>
 
 #include "settings.h"
-#include "kmainwidget.h"
+#include "tdemainwidget.h"
 #include "dlgLimits.h"
 
 
@@ -61,7 +61,7 @@ void DlgLimits::applyData()
     ksettings.maxSimultaneousConnections = le_maxnum->value();
     ksettings.minimumBandwidth = le_minband->value();
     ksettings.maximumBandwidth = le_maxband->value();
-    kmain->checkQueue();
+    tdemain->checkQueue();
 }
 
 void DlgLimits::slotChanged()
diff --git a/kget/dlgPreferences.cpp b/kget/dlgPreferences.cpp
index cc5ebb43..4a6758e2 100644
--- a/kget/dlgPreferences.cpp
+++ b/kget/dlgPreferences.cpp
@@ -29,7 +29,7 @@
 
 #include <kapplication.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcombobox.h>
 
 #include "dlgConnection.h"
@@ -45,7 +45,7 @@
 #undef index
 #endif
 
-#include "kmainwidget.h"
+#include "tdemainwidget.h"
 #include "dlgPreferences.h"
 
 
diff --git a/kget/dlgSystem.cpp b/kget/dlgSystem.cpp
index af33f966..fc3c49e7 100644
--- a/kget/dlgSystem.cpp
+++ b/kget/dlgSystem.cpp
@@ -32,10 +32,10 @@
 #undef index
 #endif
 
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
 
 #include "settings.h"
-#include "kmainwidget.h"
+#include "tdemainwidget.h"
 #include "dlgSystem.h"
 
 #include <tqbuttongroup.h>
@@ -62,11 +62,11 @@ void DlgSystem::applyData()
 {
     if (cb_useAnimation->isChecked() != ksettings.b_useAnimation)
     {
-        kmain->slotToggleAnimation();
+        tdemain->slotToggleAnimation();
     }
 
     ksettings.listViewFont = le_font->font();
-    kmain->setListFont();
+    tdemain->setListFont();
 }
 
 void DlgSystem::slotChanged()
diff --git a/kget/dlgsystembase.ui b/kget/dlgsystembase.ui
index a64575f7..2c51556d 100644
--- a/kget/dlgsystembase.ui
+++ b/kget/dlgsystembase.ui
@@ -164,6 +164,6 @@
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
-    <includehint>kfontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
 </includehints>
 </UI>
diff --git a/kget/dockindividual.cpp b/kget/dockindividual.cpp
index 76ed5753..9b668ea5 100644
--- a/kget/dockindividual.cpp
+++ b/kget/dockindividual.cpp
@@ -26,7 +26,7 @@
 
 #include <tqtooltip.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include "dockindividual.h"
 DockIndividual::DockIndividual(TQWidget *parent, const char *name ) : KSystemTray(parent,name)
diff --git a/kget/docking.cpp b/kget/docking.cpp
index e0e70f86..cb68c5b4 100644
--- a/kget/docking.cpp
+++ b/kget/docking.cpp
@@ -30,10 +30,10 @@
 #include <kapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kurldrag.h>
 
-#include "kmainwidget.h"
+#include "tdemainwidget.h"
 #include "settings.h"
 #include "docking.h"
 
diff --git a/kget/droptarget.cpp b/kget/droptarget.cpp
index 44bb1ef1..7e8de183 100644
--- a/kget/droptarget.cpp
+++ b/kget/droptarget.cpp
@@ -26,18 +26,18 @@
 
 #include <tqpainter.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kglobalsettings.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <twin.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kurldrag.h>
 
-#include "kmainwidget.h"
+#include "tdemainwidget.h"
 #include <tqcursor.h>
 #ifdef TQ_WS_X11
 #include <X11/Xlib.h>
@@ -98,9 +98,9 @@ DropTarget::DropTarget(TDEMainWindow * mainWin):TQWidget()
     popupMenu->insertSeparator();
     
     popupMenu->setItemChecked(pop_sticky, b_sticky);
-    kmain->m_paPreferences->plug(popupMenu);
+    tdemain->m_paPreferences->plug(popupMenu);
     popupMenu->insertSeparator();
-    kmain->m_paQuit->plug(popupMenu);
+    tdemain->m_paQuit->plug(popupMenu);
 
     isdragging = false;
 
@@ -129,14 +129,14 @@ DropTarget::mousePressEvent(TQMouseEvent * e)
     }
     else if (e->button() == Qt::RightButton)
     {
-        popupMenu->setItemEnabled(pop_Min, kmain->isVisible());
-        popupMenu->setItemEnabled(pop_Max, kmain->isHidden());
+        popupMenu->setItemEnabled(pop_Min, tdemain->isVisible());
+        popupMenu->setItemEnabled(pop_Max, tdemain->isHidden());
 
         popupMenu->popup(TQCursor::pos());
     }
     else if (e->button() == Qt::MidButton)
     {
-        kmain->slotPasteTransfer();
+        tdemain->slotPasteTransfer();
     }
 }
 
@@ -163,11 +163,11 @@ void DropTarget::dropEvent(TQDropEvent * event)
 
     if (KURLDrag::decode(event, list))
     {
-        kmain->addTransfers(list);
+        tdemain->addTransfers(list);
     }
     else if (TQTextDrag::decode(event, str))
     {
-        kmain->addTransfer(str);
+        tdemain->addTransfer(str);
     }
 }
 
@@ -193,10 +193,10 @@ void DropTarget::updateStickyState()
 
 void DropTarget::toggleMinimizeRestore()
 {
-    if (kmain->isVisible())
-        kmain->hide();
+    if (tdemain->isVisible())
+        tdemain->hide();
     else
-        kmain->show();
+        tdemain->show();
 }
 
 /** No descriptions */
diff --git a/kget/kget_plug_in/kget_linkview.cpp b/kget/kget_plug_in/kget_linkview.cpp
index 8a5f69cc..4195573d 100644
--- a/kget/kget_plug_in/kget_linkview.cpp
+++ b/kget/kget_plug_in/kget_linkview.cpp
@@ -3,15 +3,15 @@
 #include <tqlayout.h>
 
 #include <dcopclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kiconloader.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <kstdaction.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 #define COL_NAME 0
 #define COL_DESC 1
diff --git a/kget/kget_plug_in/kget_linkview.h b/kget/kget_plug_in/kget_linkview.h
index ab39541f..e5dc78ad 100644
--- a/kget/kget_plug_in/kget_linkview.h
+++ b/kget/kget_plug_in/kget_linkview.h
@@ -10,8 +10,8 @@
 
 #include <tqptrlist.h>
 
-#include <klistview.h>
-#include <kmainwindow.h>
+#include <tdelistview.h>
+#include <tdemainwindow.h>
 #include <kurl.h>
 
 #include "links.h"
diff --git a/kget/kget_plug_in/kget_plug_in.cpp b/kget/kget_plug_in/kget_plug_in.cpp
index b40f50dd..869fb513 100644
--- a/kget/kget_plug_in/kget_plug_in.cpp
+++ b/kget/kget_plug_in/kget_plug_in.cpp
@@ -26,11 +26,11 @@
 #include <tdehtml_part.h>
 #include <kiconloader.h>
 #include <kglobal.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinstance.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <krun.h>
 
 #include <dom/html_document.h>
diff --git a/kget/logwindow.cpp b/kget/logwindow.cpp
index 09490134..f8148fdf 100644
--- a/kget/logwindow.cpp
+++ b/kget/logwindow.cpp
@@ -30,10 +30,10 @@
 
 #include <klocale.h>
 #include <kdialog.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "transfer.h"
-#include "kmainwidget.h"
+#include "tdemainwidget.h"
 #include "logwindow.h"
 
 #include <kapplication.h>
@@ -182,8 +182,8 @@ LogWindow::LogWindow():KDialogBase(Tabbed, i18n("Log Window"), Close, Close, 0,
 
 void LogWindow::closeEvent(TQCloseEvent *e)
 {
-    kmain->m_paShowLog->setChecked(false);
-    kmain->b_viewLogWindow = false;
+    tdemain->m_paShowLog->setChecked(false);
+    tdemain->b_viewLogWindow = false;
     KDialogBase::closeEvent( e );
 }
 
diff --git a/kget/main.cpp b/kget/main.cpp
index ea6ab350..824bd9e6 100644
--- a/kget/main.cpp
+++ b/kget/main.cpp
@@ -37,7 +37,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "kmainwidget.h"
+#include "tdemainwidget.h"
 #include "version.h"
 
 
@@ -64,9 +64,9 @@ static void signalHandler(int sigId)
 {
     fprintf(stderr, "*** KGet got signal %d\n", sigId);
 
-    if (sigId != SIGSEGV && kmain) {
+    if (sigId != SIGSEGV && tdemain) {
         fprintf(stderr, "*** KGet saving data\n");
-        delete kmain;
+        delete tdemain;
     }
     // If Kget crashes again below this line we consider the data lost :-|
     // Otherwise Kget will end in an infinite loop.
@@ -101,7 +101,7 @@ static void cleanup(void)
 class KGetApp : public KUniqueApplication
 {
 private:
-    TDEMainWidget *kmainwidget;
+    TDEMainWidget *tdemainwidget;
     
 public:
     KGetApp() : KUniqueApplication()
@@ -110,7 +110,7 @@ public:
         sDebugIn << endl;
 #endif
 
-        kmainwidget=0;
+        tdemainwidget=0;
 
 #ifdef _DEBUG
         sDebugOut << endl;
@@ -122,7 +122,7 @@ public:
 #ifdef _DEBUG
         sDebugIn << endl;
 #endif
-    delete kmainwidget;
+    delete tdemainwidget;
 #ifdef _DEBUG
         sDebugOut << endl;
 #endif
@@ -132,26 +132,26 @@ public:
     int newInstance()
     {
 #ifdef _DEBUG
-        sDebugIn <<"kmainwidget="<<kmainwidget << endl;
+        sDebugIn <<"tdemainwidget="<<tdemainwidget << endl;
 #endif
 
         TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
 
-        if (kmainwidget==0)
+        if (tdemainwidget==0)
         {
             if(args->count()>0)
-                kmainwidget=new TDEMainWidget(true);
+                tdemainwidget=new TDEMainWidget(true);
             else
-                kmainwidget=new TDEMainWidget();
-            setMainWidget(kmain);
+                tdemainwidget=new TDEMainWidget();
+            setMainWidget(tdemain);
         }
 
         else
             TDEStartupInfo::setNewStartupId( mainWidget(), kapp->startupId());
 
         if (args->isSet("showDropTarget"))
-            kmain->activateDropTarget();
+            tdemain->activateDropTarget();
 
         if (args->count()==1)
         {
@@ -160,9 +160,9 @@ public:
 #endif
             TQString txt(args->arg(0));
             if ( txt.endsWith( ".kgt" ) )
-                kmain->readTransfersEx(KURL::fromPathOrURL( txt ));
+                tdemain->readTransfersEx(KURL::fromPathOrURL( txt ));
             else
-                kmain->addTransferEx( KURL::fromPathOrURL( txt ),
+                tdemain->addTransferEx( KURL::fromPathOrURL( txt ),
                                       KURL());
         }
         else if(args->count()>=2)
@@ -175,11 +175,11 @@ public:
 			// Sometimes valid filenames are not recognised by KURL::isLocalFile(), they are marked as invalid then
 			if ( args->count()==2 && ( urls.last().isLocalFile() || !urls.last().isValid()))
 			{
-				kmain->addTransferEx( urls.first(), urls.last() );
+				tdemain->addTransferEx( urls.first(), urls.last() );
 			}
 			else
 			{
-				kmain->addTransfers( urls, TQString() );
+				tdemain->addTransfers( urls, TQString() );
 			}
 		}
         args->clear();
diff --git a/kget/settings.cpp b/kget/settings.cpp
index 35451760..3489c9b4 100644
--- a/kget/settings.cpp
+++ b/kget/settings.cpp
@@ -35,7 +35,7 @@
 
 #include <tqdir.h>
 
-#include "kmainwidget.h"
+#include "tdemainwidget.h"
 #include "transferlist.h"
 #include "droptarget.h"
 #include "settings.h"
@@ -271,9 +271,9 @@ void Settings::save()
 
     // write main window geometry properties
     config->setGroup("MainGeometry");
-    config->writeEntry("Position", kmain->pos());
-    config->writeEntry("Size", kmain->size());
-    config->writeEntry("State", KWin::windowInfo(kmain->winId()).state());
+    config->writeEntry("Position", tdemain->pos());
+    config->writeEntry("Size", tdemain->size());
+    config->writeEntry("State", KWin::windowInfo(tdemain->winId()).state());
 
     // write drop target geometry properties
     config->setGroup("DropGeometry");
diff --git a/kget/tdemainwidget.cpp b/kget/tdemainwidget.cpp
index 4e852c66..3306680a 100644
--- a/kget/tdemainwidget.cpp
+++ b/kget/tdemainwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-*                                kmainwidget.cpp
+*                                tdemainwidget.cpp
 *                             -------------------
 *
 *    begin        : Tue Jan 29 2002
@@ -75,7 +75,7 @@
 #include "settings.h"
 #include "transfer.h"
 #include "transferlist.h"
-#include "kmainwidget.h"
+#include "tdemainwidget.h"
 #include "tdefileio.h"
 #include "dlgPreferences.h"
 #include "logwindow.h"
@@ -99,7 +99,7 @@ struct KURLPair
 	KURL src;
 };
 
-TDEMainWidget *kmain = 0L;
+TDEMainWidget *tdemain = 0L;
 
 #define LOAD_ICON(X) TDEGlobal::iconLoader()->loadIcon(X, KIcon::MainToolbar)
 
@@ -139,7 +139,7 @@ TDEMainWidget::TDEMainWidget(bool bStartDocked)
     b_viewPreferences = FALSE;
 
     myTransferList = 0L;
-    kmain = this;
+    tdemain = this;
 
     // Set log time, needed for the name of log file
     TQDate date = TQDateTime::currentDateTime().date();
@@ -2545,4 +2545,4 @@ void TDEMainWidget::slotShowMenubar()
         menuBar()->hide();
 }
 
-#include "kmainwidget.moc"
+#include "tdemainwidget.moc"
diff --git a/kget/tdemainwidget.h b/kget/tdemainwidget.h
index cd2ce92d..cd8703d6 100644
--- a/kget/tdemainwidget.h
+++ b/kget/tdemainwidget.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-*                                kmainwidget.h
+*                                tdemainwidget.h
 *                             -------------------
 *
 *    Revision     : $Id$
@@ -28,8 +28,8 @@
 #ifndef _KMAINWIDGET_H_
 #define _KMAINWIDGET_H_
 
-#include <kmainwindow.h>
-#include <kaction.h>
+#include <tdemainwindow.h>
+#include <tdeaction.h>
 #include <kurl.h>
 #include "common.h"
 
@@ -227,7 +227,7 @@ private:
 
 };
 
-extern TDEMainWidget *kmain;
+extern TDEMainWidget *tdemain;
 extern DropTarget *kdrop;
 
 #endif                          // _KMAINWIDGET_H_
diff --git a/kget/transfer.cpp b/kget/transfer.cpp
index e9631091..43bc6939 100644
--- a/kget/transfer.cpp
+++ b/kget/transfer.cpp
@@ -29,7 +29,7 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <ksimpleconfig.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <twin.h>
@@ -39,7 +39,7 @@
 #include "safedelete.h"
 #include "settings.h"
 #include "logwindow.h"
-#include "kmainwidget.h"
+#include "tdemainwidget.h"
 #include "dlgIndividual.h"
 #include "transferlist.h"
 #include "transfer.h"
@@ -118,10 +118,10 @@ Transfer::init(const uint _id)
     status = ST_STOPPED;
 
 
-    connect(this, TQT_SIGNAL(statusChanged(Transfer *, int)), kmain, TQT_SLOT(slotStatusChanged(Transfer *, int)));
+    connect(this, TQT_SIGNAL(statusChanged(Transfer *, int)), tdemain, TQT_SLOT(slotStatusChanged(Transfer *, int)));
     connect(this, TQT_SIGNAL(statusChanged(Transfer *, int)), this, TQT_SLOT(slotUpdateActions()));
 
-    connect(this, TQT_SIGNAL(log(uint, const TQString &, const TQString &)), kmain->logwin(), TQT_SLOT(logTransfer(uint, const TQString &, const TQString &)));
+    connect(this, TQT_SIGNAL(log(uint, const TQString &, const TQString &)), tdemain->logwin(), TQT_SLOT(logTransfer(uint, const TQString &, const TQString &)));
 
     // setup actions
     m_paResume = new TDEAction(i18n("&Resume"), "tool_resume", 0, this, TQT_SLOT(slotResume()), this, "resume");
@@ -782,7 +782,7 @@ bool Transfer::read(KSimpleConfig * config, int id)
     }
 
     if (!src.isValid() && !ksettings.b_expertMode) {
-        KMessageBox::error(kmain, i18n("Malformed URL:\n") + src.prettyURL(), i18n("Error"));
+        KMessageBox::error(tdemain, i18n("Malformed URL:\n") + src.prettyURL(), i18n("Error"));
         return false;
     }
 
@@ -840,7 +840,7 @@ void Transfer::slotExecPause()
     m_paResume->setEnabled(true);
     slotUpdateActions();
     //TODO WE NEED TO UPDATE ACTIONS..
-    kmain->slotUpdateActions();
+    tdemain->slotUpdateActions();
     emit statusChanged(this, OP_PAUSED);
     sDebugOut << endl;
 }
diff --git a/kget/transfer.h b/kget/transfer.h
index 2673faf7..17dd24be 100644
--- a/kget/transfer.h
+++ b/kget/transfer.h
@@ -28,7 +28,7 @@
 #ifndef _Transfer_h
 #define _Transfer_h
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqdatetime.h>
 #include <tqguardedptr.h>
 #include <tqmap.h>
diff --git a/kget/transferlist.h b/kget/transferlist.h
index 3ffa22ac..b22b9994 100644
--- a/kget/transferlist.h
+++ b/kget/transferlist.h
@@ -27,7 +27,7 @@
 #ifndef _TransferList_h
 #define _TransferList_h
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqptrlist.h>
 
 #include <kurl.h>
-- 
cgit v1.2.1