Use tdeApprename/tdeapp

Signed-off-by: Michele Calgaro <[email protected]>

13 files changed, 52 insertions, 52 deletions

diff --git a/src/commandline.cpp b/src/commandline.cpp
index 1095590..5068ef3 100644
--- a/src/commandline.cpp
+++ b/src/commandline.cpp
@@ -80,5 +80,5 @@ int CommandLine::exec()
 
 void CommandLineData::displayHelp()
 {
-    kapp->invokeHelp("tdesvn-commandline","tdesvn");
+    tdeApp->invokeHelp("tdesvn-commandline","tdesvn");
 }
diff --git a/src/svnfrontend/fillcachethread.cpp b/src/svnfrontend/fillcachethread.cpp
index 5958928..574c808 100644
--- a/src/svnfrontend/fillcachethread.cpp
+++ b/src/svnfrontend/fillcachethread.cpp
@@ -68,7 +68,7 @@ void FillCacheThread::run()
     TQString ex;
     svn::cache::ReposLog rl(m_Svnclient,m_what);
     bool breakit=false;
-    TDEApplication*k = TDEApplication::kApplication();
+    TDEApplication*k = tdeApp;
     try {
         svn::Revision latestCache = rl.latestCachedRev();
         svn::Revision Head = rl.latestHeadRev();
diff --git a/src/svnfrontend/graphtree/revgraphview.cpp b/src/svnfrontend/graphtree/revgraphview.cpp
index 03c1c91..1a69323 100644
--- a/src/svnfrontend/graphtree/revgraphview.cpp
+++ b/src/svnfrontend/graphtree/revgraphview.cpp
@@ -901,7 +901,7 @@ void RevGraphView::makeCat(GraphTreeLabel*_l)
     }
     svn::Revision tr(it.data().rev);
     TQString tp = _basePath+it.data().name;
-    emit makeCat(tr,tp,it.data().name,tr,kapp->activeModalWidget());
+    emit makeCat(tr,tp,it.data().name,tr,tdeApp->activeModalWidget());
 }
 
 void RevGraphView::makeDiffPrev(GraphTreeLabel*_l)
@@ -931,9 +931,9 @@ void RevGraphView::makeDiff(const TQString&n1,const TQString&n2)
     svn::Revision tr(it.data().rev);
     TQString tp = _basePath+it.data().name;
     if (Kdesvnsettings::tree_diff_rec()) {
-        emit makeRecDiff(sp,sr,tp,tr,kapp->activeModalWidget());
+        emit makeRecDiff(sp,sr,tp,tr,tdeApp->activeModalWidget());
     } else {
-        emit makeNorecDiff(sp,sr,tp,tr,kapp->activeModalWidget());
+        emit makeNorecDiff(sp,sr,tp,tr,tdeApp->activeModalWidget());
     }
 }
 
