From 95e28f5bcadbf0ac052c4f29d77b4ab5e6648d1b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:24:38 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- languages/cpp/app_templates/kapp/app_client.cpp | 2 +- languages/cpp/app_templates/kapp/main.cpp | 2 +- languages/cpp/app_templates/kconfig35/main.cpp | 2 +- languages/cpp/app_templates/kde4app/main.cpp | 2 +- languages/cpp/app_templates/kdedcop/main.cpp | 2 +- languages/cpp/app_templates/khello/main.cpp | 2 +- languages/cpp/app_templates/khello2/main.cpp | 2 +- languages/cpp/app_templates/kmake/app.cpp | 2 +- languages/cpp/app_templates/kpartapp/main.cpp | 2 +- languages/cpp/app_templates/kscons_kmdi/main.cpp | 2 +- languages/cpp/app_templates/kscons_kxt/main.cpp | 2 +- languages/cpp/app_templates/kxt/main.cpp | 2 +- languages/cpp/backgroundparser.cpp | 2 +- languages/cpp/debugger/variablewidget.cpp | 2 +- languages/cpp/doc/kde2book.toc | 6 +++--- languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp | 4 ++-- languages/java/app_templates/kappjava/app.java | 4 ++-- languages/java/app_templates/kappjava/app_client.java | 2 +- languages/java/backgroundparser.cpp | 2 +- languages/php/phpfile.cpp | 2 +- languages/ruby/debugger/variablewidget.cpp | 2 +- 21 files changed, 25 insertions(+), 25 deletions(-) (limited to 'languages') diff --git a/languages/cpp/app_templates/kapp/app_client.cpp b/languages/cpp/app_templates/kapp/app_client.cpp index ecde60fb..4098f8a8 100644 --- a/languages/cpp/app_templates/kapp/app_client.cpp +++ b/languages/cpp/app_templates/kapp/app_client.cpp @@ -7,7 +7,7 @@ int main(int argc, char **argv) { - KApplication app(argc, argv, "%{APPNAMELC}_client", false); + TDEApplication app(argc, argv, "%{APPNAMELC}_client", false); // get our DCOP client and attach so that we may use it DCOPClient *client = app.dcopClient(); diff --git a/languages/cpp/app_templates/kapp/main.cpp b/languages/cpp/app_templates/kapp/main.cpp index cfc877b4..2649e228 100644 --- a/languages/cpp/app_templates/kapp/main.cpp +++ b/languages/cpp/app_templates/kapp/main.cpp @@ -25,7 +25,7 @@ int main(int argc, char **argv) about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; // register ourselves as a dcop client app.dcopClient()->registerAs(app.name(), false); diff --git a/languages/cpp/app_templates/kconfig35/main.cpp b/languages/cpp/app_templates/kconfig35/main.cpp index ac88952e..7927da59 100644 --- a/languages/cpp/app_templates/kconfig35/main.cpp +++ b/languages/cpp/app_templates/kconfig35/main.cpp @@ -24,7 +24,7 @@ int main(int argc, char **argv) about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; // see if we are starting with session management if (app.isRestored()) diff --git a/languages/cpp/app_templates/kde4app/main.cpp b/languages/cpp/app_templates/kde4app/main.cpp index e164ac59..8719e21a 100644 --- a/languages/cpp/app_templates/kde4app/main.cpp +++ b/languages/cpp/app_templates/kde4app/main.cpp @@ -21,7 +21,7 @@ int main(int argc, char **argv) KCmdLineOptions options; options.add("+[URL]", ki18n( "Document to open" )); TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; %{APPNAME} *widget = new %{APPNAME}; diff --git a/languages/cpp/app_templates/kdedcop/main.cpp b/languages/cpp/app_templates/kdedcop/main.cpp index e643ed21..2462c3fe 100644 --- a/languages/cpp/app_templates/kdedcop/main.cpp +++ b/languages/cpp/app_templates/kdedcop/main.cpp @@ -24,7 +24,7 @@ int main(int argc, char **argv) about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; %{APPNAME} *mainWin = 0; if (app.isRestored()) diff --git a/languages/cpp/app_templates/khello/main.cpp b/languages/cpp/app_templates/khello/main.cpp index fb84ad48..2ad5ebcc 100644 --- a/languages/cpp/app_templates/khello/main.cpp +++ b/languages/cpp/app_templates/khello/main.cpp @@ -24,7 +24,7 @@ int main(int argc, char **argv) about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; %{APPNAME} *mainWin = 0; if (app.isRestored()) diff --git a/languages/cpp/app_templates/khello2/main.cpp b/languages/cpp/app_templates/khello2/main.cpp index b50fb446..71d897a4 100644 --- a/languages/cpp/app_templates/khello2/main.cpp +++ b/languages/cpp/app_templates/khello2/main.cpp @@ -24,7 +24,7 @@ int main(int argc, char **argv) about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; %{APPNAME} *mainWin = 0; if (app.isRestored()) diff --git a/languages/cpp/app_templates/kmake/app.cpp b/languages/cpp/app_templates/kmake/app.cpp index d0352538..ba44bf40 100644 --- a/languages/cpp/app_templates/kmake/app.cpp +++ b/languages/cpp/app_templates/kmake/app.cpp @@ -24,7 +24,7 @@ int main(int argc, char **argv) TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); - KApplication app; + TDEApplication app; MainViewImp *widget = new MainViewImp; app.setMainWidget(widget); widget->show(); diff --git a/languages/cpp/app_templates/kpartapp/main.cpp b/languages/cpp/app_templates/kpartapp/main.cpp index ea94c304..81b3e40d 100644 --- a/languages/cpp/app_templates/kpartapp/main.cpp +++ b/languages/cpp/app_templates/kpartapp/main.cpp @@ -23,7 +23,7 @@ int main(int argc, char **argv) about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; // see if we are starting with session management if (app.isRestored()) diff --git a/languages/cpp/app_templates/kscons_kmdi/main.cpp b/languages/cpp/app_templates/kscons_kmdi/main.cpp index ac324166..5795feb9 100644 --- a/languages/cpp/app_templates/kscons_kmdi/main.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/main.cpp @@ -31,7 +31,7 @@ int main(int argc, char **argv) TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; // see if we are starting with session management /*if (app.isRestored()) diff --git a/languages/cpp/app_templates/kscons_kxt/main.cpp b/languages/cpp/app_templates/kscons_kxt/main.cpp index 2fd5430b..9da16af6 100644 --- a/languages/cpp/app_templates/kscons_kxt/main.cpp +++ b/languages/cpp/app_templates/kscons_kxt/main.cpp @@ -24,7 +24,7 @@ int main(int argc, char **argv) about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; // see if we are starting with session management if (app.isRestored()) diff --git a/languages/cpp/app_templates/kxt/main.cpp b/languages/cpp/app_templates/kxt/main.cpp index ac88952e..7927da59 100644 --- a/languages/cpp/app_templates/kxt/main.cpp +++ b/languages/cpp/app_templates/kxt/main.cpp @@ -24,7 +24,7 @@ int main(int argc, char **argv) about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; // see if we are starting with session management if (app.isRestored()) diff --git a/languages/cpp/backgroundparser.cpp b/languages/cpp/backgroundparser.cpp index 668c5599..ab89713f 100644 --- a/languages/cpp/backgroundparser.cpp +++ b/languages/cpp/backgroundparser.cpp @@ -420,7 +420,7 @@ void BackgroundParser::fileParsed( ParsedFile& file ) { m_unitDict.insert( file.fileName(), unit ); - KApplication::postEvent( m_cppSupport, new FileParsedEvent( file.fileName(), unit->problems, m_readFromDisk ) ); + TDEApplication::postEvent( m_cppSupport, new FileParsedEvent( file.fileName(), unit->problems, m_readFromDisk ) ); m_currentFile = TQString(); diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp index 4abbe69b..bc8b7733 100644 --- a/languages/cpp/debugger/variablewidget.cpp +++ b/languages/cpp/debugger/variablewidget.cpp @@ -988,7 +988,7 @@ void VariableTree::keyPressEvent(TQKeyEvent* e) void VariableTree::copyToClipboard(TQListViewItem* item) { - TQClipboard *qb = KApplication::clipboard(); + TQClipboard *qb = TDEApplication::clipboard(); TQString text = item->text( 1 ); qb->setText( text, TQClipboard::Clipboard ); diff --git a/languages/cpp/doc/kde2book.toc b/languages/cpp/doc/kde2book.toc index 8c7325b9..115f0ee9 100644 --- a/languages/cpp/doc/kde2book.toc +++ b/languages/cpp/doc/kde2book.toc @@ -431,7 +431,7 @@ - + @@ -1275,7 +1275,7 @@ - + @@ -2236,7 +2236,7 @@ - + diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp index 0575d254..ae9675d2 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp @@ -41,8 +41,8 @@ TQListBoxItem* TQListBox_selectedItem( TQListBox* cpTQListBox ) SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) : SettingsDialogBase( parent, name, fl ) { - KApplication::kApplication()->dirs()->addResourceType("include","include"); - TQStringList tdedirs=KApplication::kApplication()->dirs()->findDirs("include",""); + TDEApplication::kApplication()->dirs()->addResourceType("include","include"); + TQStringList tdedirs=TDEApplication::kApplication()->dirs()->findDirs("include",""); for( TQStringList::Iterator it=tdedirs.begin(); it!=tdedirs.end(); ++it ) { TQString tdedir = *it; diff --git a/languages/java/app_templates/kappjava/app.java b/languages/java/app_templates/kappjava/app.java index 2cb3e94a..b8a51016 100644 --- a/languages/java/app_templates/kappjava/app.java +++ b/languages/java/app_templates/kappjava/app.java @@ -76,7 +76,7 @@ public void load(KURL url) public void setupActions() { - KApplication kapp = KApplication.kApplication(); + TDEApplication kapp = TDEApplication.kApplication(); KStdAction.openNew(this, SLOT("fileNew()"), actionCollection()); KStdAction.open(this, SLOT("fileOpen()"), actionCollection()); KStdAction.save(this, SLOT("fileSave()"), actionCollection()); @@ -242,7 +242,7 @@ static void main(String[] cmdLineArgs) about.addAuthor( "%{AUTHOR}", null, "%{EMAIL}" ); KCmdLineArgs.init(cmdLineArgs, about); KCmdLineArgs.addCmdLineOptions(options); - KApplication app = new KApplication(); + TDEApplication app = new TDEApplication(); // see if we are starting with session management if (app.isRestored()) diff --git a/languages/java/app_templates/kappjava/app_client.java b/languages/java/app_templates/kappjava/app_client.java index 9ed90c8a..9648cfad 100644 --- a/languages/java/app_templates/kappjava/app_client.java +++ b/languages/java/app_templates/kappjava/app_client.java @@ -9,7 +9,7 @@ int main(int argc, char **argv) { - KApplication app(argc, argv, "%{APPNAMELC}_client", false); + TDEApplication app(argc, argv, "%{APPNAMELC}_client", false); // get our DCOP client and attach so that we may use it DCOPClient *client = app.dcopClient(); diff --git a/languages/java/backgroundparser.cpp b/languages/java/backgroundparser.cpp index b1f23ac3..86b193c8 100644 --- a/languages/java/backgroundparser.cpp +++ b/languages/java/backgroundparser.cpp @@ -269,7 +269,7 @@ Unit* BackgroundParser::parseFile( const TQString& fileName, bool readFromDisk ) if( m_fileList->contains(fileName) ){ kdDebug(9013) << "========================> FILE: " << fileName << " IN QUEUE <=============" << endl; } else { - KApplication::postEvent( m_javaSupport, new FileParsedEvent(fileName, unit->problems) ); + TDEApplication::postEvent( m_javaSupport, new FileParsedEvent(fileName, unit->problems) ); } m_currentFile = TQString(); diff --git a/languages/php/phpfile.cpp b/languages/php/phpfile.cpp index d54028da..29c6ea9b 100644 --- a/languages/php/phpfile.cpp +++ b/languages/php/phpfile.cpp @@ -576,7 +576,7 @@ TQValueList PHPFile::classByName(TQString classname) { */ void PHPFile::postEvent(FileParseEvent *event) { - KApplication::postEvent( m_part, event ); + TDEApplication::postEvent( m_part, event ); usleep(100); } diff --git a/languages/ruby/debugger/variablewidget.cpp b/languages/ruby/debugger/variablewidget.cpp index 3a908348..de60eaea 100644 --- a/languages/ruby/debugger/variablewidget.cpp +++ b/languages/ruby/debugger/variablewidget.cpp @@ -202,7 +202,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) emit removeWatchExpression(((WatchVarItem*)item)->displayId()); delete item; } else if (res == idCopyToClipboard) { - TQClipboard *qb = KApplication::clipboard(); + TQClipboard *qb = TDEApplication::clipboard(); TQString text = "{ \"" + item->text( VAR_NAME_COLUMN ) + "\", " + "\"" + item->text( VALUE_COLUMN ) + "\" }"; -- cgit v1.2.3