summaryrefslogtreecommitdiffstats
path: root/kicker/menuext/tom/tom.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/menuext/tom/tom.cpp')
-rw-r--r--kicker/menuext/tom/tom.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/kicker/menuext/tom/tom.cpp b/kicker/menuext/tom/tom.cpp
index ed07468de..5f42bd0f0 100644
--- a/kicker/menuext/tom/tom.cpp
+++ b/kicker/menuext/tom/tom.cpp
@@ -47,7 +47,7 @@ using namespace std;
#include <tderecentdocument.h>
#include <kservice.h>
#include <kservicegroup.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kstdaction.h>
#include <tdesycocaentry.h>
@@ -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;
@@ -143,7 +143,7 @@ class runMenuWidget : public TQWidget, public QMenuItem
TQPainter p(this);
TQRect r(rect());
// ew, nasty hack. may result in coredumps due to horrid C-style cast???
- kapp->style().drawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled,
+ tdeApp->style().drawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled,
TQStyleOption(static_cast<TQMenuItem*>(this), 0, TDEIcon::SizeMedium ));
p.drawPixmap(KDialog::spacingHint(), 1, icon);
p.drawText((KDialog::spacingHint() * 2) + TDEIcon::SizeMedium, textRect.height() + ((height() - textRect.height()) / 2), i18n("Run:"));
@@ -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();
@@ -237,7 +237,7 @@ void TOM::initializeRecentDocs()
* TODO: make the number of visible items configurable?
*/
- KDesktopFile f(*it, true /* read only */);
+ TDEDesktopFile f(*it, true /* read only */);
m_recentDocsMenu->insertItem(DesktopIcon(f.readIcon(), TDEIcon::SizeMedium),
f.readName().replace('&', "&&"), id);
++id;
@@ -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(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged()));
}*/
// TASKS
@@ -484,9 +484,9 @@ void TOM::initialize()
{
removeItem(destMenuTitleID);
}
- else if (kapp->authorize("run_command"))
+ else if (tdeApp->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);
@@ -510,9 +510,9 @@ void TOM::initialize()
insertTitle(i18n("Special Items"), contextMenuTitleID);
// if we have no destinations, put the run command here
- if (numDests == 0 && kapp->authorize("run_command"))
+ if (numDests == 0 && tdeApp->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()
@@ -817,8 +817,8 @@ void TOM::runCommand()
if ( kicker_screen_number )
appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
- kapp->updateRemoteUserTimestamp( appname );
- kapp->dcopClient()->send( appname, "KDesktopIface",
+ tdeApp->updateRemoteUserTimestamp( appname );
+ tdeApp->dcopClient()->send( appname, "KDesktopIface",
"popupExecuteCommand()", data );
}
@@ -826,7 +826,7 @@ void TOM::runTask(int id)
{
if (!m_tasks.contains(id)) return;
- kapp->propagateSessionManager();
+ tdeApp->propagateSessionManager();
TDEApplication::startServiceByDesktopPath(m_tasks[id]->desktopEntryPath(),
TQStringList(), 0, 0, 0, "", true);
}
@@ -840,7 +840,7 @@ void TOM::openRecentDocument(int id)
{
if (id >= 0)
{
- kapp->propagateSessionManager();
+ tdeApp->propagateSessionManager();
KURL u;
u.setPath(m_recentDocURLs[id]);
KDEDesktopMimeType::run(u, true);
@@ -849,7 +849,7 @@ void TOM::openRecentDocument(int id)
void TOM::logout()
{
- kapp->requestShutDown();
+ tdeApp->requestShutDown();
}
#include "tom.moc"