diff --git a/src/svnfrontend/graphtree/revisiontree.cpp b/src/svnfrontend/graphtree/revisiontree.cpp
index a0c796a..1530a91 100644
--- a/src/svnfrontend/graphtree/revisiontree.cpp
+++ b/src/svnfrontend/graphtree/revisiontree.cpp
@@ -150,7 +150,7 @@ RevisionTree::RevisionTree(svn::Client*aClient,
     unsigned count = 0;
     for (it=m_Data->m_OldHistory.begin();it!=m_Data->m_OldHistory.end();++it) {
         m_Data->progress->progressBar()->setProgress(count);
-        kapp->processEvents();
+        tdeApp->processEvents();
         if (m_Data->progress->wasCancelled()) {
             cancel=true;
             break;
@@ -225,7 +225,7 @@ bool RevisionTree::topDownScan()
     TQString olabel = m_Data->progress->labelText();
     for (long j=m_Data->max_rev;j>=m_Data->min_rev;--j) {
         m_Data->progress->progressBar()->setProgress(m_Data->max_rev-j);
-        kapp->processEvents();
+        tdeApp->processEvents();
         if (m_Data->progress->wasCancelled()) {
             cancel=true;
             break;
@@ -239,7 +239,7 @@ bool RevisionTree::topDownScan()
                 label = i18n("%1<br>Check change entry %2 of %3")
                         .arg(olabel).arg(i).arg(m_Data->m_OldHistory[j].changedPaths.count());
                 m_Data->progress->setLabel(label);
-                kapp->processEvents();
+                tdeApp->processEvents();
             }
             /* find min revision of item */
             if (m_Data->m_OldHistory[j].changedPaths[i].action=='A'&&
@@ -267,7 +267,7 @@ bool RevisionTree::topDownScan()
     /* find forward references and filter them out */
     for (long j=m_Data->max_rev;j>=m_Data->min_rev;--j) {
         m_Data->progress->progressBar()->setProgress(m_Data->max_rev-j);
-        kapp->processEvents();
+        tdeApp->processEvents();
         if (m_Data->progress->wasCancelled()) {
             cancel=true;
             break;
@@ -280,7 +280,7 @@ bool RevisionTree::topDownScan()
                 }
                 label = i18n("%1<br>Check change entry %2 of %3").arg(olabel).arg(i).arg(m_Data->m_OldHistory[j].changedPaths.count());
                 m_Data->progress->setLabel(label);
-                kapp->processEvents();
+                tdeApp->processEvents();
             }
             if (!m_Data->m_OldHistory[j].changedPaths[i].copyFromPath.isEmpty()) {
                 long r = m_Data->m_OldHistory[j].changedPaths[i].copyFromRevision;
@@ -317,7 +317,7 @@ bool RevisionTree::topDownScan()
     m_Data->progress->setLabel(olabel);
     for (long j=m_Data->max_rev;j>=m_Data->min_rev;--j) {
         m_Data->progress->progressBar()->setProgress(m_Data->max_rev-j);
-        kapp->processEvents();
+        tdeApp->processEvents();
         if (m_Data->progress->wasCancelled()) {
             cancel=true;
             break;
@@ -333,7 +333,7 @@ bool RevisionTree::topDownScan()
                 }
                 label = i18n("%1<br>Check change entry %2 of %3").arg(olabel).arg(i).arg(m_Data->m_OldHistory[j].changedPaths.count());
                 m_Data->progress->setLabel(label);
-                kapp->processEvents();
+                tdeApp->processEvents();
             }
             m_Data->m_History[j].addCopyTo(m_Data->m_OldHistory[j].changedPaths[i].path,TQString(),-1,m_Data->m_OldHistory[j].changedPaths[i].action);
         }
@@ -385,7 +385,7 @@ bool RevisionTree::bottomUpScan(long startrev,unsigned recurse,const TQString&_p
     for (long j=startrev;j<=m_Data->max_rev;++j) {
         if (m_Data->m_stopTick.elapsed()>500) {
             m_Data->progress->progressBar()->advance(1);
-            kapp->processEvents();
+            tdeApp->processEvents();
             m_Data->m_stopTick.restart();
         }
         if (m_Data->progress->wasCancelled()) {
diff --git a/src/svnfrontend/modifiedthread.cpp b/src/svnfrontend/modifiedthread.cpp
index ca185b5..74bff8e 100644
--- a/src/svnfrontend/modifiedthread.cpp
+++ b/src/svnfrontend/modifiedthread.cpp
@@ -70,7 +70,7 @@ void CheckModifiedThread::run()
     } catch (const svn::Exception&e) {
         m_ContextListener->contextNotify(e.msg());
     }
-    TDEApplication*k = TDEApplication::kApplication();
+    TDEApplication*k = tdeApp;
     if (k) {
         TQCustomEvent*ev = new TQCustomEvent(EVENT_THREAD_FINISHED);
         ev->setData((void*)this);
diff --git a/src/svnfrontend/stopdlg.cpp b/src/svnfrontend/stopdlg.cpp
index bae5967..1a5b11e 100644
--- a/src/svnfrontend/stopdlg.cpp
+++ b/src/svnfrontend/stopdlg.cpp
@@ -39,7 +39,7 @@ StopDlg::StopDlg(TQObject*listener,TQWidget *parent, const char *name,const TQSt
     ,m_Context(listener),m_MinDuration(1000),mCancelled(false),mShown(false),m_BarShown(false),
     cstack(0)
 {
-    KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
+    KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon());
     m_lastLogLines = 0;
     m_lastLog = "";
 
@@ -102,7 +102,7 @@ StopDlg::~StopDlg()
 void StopDlg::slotAutoShow()
 {
     bool hasDialogs = false;
-    TQWidget * w = kapp->activeModalWidget();
+    TQWidget * w = tdeApp->activeModalWidget();
     if (w && w!=this && w!=parentWidget() ) {
         hasDialogs = true;
     }
@@ -123,7 +123,7 @@ void StopDlg::slotAutoShow()
     m_BarShown=false;
     m_netBarShown=false;
     show();
-    kapp->processEvents();
+    tdeApp->processEvents();
     mShown = true;
     mShowTimer->start(m_MinDuration, true);
 }
@@ -152,7 +152,7 @@ void StopDlg::slotTick()
             m_ProgressBar->setProgress(m_ProgressBar->progress()+1);
         }
         m_StopTick.restart();
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
 }
 
@@ -171,7 +171,7 @@ void StopDlg::slotExtraMessage(const TQString&msg)
         slotAutoShow();
     }
     m_LogWindow->append(msg);
-    kapp->processEvents();
+    tdeApp->processEvents();
 }
 
 void StopDlg::slotNetProgres(long long int current, long long int max)
@@ -193,7 +193,7 @@ void StopDlg::slotNetProgres(long long int current, long long int max)
         }
         m_NetBar->setValue(current);
         m_StopTick.restart();
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
 }
 
diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp
index 9bf18ce..f46abce 100644
--- a/src/svnfrontend/svnactions.cpp
+++ b/src/svnfrontend/svnactions.cpp
@@ -1702,7 +1702,7 @@ bool SvnActions::makeCheckout(const TQString&rUrl,const TQString&tPath,const svn
     }
     if (openIt) {
         if (!_exp) emit sigGotourl(tPath);
-        else kapp->invokeBrowser(tPath);
+        else tdeApp->invokeBrowser(tPath);
     }
     EMIT_FINISHED;
 
diff --git a/src/svnfrontend/svnfiletip.cpp b/src/svnfrontend/svnfiletip.cpp
index f9e66b5..b0abf44 100644
--- a/src/svnfrontend/svnfiletip.cpp
+++ b/src/svnfrontend/svnfiletip.cpp
@@ -218,12 +218,12 @@ void SvnFileTip::setFilter( bool enable )
     if ( enable == m_filter ) return;
 
     if ( enable ) {
-        kapp->installEventFilter( this );
+        tdeApp->installEventFilter( this );
         TQApplication::setGlobalMouseTracking( true );
     }
     else {
         TQApplication::setGlobalMouseTracking( false );
-        kapp->removeEventFilter( this );
+        tdeApp->removeEventFilter( this );
     }
     m_filter = enable;
 }
diff --git a/src/svnfrontend/svnlogdlgimp.cpp b/src/svnfrontend/svnlogdlgimp.cpp
index 2cec8bd..095c6fc 100644
--- a/src/svnfrontend/svnlogdlgimp.cpp
+++ b/src/svnfrontend/svnlogdlgimp.cpp
@@ -580,7 +580,7 @@ void SvnLogDlgImp::slotBlameItem()
         return;
     }
     svn::Revision start(svn::Revision::START);
-    m_Actions->makeBlame(start,k->rev(),_base+k->realName(),kapp->activeModalWidget(),k->rev(),this);
+    m_Actions->makeBlame(start,k->rev(),_base+k->realName(),tdeApp->activeModalWidget(),k->rev(),this);
 }
 
 void SvnLogDlgImp::slotEntriesSelectionChanged()
