From d4eae1867a21f1631dbf5b85a292166185ebfe17 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 6 Feb 2013 19:31:29 -0600 Subject: [PATCH] Rename KCmd to avoid conflicts with KDE4 --- amarok/src/app.cpp | 2 +- amarok/src/collectionscanner/main.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/amarok/src/app.cpp b/amarok/src/app.cpp index 260bdad4..ab4af5a1 100644 --- a/amarok/src/app.cpp +++ b/amarok/src/app.cpp @@ -389,7 +389,7 @@ void App::handleCliArgs() //static void App::initCliArgs( int argc, char *argv[] ) //static { - static KCmdLineOptions options[] = + static TDECmdLineOptions options[] = { { "+[URL(s)]", I18N_NOOP( "Files/URLs to open" ), 0 }, { "r", 0, 0 }, diff --git a/amarok/src/collectionscanner/main.cpp b/amarok/src/collectionscanner/main.cpp index 8cb883eb..b64e0ddb 100644 --- a/amarok/src/collectionscanner/main.cpp +++ b/amarok/src/collectionscanner/main.cpp @@ -37,7 +37,7 @@ int main( int argc, char *argv[] ) I18N_NOOP( "http://amarok.kde.org" ) ); - static KCmdLineOptions options[] = + static TDECmdLineOptions options[] = { { "+Folder(s)", I18N_NOOP( "Folders to scan" ), 0 }, { "r", 0, 0 },