diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:17:06 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:17:06 -0600 |
| commit | e4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch) | |
| tree | 8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /tdm/kfrontend/krootimage.cpp | |
| parent | d41050ea3f6904e5156d35f664346b816b9e4d12 (diff) | |
| download | tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'tdm/kfrontend/krootimage.cpp')
| -rw-r--r-- | tdm/kfrontend/krootimage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tdm/kfrontend/krootimage.cpp b/tdm/kfrontend/krootimage.cpp index 69faf2d7c..baf3b3699 100644 --- a/tdm/kfrontend/krootimage.cpp +++ b/tdm/kfrontend/krootimage.cpp @@ -48,7 +48,7 @@ static Atom prop_root; static bool properties_inited = false; MyApplication::MyApplication( const char *conf ) - : KApplication(), + : TDEApplication(), renderer( 0, new KSimpleConfig( TQFile::decodeName( conf ) ) ) { connect( &timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) ); @@ -115,7 +115,7 @@ MyApplication::slotTimeout() int main( int argc, char *argv[] ) { - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); KLocale::setMainCatalogue( "kdesktop" ); TDECmdLineArgs::init( argc, argv, "krootimage", I18N_NOOP( "KRootImage" ), description, version ); |