summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:24 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:24 -0600
commitdff37d34bfe7faea4801d273ea569eccf7e75c53 (patch)
tree1a21c502569988267643fcbb28e5bf6f1f475426
parente7bc3fffe60a085609ff9dc88bbadb9cffc7f4e4 (diff)
downloadbasket-dff37d34bfe7faea4801d273ea569eccf7e75c53.tar.gz
basket-dff37d34bfe7faea4801d273ea569eccf7e75c53.zip
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
-rw-r--r--kontact_plugin/basket_plugin.cpp2
-rw-r--r--kontact_plugin/uniqueapphandler.cpp4
-rw-r--r--src/application.cpp2
-rw-r--r--src/bnpview.cpp4
-rw-r--r--src/main.cpp10
5 files changed, 11 insertions, 11 deletions
diff --git a/kontact_plugin/basket_plugin.cpp b/kontact_plugin/basket_plugin.cpp
index f20f293..691bc5f 100644
--- a/kontact_plugin/basket_plugin.cpp
+++ b/kontact_plugin/basket_plugin.cpp
@@ -88,7 +88,7 @@ bool BasketPlugin::isRunningStandalone()
void BasketUniqueAppHandler::loadCommandLineOptions()
{
- KCmdLineArgs::addCmdLineOptions(basket_options);
+ TDECmdLineArgs::addCmdLineOptions(basket_options);
}
int BasketUniqueAppHandler::newInstance()
diff --git a/kontact_plugin/uniqueapphandler.cpp b/kontact_plugin/uniqueapphandler.cpp
index 60b5502..a5cb959 100644
--- a/kontact_plugin/uniqueapphandler.cpp
+++ b/kontact_plugin/uniqueapphandler.cpp
@@ -88,12 +88,12 @@ bool UniqueAppHandler::process( const TQCString &fun, const TQByteArray &data,
if ( fun == "newInstance()" ) {
replyType = "int";
- KCmdLineArgs::reset(); // forget options defined by other "applications"
+ TDECmdLineArgs::reset(); // forget options defined by other "applications"
loadCommandLineOptions();
// This bit is duplicated from KUniqueApplication::processDelayed()
TQDataStream ds( data, IO_ReadOnly );
- KCmdLineArgs::loadAppArgs( ds );
+ TDECmdLineArgs::loadAppArgs( ds );
if ( !ds.atEnd() ) { // backwards compatibility
TQCString asn_id;
ds >> asn_id;
diff --git a/src/application.cpp b/src/application.cpp
index 56606e3..825f776 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -42,7 +42,7 @@ int Application::newInstance()
KUniqueApplication::newInstance();
// Open the basket archive or template file supplied as argument:
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (args && args->count() >= 1) {
TQString fileName = TQFile::decodeName(args->arg(args->count() - 1));
if (TQFile::exists(fileName)) {
diff --git a/src/bnpview.cpp b/src/bnpview.cpp
index 9e974d2..48da913 100644
--- a/src/bnpview.cpp
+++ b/src/bnpview.cpp
@@ -137,7 +137,7 @@ void BNPView::lateInit()
*/
if(!isPart())
{
- if (Settings::useSystray() && KCmdLineArgs::parsedArgs() && KCmdLineArgs::parsedArgs()->isSet("start-hidden"))
+ if (Settings::useSystray() && TDECmdLineArgs::parsedArgs() && TDECmdLineArgs::parsedArgs()->isSet("start-hidden"))
if(Global::mainWindow()) Global::mainWindow()->hide();
else if (Settings::useSystray() && kapp->isRestored())
if(Global::mainWindow()) Global::mainWindow()->setShown(!Settings::startDocked());
@@ -2138,7 +2138,7 @@ void BNPView::newBasket()
void BNPView::handleCommandLine()
{
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
/* Custom data folder */
TQCString customDataFolder = args->getOption("data-folder");
diff --git a/src/main.cpp b/src/main.cpp
index 0e291ee..81b73e8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -70,11 +70,11 @@ class Application : public KUniqueApplication
int main(int argc, char *argv[])
{
- // KCmdLineArgs::init will modify argv[0] so we remember it:
+ // TDECmdLineArgs::init will modify argv[0] so we remember it:
const char *argv0 = (argc >= 1 ? argv[0] : "");
- KCmdLineArgs::init(argc, argv, Global::about());
- KCmdLineArgs::addCmdLineOptions(basket_options);
+ TDECmdLineArgs::init(argc, argv, Global::about());
+ TDECmdLineArgs::addCmdLineOptions(basket_options);
KUniqueApplication::addCmdLineOptions();
//KUniqueApplication app;
@@ -86,12 +86,12 @@ int main(int argc, char *argv[])
MainWindow* win = new MainWindow();
Global::bnpView->handleCommandLine();
app.setMainWidget(win);
-// if (!(Settings::useSystray() && KCmdLineArgs::parsedArgs() && KCmdLineArgs::parsedArgs()->isSet("start-hidden")))
+// if (!(Settings::useSystray() && TDECmdLineArgs::parsedArgs() && TDECmdLineArgs::parsedArgs()->isSet("start-hidden")))
// win->show();
if (Settings::useSystray()) {
// The user wanted to not show the window (but it is already hidden by default, so we do nothing):
- if (KCmdLineArgs::parsedArgs() && KCmdLineArgs::parsedArgs()->isSet("start-hidden"))
+ if (TDECmdLineArgs::parsedArgs() && TDECmdLineArgs::parsedArgs()->isSet("start-hidden"))
;
// When the application is restored by KDE session, restore its state:
else if (app.isRestored())