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 /konqueror/keditbookmarks/kbookmarkmerger.cpp | |
| parent | d41050ea3f6904e5156d35f664346b816b9e4d12 (diff) | |
| download | tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/keditbookmarks/kbookmarkmerger.cpp')
| -rw-r--r-- | konqueror/keditbookmarks/kbookmarkmerger.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/konqueror/keditbookmarks/kbookmarkmerger.cpp b/konqueror/keditbookmarks/kbookmarkmerger.cpp index bea3c0e26..b5dfe553f 100644 --- a/konqueror/keditbookmarks/kbookmarkmerger.cpp +++ b/konqueror/keditbookmarks/kbookmarkmerger.cpp @@ -70,9 +70,9 @@ int main( int argc, char**argv ) TDECmdLineArgs::addCmdLineOptions( cmdLineOptions ); if ( !kdeRunning ) { - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); } - KApplication app( false, false ); + TDEApplication app( false, false ); app.disableSessionManagement(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); |