Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

10 files changed, 56 insertions, 56 deletions

diff --git a/src/svnfrontend/blamedisplay_impl.cpp b/src/svnfrontend/blamedisplay_impl.cpp
index 873d9c1..6eccfa0 100644
--- a/src/svnfrontend/blamedisplay_impl.cpp
+++ b/src/svnfrontend/blamedisplay_impl.cpp
@@ -145,7 +145,7 @@ BlameDisplayItem::BlameDisplayItem(KListView*lv,BlameDisplayItem*it,const svn::A
 int BlameDisplayItem::width (const TQFontMetrics & fm, const TQListView * lv, int c ) const
 {
     if (c == COL_LINE) {
-        return KListViewItem::width(TQFontMetrics(KGlobalSettings::fixedFont()),lv,c)+2*BORDER;
+        return KListViewItem::width(TQFontMetrics(TDEGlobalSettings::fixedFont()),lv,c)+2*BORDER;
     }
     return KListViewItem::width(fm,lv,c)+2*BORDER;
 }
@@ -156,7 +156,7 @@ void BlameDisplayItem::display()
         setText(COL_REV,TQString("%1").arg(m_Content.revision()));
         setText(COL_AUT,m_Content.tAuthor());
         if (m_Content.date().isValid()) {
-            setText(COL_DATE,KGlobal::locale()->formatDateTime(m_Content.date()));
+            setText(COL_DATE,TDEGlobal::locale()->formatDateTime(m_Content.date()));
         }
     }
 
@@ -190,14 +190,14 @@ void BlameDisplayItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colum
     /* don't copy string */
     const TQString & str = text(column);;
     if (column == COL_LINE) {
-        p->setFont(KGlobalSettings::fixedFont());
+        p->setFont(TDEGlobalSettings::fixedFont());
     }
 
     TQColorGroup _cg = cg;
     TQColor _bgColor;
     if (column==COL_LINENR || isSelected()) {
-        _bgColor = KGlobalSettings::highlightColor();
-        p->setPen(KGlobalSettings::highlightedTextColor());
+        _bgColor = TDEGlobalSettings::highlightColor();
+        p->setPen(TDEGlobalSettings::highlightedTextColor());
     } else {
         if (Kdesvnsettings::self()->colored_blame()) {
             _bgColor = cb->rev2color(m_Content.revision());
@@ -415,7 +415,7 @@ void BlameDisplay_impl::showCommit(BlameDisplayItem*bit)
     KDialogBase::Close);
     TQWidget* Dialog1Layout = dlg->makeVBoxMainWidget();
     KTextBrowser*ptr = new KTextBrowser(Dialog1Layout);
-    ptr->setFont(KGlobalSettings::fixedFont());
+    ptr->setFont(TDEGlobalSettings::fixedFont());
     ptr->setWordWrap(TQTextEdit::NoWrap);
     ptr->setText(text);
     dlg->resize(dlg->configDialogSize(*(Kdesvnsettings::self()->config()),"simplelog_display"));
diff --git a/src/svnfrontend/editproperty_impl.cpp b/src/svnfrontend/editproperty_impl.cpp
index 9c5ffba..dad19a8 100644
--- a/src/svnfrontend/editproperty_impl.cpp
+++ b/src/svnfrontend/editproperty_impl.cpp
@@ -117,7 +117,7 @@ EditProperty_impl::EditProperty_impl(TQWidget *parent, const char *name)
         "second expression is used to extract the bare bug ID from that string.");
 
     m_NameEdit->setAutoCompletion(true);
-    m_NameEdit->setCompletionMode(KGlobalSettings::CompletionPopupAuto);
+    m_NameEdit->setCompletionMode(TDEGlobalSettings::CompletionPopupAuto);
     m_NameEdit->setDuplicatesEnabled(false);
     m_NameEdit->setHistoryItems(fileProperties, true);
     isDir = false;
diff --git a/src/svnfrontend/filelistviewitem.cpp b/src/svnfrontend/filelistviewitem.cpp
index 812ee69..ba13f27 100644
--- a/src/svnfrontend/filelistviewitem.cpp
+++ b/src/svnfrontend/filelistviewitem.cpp
@@ -191,7 +191,7 @@ void FileListViewItem::update()
     }
     setText(COL_STATUS,infoText());
     setText(COL_LAST_AUTHOR,cmtAuthor());
