TDE
/
tdesvn
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdesvn
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KApplication to TDEApplication to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 201e831d6d
commit 44a28c50e8
13 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File

4
src/askpass/tdesvn-askpass.cpp
Unescape View File

@ -40,9 +40,9 @@ int main(int argc, char** argv)
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
// no need to register with the dcop server // no need to register with the dcop server
KApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
KApplication app; TDEApplication app;
// no need for session management // no need for session management
app.disableSessionManagement(); app.disableSessionManagement();
TQString prompt; TQString prompt;

2
src/ksvnwidgets/diffbrowser.cpp
Unescape View File

@ -95,7 +95,7 @@ void DiffBrowser::saveDiff()
} }
TQFile tfile(saveTo); TQFile tfile(saveTo);
if (tfile.exists()) { if (tfile.exists()) {
if (KMessageBox::warningYesNo(TQT_TQWIDGET(KApplication::activeModalWidget()), if (KMessageBox::warningYesNo(TQT_TQWIDGET(TDEApplication::activeModalWidget()),
i18n("File %1 exists - overwrite?").arg(saveTo)) i18n("File %1 exists - overwrite?").arg(saveTo))
!=KMessageBox::Yes) { !=KMessageBox::Yes) {
return; return;

2
src/main.cpp
Unescape View File

@ -58,7 +58,7 @@ int main(int argc, char **argv)
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
KApplication app; TDEApplication app;
// see if we are starting with session management // see if we are starting with session management
if (app.isRestored()) if (app.isRestored())

4
src/svnfrontend/blamedisplay_impl.cpp
Unescape View File

@ -410,7 +410,7 @@ void BlameDisplay_impl::showCommit(BlameDisplayItem*bit)
} }
} }
KDialogBase* dlg = new KDialogBase( KDialogBase* dlg = new KDialogBase(
TQT_TQWIDGET(KApplication::activeModalWidget()), TQT_TQWIDGET(TDEApplication::activeModalWidget()),
"simplelog",true,TQString(i18n("Logmessage for revision %1").arg(bit->rev())), "simplelog",true,TQString(i18n("Logmessage for revision %1").arg(bit->rev())),
KDialogBase::Close); KDialogBase::Close);
TQWidget* Dialog1Layout = dlg->makeVBoxMainWidget(); 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; int buttons = KDialogBase::Close|KDialogBase::User1|KDialogBase::User2;
KDialogBase * dlg = new KDialogBase( KDialogBase * dlg = new KDialogBase(
TQT_TQWIDGET(KApplication::activeModalWidget()), TQT_TQWIDGET(TDEApplication::activeModalWidget()),
name,true,TQString(i18n("Blame %1")).arg(item),buttons,KDialogBase::Close,false, name,true,TQString(i18n("Blame %1")).arg(item),buttons,KDialogBase::Close,false,
KGuiItem(i18n("Goto line")),KGuiItem(i18n("Log message for revision"),"tdesvnlog")); KGuiItem(i18n("Goto line")),KGuiItem(i18n("Log message for revision"),"tdesvnlog"));

2
src/svnfrontend/commandexec.cpp
Unescape View File

