diff options
author | Timothy Pearson <[email protected]> | 2013-01-20 00:17:06 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-20 00:17:06 -0600 |
commit | e4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch) | |
tree | 8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /konqueror/keditbookmarks/main.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/main.cpp')
-rw-r--r-- | konqueror/keditbookmarks/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp index b99313159..50b7d2046 100644 --- a/konqueror/keditbookmarks/main.cpp +++ b/konqueror/keditbookmarks/main.cpp @@ -83,7 +83,7 @@ static void continueInWindow(TQString _wname) { } // TODO - make this register() or something like that and move dialog into main -static int askUser(KApplication &app, TQString filename, bool &readonly) { +static int askUser(TDEApplication &app, TQString filename, bool &readonly) { TQCString requestedName("keditbookmarks"); if (!filename.isEmpty()) @@ -122,7 +122,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { aboutData.addAuthor("Alexander Kellett", I18N_NOOP("Author"), "[email protected]"); TDECmdLineArgs::init(argc, argv, &aboutData); - KApplication::addCmdLineOptions(); + TDEApplication::addCmdLineOptions(); TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); @@ -133,8 +133,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { bool browser = args->isSet("browser"); - KApplication::disableAutoDcopRegistration(); - KApplication app(isGui, isGui); + TDEApplication::disableAutoDcopRegistration(); + TDEApplication app(isGui, isGui); bool gotArg = (args->count() == 1); |