From 4496f1875f98bd6a7a3a0a1ce2c48f0b17320af9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 11 Feb 2013 02:36:38 -0600 Subject: Fix unintended rename --- kcontrol/kicker/applettab_impl.cpp | 2 +- kicker/applets/launcher/CMakeLists.txt | 4 ++-- kicker/applets/launcher/ChangeLog | 8 ++++---- kicker/applets/launcher/Makefile.am | 10 +++++----- kicker/applets/launcher/ToDo | 2 +- kicker/applets/launcher/quictdelauncher.cpp | 18 +++++++++--------- kicker/applets/launcher/quictdelauncher.h | 4 ++-- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp index 50a6b925c..85f582ca4 100644 --- a/kcontrol/kicker/applettab_impl.cpp +++ b/kcontrol/kicker/applettab_impl.cpp @@ -137,7 +137,7 @@ void AppletTab::load( bool useDefaults ) } } else - l_trusted << "clockapplet" << "ksystemtrayapplet" << "krunapplet" << "quictdelauncher" + l_trusted << "clockapplet" << "ksystemtrayapplet" << "krunapplet" << "quicklauncher" << "kminipagerapplet" << "ktaskbarapplet" << "eyesapplet" << "kmixapplet"; for ( TQStringList::Iterator it = available.begin(); it != available.end(); ++it ) diff --git a/kicker/applets/launcher/CMakeLists.txt b/kicker/applets/launcher/CMakeLists.txt index c022762c0..bf5111658 100644 --- a/kicker/applets/launcher/CMakeLists.txt +++ b/kicker/applets/launcher/CMakeLists.txt @@ -26,7 +26,7 @@ link_directories( ##### other data ################################ -install( FILES quictdelauncher.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets ) +install( FILES quicklauncher.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets ) install( FILES launcherapplet.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) @@ -37,7 +37,7 @@ install( FILES launcherapplet.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) tde_add_kpart( launcher_panelapplet AUTOMOC SOURCES - quictdelauncher.skel quictdelauncher.cpp quickbutton.cpp + quicklauncher.skel quicklauncher.cpp quickbutton.cpp quickaddappsmenu.cpp flowgridmanager.cpp popularity.cpp configdlgbase.ui prefs.kcfgc configdlg.cpp LINK diff --git a/kicker/applets/launcher/ChangeLog b/kicker/applets/launcher/ChangeLog index 1144a8c35..b86dbd7aa 100644 --- a/kicker/applets/launcher/ChangeLog +++ b/kicker/applets/launcher/ChangeLog @@ -4,9 +4,9 @@ * Empty panel now has size>0, so user can still drop icons on it. * Fixed gcc 3.4 incompatibilities in EasyVector * Fixed Drag and Drop Bugs : - * Crash when non-url dropped on quictdelauncher - * Crash panel button dropped on quictdelauncher - * Able to drop objects when quictdelauncher is locked + * Crash when non-url dropped on quicklauncher + * Crash panel button dropped on quicklauncher + * Able to drop objects when quicklauncher is locked * Add application context menu now inserts new app at current location 2004-06-14 Dan Bullok @@ -28,7 +28,7 @@ * Spouts tons of debugging info to kdDebug (for now). 2004-06-12 Dan Bullok - * Fixed bug #75351: Tooltips change to filenames after rearranging applications in quictdelauncher. + * Fixed bug #75351: Tooltips change to filenames after rearranging applications in quicklauncher. * Moved the URL->(menuID,service,kurl) functionality from the QuickButton constructor to its own class: QuickURL. Very similar code is used elsewhere in kicker, and should eventually be merged. * Renamed some methods in QuickButton (getId -> menuId, getURL -> url) This matches the predominant KDE naming style. * Groundwork laid for variable-sized buttons. diff --git a/kicker/applets/launcher/Makefile.am b/kicker/applets/launcher/Makefile.am index 1e586e0dd..a0384df4f 100644 --- a/kicker/applets/launcher/Makefile.am +++ b/kicker/applets/launcher/Makefile.am @@ -3,13 +3,13 @@ INCLUDES = -I$(top_srcdir)/kicker/libkicker -I$(top_srcdir)/kicker/kicker/ui $(a kde_module_LTLIBRARIES = launcher_panelapplet.la -launcher_panelapplet_la_SOURCES = quictdelauncher.skel quictdelauncher.cpp quickbutton.cpp quickaddappsmenu.cpp flowgridmanager.cpp popularity.cpp configdlgbase.ui prefs.kcfgc configdlg.cpp +launcher_panelapplet_la_SOURCES = quicklauncher.skel quicklauncher.cpp quickbutton.cpp quickaddappsmenu.cpp flowgridmanager.cpp popularity.cpp configdlgbase.ui prefs.kcfgc configdlg.cpp METASOURCES = AUTO -noinst_HEADERS = quictdelauncher.h quickbutton.h quickaddappsmenu.h easyvector.h quickbuttongroup.h flowgridmanager.h popularity.h configdlg.h +noinst_HEADERS = quicklauncher.h quickbutton.h quickaddappsmenu.h easyvector.h quickbuttongroup.h flowgridmanager.h popularity.h configdlg.h lnkdir = $(kde_datadir)/kicker/applets -lnk_DATA = quictdelauncher.desktop +lnk_DATA = quicklauncher.desktop EXTRA_DIST = $(lnk_DATA) @@ -21,7 +21,7 @@ launcher_panelapplet_la_LIBADD = ../../kicker/core/libkicker_core.la ../../kick kde_kcfg_DATA = launcherapplet.kcfg messages: rc.cpp - $(XGETTEXT) *.cpp *.h -o $(podir)/quictdelauncher.pot + $(XGETTEXT) *.cpp *.h -o $(podir)/quicklauncher.pot srcdoc: - kdoc -a -p -H -d $$HOME/web/src/quictdelauncher quictdelauncher *.h -lqt -ltdecore -ltdeui + kdoc -a -p -H -d $$HOME/web/src/quicklauncher quicklauncher *.h -lqt -ltdecore -ltdeui diff --git a/kicker/applets/launcher/ToDo b/kicker/applets/launcher/ToDo index 1f3932b08..c7c852a36 100644 --- a/kicker/applets/launcher/ToDo +++ b/kicker/applets/launcher/ToDo @@ -3,6 +3,6 @@ TODO: x * Remove debugging code (makes everything slow). * Tooltip or other popup to alert user that buttons are locked (with a "don't show this again" checkbox). * Docs. - * Use old quictdelauncher config file if found. #77959 + * Use old quicklauncher config file if found. #77959 X * "Add application" context menu should add the new application at the index of the button that summoned the context menu. X * Make sure to always have a little space to drop things on, even when there are no buttons. diff --git a/kicker/applets/launcher/quictdelauncher.cpp b/kicker/applets/launcher/quictdelauncher.cpp index 1ba3544ab..40cbd0715 100644 --- a/kicker/applets/launcher/quictdelauncher.cpp +++ b/kicker/applets/launcher/quictdelauncher.cpp @@ -52,7 +52,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "configdlg.h" #include "popularity.h" -#include "quictdelauncher.h" +#include "quicklauncher.h" #include "quickbutton.h" #include "quickaddappsmenu.h" #include "quickbuttongroup.h" @@ -71,10 +71,10 @@ extern "C" { KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { - TDEGlobal::locale()->insertCatalogue("quictdelauncher"); + TDEGlobal::locale()->insertCatalogue("quicklauncher"); return new QuickLauncher(configFile, KPanelApplet::Normal, KPanelApplet::Preferences, - parent, "quictdelauncher"); + parent, "quicklauncher"); } } @@ -107,7 +107,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions, m_oldButtons = 0; m_dragButtons = 0; - m_configAction = new TDEAction(i18n("Configure Quictdelauncher..."), "configure", TDEShortcut(), + m_configAction = new TDEAction(i18n("Configure Quicklauncher..."), "configure", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), TQT_TQOBJECT(this)); m_saveTimer = new TQTimer(this, "m_saveTimer"); @@ -135,7 +135,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions, "QuickLauncherApplet", "serviceStartedByStorageId(TQString,TQString)", false); - kdDebug() << "Quictdelauncher registered DCOP signal" << endl; + kdDebug() << "Quicklauncher registered DCOP signal" << endl; } @@ -143,7 +143,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions, QuickLauncher::~QuickLauncher() { - TDEGlobal::locale()->removeCatalogue("quictdelauncher"); + TDEGlobal::locale()->removeCatalogue("quicklauncher"); setCustomMenu(0); delete m_popup; delete m_appletPopup; @@ -496,7 +496,7 @@ void QuickLauncher::addAppBeforeManually(TQString url, TQString sender) void QuickLauncher::about() { - TDEAboutData about("quictdelauncher", I18N_NOOP("Quick Launcher"), "2.0", + TDEAboutData about("quicklauncher", I18N_NOOP("Quick Launcher"), "2.0", I18N_NOOP("A simple application launcher"), TDEAboutData::License_GPL_V2, "(C) 2000 Bill Nagel\n(C) 2004 Dan Bullok\n(C) 2005 Fred Schaettgen"); @@ -949,7 +949,7 @@ void QuickLauncher::serviceStartedByStorageId(TQString /*starter*/, TQString sto QuickURL url = QuickURL(locate("apps", service->desktopEntryPath())); TQString desktopMenuId(url.menuId()); kdDebug() << "storageId=" << storageId << " desktopURL=" << desktopMenuId << endl; - // A service was started somwhere else. If the quictdelauncher contains + // A service was started somwhere else. If the quicklauncher contains // this service too, we flash the icon QuickButton *startedButton = 0; std::set buttonIdSet; @@ -1127,4 +1127,4 @@ void QuickLauncher::positionChange(Position) } -#include "quictdelauncher.moc" +#include "quicklauncher.moc" diff --git a/kicker/applets/launcher/quictdelauncher.h b/kicker/applets/launcher/quictdelauncher.h index 71bd1c841..2c47b602a 100644 --- a/kicker/applets/launcher/quictdelauncher.h +++ b/kicker/applets/launcher/quictdelauncher.h @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#ifndef __quictdelauncher_h__ -#define __quictdelauncher_h__ +#ifndef __quicklauncher_h__ +#define __quicklauncher_h__ #include #include -- cgit v1.2.3