diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:23:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:23:32 -0600 |
| commit | 94c9dc38220d50d037075127ad46add8a264ef26 (patch) | |
| tree | af6ba5d26197827dac1b1901895dee7a7b62a9d6 /kbabel/catalogmanager | |
| parent | 479647c43c62fc50302342c8ac50a2fe024b4426 (diff) | |
| download | tdesdk-94c9dc38220d50d037075127ad46add8a264ef26.tar.gz tdesdk-94c9dc38220d50d037075127ad46add8a264ef26.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kbabel/catalogmanager')
| -rw-r--r-- | kbabel/catalogmanager/catalogmanagerapp.h | 2 | ||||
| -rw-r--r-- | kbabel/catalogmanager/libcvs/cvshandler.cpp | 2 | ||||
| -rw-r--r-- | kbabel/catalogmanager/libsvn/svnhandler.cpp | 2 | ||||
| -rw-r--r-- | kbabel/catalogmanager/main.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/kbabel/catalogmanager/catalogmanagerapp.h b/kbabel/catalogmanager/catalogmanagerapp.h index 3f7c0fa8..99e3e97e 100644 --- a/kbabel/catalogmanager/catalogmanagerapp.h +++ b/kbabel/catalogmanager/catalogmanagerapp.h @@ -53,7 +53,7 @@ public: virtual void updatedFile( TQCString url ); }; -class CatalogManagerApp : public KApplication +class CatalogManagerApp : public TDEApplication { public: CatalogManagerApp(); diff --git a/kbabel/catalogmanager/libcvs/cvshandler.cpp b/kbabel/catalogmanager/libcvs/cvshandler.cpp index b0be0345..1cd78410 100644 --- a/kbabel/catalogmanager/libcvs/cvshandler.cpp +++ b/kbabel/catalogmanager/libcvs/cvshandler.cpp @@ -379,7 +379,7 @@ void CVSHandler::processDiff( TQString output ) tmpFile.close(); TQString error; - if ( KApplication::startServiceByName( "Kompare", tmpFile.name(), &error ) ) + if ( TDEApplication::startServiceByName( "Kompare", tmpFile.name(), &error ) ) KMessageBox::error( 0, error ); } diff --git a/kbabel/catalogmanager/libsvn/svnhandler.cpp b/kbabel/catalogmanager/libsvn/svnhandler.cpp index d00c0858..bff097fd 100644 --- a/kbabel/catalogmanager/libsvn/svnhandler.cpp +++ b/kbabel/catalogmanager/libsvn/svnhandler.cpp @@ -487,7 +487,7 @@ void SVNHandler::processDiff( TQString output ) tmpFile.close(); TQString error; - if ( KApplication::startServiceByName( "Kompare", tmpFile.name(), &error ) ) + if ( TDEApplication::startServiceByName( "Kompare", tmpFile.name(), &error ) ) KMessageBox::error( 0, error ); } diff --git a/kbabel/catalogmanager/main.cpp b/kbabel/catalogmanager/main.cpp index d071ecb6..ef17c176 100644 --- a/kbabel/catalogmanager/main.cpp +++ b/kbabel/catalogmanager/main.cpp @@ -61,7 +61,7 @@ CatalogManager *CatalogManagerApp::_view = 0; CatalogManagerApp::CatalogManagerApp() - : KApplication() + : TDEApplication() { kbInterface = new CatalogManagerInterface; _view = 0; @@ -222,7 +222,7 @@ int main(int argc, char **argv) TDECmdLineArgs::addCmdLineOptions( options ); // Add options from other components - KApplication::addCmdLineOptions(); + TDEApplication::addCmdLineOptions(); CatalogManagerApp app; |