summaryrefslogtreecommitdiffstats
path: root/kicker/menuext
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/menuext')
-rw-r--r--kicker/menuext/find/findmenu.h2
-rw-r--r--kicker/menuext/kate/katesessionmenu.cpp4
-rw-r--r--kicker/menuext/kate/katesessionmenu.h2
-rw-r--r--kicker/menuext/konq-profiles/konqy_menu.h2
-rw-r--r--kicker/menuext/konsole/konsole_mnu.cpp8
-rw-r--r--kicker/menuext/konsole/konsole_mnu.h2
-rw-r--r--kicker/menuext/konsole/konsolebookmarkhandler.cpp16
-rw-r--r--kicker/menuext/konsole/konsolebookmarkhandler.h2
-rw-r--r--kicker/menuext/konsole/konsolebookmarkmenu.cpp20
-rw-r--r--kicker/menuext/konsole/konsolebookmarkmenu.h2
-rw-r--r--kicker/menuext/prefmenu/prefmenu.cpp18
-rw-r--r--kicker/menuext/prefmenu/prefmenu.h2
-rw-r--r--kicker/menuext/recentdocs/recentdocsmenu.cpp6
-rw-r--r--kicker/menuext/recentdocs/recentdocsmenu.h2
-rw-r--r--kicker/menuext/remote/remotemenu.cpp4
-rw-r--r--kicker/menuext/remote/remotemenu.h2
-rw-r--r--kicker/menuext/system/systemmenu.cpp4
-rw-r--r--kicker/menuext/system/systemmenu.h2
-rw-r--r--kicker/menuext/tdeprint/print_mnu.h2
-rw-r--r--kicker/menuext/tom/tom.cpp48
-rw-r--r--kicker/menuext/tom/tom.h4
21 files changed, 77 insertions, 77 deletions
diff --git a/kicker/menuext/find/findmenu.h b/kicker/menuext/find/findmenu.h
index b8c3e3d96..85dd0e04d 100644
--- a/kicker/menuext/find/findmenu.h
+++ b/kicker/menuext/find/findmenu.h
@@ -30,7 +30,7 @@ class TQStringList;
class FindMenu : public KPanelMenu
{
- Q_OBJECT
+ TQ_OBJECT
public:
FindMenu( TQWidget* parent, const char* name, const TQStringList &/*args*/ );
diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp
index c992cf855..089a8ac93 100644
--- a/kicker/menuext/kate/katesessionmenu.cpp
+++ b/kicker/menuext/kate/katesessionmenu.cpp
@@ -117,7 +117,7 @@ void KateSessionMenu::initialize()
// means for updating, to let the user manually update if he/she added new sessions.
insertSeparator();
- insertItem( SmallIconSet("reload"), i18n("Reload Session List"), this, TQT_SLOT(reloadSessionsList()) );
+ insertItem( SmallIconSet("reload"), i18n("Reload Session List"), this, TQ_SLOT(reloadSessionsList()) );
}
void KateSessionMenu::slotExec( int id )
@@ -136,7 +136,7 @@ void KateSessionMenu::slotExec( int id )
TQString name = KInputDialog::getText( i18n("Session Name"),
i18n("Please enter a name for the new session"),
TQString::null,
- &ok, 0, 0, new Validator( TQT_TQOBJECT(m_parent) ) );
+ &ok, 0, 0, new Validator( m_parent ) );
if ( ! ok )
return;
diff --git a/kicker/menuext/kate/katesessionmenu.h b/kicker/menuext/kate/katesessionmenu.h
index 78ab50e17..b6a10e885 100644
--- a/kicker/menuext/kate/katesessionmenu.h
+++ b/kicker/menuext/kate/katesessionmenu.h
@@ -24,7 +24,7 @@
#include <kpanelmenu.h>
class KateSessionMenu : public KPanelMenu {
- Q_OBJECT
+ TQ_OBJECT
public:
KateSessionMenu( TQWidget *parent=0, const char *name=0, const TQStringList& /*args*/=TQStringList() );
~KateSessionMenu();
diff --git a/kicker/menuext/konq-profiles/konqy_menu.h b/kicker/menuext/konq-profiles/konqy_menu.h
index ba3bb19f7..927f1ec6e 100644
--- a/kicker/menuext/konq-profiles/konqy_menu.h
+++ b/kicker/menuext/konq-profiles/konqy_menu.h
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
class KonquerorProfilesMenu : public KPanelMenu
{
- Q_OBJECT
+ TQ_OBJECT
public:
KonquerorProfilesMenu(TQWidget *parent, const char *name, const TQStringList & /*args*/);
diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp
index c9439c8db..2e196186f 100644
--- a/kicker/menuext/konsole/konsole_mnu.cpp
+++ b/kicker/menuext/konsole/konsole_mnu.cpp
@@ -150,8 +150,8 @@ void KonsoleMenu::initialize()
insertItem(SmallIconSet("keditbookmarks"),
i18n("New Session at Bookmark"), m_bookmarksSession);
connect(m_bookmarkHandlerSession,
- TQT_SIGNAL(openURL(const TQString&, const TQString&)),
- TQT_SLOT(newSession(const TQString&, const TQString&)));
+ TQ_SIGNAL(openURL(const TQString&, const TQString&)),
+ TQ_SLOT(newSession(const TQString&, const TQString&)));
screenList.clear();
@@ -229,11 +229,11 @@ void KonsoleMenu::initialize()
// we don't have any profiles, disable the menu
setItemEnabled(profileID, false);
}
- connect(m_profileMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(launchProfile(int)));
+ connect(m_profileMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(launchProfile(int)));
insertSeparator();
insertItem(SmallIconSet("reload"),
- i18n("Reload Sessions"), this, TQT_SLOT(reinitialize()));
+ i18n("Reload Sessions"), this, TQ_SLOT(reinitialize()));
}
void KonsoleMenu::slotExec(int id)
diff --git a/kicker/menuext/konsole/konsole_mnu.h b/kicker/menuext/konsole/konsole_mnu.h
index 4272fbaf9..68473693f 100644
--- a/kicker/menuext/konsole/konsole_mnu.h
+++ b/kicker/menuext/konsole/konsole_mnu.h
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
class KonsoleMenu : public KPanelMenu/*, public KPReloadObject*/
{
- Q_OBJECT
+ TQ_OBJECT
public:
KonsoleMenu(TQWidget *parent, const char *name, const TQStringList& /* args */);
diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.cpp b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
index 9ace6483e..b2249d858 100644
--- a/kicker/menuext/konsole/konsolebookmarkhandler.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
@@ -38,8 +38,8 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( KonsoleMenu *konsole, bool )
manager->setUpdate( true );
manager->setShowNSBookmarks( false );
- connect( manager, TQT_SIGNAL( changed(const TQString &, const TQString &) ),
- TQT_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) );
+ connect( manager, TQ_SIGNAL( changed(const TQString &, const TQString &) ),
+ TQ_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) );
m_bookmarkMenu = new KonsoleBookmarkMenu( manager, this, m_menu,
NULL, false, /*Not toplevel*/
false /*No 'Add Bookmark'*/ );
@@ -62,13 +62,13 @@ void KonsoleBookmarkHandler::importOldBookmarks( const TQString& path,
KNSBookmarkImporter importer( path );
connect( &importer,
- TQT_SIGNAL( newBookmark( const TQString&, const TQCString&, const TQString& )),
- TQT_SLOT( slotNewBookmark( const TQString&, const TQCString&, const TQString& )));
+ TQ_SIGNAL( newBookmark( const TQString&, const TQCString&, const TQString& )),
+ TQ_SLOT( slotNewBookmark( const TQString&, const TQCString&, const TQString& )));
connect( &importer,
- TQT_SIGNAL( newFolder( const TQString&, bool, const TQString& )),
- TQT_SLOT( slotNewFolder( const TQString&, bool, const TQString& )));
- connect( &importer, TQT_SIGNAL( newSeparator() ), TQT_SLOT( newSeparator() ));
- connect( &importer, TQT_SIGNAL( endMenu() ), TQT_SLOT( endMenu() ));
+ TQ_SIGNAL( newFolder( const TQString&, bool, const TQString& )),
+ TQ_SLOT( slotNewFolder( const TQString&, bool, const TQString& )));
+ connect( &importer, TQ_SIGNAL( newSeparator() ), TQ_SLOT( newSeparator() ));
+ connect( &importer, TQ_SIGNAL( endMenu() ), TQ_SLOT( endMenu() ));
importer.parseNSBookmarks( false );
diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.h b/kicker/menuext/konsole/konsolebookmarkhandler.h
index a1d2f54de..f7231fd24 100644
--- a/kicker/menuext/konsole/konsolebookmarkhandler.h
+++ b/kicker/menuext/konsole/konsolebookmarkhandler.h
@@ -14,7 +14,7 @@ class KonsoleMenu;
class KonsoleBookmarkHandler : public TQObject, public KBookmarkOwner
{
- Q_OBJECT
+ TQ_OBJECT
public:
KonsoleBookmarkHandler( KonsoleMenu *konsole, bool toplevel );
diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
index 0860cc123..840b3b8f6 100644
--- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
@@ -31,14 +31,14 @@ KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr,
/*
* First, we disconnect KBookmarkMenu::slotAboutToShow()
* Then, we connect KonsoleBookmarkMenu::slotAboutToShow().
- * They are named differently because the TQT_SLOT() macro thinks we want
+ * They are named differently because the TQ_SLOT() macro thinks we want
* KonsoleBookmarkMenu::KBookmarkMenu::slotAboutToShow()
* Could this be solved if slotAboutToShow() is virtual in KBookmarMenu?
*/
- disconnect( _parentMenu, TQT_SIGNAL( aboutToShow() ), this,
- TQT_SLOT( slotAboutToShow() ) );
- connect( _parentMenu, TQT_SIGNAL( aboutToShow() ),
- TQT_SLOT( slotAboutToShow2() ) );
+ disconnect( _parentMenu, TQ_SIGNAL( aboutToShow() ), this,
+ TQ_SLOT( slotAboutToShow() ) );
+ connect( _parentMenu, TQ_SIGNAL( aboutToShow() ),
+ TQ_SLOT( slotAboutToShow2() ) );
}
/*
@@ -100,8 +100,8 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
m_actionCollection, false,
m_bAddBookmark, TQString::null );
m_lstSubMenus.append(subMenu);
- connect( actionMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), subMenu,
- TQT_SLOT(slotNSLoad()));
+ connect( actionMenu->popupMenu(), TQ_SIGNAL(aboutToShow()), subMenu,
+ TQ_SLOT(slotNSLoad()));
}
}
@@ -128,7 +128,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
// kdDebug(1203) << "Creating URL bookmark menu item for " << bm.text() << endl;
// create a normal URL item, with ID as a name
TDEAction * action = new TDEAction( text, bm.icon(), 0,
- this, TQT_SLOT( slotBookmarkSelected() ),
+ this, TQ_SLOT( slotBookmarkSelected() ),
m_actionCollection, bm.url().url().utf8() );
action->setStatusText( bm.url().prettyURL() );
@@ -168,7 +168,7 @@ void KonsoleBookmarkMenu::slotBookmarkSelected()
if ( !m_pOwner ) return; // this view doesn't handle bookmarks...
a = (TDEAction*)sender();
b = a->text();
- m_kOwner->openBookmarkURL( TQString::fromUtf8(TQT_TQOBJECT_CONST(sender())->name()), /* URL */
+ m_kOwner->openBookmarkURL( TQString::fromUtf8(sender()->name()), /* URL */
( (TDEAction *)sender() )->text() /* Title */ );
}
@@ -177,7 +177,7 @@ void KonsoleBookmarkMenu::slotNSBookmarkSelected()
TDEAction *a;
TQString b;
- TQString link(TQT_TQOBJECT_CONST(sender())->name()+8);
+ TQString link(sender()->name()+8);
a = (TDEAction*)sender();
b = a->text();
m_kOwner->openBookmarkURL( link, /*URL */
diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.h b/kicker/menuext/konsole/konsolebookmarkmenu.h
index 103b6bc19..4bb08a798 100644
--- a/kicker/menuext/konsole/konsolebookmarkmenu.h
+++ b/kicker/menuext/konsole/konsolebookmarkmenu.h
@@ -23,7 +23,7 @@ class KonsoleBookmarkMenu;
class KonsoleBookmarkMenu : public KBookmarkMenu
{
- Q_OBJECT
+ TQ_OBJECT
public:
KonsoleBookmarkMenu( KBookmarkManager* mgr,
diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp
index 534387394..5440c1ed7 100644
--- a/kicker/menuext/prefmenu/prefmenu.cpp
+++ b/kicker/menuext/prefmenu/prefmenu.cpp
@@ -60,11 +60,11 @@ PrefMenu::PrefMenu(const TQString& label,
{
m_subMenus.setAutoDelete(true);
- connect(KSycoca::self(), TQT_SIGNAL(databaseChanged()),
- this, TQT_SLOT(clearOnClose()));
+ connect(KSycoca::self(), TQ_SIGNAL(databaseChanged()),
+ this, TQ_SLOT(clearOnClose()));
- connect(this, TQT_SIGNAL(aboutToHide()),
- this, TQT_SLOT(aboutToClose()));
+ connect(this, TQ_SIGNAL(aboutToHide()),
+ this, TQ_SLOT(aboutToClose()));
}
PrefMenu::~PrefMenu()
@@ -136,7 +136,7 @@ void PrefMenu::mouseMoveEvent(TQMouseEvent * ev)
{
KPanelMenu::mouseMoveEvent(ev);
- if ((ev->state() & Qt::LeftButton) != Qt::LeftButton)
+ if ((ev->state() & TQt::LeftButton) != TQt::LeftButton)
{
return;
}
@@ -198,7 +198,7 @@ void PrefMenu::mouseMoveEvent(TQMouseEvent * ev)
// If the path to the desktop file is relative, try to get the full
// path from KStdDirs.
KURLDrag *d = new KURLDrag(KURL::List(url), this);
- connect(d, TQT_SIGNAL(destroyed()), this, TQT_SLOT(dragObjectDestroyed()));
+ connect(d, TQ_SIGNAL(destroyed()), this, TQ_SLOT(dragObjectDestroyed()));
d->setPixmap(icon);
d->dragCopy();
@@ -224,7 +224,7 @@ void PrefMenu::dragEnterEvent(TQDragEnterEvent *event)
void PrefMenu::dragLeaveEvent(TQDragLeaveEvent */*event*/)
{
// see PrefMenu::dragEnterEvent why this is nescessary
- if (!TQT_TQRECT_OBJECT(frameGeometry()).contains(TQCursor::pos()))
+ if (!frameGeometry().contains(TQCursor::pos()))
{
KURLDrag::setTarget(0);
}
@@ -246,7 +246,7 @@ void PrefMenu::initialize()
{
insertItem(KickerLib::menuIconSet("kcontrol"),
i18n("Trinity Control Center"),
- this, TQT_SLOT(launchControlCenter()));
+ this, TQ_SLOT(launchControlCenter()));
insertSeparator();
}
@@ -358,7 +358,7 @@ void PrefMenu::slotClear()
// QPopupMenu's aboutToHide() is emitted before the popup is really hidden,
// and also before a click in the menu is handled, so do the clearing
// only after that has been handled
- TQTimer::singleShot( 100, this, TQT_SLOT( slotClear()));
+ TQTimer::singleShot( 100, this, TQ_SLOT( slotClear()));
return;
}
diff --git a/kicker/menuext/prefmenu/prefmenu.h b/kicker/menuext/prefmenu/prefmenu.h
index 10befe6b2..a56391ece 100644
--- a/kicker/menuext/prefmenu/prefmenu.h
+++ b/kicker/menuext/prefmenu/prefmenu.h
@@ -34,7 +34,7 @@ typedef TQPtrList<TQPopupMenu> PopupMenuList;
class PrefMenu : public KPanelMenu
{
- Q_OBJECT
+ TQ_OBJECT
public:
PrefMenu(TQWidget *parent,
diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp
index 19adfa868..90c84ee32 100644
--- a/kicker/menuext/recentdocs/recentdocsmenu.cpp
+++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp
@@ -52,7 +52,7 @@ RecentDocsMenu::~RecentDocsMenu()
void RecentDocsMenu::initialize() {
if (initialized()) clear();
- insertItem(SmallIconSet("history_clear"), i18n("Clear History"), this, TQT_SLOT(slotClearHistory()));
+ insertItem(SmallIconSet("history_clear"), i18n("Clear History"), this, TQ_SLOT(slotClearHistory()));
insertSeparator();
_fileList = TDERecentDocument::recentDocuments();
@@ -111,10 +111,10 @@ void RecentDocsMenu::mousePressEvent(TQMouseEvent* e) {
void RecentDocsMenu::mouseMoveEvent(TQMouseEvent* e) {
KPanelMenu::mouseMoveEvent(e);
- if (!(e->state() & Qt::LeftButton))
+ if (!(e->state() & TQt::LeftButton))
return;
- if (!TQT_TQRECT_OBJECT(rect()).contains(_mouseDown))
+ if (!rect().contains(_mouseDown))
return;
int dragLength = (e->pos() - _mouseDown).manhattanLength();
diff --git a/kicker/menuext/recentdocs/recentdocsmenu.h b/kicker/menuext/recentdocs/recentdocsmenu.h
index 487a9fe94..2ec65a1a4 100644
--- a/kicker/menuext/recentdocs/recentdocsmenu.h
+++ b/kicker/menuext/recentdocs/recentdocsmenu.h
@@ -31,7 +31,7 @@ class TQPoint;
class RecentDocsMenu : public KPanelMenu
{
- Q_OBJECT
+ TQ_OBJECT
public:
RecentDocsMenu(TQWidget* parent, const char* name, const TQStringList &/*args*/);
diff --git a/kicker/menuext/remote/remotemenu.cpp b/kicker/menuext/remote/remotemenu.cpp
index aeaff8e94..8c0a8407a 100644
--- a/kicker/menuext/remote/remotemenu.cpp
+++ b/kicker/menuext/remote/remotemenu.cpp
@@ -68,9 +68,9 @@ void RemoteMenu::initialize()
}
id = insertItem(SmallIcon("wizard"), i18n("Add Network Folder"));
- connectItem(id, this, TQT_SLOT(startWizard()));
+ connectItem(id, this, TQ_SLOT(startWizard()));
id = insertItem(SmallIcon("kfm"), i18n("Manage Network Folders"));
- connectItem(id, this, TQT_SLOT(openRemoteDir()));
+ connectItem(id, this, TQ_SLOT(openRemoteDir()));
insertSeparator();
diff --git a/kicker/menuext/remote/remotemenu.h b/kicker/menuext/remote/remotemenu.h
index 607e1fc64..327cc79b2 100644
--- a/kicker/menuext/remote/remotemenu.h
+++ b/kicker/menuext/remote/remotemenu.h
@@ -26,7 +26,7 @@
class RemoteMenu : public KPanelMenu, public KDirNotify
{
- Q_OBJECT
+ TQ_OBJECT
K_DCOP
public:
diff --git a/kicker/menuext/system/systemmenu.cpp b/kicker/menuext/system/systemmenu.cpp
index 12ec087d8..e738e7af9 100644
--- a/kicker/menuext/system/systemmenu.cpp
+++ b/kicker/menuext/system/systemmenu.cpp
@@ -32,8 +32,8 @@ SystemMenu::SystemMenu(TQWidget *parent, const char *name,
const TQStringList &/*args*/)
: KPanelMenu( parent, name)
{
- connect( &m_dirLister, TQT_SIGNAL( completed() ),
- this, TQT_SLOT( slotCompleted() ) );
+ connect( &m_dirLister, TQ_SIGNAL( completed() ),
+ this, TQ_SLOT( slotCompleted() ) );
m_dirLister.openURL(KURL("system:/"));
}
diff --git a/kicker/menuext/system/systemmenu.h b/kicker/menuext/system/systemmenu.h
index 1efbc3c57..26263af81 100644
--- a/kicker/menuext/system/systemmenu.h
+++ b/kicker/menuext/system/systemmenu.h
@@ -27,7 +27,7 @@
class SystemMenu : public KPanelMenu
{
- Q_OBJECT
+ TQ_OBJECT
public:
SystemMenu(TQWidget *parent, const char *name,
diff --git a/kicker/menuext/tdeprint/print_mnu.h b/kicker/menuext/tdeprint/print_mnu.h
index 47c9e609e..4be9b80a5 100644
--- a/kicker/menuext/tdeprint/print_mnu.h
+++ b/kicker/menuext/tdeprint/print_mnu.h
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
class PrintMenu : public KPanelMenu, public KPReloadObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
PrintMenu(TQWidget *parent, const char *name, const TQStringList & /*args*/);
diff --git a/kicker/menuext/tom/tom.cpp b/kicker/menuext/tom/tom.cpp
index 0fa85a1e3..973c52ee9 100644
--- a/kicker/menuext/tom/tom.cpp
+++ b/kicker/menuext/tom/tom.cpp
@@ -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());
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 11:02:06 +0000