From 160c6c9343635d787a339d498b49a16bdb48a3ad Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 6 Feb 2013 19:37:45 -0600 Subject: [PATCH] Rename KCmd to avoid conflicts with KDE4 --- ChangeLog | 2 +- krusader/GUI/kcmdline.h | 2 +- krusader/main.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4b0a8b6..d55c01a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -945,7 +945,7 @@ FIXED: more freedom to give FTP proxy URL-s in "New FTP Connection" menu FIXED: crash at ftp://user@server@proxy:port FTP URL-s FIXED: no parent directory at tar://... and zip://... URL-s - FIXED: font size problems in KCmdLine and KrMaskChoice + FIXED: font size problems in TDECmdLine and KrMaskChoice FIXED: internal editor quits without notification even if the edited file was not saved FIXED: no i18n for Name, Ext, Size, Modified diff --git a/krusader/GUI/kcmdline.h b/krusader/GUI/kcmdline.h index 15cb6a4..c8d2bb5 100644 --- a/krusader/GUI/kcmdline.h +++ b/krusader/GUI/kcmdline.h @@ -82,7 +82,7 @@ class KCMDLine : public TQWidget, KrActionBase { signals: void signalRun(); public slots: - inline void setFocus() { cmdLine->setFocus(); } // overloaded for KCmdLine + inline void setFocus() { cmdLine->setFocus(); } // overloaded for TDECmdLine void slotReturnFocus(); // returns keyboard focus to panel void slotRun(); void addPlaceholder(); diff --git a/krusader/main.cpp b/krusader/main.cpp index c459297..53ff75e 100644 --- a/krusader/main.cpp +++ b/krusader/main.cpp @@ -51,7 +51,7 @@ static const char *description = I18N_NOOP("Krusader\nTwin-Panel File Manager for TDE"); // INSERT A DESCRIPTION FOR YOUR APPLICATION HERE -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "left ", I18N_NOOP("Start left panel at "), 0}, { "right ", I18N_NOOP("Start right panel at "), 0},