Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

8 files changed, 25 insertions, 25 deletions

diff --git a/src/svnfrontend/graphtree/drawparams.h b/src/svnfrontend/graphtree/drawparams.h
index 0244620..966541d 100644
--- a/src/svnfrontend/graphtree/drawparams.h
+++ b/src/svnfrontend/graphtree/drawparams.h
@@ -43,7 +43,7 @@
 class TQPopupMenu;
 class TQString;
 
-class KConfigGroup;
+class TDEConfigGroup;
 
 
 /**
diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp
index dcc754d..a36b9ef 100644
--- a/src/svnfrontend/svnactions.cpp
+++ b/src/svnfrontend/svnactions.cpp
@@ -126,7 +126,7 @@ public:
         for (it=m_tempdirlist.begin();it!=m_tempdirlist.end();++it) {
             for (TQStringList::iterator it2 = (*it).begin();
                 it2 != (*it).end();++it2) {
-                KIO::NetAccess::del((*it2),0);
+                TDEIO::NetAccess::del((*it2),0);
             }
         }
         delete m_Svnclient;
@@ -1068,7 +1068,7 @@ void SvnActions::procClosed(TDEProcess*proc)
     if ( (it=m_Data->m_tempdirlist.find(proc))!=m_Data->m_tempdirlist.end()) {
         for (TQStringList::iterator it2 = (*it).begin();
             it2 != (*it).end();++it2) {
-                KIO::NetAccess::del((*it2),0);
+                TDEIO::NetAccess::del((*it2),0);
         }
         m_Data->m_tempdirlist.erase(it);
     }
diff --git a/src/svnfrontend/svnactions.h b/src/svnfrontend/svnactions.h
index e208181..4342ea5 100644
--- a/src/svnfrontend/svnactions.h
+++ b/src/svnfrontend/svnactions.h
@@ -53,7 +53,7 @@ namespace svn {
     class InfoEntry;
 }
 
-namespace KIO {
+namespace TDEIO {
     class Job;
 }
 
diff --git a/src/svnfrontend/svnfiletip.cpp b/src/svnfrontend/svnfiletip.cpp
index 283e084..cc99182 100644
--- a/src/svnfrontend/svnfiletip.cpp
+++ b/src/svnfrontend/svnfiletip.cpp
@@ -268,10 +268,10 @@ void SvnFileTip::startDelayed()
         KFileItemList oneItem;
         oneItem.append( m_svnitem->fileItem() );
 
-        m_previewJob = KIO::filePreview( oneItem, 256, 256, 64, 70, true, true, 0);
+        m_previewJob = TDEIO::filePreview( oneItem, 256, 256, 64, 70, true, true, 0);
         connect( m_previewJob, TQT_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ),
                  this, TQT_SLOT( gotPreview( const KFileItem *, const TQPixmap & ) ) );
-        connect( m_previewJob, TQT_SIGNAL( result( KIO::Job * ) ),
+        connect( m_previewJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
                  this, TQT_SLOT( gotPreviewResult() ) );
     }
 
diff --git a/src/svnfrontend/svnfiletip.h b/src/svnfrontend/svnfiletip.h
index 59ce063..2c20dcd 100644
--- a/src/svnfrontend/svnfiletip.h
+++ b/src/svnfrontend/svnfiletip.h
@@ -90,7 +90,7 @@ public:
     int        m_num;
     TQScrollView* m_view;
     SvnItem* m_svnitem;
-    KIO::PreviewJob* m_previewJob;
+    TDEIO::PreviewJob* m_previewJob;
     TQRect      m_rect;
     TQTimer*    m_timer;
 };
diff --git a/src/svnfrontend/svnlogdlgimp.cpp b/src/svnfrontend/svnlogdlgimp.cpp
index 9cbc7e3..d3a7910 100644
--- a/src/svnfrontend/svnlogdlgimp.cpp
+++ b/src/svnfrontend/svnlogdlgimp.cpp
@@ -206,7 +206,7 @@ SvnLogDlgImp::SvnLogDlgImp(SvnActions*ac,TQWidget *parent, const char *name,bool
         m_ChangedList->hide();
     }
     m_Actions = ac;
-    KConfigGroup cs(Kdesvnsettings::self()->config(), groupName);
+    TDEConfigGroup cs(Kdesvnsettings::self()->config(), groupName);
     TQString t1 = cs.readEntry("logsplitter",TQString());
     if (!t1.isEmpty()) {
         TQTextStream st2(&t1,IO_ReadOnly);
@@ -228,7 +228,7 @@ SvnLogDlgImp::~SvnLogDlgImp()
     st1 << *m_rightSplitter;
     TQTextStream st2(&t2,IO_WriteOnly);
     st2 << *m_centralSplitter;
-    KConfigGroup cs(Kdesvnsettings::self()->config(), groupName);
+    TDEConfigGroup cs(Kdesvnsettings::self()->config(), groupName);
     cs.writeEntry("right_logsplitter",t1);
     cs.writeEntry("logsplitter",t2);
     cs.writeEntry("laststate",m_ChangedList->isHidden());
@@ -442,7 +442,7 @@ void SvnLogDlgImp::saveSize()
 {
     int scnum = TQApplication::desktop()->screenNumber(parentWidget());
     TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
-    KConfigGroupSaver cs(Kdesvnsettings::self()->config(), groupName);
+    TDEConfigGroupSaver cs(Kdesvnsettings::self()->config(), groupName);
     TQSize sizeToSave = size();
     Kdesvnsettings::self()->config()->writeEntry( TQString::fromLatin1("Width %1").arg( desk.width()),
         TQString::number( sizeToSave.width()), true, false);
@@ -457,7 +457,7 @@ TQSize SvnLogDlgImp::dialogSize()
     TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
     w = sizeHint().width();
     h = sizeHint().height();
-    KConfigGroupSaver cs(Kdesvnsettings::self()->config(), groupName);
+    TDEConfigGroupSaver cs(Kdesvnsettings::self()->config(), groupName);
     w = Kdesvnsettings::self()->config()->readNumEntry( TQString::fromLatin1("Width %1").arg( desk.width()), w );
     h = Kdesvnsettings::self()->config()->readNumEntry( TQString::fromLatin1("Height %1").arg( desk.height()), h );
     return( TQSize( w, h ) );
diff --git a/src/svnfrontend/tdesvnfilelist.cpp b/src/svnfrontend/tdesvnfilelist.cpp
index 496d958..a765807 100644
--- a/src/svnfrontend/tdesvnfilelist.cpp
+++ b/src/svnfrontend/tdesvnfilelist.cpp
@@ -1813,9 +1813,9 @@ void tdesvnfilelist::slotDropped(TQDropEvent* event,TQListViewItem*item)
                 slotImportIntoDir(urlList[0],tdir,fi.isDir());
             } else {
                 //m_pList->stopScan();
-                KIO::Job * job = 0L;
-                job = KIO::copy(urlList,tdir);
-                connect( job, TQT_SIGNAL( result( KIO::Job * ) ),TQT_SLOT( slotCopyFinished( KIO::Job * ) ) );
+                TDEIO::Job * job = 0L;
+                job = TDEIO::copy(urlList,tdir);
+                connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),TQT_SLOT( slotCopyFinished( TDEIO::Job * ) ) );
                 dispDummy();
                 event->acceptAction();
                 return;
@@ -1937,9 +1937,9 @@ void tdesvnfilelist::slotCat()
 
 
 /*!
-    \fn tdesvnfilelist::slotCopyFinished( KIO::Job *)
+    \fn tdesvnfilelist::slotCopyFinished( TDEIO::Job *)
  */
