diff options
Diffstat (limited to 'kicker/menuext/tom')
-rw-r--r-- | kicker/menuext/tom/tom.cpp | 50 | ||||
-rw-r--r-- | kicker/menuext/tom/tom.h | 4 |
2 files changed, 27 insertions, 27 deletions
diff --git a/kicker/menuext/tom/tom.cpp b/kicker/menuext/tom/tom.cpp index 0fa85a1e3..3e97cf385 100644 --- a/kicker/menuext/tom/tom.cpp +++ b/kicker/menuext/tom/tom.cpp @@ -62,7 +62,7 @@ const int destMenuTitleID = 10001; extern "C" { - KDE_EXPORT void* init_kickermenu_tom() + TDE_EXPORT void* init_kickermenu_tom() { TDEGlobal::locale()->insertCatalogue("libkickermenu_tom"); return new TOMFactory; @@ -105,7 +105,7 @@ class runMenuWidget : public TQWidget, public QMenuItem l1->setPixmap(foo); runLayout->addWidget(l1);*/ /*TQLabel* l2 = new TQLabel(i18n("&Run: "), this); - l2->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative); + l2->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative); l2->setBuddy(this); runLayout->addWidget(l2);*/ m_runEdit = new KHistoryCombo(this); @@ -116,21 +116,21 @@ class runMenuWidget : public TQWidget, public QMenuItem TQSettings settings; if (settings.readEntry("/TDEStyle/Settings/MenuTransparencyEngine", "Disabled") != "Disabled") { - setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative); - //l1->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative); - //l2->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative); - m_runEdit->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative); + setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative); + //l1->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative); + //l2->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative); + m_runEdit->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative); } else { - /*setBackgroundMode(Qt::NoBackground, Qt::NoBackground); - l1->setBackgroundMode(Qt::NoBackground, Qt::NoBackground); - l2->setBackgroundMode(Qt::NoBackground, Qt::NoBackground); - m_runEdit->setBackgroundMode(Qt::NoBackground, Qt::NoBackground);*/ + /*setBackgroundMode(TQt::NoBackground, TQt::NoBackground); + l1->setBackgroundMode(TQt::NoBackground, TQt::NoBackground); + l2->setBackgroundMode(TQt::NoBackground, TQt::NoBackground); + m_runEdit->setBackgroundMode(TQt::NoBackground, TQt::NoBackground);*/ //l1->setAutoMask(true); - //l1->setBackgroundMode(Qt::NoBackground, Qt::NoBackground); - //l2->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative); - //m_runEdit->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative); + //l1->setBackgroundMode(TQt::NoBackground, TQt::NoBackground); + //l2->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative); + //m_runEdit->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative); } setMinimumHeight(TDEIcon::SizeMedium + 2); @@ -217,7 +217,7 @@ void TOM::initializeRecentDocs() { m_recentDocsMenu->clear(); m_recentDocsMenu->insertItem(SmallIconSet("history_clear"), i18n("Clear History"), - this, TQT_SLOT(clearRecentDocHistory())); + this, TQ_SLOT(clearRecentDocHistory())); m_recentDocsMenu->insertSeparator(); m_recentDocURLs = TDERecentDocument::recentDocuments(); @@ -365,13 +365,13 @@ int TOM::appendTaskGroup(TDEConfig& config, bool inSubMenu) return 0; } - connect(taskGroup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(runTask(int))); + connect(taskGroup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(runTask(int))); // so we have an actual task group menu with tasks, let's add it if (inSubMenu) { - TQObject::connect(taskGroup, TQT_SIGNAL(aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*)), - this, TQT_SLOT(contextualizeRMBmenu(TDEPopupMenu*, int, TQPopupMenu*))); + TQObject::connect(taskGroup, TQ_SIGNAL(aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*)), + this, TQ_SLOT(contextualizeRMBmenu(TDEPopupMenu*, int, TQPopupMenu*))); m_submenus.append(taskGroup); @@ -389,7 +389,7 @@ int TOM::appendTaskGroup(TDEConfig& config, bool inSubMenu) rmbMenu->insertItem(title, contextMenuTitleID); rmbMenu->insertItem(i18n("Add This Task to Panel")); rmbMenu->insertItem(i18n("Modify This Task...")); - rmbMenu->insertItem(i18n("Remove This Task..."), this, TQT_SLOT(removeTask())); + rmbMenu->insertItem(i18n("Remove This Task..."), this, TQ_SLOT(removeTask())); rmbMenu->insertItem(i18n("Insert New Task...")); } } @@ -432,7 +432,7 @@ void TOM::initialize() } else { - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged())); }*/ // TASKS @@ -486,7 +486,7 @@ void TOM::initialize() } else if (kapp->authorize("run_command")) { - insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand())); + insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQ_SLOT(runCommand())); } // RECENTLY USED ITEMS @@ -494,8 +494,8 @@ void TOM::initialize() m_recentDocsMenu = new TDEPopupMenu(this, "recentDocs"); m_recentDocsMenu->setFont(m_largerFont); - connect(m_recentDocsMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(initializeRecentDocs())); - connect(m_recentDocsMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(openRecentDocument(int))); + connect(m_recentDocsMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(initializeRecentDocs())); + connect(m_recentDocsMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(openRecentDocument(int))); insertItem(DesktopIcon("text-x-generic", TDEIcon::SizeMedium), i18n("Recent Documents"), m_recentDocsMenu); m_submenus.append(m_recentDocsMenu); @@ -512,7 +512,7 @@ void TOM::initialize() // if we have no destinations, put the run command here if (numDests == 0 && kapp->authorize("run_command")) { - insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand())); + insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQ_SLOT(runCommand())); } @@ -564,7 +564,7 @@ void TOM::initialize() } insertItem(DesktopIcon("system-log-out", TDEIcon::SizeMedium), - i18n("Logout %1").arg(username), this, TQT_SLOT(logout())); + i18n("Logout %1").arg(username), this, TQ_SLOT(logout())); } void TOM::reload() @@ -755,7 +755,7 @@ void TOM::paintEvent(TQPaintEvent * e) TQPainter p(this); - style().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, + style().drawPrimitive( TQStyle::PE_PanelPopup, &p, TQRect( 0, 0, width(), height() ), colorGroup(), TQStyle::Style_Default, TQStyleOption( frameWidth(), 0 ) ); diff --git a/kicker/menuext/tom/tom.h b/kicker/menuext/tom/tom.h index b67f2bd6c..7e7b9e5ec 100644 --- a/kicker/menuext/tom/tom.h +++ b/kicker/menuext/tom/tom.h @@ -32,7 +32,7 @@ typedef TQMap<int, KService::Ptr> TaskMap; class TOM : public KPanelMenu { - Q_OBJECT + TQ_OBJECT public: TOM(TQWidget *parent = 0, const char *name = 0); @@ -102,7 +102,7 @@ class TOMFactory : public KLibFactory protected: TQObject* createObject(TQObject *parent = 0, const char *name = 0, - const char *classname = TQOBJECT_OBJECT_NAME_STRING, + const char *classname = "TQObject", const TQStringList& args = TQStringList()); }; |