diff options
| -rw-r--r-- | acinclude.m4 | 26 | ||||
| -rw-r--r-- | src/kdiff3.cpp | 4 | ||||
| -rw-r--r-- | src/kdiff3_shell.cpp | 2 | ||||
| -rw-r--r-- | src/kreplacements/kreplacements.cpp | 14 | ||||
| -rw-r--r-- | src/kreplacements/kreplacements.h | 10 | ||||
| -rw-r--r-- | src/main.cpp | 2 |
6 files changed, 29 insertions, 29 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 0c3bc32..220049a 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1979,20 +1979,20 @@ cat > conftest.$ac_ext <<EOF #include <kapp.h> int main() { - printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); - printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); - printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); - printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); - printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); - printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); - printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); - printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); - printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); - printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); + printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data()); + printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data()); + printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data()); + printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data()); + printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data()); + printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data()); + printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data()); + printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data()); + printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data()); + printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data()); printf("kde_wallpaperdir=\\"%s\\"\n", - KApplication::kde_wallpaperdir().data()); - printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); - printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); + TDEApplication::kde_wallpaperdir().data()); + printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data()); + printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data()); printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n"); diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp index b58ddaa..f971081 100644 --- a/src/kdiff3.cpp +++ b/src/kdiff3.cpp @@ -277,7 +277,7 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par m_pDirectoryMergeSplitter = new TQSplitter( m_pMainSplitter ); m_pDirectoryMergeSplitter->setOrientation(Qt::Horizontal ); m_pDirectoryMergeWindow = new DirectoryMergeWindow( m_pDirectoryMergeSplitter, m_pOptionDialog, - KApplication::kApplication()->iconLoader() ); + TDEApplication::kApplication()->iconLoader() ); m_pDirectoryMergeInfo = new DirectoryMergeInfo( m_pDirectoryMergeSplitter ); m_pDirectoryMergeWindow->setDirectoryMergeInfo( m_pDirectoryMergeInfo ); connect( m_pDirectoryMergeWindow, TQT_SIGNAL(startDiffMerge(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDiffStatus*)), @@ -927,7 +927,7 @@ void KDiff3App::slotFileQuit() if( !queryClose() ) return; // Don't quit - KApplication::exit( isFileSaved() ? 0 : 1 ); + TDEApplication::exit( isFileSaved() ? 0 : 1 ); } diff --git a/src/kdiff3_shell.cpp b/src/kdiff3_shell.cpp index cd6f08a..226b6c3 100644 --- a/src/kdiff3_shell.cpp +++ b/src/kdiff3_shell.cpp @@ -119,7 +119,7 @@ void KDiff3Shell::closeEvent(TQCloseEvent*e) { e->accept(); bool bFileSaved = ((KDiff3App*)m_part->widget())->isFileSaved(); - KApplication::exit( bFileSaved ? 0 : 1 ); + TDEApplication::exit( bFileSaved ? 0 : 1 ); } else e->ignore(); diff --git a/src/kreplacements/kreplacements.cpp b/src/kreplacements/kreplacements.cpp index 084faf6..9b20e49 100644 --- a/src/kreplacements/kreplacements.cpp +++ b/src/kreplacements/kreplacements.cpp @@ -978,9 +978,9 @@ bool TDECmdLineArgs::isSet(const TQString& s) } /////////////////// -KApplication* kapp; +TDEApplication* kapp; -KApplication::KApplication() +TDEApplication::TDEApplication() : TQApplication( s_argc,s_argv ) { kapp = this; @@ -1109,22 +1109,22 @@ KApplication::KApplication() } } -KConfig* KApplication::config() +KConfig* TDEApplication::config() { return &m_config; } -bool KApplication::isRestored() +bool TDEApplication::isRestored() { return false; } -KApplication* KApplication::kApplication() +TDEApplication* TDEApplication::kApplication() { return kapp; } -KIconLoader* KApplication::iconLoader() +KIconLoader* TDEApplication::iconLoader() { return &m_iconLoader; } @@ -1150,7 +1150,7 @@ KActionCollection* KParts::Part::actionCollection() return 0; } -KApplication* KParts::Part::instance() +TDEApplication* KParts::Part::instance() { return kapp; } diff --git a/src/kreplacements/kreplacements.h b/src/kreplacements/kreplacements.h index e56f9bd..42993e1 100644 --- a/src/kreplacements/kreplacements.h +++ b/src/kreplacements/kreplacements.h @@ -375,19 +375,19 @@ public: TQPixmap loadIcon(const TQString& name, int); }; -class KApplication : public TQApplication +class TDEApplication : public TQApplication { KConfig m_config; KIconLoader m_iconLoader; public: - KApplication(); - static KApplication* kApplication(); + TDEApplication(); + static TDEApplication* kApplication(); KIconLoader* iconLoader(); KConfig* config(); bool isRestored(); }; -extern KApplication* kapp; +extern TDEApplication* kapp; class KLibFactory : public TQObject { @@ -473,7 +473,7 @@ namespace KParts { public: KActionCollection* actionCollection(); - KApplication* instance(); + TDEApplication* instance(); void setWidget( TQWidget* w ){ m_pWidget=w; } TQWidget* widget(){return m_pWidget;} void setXMLFile(const TQString&){} diff --git a/src/main.cpp b/src/main.cpp index e0c1629..24f44b5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -195,7 +195,7 @@ int main(int argc, char *argv[]) TQStringList ignorableOptions; initialiseCmdLineArgs(vOptions, ignorableOptions); - KApplication app; + TDEApplication app; #ifdef KREPLACEMENTS_H TQString locale; |