@ -314,7 +314,7 @@ int CommandExec::exec()
if (Kdesvnsettings::self()->cmdline_show_logwindow() && if (Kdesvnsettings::self()->cmdline_show_logwindow() &&
m_lastMessagesLines >= Kdesvnsettings::self()->cmdline_log_minline()) { m_lastMessagesLines >= Kdesvnsettings::self()->cmdline_log_minline()) {
KDialogBase dlg ( KDialogBase dlg (
TQT_TQWIDGET(KApplication::activeModalWidget()), TQT_TQWIDGET(TDEApplication::activeModalWidget()),
"execution_log", "execution_log",
true, true,
i18n("Execution log"), i18n("Execution log"),

2
src/svnfrontend/fillcachethread.cpp
Unescape View File

@ -68,7 +68,7 @@ void FillCacheThread::run()
TQString ex; TQString ex;
svn::cache::ReposLog rl(m_Svnclient,m_what); svn::cache::ReposLog rl(m_Svnclient,m_what);
bool breakit=false; bool breakit=false;
KApplication*k = KApplication::kApplication(); TDEApplication*k = TDEApplication::kApplication();
try { try {
svn::Revision latestCache = rl.latestCachedRev(); svn::Revision latestCache = rl.latestCachedRev();
svn::Revision Head = rl.latestHeadRev(); svn::Revision Head = rl.latestHeadRev();

4
src/svnfrontend/fronthelpers/cursorstack.h
Unescape View File

@ -41,7 +41,7 @@ public:
*/ */
CursorStack(TQt::CursorShape c = TQt::WaitCursor) CursorStack(TQt::CursorShape c = TQt::WaitCursor)
{ {
KApplication::setOverrideCursor(TQCursor(c)); TDEApplication::setOverrideCursor(TQCursor(c));
} }
//! Destructor. //! Destructor.
/*! /*!
@ -49,7 +49,7 @@ public:
*/ */
~CursorStack() ~CursorStack()
{ {
KApplication::restoreOverrideCursor(); TDEApplication::restoreOverrideCursor();
} }
}; };

2
src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp
Unescape View File

@ -50,7 +50,7 @@ void RevisionButtonImpl::askRevision()
Rangeinput_impl*rdlg; Rangeinput_impl*rdlg;
int buttons = KDialogBase::Ok|KDialogBase::Cancel; 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) { if (!dlg) {
return; return;

2
src/svnfrontend/graphtree/revgraphview.cpp
Unescape View File

@ -944,7 +944,7 @@ void RevGraphView::setBasePath(const TQString&_path)
void RevGraphView::slotClientException(const TQString&what) 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" #include "revgraphview.moc"

2
src/svnfrontend/modifiedthread.cpp
Unescape View File

@ -70,7 +70,7 @@ void CheckModifiedThread::run()
} catch (const svn::Exception&e) { } catch (const svn::Exception&e) {
m_ContextListener->contextNotify(e.msg()); m_ContextListener->contextNotify(e.msg());
} }
KApplication*k = KApplication::kApplication(); TDEApplication*k = TDEApplication::kApplication();
if (k) { if (k) {
TQCustomEvent*ev = new TQCustomEvent(EVENT_THREAD_FINISHED); TQCustomEvent*ev = new TQCustomEvent(EVENT_THREAD_FINISHED);
ev->setData((void*)this); ev->setData((void*)this);

6
src/svnfrontend/svnactions.cpp
Unescape View File

@ -252,7 +252,7 @@ template<class T> KDialogBase* SvnActions::createDialog(T**ptr,const TQString&_h
buttons = buttons|KDialogBase::User1; buttons = buttons|KDialogBase::User1;
} }
KDialogBase * dlg = new KDialogBase( KDialogBase * dlg = new KDialogBase(
modal?TQT_TQWIDGET(TQT_TQWIDGET(KApplication::activeModalWidget())):0, // parent modal?TQT_TQWIDGET(TQT_TQWIDGET(TDEApplication::activeModalWidget())):0, // parent
name, // name name, // name
modal, // modal modal, // modal
_head, // caption _head, // caption
@ -483,7 +483,7 @@ void SvnActions::makeLog(const svn::Revision&start,const svn::Revision&end,const
kdDebug()<<"getting logs..."<<endl; kdDebug()<<"getting logs..."<<endl;
svn::SharedPointer<svn::LogEntriesMap> logs = getLog(start,end,peg,which,list_files,limit); svn::SharedPointer<svn::LogEntriesMap> logs = getLog(start,end,peg,which,list_files,limit);
if (!logs) return; 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) { if (need_modal||!m_Data->m_LogDialog) {
m_Data->m_LogDialog=new SvnLogDlgImp(this,0,"logdialog",need_modal); 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*)), 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; 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) { if (need_modal||!m_Data->m_DiffBrowserPtr||!m_Data->m_DiffDialog) {
DiffBrowser*ptr; DiffBrowser*ptr;

6
src/svnfrontend/tdesvnfilelist.cpp
Unescape View File

@ -1041,7 +1041,7 @@ void tdesvnfilelist::slotSelectionChanged()
void tdesvnfilelist::slotClientException(const TQString&what) void tdesvnfilelist::slotClientException(const TQString&what)
{ {
emit sigLogMessage(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; return;
} }
if (i.reposRoot().isEmpty()) { 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 { } else {
sigSwitchUrl(i.reposRoot()); sigSwitchUrl(i.reposRoot());
} }
@ -1150,7 +1150,7 @@ template<class T> KDialogBase* tdesvnfilelist::createDialog(T**ptr,const TQStrin
buttons = buttons|KDialogBase::Help; buttons = buttons|KDialogBase::Help;
} }
KDialogBase * dlg = new KDialogBase( KDialogBase * dlg = new KDialogBase(
TQT_TQWIDGET(TQT_TQWIDGET(KApplication::activeModalWidget())), TQT_TQWIDGET(TQT_TQWIDGET(TDEApplication::activeModalWidget())),
name, name,
true, true,
_head, _head,

8
src/tdesvnview.cpp
Unescape View File

@ -239,7 +239,7 @@ void tdesvnView::slotSettingsChanged()
void tdesvnView::slotCreateRepo() void tdesvnView::slotCreateRepo()
{ {
KDialogBase * dlg = new KDialogBase( KDialogBase * dlg = new KDialogBase(
TQT_TQWIDGET(KApplication::activeModalWidget()), TQT_TQWIDGET(TDEApplication::activeModalWidget()),
"create_repository", "create_repository",
true, true,
i18n("Create new repository"), i18n("Create new repository"),
@ -287,7 +287,7 @@ void tdesvnView::slotCreateRepo()
void tdesvnView::slotHotcopy() void tdesvnView::slotHotcopy()
{ {
KDialogBase * dlg = new KDialogBase( KDialogBase * dlg = new KDialogBase(
TQT_TQWIDGET(KApplication::activeModalWidget()), TQT_TQWIDGET(TDEApplication::activeModalWidget()),
"hotcopy_repository", "hotcopy_repository",
true, true,
i18n("Hotcopy a repository"), i18n("Hotcopy a repository"),
@ -322,7 +322,7 @@ void tdesvnView::slotHotcopy()
void tdesvnView::slotLoaddump() void tdesvnView::slotLoaddump()
{ {
KDialogBase dlg( KDialogBase dlg(
TQT_TQWIDGET(KApplication::activeModalWidget()), TQT_TQWIDGET(TDEApplication::activeModalWidget()),
"hotcopy_repository", "hotcopy_repository",
true, true,
i18n("Hotcopy a repository"), i18n("Hotcopy a repository"),
@ -372,7 +372,7 @@ void tdesvnView::slotLoaddump()
void tdesvnView::slotDumpRepo() void tdesvnView::slotDumpRepo()
{ {
KDialogBase * dlg = new KDialogBase( KDialogBase * dlg = new KDialogBase(
TQT_TQWIDGET(KApplication::activeModalWidget()), TQT_TQWIDGET(TDEApplication::activeModalWidget()),
"dump_repository", "dump_repository",
true, true,
i18n("Dump a repository"), i18n("Dump a repository"),

Write Preview
Loading…
Cancel
Save