-    setText(COL_LAST_DATE,KGlobal::locale()->formatDateTime(fullDate()));
+    setText(COL_LAST_DATE,TDEGlobal::locale()->formatDateTime(fullDate()));
     setText(COL_LAST_REV,TQString("%1").arg(cmtRev()));
     setText(COL_IS_LOCKED,lockOwner());
 }
diff --git a/src/svnfrontend/fronthelpers/propertyitem.cpp b/src/svnfrontend/fronthelpers/propertyitem.cpp
index 3539fd7..adf16d0 100644
--- a/src/svnfrontend/fronthelpers/propertyitem.cpp
+++ b/src/svnfrontend/fronthelpers/propertyitem.cpp
@@ -40,7 +40,7 @@ bool PropertyListViewItem::different()const
 void PropertyListViewItem::deleteIt()
 {
     m_deleted = true;
-    setPixmap(0,KGlobal::iconLoader()->loadIcon("cancel",KIcon::Desktop,16));
+    setPixmap(0,TDEGlobal::iconLoader()->loadIcon("cancel",KIcon::Desktop,16));
 }
 
 void PropertyListViewItem::unDeleteIt()
diff --git a/src/svnfrontend/graphtree/revgraphview.cpp b/src/svnfrontend/graphtree/revgraphview.cpp
index 494c73a..fec18ba 100644
--- a/src/svnfrontend/graphtree/revgraphview.cpp
+++ b/src/svnfrontend/graphtree/revgraphview.cpp
@@ -162,12 +162,12 @@ void RevGraphView::endInsert()
     viewport()->setUpdatesEnabled(true);
 }
 
-void RevGraphView::readDotOutput(KProcess*,char *   buffer,int   buflen)
+void RevGraphView::readDotOutput(TDEProcess*,char *   buffer,int   buflen)
 {
     dotOutput+=TQString::fromLocal8Bit(buffer, buflen);
 }
 
-void RevGraphView::dotExit(KProcess*p)
+void RevGraphView::dotExit(TDEProcess*p)
 {
     if (p!=renderProcess)return;
     // remove line breaks when lines to long
@@ -491,14 +491,14 @@ void RevGraphView::dumpRevtree()
         }
     }
     *stream << "}\n"<<flush;
-    renderProcess = new KProcess();
+    renderProcess = new TDEProcess();
     renderProcess->setEnvironment("LANG","C");
     *renderProcess << "dot";
     *renderProcess << dotTmpFile->name() << "-Tplain";
