From kde-commits Sat Aug 20 18:26:44 2005 From: Matt Broadstone Date: Sat, 20 Aug 2005 18:26:44 +0000 To: kde-commits Subject: KDE/kdebase/kicker/kicker Message-Id: <1124562404.835762.30717.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=112456244332248 SVN commit 451454 by mbroadst: EM the() to self(), other cleanups.. M +5 -5 core/container_extension.cpp M +3 -5 core/extensionmanager.cpp M +1 -1 core/extensionmanager.h M +4 -4 core/kicker.cpp M +5 -5 core/panelextension.cpp M +1 -2 core/pluginmanager.cpp M +1 -1 ui/addextension_mnu.cpp M +3 -3 ui/removeextension_mnu.cpp --- trunk/KDE/kdebase/kicker/kicker/core/container_extension.cpp #451453:451454 @@ -96,7 +96,7 @@ _rbHB(0), m_extension(0), m_maintainFocus(0), - m_panelOrder(ExtensionManager::the()->nextPanelOrder()) + m_panelOrder(ExtensionManager::self()->nextPanelOrder()) { // now actually try to load the extension m_extension = PluginManager::the()->loadExtension(info, this); @@ -120,7 +120,7 @@ _rbHB(0), m_extension(extension), m_maintainFocus(0), - m_panelOrder(ExtensionManager::the()->nextPanelOrder()) + m_panelOrder(ExtensionManager::self()->nextPanelOrder()) { m_extension->reparent(this, QPoint(0, 0)); init(); @@ -171,7 +171,7 @@ _userHidden = static_cast(tmp); } - m_extension->setPosition(ExtensionManager::the()->initialPanelPosition(m_extension->preferredPosition())); + m_extension->setPosition(ExtensionManager::self()->initialPanelPosition(m_extension->preferredPosition())); connect(m_extension, SIGNAL(updateLayout()), SLOT(updateLayout())); connect(m_extension, SIGNAL(maintainFocus(bool)), SLOT(maintainFocus(bool))); @@ -1891,7 +1891,7 @@ /*kdDebug(1210) << "initialGeometry() Computing geometry for " << name() << " on screen " << XineramaScreen << endl;*/ - QRect workArea = ExtensionManager::the()->workArea(this, XineramaScreen); + QRect workArea = ExtensionManager::self()->workArea(this, XineramaScreen); QSize size = initialSize(p, workArea); QPoint point = initialLocation(p, a, XineramaScreen, size, workArea, @@ -1969,7 +1969,7 @@ ((me->state() & Qt::LeftButton) == Qt::LeftButton) && !Kicker::the()->isImmutable() && !m_extension->settings()->config()->isImmutable() && - !ExtensionManager::the()->isMenuBar(this)) + !ExtensionManager::self()->isMenuBar(this)) { QPoint p(me->globalPos() - _last_lmb_press); int x_treshold = width(); --- trunk/KDE/kdebase/kicker/kicker/core/extensionmanager.cpp #451453:451454 @@ -50,7 +50,7 @@ static KStaticDeleter extensionManagerDeleter; ExtensionManager* ExtensionManager::m_self = 0; -ExtensionManager* ExtensionManager::the() +ExtensionManager* ExtensionManager::self() { if (!m_manager) { @@ -71,12 +71,10 @@ ExtensionManager::~ExtensionManager() { - ExtensionContainer::List::iterator itEnd = _containers.end(); - for (ExtensionContainer::List::iterator it = _containers.begin(); it != itEnd; ++it) + while (!_containers.isEmpty()) { - delete *it; + delete _containers.takeFirst(); } - _containers.clear(); delete m_menubarPanel; delete m_mainPanel; --- trunk/KDE/kdebase/kicker/kicker/core/extensionmanager.h #451453:451454 @@ -37,7 +37,7 @@ Q_OBJECT public: - static ExtensionManager* the(); + static ExtensionManager* self(); void configureMenubar(bool duringInit); void addExtension(const QString &desktopFile); --- trunk/KDE/kdebase/kicker/kicker/core/kicker.cpp #451453:451454 @@ -149,7 +149,7 @@ #endif // the panels, aka extensions - QTimer::singleShot(0, ExtensionManager::the(), SLOT(initialize())); + QTimer::singleShot(0, ExtensionManager::self(), SLOT(initialize())); } Kicker::~Kicker() @@ -279,9 +279,9 @@ return config()->isImmutable(); } -void Kicker::addExtension( const QString &desktopFile ) +void Kicker::addExtension(const QString &desktopFile) { - ExtensionManager::the()->addExtension( desktopFile ); + ExtensionManager::self()->addExtension(desktopFile); } QStringList Kicker::configModules(bool controlCenter) @@ -356,7 +356,7 @@ void Kicker::configureMenubar() { - ExtensionManager::the()->configureMenubar(false); + ExtensionManager::self()->configureMenubar(false); } void Kicker::configDialogFinished() --- trunk/KDE/kdebase/kicker/kicker/core/panelextension.cpp #451453:451454 @@ -106,7 +106,7 @@ { _containerArea->show(); - if (ExtensionManager::the()->isMainPanel(topLevelWidget())) + if (ExtensionManager::self()->isMainPanel(topLevelWidget())) { setObjId("Panel"); _containerArea->initialize(true); @@ -160,7 +160,7 @@ sizeInPixels()); } - return size.boundedTo( maxSize ); + return size.boundedTo(maxSize); } bool PanelExtension::eventFilter(QObject*, QEvent * e) @@ -261,7 +261,7 @@ { if (_opMnu) { - bool haveExtensions = ExtensionManager::the()->containers().count() > 0; + bool haveExtensions = ExtensionManager::self()->containers().count() > 0; _opMnu->setItemEnabled(REMOVE_EXTENSION_ID, haveExtensions); } @@ -283,7 +283,7 @@ bool kickerImmutable = Kicker::the()->isImmutable(); if (!kickerImmutable) { - bool isMenuBar = ExtensionManager::the()->isMenuBar( + bool isMenuBar = ExtensionManager::self()->isMenuBar( dynamic_cast(parent())); // setup addmenu and removemenu @@ -309,7 +309,7 @@ _opMnu->insertItem(i18n("Remove Pa&nel"), m_removeExtensionMenu, REMOVE_EXTENSION_ID); _opMnu->setItemEnabled(REMOVE_EXTENSION_ID, - ExtensionManager::the()->containers().count() > 0); + ExtensionManager::self()->containers().count() > 0); _opMnu->insertSeparator(); } --- trunk/KDE/kdebase/kicker/kicker/core/pluginmanager.cpp #451453:451454 @@ -137,8 +137,7 @@ return applet; } -KPanelExtension* PluginManager::loadExtension( - const AppletInfo& info, QWidget* parent ) +KPanelExtension* PluginManager::loadExtension(const AppletInfo& info, QWidget* parent ) { if (info.library() == "childpanel_panelextension" /* KDE4? || info.library() == "panel" */) --- trunk/KDE/kdebase/kicker/kicker/ui/addextension_mnu.cpp #451453:451454 @@ -57,5 +57,5 @@ void PanelAddExtensionMenu::slotExec(int id) { - ExtensionManager::the()->addExtension( extensions[id].desktopFile() ); + ExtensionManager::self()->addExtension( extensions[id].desktopFile() ); } --- trunk/KDE/kdebase/kicker/kicker/ui/removeextension_mnu.cpp #451453:451454 @@ -54,7 +54,7 @@ int id = 0; clear(); - m_containers = ExtensionManager::the()->containers(); + m_containers = ExtensionManager::self()->containers(); PanelMenuItemInfo::List items; ExtensionContainer::List::iterator itEnd = m_containers.end(); @@ -101,11 +101,11 @@ { if (id == REMOVEALLID) { - ExtensionManager::the()->removeAllContainers(); + ExtensionManager::self()->removeAllContainers(); } else if (m_containers.at(id) != m_containers.back()) { - ExtensionManager::the()->removeContainer(m_containers.at(id)); + ExtensionManager::self()->removeContainer(m_containers.at(id)); } }