@@ -618,7 +618,7 @@ void SvnLogDlgImp::slotSingleContext(TQListViewItem*_item, const TQPoint & e, in
     {
         case 101:
         {
-            m_Actions->makeBlame(start,k->rev(),_base+name,kapp->activeModalWidget(),k->rev(),this);
+            m_Actions->makeBlame(start,k->rev(),_base+name,tdeApp->activeModalWidget(),k->rev(),this);
             break;
         }
         case 102:
@@ -628,7 +628,7 @@ void SvnLogDlgImp::slotSingleContext(TQListViewItem*_item, const TQPoint & e, in
         }
         case 103:
         {
-            emit makeCat(k->rev(),_base+source,source,k->rev(),kapp->activeModalWidget());
+            emit makeCat(k->rev(),_base+source,source,k->rev(),tdeApp->activeModalWidget());
         }
         default:
             break;
@@ -654,7 +654,7 @@ void SvnLogDlgImp::slotSingleDoubleClicked(TQListViewItem*_item)
     //svn_revnum_t prev = item->revision()>0?item->revision():k->rev()-1;
     svn::Revision start(svn::Revision::START);
     if (action != "D") {
-        m_Actions->makeBlame(start,k->rev(),_base+name,kapp->activeModalWidget(),k->rev(),this);
+        m_Actions->makeBlame(start,k->rev(),_base+name,tdeApp->activeModalWidget(),k->rev(),this);
     }
 }
 
diff --git a/src/svnfrontend/tcontextlistener.cpp b/src/svnfrontend/tcontextlistener.cpp
index eaa4d14..8e43435 100644
--- a/src/svnfrontend/tcontextlistener.cpp
+++ b/src/svnfrontend/tcontextlistener.cpp
@@ -61,7 +61,7 @@ bool ThreadContextListener::contextGetLogin(const TQString& realm, TQString& use
     TQCustomEvent*ev = new TQCustomEvent(EVENT_THREAD_LOGIN_PROMPT);
     void*t = (void*)&_data;
     ev->setData(t);
-    kapp->postEvent(this,ev);
+    tdeApp->postEvent(this,ev);
     m_Data->m_trustpromptWait.wait(&m_WaitMutex);
     m_WaitMutex.unlock();
     username = _data.user;
@@ -84,7 +84,7 @@ bool ThreadContextListener::contextGetSavedLogin(const TQString & realm,TQString
     TQCustomEvent*ev = new TQCustomEvent(EVENT_THREAD_LOGIN_SAVED);
     void*t = (void*)&_data;
     ev->setData(t);
-    kapp->postEvent(this,ev);
+    tdeApp->postEvent(this,ev);
     m_Data->m_trustpromptWait.wait(&m_WaitMutex);
     m_WaitMutex.unlock();
     username = _data.user;
@@ -103,7 +103,7 @@ bool ThreadContextListener::contextGetLogMessage(TQString& msg,const svn::Commit
     TQCustomEvent*ev = new TQCustomEvent(EVENT_THREAD_LOGMSG_PROMPT);
     void*t = (void*)&log;
     ev->setData(t);
-    kapp->postEvent(this,ev);
+    tdeApp->postEvent(this,ev);
     m_Data->m_trustpromptWait.wait(&m_WaitMutex);
     m_WaitMutex.unlock();
     msg = log.msg;
@@ -120,7 +120,7 @@ bool ThreadContextListener::contextSslClientCertPrompt(TQString& certFile)
     scertf.certfile="";
     TQCustomEvent*ev = new TQCustomEvent(EVENT_THREAD_CERT_SELECT_PROMPT);
     ev->setData((void*)&scertf);
-    kapp->postEvent(this,ev);
+    tdeApp->postEvent(this,ev);
     m_Data->m_trustpromptWait.wait(&m_WaitMutex);
     m_WaitMutex.unlock();
     certFile = scertf.certfile;
@@ -138,7 +138,7 @@ bool ThreadContextListener::contextSslClientCertPwPrompt(TQString& password, con
     scert_data.realm=realm;
     TQCustomEvent*ev = new TQCustomEvent(EVENT_THREAD_CERT_PW_PROMPT);
     ev->setData((void*)&scert_data);
-    kapp->postEvent(this,ev);
+    tdeApp->postEvent(this,ev);
     m_Data->m_trustpromptWait.wait(&m_WaitMutex);
     m_WaitMutex.unlock();
     password = scert_data.password;
@@ -155,7 +155,7 @@ svn::ContextListener::SslServerTrustAnswer ThreadContextListener::contextSslServ
     trust_answer.m_SslTrustAnswer=DONT_ACCEPT;
     trust_answer.m_Trustdata = &data;
     ev->setData((void*)&trust_answer);
-    kapp->postEvent(this,ev);
+    tdeApp->postEvent(this,ev);
     m_Data->m_trustpromptWait.wait(&m_WaitMutex);
     m_WaitMutex.unlock();
     return trust_answer.m_SslTrustAnswer;
@@ -169,7 +169,7 @@ void ThreadContextListener::contextNotify(const TQString&aMsg)
     ThreadContextListenerData::snotify* _notify = new ThreadContextListenerData::snotify();
     _notify->msg = aMsg;
     ev->setData((void*)_notify);
-    kapp->postEvent(this,ev);
+    tdeApp->postEvent(this,ev);
 }
 
 /*!
@@ -194,7 +194,7 @@ void ThreadContextListener::contextProgress(long long int current, long long int
     }
     _notify->msg = msg;
     ev->setData((void*)_notify);
-    kapp->postEvent(this,ev);
+    tdeApp->postEvent(this,ev);
 }
 
 void ThreadContextListener::sendTick()
@@ -205,7 +205,7 @@ void ThreadContextListener::sendTick()
     ThreadContextListenerData::snotify* _notify = new ThreadContextListenerData::snotify();
     _notify->msg = "";
     ev->setData((void*)_notify);
-    kapp->postEvent(this,ev);
+    tdeApp->postEvent(this,ev);
 }
 
 /* methods below may only called from mainthread! (via event) */
diff --git a/src/svnfrontend/tdesvnfilelist.cpp b/src/svnfrontend/tdesvnfilelist.cpp
index d297e7d..3735b76 100644
--- a/src/svnfrontend/tdesvnfilelist.cpp
+++ b/src/svnfrontend/tdesvnfilelist.cpp
@@ -1003,7 +1003,7 @@ void tdesvnfilelist::enableActions()
     }
     temp = filesActions()->action("openwith");
     if (temp) {
-        temp->setEnabled(kapp->authorizeTDEAction("openwith")&&single&&!dir);
+        temp->setEnabled(tdeApp->authorizeTDEAction("openwith")&&single&&!dir);
     }
 
     temp = filesActions()->action("update_log_cache");
@@ -1051,7 +1051,7 @@ void tdesvnfilelist::slotClientException(const TQString&what)
 void tdesvnfilelist::slotNotifyMessage(const TQString&what)
 {
     emit sigLogMessage(what);
-    kapp->processEvents(20);
+    tdeApp->processEvents(20);
 }
 
 void tdesvnfilelist::slotChangeToRepository()
@@ -1268,7 +1268,7 @@ void tdesvnfilelist::refreshCurrentTree()
     if (!item) return;
     //m_pList->stopScan();
     m_pList->m_fileTip->setItem(0);
-    kapp->processEvents();
+    tdeApp->processEvents();
     setUpdatesEnabled(false);
     if (item->fullName()==baseUri()) {
         if (!refreshItem(item)) {
@@ -1297,7 +1297,7 @@ void tdesvnfilelist::refreshCurrent(SvnItem*cur)
         refreshCurrentTree();
         return;
     }
-    kapp->processEvents();
+    tdeApp->processEvents();
     setUpdatesEnabled(false);
     refreshRecursive(cur->fItem());
     setUpdatesEnabled(true);
@@ -1314,7 +1314,7 @@ bool tdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down)
     }
 
     if (!item) return false;
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     FileListViewItemList currentSync;
     currentSync.setAutoDelete(false);
@@ -1658,7 +1658,7 @@ void tdesvnfilelist::contentsDragMoveEvent( TQDragMoveEvent* event)
             cleanHighLighter();
             m_pList->mOldDropHighlighter=tmpRect;
             viewport()->repaint(tmpRect);
-            kapp->processEvents();
+            tdeApp->processEvents();
         }
     }
     if (ok) {
@@ -1793,7 +1793,7 @@ void tdesvnfilelist::slotDropped(TQDropEvent* event,TQListViewItem*item)
         FileListViewItem*which = static_cast<FileListViewItem*>(item);
         clearSelection();
         which->setSelected(true);
-        kapp->processEvents();
+        tdeApp->processEvents();
         tdir = which->fullName();
     } else {
         tdir = baseUri();
@@ -3077,7 +3077,7 @@ void tdesvnfilelist::slotUnfoldTree()
                 }
                 if (t.elapsed()>=200) {
                     sdlg.slotTick();
-                    kapp->processEvents(20);
+                    tdeApp->processEvents(20);
                     t.restart();
                 }
                 ((FileListViewItem*)item)->setOpenNoBlock(true);