-void tdesvnfilelist::slotCopyFinished( KIO::Job * job)
+void tdesvnfilelist::slotCopyFinished( TDEIO::Job * job)
 {
     if (m_pList->m_DirWatch) {
         m_pList->m_DirWatch->startScan(false);
@@ -1953,8 +1953,8 @@ void tdesvnfilelist::slotCopyFinished( KIO::Job * job)
         }
         // always just connect a CopyJob here!!!!
         if (ok) {
-            KURL::List lst = static_cast<KIO::CopyJob*>(job)->srcURLs();
-            KURL turl = static_cast<KIO::CopyJob*>(job)->destURL();
+            KURL::List lst = static_cast<TDEIO::CopyJob*>(job)->srcURLs();
+            KURL turl = static_cast<TDEIO::CopyJob*>(job)->destURL();
             TQString base = turl.path(1);
             KURL::List::iterator iter;
             TQValueList<svn::Path> tmp;
@@ -2004,8 +2004,8 @@ void tdesvnfilelist::slotDelete()
         return;
     }
     if (kioList.count()>0) {
-        KIO::Job*aJob = KIO::del(kioList);
-        connect(aJob,TQT_SIGNAL(result (KIO::Job *)),this,TQT_SLOT(slotDeleteFinished(KIO::Job*)));
+        TDEIO::Job*aJob = TDEIO::del(kioList);
+        connect(aJob,TQT_SIGNAL(result (TDEIO::Job *)),this,TQT_SLOT(slotDeleteFinished(TDEIO::Job*)));
         dispDummy();
     }
     if (m_deletePerfect && items.size()>0) {
@@ -2016,9 +2016,9 @@ void tdesvnfilelist::slotDelete()
 }
 
 /*!
-    \fn tdesvnfilelist::slotDeleteFinished(KIO::Job*)
+    \fn tdesvnfilelist::slotDeleteFinished(TDEIO::Job*)
  */
-void tdesvnfilelist::slotDeleteFinished(KIO::Job*job)
+void tdesvnfilelist::slotDeleteFinished(TDEIO::Job*job)
 {
     if (job) {
         tqApp->exit_loop();
diff --git a/src/svnfrontend/tdesvnfilelist.h b/src/svnfrontend/tdesvnfilelist.h
index 6f9a6fb..7de4d08 100644
--- a/src/svnfrontend/tdesvnfilelist.h
+++ b/src/svnfrontend/tdesvnfilelist.h
@@ -40,7 +40,7 @@ class KDialogBase;
 class KdesvnFileListPrivate;
 class SvnActions;
 
-namespace KIO {
+namespace TDEIO {
     class Job;
 }
 
@@ -169,8 +169,8 @@ protected slots:
     virtual void slotDisplayLastDiff();
 
     /* callback slots */
-    virtual void slotCopyFinished( KIO::Job *);
-    virtual void slotDeleteFinished(KIO::Job*);
+    virtual void slotCopyFinished( TDEIO::Job *);
+    virtual void slotDeleteFinished(TDEIO::Job*);
     virtual void _openURL(const TQString&);
     virtual void _dirwatchTimeout();
     virtual void _propListTimeout();