diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-03 20:49:48 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-03 20:49:48 +0000 |
commit | fd7a608ffe99df747f0496300276b95f766c18b9 (patch) | |
tree | c54dfe97fb682af9705d2cb09c424c60db861228 /kicker/applets | |
parent | 27856879bf962f178d88e79144e37a47e731b122 (diff) | |
download | tdebase-fd7a608ffe99df747f0496300276b95f766c18b9.tar.gz tdebase-fd7a608ffe99df747f0496300276b95f766c18b9.zip |
* Added Kickoff menu
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1171422 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker/applets')
-rw-r--r-- | kicker/applets/clock/clock.cpp | 4 | ||||
-rw-r--r-- | kicker/applets/launcher/quicklauncher.cpp | 2 | ||||
-rw-r--r-- | kicker/applets/media/mediumbutton.cpp | 55 | ||||
-rw-r--r-- | kicker/applets/minipager/pagerbutton.cpp | 2 | ||||
-rw-r--r-- | kicker/applets/naughty/NaughtyProcessMonitor.cpp | 2 | ||||
-rw-r--r-- | kicker/applets/systemtray/systemtrayapplet.cpp | 2 | ||||
-rw-r--r-- | kicker/applets/trash/trashbutton.cpp | 2 |
7 files changed, 36 insertions, 33 deletions
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index 7bc46afa4..26f1ae4c0 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -901,8 +901,8 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions, _calendar(0), _disableCalendar(false), _clock(0), - _timer(new TQTimer(this)), - m_layoutTimer(new TQTimer(this)), + _timer(new TQTimer(this, "ClockApplet::_timer")), + m_layoutTimer(new TQTimer(this, "m_layoutTimer")), m_layoutDelay(0), m_followBackgroundSetting(true), m_dateFollowBackgroundSetting(true), diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp index 557ea4cd3..a278b39c9 100644 --- a/kicker/applets/launcher/quicklauncher.cpp +++ b/kicker/applets/launcher/quicklauncher.cpp @@ -110,7 +110,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions, m_configAction = new KAction(i18n("Configure Quicklauncher..."), "configure", KShortcut(), this, TQT_SLOT(slotConfigure()), this); - m_saveTimer = new TQTimer(this); + m_saveTimer = new TQTimer(this, "m_saveTimer"); connect(m_saveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(saveConfig())); m_popularity = new PopularityStatistics(); diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp index 5be2acbab..0fae43441 100644 --- a/kicker/applets/media/mediumbutton.cpp +++ b/kicker/applets/media/mediumbutton.cpp @@ -45,7 +45,8 @@ #include <konq_drag.h> MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem) - : PanelPopupButton(parent), mActions(this, this), mFileItem(fileItem) + : PanelPopupButton(parent), mActions(this, this), mFileItem(fileItem), mOpenTimer(0, + "MediumButton::mOpenTimer") { KAction *a = KStdAction::paste(this, TQT_SLOT(slotPaste()), &mActions, "pasteto"); @@ -74,9 +75,9 @@ MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem) MediumButton::~MediumButton() { - TQPopupMenu *menu = popup(); - setPopup(0); - delete menu; + TQPopupMenu *menu = static_cast<TQPopupMenu*>(popup()); + setPopup(0); + delete menu; } const KFileItem &MediumButton::fileItem() const @@ -94,29 +95,29 @@ void MediumButton::setFileItem(const KFileItem &fileItem) void MediumButton::initPopup() { - TQPopupMenu *old_popup = popup(); - - KFileItemList items; - items.append(&mFileItem); - - KonqPopupMenu::KonqPopupFlags kpf = - KonqPopupMenu::ShowProperties - | KonqPopupMenu::ShowNewWindow; - - KParts::BrowserExtension::PopupFlags bef = - KParts::BrowserExtension::DefaultPopupItems; - - KonqPopupMenu *new_popup = new KonqPopupMenu(0L, items, - KURL("media:/"), mActions, 0L, - this, kpf, bef); - KPopupTitle *title = new KPopupTitle(new_popup); - title->setTitle(mFileItem.text()); - - new_popup->insertItem(title, -1, 0); - - setPopup(new_popup); - - if (old_popup!=0L) delete old_popup; + TQPopupMenu *old_popup = static_cast<TQPopupMenu*>(popup()); + + KFileItemList items; + items.append(&mFileItem); + + KonqPopupMenu::KonqPopupFlags kpf = + KonqPopupMenu::ShowProperties + | KonqPopupMenu::ShowNewWindow; + + KParts::BrowserExtension::PopupFlags bef = + KParts::BrowserExtension::DefaultPopupItems; + + KonqPopupMenu *new_popup = new KonqPopupMenu(0L, items, + KURL("media:/"), mActions, 0L, + this, kpf, bef); + KPopupTitle *title = new KPopupTitle(new_popup); + title->setTitle(mFileItem.text()); + + new_popup->insertItem(title, -1, 0); + + setPopup(new_popup); + + if (old_popup!=0L) delete old_popup; } void MediumButton::refreshType() diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp index c56afca38..10a5aa8c9 100644 --- a/kicker/applets/minipager/pagerbutton.cpp +++ b/kicker/applets/minipager/pagerbutton.cpp @@ -70,6 +70,8 @@ KMiniPagerButton::KMiniPagerButton(int desk, bool useViewPorts, const TQPoint& v m_bgPixmap(0), m_isCommon(false), m_currentWindow(0), + m_updateCompressor(0, "KMiniPagerButton::updateCompressor"), + m_dragSwitchTimer(0, "KMiniPagerButton::dragSwitchTimer"), m_inside(false) { setToggleButton(true); diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.cpp b/kicker/applets/naughty/NaughtyProcessMonitor.cpp index 37cba7a37..6228cfba1 100644 --- a/kicker/applets/naughty/NaughtyProcessMonitor.cpp +++ b/kicker/applets/naughty/NaughtyProcessMonitor.cpp @@ -94,7 +94,7 @@ NaughtyProcessMonitor::NaughtyProcessMonitor d = new NaughtyProcessMonitorPrivate; d->interval_ = interval * 1000; d->triggerLevel_ = triggerLevel; - d->timer_ = new TQTimer(this); + d->timer_ = new TQTimer(this, "NaughtyProcessMonitorPrivate::timer"); connect(d->timer_, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); } diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index 51bf2b9d8..ad44b640f 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -401,7 +401,7 @@ void SystemTrayApplet::showExpandButton(bool show) connect(m_expandButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleExpanded())); - m_autoRetractTimer = new TQTimer(this); + m_autoRetractTimer = new TQTimer(this, "m_autoRetractTimer"); connect(m_autoRetractTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(checkAutoRetract())); } diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp index eb036c119..19e6be02b 100644 --- a/kicker/applets/trash/trashbutton.cpp +++ b/kicker/applets/trash/trashbutton.cpp @@ -78,7 +78,7 @@ void TrashButton::setItemCount(int count) void TrashButton::initPopup() { - TQPopupMenu *old_popup = popup(); + TQPopupMenu *old_popup = static_cast<TQPopupMenu*>(popup()); KFileItemList items; items.append(&mFileItem); |