diff --git a/src/tdesvn.cpp b/src/tdesvn.cpp
index f90dfb9..6795964 100644
--- a/src/tdesvn.cpp
+++ b/src/tdesvn.cpp
@@ -107,7 +107,7 @@ tdesvn::tdesvn()
         if (TQCString(factory->className())!="cFactory") {
             kdDebug()<<"wrong factory"<<endl;
             KMessageBox::error(this, i18n("Could not find our part"));
-            kapp->quit();
+            tdeApp->quit();
             return;
         }
         cFactory*cfa = static_cast<cFactory*>(factory);
@@ -149,7 +149,7 @@ tdesvn::tdesvn()
             connectActionCollection(m_part->actionCollection());
         } else {
             KMessageBox::error(this, i18n("Could not load the part:\n")+KLibLoader::self()->lastErrorMessage());
-            kapp->quit();
+            tdeApp->quit();
             return;
         }
     }
@@ -158,8 +158,8 @@ tdesvn::tdesvn()
         // if we couldn't find our Part, we exit since the Shell by
         // itself can't do anything useful
         KMessageBox::error(this, i18n("Could not find our part")+TQString(":\n")+KLibLoader::self()->lastErrorMessage());
-        kapp->quit();
-        // we return here, cause kapp->quit() only means "exit the
+        tdeApp->quit();
+        // we return here, cause tdeApp->quit() only means "exit the
         // next time we enter the event loop...
         return;
     }