-    connect(renderProcess,TQT_SIGNAL(processExited(KProcess*)),this,TQT_SLOT(dotExit(KProcess*)));
-    connect(renderProcess,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),
-        this,TQT_SLOT(readDotOutput(KProcess*,char*,int)) );
-    if (!renderProcess->start(KProcess::NotifyOnExit,KProcess::Stdout)) {
+    connect(renderProcess,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(dotExit(TDEProcess*)));
+    connect(renderProcess,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+        this,TQT_SLOT(readDotOutput(TDEProcess*,char*,int)) );
+    if (!renderProcess->start(TDEProcess::NotifyOnExit,TDEProcess::Stdout)) {
         TQString arguments;
         for (unsigned c=0;c<renderProcess->args().count();++c) {
             arguments+=TQString(" %1").arg(renderProcess->args()[c].data());
diff --git a/src/svnfrontend/graphtree/revgraphview.h b/src/svnfrontend/graphtree/revgraphview.h
index f0b39c7..d8d1972 100644
--- a/src/svnfrontend/graphtree/revgraphview.h
+++ b/src/svnfrontend/graphtree/revgraphview.h
@@ -30,7 +30,7 @@ namespace svn {
 }
 
 class KTempFile;
-class KProcess;
+class TDEProcess;
 class RevisionTree;
 class GraphTreeLabel;
 class GraphViewTip;
@@ -98,8 +98,8 @@ public slots:
     virtual void slotClientException(const TQString&what);
 
 protected slots:
-    virtual void readDotOutput(KProcess *   proc,char *   buffer,int   buflen);
-    virtual void dotExit(KProcess*);
+    virtual void readDotOutput(TDEProcess *   proc,char *   buffer,int   buflen);
+    virtual void dotExit(TDEProcess*);
 
 protected:
     TQCanvas*m_Canvas;
@@ -109,7 +109,7 @@ protected:
     TQObject*m_Listener;
     KTempFile*dotTmpFile;
     TQString dotOutput;
-    KProcess*renderProcess;
+    TDEProcess*renderProcess;
     trevTree m_Tree;
     TQColor getBgColor(const TQString&nodeName)const;
     bool isStart(const TQString&nodeName)const;
diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp
index 729a8b9..dcc754d 100644
--- a/src/svnfrontend/svnactions.cpp
+++ b/src/svnfrontend/svnactions.cpp
@@ -116,7 +116,7 @@ public:
             delete m_LogDialog;
         }
 
-        TQMap<KProcess*,TQStringList>::iterator it;
+        TQMap<TDEProcess*,TQStringList>::iterator it;
         for (it=m_tempfilelist.begin();it!=m_tempfilelist.end();++it) {
             for (TQStringList::iterator it2 = (*it).begin();
                 it2 != (*it).end();++it2) {
@@ -180,8 +180,8 @@ public:
     /// \todo as persistent cache (sqlite?)
     helpers::itemCache<svn::InfoEntry> m_InfoCache;
 
-    TQMap<KProcess*,TQStringList> m_tempfilelist;
-    TQMap<KProcess*,TQStringList> m_tempdirlist;
+    TQMap<TDEProcess*,TQStringList> m_tempfilelist;
+    TQMap<TDEProcess*,TQStringList> m_tempdirlist;
 
     TQTimer m_ThreadCheckTimer;
     TQTimer m_UpdateCheckTimer;
@@ -601,7 +601,7 @@ void SvnActions::slotMakeCat(const svn::Revision&start, const TQString&what, con
     if (co.size()) {
         KDialogBase*dlg = createDialog(&ptr,TQString(i18n("Content of %1")).arg(disp),false,"cat_display_dlg");
         if (dlg) {
-            ptr->setFont(KGlobalSettings::fixedFont());
+            ptr->setFont(TDEGlobalSettings::fixedFont());
             ptr->setWordWrap(TQTextEdit::NoWrap);
             ptr->setText(TQString::FROMUTF8(co,co.size()));
             dlg->exec();
@@ -1036,16 +1036,16 @@ bool SvnActions::makeCommit(const svn::Targets&targets)
 }
 
 /*!
-    \fn SvnActions::wroteStdin(KProcess*)
+    \fn SvnActions::wroteStdin(TDEProcess*)
  */
-void SvnActions::wroteStdin(KProcess*proc)
+void SvnActions::wroteStdin(TDEProcess*proc)
 {
     if (!proc) return;
-    kdDebug()<<"void SvnActions::wroteStdin(KProcess*proc)"<<endl;
+    kdDebug()<<"void SvnActions::wroteStdin(TDEProcess*proc)"<<endl;
     proc->closeStdin();
 }
 
-void SvnActions::receivedStderr(KProcess*proc,char*buff,int len)
+void SvnActions::receivedStderr(TDEProcess*proc,char*buff,int len)
 {
     if (!proc || !buff || len == 0) {
         return;
@@ -1054,10 +1054,10 @@ void SvnActions::receivedStderr(KProcess*proc,char*buff,int len)
     emit sendNotify(msg);
 }
 
-void SvnActions::procClosed(KProcess*proc)
+void SvnActions::procClosed(TDEProcess*proc)
 {
     if (!proc) return;
-    TQMap<KProcess*,TQStringList>::iterator it;
+    TQMap<TDEProcess*,TQStringList>::iterator it;
     if ( (it=m_Data->m_tempfilelist.find(proc))!=m_Data->m_tempfilelist.end()) {
         for (TQStringList::iterator it2 = (*it).begin();
             it2 != (*it).end();++it2) {
@@ -1183,7 +1183,7 @@ void SvnActions::makeDiffExternal(const TQString&p1,const svn::Revision&start,co
             }
         }
     }
-    KProcess*proc = new KProcess();
+    TDEProcess*proc = new TDEProcess();
     for ( TQStringList::Iterator it = wlist.begin();it!=wlist.end();++it) {
         if (*it=="%1") {
             *proc<<first;
@@ -1193,10 +1193,10 @@ void SvnActions::makeDiffExternal(const TQString&p1,const svn::Revision&start,co
             *proc << *it;
         }
     }
-    connect(proc,TQT_SIGNAL(processExited(KProcess*)),this,TQT_SLOT(procClosed(KProcess*)));
-    connect(proc,TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),this,TQT_SLOT(receivedStderr(KProcess*,char*,int)));
-    connect(proc,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),this,TQT_SLOT(receivedStderr(KProcess*,char*,int)));
-    if (proc->start(m_Data->runblocked?KProcess::Block:KProcess::NotifyOnExit,KProcess::All)) {
+    connect(proc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(procClosed(TDEProcess*)));
+    connect(proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int)));
+    connect(proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int)));
+    if (proc->start(m_Data->runblocked?TDEProcess::Block:TDEProcess::NotifyOnExit,TDEProcess::All)) {
         if (!m_Data->runblocked) {
             if (!isDir) {
                 tfile2.setAutoDelete(false);
@@ -1321,11 +1321,11 @@ void SvnActions::makeNorecDiff(const TQString&p1,const svn::Revision&r1,const TQ
 void SvnActions::dispDiff(const TQByteArray&ex)
 {
     TQString what = Kdesvnsettings::external_diff_display();
-    int r = KProcess::Stdin|KProcess::Stderr;
+    int r = TDEProcess::Stdin|TDEProcess::Stderr;
 
     if (Kdesvnsettings::use_external_diff() && (what.find("%1")==-1 || what.find("%2")==-1)) {
         TQStringList wlist = TQStringList::split(" ",what);
-        KProcess*proc = new KProcess();
+        TDEProcess*proc = new TDEProcess();
         bool fname_used = false;
         KTempFile tfile;
         tfile.setAutoDelete(false);
@@ -1342,12 +1342,12 @@ void SvnActions::dispDiff(const TQByteArray&ex)
             }
         }
 
-        connect(proc,TQT_SIGNAL(processExited(KProcess*)),this,TQT_SLOT(procClosed(KProcess*)));
-        connect(proc,TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),this,TQT_SLOT(receivedStderr(KProcess*,char*,int)));
+        connect(proc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(procClosed(TDEProcess*)));
+        connect(proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int)));
         if (!fname_used) {
-            connect(proc,TQT_SIGNAL(wroteStdin(KProcess*)),this,TQT_SLOT(wroteStdin(KProcess*)));
+            connect(proc,TQT_SIGNAL(wroteStdin(TDEProcess*)),this,TQT_SLOT(wroteStdin(TDEProcess*)));
         }
-        if (proc->start(KProcess::NotifyOnExit,fname_used?KProcess::Stderr:(KProcess::Communication)r)) {
+        if (proc->start(TDEProcess::NotifyOnExit,fname_used?TDEProcess::Stderr:(TDEProcess::Communication)r)) {
             if (!fname_used) proc->writeStdin(ex,ex.size());
             else m_Data->m_tempfilelist[proc].append(tfile.name());
             return;
@@ -1924,7 +1924,7 @@ void SvnActions::slotResolve(const TQString&p)
         return;
     }
 
-    KProcess*proc = new KProcess();
+    TDEProcess*proc = new TDEProcess();
     for ( TQStringList::Iterator it = wlist.begin();it!=wlist.end();++it) {
         if (*it=="%o"||*it=="%l") {
             *proc<<(base+"/"+i1.conflictOld());
@@ -1938,10 +1938,10 @@ void SvnActions::slotResolve(const TQString&p)
             *proc << *it;
         }
     }
-    connect(proc,TQT_SIGNAL(processExited(KProcess*)),this,TQT_SLOT(procClosed(KProcess*)));
-    connect(proc,TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),this,TQT_SLOT(receivedStderr(KProcess*,char*,int)));
-    connect(proc,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),this,TQT_SLOT(receivedStderr(KProcess*,char*,int)));
-    if (proc->start(m_Data->runblocked?KProcess::Block:KProcess::NotifyOnExit,KProcess::All)) {
+    connect(proc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(procClosed(TDEProcess*)));
+    connect(proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int)));
+    connect(proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int)));
+    if (proc->start(m_Data->runblocked?TDEProcess::Block:TDEProcess::NotifyOnExit,TDEProcess::All)) {
         return;
     } else {
         emit sendNotify(i18n("Resolve-process could not started, check command."));
@@ -2076,7 +2076,7 @@ void SvnActions::slotMergeExternal(const TQString&_src1,const TQString&_src2, co
     }
     TQString edisp = Kdesvnsettings::external_merge_program();
     TQStringList wlist = TQStringList::split(" ",edisp);
-    KProcess*proc = new KProcess();
+    TDEProcess*proc = new TDEProcess();
     for ( TQStringList::Iterator it = wlist.begin();it!=wlist.end();++it) {
         if (*it=="%s1") {
             *proc<<first;
@@ -2088,9 +2088,9 @@ void SvnActions::slotMergeExternal(const TQString&_src1,const TQString&_src2, co
             *proc << *it;
         }
     }
-    connect(proc,TQT_SIGNAL(processExited(KProcess*)),this,TQT_SLOT(procClosed(KProcess*)));
-    connect(proc,TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),this,TQT_SLOT(receivedStderr(KProcess*,char*,int)));
-    if (proc->start(m_Data->runblocked?KProcess::Block:KProcess::NotifyOnExit,KProcess::Stderr)) {
+    connect(proc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(procClosed(TDEProcess*)));
+    connect(proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int)));
+    if (proc->start(m_Data->runblocked?TDEProcess::Block:TDEProcess::NotifyOnExit,TDEProcess::Stderr)) {
         if (!m_Data->runblocked) {
             tdir1.setAutoDelete(false);
             m_Data->m_tempdirlist[proc].append(tdir1.name());
diff --git a/src/svnfrontend/svnactions.h b/src/svnfrontend/svnactions.h
index ded8477..e208181 100644
--- a/src/svnfrontend/svnactions.h
+++ b/src/svnfrontend/svnactions.h
@@ -41,7 +41,7 @@ class KDialog;
 class KDialogBase;
 class TQDialog;
 class CContextListener;
-class KProcess;
+class TDEProcess;
 class SvnActionsData;
 class CheckModifiedThread;
 class CheckUpdatesThread;
@@ -245,11 +245,11 @@ signals:
     void sigCacheStatus(TQ_LONG,TQ_LONG);
 
 protected slots:
-    virtual void wroteStdin(KProcess*);
-    virtual void procClosed(KProcess*);
+    virtual void wroteStdin(TDEProcess*);
+    virtual void procClosed(TDEProcess*);
     virtual void checkModthread();
     virtual void checkUpdateThread();
-    virtual void receivedStderr(KProcess*,char*,int);
+    virtual void receivedStderr(TDEProcess*,char*,int);
 };
 
 #endif
diff --git a/src/svnfrontend/svnfiletip.cpp b/src/svnfrontend/svnfiletip.cpp
index 7f4c857..283e084 100644
--- a/src/svnfrontend/svnfiletip.cpp
+++ b/src/svnfrontend/svnfiletip.cpp
@@ -137,7 +137,7 @@ void SvnFileTip::reposition()
     // 4+: none
     m_corner = 0;
     // should the tooltip be shown to the left or to the right of the ivi ?
-    TQRect desk = KGlobalSettings::desktopGeometry(rect.center());
+    TQRect desk = TDEGlobalSettings::desktopGeometry(rect.center());
     if (rect.center().x() + width() > desk.right())
     {
         // to the left
diff --git a/src/svnfrontend/tdesvnfilelist.cpp b/src/svnfrontend/tdesvnfilelist.cpp
index 46ab4b8..496d958 100644
--- a/src/svnfrontend/tdesvnfilelist.cpp
+++ b/src/svnfrontend/tdesvnfilelist.cpp
@@ -2686,7 +2686,7 @@ void tdesvnfilelist::contentsMouseMoveEvent( TQMouseEvent *e )
                 vp.setY( itemRect( item ).y() );
                 TQRect rect( viewportToContents( vp ), TQSize(20, item->height()) );
                 m_pList->m_fileTip->setItem( static_cast<SvnItem*>(item), rect, item->pixmap(0));
-                m_pList->m_fileTip->setPreview(KGlobalSettings::showFilePreview(item->fullName())/*&&isWorkingCopy()*/
+                m_pList->m_fileTip->setPreview(TDEGlobalSettings::showFilePreview(item->fullName())/*&&isWorkingCopy()*/
                         &&Kdesvnsettings::display_previews_in_file_tips());
                 setShowToolTips(false);
             } else {