diff options
-rw-r--r-- | src/askpass/tdesvn-askpass.cpp | 4 | ||||
-rw-r--r-- | src/ksvnwidgets/diffbrowser.cpp | 2 | ||||
-rw-r--r-- | src/main.cpp | 2 | ||||
-rw-r--r-- | src/svnfrontend/blamedisplay_impl.cpp | 4 | ||||
-rw-r--r-- | src/svnfrontend/commandexec.cpp | 2 | ||||
-rw-r--r-- | src/svnfrontend/fillcachethread.cpp | 2 | ||||
-rw-r--r-- | src/svnfrontend/fronthelpers/cursorstack.h | 4 | ||||
-rw-r--r-- | src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp | 2 | ||||
-rw-r--r-- | src/svnfrontend/graphtree/revgraphview.cpp | 2 | ||||
-rw-r--r-- | src/svnfrontend/modifiedthread.cpp | 2 | ||||
-rw-r--r-- | src/svnfrontend/svnactions.cpp | 6 | ||||
-rw-r--r-- | src/svnfrontend/tdesvnfilelist.cpp | 6 | ||||
-rw-r--r-- | src/tdesvnview.cpp | 8 |
13 files changed, 23 insertions, 23 deletions
diff --git a/src/askpass/tdesvn-askpass.cpp b/src/askpass/tdesvn-askpass.cpp index d717d9e..2f045a0 100644 --- a/src/askpass/tdesvn-askpass.cpp +++ b/src/askpass/tdesvn-askpass.cpp @@ -40,9 +40,9 @@ int main(int argc, char** argv) TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); // no need to register with the dcop server - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); - KApplication app; + TDEApplication app; // no need for session management app.disableSessionManagement(); TQString prompt; diff --git a/src/ksvnwidgets/diffbrowser.cpp b/src/ksvnwidgets/diffbrowser.cpp index 9671147..5e71787 100644 --- a/src/ksvnwidgets/diffbrowser.cpp +++ b/src/ksvnwidgets/diffbrowser.cpp @@ -95,7 +95,7 @@ void DiffBrowser::saveDiff() } TQFile tfile(saveTo); if (tfile.exists()) { - if (KMessageBox::warningYesNo(TQT_TQWIDGET(KApplication::activeModalWidget()), + if (KMessageBox::warningYesNo(TQT_TQWIDGET(TDEApplication::activeModalWidget()), i18n("File %1 exists - overwrite?").arg(saveTo)) !=KMessageBox::Yes) { return; diff --git a/src/main.cpp b/src/main.cpp index a2f0156..81cf3d2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -58,7 +58,7 @@ int main(int argc, char **argv) TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; // see if we are starting with session management if (app.isRestored()) diff --git a/src/svnfrontend/blamedisplay_impl.cpp b/src/svnfrontend/blamedisplay_impl.cpp index dc2f028..873d9c1 100644 --- a/src/svnfrontend/blamedisplay_impl.cpp +++ b/src/svnfrontend/blamedisplay_impl.cpp @@ -410,7 +410,7 @@ void BlameDisplay_impl::showCommit(BlameDisplayItem*bit) } } KDialogBase* dlg = new KDialogBase( - TQT_TQWIDGET(KApplication::activeModalWidget()), + TQT_TQWIDGET(TDEApplication::activeModalWidget()), "simplelog",true,TQString(i18n("Logmessage for revision %1").arg(bit->rev())), KDialogBase::Close); TQWidget* Dialog1Layout = dlg->makeVBoxMainWidget(); @@ -446,7 +446,7 @@ void BlameDisplay_impl::displayBlame(SimpleLogCb*_cb,const TQString&item,const s { int buttons = KDialogBase::Close|KDialogBase::User1|KDialogBase::User2; KDialogBase * dlg = new KDialogBase( - TQT_TQWIDGET(KApplication::activeModalWidget()), + TQT_TQWIDGET(TDEApplication::activeModalWidget()), name,true,TQString(i18n("Blame %1")).arg(item),buttons,KDialogBase::Close,false, KGuiItem(i18n("Goto line")),KGuiItem(i18n("Log message for revision"),"tdesvnlog")); diff --git a/src/svnfrontend/commandexec.cpp b/src/svnfrontend/commandexec.cpp index 45e4850..8252874 100644 --- a/src/svnfrontend/commandexec.cpp +++ b/src/svnfrontend/commandexec.cpp @@ -314,7 +314,7 @@ int CommandExec::exec() if (Kdesvnsettings::self()->cmdline_show_logwindow() && m_lastMessagesLines >= Kdesvnsettings::self()->cmdline_log_minline()) { KDialogBase dlg ( - TQT_TQWIDGET(KApplication::activeModalWidget()), + TQT_TQWIDGET(TDEApplication::activeModalWidget()), "execution_log", true, i18n("Execution log"), diff --git a/src/svnfrontend/fillcachethread.cpp b/src/svnfrontend/fillcachethread.cpp index 92c805e..9f00cdc 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; - KApplication*k = KApplication::kApplication(); + TDEApplication*k = TDEApplication::kApplication(); try { svn::Revision latestCache = rl.latestCachedRev(); svn::Revision Head = rl.latestHeadRev(); diff --git a/src/svnfrontend/fronthelpers/cursorstack.h b/src/svnfrontend/fronthelpers/cursorstack.h index cadad9b..ba69612 100644 --- a/src/svnfrontend/fronthelpers/cursorstack.h +++ b/src/svnfrontend/fronthelpers/cursorstack.h @@ -41,7 +41,7 @@ public: */ CursorStack(TQt::CursorShape c = TQt::WaitCursor) { - KApplication::setOverrideCursor(TQCursor(c)); + TDEApplication::setOverrideCursor(TQCursor(c)); } //! Destructor. /*! @@ -49,7 +49,7 @@ public: */ ~CursorStack() { - KApplication::restoreOverrideCursor(); + TDEApplication::restoreOverrideCursor(); } }; diff --git a/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp b/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp index 7e5949b..e157153 100644 --- a/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp +++ b/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp @@ -50,7 +50,7 @@ void RevisionButtonImpl::askRevision() Rangeinput_impl*rdlg; int buttons = KDialogBase::Ok|KDialogBase::Cancel; - KDialogBase * dlg = new KDialogBase(TQT_TQWIDGET(KApplication::activeModalWidget()),"Revinput",true,i18n("Select revision"),buttons); + KDialogBase * dlg = new KDialogBase(TQT_TQWIDGET(TDEApplication::activeModalWidget()),"Revinput",true,i18n("Select revision"),buttons); if (!dlg) { return; diff --git a/src/svnfrontend/graphtree/revgraphview.cpp b/src/svnfrontend/graphtree/revgraphview.cpp index 3099689..494c73a 100644 --- a/src/svnfrontend/graphtree/revgraphview.cpp +++ b/src/svnfrontend/graphtree/revgraphview.cpp @@ -944,7 +944,7 @@ void RevGraphView::setBasePath(const TQString&_path) void RevGraphView::slotClientException(const TQString&what) { - KMessageBox::sorry(TQT_TQWIDGET(KApplication::activeModalWidget()),what,i18n("SVN Error")); + KMessageBox::sorry(TQT_TQWIDGET(TDEApplication::activeModalWidget()),what,i18n("SVN Error")); } #include "revgraphview.moc" diff --git a/src/svnfrontend/modifiedthread.cpp b/src/svnfrontend/modifiedthread.cpp index bebff23..8797021 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()); } - KApplication*k = KApplication::kApplication(); + TDEApplication*k = TDEApplication::kApplication(); if (k) { TQCustomEvent*ev = new TQCustomEvent(EVENT_THREAD_FINISHED); ev->setData((void*)this); diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp index a44dc25..729a8b9 100644 --- a/src/svnfrontend/svnactions.cpp +++ b/src/svnfrontend/svnactions.cpp @@ -252,7 +252,7 @@ template<class T> KDialogBase* SvnActions::createDialog(T**ptr,const TQString&_h buttons = buttons|KDialogBase::User1; } KDialogBase * dlg = new KDialogBase( - modal?TQT_TQWIDGET(TQT_TQWIDGET(KApplication::activeModalWidget())):0, // parent + modal?TQT_TQWIDGET(TQT_TQWIDGET(TDEApplication::activeModalWidget())):0, // parent name, // name modal, // modal _head, // caption @@ -483,7 +483,7 @@ void SvnActions::makeLog(const svn::Revision&start,const svn::Revision&end,const kdDebug()<<"getting logs..."<<endl; svn::SharedPointer<svn::LogEntriesMap> logs = getLog(start,end,peg,which,list_files,limit); if (!logs) return; - bool need_modal = m_Data->runblocked||TQT_TQWIDGET(KApplication::activeModalWidget())!=0; + bool need_modal = m_Data->runblocked||TQT_TQWIDGET(TDEApplication::activeModalWidget())!=0; if (need_modal||!m_Data->m_LogDialog) { m_Data->m_LogDialog=new SvnLogDlgImp(this,0,"logdialog",need_modal); connect(m_Data->m_LogDialog,TQT_SIGNAL(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)), @@ -1356,7 +1356,7 @@ void SvnActions::dispDiff(const TQByteArray&ex) } delete proc; } - bool need_modal = m_Data->runblocked||TQT_TQWIDGET(KApplication::activeModalWidget())!=0; + bool need_modal = m_Data->runblocked||TQT_TQWIDGET(TDEApplication::activeModalWidget())!=0; if (need_modal||!m_Data->m_DiffBrowserPtr||!m_Data->m_DiffDialog) { DiffBrowser*ptr; diff --git a/src/svnfrontend/tdesvnfilelist.cpp b/src/svnfrontend/tdesvnfilelist.cpp index bd0d345..46ab4b8 100644 --- a/src/svnfrontend/tdesvnfilelist.cpp +++ b/src/svnfrontend/tdesvnfilelist.cpp @@ -1041,7 +1041,7 @@ void tdesvnfilelist::slotSelectionChanged() void tdesvnfilelist::slotClientException(const TQString&what) { emit sigLogMessage(what); - KMessageBox::sorry(TQT_TQWIDGET(KApplication::activeModalWidget()),what,i18n("SVN Error")); + KMessageBox::sorry(TQT_TQWIDGET(TDEApplication::activeModalWidget()),what,i18n("SVN Error")); } @@ -1067,7 +1067,7 @@ void tdesvnfilelist::slotChangeToRepository() return; } if (i.reposRoot().isEmpty()) { - KMessageBox::sorry(TQT_TQWIDGET(KApplication::activeModalWidget()),i18n("Could not retrieve repository of working copy."),i18n("SVN Error")); + KMessageBox::sorry(TQT_TQWIDGET(TDEApplication::activeModalWidget()),i18n("Could not retrieve repository of working copy."),i18n("SVN Error")); } else { sigSwitchUrl(i.reposRoot()); } @@ -1150,7 +1150,7 @@ template<class T> KDialogBase* tdesvnfilelist::createDialog(T**ptr,const TQStrin buttons = buttons|KDialogBase::Help; } KDialogBase * dlg = new KDialogBase( - TQT_TQWIDGET(TQT_TQWIDGET(KApplication::activeModalWidget())), + TQT_TQWIDGET(TQT_TQWIDGET(TDEApplication::activeModalWidget())), name, true, _head, diff --git a/src/tdesvnview.cpp b/src/tdesvnview.cpp index 57313a1..a4787c8 100644 --- a/src/tdesvnview.cpp +++ b/src/tdesvnview.cpp @@ -239,7 +239,7 @@ void tdesvnView::slotSettingsChanged() void tdesvnView::slotCreateRepo() { KDialogBase * dlg = new KDialogBase( - TQT_TQWIDGET(KApplication::activeModalWidget()), + TQT_TQWIDGET(TDEApplication::activeModalWidget()), "create_repository", true, i18n("Create new repository"), @@ -287,7 +287,7 @@ void tdesvnView::slotCreateRepo() void tdesvnView::slotHotcopy() { KDialogBase * dlg = new KDialogBase( - TQT_TQWIDGET(KApplication::activeModalWidget()), + TQT_TQWIDGET(TDEApplication::activeModalWidget()), "hotcopy_repository", true, i18n("Hotcopy a repository"), @@ -322,7 +322,7 @@ void tdesvnView::slotHotcopy() void tdesvnView::slotLoaddump() { KDialogBase dlg( - TQT_TQWIDGET(KApplication::activeModalWidget()), + TQT_TQWIDGET(TDEApplication::activeModalWidget()), "hotcopy_repository", true, i18n("Hotcopy a repository"), @@ -372,7 +372,7 @@ void tdesvnView::slotLoaddump() void tdesvnView::slotDumpRepo() { KDialogBase * dlg = new KDialogBase( - TQT_TQWIDGET(KApplication::activeModalWidget()), + TQT_TQWIDGET(TDEApplication::activeModalWidget()), "dump_repository", true, i18n("Dump a repository"), |