@@ -224,7 +224,7 @@ void tdesvn::setupActions()
     KStdAction::openNew(this,TQ_SLOT(fileNew()),actionCollection());
     ac = KStdAction::close(this,TQ_SLOT(fileClose()),actionCollection());
     ac->setEnabled(getMemberList()->count()>1);
-    KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
+    KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection());
 
     TDERecentFilesAction*rac = KStdAction::openRecent(this,TQ_SLOT(loadRescent(const KURL&)),actionCollection());
     if (rac)
diff --git a/src/tdesvn_part.cpp b/src/tdesvn_part.cpp
index d123c1b..b336ea4 100644
--- a/src/tdesvn_part.cpp
+++ b/src/tdesvn_part.cpp
@@ -204,11 +204,11 @@ void tdesvnPart::setupActions()
     toggletemp->setChecked(Kdesvnsettings::network_on());
     connect(toggletemp,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotEnableNetwork(bool)));
 
-    kdDebug()<<"Appname = " << (TQString)kapp->instanceName() << endl;
+    kdDebug()<<"Appname = " << (TQString)tdeApp->instanceName() << endl;
 
     TDEAction * t = KStdAction::preferences(this, TQ_SLOT(slotShowSettings()), actionCollection(),"tdesvnpart_pref");
     t->setText(i18n("&Configure %1...").arg("Kdesvn"));
-    if (TQString(kapp->instanceName())!=TQString("tdesvn")) {
+    if (TQString(tdeApp->instanceName())!=TQString("tdesvn")) {
         (void)new TDEAction(i18n("&About tdesvn part"), "tdesvn", 0, this, TQ_SLOT(showAboutApplication()), actionCollection(), "help_about_tdesvnpart");
         (void)new TDEAction(i18n("Tdesvn &Handbook"), "help", 0, this, TQ_SLOT(appHelpActivated()), actionCollection(), "help_tdesvn");
         (void)new TDEAction(i18n("Send Bugreport for tdesvn"), 0, 0, this, TQ_SLOT(reportBug()), actionCollection(), "report_bug");
@@ -334,7 +334,7 @@ void tdesvnPart::showAboutApplication()
  */
 void tdesvnPart::appHelpActivated()
 {
-    kapp->invokeHelp(TQString(), "tdesvn");
+    tdeApp->invokeHelp(TQString(), "tdesvn");
 }