diff options
| author | Timothy Pearson <[email protected]> | 2013-02-06 19:44:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-06 19:44:17 -0600 |
| commit | 5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd (patch) | |
| tree | a5eb4cb7c4754e533de65c5adee17d783e426425 /konqueror/keditbookmarks/kbookmarkmerger.cpp | |
| parent | 98eb308fc180d9bea71f448b262ab796353ac904 (diff) | |
| download | tdebase-5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd.tar.gz tdebase-5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd.zip | |
Rename KCmd 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 1fbcd6c03..6d7357bb6 100644 --- a/konqueror/keditbookmarks/kbookmarkmerger.cpp +++ b/konqueror/keditbookmarks/kbookmarkmerger.cpp @@ -37,10 +37,10 @@ #include <X11/Xlib.h> -static const KCmdLineOptions cmdLineOptions[] = +static const TDECmdLineOptions cmdLineOptions[] = { { "+directory", I18N_NOOP( "Directory to scan for extra bookmarks" ), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; // The code for this function was taken from kdesktop/kcheckrunning.cpp |