summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-12-22 18:45:07 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-12-26 21:26:32 +0900
commitc4a6487c827add9382001ff1892b8fb3bfa94682 (patch)
treeec6c8a691a15099df946531b66355a76ca02b2db
parent7c724a49212a9ffdf42381d99648f15457867787 (diff)
downloadtdebase-c4a6487c827add9382001ff1892b8fb3bfa94682.tar.gz
tdebase-c4a6487c827add9382001ff1892b8fb3bfa94682.zip
Replace various '#define' strings - part 6
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--drkonqi/debugger.cpp2
-rw-r--r--drkonqi/toplevel.cpp4
-rw-r--r--kappfinder/toplevel.cpp10
-rw-r--r--kate/app/kateapp.cpp4
-rw-r--r--kate/app/kateconfigdialog.cpp4
-rw-r--r--kate/app/kateconsole.cpp2
-rw-r--r--kate/app/katefilelist.cpp10
-rw-r--r--kate/app/katefileselector.cpp2
-rw-r--r--kate/app/kategrepdialog.cpp2
-rw-r--r--kate/app/katemainwindow.cpp54
-rw-r--r--kate/app/katemdi.cpp4
-rw-r--r--kate/app/katesessionpanel.cpp20
-rw-r--r--kate/app/kateviewmanager.cpp18
-rw-r--r--kate/app/kwritemain.cpp24
-rw-r--r--kcontrol/background/bgdialog.cpp2
-rw-r--r--kcontrol/clock/dtime.h2
-rw-r--r--kcontrol/displayconfig/displayconfig.cpp28
-rw-r--r--kcontrol/dnssd/kcmdnssd.cpp2
-rw-r--r--kcontrol/hwmanager/hwdevicetray.cpp2
-rw-r--r--kcontrol/hwmanager/hwdevicetray_bindings.cpp2
-rw-r--r--kcontrol/kcontrol/main.cpp4
-rw-r--r--kcontrol/kcontrol/moduleIface.cpp2
-rw-r--r--kcontrol/kcontrol/toplevel.cpp16
-rw-r--r--kcontrol/locale/localemon.cpp4
-rw-r--r--kcontrol/randr/tderandrbindings.cpp2
-rw-r--r--kcontrol/randr/tderandrpassivepopup.cpp2
-rw-r--r--kcontrol/randr/tderandrtray.cpp6
-rw-r--r--kcontrol/style/kcmstyle.cpp2
-rw-r--r--kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp10
-rw-r--r--kcontrol/tdefontinst/viewpart/FontViewerApp.cpp6
-rw-r--r--kcontrol/tdeio/policydlg.cpp2
-rw-r--r--kcontrol/tdm/tdm-appear.cpp2
-rw-r--r--kcontrol/tdm/tdm-users.cpp2
-rw-r--r--kdcop/kdcopwindow.cpp28
-rw-r--r--kdesktop/bgmanager.cpp16
-rw-r--r--kdesktop/desktop.cpp6
-rw-r--r--kdesktop/kdesktopbindings.cpp2
-rw-r--r--kdesktop/kdiconview.cpp16
-rw-r--r--kdesktop/krootwm.cpp2
-rw-r--r--kdesktop/lock/autologout.cpp2
-rw-r--r--kdesktop/lock/lockprocess.cpp4
-rw-r--r--kdialog/kdialog.cpp2
-rw-r--r--kfind/kfinddlg.cpp2
-rw-r--r--kfind/kftabdlg.cpp4
-rw-r--r--khelpcenter/mainwindow.cpp22
-rw-r--r--khelpcenter/navigator.cpp4
-rw-r--r--khotkeys/kcontrol/kcmkhotkeys.cpp2
-rw-r--r--khotkeys/kcontrol/voicerecorder.cpp2
-rw-r--r--khotkeys/kcontrol/windowdef_simple_widget.cpp2
-rw-r--r--khotkeys/kcontrol/windowselector.cpp2
-rw-r--r--khotkeys/update/update.cpp2
-rw-r--r--kicker/applets/clock/clock.cpp20
-rw-r--r--kicker/applets/launcher/quickbutton.cpp2
-rw-r--r--kicker/applets/launcher/quicklauncher.cpp2
-rw-r--r--kicker/applets/media/mediumbutton.cpp6
-rw-r--r--kicker/applets/minipager/pagerapplet.cpp4
-rw-r--r--kicker/applets/naughty/NaughtyApplet.cpp2
-rw-r--r--kicker/applets/systemtray/systemtrayapplet.cpp2
-rw-r--r--kicker/applets/trash/trashbutton.cpp4
-rw-r--r--kicker/extensions/dockbar/dockbarextension.cpp2
-rw-r--r--kicker/extensions/kasbar/kastasker.cpp32
-rw-r--r--kicker/extensions/kasbar/kastaskitem.cpp2
-rw-r--r--kicker/extensions/sidebar/sidebarextension.cpp2
-rw-r--r--kicker/kicker/core/container_applet.cpp6
-rw-r--r--kicker/kicker/core/container_button.cpp2
-rw-r--r--kicker/kicker/core/container_extension.cpp4
-rw-r--r--kicker/kicker/core/kicker.cpp2
-rw-r--r--kicker/kicker/core/kickerbindings.cpp2
-rw-r--r--kicker/kicker/core/pluginmanager.cpp6
-rw-r--r--kicker/kicker/ui/addapplet.cpp2
-rw-r--r--kicker/kicker/ui/k_mnu.cpp2
-rw-r--r--kicker/kicker/ui/k_new_mnu.cpp12
-rw-r--r--kicker/kicker/ui/service_mnu.cpp4
-rw-r--r--kicker/libkicker/kickertip.cpp4
-rw-r--r--kicker/libkicker/menuinfo.cpp2
-rw-r--r--kicker/menuext/kate/katesessionmenu.cpp2
-rw-r--r--kicker/taskbar/taskbar.cpp2
-rw-r--r--kicker/taskbar/taskbarbindings.cpp2
-rw-r--r--kicker/taskmanager/taskmanager.cpp2
-rw-r--r--klipper/configdialog.cpp2
-rw-r--r--klipper/klipperbindings.cpp2
-rw-r--r--klipper/toplevel.cpp8
-rw-r--r--kmenuedit/kmenuedit.cpp6
-rw-r--r--konqueror/KonqMainWindowIface.cpp6
-rw-r--r--konqueror/keditbookmarks/actionsimpl.cpp86
-rw-r--r--konqueror/keditbookmarks/favicons.cpp2
-rw-r--r--konqueror/konq_extensionmanager.cpp4
-rw-r--r--konqueror/konq_factory.cpp4
-rw-r--r--konqueror/konq_frame.cpp2
-rw-r--r--konqueror/konq_guiclients.cpp2
-rw-r--r--konqueror/konq_mainwindow.cpp174
-rw-r--r--konqueror/konq_view.cpp2
-rw-r--r--konqueror/listview/konq_infolistviewwidget.cpp2
-rw-r--r--konqueror/shellcmdplugin/kshellcmdexecutor.cpp8
-rw-r--r--konqueror/sidebar/konqsidebar.cpp4
-rw-r--r--konqueror/sidebar/sidebar_widget.cpp4
-rw-r--r--konqueror/sidebar/trees/konq_sidebartree.cpp16
-rw-r--r--konsole/konsole/TEWidget.cpp2
-rw-r--r--konsole/konsole/konsole.cpp142
-rw-r--r--konsole/konsole/konsole_part.cpp12
-rw-r--r--konsole/konsole/kwrited.cpp2
-rw-r--r--kpager/kpager.cpp6
-rw-r--r--ksmserver/shutdown.cpp2
-rw-r--r--ksplashml/themeengine/themeengine.cpp4
-rw-r--r--ksplashml/wndmain.cpp2
-rw-r--r--ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp10
-rw-r--r--ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h4
-rw-r--r--ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h4
-rw-r--r--ksysguard/gui/ksysguard.cpp22
-rw-r--r--ksystraycmd/ksystraycmd.cpp2
-rw-r--r--kxkb/kcmlayout.cpp56
-rw-r--r--kxkb/kxkb.cpp2
-rw-r--r--kxkb/kxkbbindings.cpp2
-rw-r--r--libkonq/konq_iconviewwidget.cpp4
-rw-r--r--libkonq/konq_pixmapprovider.cpp2
-rw-r--r--libkonq/konq_popupmenu.cpp24
-rw-r--r--libkonq/konq_sound.cpp2
-rw-r--r--tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp2
-rw-r--r--tdeprint/kprinter/printwrapper.cpp2
-rw-r--r--tdeprint/tdeprintfax/tdeprintfax.cpp24
-rw-r--r--tdm/kfrontend/kchooser.cpp2
-rw-r--r--tdm/kfrontend/kgapp.cpp2
-rw-r--r--tdm/kfrontend/krootimage.cpp4
-rw-r--r--tdm/kfrontend/themer/tdmthemer.cpp4
-rw-r--r--twin/kcmtwin/twinrules/kcm.cpp2
-rw-r--r--twin/sm.cpp2
126 files changed, 599 insertions, 599 deletions
diff --git a/drkonqi/debugger.cpp b/drkonqi/debugger.cpp
index 4e3622e12..a9625d44a 100644
--- a/drkonqi/debugger.cpp
+++ b/drkonqi/debugger.cpp
@@ -193,7 +193,7 @@ void KrashDebugger :: startDebugger()
}
m_status->setText(i18n("Loading symbols..."));
- m_proctrace = new BackTrace(m_krashconf, TQT_TQOBJECT(this));
+ m_proctrace = new BackTrace(m_krashconf, this);
connect(m_proctrace, TQT_SIGNAL(append(const TQString &)),
TQT_SLOT(slotAppend(const TQString &)));
diff --git a/drkonqi/toplevel.cpp b/drkonqi/toplevel.cpp
index 297181d89..969a1a8cd 100644
--- a/drkonqi/toplevel.cpp
+++ b/drkonqi/toplevel.cpp
@@ -159,7 +159,7 @@ void Toplevel :: slotUser1()
TQApplication::setOverrideCursor ( TQt::waitCursor );
// generate the backtrace
- BackTrace *backtrace = new BackTrace(m_krashconf, TQT_TQOBJECT(this));
+ BackTrace *backtrace = new BackTrace(m_krashconf, this);
connect(backtrace, TQT_SIGNAL(someError()), TQT_SLOT(slotBacktraceSomeError()));
connect(backtrace, TQT_SIGNAL(done(const TQString &)), TQT_SLOT(slotBacktraceDone(const TQString &)));
@@ -198,7 +198,7 @@ void Toplevel :: slotUser3()
TQApplication::setOverrideCursor ( TQt::waitCursor );
// generate the backtrace
- BackTrace *backtrace = new BackTrace(m_krashconf, TQT_TQOBJECT(this));
+ BackTrace *backtrace = new BackTrace(m_krashconf, this);
connect(backtrace, TQT_SIGNAL(someError()), TQT_SLOT(slotSendReportBacktraceSomeError()));
connect(backtrace, TQT_SIGNAL(done(const TQString &)), TQT_SLOT(slotSendReportBacktraceDone(const TQString &)));
diff --git a/kappfinder/toplevel.cpp b/kappfinder/toplevel.cpp
index fd6fd1283..bcf8e6aef 100644
--- a/kappfinder/toplevel.cpp
+++ b/kappfinder/toplevel.cpp
@@ -77,18 +77,18 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
layout->addWidget( mSummary );
KButtonBox* bbox = new KButtonBox( this );
- mScanButton = bbox->addButton( KGuiItem( i18n( "Scan" ), "edit-find"), TQT_TQOBJECT(this), TQT_SLOT( slotScan() ) );
+ mScanButton = bbox->addButton( KGuiItem( i18n( "Scan" ), "edit-find"), this, TQT_SLOT( slotScan() ) );
bbox->addStretch( 5 );
- mSelectButton = bbox->addButton( i18n( "Select All" ), TQT_TQOBJECT(this),
+ mSelectButton = bbox->addButton( i18n( "Select All" ), this,
TQT_SLOT( slotSelectAll() ) );
mSelectButton->setEnabled( false );
- mUnSelectButton = bbox->addButton( i18n( "Unselect All" ), TQT_TQOBJECT(this),
+ mUnSelectButton = bbox->addButton( i18n( "Unselect All" ), this,
TQT_SLOT( slotUnselectAll() ) );
mUnSelectButton->setEnabled( false );
bbox->addStretch( 5 );
- mApplyButton = bbox->addButton( KStdGuiItem::apply(), TQT_TQOBJECT(this), TQT_SLOT( slotCreate() ) );
+ mApplyButton = bbox->addButton( KStdGuiItem::apply(), this, TQT_SLOT( slotCreate() ) );
mApplyButton->setEnabled( false );
- bbox->addButton( KStdGuiItem::close(), TQT_TQOBJECT(kapp), TQT_SLOT( quit() ) );
+ bbox->addButton( KStdGuiItem::close(), kapp, TQT_SLOT( quit() ) );
bbox->layout();
layout->addWidget( bbox );
diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp
index 0176545fa..0e4c18121 100644
--- a/kate/app/kateapp.cpp
+++ b/kate/app/kateapp.cpp
@@ -69,10 +69,10 @@ KateApp::KateApp (TDECmdLineArgs *args)
m_application = new Kate::Application (this);
// doc + project man
- m_docManager = new KateDocManager (TQT_TQOBJECT(this));
+ m_docManager = new KateDocManager (this);
// init all normal plugins
- m_pluginManager = new KatePluginManager (TQT_TQOBJECT(this));
+ m_pluginManager = new KatePluginManager (this);
// session manager up
m_sessionManager = KateSessionManager::self();
diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp
index 6fcd4e483..c2763f73a 100644
--- a/kate/app/kateconfigdialog.cpp
+++ b/kate/app/kateconfigdialog.cpp
@@ -297,7 +297,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
/*TQVBox **/page=addVBoxPage(path,i18n("Plugin Manager"),
BarIcon("connect_established",TDEIcon::SizeSmall));
KateConfigPluginPage *configPluginPage = new KateConfigPluginPage(page, this);
- connect( configPluginPage, TQT_SIGNAL( changed() ), TQT_TQOBJECT(this), TQT_SLOT( slotChanged() ) );
+ connect( configPluginPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
// Tools->External Tools menu
path.clear();
@@ -305,7 +305,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
page = addVBoxPage( path, i18n("External Tools"),
BarIcon("configure", TDEIcon::SizeSmall) );
configExternalToolsPage = new KateExternalToolsConfigWidget(page, "external tools config page");
- connect( configExternalToolsPage, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotChanged()) );
+ connect( configExternalToolsPage, TQT_SIGNAL(changed()), this, TQT_SLOT(slotChanged()) );
// editor widgets from kwrite/kwdialog
path.clear();
diff --git a/kate/app/kateconsole.cpp b/kate/app/kateconsole.cpp
index cb49ef16e..84d2cb22c 100644
--- a/kate/app/kateconsole.cpp
+++ b/kate/app/kateconsole.cpp
@@ -64,7 +64,7 @@ void KateConsole::loadConsoleIfNeeded()
if (!factory) return;
- m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(TQT_TQOBJECT(this),"libkonsolepart", "KParts::ReadOnlyPart"));
+ m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(this,"libkonsolepart", "KParts::ReadOnlyPart"));
if (!m_part) return;
diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp
index 5379d665d..6304a8657 100644
--- a/kate/app/katefilelist.cpp
+++ b/kate/app/katefilelist.cpp
@@ -136,20 +136,20 @@ KateFileList::~KateFileList ()
void KateFileList::setupActions ()
{
- windowNext = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(slotPrevDocument()), m_main->actionCollection());
- windowPrev = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(slotNextDocument()), m_main->actionCollection());
+ windowNext = KStdAction::back(this, TQT_SLOT(slotPrevDocument()), m_main->actionCollection());
+ windowPrev = KStdAction::forward(this, TQT_SLOT(slotNextDocument()), m_main->actionCollection());
sortAction = new TDESelectAction( i18n("Sort &By"), 0,
m_main->actionCollection(), "filelist_sortby" );
listMoveFileUp = new TDEAction( i18n("Move File Up"), 0, m_main->actionCollection(), "filelist_move_up" );
//listMoveFileUp->setShortcut(TDEShortcut(CTRL + SHIFT + Key_Comma));
listMoveFileDown = new TDEAction( i18n("Move File Down"), 0, m_main->actionCollection(), "filelist_move_down" );
//listMoveFileDown->setShortcut(TDEShortcut(CTRL + SHIFT + Key_Period));
- connect( listMoveFileUp, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(moveFileUp()) );
- connect( listMoveFileDown, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(moveFileDown()) );
+ connect( listMoveFileUp, TQT_SIGNAL(activated()), this, TQT_SLOT(moveFileUp()) );
+ connect( listMoveFileDown, TQT_SIGNAL(activated()), this, TQT_SLOT(moveFileDown()) );
TQStringList l;
l << i18n("Opening Order") << i18n("Document Name") << i18n("URL") << i18n("Manual Placement");
sortAction->setItems( l );
- connect( sortAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setSortType(int)) );
+ connect( sortAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setSortType(int)) );
}
void KateFileList::updateActions ()
diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp
index 67ea67a8b..640e901a7 100644
--- a/kate/app/katefileselector.cpp
+++ b/kate/app/katefileselector.cpp
@@ -168,7 +168,7 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow,
// tdeaction for the dir sync method
acSyncDir = new TDEAction( i18n("Current Document Folder"), "curfiledir", 0,
- TQT_TQOBJECT(this), TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" );
+ this, TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" );
toolbar->setIconText( TDEToolBar::IconOnly );
toolbar->setIconSize( 16 );
toolbar->setEnableContextMenu( false );
diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp
index ddeda4cd4..c32043104 100644
--- a/kate/app/kategrepdialog.cpp
+++ b/kate/app/kategrepdialog.cpp
@@ -153,7 +153,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
loInput->addLayout( loFiles, 2, 1 );
cmbFiles = new KComboBox(true, this);
- lFiles->setBuddy(TQT_TQWIDGET(cmbFiles->focusProxy()));
+ lFiles->setBuddy(cmbFiles->focusProxy());
cmbFiles->setMinimumSize(cmbFiles->sizeHint());
cmbFiles->setInsertionPolicy(TQComboBox::NoInsertion);
cmbFiles->setDuplicatesEnabled(false);
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index 906bac6f5..c08b18d0a 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -243,25 +243,25 @@ void KateMainWindow::setupActions()
{
TDEAction *a;
- KStdAction::openNew( TQT_TQOBJECT(m_viewManager), TQT_SLOT( slotDocumentNew() ), actionCollection(), "file_new" )->setWhatsThis(i18n("Create a new document"));
- KStdAction::open( TQT_TQOBJECT(m_viewManager), TQT_SLOT( slotDocumentOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Open an existing document for editing"));
+ KStdAction::openNew( m_viewManager, TQT_SLOT( slotDocumentNew() ), actionCollection(), "file_new" )->setWhatsThis(i18n("Create a new document"));
+ KStdAction::open( m_viewManager, TQT_SLOT( slotDocumentOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Open an existing document for editing"));
- fileOpenRecent = KStdAction::openRecent (TQT_TQOBJECT(m_viewManager), TQT_SLOT(openURL (const KURL&)), actionCollection());
+ fileOpenRecent = KStdAction::openRecent (m_viewManager, TQT_SLOT(openURL (const KURL&)), actionCollection());
fileOpenRecent->setWhatsThis(i18n("This lists files which you have opened recently, and allows you to easily open them again."));
a=new TDEAction( i18n("Save A&ll"),"save_all", CTRL+Key_L, KateDocManager::self(), TQT_SLOT( saveAll() ), actionCollection(), "file_save_all" );
a->setWhatsThis(i18n("Save all open, modified documents to disk."));
- KStdAction::close( TQT_TQOBJECT(m_viewManager), TQT_SLOT( slotDocumentClose() ), actionCollection(), "file_close" )->setWhatsThis(i18n("Close the current document."));
+ KStdAction::close( m_viewManager, TQT_SLOT( slotDocumentClose() ), actionCollection(), "file_close" )->setWhatsThis(i18n("Close the current document."));
- a=new TDEAction( i18n( "Clos&e All" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotDocumentCloseAll() ), actionCollection(), "file_close_all" );
+ a=new TDEAction( i18n( "Clos&e All" ), 0, this, TQT_SLOT( slotDocumentCloseAll() ), actionCollection(), "file_close_all" );
a->setWhatsThis(i18n("Close all open documents."));
- KStdAction::mail( TQT_TQOBJECT(this), TQT_SLOT(slotMail()), actionCollection() )->setWhatsThis(i18n("Send one or more of the open documents as email attachments."));
+ KStdAction::mail( this, TQT_SLOT(slotMail()), actionCollection() )->setWhatsThis(i18n("Send one or more of the open documents as email attachments."));
- KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotFileQuit() ), actionCollection(), "file_quit" )->setWhatsThis(i18n("Close this window"));
+ KStdAction::quit( this, TQT_SLOT( slotFileQuit() ), actionCollection(), "file_quit" )->setWhatsThis(i18n("Close this window"));
- a=new TDEAction(i18n("&New Window"), "window-new", 0, TQT_TQOBJECT(this), TQT_SLOT(newWindow()), actionCollection(), "view_new_view");
+ a=new TDEAction(i18n("&New Window"), "window-new", 0, this, TQT_SLOT(newWindow()), actionCollection(), "view_new_view");
a->setWhatsThis(i18n("Create a new Kate view (a new window with the same document list)."));
if ( KateApp::self()->authorize("shell_access") )
@@ -278,57 +278,57 @@ void KateMainWindow::setupActions()
connect(documentOpenWith->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(mSlotFixOpenWithMenu()));
connect(documentOpenWith->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotOpenWithMenuAction(int)));
- a=KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(editKeys()), actionCollection());
+ a=KStdAction::keyBindings(this, TQT_SLOT(editKeys()), actionCollection());
a->setWhatsThis(i18n("Configure the application's keyboard shortcut assignments."));
- a=KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection());
+ a=KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()), actionCollection());
a->setWhatsThis(i18n("Configure which items should appear in the toolbar(s)."));
- TDEAction* settingsConfigure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection(), "settings_configure");
+ TDEAction* settingsConfigure = KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actionCollection(), "settings_configure");
settingsConfigure->setWhatsThis(i18n("Configure various aspects of this application and the editing component."));
// pipe to terminal action
if (KateApp::self()->authorize("shell_access"))
- new TDEAction(i18n("&Pipe to Console"), "pipe", 0, TQT_TQOBJECT(console), TQT_SLOT(slotPipeToConsole()), actionCollection(), "tools_pipe_to_terminal");
+ new TDEAction(i18n("&Pipe to Console"), "pipe", 0, console, TQT_SLOT(slotPipeToConsole()), actionCollection(), "tools_pipe_to_terminal");
// tip of the day :-)
- KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( tipOfTheDay() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application."));
+ KStdAction::tipOfDay( this, TQT_SLOT( tipOfTheDay() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application."));
if (KatePluginManager::self()->pluginList().count() > 0)
{
- a=new TDEAction(i18n("&Plugins Handbook"), 0, TQT_TQOBJECT(this), TQT_SLOT(pluginHelp()), actionCollection(), "help_plugins_contents");
+ a=new TDEAction(i18n("&Plugins Handbook"), 0, this, TQT_SLOT(pluginHelp()), actionCollection(), "help_plugins_contents");
a->setWhatsThis(i18n("This shows help files for various available plugins."));
}
- connect(m_viewManager,TQT_SIGNAL(viewChanged()),TQT_TQOBJECT(this),TQT_SLOT(slotWindowActivated()));
- connect(m_viewManager,TQT_SIGNAL(viewChanged()),TQT_TQOBJECT(this),TQT_SLOT(slotUpdateOpenWith()));
+ connect(m_viewManager,TQT_SIGNAL(viewChanged()),this,TQT_SLOT(slotWindowActivated()));
+ connect(m_viewManager,TQT_SIGNAL(viewChanged()),this,TQT_SLOT(slotUpdateOpenWith()));
slotWindowActivated ();
// session actions
new TDEAction(i18n("&New"), "list-add", 0,
- TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotNewSession()), actionCollection(), "session_new");
+ m_sessionpanel, TQT_SLOT(slotNewSession()), actionCollection(), "session_new");
new TDEAction(i18n("&Save"), "document-save", 0,
- TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotSaveSession()), actionCollection(), "session_save");
+ m_sessionpanel, TQT_SLOT(slotSaveSession()), actionCollection(), "session_save");
new TDEAction(i18n("Save &As..."), "document-save-as", 0,
- TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotSaveSessionAs()), actionCollection(), "session_save_as");
+ m_sessionpanel, TQT_SLOT(slotSaveSessionAs()), actionCollection(), "session_save_as");
new TDEAction(i18n("&Rename"), "edit_user", 0,
- TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotRenameSession()), actionCollection(), "session_rename");
+ m_sessionpanel, TQT_SLOT(slotRenameSession()), actionCollection(), "session_rename");
new TDEAction(i18n("&Delete"), "edit-delete", 0,
- TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotDeleteSession()), actionCollection(), "session_delete");
+ m_sessionpanel, TQT_SLOT(slotDeleteSession()), actionCollection(), "session_delete");
new TDEAction(i18n("Re&load"), "reload", 0,
- TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotReloadSession()), actionCollection(), "session_reload");
+ m_sessionpanel, TQT_SLOT(slotReloadSession()), actionCollection(), "session_reload");
new TDEAction(i18n("Acti&vate"), "forward", 0,
- TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotActivateSession()), actionCollection(), "session_activate");
+ m_sessionpanel, TQT_SLOT(slotActivateSession()), actionCollection(), "session_activate");
new TDEToggleAction(i18n("Toggle read &only"), "encrypted", 0,
- TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotSessionToggleReadOnly()), actionCollection(), "session_toggle_read_only");
+ m_sessionpanel, TQT_SLOT(slotSessionToggleReadOnly()), actionCollection(), "session_toggle_read_only");
new TDEAction(i18n("Move &Up"), "go-up", 0,
- TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotSessionMoveUp()), actionCollection(), "session_move_up");
+ m_sessionpanel, TQT_SLOT(slotSessionMoveUp()), actionCollection(), "session_move_up");
new TDEAction(i18n("Move Do&wn"), "go-down", 0,
- TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotSessionMoveDown()), actionCollection(), "session_move_down");
+ m_sessionpanel, TQT_SLOT(slotSessionMoveDown()), actionCollection(), "session_move_down");
new KateSessionListActionMenu(this, i18n("Sele&ct session"), actionCollection(), "session_list");
- connect(m_sessionpanel, TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotSelectionChanged()));
+ connect(m_sessionpanel, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
}
KateTabWidget *KateMainWindow::tabWidget ()
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp
index d3d4528b1..43c2f8925 100644
--- a/kate/app/katemdi.cpp
+++ b/kate/app/katemdi.cpp
@@ -256,8 +256,8 @@ bool ToolView::visible () const
void ToolView::childEvent ( TQChildEvent *ev )
{
// set the widget to be focus proxy if possible
- if (ev->inserted() && ev->child() && TQT_TQOBJECT(ev->child())->tqt_cast("TQWidget")) {
- setFocusProxy (::tqt_cast<TQWidget*>(TQT_TQOBJECT(ev->child())));
+ if (ev->inserted() && ev->child() && ev->child()->tqt_cast("TQWidget")) {
+ setFocusProxy (::tqt_cast<TQWidget*>(ev->child()));
}
TQVBox::childEvent (ev);
diff --git a/kate/app/katesessionpanel.cpp b/kate/app/katesessionpanel.cpp
index c2f262ff8..2eacc3c59 100644
--- a/kate/app/katesessionpanel.cpp
+++ b/kate/app/katesessionpanel.cpp
@@ -199,45 +199,45 @@ void KateSessionPanel::setup_toolbar()
TDEAction *a;
a = new TDEAction(i18n("New"), SmallIcon("list-add"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotNewSession()), m_actionCollection, "session_new");
+ this, TQT_SLOT(slotNewSession()), m_actionCollection, "session_new");
a->setWhatsThis(i18n("Create a new session and switch to it."));
a->plug(m_toolbar);
a = new TDEAction(i18n("Save"), SmallIcon("document-save"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotSaveSession()), m_actionCollection, "session_save");
+ this, TQT_SLOT(slotSaveSession()), m_actionCollection, "session_save");
a->setWhatsThis(i18n("Save the selected session."));
a->plug(m_toolbar);
a = new TDEAction(i18n("Save as..."), SmallIcon("document-save-as"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotSaveSessionAs()), m_actionCollection, "session_save_as");
+ this, TQT_SLOT(slotSaveSessionAs()), m_actionCollection, "session_save_as");
a->setWhatsThis(i18n("Save an unsaved session with a new name or clone an already saved session "
"into a new session."));
a->plug(m_toolbar);
a = new TDEAction(i18n("Rename"), SmallIcon("edit_user"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotRenameSession()), m_actionCollection, "session_rename");
+ this, TQT_SLOT(slotRenameSession()), m_actionCollection, "session_rename");
a->setWhatsThis(i18n("Rename the selected session."));
a->plug(m_toolbar);
a = new TDEAction(i18n("Delete"), SmallIcon("edit-delete"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotDeleteSession()), m_actionCollection, "session_delete");
+ this, TQT_SLOT(slotDeleteSession()), m_actionCollection, "session_delete");
a->setWhatsThis(i18n("Delete the selected session."));
a->plug(m_toolbar);
a = new TDEAction(i18n("Reload"), SmallIcon("reload"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotReloadSession()), m_actionCollection, "session_reload");
+ this, TQT_SLOT(slotReloadSession()), m_actionCollection, "session_reload");
a->setWhatsThis(i18n("Reload the last saved state of the selected session."));
a->plug(m_toolbar);
m_toolbar->insertLineSeparator();
a = new TDEAction(i18n("Activate"), SmallIcon("forward"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotActivateSession()), m_actionCollection, "session_activate");
+ this, TQT_SLOT(slotActivateSession()), m_actionCollection, "session_activate");
a->setWhatsThis(i18n("Activate the selected session."));
a->plug(m_toolbar);
TDEToggleAction *tglA = new TDEToggleAction(i18n("Toggle read only"), SmallIcon("encrypted"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotSessionToggleReadOnly()), m_actionCollection, "session_toggle_read_only");
+ this, TQT_SLOT(slotSessionToggleReadOnly()), m_actionCollection, "session_toggle_read_only");
tglA->setWhatsThis(i18n("Toggle read only status for the selected session.<p>"
"In a read only session, you can work as usual but the list of documents in the session "
"will not be saved when you exit Kate or switch to another session.<p>"
@@ -245,12 +245,12 @@ void KateSessionPanel::setup_toolbar()
tglA->plug(m_toolbar);
a = new TDEAction(i18n("Move Up"), SmallIcon("go-up"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotSessionMoveUp()), m_actionCollection, "session_move_up");
+ this, TQT_SLOT(slotSessionMoveUp()), m_actionCollection, "session_move_up");
a->setWhatsThis(i18n("Move up the selected session."));
a->plug(m_toolbar);
a = new TDEAction(i18n("Move Down"), SmallIcon("go-down"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotSessionMoveDown()), m_actionCollection, "session_move_down");
+ this, TQT_SLOT(slotSessionMoveDown()), m_actionCollection, "session_move_down");
a->setWhatsThis(i18n("Move down the selected session."));
a->plug(m_toolbar);
}
diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp
index 7682b6cfd..876faec5b 100644
--- a/kate/app/kateviewmanager.cpp
+++ b/kate/app/kateviewmanager.cpp
@@ -94,47 +94,47 @@ void KateViewManager::setupActions ()
/**
* tabbing
*/
- a=new TDEAction ( i18n("New Tab"),"tab_new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewTab()),
+ a=new TDEAction ( i18n("New Tab"),"tab_new", 0, this, TQT_SLOT(slotNewTab()),
m_mainWindow->actionCollection(), "view_new_tab" );
- m_closeTab = new TDEAction ( i18n("Close Current Tab"),"tab_remove",0,TQT_TQOBJECT(this),TQT_SLOT(slotCloseTab()),
+ m_closeTab = new TDEAction ( i18n("Close Current Tab"),"tab_remove",0,this,TQT_SLOT(slotCloseTab()),
m_mainWindow->actionCollection(),"view_close_tab");
m_activateNextTab
= new TDEAction( i18n( "Activate Next Tab" ),
TQApplication::reverseLayout() ? TDEStdAccel::tabPrev() : TDEStdAccel::tabNext(),
- TQT_TQOBJECT(this), TQT_SLOT( activateNextTab() ), m_mainWindow->actionCollection(), "view_next_tab" );
+ this, TQT_SLOT( activateNextTab() ), m_mainWindow->actionCollection(), "view_next_tab" );
m_activatePrevTab
= new TDEAction( i18n( "Activate Previous Tab" ),
TQApplication::reverseLayout() ? TDEStdAccel::tabNext() : TDEStdAccel::tabPrev(),
- TQT_TQOBJECT(this), TQT_SLOT( activatePrevTab() ), m_mainWindow->actionCollection(), "view_prev_tab" );
+ this, TQT_SLOT( activatePrevTab() ), m_mainWindow->actionCollection(), "view_prev_tab" );
/**
* view splitting
*/
- a=new TDEAction ( i18n("Split Ve&rtical"), "view_right", CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), TQT_SLOT(
+ a=new TDEAction ( i18n("Split Ve&rtical"), "view_right", CTRL+SHIFT+Key_L, this, TQT_SLOT(
slotSplitViewSpaceVert() ), m_mainWindow->actionCollection(), "view_split_vert");
a->setWhatsThis(i18n("Split the currently active view vertically into two views."));
- a=new TDEAction ( i18n("Split &Horizontal"), "view_bottom", CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), TQT_SLOT(
+ a=new TDEAction ( i18n("Split &Horizontal"), "view_bottom", CTRL+SHIFT+Key_T, this, TQT_SLOT(
slotSplitViewSpaceHoriz() ), m_mainWindow->actionCollection(), "view_split_horiz");
a->setWhatsThis(i18n("Split the currently active view horizontally into two views."));
- m_closeView = new TDEAction ( i18n("Cl&ose Current View"), "view_remove", CTRL+SHIFT+Key_R, TQT_TQOBJECT(this),
+ m_closeView = new TDEAction ( i18n("Cl&ose Current View"), "view_remove", CTRL+SHIFT+Key_R, this,
TQT_SLOT( slotCloseCurrentViewSpace() ), m_mainWindow->actionCollection(),
"view_close_current_space" );
m_closeView->setWhatsThis(i18n("Close the currently active splitted view"));
- goNext=new TDEAction(i18n("Next View"),Key_F8,TQT_TQOBJECT(this),
+ goNext=new TDEAction(i18n("Next View"),Key_F8,this,
TQT_SLOT(activateNextView()),m_mainWindow->actionCollection(),"go_next");
goNext->setWhatsThis(i18n("Make the next split view the active one."));
- goPrev=new TDEAction(i18n("Previous View"),SHIFT+Key_F8, TQT_TQOBJECT(this), TQT_SLOT(activatePrevView()),m_mainWindow->actionCollection(),"go_prev");
+ goPrev=new TDEAction(i18n("Previous View"),SHIFT+Key_F8, this, TQT_SLOT(activatePrevView()),m_mainWindow->actionCollection(),"go_prev");
goPrev->setWhatsThis(i18n("Make the previous split view the active one."));
diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp
index 00eb85a68..d2c769f33 100644
--- a/kate/app/kwritemain.cpp
+++ b/kate/app/kwritemain.cpp
@@ -139,41 +139,41 @@ KWrite::~KWrite()
void KWrite::setupActions()
{
- KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT(slotFlush()), actionCollection(), "file_close" )->setWhatsThis(i18n("Use this to close the current document"));
+ KStdAction::close( this, TQT_SLOT(slotFlush()), actionCollection(), "file_close" )->setWhatsThis(i18n("Use this to close the current document"));
// setup File menu
- KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(printDlg()), actionCollection())->setWhatsThis(i18n("Use this command to print the current document"));
- KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT(slotNew()), actionCollection(), "file_new" )->setWhatsThis(i18n("Use this command to create a new document"));
- KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Use this command to open an existing document for editing"));
+ KStdAction::print(this, TQT_SLOT(printDlg()), actionCollection())->setWhatsThis(i18n("Use this command to print the current document"));
+ KStdAction::openNew( this, TQT_SLOT(slotNew()), actionCollection(), "file_new" )->setWhatsThis(i18n("Use this command to create a new document"));
+ KStdAction::open( this, TQT_SLOT( slotOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Use this command to open an existing document for editing"));
- m_recentFiles = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotOpen(const KURL&)),
+ m_recentFiles = KStdAction::openRecent(this, TQT_SLOT(slotOpen(const KURL&)),
actionCollection());
m_recentFiles->setWhatsThis(i18n("This lists files which you have opened recently, and allows you to easily open them again."));
- TDEAction *a=new TDEAction(i18n("&New Window"), "window-new", 0, TQT_TQOBJECT(this), TQT_SLOT(newView()),
+ TDEAction *a=new TDEAction(i18n("&New Window"), "window-new", 0, this, TQT_SLOT(newView()),
actionCollection(), "view_new_view");
a->setWhatsThis(i18n("Create another view containing the current document"));
- a=new TDEAction(i18n("Choose Editor Component..."),0,TQT_TQOBJECT(this),TQT_SLOT(changeEditor()),
+ a=new TDEAction(i18n("Choose Editor Component..."),0,this,TQT_SLOT(changeEditor()),
actionCollection(),"settings_choose_editor");
a->setWhatsThis(i18n("Override the system wide setting for the default editing component"));
- KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection())->setWhatsThis(i18n("Close the current document view"));
+ KStdAction::quit(this, TQT_SLOT(close()), actionCollection())->setWhatsThis(i18n("Close the current document view"));
// setup Settings menu
setStandardToolBarMenuEnabled(true);
- m_paShowStatusBar = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(toggleStatusBar()), actionCollection(), "settings_show_statusbar");
+ m_paShowStatusBar = KStdAction::showStatusbar(this, TQT_SLOT(toggleStatusBar()), actionCollection(), "settings_show_statusbar");
m_paShowStatusBar->setWhatsThis(i18n("Use this command to show or hide the view's statusbar"));
- m_paShowPath = new TDEToggleAction(i18n("Sho&w Path"), 0, TQT_TQOBJECT(this), TQT_SLOT(newCaption()),
+ m_paShowPath = new TDEToggleAction(i18n("Sho&w Path"), 0, this, TQT_SLOT(newCaption()),
actionCollection(), "set_showPath");
m_paShowPath->setCheckedState(i18n("Hide Path"));
m_paShowPath->setWhatsThis(i18n("Show the complete document path in the window caption"));
- a=KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(editKeys()), actionCollection());
+ a=KStdAction::keyBindings(this, TQT_SLOT(editKeys()), actionCollection());
a->setWhatsThis(i18n("Configure the application's keyboard shortcut assignments."));
- a=KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(editToolbars()), actionCollection());
+ a=KStdAction::configureToolbars(this, TQT_SLOT(editToolbars()), actionCollection());
a->setWhatsThis(i18n("Configure which items should appear in the toolbar(s)."));
}
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index 89847c9b2..66acb0fce 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -73,7 +73,7 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop)
m_previewUpdates = true;
KWinModule *m_twin;
- m_twin = new KWinModule(TQT_TQOBJECT(this));
+ m_twin = new KWinModule(this);
m_curDesk = m_twin->currentDesktop();
TQSize s(m_twin->numberOfViewports(m_twin->currentDesktop()));
m_useViewports = s.width() * s.height() > 1;
diff --git a/kcontrol/clock/dtime.h b/kcontrol/clock/dtime.h
index 387937185..ed8819502 100644
--- a/kcontrol/clock/dtime.h
+++ b/kcontrol/clock/dtime.h
@@ -118,7 +118,7 @@ class KStrictIntValidator : public TQIntValidator
public:
KStrictIntValidator(int bottom, int top, TQWidget * parent,
const char * name = 0 )
- : TQIntValidator(bottom, top, TQT_TQOBJECT(parent), name) {};
+ : TQIntValidator(bottom, top, parent, name) {};
TQValidator::State validate( TQString & input, int & d ) const;
};
diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp
index 2c262fc3b..02a4d4e82 100644
--- a/kcontrol/displayconfig/displayconfig.cpp
+++ b/kcontrol/displayconfig/displayconfig.cpp
@@ -434,8 +434,8 @@ void KDisplayConfig::updateDraggableMonitorInformationInternal (int monitor_id,
monitors = base->monitorPhyArrange->childrenListObject();
if ( monitors.count() ) {
for ( i = 0; i < int(monitors.count()); ++i ) {
- if (::tqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) {
- DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )));
+ if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) {
+ DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i ));
if (monitor->screen_id == monitor_id) {
moved_monitor = monitor;
screendata = m_screenInfoArray[activeProfileName].at(moved_monitor->screen_id);
@@ -475,8 +475,8 @@ void KDisplayConfig::updateDraggableMonitorInformationInternal (int monitor_id,
primary_monitor = NULL;
if ( monitors.count() ) {
for ( i = 0; i < int(monitors.count()); ++i ) {
- if (::tqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) {
- DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )));
+ if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) {
+ DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i ));
if (monitor->screen_id == j) {
monitor->is_primary = true; // Prevent dragging of the primary monitor
primary_monitor = monitor;
@@ -548,8 +548,8 @@ bool KDisplayConfig::applyMonitorLayoutRules(DraggableMonitor* monitor_to_move)
monitors = base->monitorPhyArrange->childrenListObject();
if ( monitors.count() ) {
for ( i = 0; i < int(monitors.count()); ++i ) {
- if (::tqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) {
- DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )));
+ if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) {
+ DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i ));
if (monitor != monitor_to_move) {
other_monitors = other_monitors.unite(MonitorRegion(monitor->geometry()));
}
@@ -592,8 +592,8 @@ bool KDisplayConfig::applyMonitorLayoutRules(DraggableMonitor* monitor_to_move)
monitors = base->monitorPhyArrange->childrenListObject();
if ( monitors.count() ) {
for ( i = 0; i < int(monitors.count()); ++i ) {
- if (::tqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) {
- DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )));
+ if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) {
+ DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i ));
if (monitor != monitor_to_move) {
other_monitors2 = other_monitors2.unite(MonitorRegion(monitor->geometry()));
}
@@ -641,8 +641,8 @@ void KDisplayConfig::moveMonitor(DraggableMonitor* monitor, int realx, int realy
primary_monitor = NULL;
if ( monitors.count() ) {
for ( i = 0; i < int(monitors.count()); ++i ) {
- if (::tqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) {
- DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )));
+ if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) {
+ DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i ));
if (monitor->screen_id == j) {
monitor->is_primary = true; // Prevent dragging of the primary monitor
primary_monitor = monitor;
@@ -1329,8 +1329,8 @@ void KDisplayConfig::updateDragDropDisplay() {
monitors = base->monitorPhyArrange->childrenListObject();
if ( monitors.count() ) {
for ( i = 0; i < int(monitors.count()); ++i ) {
- if (::tqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) {
- TQWidget *monitor = TQT_TQWIDGET(monitors.at( i ));
+ if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) {
+ TQWidget *monitor = static_cast<TQWidget*>(monitors.at( i ));
if ( !monitor->close(TRUE) ) {
Q_ASSERT("zombie monitor will not go away!");
}
@@ -1381,8 +1381,8 @@ void KDisplayConfig::layoutDragDropDisplay() {
monitors = base->monitorPhyArrange->childrenListObject();
if ( monitors.count() ) {
for ( i = 0; i < int(monitors.count()); ++i ) {
- if (::tqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) {
- DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )));
+ if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) {
+ DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i ));
screendata = m_screenInfoArray[activeProfileName].at(monitor->screen_id);
moveMonitor(monitor, screendata->absolute_x_position, screendata->absolute_y_position);
}
diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp
index d442552e3..0ce36a463 100644
--- a/kcontrol/dnssd/kcmdnssd.cpp
+++ b/kcontrol/dnssd/kcmdnssd.cpp
@@ -119,7 +119,7 @@ void KCMDnssd::load()
{
if (geteuid()==0) loadMdnsd();
enableZeroconf->setChecked(false);
- TQProcess avahiStatus(TQString("/usr/share/avahi/avahi_status"), TQT_TQOBJECT(this), "avahiStatus");
+ TQProcess avahiStatus(TQString("/usr/share/avahi/avahi_status"), this, "avahiStatus");
avahiStatus.start();
while (avahiStatus.isRunning()) {
kapp->processEvents();
diff --git a/kcontrol/hwmanager/hwdevicetray.cpp b/kcontrol/hwmanager/hwdevicetray.cpp
index 8aade89ca..4f4393e7e 100644
--- a/kcontrol/hwmanager/hwdevicetray.cpp
+++ b/kcontrol/hwmanager/hwdevicetray.cpp
@@ -158,7 +158,7 @@ HwDeviceSystemTray::HwDeviceSystemTray(TQWidget *parent, const char *name)
connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(quitApp()));
TQToolTip::add(this, i18n("Device monitor"));
- globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this));
+ globalKeys = new TDEGlobalAccel(this);
TDEGlobalAccel* keys = globalKeys;
#include "hwdevicetray_bindings.cpp"
// the keys need to be read from tdeglobals, not kickerrc
diff --git a/kcontrol/hwmanager/hwdevicetray_bindings.cpp b/kcontrol/hwmanager/hwdevicetray_bindings.cpp
index bcbbbda1b..f8d8271bb 100644
--- a/kcontrol/hwmanager/hwdevicetray_bindings.cpp
+++ b/kcontrol/hwmanager/hwdevicetray_bindings.cpp
@@ -18,7 +18,7 @@
*/
#ifndef NOSLOTS
# define DEF( name, key3, key4, fnSlot ) \
- keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) )
+ keys->insert( name, i18n(name), TQString(), key3, key4, this, TQT_SLOT(fnSlot) )
#else
# define DEF( name, key3, key4, fnSlot ) \
keys->insert( name, i18n(name), TQString(), key3, key4 )
diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp
index 25ab4fc4a..a3912c5da 100644
--- a/kcontrol/kcontrol/main.cpp
+++ b/kcontrol/kcontrol/main.cpp
@@ -59,7 +59,7 @@ KControlApp::KControlApp()
TDEGlobal::setActiveInstance(this);
// KUniqueApplication does dcop regitration for us
- ModuleIface *modIface = new ModuleIface(TQT_TQOBJECT(toplevel), "moduleIface");
+ ModuleIface *modIface = new ModuleIface(toplevel, "moduleIface");
connect (modIface, TQT_SIGNAL(helpClicked()), toplevel, TQT_SLOT(slotHelpRequest()));
connect (modIface, TQT_SIGNAL(handbookClicked()), toplevel, TQT_SLOT(slotHandbookRequest()));
@@ -90,7 +90,7 @@ KControlApp::~KControlApp()
{
TDEConfig *config = TDEGlobal::config();
config->setGroup("General");
- TQWidget *desk = TQT_TQWIDGET(TQApplication::desktop());
+ TQWidget *desk = TQApplication::desktop();
config->writeEntry(TQString::fromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width());
config->writeEntry(TQString::fromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height());
config->sync();
diff --git a/kcontrol/kcontrol/moduleIface.cpp b/kcontrol/kcontrol/moduleIface.cpp
index dbaba9054..5cc43c82d 100644
--- a/kcontrol/kcontrol/moduleIface.cpp
+++ b/kcontrol/kcontrol/moduleIface.cpp
@@ -26,7 +26,7 @@
ModuleIface::ModuleIface(TQObject *parent, const char *name)
: TQObject(parent, name), DCOPObject(name) {
- _parent = TQT_TQWIDGET(parent);
+ _parent = static_cast<TQWidget*>(parent);
}
diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp
index c9a8a6763..bf7cc6f65 100644
--- a/kcontrol/kcontrol/toplevel.cpp
+++ b/kcontrol/kcontrol/toplevel.cpp
@@ -234,40 +234,40 @@ bool TopLevel::queryClose()
void TopLevel::setupActions()
{
- KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
+ KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
actionCollection());
icon_view = new TDERadioAction
- (i18n("&Icon View"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateIconView()),
+ (i18n("&Icon View"), 0, this, TQT_SLOT(activateIconView()),
actionCollection(), "activate_iconview");
icon_view->setExclusiveGroup( "viewmode" );
tree_view = new TDERadioAction
- (i18n("&Tree View"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateTreeView()),
+ (i18n("&Tree View"), 0, this, TQT_SLOT(activateTreeView()),
actionCollection(), "activate_treeview");
tree_view->setExclusiveGroup( "viewmode" );
icon_small = new TDERadioAction
- (i18n("&Small"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateSmallIcons()),
+ (i18n("&Small"), 0, this, TQT_SLOT(activateSmallIcons()),
actionCollection(), "activate_smallicons");
icon_small->setExclusiveGroup( "iconsize" );
icon_medium = new TDERadioAction
- (i18n("&Medium"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateMediumIcons()),
+ (i18n("&Medium"), 0, this, TQT_SLOT(activateMediumIcons()),
actionCollection(), "activate_mediumicons");
icon_medium->setExclusiveGroup( "iconsize" );
icon_large = new TDERadioAction
- (i18n("&Large"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateLargeIcons()),
+ (i18n("&Large"), 0, this, TQT_SLOT(activateLargeIcons()),
actionCollection(), "activate_largeicons");
icon_large->setExclusiveGroup( "iconsize" );
icon_huge = new TDERadioAction
- (i18n("&Huge"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateHugeIcons()),
+ (i18n("&Huge"), 0, this, TQT_SLOT(activateHugeIcons()),
actionCollection(), "activate_hugeicons");
icon_huge->setExclusiveGroup( "iconsize" );
- about_module = new TDEAction(i18n("About Current Module"), 0, TQT_TQOBJECT(this), TQT_SLOT(aboutModule()), actionCollection(), "help_about_module");
+ about_module = new TDEAction(i18n("About Current Module"), 0, this, TQT_SLOT(aboutModule()), actionCollection(), "help_about_module");
about_module->setEnabled(false);
createGUI("kcontrolui.rc");
diff --git a/kcontrol/locale/localemon.cpp b/kcontrol/locale/localemon.cpp
index 609e0c9ad..6d37cb15f 100644
--- a/kcontrol/locale/localemon.cpp
+++ b/kcontrol/locale/localemon.cpp
@@ -260,8 +260,8 @@ void TDELocaleConfigMoney::slotMonNegMonSignPosChanged(int i)
void TDELocaleConfigMoney::slotTranslate()
{
TQObjectList list;
- list.append(TQT_TQOBJECT(m_cmbMonPosMonSignPos));
- list.append(TQT_TQOBJECT(m_cmbMonNegMonSignPos));
+ list.append(m_cmbMonPosMonSignPos);
+ list.append(m_cmbMonNegMonSignPos);
TQComboBox *wc;
for (TQObjectListIt li(list) ; (wc = (TQComboBox *)li.current()) != 0; ++li)
diff --git a/kcontrol/randr/tderandrbindings.cpp b/kcontrol/randr/tderandrbindings.cpp
index b95441f08..5df10af1f 100644
--- a/kcontrol/randr/tderandrbindings.cpp
+++ b/kcontrol/randr/tderandrbindings.cpp
@@ -18,7 +18,7 @@
*/
#ifndef NOSLOTS
# define DEF( name, key3, key4, fnSlot ) \
- keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) )
+ keys->insert( name, i18n(name), TQString(), key3, key4, this, TQT_SLOT(fnSlot) )
#else
# define DEF( name, key3, key4, fnSlot ) \
keys->insert( name, i18n(name), TQString(), key3, key4 )
diff --git a/kcontrol/randr/tderandrpassivepopup.cpp b/kcontrol/randr/tderandrpassivepopup.cpp
index 5d2010f94..c938a31fc 100644
--- a/kcontrol/randr/tderandrpassivepopup.cpp
+++ b/kcontrol/randr/tderandrpassivepopup.cpp
@@ -94,7 +94,7 @@ void KRandrPassivePopup::startWatchingWidget( TQWidget* widget_P )
bool KRandrPassivePopup::eventFilter( TQObject* o, TQEvent* e )
{
if( e->type() == TQEvent::Move && o->isWidgetType()
- && watched_widgets.contains( TQT_TQWIDGET( o )))
+ && watched_widgets.contains( static_cast<TQWidget*>( o )))
TQTimer::singleShot( 0, this, TQT_SLOT( slotPositionSelf()));
return false;
}
diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp
index 6a65662a7..6d44c3914 100644
--- a/kcontrol/randr/tderandrtray.cpp
+++ b/kcontrol/randr/tderandrtray.cpp
@@ -67,7 +67,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
my_parent = parent;
//printf("Reading configuration...\n");
- globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this));
+ globalKeys = new TDEGlobalAccel(this);
TDEGlobalAccel* keys = globalKeys;
#include "tderandrbindings.cpp"
// the keys need to be read from kdeglobals, not kickerrc
@@ -314,7 +314,7 @@ void KRandRSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu)
menu->insertTitle(SmallIcon("randr"), i18n("Global Configuration"));
TDEAction *actColors = new TDEAction( i18n( "Configure Displays..." ),
- SmallIconSet( "configure" ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDisplayConfig() ),
+ SmallIconSet( "configure" ), TDEShortcut(), this, TQT_SLOT( slotDisplayConfig() ),
actionCollection() );
actColors->plug( menu );
@@ -324,7 +324,7 @@ void KRandRSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu)
// actPrefs->plug( menu );
TDEAction *actSKeys = new TDEAction( i18n( "Configure Shortcut Keys..." ),
- SmallIconSet( "configure" ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotSKeys() ),
+ SmallIconSet( "configure" ), TDEShortcut(), this, TQT_SLOT( slotSKeys() ),
actionCollection() );
actSKeys->plug( menu );
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index cc052e4c3..2a751f14e 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -851,7 +851,7 @@ void KCMStyle::styleChanged()
void KCMStyle::switchStyle(const TQString& styleName, bool force)
{
// Don't flicker the preview if the same style is chosen in the cb
- if (!force && appliedStyle && TQT_TQOBJECT(appliedStyle)->name() == styleName)
+ if (!force && appliedStyle && appliedStyle->name() == styleName)
return;
// Create an instance of the new style...
diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
index f81fba326..bb166bdc4 100644
--- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
@@ -113,7 +113,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
{
itsSplitter=new TQSplitter(this);
fontsFrame=new TQFrame(itsSplitter),
- itsPreview=(KParts::ReadOnlyPart *)factory->create(TQT_TQOBJECT(itsSplitter), "kcmfontinst", "KParts::ReadOnlyPart");
+ itsPreview=(KParts::ReadOnlyPart *)factory->create(itsSplitter, "kcmfontinst", "KParts::ReadOnlyPart");
itsSplitter->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
TQValueList<int> sizes(itsConfig.readIntListEntry(CFG_SPLITTER_SIZES));
@@ -211,14 +211,14 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
itsListAct->plug(toolbar);
}
- itsShowBitmapAct=new TDEToggleAction(i18n("Show Bitmap Fonts"), "application-x-font-snf", 0, TQT_TQOBJECT(this), TQT_SLOT(filterFonts()),
+ itsShowBitmapAct=new TDEToggleAction(i18n("Show Bitmap Fonts"), "application-x-font-snf", 0, this, TQT_SLOT(filterFonts()),
itsDirOp->actionCollection(), "showbitmap");
itsShowBitmapAct->setChecked(showBitmap);
itsShowBitmapAct->plug(toolbar);
toolbar->insertLineSeparator();
- act=new TDEAction(i18n("Add Fonts..."), "newfont", 0, TQT_TQOBJECT(this), TQT_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts");
+ act=new TDEAction(i18n("Add Fonts..."), "newfont", 0, this, TQT_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts");
act->plug(toolbar);
topMnu->insert(act);
@@ -232,11 +232,11 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
}
toolbar->insertLineSeparator();
- act=new TDEAction(i18n("Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(configure()), itsDirOp->actionCollection(), "configure");
+ act=new TDEAction(i18n("Configure..."), "configure", 0, this, TQT_SLOT(configure()), itsDirOp->actionCollection(), "configure");
act->plug(toolbar);
#ifdef HAVE_XFT
toolbar->insertLineSeparator();
- act=new TDEAction(i18n("Print..."), "document-print", 0, TQT_TQOBJECT(this), TQT_SLOT(print()), itsDirOp->actionCollection(), "print");
+ act=new TDEAction(i18n("Print..."), "document-print", 0, this, TQT_SLOT(print()), itsDirOp->actionCollection(), "print");
act->plug(toolbar);
#endif
diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
index df1fa92d2..ddb483e5e 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
@@ -49,10 +49,10 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow()
if(factory)
{
- KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
- KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
+ KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
+ KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
- itsPreview=(KParts::ReadOnlyPart *)factory->create(TQT_TQOBJECT(this), "fontvier", "KParts::ReadOnlyPart");
+ itsPreview=(KParts::ReadOnlyPart *)factory->create(this, "fontvier", "KParts::ReadOnlyPart");
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
KURL openURL;
diff --git a/kcontrol/tdeio/policydlg.cpp b/kcontrol/tdeio/policydlg.cpp
index c45dd837e..385bc4a04 100644
--- a/kcontrol/tdeio/policydlg.cpp
+++ b/kcontrol/tdeio/policydlg.cpp
@@ -63,7 +63,7 @@ PolicyDlg::PolicyDlg (const TQString& caption, TQWidget *parent,
m_dlgUI = new PolicyDlgUI (this);
setMainWidget(m_dlgUI);
- m_dlgUI->leDomain->setValidator(new DomainLineValidator(TQT_TQOBJECT(m_dlgUI->leDomain)));
+ m_dlgUI->leDomain->setValidator(new DomainLineValidator(m_dlgUI->leDomain));
m_dlgUI->cbPolicy->setMinimumWidth( m_dlgUI->cbPolicy->fontMetrics().maxWidth() * 25 );
enableButtonOK( false );
diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp
index 21745ef5d..5b8ede62e 100644
--- a/kcontrol/tdm/tdm-appear.cpp
+++ b/kcontrol/tdm/tdm-appear.cpp
@@ -146,7 +146,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
label = new TQLabel(i18n("Position:"), group);
hglay->addMultiCellWidget(label, 0,1, 0,0, TQt::AlignVCenter);
- TQValidator *posValidator = new TQIntValidator(0, 100, TQT_TQOBJECT(group));
+ TQValidator *posValidator = new TQIntValidator(0, 100, group);
TQLabel *xLineLabel = new TQLabel(i18n("&X:"), group);
hglay->addWidget(xLineLabel, 0, 1);
xLineEdit = new TQLineEdit (group);
diff --git a/kcontrol/tdm/tdm-users.cpp b/kcontrol/tdm/tdm-users.cpp
index 4b7b64ba3..aeaeb9347 100644
--- a/kcontrol/tdm/tdm-users.cpp
+++ b/kcontrol/tdm/tdm-users.cpp
@@ -98,7 +98,7 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
" Note that users with the UID 0 (typically root) are not affected by this and must be"
" explicitly hidden in \"Not hidden\" mode."));
TQSizePolicy sp_ign_fix( TQSizePolicy::Ignored, TQSizePolicy::Fixed );
- TQValidator *valid = new TQIntValidator( 0, 999999, TQT_TQOBJECT(minGroup) );
+ TQValidator *valid = new TQIntValidator( 0, 999999, minGroup );
TQLabel *minlab = new TQLabel( i18n("Below:"), minGroup );
leminuid = new KLineEdit( minGroup );
minlab->setBuddy( leminuid );
diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp
index 059fa2125..f95bb2ff2 100644
--- a/kdcop/kdcopwindow.cpp
+++ b/kdcop/kdcopwindow.cpp
@@ -71,7 +71,7 @@ public:
new TQLabel(caption + ": ", l);
KLineEdit* e = new KLineEdit( l );
m_widgets.insert(key, e ) ;
- e->setValidator( new TQIntValidator( TQT_TQOBJECT(e) ) );
+ e->setValidator( new TQIntValidator( e ) );
}
int field(int key)
{
@@ -303,12 +303,12 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name)
TQT_SLOT(slotResultListContextMenu(TQListBoxItem*, const TQPoint&)));
// set up the actions
- KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
- KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy()), actionCollection() );
+ KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() );
+ KStdAction::copy( this, TQT_SLOT( slotCopy()), actionCollection() );
KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() );
- (void) new TDEAction( i18n( "&Reload" ), "reload", TDEStdAccel::shortcut(TDEStdAccel::Reload), TQT_TQOBJECT(this), TQT_SLOT( slotReload() ), actionCollection(), "reload" );
+ (void) new TDEAction( i18n( "&Reload" ), "reload", TDEStdAccel::shortcut(TDEStdAccel::Reload), this, TQT_SLOT( slotReload() ), actionCollection(), "reload" );
exeaction =
new TDEAction
@@ -316,7 +316,7 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name)
i18n("&Execute"),
"application-x-executable",
CTRL + Key_E,
- TQT_TQOBJECT(this),
+ this,
TQT_SLOT(slotItemExecuted()),
actionCollection(),
"execute"
@@ -327,7 +327,7 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name)
langmode = new TDESelectAction ( i18n("Language Mode"),
CTRL + Key_M,
- TQT_TQOBJECT(this),
+ this,
TQT_SLOT(slotMode()),
actionCollection(),
"langmode");
@@ -458,7 +458,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
KLineEdit* e = new KLineEdit( frame );
grid->addWidget( e, i, 2 );
wl.append( e );
- e->setValidator( new TQIntValidator( TQT_TQOBJECT(e) ) );
+ e->setValidator( new TQIntValidator( e ) );
}
else if ( type == "unsigned" || type == "uint" || type == "unsigned int"
|| type == "TQ_UINT32" )
@@ -471,7 +471,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
grid->addWidget( e, i, 2 );
wl.append( e );
- TQIntValidator* iv = new TQIntValidator( TQT_TQOBJECT(e) );
+ TQIntValidator* iv = new TQIntValidator( e );
iv->setBottom( 0 );
e->setValidator( iv );
}
@@ -484,7 +484,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
KLineEdit* e = new KLineEdit( frame );
grid->addWidget( e, i, 2 );
wl.append( e );
- e->setValidator( new TQIntValidator( TQT_TQOBJECT(e) ) );
+ e->setValidator( new TQIntValidator( e ) );
}
else if ( type == "ulong" || type == "unsigned long" || type == "unsigned long int"
|| type == "TQ_UINT64" )
@@ -496,7 +496,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
KLineEdit* e = new KLineEdit( frame );
grid->addWidget( e, i, 2 );
wl.append( e );
- e->setValidator( new TQIntValidator( TQT_TQOBJECT(e) ) );
+ e->setValidator( new TQIntValidator( e ) );
}
else if ( type == "short" || type == "short int" )
{
@@ -507,7 +507,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
KLineEdit* e = new KLineEdit( frame );
grid->addWidget( e, i, 2 );
wl.append( e );
- e->setValidator( new TQIntValidator( TQT_TQOBJECT(e) ) );
+ e->setValidator( new TQIntValidator( e ) );
}
else if ( type == "ushort" || type == "unsigned short" || type == "unsigned short int" )
{
@@ -518,7 +518,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
KLineEdit* e = new KLineEdit( frame );
grid->addWidget( e, i, 2 );
wl.append( e );
- e->setValidator( new TQIntValidator( TQT_TQOBJECT(e) ) );
+ e->setValidator( new TQIntValidator( e ) );
}
else if ( type == "float" )
{
@@ -529,7 +529,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
KLineEdit* e = new KLineEdit( frame );
grid->addWidget( e, i, 2 );
wl.append( e );
- e->setValidator( new TQDoubleValidator( TQT_TQOBJECT(e) ) );
+ e->setValidator( new TQDoubleValidator( e ) );
}
else if ( type == "double" )
{
@@ -540,7 +540,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
KLineEdit* e = new KLineEdit( frame );
grid->addWidget( e, i, 2 );
wl.append( e );
- e->setValidator( new TQDoubleValidator( TQT_TQOBJECT(e) ) );
+ e->setValidator( new TQDoubleValidator( e ) );
}
else if ( type == "bool" )
{
diff --git a/kdesktop/bgmanager.cpp b/kdesktop/bgmanager.cpp
index 7e90e8fca..7f524ae26 100644
--- a/kdesktop/bgmanager.cpp
+++ b/kdesktop/bgmanager.cpp
@@ -78,7 +78,7 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule
m_pDesktop = desktop;
if (desktop == 0L)
- desktop = TQT_TQWIDGET(TDEApplication::desktop()->screen());
+ desktop = TDEApplication::desktop()->screen();
m_Renderer.resize( 1 );
m_Cache.resize( 1 );
@@ -544,14 +544,14 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk)
root_cleared = true;
TQTimer::singleShot( 0, this, TQT_SLOT( clearRoot()));
// but make the pixmap visible until m_pDesktop is visible
- TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap(*ep);
- TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
+ TDEApplication::desktop()->screen()->setErasePixmap(*ep);
+ TDEApplication::desktop()->screen()->erase();
}
}
else
{
- TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap(*ep);
- TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
+ TDEApplication::desktop()->screen()->setErasePixmap(*ep);
+ TDEApplication::desktop()->screen()->erase();
}
// and export it via Esetroot-style for gnome/GTK apps to share in the pretties
@@ -571,8 +571,8 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk)
void KBackgroundManager::clearRoot()
{
- TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap( TQPixmap());
- TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
+ TDEApplication::desktop()->screen()->setErasePixmap( TQPixmap());
+ TDEApplication::desktop()->screen()->erase();
}
/*
@@ -1004,7 +1004,7 @@ void KBackgroundManager::repaintBackground()
if (m_pDesktop)
m_pDesktop->repaint();
else
- TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
+ TDEApplication::desktop()->screen()->erase();
}
void KBackgroundManager::desktopResized()
diff --git a/kdesktop/desktop.cpp b/kdesktop/desktop.cpp
index 989d07d73..fef324797 100644
--- a/kdesktop/desktop.cpp
+++ b/kdesktop/desktop.cpp
@@ -155,7 +155,7 @@ KDesktop::KDesktop( SaverEngine* saver, bool x_root_hack, bool wait_for_kded ) :
setCaption( "KDE Desktop");
setAcceptDrops(true); // WStyle_Customize seems to disable that
- m_pKwinmodule = new KWinModule( TQT_TQOBJECT(this) );
+ m_pKwinmodule = new KWinModule( this );
kapp->dcopClient()->setNotifications(true);
kapp->dcopClient()->connectDCOPSignal(kicker_name, kicker_name, "desktopIconsAreaChanged(TQRect, int)",
@@ -359,7 +359,7 @@ KDesktop::backgroundInitDone()
// avoid flicker
if (m_bDesktopEnabled)
{
- const TQPixmap *bg = TQT_TQWIDGET(TQApplication::desktop()->screen())->backgroundPixmap();
+ const TQPixmap *bg = TQApplication::desktop()->screen()->backgroundPixmap();
if ( bg )
m_pIconView->setErasePixmap( *bg );
@@ -396,7 +396,7 @@ KDesktop::slotStart()
m_pIconView->start();
// Global keys
- keys = new TDEGlobalAccel( TQT_TQOBJECT(this) );
+ keys = new TDEGlobalAccel( this );
(void) new KRootWm( m_pSaver, this );
#include "kdesktopbindings.cpp"
diff --git a/kdesktop/kdesktopbindings.cpp b/kdesktop/kdesktopbindings.cpp
index fe751db4f..71f01abc4 100644
--- a/kdesktop/kdesktopbindings.cpp
+++ b/kdesktop/kdesktopbindings.cpp
@@ -1,6 +1,6 @@
#ifndef NOSLOTS
# define DEF( name, key3, key4, fnSlot ) \
- keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) )
+ keys->insert( name, i18n(name), TQString(), key3, key4, this, TQT_SLOT(fnSlot) )
# define DEF2( name, key3, key4, receiver, slot ) \
keys->insert( name, i18n(name), TQString(), key3, key4, receiver, slot );
#else
diff --git a/kdesktop/kdiconview.cpp b/kdesktop/kdiconview.cpp
index 00fa59bf8..2c2d0fe0f 100644
--- a/kdesktop/kdiconview.cpp
+++ b/kdesktop/kdiconview.cpp
@@ -427,28 +427,28 @@ void KDIconView::createActions()
undo, TQT_SLOT( setText( const TQString & ) ) );
undo->setEnabled( KonqUndoManager::self()->undoAvailable() );
- TDEAction* paCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( slotCut() ), &m_actionCollection, "cut" );
+ TDEAction* paCut = KStdAction::cut( this, TQT_SLOT( slotCut() ), &m_actionCollection, "cut" );
TDEShortcut cutShortCut = paCut->shortcut();
cutShortCut.remove( KKey( SHIFT + Key_Delete ) ); // used for deleting files
paCut->setShortcut( cutShortCut );
- KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy() ), &m_actionCollection, "copy" );
- KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPaste() ), &m_actionCollection, "paste" );
- TDEAction *pasteTo = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPopupPasteTo() ), &m_actionCollection, "pasteto" );
+ KStdAction::copy( this, TQT_SLOT( slotCopy() ), &m_actionCollection, "copy" );
+ KStdAction::paste( this, TQT_SLOT( slotPaste() ), &m_actionCollection, "paste" );
+ TDEAction *pasteTo = KStdAction::paste( this, TQT_SLOT( slotPopupPasteTo() ), &m_actionCollection, "pasteto" );
pasteTo->setEnabled( false ); // only enabled during popupMenu()
TDEShortcut reloadShortcut = TDEStdAccel::shortcut(TDEStdAccel::Reload);
- new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( refreshIcons() ), &m_actionCollection, "reload" );
+ new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQT_SLOT( refreshIcons() ), &m_actionCollection, "reload" );
- (void) new TDEAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, TQT_TQOBJECT(this), TQT_SLOT( renameSelectedItem() ), &m_actionCollection, "rename" );
- (void) new TDEAction( i18n( "&Properties" ), ALT+Key_Return, TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ), &m_actionCollection, "properties" );
+ (void) new TDEAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, this, TQT_SLOT( renameSelectedItem() ), &m_actionCollection, "rename" );
+ (void) new TDEAction( i18n( "&Properties" ), ALT+Key_Return, this, TQT_SLOT( slotProperties() ), &m_actionCollection, "properties" );
TDEAction* trash = new TDEAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, &m_actionCollection, "trash" );
connect( trash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
this, TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) );
TDEConfig config("kdeglobals", true, false);
config.setGroup( "KDE" );
- (void) new TDEAction( i18n( "&Delete" ), "edit-delete", SHIFT+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotDelete() ), &m_actionCollection, "del" );
+ (void) new TDEAction( i18n( "&Delete" ), "edit-delete", SHIFT+Key_Delete, this, TQT_SLOT( slotDelete() ), &m_actionCollection, "del" );
// Initial state of the actions (cut/copy/paste/...)
slotSelectionChanged();
diff --git a/kdesktop/krootwm.cpp b/kdesktop/krootwm.cpp
index f3c6170e7..1d7894a93 100644
--- a/kdesktop/krootwm.cpp
+++ b/kdesktop/krootwm.cpp
@@ -134,7 +134,7 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
if (kapp->authorize("run_command"))
{
- new TDEAction(i18n("Run Command..."), "system-run", 0, TQT_TQOBJECT(m_pDesktop), TQT_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
+ new TDEAction(i18n("Run Command..."), "system-run", 0, m_pDesktop, TQT_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
new TDEAction(i18n("Open Terminal Here..." ), "terminal", CTRL+Key_T, this, TQT_SLOT( slotOpenTerminal() ),
m_actionCollection, "open_terminal" );
}
diff --git a/kdesktop/lock/autologout.cpp b/kdesktop/lock/autologout.cpp
index 1b63160f6..19c6d1e28 100644
--- a/kdesktop/lock/autologout.cpp
+++ b/kdesktop/lock/autologout.cpp
@@ -119,7 +119,7 @@ void AutoLogout::slotActivity()
void AutoLogout::logout()
{
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
DCOPRef("ksmserver","ksmserver").send("logout", 0, 0, 0);
}
diff --git a/kdesktop/lock/lockprocess.cpp b/kdesktop/lock/lockprocess.cpp
index d9fae24f1..f493649f1 100644
--- a/kdesktop/lock/lockprocess.cpp
+++ b/kdesktop/lock/lockprocess.cpp
@@ -533,7 +533,7 @@ void LockProcess::setupSignals()
if (pipe(signal_pipe) == -1) {
// Error handler to shut up gcc warnings
}
- TQSocketNotifier* notif = new TQSocketNotifier(signal_pipe[0], TQSocketNotifier::Read, TQT_TQOBJECT(this) );
+ TQSocketNotifier* notif = new TQSocketNotifier(signal_pipe[0], TQSocketNotifier::Read, this );
connect( notif, TQT_SIGNAL(activated(int)), TQT_SLOT(signalPipeSignal()));
}
@@ -1353,7 +1353,7 @@ bool LockProcess::startSaver(bool notify_ready)
saveVRoot();
if (mParent) {
- TQSocketNotifier *notifier = new TQSocketNotifier(mParent, TQSocketNotifier::Read, TQT_TQOBJECT(this), "notifier");
+ TQSocketNotifier *notifier = new TQSocketNotifier(mParent, TQSocketNotifier::Read, this, "notifier");
connect(notifier, TQT_SIGNAL( activated (int)), TQT_SLOT( quitSaver()));
}
createSaverWindow();
diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp
index fa2512077..2313f7c40 100644
--- a/kdialog/kdialog.cpp
+++ b/kdialog/kdialog.cpp
@@ -125,7 +125,7 @@ bool WinIdEmbedder::eventFilter(TQObject *o, TQEvent *e)
if (e->type() == TQEvent::Show && o->isWidgetType()
&& o->inherits("KDialog"))
{
- TQWidget *w = TQT_TQWIDGET(o);
+ TQWidget *w = static_cast<TQWidget*>(o);
if (print)
cout << "winId: " << w->winId() << endl;
#ifdef Q_WS_X11
diff --git a/kfind/kfinddlg.cpp b/kfind/kfinddlg.cpp
index ff47a2776..7fabcecde 100644
--- a/kfind/kfinddlg.cpp
+++ b/kfind/kfinddlg.cpp
@@ -72,7 +72,7 @@ KfindDlg::KfindDlg(const KURL & url, TQWidget *parent, const char *name)
connect(win ,TQT_SIGNAL(resultSelected(bool)),
this,TQT_SIGNAL(resultSelected(bool)));
- query = new KQuery(TQT_TQOBJECT(frame));
+ query = new KQuery(frame);
connect(query, TQT_SIGNAL(addFile(const KFileItem*,const TQString&)),
TQT_SLOT(addFile(const KFileItem*,const TQString&)));
connect(query, TQT_SIGNAL(result(int)), TQT_SLOT(slotResult(int)));
diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp
index 240b223bf..6def97ec6 100644
--- a/kfind/kftabdlg.cpp
+++ b/kfind/kftabdlg.cpp
@@ -496,7 +496,7 @@ void KfindTabWidget::loadHistory()
void KfindTabWidget::slotEditRegExp()
{
if ( ! regExpDialog )
- regExpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) );
+ regExpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this );
KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( regExpDialog->tqt_cast( "KRegExpEditorInterface" ) );
if ( !iface )
@@ -807,7 +807,7 @@ bool KfindTabWidget::isSearchRecursive()
Digit validator. Allows only digits to be typed.
**/
KDigitValidator::KDigitValidator( TQWidget * parent, const char *name )
- : TQValidator( TQT_TQOBJECT(parent), name )
+ : TQValidator( parent, name )
{
r = new TQRegExp("^[0-9]*$");
}
diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp
index 8a79b536c..3579b1afe 100644
--- a/khelpcenter/mainwindow.cpp
+++ b/khelpcenter/mainwindow.cpp
@@ -90,7 +90,7 @@ MainWindow::MainWindow()
{
mSplitter = new TQSplitter( this );
- mDoc = new View( mSplitter, 0, TQT_TQOBJECT(this), 0, TDEHTMLPart::DefaultGUI, actionCollection() );
+ mDoc = new View( mSplitter, 0, this, 0, TDEHTMLPart::DefaultGUI, actionCollection() );
connect( mDoc, TQT_SIGNAL( setWindowCaption( const TQString & ) ),
TQT_SLOT( setCaption( const TQString & ) ) );
connect( mDoc, TQT_SIGNAL( setStatusBarText( const TQString & ) ),
@@ -208,8 +208,8 @@ void MainWindow::writeConfig()
void MainWindow::setupActions()
{
- KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
- KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), actionCollection(),
+ KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() );
+ KStdAction::print( this, TQT_SLOT( print() ), actionCollection(),
"printFrame" );
TDEAction *prevPage = new TDEAction( i18n( "Previous Page" ), CTRL+Key_PageUp, mDoc, TQT_SLOT( prevPage() ),
@@ -220,19 +220,19 @@ void MainWindow::setupActions()
actionCollection(), "nextPage" );
nextPage->setWhatsThis( i18n( "Moves to the next page of the document" ) );
- TDEAction *home = KStdAction::home( TQT_TQOBJECT(this), TQT_SLOT( slotShowHome() ), actionCollection() );
+ TDEAction *home = KStdAction::home( this, TQT_SLOT( slotShowHome() ), actionCollection() );
home->setText(i18n("Table of &Contents"));
home->setToolTip(i18n("Table of contents"));
home->setWhatsThis(i18n("Go back to the table of contents"));
- mCopyText = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopySelectedText()), actionCollection(), "copy_text");
+ mCopyText = KStdAction::copy( this, TQT_SLOT(slotCopySelectedText()), actionCollection(), "copy_text");
- mLastSearchAction = new TDEAction( i18n("&Last Search Result"), 0, TQT_TQOBJECT(this),
+ mLastSearchAction = new TDEAction( i18n("&Last Search Result"), 0, this,
TQT_SLOT( slotLastSearch() ),
actionCollection(), "lastsearch" );
mLastSearchAction->setEnabled( false );
- new TDEAction( i18n("Build Search Index..."), 0, TQT_TQOBJECT(mNavigator),
+ new TDEAction( i18n("Build Search Index..."), 0, mNavigator,
TQT_SLOT( showIndexDialog() ), actionCollection(), "build_index" );
KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ),
actionCollection() );
@@ -240,16 +240,16 @@ void MainWindow::setupActions()
TDEConfig *cfg = TDEGlobal::config();
cfg->setGroup( "Debug" );
if ( cfg->readBoolEntry( "SearchErrorLog", false ) ) {
- new TDEAction( i18n("Show Search Error Log"), 0, TQT_TQOBJECT(this),
+ new TDEAction( i18n("Show Search Error Log"), 0, this,
TQT_SLOT( showSearchStderr() ), actionCollection(),
"show_search_stderr" );
}
History::self().setupActions( actionCollection() );
- new TDEAction( i18n( "Configure Fonts..." ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotConfigureFonts() ), actionCollection(), "configure_fonts" );
- new TDEAction( i18n( "Increase Font Sizes" ), "zoom-in", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotIncFontSizes() ), actionCollection(), "incFontSizes" );
- new TDEAction( i18n( "Decrease Font Sizes" ), "zoom-out", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDecFontSizes() ), actionCollection(), "decFontSizes" );
+ new TDEAction( i18n( "Configure Fonts..." ), TDEShortcut(), this, TQT_SLOT( slotConfigureFonts() ), actionCollection(), "configure_fonts" );
+ new TDEAction( i18n( "Increase Font Sizes" ), "zoom-in", TDEShortcut(), this, TQT_SLOT( slotIncFontSizes() ), actionCollection(), "incFontSizes" );
+ new TDEAction( i18n( "Decrease Font Sizes" ), "zoom-out", TDEShortcut(), this, TQT_SLOT( slotDecFontSizes() ), actionCollection(), "decFontSizes" );
}
void MainWindow::slotCopySelectedText()
diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp
index 05bd68129..4cb3b2f00 100644
--- a/khelpcenter/navigator.cpp
+++ b/khelpcenter/navigator.cpp
@@ -294,14 +294,14 @@ void Navigator::createItemFromDesktopFile( NavigatorItem *topItem,
void Navigator::insertInfoDocs( NavigatorItem *topItem )
{
- InfoTree *infoTree = new InfoTree( TQT_TQOBJECT(this) );
+ InfoTree *infoTree = new InfoTree( this );
infoTree->build( topItem );
}
NavigatorItem *Navigator::insertScrollKeeperDocs( NavigatorItem *topItem,
NavigatorItem *after )
{
- ScrollKeeperTreeBuilder *builder = new ScrollKeeperTreeBuilder( TQT_TQOBJECT(this) );
+ ScrollKeeperTreeBuilder *builder = new ScrollKeeperTreeBuilder( this );
return builder->build( topItem, after );
}
diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp
index 85dbaaaa8..cd394a6e6 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.cpp
+++ b/khotkeys/kcontrol/kcmkhotkeys.cpp
@@ -67,7 +67,7 @@ Module::Module( TQWidget* parent_P, const char* )
{
setButtons( Help | Cancel | Apply | Ok );
module = this;
- init_global_data( false, TQT_TQOBJECT(this) ); // don't grab keys
+ init_global_data( false, this ); // don't grab keys
init_arts();
TQVBoxLayout* vbox = new TQVBoxLayout( this );
vbox->setSpacing( 6 );
diff --git a/khotkeys/kcontrol/voicerecorder.cpp b/khotkeys/kcontrol/voicerecorder.cpp
index fc231a82c..763e096e8 100644
--- a/khotkeys/kcontrol/voicerecorder.cpp
+++ b/khotkeys/kcontrol/voicerecorder.cpp
@@ -46,7 +46,7 @@ bool VoiceRecorder::init( KLibrary* lib )
}
VoiceRecorder::VoiceRecorder(const Sound& sound_P, const TQString &voiceId, TQWidget *parent, const char *name)
- : Voice_input_widget_ui(parent, name) , _recorder( SoundRecorder::create(TQT_TQOBJECT(this))) , _state(sNotModified), _tempFile(0L) , _voiceId(voiceId)
+ : Voice_input_widget_ui(parent, name) , _recorder( SoundRecorder::create(this)) , _state(sNotModified), _tempFile(0L) , _voiceId(voiceId)
{
_sound=sound_P;
buttonPlay->setEnabled(sound_P.size() > 50);
diff --git a/khotkeys/kcontrol/windowdef_simple_widget.cpp b/khotkeys/kcontrol/windowdef_simple_widget.cpp
index e0a6671e7..f79d81ea1 100644
--- a/khotkeys/kcontrol/windowdef_simple_widget.cpp
+++ b/khotkeys/kcontrol/windowdef_simple_widget.cpp
@@ -157,7 +157,7 @@ void Windowdef_simple_widget::autodetect_clicked()
void Windowdef_simple_widget::autodetect()
{
- WindowSelector* sel = new WindowSelector( TQT_TQOBJECT(this), TQT_SLOT( autodetect_window_selected( WId )));
+ WindowSelector* sel = new WindowSelector( this, TQT_SLOT( autodetect_window_selected( WId )));
sel->select();
}
diff --git a/khotkeys/kcontrol/windowselector.cpp b/khotkeys/kcontrol/windowselector.cpp
index 745f85682..3202c2241 100644
--- a/khotkeys/kcontrol/windowselector.cpp
+++ b/khotkeys/kcontrol/windowselector.cpp
@@ -35,7 +35,7 @@ WindowSelector::WindowSelector( TQObject* receiver_P, const char* slot_P )
void WindowSelector::select()
{
kapp->desktop()->grabMouse( TQCursor( TQt::crossCursor ));
- kapp->installX11EventFilter( TQT_TQWIDGET(this) );
+ kapp->installX11EventFilter( this );
}
bool WindowSelector::x11Event( XEvent* e )
diff --git a/khotkeys/update/update.cpp b/khotkeys/update/update.cpp
index 3368ee21e..19e503ac5 100644
--- a/khotkeys/update/update.cpp
+++ b/khotkeys/update/update.cpp
@@ -46,7 +46,7 @@ int main( int argc, char* argv[] )
kdWarning() << "File " << id << " not found!" << endl;
return 1;
}
- init_global_data( false, TQT_TQOBJECT(&app) );
+ init_global_data( false, &app );
Settings settings;
settings.read_settings( true );
TDEConfig cfg( file, true );
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 131ce7482..408349250 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -84,7 +84,7 @@ TDEConfigDialogSingle::TDEConfigDialogSingle(Zone *zone, TQWidget *parent,
setIcon(SmallIcon("date"));
settings = new SettingsWidgetImp(prefs, zone, 0, "General");
- connect(TQT_TQOBJECT(settings->kcfg_Type), TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int)));
+ connect(settings->kcfg_Type, TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int)));
settings->kcfg_PlainBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
settings->kcfg_DateBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
@@ -104,23 +104,23 @@ TDEConfigDialogSingle::TDEConfigDialogSingle(Zone *zone, TQWidget *parent,
settings->widgetStack->addWidget(fuzzyPage, 3);
fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
- connect(TQT_TQOBJECT(settings->kcfg_PlainShowDate), TQT_SIGNAL(toggled(bool)),
+ connect(settings->kcfg_PlainShowDate, TQT_SIGNAL(toggled(bool)),
TQT_SLOT(dateToggled()));
- connect(TQT_TQOBJECT(settings->kcfg_PlainShowDayOfWeek), TQT_SIGNAL(toggled(bool)),
+ connect(settings->kcfg_PlainShowDayOfWeek, TQT_SIGNAL(toggled(bool)),
TQT_SLOT(dateToggled()));
- connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDate), TQT_SIGNAL(toggled(bool)),
+ connect(digitalPage->kcfg_DigitalShowDate, TQT_SIGNAL(toggled(bool)),
TQT_SLOT(dateToggled()));
- connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDayOfWeek), TQT_SIGNAL(toggled(bool)),
+ connect(digitalPage->kcfg_DigitalShowDayOfWeek, TQT_SIGNAL(toggled(bool)),
TQT_SLOT(dateToggled()));
- connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDate), TQT_SIGNAL(toggled(bool)),
+ connect(digitalPage->kcfg_DigitalShowDate, TQT_SIGNAL(toggled(bool)),
TQT_SLOT(dateToggled()));
- connect(TQT_TQOBJECT(analogPage->kcfg_AnalogShowDate), TQT_SIGNAL(toggled(bool)),
+ connect(analogPage->kcfg_AnalogShowDate, TQT_SIGNAL(toggled(bool)),
TQT_SLOT(dateToggled()));
- connect(TQT_TQOBJECT(analogPage->kcfg_AnalogShowDayOfWeek), TQT_SIGNAL(toggled(bool)),
+ connect(analogPage->kcfg_AnalogShowDayOfWeek, TQT_SIGNAL(toggled(bool)),
TQT_SLOT(dateToggled()));
- connect(TQT_TQOBJECT(fuzzyPage->kcfg_FuzzyShowDate), TQT_SIGNAL(toggled(bool)),
+ connect(fuzzyPage->kcfg_FuzzyShowDate, TQT_SIGNAL(toggled(bool)),
TQT_SLOT(dateToggled()));
- connect(TQT_TQOBJECT(fuzzyPage->kcfg_FuzzyShowDayOfWeek), TQT_SIGNAL(toggled(bool)),
+ connect(fuzzyPage->kcfg_FuzzyShowDayOfWeek, TQT_SIGNAL(toggled(bool)),
TQT_SLOT(dateToggled()));
addPage(settings, i18n("General"), TQString::fromLatin1("package_settings"));
diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index 741eee46d..add317a3b 100644
--- a/kicker/applets/launcher/quickbutton.cpp
+++ b/kicker/applets/launcher/quickbutton.cpp
@@ -175,7 +175,7 @@ QuickButton::QuickButton(const TQString &u, TDEAction* configAction,
this, TQT_SLOT(removeApp()));
m_stickyAction = new TDEToggleAction(i18n("Never Remove Automatically"),
- TDEShortcut(), TQT_TQOBJECT(this));
+ TDEShortcut(), this);
connect(m_stickyAction, TQT_SIGNAL(toggled(bool)),
this, TQT_SLOT(slotStickyToggled(bool)));
m_stickyAction->plug(_popup, 2);
diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp
index 624c229da..d0f5d25dd 100644
--- a/kicker/applets/launcher/quicklauncher.cpp
+++ b/kicker/applets/launcher/quicklauncher.cpp
@@ -108,7 +108,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions,
m_dragButtons = 0;
m_configAction = new TDEAction(i18n("Configure Quicklauncher..."), "configure", TDEShortcut(),
- TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), TQT_TQOBJECT(this));
+ this, TQT_SLOT(slotConfigure()), this);
m_saveTimer = new TQTimer(this, "m_saveTimer");
connect(m_saveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(saveConfig()));
diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp
index b87f73ab1..5977063d7 100644
--- a/kicker/applets/media/mediumbutton.cpp
+++ b/kicker/applets/media/mediumbutton.cpp
@@ -45,13 +45,13 @@
#include <konq_drag.h>
MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem)
- : PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)), mFileItem(fileItem), mOpenTimer(0,
+ : PanelPopupButton(parent), mActions(this, this), mFileItem(fileItem), mOpenTimer(0,
"MediumButton::mOpenTimer")
{
- TDEAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()),
+ TDEAction *a = KStdAction::paste(this, TQT_SLOT(slotPaste()),
&mActions, "pasteto");
a->setShortcut(0);
- a = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), &mActions, "copy");
+ a = KStdAction::copy(this, TQT_SLOT(slotCopy()), &mActions, "copy");
a->setShortcut(0);
setBackgroundOrigin(AncestorOrigin);
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index 7685f04d7..be61ad451 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -114,7 +114,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
setFont( TDEGlobalSettings::taskbarFont() );
- m_twin = new KWinModule(TQT_TQOBJECT(this));
+ m_twin = new KWinModule(this);
m_activeWindow = m_twin->activeWindow();
m_curDesk = m_twin->currentDesktop();
@@ -366,7 +366,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y)
{ // must own manager selection before setting global desktop layout
int screen = DefaultScreen( tqt_xdisplay());
m_desktopLayoutOwner = new TDESelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(),
- screen, TQT_TQOBJECT(this) );
+ screen, this );
if( !m_desktopLayoutOwner->claim( false ))
{
delete m_desktopLayoutOwner;
diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp
index 8eb26afbc..2e75890d6 100644
--- a/kicker/applets/naughty/NaughtyApplet.cpp
+++ b/kicker/applets/naughty/NaughtyApplet.cpp
@@ -71,7 +71,7 @@ NaughtyApplet::NaughtyApplet
TQVBoxLayout * layout = new TQVBoxLayout(this);
layout->addWidget(button_);
- monitor_ = new NaughtyProcessMonitor(2, 20, TQT_TQOBJECT(this));
+ monitor_ = new NaughtyProcessMonitor(2, 20, this);
connect
(
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index 2985e1915..917382d8b 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -104,7 +104,7 @@ SystemTrayApplet::SystemTrayApplet(const TQString& configFile, Type type, int ac
setBackgroundOrigin(AncestorOrigin);
- twin_module = new KWinModule(TQT_TQOBJECT(this));
+ twin_module = new KWinModule(this);
// kApplication notifies us of settings changes. added to support
// disabling of frame effect on mouse hover
diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp
index 85c0eef62..3205f6910 100644
--- a/kicker/applets/trash/trashbutton.cpp
+++ b/kicker/applets/trash/trashbutton.cpp
@@ -32,14 +32,14 @@
#include <konq_popupmenu.h>
TrashButton::TrashButton(TQWidget *parent)
- : PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)),
+ : PanelPopupButton(parent), mActions(this, this),
mFileItem(KFileItem::Unknown, KFileItem::Unknown, "trash:/")
{
TDEIO::UDSEntry entry;
TDEIO::NetAccess::stat("trash:/", entry, 0L);
mFileItem.assign(KFileItem(entry, "trash:/"));
- TDEAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()),
+ TDEAction *a = KStdAction::paste(this, TQT_SLOT(slotPaste()),
&mActions, "paste");
a->setShortcut(0);
diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp
index cbd336f6f..143812e0d 100644
--- a/kicker/extensions/dockbar/dockbarextension.cpp
+++ b/kicker/extensions/dockbar/dockbarextension.cpp
@@ -57,7 +57,7 @@ DockBarExtension::DockBarExtension(const TQString& configFile, Type type,
: KPanelExtension(configFile, type, actions, parent, name)
{
dragging_container = 0;
- twin_module = new KWinModule(TQT_TQOBJECT(this));
+ twin_module = new KWinModule(this);
connect( twin_module, TQT_SIGNAL( windowAdded(WId) ), TQT_SLOT( windowAdded(WId) ) );
setMinimumSize(DockContainer::sz(), DockContainer::sz());
setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp
index 11185c9e0..04d6a8e0f 100644
--- a/kicker/extensions/kasbar/kastasker.cpp
+++ b/kicker/extensions/kasbar/kastasker.cpp
@@ -152,57 +152,57 @@ TDEPopupMenu *KasTasker::contextMenu()
menu = new TDEPopupMenu;
showAllWindowsAction = new TDEToggleAction( i18n("Show &All Windows"), TDEShortcut(),
- TQT_TQOBJECT(this), "toggle_show_all_windows" );
+ this, "toggle_show_all_windows" );
showAllWindowsAction->setChecked( showAllWindows() );
showAllWindowsAction->plug( menu );
connect( showAllWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowAllWindows(bool)) );
- connect( TQT_TQOBJECT(this), TQT_SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, TQT_SLOT(setChecked(bool)) );
+ connect( this, TQT_SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, TQT_SLOT(setChecked(bool)) );
groupWindowsAction = new TDEToggleAction( i18n("&Group Windows"), TDEShortcut(),
- TQT_TQOBJECT(this), "toggle_group_windows" );
+ this, "toggle_group_windows" );
groupWindowsAction->setChecked( groupWindows() );
groupWindowsAction->plug( menu );
connect( groupWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setGroupWindows(bool)) );
- connect( TQT_TQOBJECT(this), TQT_SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, TQT_SLOT(setChecked(bool)) );
+ connect( this, TQT_SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, TQT_SLOT(setChecked(bool)) );
- showClockAction = new TDEToggleAction( i18n("Show &Clock"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_show_clock" );
+ showClockAction = new TDEToggleAction( i18n("Show &Clock"), TDEShortcut(), this, "toggle_show_clock" );
showClockAction->setChecked( showClock() );
showClockAction->plug( menu );
connect( showClockAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowClock(bool)) );
- connect( TQT_TQOBJECT(this), TQT_SIGNAL(showClockChanged(bool)), showClockAction, TQT_SLOT(setChecked(bool)) );
+ connect( this, TQT_SIGNAL(showClockChanged(bool)), showClockAction, TQT_SLOT(setChecked(bool)) );
- showLoadAction = new TDEToggleAction( i18n("Show &Load Meter"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_show_load" );
+ showLoadAction = new TDEToggleAction( i18n("Show &Load Meter"), TDEShortcut(), this, "toggle_show_load" );
showLoadAction->setChecked( showLoad() );
showLoadAction->plug( menu );
connect( showLoadAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowLoad(bool)) );
- connect( TQT_TQOBJECT(this), TQT_SIGNAL(showLoadChanged(bool)), showLoadAction, TQT_SLOT(setChecked(bool)) );
+ connect( this, TQT_SIGNAL(showLoadChanged(bool)), showLoadAction, TQT_SLOT(setChecked(bool)) );
menu->insertSeparator();
if ( !standalone_ ) {
- toggleDetachedAction = new TDEToggleAction( i18n("&Floating"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_detached" );
+ toggleDetachedAction = new TDEToggleAction( i18n("&Floating"), TDEShortcut(), this, "toggle_detached" );
toggleDetachedAction->setChecked( isDetached() );
toggleDetachedAction->plug( menu );
connect( toggleDetachedAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setDetached(bool)) );
- connect( TQT_TQOBJECT(this), TQT_SIGNAL(detachedChanged(bool)), toggleDetachedAction, TQT_SLOT(setChecked(bool)) );
+ connect( this, TQT_SIGNAL(detachedChanged(bool)), toggleDetachedAction, TQT_SLOT(setChecked(bool)) );
}
rotateBarAction = new TDEAction( i18n("R&otate Bar"), TQString("rotate"), TDEShortcut(),
- TQT_TQOBJECT(this), TQT_SLOT( toggleOrientation() ),
- TQT_TQOBJECT(this), "rotate_bar" );
+ this, TQT_SLOT( toggleOrientation() ),
+ this, "rotate_bar" );
rotateBarAction->plug( menu );
- connect( TQT_TQOBJECT(this), TQT_SIGNAL(detachedChanged(bool)), rotateBarAction, TQT_SLOT(setEnabled(bool)) );
+ connect( this, TQT_SIGNAL(detachedChanged(bool)), rotateBarAction, TQT_SLOT(setEnabled(bool)) );
connect( rotateBarAction, TQT_SIGNAL(activated()), TQT_SLOT(writeConfigLater()) );
- menu->insertItem( SmallIcon("reload"), i18n("&Refresh"), TQT_TQOBJECT(this), TQT_SLOT( refreshAll() ) );
+ menu->insertItem( SmallIcon("reload"), i18n("&Refresh"), this, TQT_SLOT( refreshAll() ) );
menu->insertSeparator();
- menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), TQT_TQOBJECT(this), TQT_SLOT( showPreferences() ) );
+ menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), this, TQT_SLOT( showPreferences() ) );
// Help menu
TDEPopupMenu *help = new TDEPopupMenu;
- help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), TQT_TQOBJECT(this), TQT_SLOT( showAbout() ) );
+ help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), this, TQT_SLOT( showAbout() ) );
menu->insertItem( SmallIcon("help"), i18n("&Help"), help );
if ( standalone_ ) {
diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp
index 0f57524cc..ee4a0bc7d 100644
--- a/kicker/extensions/kasbar/kastaskitem.cpp
+++ b/kicker/extensions/kasbar/kastaskitem.cpp
@@ -390,7 +390,7 @@ void KasTaskItem::showPropertiesDialog()
tabs->addTab( createTaskProps( task_, tabs ), i18n("Task") );
tabs->addTab( createTaskProps( this, tabs ), i18n("Item") );
- tabs->addTab( createTaskProps( TQT_TQOBJECT(kasbar()), tabs, false ), i18n("Bar") );
+ tabs->addTab( createTaskProps( kasbar(), tabs, false ), i18n("Bar") );
#if 0
tabs->addTab( createNETProps( tabs ), i18n("NET") );
diff --git a/kicker/extensions/sidebar/sidebarextension.cpp b/kicker/extensions/sidebar/sidebarextension.cpp
index 89b0c4028..d29299939 100644
--- a/kicker/extensions/sidebar/sidebarextension.cpp
+++ b/kicker/extensions/sidebar/sidebarextension.cpp
@@ -57,7 +57,7 @@ SidebarExtension::SidebarExtension( const TQString& configFile,
"konq_sidebar",
m_sbWrapper,
"SideBar_View",
- TQT_TQOBJECT(this),
+ this,
"Sidebar","universal");
KParts::BrowserExtension *be=KParts::BrowserExtension::childObject(p);
diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp
index 81f2139c5..e72dd1887 100644
--- a/kicker/kicker/core/container_applet.cpp
+++ b/kicker/kicker/core/container_applet.cpp
@@ -92,7 +92,7 @@ AppletContainer::AppletContainer(const AppletInfo& info,
_layout->addSpacing(APPLET_MARGIN);
_handle = new AppletHandle(this);
- _layout->addWidget(TQT_TQWIDGET(_handle), 0);
+ _layout->addWidget(_handle, 0);
connect(_handle, TQT_SIGNAL(moveApplet(const TQPoint&)),
this, TQT_SLOT(moveApplet(const TQPoint&)));
connect(_handle, TQT_SIGNAL(showAppletMenu()), this, TQT_SLOT(showAppletMenu()));
@@ -225,7 +225,7 @@ void AppletContainer::showAppletMenu()
Kicker::the()->setInsertionPoint(_handle->mapToGlobal(_handle->rect().center()));
- switch(menu->exec(KickerLib::popupPosition(popupDirection(), menu, TQT_TQWIDGET(_handle))))
+ switch(menu->exec(KickerLib::popupPosition(popupDirection(), menu, _handle)))
{
case PanelAppletOpMenu::Move:
moveApplet(_handle->mapToParent(_handle->rect().center()));
@@ -471,7 +471,7 @@ void AppletContainer::setImmutable(bool immutable)
}
else if (!_handle->isVisibleTo(this))
{
- TQToolTip::add(TQT_TQWIDGET(_handle), _info.name());
+ TQToolTip::add(_handle, _info.name());
_handle->show();
setBackground();
}
diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp
index da1a5e4c2..3c53d211e 100644
--- a/kicker/kicker/core/container_button.cpp
+++ b/kicker/kicker/core/container_button.cpp
@@ -262,7 +262,7 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e)
TQPopupMenu* menu = opMenu();
connect( menu, TQT_SIGNAL( aboutToHide() ), this, TQT_SLOT( slotMenuClosed() ) );
- TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, TQT_TQWIDGET(this),
+ TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, this,
(orientation() == TQt::Horizontal) ?
TQPoint(0, 0) : me->pos());
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index dff2836e9..9553e0a85 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -149,7 +149,7 @@ void ExtensionContainer::init()
connect(UnhideTrigger::the(), TQT_SIGNAL(triggerUnhide(UnhideTrigger::Trigger,int)),
this, TQT_SLOT(unhideTriggered(UnhideTrigger::Trigger,int)));
- _popupWidgetFilter = new PopupWidgetFilter( TQT_TQOBJECT(this) );
+ _popupWidgetFilter = new PopupWidgetFilter( this );
connect(_popupWidgetFilter, TQT_SIGNAL(popupWidgetHiding()), TQT_SLOT(maybeStartAutoHideTimer()));
// layout
@@ -733,7 +733,7 @@ void ExtensionContainer::autoHideTimeout()
{
// kdDebug(1210) << "PanelContainer::autoHideTimeout() " << name() << endl;
// Hack: If there is a popup open, don't autohide until it closes.
- TQWidget* popup = TQT_TQWIDGET(TQApplication::activePopupWidget());
+ TQWidget* popup = TQApplication::activePopupWidget();
if (popup)
{
diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp
index 94517607e..6a92b3899 100644
--- a/kicker/kicker/core/kicker.cpp
+++ b/kicker/kicker/core/kicker.cpp
@@ -116,7 +116,7 @@ Kicker::Kicker()
// initialize our keys
// note that this creates the KMenu by calling MenuManager::the()
- keys = new TDEGlobalAccel( TQT_TQOBJECT(this) );
+ keys = new TDEGlobalAccel( this );
#define KICKER_ALL_BINDINGS
#include "kickerbindings.cpp"
keys->readSettings();
diff --git a/kicker/kicker/core/kickerbindings.cpp b/kicker/kicker/core/kickerbindings.cpp
index b8d774fdb..07ac99d7a 100644
--- a/kicker/kicker/core/kickerbindings.cpp
+++ b/kicker/kicker/core/kickerbindings.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef NOSLOTS
# define DEF( name, key3, key4, target, fnSlot ) \
- keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(target), TQT_SLOT(fnSlot) )
+ keys->insert( name, i18n(name), TQString(), key3, key4, target, TQT_SLOT(fnSlot) )
#else
# define DEF( name, key3, key4, target, fnSlot ) \
keys->insert( name, i18n(name), TQString(), key3, key4 )
diff --git a/kicker/kicker/core/pluginmanager.cpp b/kicker/kicker/core/pluginmanager.cpp
index a8b79877a..a0c1c0c31 100644
--- a/kicker/kicker/core/pluginmanager.cpp
+++ b/kicker/kicker/core/pluginmanager.cpp
@@ -159,7 +159,7 @@ KPanelApplet* PluginManager::loadApplet(const AppletInfo& info,
if (applet)
{
- _dict.insert( TQT_TQOBJECT(applet), new AppletInfo( info ) );
+ _dict.insert( applet, new AppletInfo( info ) );
connect( applet, TQT_SIGNAL( destroyed( TQObject* ) ),
TQT_SLOT( slotPluginDestroyed( TQObject* ) ) );
}
@@ -197,7 +197,7 @@ KPanelExtension* PluginManager::loadExtension(
KPanelExtension* extension = init_ptr( parent, info.configFile() );
if( extension ) {
- _dict.insert( TQT_TQOBJECT(extension), new AppletInfo( info ) );
+ _dict.insert( extension, new AppletInfo( info ) );
connect( extension, TQT_SIGNAL( destroyed( TQObject* ) ),
TQT_SLOT( slotPluginDestroyed( TQObject* ) ) );
}
@@ -365,7 +365,7 @@ LibUnloader::LibUnloader( const TQString &libName, TQObject *parent )
void LibUnloader::unload( const TQString &libName )
{
- (void)new LibUnloader( libName, TQT_TQOBJECT(kapp) );
+ (void)new LibUnloader( libName, kapp );
}
void LibUnloader::unload()
diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp
index 26cddaf7b..27d709837 100644
--- a/kicker/kicker/ui/addapplet.cpp
+++ b/kicker/kicker/ui/addapplet.cpp
@@ -305,7 +305,7 @@ bool AddAppletDialog::eventFilter(TQObject *o, TQEvent *e)
if (e->type() == TQEvent::Resize)
TQTimer::singleShot(0, this, TQT_SLOT(resizeAppletView()));
- return TQT_TQOBJECT(this)->TQObject::eventFilter(o, e);
+ return this->TQObject::eventFilter(o, e);
}
void AddAppletDialog::populateApplets()
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index 79ba8826f..2fe75f2d5 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -528,7 +528,7 @@ void PanelKMenu::slotSessionActivated( int ent )
void PanelKMenu::doNewSession( bool lock )
{
int result = KMessageBox::warningContinueCancel(
- TQT_TQWIDGET(kapp->desktop()->screen(kapp->desktop()->screenNumber(this))),
+ kapp->desktop()->screen(kapp->desktop()->screenNumber(this)),
i18n("<p>You have chosen to open another desktop session.<br>"
"The current session will be hidden "
"and a new login screen will be displayed.<br>"
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index 439dce8df..569bd1d8c 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -522,7 +522,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
if(raiseWidget)
break;
if(receiver->isWidgetType())
- receiver = TQT_TQOBJECT(TQT_TQWIDGET(receiver)->parentWidget(true));
+ receiver = static_cast<TQWidget*>(receiver)->parentWidget(true);
else
break;
}
@@ -533,7 +533,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
TQWidget::StrongFocus : TQWidget::NoFocus);
setTabOrder(raiseWidget, m_searchResultsWidget);
if (raiseWidget != m_stacker->visibleWidget()
- && TQT_TQWIDGET(receiver)->focusPolicy() == TQWidget::NoFocus
+ && static_cast<TQWidget*>(receiver)->focusPolicy() == TQWidget::NoFocus
&& m_stacker->id(raiseWidget) >= 0) {
m_stacker->raiseWidget(raiseWidget);
@@ -562,7 +562,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
}
if(e->type() == TQEvent::Enter && receiver->isWidgetType()) {
- TQT_TQWIDGET(receiver)->setMouseTracking(true);
+ static_cast<TQWidget*>(receiver)->setMouseTracking(true);
TQToolTip::hide();
}
@@ -1445,7 +1445,7 @@ void KMenu::insertStaticItems()
m_systemView->insertItem( "network", i18n( "Network Folders" ),
"remote:/", "remote:/", nId++, index++ );
- m_mediaWatcher = new MediaWatcher( TQT_TQOBJECT(this) );
+ m_mediaWatcher = new MediaWatcher( this );
connect( m_mediaWatcher, TQT_SIGNAL( mediumChanged() ), TQT_SLOT( updateMedia() ) );
m_media_id = 0;
@@ -1534,7 +1534,7 @@ void KMenu::slotSessionActivated( int ent )
void KMenu::doNewSession( bool lock )
{
int result = KMessageBox::warningContinueCancel(
- TQT_TQWIDGET(kapp->desktop()->screen(kapp->desktop()->screenNumber(this))),
+ kapp->desktop()->screen(kapp->desktop()->screenNumber(this)),
i18n("<p>You have chosen to open another desktop session.<br>"
"The current session will be hidden "
"and a new login screen will be displayed.<br>"
@@ -2979,7 +2979,7 @@ void KMenu::slotContextMenu(int selected)
case EditItem:
case EditMenu:
accept();
- proc = new TDEProcess(TQT_TQOBJECT(this));
+ proc = new TDEProcess(this);
*proc << TDEStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
*proc << "/"+m_popupPath.menuPath.section('/',-200,-2) << m_popupPath.menuPath.section('/', -1);
proc->start();
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index 10510ca6f..0e8a8ce99 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -696,7 +696,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
}
case EditItem:
- proc = new TDEProcess(TQT_TQOBJECT(this));
+ proc = new TDEProcess(this);
*proc << TDEStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
*proc << "/"+relPath_ << static_cast<KService *>(contextKSycocaEntry_)->menuId();
proc->start();
@@ -740,7 +740,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
}
case EditMenu:
- proc = new TDEProcess(TQT_TQOBJECT(this));
+ proc = new TDEProcess(this);
*proc << TDEStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
*proc << "/"+static_cast<KServiceGroup *>(contextKSycocaEntry_)->relPath();
proc->start();
diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp
index b3716a871..a491aae27 100644
--- a/kicker/libkicker/kickertip.cpp
+++ b/kicker/libkicker/kickertip.cpp
@@ -452,7 +452,7 @@ void KickerTip::tipperDestroyed(TQObject* o)
{
// we can't do a dynamic cast because we are in the process of dying
// so static it is.
- untipFor(TQT_TQWIDGET(o));
+ untipFor(static_cast<TQWidget*>(o));
}
void KickerTip::internalUpdate()
@@ -508,7 +508,7 @@ bool KickerTip::eventFilter(TQObject *object, TQEvent *event)
return false;
}
- TQWidget *widget = TQT_TQWIDGET(object);
+ TQWidget *widget = static_cast<TQWidget*>(object);
switch (event->type())
{
diff --git a/kicker/libkicker/menuinfo.cpp b/kicker/libkicker/menuinfo.cpp
index a8e4bf1fa..8cdc4c664 100644
--- a/kicker/libkicker/menuinfo.cpp
+++ b/kicker/libkicker/menuinfo.cpp
@@ -64,5 +64,5 @@ KPanelMenu* MenuInfo::load(TQWidget *parent, const char *name)
return KParts::ComponentFactory::createInstanceFromLibrary<KPanelMenu>(
TQFile::encodeName( library_ ),
- TQT_TQOBJECT(parent), name );
+ parent, name );
}
diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp
index c992cf855..4238fc562 100644
--- a/kicker/menuext/kate/katesessionmenu.cpp
+++ b/kicker/menuext/kate/katesessionmenu.cpp
@@ -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/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp
index 9ca123a94..81f54f25b 100644
--- a/kicker/taskbar/taskbar.cpp
+++ b/kicker/taskbar/taskbar.cpp
@@ -132,7 +132,7 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettin
blocklayout = false;
connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
- keys = new TDEGlobalAccel( TQT_TQOBJECT(this) );
+ keys = new TDEGlobalAccel( this );
#include "taskbarbindings.cpp"
keys->readSettings();
keys->updateConnections();
diff --git a/kicker/taskbar/taskbarbindings.cpp b/kicker/taskbar/taskbarbindings.cpp
index 364faac97..c451d621f 100644
--- a/kicker/taskbar/taskbarbindings.cpp
+++ b/kicker/taskbar/taskbarbindings.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef NOSLOTS
# define DEF( name, key3, key4, fnSlot ) \
- keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) )
+ keys->insert( name, i18n(name), TQString(), key3, key4, this, TQT_SLOT(fnSlot) )
#else
# define DEF( name, key3, key4, fnSlot ) \
keys->insert( name, i18n(name), TQString(), key3, key4 )
diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp
index 33df1ddd6..d4da190b6 100644
--- a/kicker/taskmanager/taskmanager.cpp
+++ b/kicker/taskmanager/taskmanager.cpp
@@ -1305,7 +1305,7 @@ void Task::updateThumbnail()
// by the thumbnail generation. This makes things much smoother
// on slower machines.
//
- TQWidget *rootWin = TQT_TQWIDGET(tqApp->desktop());
+ TQWidget *rootWin = tqApp->desktop();
TQRect geom = _info.geometry();
_grab = TQPixmap::grabWindow(rootWin->winId(),
geom.x(), geom.y(),
diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp
index 25c095c2a..c44e11afe 100644
--- a/klipper/configdialog.cpp
+++ b/klipper/configdialog.cpp
@@ -201,7 +201,7 @@ void ListView::rename( TQListViewItem* item, int c )
if ( gui ) {
if ( ! _regExpEditor )
- _regExpEditor = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) );
+ _regExpEditor = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this );
KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( _regExpEditor->tqt_cast( "KRegExpEditorInterface" ) );
assert( iface );
iface->setRegExp( item->text( 0 ) );
diff --git a/klipper/klipperbindings.cpp b/klipper/klipperbindings.cpp
index 16b0c24f2..dd14ad3c4 100644
--- a/klipper/klipperbindings.cpp
+++ b/klipper/klipperbindings.cpp
@@ -18,7 +18,7 @@
*/
#ifndef NOSLOTS
# define DEF( name, key3, key4, fnSlot ) \
- keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) )
+ keys->insert( name, i18n(name), TQString(), key3, key4, this, TQT_SLOT(fnSlot) )
#else
# define DEF( name, key3, key4, fnSlot ) \
keys->insert( name, i18n(name), TQString(), key3, key4 )
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp
index d90846dfc..c764b0003 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -156,7 +156,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
clearHistoryAction = new TDEAction( i18n("C&lear Clipboard History"),
"history_clear",
0,
- TQT_TQOBJECT(history()),
+ history(),
TQT_SLOT( slotClear() ),
collection,
"clearHistoryAction" );
@@ -165,7 +165,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
configureAction = new TDEAction( i18n("&Configure Klipper..."),
"configure",
0,
- TQT_TQOBJECT(this),
+ this,
TQT_SLOT( slotConfigure() ),
collection,
"configureAction" );
@@ -173,7 +173,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
quitAction = new TDEAction( i18n("&Quit"),
"system-log-out",
0,
- TQT_TQOBJECT(this),
+ this,
TQT_SLOT( slotQuit() ),
collection,
"quitAction" );
@@ -203,7 +203,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
m_iconOrigHeight = m_pixmap.height();
adjustSize();
- globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this));
+ globalKeys = new TDEGlobalAccel(this);
TDEGlobalAccel* keys = globalKeys;
#include "klipperbindings.cpp"
// the keys need to be read from kdeglobals, not kickerrc --ellis, 22/9/02
diff --git a/kmenuedit/kmenuedit.cpp b/kmenuedit/kmenuedit.cpp
index 05414213f..277748ae9 100644
--- a/kmenuedit/kmenuedit.cpp
+++ b/kmenuedit/kmenuedit.cpp
@@ -67,12 +67,12 @@ void KMenuEdit::setupActions()
if (!m_controlCenter)
(void)new TDEAction(i18n("New S&eparator"), "menu_new_sep", 0, actionCollection(), "newsep");
- (void)new TDEAction(i18n("Save && Quit"), "filesave_and_close", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSave_and_close()), actionCollection(), "file_save_and_quit");
+ (void)new TDEAction(i18n("Save && Quit"), "filesave_and_close", 0, this, TQT_SLOT( slotSave_and_close()), actionCollection(), "file_save_and_quit");
m_actionDelete = 0;
- KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT( slotSave() ), actionCollection());
- KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection());
+ KStdAction::save(this, TQT_SLOT( slotSave() ), actionCollection());
+ KStdAction::quit(this, TQT_SLOT( close() ), actionCollection());
KStdAction::cut(0, 0, actionCollection());
KStdAction::copy(0, 0, actionCollection());
KStdAction::paste(0, 0, actionCollection());
diff --git a/konqueror/KonqMainWindowIface.cpp b/konqueror/KonqMainWindowIface.cpp
index a18301a2f..5f3cbd14f 100644
--- a/konqueror/KonqMainWindowIface.cpp
+++ b/konqueror/KonqMainWindowIface.cpp
@@ -153,13 +153,13 @@ TQMap<TQCString,DCOPRef> KonqMainWindowIface::actionMap()
QCStringList KonqMainWindowIface::functionsDynamic()
{
- return DCOPObject::functionsDynamic() + KDCOPPropertyProxy::functions( TQT_TQOBJECT(m_pMainWindow) );
+ return DCOPObject::functionsDynamic() + KDCOPPropertyProxy::functions( m_pMainWindow );
}
bool KonqMainWindowIface::processDynamic( const TQCString &fun, const TQByteArray &data, TQCString &replyType, TQByteArray &replyData )
{
- if ( KDCOPPropertyProxy::isPropertyRequest( fun, TQT_TQOBJECT(m_pMainWindow) ) )
- return KDCOPPropertyProxy::processPropertyRequest( fun, data, replyType, replyData, TQT_TQOBJECT(m_pMainWindow) );
+ if ( KDCOPPropertyProxy::isPropertyRequest( fun, m_pMainWindow ) )
+ return KDCOPPropertyProxy::processPropertyRequest( fun, data, replyType, replyData, m_pMainWindow );
return DCOPObject::processDynamic( fun, data, replyType, replyData );
}
diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index aedf4a74d..9e4480d0b 100644
--- a/konqueror/keditbookmarks/actionsimpl.cpp
+++ b/konqueror/keditbookmarks/actionsimpl.cpp
@@ -78,136 +78,136 @@ void KEBApp::createActions() {
// save and quit should probably not be in the toplevel???
(void) KStdAction::quit(
- TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection());
+ this, TQT_SLOT( close() ), actionCollection());
KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
(void) KStdAction::configureToolbars(
- TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection());
+ this, TQT_SLOT( slotConfigureToolbars() ), actionCollection());
if (m_browser) {
(void) KStdAction::open(
- TQT_TQOBJECT(actn), TQT_SLOT( slotLoad() ), actionCollection());
+ actn, TQT_SLOT( slotLoad() ), actionCollection());
(void) KStdAction::saveAs(
- TQT_TQOBJECT(actn), TQT_SLOT( slotSaveAs() ), actionCollection());
+ actn, TQT_SLOT( slotSaveAs() ), actionCollection());
}
- (void) KStdAction::cut(TQT_TQOBJECT(actn), TQT_SLOT( slotCut() ), actionCollection());
- (void) KStdAction::copy(TQT_TQOBJECT(actn), TQT_SLOT( slotCopy() ), actionCollection());
- (void) KStdAction::paste(TQT_TQOBJECT(actn), TQT_SLOT( slotPaste() ), actionCollection());
- (void) KStdAction::print(TQT_TQOBJECT(actn), TQT_SLOT( slotPrint() ), actionCollection());
+ (void) KStdAction::cut(actn, TQT_SLOT( slotCut() ), actionCollection());
+ (void) KStdAction::copy(actn, TQT_SLOT( slotCopy() ), actionCollection());
+ (void) KStdAction::paste(actn, TQT_SLOT( slotPaste() ), actionCollection());
+ (void) KStdAction::print(actn, TQT_SLOT( slotPrint() ), actionCollection());
// settings menu
(void) new TDEToggleAction(
i18n("&Show Netscape Bookmarks in Konqueror"), 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotShowNS() ), actionCollection(),
+ actn, TQT_SLOT( slotShowNS() ), actionCollection(),
"settings_showNS");
// actions
(void) new TDEAction(
i18n("&Delete"), "edit-delete", Key_Delete,
- TQT_TQOBJECT(actn), TQT_SLOT( slotDelete() ), actionCollection(), "delete");
+ actn, TQT_SLOT( slotDelete() ), actionCollection(), "delete");
(void) new TDEAction(
i18n("Rename"), "text", Key_F2,
- TQT_TQOBJECT(actn), TQT_SLOT( slotRename() ), actionCollection(), "rename");
+ actn, TQT_SLOT( slotRename() ), actionCollection(), "rename");
(void) new TDEAction(
i18n("C&hange URL"), "text", Key_F3,
- TQT_TQOBJECT(actn), TQT_SLOT( slotChangeURL() ), actionCollection(), "changeurl");
+ actn, TQT_SLOT( slotChangeURL() ), actionCollection(), "changeurl");
(void) new TDEAction(
i18n("C&hange Comment"), "text", Key_F4,
- TQT_TQOBJECT(actn), TQT_SLOT( slotChangeComment() ), actionCollection(), "changecomment");
+ actn, TQT_SLOT( slotChangeComment() ), actionCollection(), "changecomment");
(void) new TDEAction(
i18n("Chan&ge Icon..."), "icons", 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotChangeIcon() ), actionCollection(), "changeicon");
+ actn, TQT_SLOT( slotChangeIcon() ), actionCollection(), "changeicon");
(void) new TDEAction(
i18n("Update Favicon"), 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon");
+ actn, TQT_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon");
(void) new TDEAction(
i18n("Recursive Sort"), 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort");
+ actn, TQT_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort");
(void) new TDEAction(
i18n("&New Folder..."), "folder-new", CTRL+Key_N,
- TQT_TQOBJECT(actn), TQT_SLOT( slotNewFolder() ), actionCollection(), "newfolder");
+ actn, TQT_SLOT( slotNewFolder() ), actionCollection(), "newfolder");
(void) new TDEAction(
i18n("&New Bookmark"), "www", 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark");
+ actn, TQT_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark");
(void) new TDEAction(
i18n("&Insert Separator"), CTRL+Key_I,
- TQT_TQOBJECT(actn), TQT_SLOT( slotInsertSeparator() ), actionCollection(),
+ actn, TQT_SLOT( slotInsertSeparator() ), actionCollection(),
"insertseparator");
(void) new TDEAction(
i18n("&Sort Alphabetically"), 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotSort() ), actionCollection(), "sort");
+ actn, TQT_SLOT( slotSort() ), actionCollection(), "sort");
(void) new TDEAction(
i18n("Set as T&oolbar Folder"), "bookmark_toolbar", 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar");
+ actn, TQT_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar");
(void) new TDEAction(
i18n("Show in T&oolbar"), "bookmark_toolbar", 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar");
+ actn, TQT_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar");
(void) new TDEAction(
i18n("Hide in T&oolbar"), "bookmark_toolbar", 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar");
+ actn, TQT_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar");
(void) new TDEAction(
i18n("&Expand All Folders"), 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotExpandAll() ), actionCollection(), "expandall");
+ actn, TQT_SLOT( slotExpandAll() ), actionCollection(), "expandall");
(void) new TDEAction(
i18n("Collapse &All Folders"), 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" );
+ actn, TQT_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" );
(void) new TDEAction(
i18n("&Open in Konqueror"), "document-open", 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" );
+ actn, TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" );
(void) new TDEAction(
i18n("Check &Status"), "bookmark", 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotTestSelection() ), actionCollection(), "testlink" );
+ actn, TQT_SLOT( slotTestSelection() ), actionCollection(), "testlink" );
(void) new TDEAction(
i18n("Check Status: &All"), 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotTestAll() ), actionCollection(), "testall" );
+ actn, TQT_SLOT( slotTestAll() ), actionCollection(), "testall" );
(void) new TDEAction(
i18n("Update All &Favicons"), 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotUpdateAllFavIcons() ), actionCollection(),
+ actn, TQT_SLOT( slotUpdateAllFavIcons() ), actionCollection(),
"updateallfavicons" );
(void) new TDEAction(
i18n("Cancel &Checks"), 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" );
+ actn, TQT_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" );
(void) new TDEAction(
i18n("Cancel &Favicon Updates"), 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotCancelFavIconUpdates() ), actionCollection(),
+ actn, TQT_SLOT( slotCancelFavIconUpdates() ), actionCollection(),
"cancelfaviconupdates" );
(void) new TDEAction(
i18n("Import &Netscape Bookmarks..."), "netscape", 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importNS");
+ actn, TQT_SLOT( slotImport() ), actionCollection(), "importNS");
(void) new TDEAction(
i18n("Import &Opera Bookmarks..."), "opera", 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importOpera");
+ actn, TQT_SLOT( slotImport() ), actionCollection(), "importOpera");
(void) new TDEAction(
i18n("Import All &Crash Sessions as Bookmarks..."), 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importCrashes");
+ actn, TQT_SLOT( slotImport() ), actionCollection(), "importCrashes");
(void) new TDEAction(
i18n("Import &Galeon Bookmarks..."), 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importGaleon");
+ actn, TQT_SLOT( slotImport() ), actionCollection(), "importGaleon");
(void) new TDEAction(
i18n("Import &KDE2/KDE3/TDE Bookmarks..."), 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importKDE2");
+ actn, TQT_SLOT( slotImport() ), actionCollection(), "importKDE2");
(void) new TDEAction(
i18n("Import &IE Bookmarks..."), 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importIE");
+ actn, TQT_SLOT( slotImport() ), actionCollection(), "importIE");
(void) new TDEAction(
i18n("Import &Mozilla Bookmarks..."), "mozilla", 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importMoz");
+ actn, TQT_SLOT( slotImport() ), actionCollection(), "importMoz");
(void) new TDEAction(
i18n("Export to &Netscape Bookmarks"), "netscape", 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotExportNS() ), actionCollection(), "exportNS");
+ actn, TQT_SLOT( slotExportNS() ), actionCollection(), "exportNS");
(void) new TDEAction(
i18n("Export to &Opera Bookmarks..."), "opera", 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotExportOpera() ), actionCollection(), "exportOpera");
+ actn, TQT_SLOT( slotExportOpera() ), actionCollection(), "exportOpera");
(void) new TDEAction(
i18n("Export to &HTML Bookmarks..."), "text-html", 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotExportHTML() ), actionCollection(), "exportHTML");
+ actn, TQT_SLOT( slotExportHTML() ), actionCollection(), "exportHTML");
(void) new TDEAction(
i18n("Export to &IE Bookmarks..."), 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotExportIE() ), actionCollection(), "exportIE");
+ actn, TQT_SLOT( slotExportIE() ), actionCollection(), "exportIE");
(void) new TDEAction(
i18n("Export to &Mozilla Bookmarks..."), "mozilla", 0,
- TQT_TQOBJECT(actn), TQT_SLOT( slotExportMoz() ), actionCollection(), "exportMoz");
+ actn, TQT_SLOT( slotExportMoz() ), actionCollection(), "exportMoz");
}
void ActionsImpl::slotLoad() {
diff --git a/konqueror/keditbookmarks/favicons.cpp b/konqueror/keditbookmarks/favicons.cpp
index a1ea018b1..6013187bb 100644
--- a/konqueror/keditbookmarks/favicons.cpp
+++ b/konqueror/keditbookmarks/favicons.cpp
@@ -83,7 +83,7 @@ void FavIconsItr::doAction() {
// kdDebug() << "FavIconsItr::doAction()" << endl;
curItem()->setTmpStatus(i18n("Updating favicon..."));
if (!m_updater) {
- m_updater = new FavIconUpdater(TQT_TQOBJECT(kapp), "FavIconUpdater");
+ m_updater = new FavIconUpdater(kapp, "FavIconUpdater");
connect(m_updater, TQT_SIGNAL( done(bool) ),
this, TQT_SLOT( slotDone(bool) ) );
}
diff --git a/konqueror/konq_extensionmanager.cpp b/konqueror/konq_extensionmanager.cpp
index b00522252..d60caeeb1 100644
--- a/konqueror/konq_extensionmanager.cpp
+++ b/konqueror/konq_extensionmanager.cpp
@@ -100,8 +100,8 @@ void KonqExtensionManager::apply()
setChanged(false);
if( d->mainWindow )
{
- KParts::Plugin::loadPlugins(TQT_TQOBJECT(d->mainWindow), d->mainWindow, TDEGlobal::instance());
- TQPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects(TQT_TQOBJECT(d->mainWindow));
+ KParts::Plugin::loadPlugins(d->mainWindow, d->mainWindow, TDEGlobal::instance());
+ TQPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects(d->mainWindow);
TQPtrListIterator<KParts::Plugin> it(plugins);
KParts::Plugin *plugin;
while((plugin = it.current()) != 0)
diff --git a/konqueror/konq_factory.cpp b/konqueror/konq_factory.cpp
index e35f5b7c7..0a69c1c8c 100644
--- a/konqueror/konq_factory.cpp
+++ b/konqueror/konq_factory.cpp
@@ -64,10 +64,10 @@ KParts::ReadOnlyPart *KonqViewFactory::create( TQWidget *parentWidget, const cha
else
{
if ( m_createBrowser )
- obj = m_factory->create( TQT_TQOBJECT(parentWidget), name, "Browser/View", m_args );
+ obj = m_factory->create( parentWidget, name, "Browser/View", m_args );
if ( !obj )
- obj = m_factory->create( TQT_TQOBJECT(parentWidget), name, "KParts::ReadOnlyPart", m_args );
+ obj = m_factory->create( parentWidget, name, "KParts::ReadOnlyPart", m_args );
}
if ( !obj->inherits( "KParts::ReadOnlyPart" ) )
diff --git a/konqueror/konq_frame.cpp b/konqueror/konq_frame.cpp
index cf0960f4d..93f465a13 100644
--- a/konqueror/konq_frame.cpp
+++ b/konqueror/konq_frame.cpp
@@ -151,7 +151,7 @@ void KonqFrameStatusBar::splitFrameMenu()
// We have to ship the remove view action ourselves,
// since this may not be the active view (passive view)
- TDEAction actRemoveView(i18n("Close View"), "view_remove", 0, TQT_TQOBJECT(m_pParentKonqFrame), TQT_SLOT(slotRemoveView()), (TQObject*)0, "removethisview");
+ TDEAction actRemoveView(i18n("Close View"), "view_remove", 0, m_pParentKonqFrame, TQT_SLOT(slotRemoveView()), (TQObject*)0, "removethisview");
//KonqView * nextView = mw->viewManager()->chooseNextView( m_pParentKonqFrame->childView() );
actRemoveView.setEnabled( mw->mainViewsCount() > 1 || m_pParentKonqFrame->childView()->isToggleView() || m_pParentKonqFrame->childView()->isPassiveMode() );
diff --git a/konqueror/konq_guiclients.cpp b/konqueror/konq_guiclients.cpp
index fd7a1c29d..0e014e70a 100644
--- a/konqueror/konq_guiclients.cpp
+++ b/konqueror/konq_guiclients.cpp
@@ -157,7 +157,7 @@ void PopupMenuGUIClient::addEmbeddingService( TQDomElement &menu, int idx, const
action.setAttribute( "group", "preview" );
(void)new TDEAction( name, service->pixmap( TDEIcon::Small ), 0,
- TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotOpenEmbedded() ), actionCollection(), actName );
+ m_mainWindow, TQT_SLOT( slotOpenEmbedded() ), actionCollection(), actName );
}
ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow )
diff --git a/konqueror/konq_mainwindow.cpp b/konqueror/konq_mainwindow.cpp
index ab8d56c77..f5a34925a 100644
--- a/konqueror/konq_mainwindow.cpp
+++ b/konqueror/konq_mainwindow.cpp
@@ -192,7 +192,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
// init history-manager, load history, get completion object
if ( !s_pCompletion ) {
- KonqHistoryManager *mgr = new KonqHistoryManager( TQT_TQOBJECT(kapp), "history mgr" );
+ KonqHistoryManager *mgr = new KonqHistoryManager( kapp, "history mgr" );
s_pCompletion = mgr->completionObject();
@@ -360,7 +360,7 @@ TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const T
m_bookmarkBarActionCollection = new TDEActionCollection( this );
m_bookmarkBarActionCollection->setHighlightingEnabled( true );
connectActionCollection( m_bookmarkBarActionCollection );
- DelayedInitializer *initializer = new DelayedInitializer( TQEvent::Show, TQT_TQOBJECT(res) );
+ DelayedInitializer *initializer = new DelayedInitializer( TQEvent::Show, res );
connect( initializer, TQT_SIGNAL( initialize() ), this, TQT_SLOT(initBookmarkBar()) );
}
}
@@ -370,12 +370,12 @@ TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const T
void KonqMainWindow::initBookmarkBar()
{
- TDEToolBar * bar = static_cast<TDEToolBar *>( TQT_TQWIDGET(child( "bookmarkToolBar", "TDEToolBar" )) );
+ TDEToolBar * bar = static_cast<TDEToolBar *>( child( "bookmarkToolBar", "TDEToolBar" ) );
if (!bar) return;
delete m_paBookmarkBar;
- m_paBookmarkBar = new KBookmarkBar( KonqBookmarkManager::self(), m_pBookmarksOwner, bar, m_bookmarkBarActionCollection, TQT_TQOBJECT(this) );
+ m_paBookmarkBar = new KBookmarkBar( KonqBookmarkManager::self(), m_pBookmarksOwner, bar, m_bookmarkBarActionCollection, this );
connect( m_paBookmarkBar,
TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ),
this, TQT_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) ));
@@ -1060,7 +1060,7 @@ void KonqMainWindow::openURL( KonqView *childView, const KURL &url, const KParts
TQObject *KonqMainWindow::lastFrame( KonqView *view )
{
TQObject *nextFrame, *viewFrame;
- nextFrame = TQT_TQOBJECT(view->frame());
+ nextFrame = view->frame();
viewFrame = 0;
while ( nextFrame != 0 && ! nextFrame->inherits( "TQWidgetStack" ) ) {
viewFrame = nextFrame;
@@ -3315,7 +3315,7 @@ void KonqMainWindow::initCombo()
if ( !bookmarkCompletionInitialized )
{
bookmarkCompletionInitialized = true;
- DelayedInitializer *initializer = new DelayedInitializer( TQEvent::KeyPress, TQT_TQOBJECT(m_combo->lineEdit()) );
+ DelayedInitializer *initializer = new DelayedInitializer( TQEvent::KeyPress, m_combo->lineEdit() );
connect( initializer, TQT_SIGNAL( initialize() ), this, TQT_SLOT( bookmarksIntoCompletion() ) );
}
}
@@ -3820,72 +3820,72 @@ void KonqMainWindow::initActions()
(void) new TDEAction( i18n( "&Edit File Type..." ), 0, actionCollection(), "editMimeType" );
(void) new TDEAction( i18n( "Properties" ), ALT+Key_Return, actionCollection(), "properties" );
- (void) new TDEAction( i18n( "New &Window" ), "window-new", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT( slotNewWindow() ), actionCollection(), "new_window" );
- (void) new TDEAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" );
- (void) new TDEAction( i18n( "Send &Link Address..." ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendURL() ), actionCollection(), "sendURL" );
- (void) new TDEAction( i18n( "S&end File..." ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendFile() ), actionCollection(), "sendPage" );
+ (void) new TDEAction( i18n( "New &Window" ), "window-new", TDEStdAccel::shortcut(TDEStdAccel::New), this, TQT_SLOT( slotNewWindow() ), actionCollection(), "new_window" );
+ (void) new TDEAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, this, TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" );
+ (void) new TDEAction( i18n( "Send &Link Address..." ), "mail_generic", 0, this, TQT_SLOT( slotSendURL() ), actionCollection(), "sendURL" );
+ (void) new TDEAction( i18n( "S&end File..." ), "mail_generic", 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "sendPage" );
if (kapp->authorize("shell_access"))
{
- (void) new TDEAction( i18n( "Open &Terminal" ), "openterm", Key_F4, TQT_TQOBJECT(this), TQT_SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" );
+ (void) new TDEAction( i18n( "Open &Terminal" ), "openterm", Key_F4, this, TQT_SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" );
}
- (void) new TDEAction( i18n( "&Open Location..." ), "document-open", TDEStdAccel::shortcut(TDEStdAccel::Open), TQT_TQOBJECT(this), TQT_SLOT( slotOpenLocation() ), actionCollection(), "open_location" );
+ (void) new TDEAction( i18n( "&Open Location..." ), "document-open", TDEStdAccel::shortcut(TDEStdAccel::Open), this, TQT_SLOT( slotOpenLocation() ), actionCollection(), "open_location" );
- m_paFindFiles = new TDEToggleAction( i18n( "&Find File..." ), "filefind", TDEStdAccel::shortcut(TDEStdAccel::Find), TQT_TQOBJECT(this), TQT_SLOT( slotToolFind() ), actionCollection(), "findfile" );
+ m_paFindFiles = new TDEToggleAction( i18n( "&Find File..." ), "filefind", TDEStdAccel::shortcut(TDEStdAccel::Find), this, TQT_SLOT( slotToolFind() ), actionCollection(), "findfile" );
m_paPrint = KStdAction::print( 0, 0, actionCollection(), "print" );
- (void) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "quit" );
+ (void) KStdAction::quit( this, TQT_SLOT( close() ), actionCollection(), "quit" );
- m_ptaUseHTML = new TDEToggleAction( i18n( "&Use index.html" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowHTML() ), actionCollection(), "usehtml" );
- m_paLockView = new TDEToggleAction( i18n( "Lock to Current Location"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotLockView() ), actionCollection(), "lock" );
- m_paLinkView = new TDEToggleAction( i18n( "Lin&k View"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotLinkView() ), actionCollection(), "link" );
+ m_ptaUseHTML = new TDEToggleAction( i18n( "&Use index.html" ), 0, this, TQT_SLOT( slotShowHTML() ), actionCollection(), "usehtml" );
+ m_paLockView = new TDEToggleAction( i18n( "Lock to Current Location"), 0, this, TQT_SLOT( slotLockView() ), actionCollection(), "lock" );
+ m_paLinkView = new TDEToggleAction( i18n( "Lin&k View"), 0, this, TQT_SLOT( slotLinkView() ), actionCollection(), "link" );
// Go menu
m_paUp = new TDEToolBarPopupAction( i18n( "&Up" ), "go-up", TDEStdAccel::shortcut(TDEStdAccel::Up), actionCollection(), "up" );
- connect( m_paUp, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this),
+ connect( m_paUp, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this,
TQT_SLOT( slotUp(TDEAction::ActivationReason, TQt::ButtonState) ) );
- connect( m_paUp->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotUpAboutToShow() ) );
- connect( m_paUp->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotUpActivated( int ) ) );
+ connect( m_paUp->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotUpAboutToShow() ) );
+ connect( m_paUp->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotUpActivated( int ) ) );
TQPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward();
m_paBack = new TDEToolBarPopupAction( backForward.first, TDEStdAccel::shortcut(TDEStdAccel::Back), 0, "", actionCollection(), "back" );
- connect( m_paBack, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this),
+ connect( m_paBack, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this,
TQT_SLOT( slotBack(TDEAction::ActivationReason, TQt::ButtonState) ) );
- connect( m_paBack->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotBackAboutToShow() ) );
- connect( m_paBack->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotBackActivated( int ) ) );
+ connect( m_paBack->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotBackAboutToShow() ) );
+ connect( m_paBack->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotBackActivated( int ) ) );
m_paForward = new TDEToolBarPopupAction( backForward.second, TDEStdAccel::shortcut(TDEStdAccel::Forward), 0, "", actionCollection(), "forward" );
- connect( m_paForward, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this),
+ connect( m_paForward, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this,
TQT_SLOT( slotForward(TDEAction::ActivationReason, TQt::ButtonState) ) );
- connect( m_paForward->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotForwardAboutToShow() ) );
- connect( m_paForward->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotForwardActivated( int ) ) );
+ connect( m_paForward->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotForwardAboutToShow() ) );
+ connect( m_paForward->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotForwardActivated( int ) ) );
m_paHistory = new KonqBidiHistoryAction( i18n("History"), actionCollection(), "history" );
- connect( m_paHistory, TQT_SIGNAL( menuAboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotGoMenuAboutToShow() ) );
- connect( m_paHistory, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotGoHistoryActivated( int ) ) );
+ connect( m_paHistory, TQT_SIGNAL( menuAboutToShow() ), this, TQT_SLOT( slotGoMenuAboutToShow() ) );
+ connect( m_paHistory, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotGoHistoryActivated( int ) ) );
m_paHome = new TDEAction( i18n( "Home" ), "go-home", TDEStdAccel::shortcut(TDEStdAccel::Home), actionCollection(), "home" );
- connect( m_paHome, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this),
+ connect( m_paHome, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this,
TQT_SLOT( slotHome(TDEAction::ActivationReason, TQt::ButtonState) ) );
- (void) new TDEAction( i18n( "S&ystem" ), "computer", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoSystem() ), actionCollection(), "go_system" );
- (void) new TDEAction( i18n( "App&lications" ), "kmenu", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoApplications() ), actionCollection(), "go_applications" );
- (void) new TDEAction( i18n( "&Storage Media" ), "computer", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoMedia() ), actionCollection(), "go_media" );
- (void) new TDEAction( i18n( "&Network Folders" ), "network", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoNetworkFolders() ), actionCollection(), "go_network_folders" );
- (void) new TDEAction( i18n( "Sett&ings" ), "kcontrol", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoSettings() ), actionCollection(), "go_settings" );
+ (void) new TDEAction( i18n( "S&ystem" ), "computer", 0, this, TQT_SLOT( slotGoSystem() ), actionCollection(), "go_system" );
+ (void) new TDEAction( i18n( "App&lications" ), "kmenu", 0, this, TQT_SLOT( slotGoApplications() ), actionCollection(), "go_applications" );
+ (void) new TDEAction( i18n( "&Storage Media" ), "computer", 0, this, TQT_SLOT( slotGoMedia() ), actionCollection(), "go_media" );
+ (void) new TDEAction( i18n( "&Network Folders" ), "network", 0, this, TQT_SLOT( slotGoNetworkFolders() ), actionCollection(), "go_network_folders" );
+ (void) new TDEAction( i18n( "Sett&ings" ), "kcontrol", 0, this, TQT_SLOT( slotGoSettings() ), actionCollection(), "go_settings" );
//(void) new TDEAction( i18n( "Sidebar Configuration" ), 0, this, TQT_SLOT( slotGoDirTree() ), actionCollection(), "go_dirtree" );
- (void) new TDEAction( i18n( "Trash" ), "trashcan_full", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoTrash() ), actionCollection(), "go_trash" );
- (void) new TDEAction( i18n( "Autostart" ), "launch", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoAutostart() ), actionCollection(), "go_autostart" );
+ (void) new TDEAction( i18n( "Trash" ), "trashcan_full", 0, this, TQT_SLOT( slotGoTrash() ), actionCollection(), "go_trash" );
+ (void) new TDEAction( i18n( "Autostart" ), "launch", 0, this, TQT_SLOT( slotGoAutostart() ), actionCollection(), "go_autostart" );
KonqMostOftenURLSAction *mostOften = new KonqMostOftenURLSAction( i18n("Most Often Visited"), actionCollection(), "go_most_often" );
connect( mostOften, TQT_SIGNAL( activated( const KURL& )),
TQT_SLOT( slotOpenURL( const KURL& )));
- (void) new TDEAction( i18n( "History" ), "history", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoHistory() ), actionCollection(), "go_history" );
+ (void) new TDEAction( i18n( "History" ), "history", 0, this, TQT_SLOT( slotGoHistory() ), actionCollection(), "go_history" );
// Settings menu
- m_paSaveViewProfile = new TDEAction( i18n( "&Save View Profile..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveViewProfile() ), actionCollection(), "saveviewprofile" );
- m_paSaveViewPropertiesLocally = new TDEToggleAction( i18n( "Save View Changes per &Folder" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveViewPropertiesLocally() ), actionCollection(), "saveViewPropertiesLocally" );
+ m_paSaveViewProfile = new TDEAction( i18n( "&Save View Profile..." ), 0, this, TQT_SLOT( slotSaveViewProfile() ), actionCollection(), "saveviewprofile" );
+ m_paSaveViewPropertiesLocally = new TDEToggleAction( i18n( "Save View Changes per &Folder" ), 0, this, TQT_SLOT( slotSaveViewPropertiesLocally() ), actionCollection(), "saveViewPropertiesLocally" );
// "Remove" ? "Reset" ? The former is more correct, the latter is more kcontrol-like...
- m_paRemoveLocalProperties = new TDEAction( i18n( "Remove Folder Properties" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveLocalProperties() ), actionCollection(), "removeLocalProperties" );
+ m_paRemoveLocalProperties = new TDEAction( i18n( "Remove Folder Properties" ), 0, this, TQT_SLOT( slotRemoveLocalProperties() ), actionCollection(), "removeLocalProperties" );
m_configureModules << "tde-filebehavior.desktop" << "tde-fileappearance.desktop" <<
@@ -3900,38 +3900,38 @@ void KonqMainWindow::initActions()
if (!kapp->authorizeControlModules(configModules()).isEmpty())
- KStdAction::preferences (TQT_TQOBJECT(this), TQT_SLOT (slotConfigure()), actionCollection() );
+ KStdAction::preferences (this, TQT_SLOT (slotConfigure()), actionCollection() );
KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() );
- KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection() );
+ KStdAction::configureToolbars( this, TQT_SLOT( slotConfigureToolbars() ), actionCollection() );
- m_paConfigureExtensions = new TDEAction( i18n("Configure Extensions..."), 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfigureExtensions()), actionCollection(), "options_configure_extensions");
- m_paConfigureSpellChecking = new TDEAction( i18n("Configure Spell Checking..."), "tools-check-spelling", 0,TQT_TQOBJECT(this), TQT_SLOT( slotConfigureSpellChecking()), actionCollection(), "configurespellcheck");
+ m_paConfigureExtensions = new TDEAction( i18n("Configure Extensions..."), 0, this, TQT_SLOT( slotConfigureExtensions()), actionCollection(), "options_configure_extensions");
+ m_paConfigureSpellChecking = new TDEAction( i18n("Configure Spell Checking..."), "tools-check-spelling", 0,this, TQT_SLOT( slotConfigureSpellChecking()), actionCollection(), "configurespellcheck");
// Window menu
- m_paSplitViewHor = new TDEAction( i18n( "Split View &Left/Right" ), "view_left_right", CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), TQT_SLOT( slotSplitViewHorizontal() ), actionCollection(), "splitviewh" );
- m_paSplitViewVer = new TDEAction( i18n( "Split View &Top/Bottom" ), "view_top_bottom", CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), TQT_SLOT( slotSplitViewVertical() ), actionCollection(), "splitviewv" );
- m_paAddTab = new TDEAction( i18n( "&New Tab" ), "tab_new", "CTRL+SHIFT+N;CTRL+T", TQT_TQOBJECT(this), TQT_SLOT( slotAddTab() ), actionCollection(), "newtab" );
- m_paDuplicateTab = new TDEAction( i18n( "&Duplicate Current Tab" ), "tab_duplicate", CTRL+SHIFT+Key_D, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateTab() ), actionCollection(), "duplicatecurrenttab" );
- m_paBreakOffTab = new TDEAction( i18n( "Detach Current Tab" ), "tab_breakoff", CTRL+SHIFT+Key_B, TQT_TQOBJECT(this), TQT_SLOT( slotBreakOffTab() ), actionCollection(), "breakoffcurrenttab" );
- m_paRemoveView = new TDEAction( i18n( "&Close Active View" ),"view_remove", CTRL+SHIFT+Key_R, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveView() ), actionCollection(), "removeview" );
- m_paRemoveTab = new TDEAction( i18n( "Close Current Tab" ), "tab_remove", CTRL+Key_W, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveTab() ), actionCollection(), "removecurrenttab" );
- m_paRemoveOtherTabs = new TDEAction( i18n( "Close &Other Tabs" ), "tab_remove_other", 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveOtherTabsPopup() ), actionCollection(), "removeothertabs" );
-
- m_paActivateNextTab = new TDEAction( i18n( "Activate Next Tab" ), "tab_next", TQApplication::reverseLayout() ? TDEStdAccel::tabPrev() : TDEStdAccel::tabNext(), TQT_TQOBJECT(this), TQT_SLOT( slotActivateNextTab() ), actionCollection(), "activatenexttab" );
- m_paActivatePrevTab = new TDEAction( i18n( "Activate Previous Tab" ), "tab_previous", TQApplication::reverseLayout() ? TDEStdAccel::tabNext() : TDEStdAccel::tabPrev(), TQT_TQOBJECT(this), TQT_SLOT( slotActivatePrevTab() ), actionCollection(), "activateprevtab" );
+ m_paSplitViewHor = new TDEAction( i18n( "Split View &Left/Right" ), "view_left_right", CTRL+SHIFT+Key_L, this, TQT_SLOT( slotSplitViewHorizontal() ), actionCollection(), "splitviewh" );
+ m_paSplitViewVer = new TDEAction( i18n( "Split View &Top/Bottom" ), "view_top_bottom", CTRL+SHIFT+Key_T, this, TQT_SLOT( slotSplitViewVertical() ), actionCollection(), "splitviewv" );
+ m_paAddTab = new TDEAction( i18n( "&New Tab" ), "tab_new", "CTRL+SHIFT+N;CTRL+T", this, TQT_SLOT( slotAddTab() ), actionCollection(), "newtab" );
+ m_paDuplicateTab = new TDEAction( i18n( "&Duplicate Current Tab" ), "tab_duplicate", CTRL+SHIFT+Key_D, this, TQT_SLOT( slotDuplicateTab() ), actionCollection(), "duplicatecurrenttab" );
+ m_paBreakOffTab = new TDEAction( i18n( "Detach Current Tab" ), "tab_breakoff", CTRL+SHIFT+Key_B, this, TQT_SLOT( slotBreakOffTab() ), actionCollection(), "breakoffcurrenttab" );
+ m_paRemoveView = new TDEAction( i18n( "&Close Active View" ),"view_remove", CTRL+SHIFT+Key_R, this, TQT_SLOT( slotRemoveView() ), actionCollection(), "removeview" );
+ m_paRemoveTab = new TDEAction( i18n( "Close Current Tab" ), "tab_remove", CTRL+Key_W, this, TQT_SLOT( slotRemoveTab() ), actionCollection(), "removecurrenttab" );
+ m_paRemoveOtherTabs = new TDEAction( i18n( "Close &Other Tabs" ), "tab_remove_other", 0, this, TQT_SLOT( slotRemoveOtherTabsPopup() ), actionCollection(), "removeothertabs" );
+
+ m_paActivateNextTab = new TDEAction( i18n( "Activate Next Tab" ), "tab_next", TQApplication::reverseLayout() ? TDEStdAccel::tabPrev() : TDEStdAccel::tabNext(), this, TQT_SLOT( slotActivateNextTab() ), actionCollection(), "activatenexttab" );
+ m_paActivatePrevTab = new TDEAction( i18n( "Activate Previous Tab" ), "tab_previous", TQApplication::reverseLayout() ? TDEStdAccel::tabNext() : TDEStdAccel::tabPrev(), this, TQT_SLOT( slotActivatePrevTab() ), actionCollection(), "activateprevtab" );
TQCString actionname;
for (int i=1;i<13;i++) {
actionname.sprintf("activate_tab_%02d", i);
- new TDEAction(i18n("Activate Tab %1").arg(i), 0, TQT_TQOBJECT(this), TQT_SLOT(slotActivateTab()), actionCollection(), actionname);
+ new TDEAction(i18n("Activate Tab %1").arg(i), 0, this, TQT_SLOT(slotActivateTab()), actionCollection(), actionname);
}
- m_paMoveTabLeft = new TDEAction( i18n("Move Tab Left"), "go-previous" , CTRL+SHIFT+Key_Left,TQT_TQOBJECT(this), TQT_SLOT( slotMoveTabLeft()),actionCollection(),"tab_move_left");
- m_paMoveTabRight = new TDEAction( i18n("Move Tab Right"), "go-next" , CTRL+SHIFT+Key_Right,TQT_TQOBJECT(this), TQT_SLOT( slotMoveTabRight()),actionCollection(),"tab_move_right");
+ m_paMoveTabLeft = new TDEAction( i18n("Move Tab Left"), "go-previous" , CTRL+SHIFT+Key_Left,this, TQT_SLOT( slotMoveTabLeft()),actionCollection(),"tab_move_left");
+ m_paMoveTabRight = new TDEAction( i18n("Move Tab Right"), "go-next" , CTRL+SHIFT+Key_Right,this, TQT_SLOT( slotMoveTabRight()),actionCollection(),"tab_move_right");
#ifndef NDEBUG
- (void) new TDEAction( i18n( "Dump Debug Info" ), "view_dump_debug_info", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDumpDebugInfo() ), actionCollection(), "dumpdebuginfo" );
+ (void) new TDEAction( i18n( "Dump Debug Info" ), "view_dump_debug_info", 0, this, TQT_SLOT( slotDumpDebugInfo() ), actionCollection(), "dumpdebuginfo" );
#endif
m_paSaveRemoveViewProfile = new TDEAction( i18n( "C&onfigure View Profiles..." ), 0, m_pViewManager, TQT_SLOT( slotProfileDlg() ), actionCollection(), "saveremoveviewprofile" );
@@ -3943,14 +3943,14 @@ void KonqMainWindow::initActions()
TDEShortcut fullScreenShortcut = m_ptaFullScreen->shortcut();
fullScreenShortcut.append( KKey( Key_F11 ) );
m_ptaFullScreen->setShortcut( fullScreenShortcut );
- connect( m_ptaFullScreen, TQT_SIGNAL( toggled( bool )), TQT_TQOBJECT(this), TQT_SLOT( slotUpdateFullScreen( bool )));
+ connect( m_ptaFullScreen, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( slotUpdateFullScreen( bool )));
TDEShortcut reloadShortcut = TDEStdAccel::shortcut(TDEStdAccel::Reload);
reloadShortcut.append(KKey(CTRL + Key_R));
- m_paReload = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( slotReload() ), actionCollection(), "reload" );
- m_paReloadAllTabs = new TDEAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, TQT_TQOBJECT(this), TQT_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" );
+ m_paReload = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQT_SLOT( slotReload() ), actionCollection(), "reload" );
+ m_paReloadAllTabs = new TDEAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, this, TQT_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" );
- m_paReloadStop = new TDEAction( i18n( "&Reload/Stop" ), "reload", 0, TQT_TQOBJECT(this), TQT_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" );
+ m_paReloadStop = new TDEAction( i18n( "&Reload/Stop" ), "reload", 0, this, TQT_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" );
m_paUndo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), actionCollection(), "undo" );
//m_paUndo->setEnabled( KonqUndoManager::self()->undoAvailable() );
@@ -3965,24 +3965,24 @@ void KonqMainWindow::initActions()
m_paCopy = KStdAction::copy( 0, 0, actionCollection(), "copy" );
m_paPaste = KStdAction::paste( 0, 0, actionCollection(), "paste" );
- m_paStop = new TDEAction( i18n( "&Stop" ), "process-stop", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT( slotStop() ), actionCollection(), "stop" );
+ m_paStop = new TDEAction( i18n( "&Stop" ), "process-stop", Key_Escape, this, TQT_SLOT( slotStop() ), actionCollection(), "stop" );
m_paRename = new TDEAction( i18n( "&Rename" ), "edit_rename", Key_F2, actionCollection(), "rename" );
m_paTrash = new TDEAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, actionCollection(), "trash" );
connect( m_paTrash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) );
+ this, TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) );
m_paDelete = new TDEAction( i18n( "&Delete" ), "edit-delete", SHIFT+Key_Delete, actionCollection(), "del" );
// F5 is the default key binding for Reload.... a la Windows. mc users want F5 for Copy and F6 for move, but I can't make that default.
- m_paCopyFiles = new TDEAction( i18n("Copy &Files..."), "copyfiles", Key_F7, TQT_TQOBJECT(this), TQT_SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" );
- m_paMoveFiles = new TDEAction( i18n("M&ove Files..."), "movefiles", Key_F8, TQT_TQOBJECT(this), TQT_SLOT( slotMoveFiles() ), actionCollection(), "movefiles" );
+ m_paCopyFiles = new TDEAction( i18n("Copy &Files..."), "copyfiles", Key_F7, this, TQT_SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" );
+ m_paMoveFiles = new TDEAction( i18n("M&ove Files..."), "movefiles", Key_F8, this, TQT_SLOT( slotMoveFiles() ), actionCollection(), "movefiles" );
// This action doesn't appear in the GUI, it's for the shortcut only. KNewMenu takes care of the GUI stuff.
- m_paNewDir = new TDEAction( i18n("Create Folder..." ), "konq_create_dir", Key_F10, TQT_TQOBJECT(this), TQT_SLOT( slotNewDir() ), actionCollection(), "konq_create_dir" );
- m_paAnimatedLogo = new KonqLogoAction( i18n("Animated Logo"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "animated_logo" );
+ m_paNewDir = new TDEAction( i18n("Create Folder..." ), "konq_create_dir", Key_F10, this, TQT_SLOT( slotNewDir() ), actionCollection(), "konq_create_dir" );
+ m_paAnimatedLogo = new KonqLogoAction( i18n("Animated Logo"), 0, this, TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "animated_logo" );
// Location bar
m_locationLabel = new KonqDraggableLabel( this, i18n("L&ocation: ") );
- (void) new KWidgetAction( m_locationLabel, i18n("L&ocation: "), Key_F6, TQT_TQOBJECT(this), TQT_SLOT( slotLocationLabelActivated() ), actionCollection(), "location_label" );
+ (void) new KWidgetAction( m_locationLabel, i18n("L&ocation: "), Key_F6, this, TQT_SLOT( slotLocationLabelActivated() ), actionCollection(), "location_label" );
m_locationLabel->setBuddy( m_combo );
KWidgetAction* comboAction = new KWidgetAction( m_combo, i18n( "Location Bar" ), 0,
@@ -4023,11 +4023,11 @@ void KonqMainWindow::initActions()
if (addBookmark)
addBookmark->setText(i18n("Bookmark This Location"));
- m_paShowMenuBar = KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotShowMenuBar() ), actionCollection() );
+ m_paShowMenuBar = KStdAction::showMenubar( this, TQT_SLOT( slotShowMenuBar() ), actionCollection() );
- (void) new TDEAction( i18n( "Kon&queror Introduction" ), "konqui_intro", 0, TQT_TQOBJECT(this), TQT_SLOT( slotIntro() ), actionCollection(), "konqintro" );
+ (void) new TDEAction( i18n( "Kon&queror Introduction" ), "konqui_intro", 0, this, TQT_SLOT( slotIntro() ), actionCollection(), "konqintro" );
- TDEAction *goUrl = new TDEAction( i18n( "Go" ), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT( goURL() ), actionCollection(), "go_url" );
+ TDEAction *goUrl = new TDEAction( i18n( "Go" ), "key_enter", 0, this, TQT_SLOT( goURL() ), actionCollection(), "go_url" );
goUrl->setWhatsThis( i18n( "Go<p>"
"Goes to the page that has been entered into the location bar." ) );
@@ -4701,7 +4701,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
popupMenuCollection.insert( m_paDelete );
// The pasteto action is used when clicking on a dir, to paste into it.
- TDEAction *actPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPopupPasteTo() ), &popupMenuCollection, "pasteto" );
+ TDEAction *actPaste = KStdAction::paste( this, TQT_SLOT( slotPopupPasteTo() ), &popupMenuCollection, "pasteto" );
actPaste->setEnabled( m_paPaste->isEnabled() );
popupMenuCollection.insert( actPaste );
@@ -4774,10 +4774,10 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
if (doTabHandling)
{
if (_args.forcesNewWindow()) {
- actNewWindow = new TDEAction( i18n( "Open in T&his Window" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" );
+ actNewWindow = new TDEAction( i18n( "Open in T&his Window" ), 0, this, TQT_SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" );
actNewWindow->setToolTip( i18n( "Open the document in current window" ) );
}
- actNewWindow = new TDEAction( i18n( "Open in New &Window" ), "window-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewWindow() ), konqyMenuClient->actionCollection(), "newview" );
+ actNewWindow = new TDEAction( i18n( "Open in New &Window" ), "window-new", 0, this, TQT_SLOT( slotPopupNewWindow() ), konqyMenuClient->actionCollection(), "newview" );
actNewWindow->setToolTip( i18n( "Open the document in a new window" ) );
//Set tab_new_x to point to the correct icon based on NewTabsInFront
@@ -4788,12 +4788,12 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
else
tab_new_x = "tab_new_bg" ;
- TDEAction *actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), "tab_new_bg", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), actionCollection(), "openintab" );
+ TDEAction *actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), "tab_new_bg", 0, this, TQT_SLOT( slotPopupNewTab() ), actionCollection(), "openintab" );
actNewTab->setStatusText( i18n( "Open the document in a new background tab" ) );
- TDEAction *actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), "tab_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTabAtFront() ), actionCollection(), "openintabfront" );
+ TDEAction *actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), "tab_new", 0, this, TQT_SLOT( slotPopupNewTabAtFront() ), actionCollection(), "openintabfront" );
actNewTabFront->setStatusText( i18n( "Open the document in a new foreground tab" ) );
- actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" );
- actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTabAtFront() ), konqyMenuClient->actionCollection(), "openintabfront" );
+ actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), tab_new_x, 0, this, TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" );
+ actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), tab_new_x, 0, this, TQT_SLOT( slotPopupNewTabAtFront() ), konqyMenuClient->actionCollection(), "openintabfront" );
actNewTab->setToolTip( i18n( "Open the document in a new background tab" ) );
actNewTabFront->setToolTip( i18n( "Open the document in a new foreground tab" ) );
doTabHandling = true;
@@ -4851,7 +4851,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
TQObject::disconnect( m_pMenuNew->popupMenu(), TQT_SIGNAL(aboutToShow()),
this, TQT_SLOT(slotFileNewAboutToShow()) );
- TQGuardedPtr<TQObject> guard(TQT_TQOBJECT(this)); // #149736
+ TQGuardedPtr<TQObject> guard(this); // #149736
pPopupMenu->exec( _global );
delete pPopupMenu;
@@ -5099,7 +5099,7 @@ void KonqMainWindow::updateViewModeActions()
if ( services.count() <= 1 )
return;
- m_viewModeMenu = new TDEActionMenu( i18n( "&View Mode" ), TQT_TQOBJECT(this) );
+ m_viewModeMenu = new TDEActionMenu( i18n( "&View Mode" ), this );
// a temporary map, just like the m_viewModeToolBarServices map, but
// mapping to a KonqViewModeAction object. It's just temporary as we
@@ -5132,9 +5132,9 @@ void KonqMainWindow::updateViewModeActions()
TQString icon = (*it)->icon();
if ( icon != TQString::fromLatin1( "unknown" ) )
// we *have* to specify a parent qobject, otherwise the exclusive group stuff doesn't work!(Simon)
- action = new TDERadioAction( itname, icon, 0, TQT_TQOBJECT(this), (*it)->desktopEntryName().ascii() );
+ action = new TDERadioAction( itname, icon, 0, this, (*it)->desktopEntryName().ascii() );
else
- action = new TDERadioAction( itname, 0, TQT_TQOBJECT(this), (*it)->desktopEntryName().ascii() );
+ action = new TDERadioAction( itname, 0, this, (*it)->desktopEntryName().ascii() );
action->setExclusiveGroup( "KonqMainWindow_ViewModes" );
@@ -5186,7 +5186,7 @@ void KonqMainWindow::updateViewModeActions()
KonqViewModeAction *tbAction = new KonqViewModeAction( text,
icon,
- TQT_TQOBJECT(this),
+ this,
name );
tbAction->setExclusiveGroup( "KonqMainWindow_ToolBarViewModes" );
@@ -5278,7 +5278,7 @@ KonqMainWindowIface* KonqMainWindow::dcopObject()
void KonqMainWindow::updateBookmarkBar()
{
- TDEToolBar * bar = static_cast<TDEToolBar *>( TQT_TQWIDGET(child( "bookmarkToolBar", "TDEToolBar" )) );
+ TDEToolBar * bar = static_cast<TDEToolBar *>( child( "bookmarkToolBar", "TDEToolBar" ) );
if (!bar) return;
@@ -5812,7 +5812,7 @@ void KonqMainWindow::setPreloadedWindow( KonqMainWindow* window )
if( window == NULL )
return;
window->viewManager()->clear();
- TDEIO::Scheduler::unregisterWindow( TQT_TQOBJECT(window) );
+ TDEIO::Scheduler::unregisterWindow( window );
}
// used by preloading - this KonqMainWindow will be reused, reset everything
diff --git a/konqueror/konq_view.cpp b/konqueror/konq_view.cpp
index 0bacb9c5b..89f4a2e07 100644
--- a/konqueror/konq_view.cpp
+++ b/konqueror/konq_view.cpp
@@ -1271,7 +1271,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
!lstDragURLs.first().url().contains( "javascript:", false ) && // ### this looks like a hack to me
ev->source() != m_pPart->widget() &&
children &&
- children->findRef( TQT_TQOBJECT(ev->source()) ) == -1 )
+ children->findRef( ev->source() ) == -1 )
ev->acceptAction();
delete children;
diff --git a/konqueror/listview/konq_infolistviewwidget.cpp b/konqueror/listview/konq_infolistviewwidget.cpp
index e835f1cb3..4698365e6 100644
--- a/konqueror/listview/konq_infolistviewwidget.cpp
+++ b/konqueror/listview/konq_infolistviewwidget.cpp
@@ -37,7 +37,7 @@ KonqInfoListViewWidget::KonqInfoListViewWidget( KonqListView* parent,
{
m_metaInfoJob = 0;
- m_mtSelector = new TDESelectAction(i18n("View &As"), 0, TQT_TQOBJECT(this),
+ m_mtSelector = new TDESelectAction(i18n("View &As"), 0, this,
TQT_SLOT(slotSelectMimeType()),
parent->actionCollection(), "view_as" );
diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
index e5e8dabe4..228db9a36 100644
--- a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
+++ b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
@@ -84,11 +84,11 @@ int KShellCommandExecutor::exec()
return 0;
}
- m_readNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Read, TQT_TQOBJECT(this));
- m_writeNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Write, TQT_TQOBJECT(this));
+ m_readNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Read, this);
+ m_writeNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Write, this);
m_writeNotifier->setEnabled(false);
- connect (m_readNotifier, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this),TQT_SLOT(readDataFromShell()));
- connect (m_writeNotifier, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this),TQT_SLOT(writeDataToShell()));
+ connect (m_readNotifier, TQT_SIGNAL(activated(int)), this,TQT_SLOT(readDataFromShell()));
+ connect (m_writeNotifier, TQT_SIGNAL(activated(int)), this,TQT_SLOT(writeDataToShell()));
return 1;
}
diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp
index bfff3c8e7..774ad8509 100644
--- a/konqueror/sidebar/konqsidebar.cpp
+++ b/konqueror/sidebar/konqsidebar.cpp
@@ -37,8 +37,8 @@ KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName,
connect(m_widget,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed()));
connect(m_extension, TQT_SIGNAL(addWebSideBar(const KURL&, const TQString&)),
m_widget, TQT_SLOT(addWebSideBar(const KURL&, const TQString&)));
- TDEAcceleratorManager::setNoAccel(TQT_TQWIDGET(m_widget));
- setWidget(TQT_TQWIDGET(m_widget));
+ TDEAcceleratorManager::setNoAccel(m_widget);
+ setWidget(m_widget);
}
TDEInstance *KonqSidebar::getInstance()
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index 2e741b2f9..8fe85f512 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -834,7 +834,7 @@ bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos)
{
m_buttonBar->appendTab(SmallIcon(icon), lastbtn, name);
ButtonInfo *bi = new ButtonInfo(desktoppath, ((KonqSidebar*)m_partParent),0, url, lib, name,
- icon, TQT_TQOBJECT(this));
+ icon, this);
/*int id=*/m_buttons.insert(lastbtn, bi);
KMultiTabBarTab *tab = m_buttonBar->tab(lastbtn);
tab->installEventFilter(this);
@@ -1323,7 +1323,7 @@ TQSplitter *Sidebar_Widget::splitter() const
TQObject *p = parent();
if (!p) return 0;
p = p->parent();
- return static_cast<TQSplitter*>(TQT_TQWIDGET(p));
+ return static_cast<TQSplitter*>(p);
}
void Sidebar_Widget::userMovedSplitter()
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index aa318826a..77e4f640b 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -908,21 +908,21 @@ void KonqSidebarTree::showToplevelContextMenu()
if (!m_collection)
{
m_collection = new TDEActionCollection( this, "bookmark actions" );
- (void) new TDEAction( i18n("&Create New Folder..."), "folder-new", 0, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("&Create New Folder..."), "folder-new", 0, this,
TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder");
- (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, this,
TQT_SLOT( slotDelete() ), m_collection, "delete_folder");
- (void) new TDEAction( i18n("Rename"), 0, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("Rename"), 0, this,
TQT_SLOT( slotRename() ), m_collection, "rename");
- (void) new TDEAction( i18n("Delete Link"), "edit-delete", 0, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("Delete Link"), "edit-delete", 0, this,
TQT_SLOT( slotDelete() ), m_collection, "delete_link");
- (void) new TDEAction( i18n("Properties"), "edit", 0, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("Properties"), "edit", 0, this,
TQT_SLOT( slotProperties() ), m_collection, "item_properties");
- (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, this,
TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window");
- (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, this,
TQT_SLOT( slotOpenTab() ), m_collection, "open_tab");
- (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, TQT_TQOBJECT(this),
+ (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, this,
TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location");
}
diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp
index f18278801..2302cf81a 100644
--- a/konsole/konsole/TEWidget.cpp
+++ b/konsole/konsole/TEWidget.cpp
@@ -1093,7 +1093,7 @@ void TEWidget::print(TQPainter &paint, bool friendly, bool exact)
pm.fill();
TQPainter pm_paint;
- pm_paint.begin(&pm, TQT_TQWIDGET(this));
+ pm_paint.begin(&pm, this);
paintContents(pm_paint, contentsRect(), true);
pm_paint.end();
paint.drawPixmap(0, 0, pm);
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index 7ff81454c..ebfc76a24 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -297,7 +297,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
TDEAcceleratorManager::setNoAccel( menubar );
- sessionNumberMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
+ sessionNumberMapper = new TQSignalMapper( this );
connect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ),
this, TQT_SLOT( newSessionTabbar( int ) ) );
@@ -601,7 +601,7 @@ void Konsole::makeGUI()
showMenubar->plug ( m_options );
// Tabbar
- selectTabbar = new TDESelectAction(i18n("&Tab Bar"), 0, TQT_TQOBJECT(this),
+ selectTabbar = new TDESelectAction(i18n("&Tab Bar"), 0, this,
TQT_SLOT(slotSelectTabbar()), actions, "tabbar" );
TQStringList tabbaritems;
tabbaritems << i18n("&Hide") << i18n("&Top") << i18n("&Bottom");
@@ -609,7 +609,7 @@ void Konsole::makeGUI()
selectTabbar->plug(m_options);
// Scrollbar
- selectScrollbar = new TDESelectAction(i18n("Sc&rollbar"), 0, TQT_TQOBJECT(this),
+ selectScrollbar = new TDESelectAction(i18n("Sc&rollbar"), 0, this,
TQT_SLOT(slotSelectScrollbar()), actions, "scrollbar" );
TQStringList scrollitems;
scrollitems << i18n("&Hide") << i18n("&Left") << i18n("&Right");
@@ -625,7 +625,7 @@ void Konsole::makeGUI()
}
// Select Bell
- selectBell = new TDESelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , TQT_TQOBJECT(this),
+ selectBell = new TDESelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , this,
TQT_SLOT(slotSelectBell()), actions, "bell");
TQStringList bellitems;
bellitems << i18n("System &Bell")
@@ -640,28 +640,28 @@ void Konsole::makeGUI()
SmallIconSet( "text" ),
actions, 0L );
m_fontsizes->insert( new TDEAction( i18n( "&Enlarge Font" ),
- SmallIconSet( "fontsizeup" ), 0, TQT_TQOBJECT(this),
+ SmallIconSet( "fontsizeup" ), 0, this,
TQT_SLOT( biggerFont() ), actions,
"enlarge_font" ) );
m_fontsizes->insert( new TDEAction( i18n( "&Shrink Font" ),
- SmallIconSet( "fontsizedown" ), 0, TQT_TQOBJECT(this),
+ SmallIconSet( "fontsizedown" ), 0, this,
TQT_SLOT( smallerFont() ), actions,
"shrink_font" ) );
m_fontsizes->insert( new TDEAction( i18n( "Se&lect..." ),
- SmallIconSet( "font-x-generic" ), 0, TQT_TQOBJECT(this),
+ SmallIconSet( "font-x-generic" ), 0, this,
TQT_SLOT( slotSelectFont() ), actions,
"select_font" ) );
if ( b_installBitmapFonts )
{
m_fontsizes->insert( new TDEAction( i18n( "&Install Bitmap..." ),
- SmallIconSet( "font-x-generic" ), 0, TQT_TQOBJECT(this),
+ SmallIconSet( "font-x-generic" ), 0, this,
TQT_SLOT( slotInstallBitmapFonts() ), actions,
"install_fonts" ) );
}
m_fontsizes->plug(m_options);
// encoding menu, start with default checked !
- selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet( "charset" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetEncoding()), actions, "set_encoding" );
+ selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet( "charset" ), 0, this, TQT_SLOT(slotSetEncoding()), actions, "set_encoding" );
TQStringList list = TDEGlobal::charsets()->descriptiveEncodingNames();
list.prepend( i18n( "Default" ) );
selectSetEncoding->setItems(list);
@@ -678,7 +678,7 @@ void Konsole::makeGUI()
// Select size
if (!b_fixedSize)
{
- selectSize = new KonsoleFontSelectAction(i18n("S&ize"), 0, TQT_TQOBJECT(this),
+ selectSize = new KonsoleFontSelectAction(i18n("S&ize"), 0, this,
TQT_SLOT(slotSelectSize()), actions, "size");
TQStringList sizeitems;
sizeitems << i18n("40x15 (&Small)")
@@ -692,13 +692,13 @@ void Konsole::makeGUI()
selectSize->plug(m_options);
}
- TDEAction *historyType = new TDEAction(i18n("Hist&ory..."), "history", 0, TQT_TQOBJECT(this),
+ TDEAction *historyType = new TDEAction(i18n("Hist&ory..."), "history", 0, this,
TQT_SLOT(slotHistoryType()), actions, "history");
historyType->plug(m_options);
m_options->insertSeparator();
- TDEAction *save_settings = new TDEAction(i18n("&Save as Default"), "document-save", 0, TQT_TQOBJECT(this),
+ TDEAction *save_settings = new TDEAction(i18n("&Save as Default"), "document-save", 0, this,
TQT_SLOT(slotSaveSettings()), actions, "save_default");
save_settings->plug(m_options);
@@ -708,9 +708,9 @@ void Konsole::makeGUI()
m_options->insertSeparator();
- KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureNotifications()), actionCollection())->plug(m_options);
- KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), actionCollection())->plug(m_options);
- TDEAction *configure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actions);
+ KStdAction::configureNotifications(this, TQT_SLOT(slotConfigureNotifications()), actionCollection())->plug(m_options);
+ KStdAction::keyBindings(this, TQT_SLOT(slotConfigureKeys()), actionCollection())->plug(m_options);
+ TDEAction *configure = KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actions);
configure->plug(m_options);
if (TDEGlobalSettings::insertTearOffHandle())
@@ -735,7 +735,7 @@ void Konsole::makeGUI()
{
updateRMBMenu(); // show menubar / exit fullscreen
- TDEAction* selectionEnd = new TDEAction(i18n("Set Selection End"), 0, TQT_TQOBJECT(this),
+ TDEAction* selectionEnd = new TDEAction(i18n("Set Selection End"), 0, this,
TQT_SLOT(slotSetSelectionEnd()), actions, "selection_end");
selectionEnd->plug(m_rightButton);
@@ -821,48 +821,48 @@ void Konsole::makeGUI()
if (!m_detachSession)
{
- m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, TQT_TQOBJECT(this),
+ m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, this,
TQT_SLOT(slotDetachSession()), m_shortcuts, "detach_session");
}
m_detachSession->plug(m_tabPopupMenu);
- m_tabPopupMenu->insertItem( i18n("&Rename Session..."), TQT_TQOBJECT(this),
+ m_tabPopupMenu->insertItem( i18n("&Rename Session..."), this,
TQT_SLOT(slotTabRenameSession()) );
m_tabPopupMenu->insertSeparator();
m_tabMonitorActivity = new TDEToggleAction ( i18n( "Monitor for &Activity" ),
- SmallIconSet("activity"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotTabToggleMonitor() ), TQT_TQOBJECT(this) );
+ SmallIconSet("activity"), 0, this, TQT_SLOT( slotTabToggleMonitor() ), this );
m_tabMonitorActivity->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Activity" ) ) );
m_tabMonitorActivity->plug(m_tabPopupMenu);
m_tabMonitorSilence = new TDEToggleAction ( i18n( "Monitor for &Silence" ),
- SmallIconSet("silence"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotTabToggleMonitor() ), TQT_TQOBJECT(this) );
+ SmallIconSet("silence"), 0, this, TQT_SLOT( slotTabToggleMonitor() ), this );
m_tabMonitorSilence->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Silence" ) ) );
m_tabMonitorSilence->plug(m_tabPopupMenu);
- m_tabMasterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, TQT_TQOBJECT(this),
- TQT_SLOT( slotTabToggleMasterMode() ), TQT_TQOBJECT(this));
+ m_tabMasterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, this,
+ TQT_SLOT( slotTabToggleMasterMode() ), this);
m_tabMasterMode->plug(m_tabPopupMenu);
m_tabPopupMenu->insertSeparator();
if (!m_moveSessionLeft)
{
m_moveSessionLeft = new TDEAction(i18n("&Move Session Left"), TQApplication::reverseLayout() ? "forward" : "back",
- TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left, TQT_TQOBJECT(this),
+ TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left, this,
TQT_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left");
}
m_moveSessionLeft->plug(m_tabPopupMenu);
if (!m_moveSessionRight)
{
m_moveSessionRight = new TDEAction(i18n("M&ove Session Right"), TQApplication::reverseLayout() ? "back" : "forward",
- TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right, TQT_TQOBJECT(this),
+ TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right, this,
TQT_SLOT(moveSessionRight()), m_shortcuts, "move_session_right");
}
m_moveSessionRight->plug(m_tabPopupMenu);
m_tabPopupMenu->insertSeparator();
- m_tabPopupMenu->insertItem( SmallIconSet("colors"), i18n("Select &Tab Color..."), TQT_TQOBJECT(this), TQT_SLOT(slotTabSelectColor()) );
- m_tabPopupMenu->insertItem( i18n("Reset Tab Color"), TQT_TQOBJECT(this), TQT_SLOT(slotTabResetColor()) );
+ m_tabPopupMenu->insertItem( SmallIconSet("colors"), i18n("Select &Tab Color..."), this, TQT_SLOT(slotTabSelectColor()) );
+ m_tabPopupMenu->insertItem( i18n("Reset Tab Color"), this, TQT_SLOT(slotTabResetColor()) );
m_tabPopupMenu->insertSeparator();
m_tabPopupTabsMenu = new TDEPopupMenu( m_tabPopupMenu );
@@ -871,7 +871,7 @@ void Konsole::makeGUI()
TQT_SLOT( activateSession( int ) ) );
m_tabPopupMenu->insertSeparator();
- m_tabPopupMenu->insertItem( SmallIcon("window-close"), i18n("C&lose Session"), TQT_TQOBJECT(this),
+ m_tabPopupMenu->insertItem( SmallIcon("window-close"), i18n("C&lose Session"), this,
TQT_SLOT(slotTabCloseSession()) );
if (m_options) {
@@ -880,23 +880,23 @@ void Konsole::makeGUI()
TDEAcceleratorManager::manage( m_tabbarPopupMenu );
selectTabbar->plug(m_tabbarPopupMenu);
- TDESelectAction *viewOptions = new TDESelectAction(TQT_TQOBJECT(this));
+ TDESelectAction *viewOptions = new TDESelectAction(this);
viewOptions->setText(i18n("Tab &Options"));
TQStringList options;
options << i18n("&Text && Icons") << i18n("Text &Only") << i18n("&Icons Only");
viewOptions->setItems(options);
viewOptions->setCurrentItem(m_tabViewMode);
viewOptions->plug(m_tabbarPopupMenu);
- connect(viewOptions, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotTabSetViewOptions(int)));
+ connect(viewOptions, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotTabSetViewOptions(int)));
slotTabSetViewOptions(m_tabViewMode);
- TDEToggleAction *dynamicTabHideOption = new TDEToggleAction ( i18n( "&Dynamic Hide" ), 0, TQT_TQOBJECT(this),
- TQT_SLOT( slotTabbarToggleDynamicHide() ), TQT_TQOBJECT(this));
+ TDEToggleAction *dynamicTabHideOption = new TDEToggleAction ( i18n( "&Dynamic Hide" ), 0, this,
+ TQT_SLOT( slotTabbarToggleDynamicHide() ), this);
dynamicTabHideOption->setChecked(b_dynamicTabHide);
dynamicTabHideOption->plug(m_tabbarPopupMenu);
TDEToggleAction *m_autoResizeTabs = new TDEToggleAction( i18n("&Auto Resize Tabs"),
- 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleAutoResizeTabs() ), TQT_TQOBJECT(this));
+ 0, this, TQT_SLOT( slotToggleAutoResizeTabs() ), this);
m_autoResizeTabs->setChecked(b_autoResizeTabs);
m_autoResizeTabs->plug(m_tabbarPopupMenu);
}
@@ -1089,78 +1089,78 @@ void Konsole::makeBasicGUI()
m_shortcuts = new TDEActionCollection(this);
- m_copyClipboard = new TDEAction(i18n("&Copy"), "edit-copy", 0, TQT_TQOBJECT(this),
+ m_copyClipboard = new TDEAction(i18n("&Copy"), "edit-copy", 0, this,
TQT_SLOT(slotCopyClipboard()), m_shortcuts, "edit_copy");
- m_pasteClipboard = new TDEAction(i18n("&Paste"), "edit-paste", TQt::SHIFT+TQt::Key_Insert, TQT_TQOBJECT(this),
+ m_pasteClipboard = new TDEAction(i18n("&Paste"), "edit-paste", TQt::SHIFT+TQt::Key_Insert, this,
TQT_SLOT(slotPasteClipboard()), m_shortcuts, "edit_paste");
- m_pasteSelection = new TDEAction(i18n("Paste Selection"), TQt::CTRL+TQt::SHIFT+TQt::Key_Insert, TQT_TQOBJECT(this),
+ m_pasteSelection = new TDEAction(i18n("Paste Selection"), TQt::CTRL+TQt::SHIFT+TQt::Key_Insert, this,
TQT_SLOT(slotPasteSelection()), m_shortcuts, "pasteselection");
- m_clearTerminal = new TDEAction(i18n("C&lear Terminal"), 0, TQT_TQOBJECT(this),
+ m_clearTerminal = new TDEAction(i18n("C&lear Terminal"), 0, this,
TQT_SLOT(slotClearTerminal()), m_shortcuts, "clear_terminal");
- m_resetClearTerminal = new TDEAction(i18n("&Reset && Clear Terminal"), 0, TQT_TQOBJECT(this),
+ m_resetClearTerminal = new TDEAction(i18n("&Reset && Clear Terminal"), 0, this,
TQT_SLOT(slotResetClearTerminal()), m_shortcuts, "reset_clear_terminal");
- m_findHistory = new TDEAction(i18n("&Find in History..."), "edit-find", 0, TQT_TQOBJECT(this),
+ m_findHistory = new TDEAction(i18n("&Find in History..."), "edit-find", 0, this,
TQT_SLOT(slotFindHistory()), m_shortcuts, "find_history");
m_findHistory->setEnabled(b_histEnabled);
- m_findNext = new TDEAction(i18n("Find &Next"), "go-next", 0, TQT_TQOBJECT(this),
+ m_findNext = new TDEAction(i18n("Find &Next"), "go-next", 0, this,
TQT_SLOT(slotFindNext()), m_shortcuts, "find_next");
m_findNext->setEnabled(b_histEnabled);
- m_findPrevious = new TDEAction(i18n("Find Pre&vious"), "go-previous", 0, TQT_TQOBJECT(this),
+ m_findPrevious = new TDEAction(i18n("Find Pre&vious"), "go-previous", 0, this,
TQT_SLOT(slotFindPrevious()), m_shortcuts, "find_previous");
m_findPrevious->setEnabled( b_histEnabled );
- m_saveHistory = new TDEAction(i18n("S&ave History As..."), "document-save-as", 0, TQT_TQOBJECT(this),
+ m_saveHistory = new TDEAction(i18n("S&ave History As..."), "document-save-as", 0, this,
TQT_SLOT(slotSaveHistory()), m_shortcuts, "save_history");
m_saveHistory->setEnabled(b_histEnabled );
- m_clearHistory = new TDEAction(i18n("Clear &History"), "history_clear", 0, TQT_TQOBJECT(this),
+ m_clearHistory = new TDEAction(i18n("Clear &History"), "history_clear", 0, this,
TQT_SLOT(slotClearHistory()), m_shortcuts, "clear_history");
m_clearHistory->setEnabled(b_histEnabled);
m_clearAllSessionHistories = new TDEAction(i18n("Clear All H&istories"), "history_clear", 0,
- TQT_TQOBJECT(this), TQT_SLOT(slotClearAllSessionHistories()), m_shortcuts, "clear_all_histories");
+ this, TQT_SLOT(slotClearAllSessionHistories()), m_shortcuts, "clear_all_histories");
if (!m_detachSession)
{
- m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, TQT_TQOBJECT(this),
+ m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, this,
TQT_SLOT(slotDetachSession()), m_shortcuts, "detach_session");
}
m_detachSession->setEnabled(false);
- m_renameSession = new TDEAction(i18n("&Rename Session..."), TQt::CTRL+TQt::SHIFT+TQt::Key_R, TQT_TQOBJECT(this),
+ m_renameSession = new TDEAction(i18n("&Rename Session..."), TQt::CTRL+TQt::SHIFT+TQt::Key_R, this,
TQT_SLOT(slotRenameSession()), m_shortcuts, "rename_session");
if (kapp->authorizeTDEAction("zmodem_upload"))
m_zmodemUpload = new TDEAction( i18n( "&ZModem Upload..." ),
- TQt::CTRL+TQt::ALT+TQt::Key_U, TQT_TQOBJECT(this),
+ TQt::CTRL+TQt::ALT+TQt::Key_U, this,
TQT_SLOT( slotZModemUpload() ),
m_shortcuts, "zmodem_upload" );
monitorActivity = new TDEToggleAction ( i18n( "Monitor for &Activity" ),
- SmallIconSet("activity"), 0, TQT_TQOBJECT(this),
+ SmallIconSet("activity"), 0, this,
TQT_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_activity" );
monitorActivity->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Activity" ) ) );
monitorSilence = new TDEToggleAction ( i18n( "Monitor for &Silence" ),
- SmallIconSet("silence"), 0, TQT_TQOBJECT(this),
+ SmallIconSet("silence"), 0, this,
TQT_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_silence" );
monitorSilence->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Silence" ) ) );
- masterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, TQT_TQOBJECT(this),
+ masterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, this,
TQT_SLOT( slotToggleMasterMode() ), m_shortcuts, "send_input_to_all_sessions" );
- showMenubar = new TDEToggleAction ( i18n( "Show &Menubar" ), "showmenu", TQt::CTRL+TQt::SHIFT+TQt::ALT+TQt::Key_M, TQT_TQOBJECT(this),
+ showMenubar = new TDEToggleAction ( i18n( "Show &Menubar" ), "showmenu", TQt::CTRL+TQt::SHIFT+TQt::ALT+TQt::Key_M, this,
TQT_SLOT( slotToggleMenubar() ), m_shortcuts, "show_menubar" );
showMenubar->setCheckedState( KGuiItem( i18n("Hide &Menubar"), "showmenu", TQString::null, TQString::null ) );
m_fullscreen = KStdAction::fullScreen(0, 0, m_shortcuts, this );
- connect( m_fullscreen,TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this),TQT_SLOT(updateFullScreen(bool)));
+ connect( m_fullscreen,TQT_SIGNAL(toggled(bool)), this,TQT_SLOT(updateFullScreen(bool)));
m_fullscreen->setChecked(b_fullscreen);
- m_saveProfile = new TDEAction( i18n( "Save Sessions &Profile..." ), SmallIconSet("document-save-as"), 0, TQT_TQOBJECT(this),
+ m_saveProfile = new TDEAction( i18n( "Save Sessions &Profile..." ), SmallIconSet("document-save-as"), 0, this,
TQT_SLOT( slotSaveSessionsProfile() ), m_shortcuts, "save_sessions_profile" );
//help menu
@@ -1169,43 +1169,43 @@ void Konsole::makeBasicGUI()
// Don't steal F1 (handbook) accel (esp. since it not visible in
// "Configure Shortcuts").
- m_closeSession = new TDEAction(i18n("C&lose Session"), "window-close", 0, TQT_TQOBJECT(this),
+ m_closeSession = new TDEAction(i18n("C&lose Session"), "window-close", 0, this,
TQT_SLOT(confirmCloseCurrentSession()), m_shortcuts, "close_session");
- m_print = new TDEAction(i18n("&Print Screen..."), "document-print", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPrint() ), m_shortcuts, "file_print");
- m_quit = new TDEAction(i18n("&Quit"), "system-log-out", 0, TQT_TQOBJECT(this), TQT_SLOT( close() ), m_shortcuts, "file_quit");
+ m_print = new TDEAction(i18n("&Print Screen..."), "document-print", 0, this, TQT_SLOT( slotPrint() ), m_shortcuts, "file_print");
+ m_quit = new TDEAction(i18n("&Quit"), "system-log-out", 0, this, TQT_SLOT( close() ), m_shortcuts, "file_quit");
TDEShortcut shortcut(TQt::CTRL+TQt::ALT+TQt::Key_N);
shortcut.append(TDEShortcut(TQt::CTRL+TQt::SHIFT+TQt::Key_N));
- new TDEAction(i18n("New Session"), shortcut, TQT_TQOBJECT(this), TQT_SLOT(newSession()), m_shortcuts, "new_session");
- new TDEAction(i18n("Activate Menu"), TQt::CTRL+TQt::ALT+TQt::Key_M, TQT_TQOBJECT(this), TQT_SLOT(activateMenu()), m_shortcuts, "activate_menu");
- new TDEAction(i18n("List Sessions"), 0, TQT_TQOBJECT(this), TQT_SLOT(listSessions()), m_shortcuts, "list_sessions");
+ new TDEAction(i18n("New Session"), shortcut, this, TQT_SLOT(newSession()), m_shortcuts, "new_session");
+ new TDEAction(i18n("Activate Menu"), TQt::CTRL+TQt::ALT+TQt::Key_M, this, TQT_SLOT(activateMenu()), m_shortcuts, "activate_menu");
+ new TDEAction(i18n("List Sessions"), 0, this, TQT_SLOT(listSessions()), m_shortcuts, "list_sessions");
if (!m_moveSessionLeft)
{
m_moveSessionLeft = new TDEAction(i18n("&Move Session Left"), TQApplication::reverseLayout() ? "forward" : "back",
- TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left, TQT_TQOBJECT(this),
+ TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left, this,
TQT_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left");
}
if (!m_moveSessionRight)
{
m_moveSessionRight = new TDEAction(i18n("M&ove Session Right"), TQApplication::reverseLayout() ? "back" : "forward",
- TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right, TQT_TQOBJECT(this),
+ TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right, this,
TQT_SLOT(moveSessionRight()), m_shortcuts, "move_session_right");
}
new TDEAction(i18n("Go to Previous Session"), TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Right : TQt::SHIFT+TQt::Key_Left,
- TQT_TQOBJECT(this), TQT_SLOT(prevSession()), m_shortcuts, "previous_session");
+ this, TQT_SLOT(prevSession()), m_shortcuts, "previous_session");
new TDEAction(i18n("Go to Next Session"), TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Left : TQt::SHIFT+TQt::Key_Right,
- TQT_TQOBJECT(this), TQT_SLOT(nextSession()), m_shortcuts, "next_session");
+ this, TQT_SLOT(nextSession()), m_shortcuts, "next_session");
for (int i=1;i<13;i++) { // Due to 12 function keys?
- new TDEAction(i18n("Switch to Session %1").arg(i), 0, TQT_TQOBJECT(this), TQT_SLOT(switchToSession()), m_shortcuts, TQString(TQString().sprintf("switch_to_session_%02d", i)).latin1());
+ new TDEAction(i18n("Switch to Session %1").arg(i), 0, this, TQT_SLOT(switchToSession()), m_shortcuts, TQString(TQString().sprintf("switch_to_session_%02d", i)).latin1());
}
- new TDEAction(i18n("Enlarge Font"), 0, TQT_TQOBJECT(this), TQT_SLOT(biggerFont()), m_shortcuts, "bigger_font");
- new TDEAction(i18n("Shrink Font"), 0, TQT_TQOBJECT(this), TQT_SLOT(smallerFont()), m_shortcuts, "smaller_font");
+ new TDEAction(i18n("Enlarge Font"), 0, this, TQT_SLOT(biggerFont()), m_shortcuts, "bigger_font");
+ new TDEAction(i18n("Shrink Font"), 0, this, TQT_SLOT(smallerFont()), m_shortcuts, "smaller_font");
- new TDEAction(i18n("Toggle Bidi"), TQt::CTRL+TQt::ALT+TQt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi");
+ new TDEAction(i18n("Toggle Bidi"), TQt::CTRL+TQt::ALT+TQt::Key_B, this, TQT_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi");
// Should we load all *.desktop files now? Required for Session shortcuts.
if ( TDEConfigGroup(TDEGlobal::config(), "General").readBoolEntry("SessionShortcutsEnabled", false) ) {
@@ -2145,7 +2145,7 @@ void Konsole::reparseConfiguration()
disconnect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ),
this, TQT_SLOT( newSessionTabbar( int ) ) );
delete sessionNumberMapper;
- sessionNumberMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
+ sessionNumberMapper = new TQSignalMapper( this );
connect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ),
this, TQT_SLOT( newSessionTabbar( int ) ) );
@@ -2536,7 +2536,7 @@ void Konsole::addSession(TESession* s)
TDERadioAction *ra = new TDERadioAction(newTitle.replace('&',"&&"),
s->IconName(),
0,
- TQT_TQOBJECT(this),
+ this,
TQT_SLOT(activateSession()),
m_shortcuts);
ra->setExclusiveGroup("sessions");
@@ -3480,7 +3480,7 @@ void Konsole::addSessionCommand(const TQString &path)
if ( m_shortcuts->action( name.latin1() ) ) {
sessionAction = m_shortcuts->action( name.latin1() );
} else {
- sessionAction = new TDEAction( comment, 0, TQT_TQOBJECT(this), 0, m_shortcuts, name.latin1() );
+ sessionAction = new TDEAction( comment, 0, this, 0, m_shortcuts, name.latin1() );
}
connect( sessionAction, TQT_SIGNAL( activated() ), sessionNumberMapper, TQT_SLOT( map() ) );
sessionNumberMapper->setMapping( sessionAction, cmd_serial );
@@ -3845,7 +3845,7 @@ void Konsole::attachSession(TESession* session)
TQString title=session->Title();
TDERadioAction *ra = new TDERadioAction(title.replace('&',"&&"), session->IconName(),
- 0, TQT_TQOBJECT(this), TQT_SLOT(activateSession()), m_shortcuts);
+ 0, this, TQT_SLOT(activateSession()), m_shortcuts);
ra->setExclusiveGroup("sessions");
ra->setChecked(true);
@@ -4354,7 +4354,7 @@ KonsoleFind::KonsoleFind( TQWidget *parent, const char *name, bool /*modal*/ )
void KonsoleFind::slotEditRegExp()
{
if ( m_editorDialog == 0 )
- m_editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) );
+ m_editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this );
assert( m_editorDialog );
diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp
index 5e1379a4e..405d83b28 100644
--- a/konsole/konsole/konsole_part.cpp
+++ b/konsole/konsole/konsole_part.cpp
@@ -151,7 +151,7 @@ konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObje
te = new TEWidget(parentWidget,widgetName);
te->setMinimumSize(150,70); // allow resizing, cause resize in TEWidget
- setWidget(TQT_TQWIDGET(te));
+ setWidget(te);
te->setFocus();
connect( te,TQT_SIGNAL(configureRequest(TEWidget*,int,int,int)),
this,TQT_SLOT(configureRequest(TEWidget*,int,int,int)) );
@@ -469,16 +469,16 @@ void konsolePart::makeGUI()
// Popup Menu -------------------------------------------------------------------
m_popupMenu = new TDEPopupMenu((TDEMainWindow*)parentWidget);
- TDEAction* selectionEnd = new TDEAction(i18n("Set Selection End"), 0, TQT_TQOBJECT(te),
+ TDEAction* selectionEnd = new TDEAction(i18n("Set Selection End"), 0, te,
TQT_SLOT(setSelectionEnd()), actions, "selection_end");
selectionEnd->plug(m_popupMenu);
TDEAction *copyClipboard = new TDEAction(i18n("&Copy"), "edit-copy", 0,
- TQT_TQOBJECT(te), TQT_SLOT(copyClipboard()), actions, "edit_copy");
+ te, TQT_SLOT(copyClipboard()), actions, "edit_copy");
copyClipboard->plug(m_popupMenu);
TDEAction *pasteClipboard = new TDEAction(i18n("&Paste"), "edit-paste", 0,
- TQT_TQOBJECT(te), TQT_SLOT(pasteClipboard()), actions, "edit_paste");
+ te, TQT_SLOT(pasteClipboard()), actions, "edit_paste");
pasteClipboard->plug(m_popupMenu);
if (m_signals)
@@ -608,7 +608,7 @@ void konsolePart::readProperties()
if (sch->useTransparency()) {
if (!argb_visual) {
if (!rootxpm)
- rootxpm = new KRootPixmap(TQT_TQWIDGET(te));
+ rootxpm = new KRootPixmap(te);
rootxpm->setFadeEffect(sch->tr_x(), TQColor(sch->tr_r(), sch->tr_g(), sch->tr_b()));
rootxpm->start();
rootxpm->repaint(true);
@@ -796,7 +796,7 @@ void konsolePart::setSchema(ColorSchema* s)
if (s->useTransparency()) {
if (!argb_visual) {
if (!rootxpm)
- rootxpm = new KRootPixmap(TQT_TQWIDGET(te));
+ rootxpm = new KRootPixmap(te);
rootxpm->setFadeEffect(s->tr_x(), TQColor(s->tr_r(), s->tr_g(), s->tr_b()));
rootxpm->start();
rootxpm->repaint(true);
diff --git a/konsole/konsole/kwrited.cpp b/konsole/konsole/kwrited.cpp
index 56d21882e..f3ca3ea19 100644
--- a/konsole/konsole/kwrited.cpp
+++ b/konsole/konsole/kwrited.cpp
@@ -79,7 +79,7 @@ KWrited::KWrited() : TQTextEdit()
pty = new KPty();
pty->open();
pty->login(KUser().loginName().local8Bit().data(), getenv("DISPLAY"));
- TQSocketNotifier *sn = new TQSocketNotifier(pty->masterFd(), TQSocketNotifier::Read, TQT_TQOBJECT(this));
+ TQSocketNotifier *sn = new TQSocketNotifier(pty->masterFd(), TQSocketNotifier::Read, this);
connect(sn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(block_in(int)));
TQString txt = i18n("KWrited - Listening on Device %1").arg(pty->ttyName());
diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp
index 4775576ee..d18d814c0 100644
--- a/kpager/kpager.cpp
+++ b/kpager/kpager.cpp
@@ -187,7 +187,7 @@ KPager::KPager(KPagerMainWindow *parent, const char *name)
m_windows.setAutoDelete(true); // delete windows info after removal
setBackgroundColor( black );
- m_winmodule=new KWinModule(TQT_TQOBJECT(this));
+ m_winmodule=new KWinModule(this);
m_currentDesktop=m_winmodule->currentDesktop();
m_grabWinTimer=new TQTimer(this,"grabWinTimer");
@@ -231,8 +231,8 @@ KPager::KPager(KPagerMainWindow *parent, const char *name)
defFont = cfg->readFontEntry("Font", &defFont);
setFont(defFont);
- m_prefs_action = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configureDialog()), parent->actionCollection());
- m_quit_action = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), parent->actionCollection());
+ m_prefs_action = KStdAction::preferences(this, TQT_SLOT(configureDialog()), parent->actionCollection());
+ m_quit_action = KStdAction::quit(kapp, TQT_SLOT(quit()), parent->actionCollection());
updateLayout();
}
diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp
index 0d9faaea2..ec27f7768 100644
--- a/ksmserver/shutdown.cpp
+++ b/ksmserver/shutdown.cpp
@@ -289,7 +289,7 @@ void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm,
// Set the real desktop background to black so that exit looks
// clean regardless of what was on "our" desktop.
if (!showLogoutStatusDlg) {
- TQT_TQWIDGET(kapp->desktop())->setBackgroundColor( TQt::black );
+ kapp->desktop()->setBackgroundColor( TQt::black );
}
state = Shutdown;
wmPhase1WaitingCount = 0;
diff --git a/ksplashml/themeengine/themeengine.cpp b/ksplashml/themeengine/themeengine.cpp
index 9a7d3aba5..db12b8493 100644
--- a/ksplashml/themeengine/themeengine.cpp
+++ b/ksplashml/themeengine/themeengine.cpp
@@ -77,7 +77,7 @@ ThemeEngine::~ThemeEngine()
bool ThemeEngine::eventFilter( TQObject* o, TQEvent* e )
{
if( e->type() == TQEvent::Show && o->isWidgetType())
- addSplashWindow( TQT_TQWIDGET( o ));
+ addSplashWindow( static_cast<TQWidget*>( o ));
return false;
}
@@ -107,7 +107,7 @@ void ThemeEngine::addSplashWindow( TQWidget* w )
void ThemeEngine::splashWindowDestroyed( TQObject* obj )
{
- d->mSplashWindows.remove( TQT_TQWIDGET( obj )->winId());
+ d->mSplashWindows.remove( static_cast<TQWidget*>( obj )->winId());
}
bool ThemeEngine::x11Event( XEvent* e )
diff --git a/ksplashml/wndmain.cpp b/ksplashml/wndmain.cpp
index 3fd1d786d..0514b53bc 100644
--- a/ksplashml/wndmain.cpp
+++ b/ksplashml/wndmain.cpp
@@ -383,7 +383,7 @@ ThemeEngine *KSplash::_loadThemeEngine( const TQString& pluginName, const TQStri
{
TQStringList themeTitle;
themeTitle << theme;
- return static_cast<ThemeEngine *>(TQT_TQWIDGET(factory->create(TQT_TQOBJECT(this), "theme", objName.latin1(), themeTitle)));
+ return static_cast<ThemeEngine *>(factory->create(this, "theme", objName.latin1(), themeTitle));
}
else
return 0L;
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp
index 22894afea..4e32dc630 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp
@@ -58,7 +58,7 @@ FancyPlotter::FancyPlotter( TQWidget* parent, const char* name,
* SensorDisplay::eventFilter. */
mPlotter->installEventFilter( this );
- setPlotterWidget( TQT_TQWIDGET(mPlotter) );
+ setPlotterWidget( mPlotter );
setModified( false );
}
@@ -242,8 +242,8 @@ bool FancyPlotter::addSensor( const TQString &hostName, const TQString &name,
.arg( sensors().at( mBeams - i - 1 )->name() );
}
- TQToolTip::remove( TQT_TQWIDGET(mPlotter) );
- TQToolTip::add( TQT_TQWIDGET(mPlotter), tooltip );
+ TQToolTip::remove( mPlotter );
+ TQToolTip::add( mPlotter, tooltip );
return true;
}
@@ -267,8 +267,8 @@ bool FancyPlotter::removeSensor( uint pos )
.arg( sensors().at( mBeams - i - 1 )->name() );
}
- TQToolTip::remove( TQT_TQWIDGET(mPlotter) );
- TQToolTip::add( TQT_TQWIDGET(mPlotter), tooltip );
+ TQToolTip::remove( mPlotter );
+ TQToolTip::add( mPlotter, tooltip );
return true;
}
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h
index fe88f292f..e97fabffc 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h
@@ -9,8 +9,8 @@
void MultiMeterSettingsWidget::init()
{
- m_lowerLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_lowerLimit)));
- m_upperLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_upperLimit)));
+ m_lowerLimit->setValidator(new KDoubleValidator(m_lowerLimit));
+ m_upperLimit->setValidator(new KDoubleValidator(m_upperLimit));
m_title->setFocus();
}
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h
index 515cb13f6..ad1f2687b 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h
@@ -9,8 +9,8 @@
void SensorLoggerDlgWidget::init()
{
- m_lowerLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_lowerLimit)));
- m_upperLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_upperLimit)));
+ m_lowerLimit->setValidator(new KDoubleValidator(m_lowerLimit));
+ m_upperLimit->setValidator(new KDoubleValidator(m_upperLimit));
m_timerInterval->setRange(1, 99, 1, true);
m_fileName->setFocus();
diff --git a/ksysguard/gui/ksysguard.cpp b/ksysguard/gui/ksysguard.cpp
index 2c2994eaa..2375cf8ee 100644
--- a/ksysguard/gui/ksysguard.cpp
+++ b/ksysguard/gui/ksysguard.cpp
@@ -105,39 +105,39 @@ TopLevel::TopLevel( const char *name )
statusBar()->hide();
// create actions for menue entries
- new TDEAction( i18n( "&New Worksheet..." ), "tab_new", 0, TQT_TQOBJECT(mWorkSpace),
+ new TDEAction( i18n( "&New Worksheet..." ), "tab_new", 0, mWorkSpace,
TQT_SLOT( newWorkSheet() ), actionCollection(), "new_worksheet" );
- new TDEAction( i18n( "Import Worksheet..." ), "document-open", 0, TQT_TQOBJECT(mWorkSpace),
+ new TDEAction( i18n( "Import Worksheet..." ), "document-open", 0, mWorkSpace,
TQT_SLOT( loadWorkSheet() ), actionCollection(), "import_worksheet" );
mActionOpenRecent = new TDERecentFilesAction( i18n( "&Import Recent Worksheet" ),"document-open", 0,
- TQT_TQOBJECT(mWorkSpace), TQT_SLOT( loadWorkSheet( const KURL& ) ), actionCollection(), "recent_import_worksheet" );
+ mWorkSpace, TQT_SLOT( loadWorkSheet( const KURL& ) ), actionCollection(), "recent_import_worksheet" );
- new TDEAction( i18n( "&Remove Worksheet" ), "tab_remove", 0, TQT_TQOBJECT(mWorkSpace),
+ new TDEAction( i18n( "&Remove Worksheet" ), "tab_remove", 0, mWorkSpace,
TQT_SLOT( deleteWorkSheet() ), actionCollection(), "remove_worksheet" );
- new TDEAction( i18n( "&Export Worksheet..." ), "document-save-as", 0, TQT_TQOBJECT(mWorkSpace),
+ new TDEAction( i18n( "&Export Worksheet..." ), "document-save-as", 0, mWorkSpace,
TQT_SLOT( saveWorkSheetAs() ), actionCollection(), "export_worksheet" );
- KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
+ KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() );
- new TDEAction( i18n( "C&onnect Host..." ), "connect_established", 0, TQT_TQOBJECT(this),
+ new TDEAction( i18n( "C&onnect Host..." ), "connect_established", 0, this,
TQT_SLOT( connectHost() ), actionCollection(), "connect_host" );
- new TDEAction( i18n( "D&isconnect Host" ), "connect_no", 0, TQT_TQOBJECT(this),
+ new TDEAction( i18n( "D&isconnect Host" ), "connect_no", 0, this,
TQT_SLOT( disconnectHost() ), actionCollection(), "disconnect_host" );
// KStdAction::cut( mWorkSpace, TQT_SLOT( cut() ), actionCollection() );
// KStdAction::copy( mWorkSpace, TQT_SLOT( copy() ), actionCollection() );
// KStdAction::paste( mWorkSpace, TQT_SLOT( paste() ), actionCollection() );
- new TDEAction( i18n( "&Worksheet Properties" ), "configure", 0, TQT_TQOBJECT(mWorkSpace),
+ new TDEAction( i18n( "&Worksheet Properties" ), "configure", 0, mWorkSpace,
TQT_SLOT( configure() ), actionCollection(), "configure_sheet" );
new TDEAction( i18n( "Load Standard Sheets" ), "document-revert",
- 0, TQT_TQOBJECT(this), TQT_SLOT( resetWorkSheets() ),
+ 0, this, TQT_SLOT( resetWorkSheets() ),
actionCollection(), "revert_all_worksheets" );
- new TDEAction( i18n( "Configure &Style..." ), "colorize", 0, TQT_TQOBJECT(this),
+ new TDEAction( i18n( "Configure &Style..." ), "colorize", 0, this,
TQT_SLOT( editStyle() ), actionCollection(), "configure_style" );
// TODO remove resize and fix so sizeHints() determines default size.
diff --git a/ksystraycmd/ksystraycmd.cpp b/ksystraycmd/ksystraycmd.cpp
index 630079600..298bc2eae 100644
--- a/ksystraycmd/ksystraycmd.cpp
+++ b/ksystraycmd/ksystraycmd.cpp
@@ -26,7 +26,7 @@ KSysTrayCmd::KSysTrayCmd()
win(0), client(0), twinmodule(0), top(0), left(0)
{
setAlignment( AlignCenter );
- twinmodule = new KWinModule( TQT_TQOBJECT(this) );
+ twinmodule = new KWinModule( this );
refresh();
}
diff --git a/kxkb/kcmlayout.cpp b/kxkb/kcmlayout.cpp
index 7b59e888b..303c88541 100644
--- a/kxkb/kcmlayout.cpp
+++ b/kxkb/kcmlayout.cpp
@@ -108,47 +108,47 @@ LayoutConfig::LayoutConfig(TQWidget *parent, const char *name)
TQVBoxLayout *main = new TQVBoxLayout(this, 0, KDialog::spacingHint());
widget = new LayoutConfigWidget(this, "widget");
- main->addWidget(TQT_TQWIDGET(widget));
+ main->addWidget(widget);
- connect( TQT_TQOBJECT(widget->chkEnable), TQT_SIGNAL( toggled( bool )), TQT_TQOBJECT(this), TQT_SLOT(changed()));
- connect( TQT_TQOBJECT(widget->chkShowSingle), TQT_SIGNAL( toggled( bool )), TQT_TQOBJECT(this), TQT_SLOT(changed()));
+ connect( widget->chkEnable, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT(changed()));
+ connect( widget->chkShowSingle, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT(changed()));
- connect( TQT_TQOBJECT(widget->comboHotkey), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(hotkeyComboChanged()));
- connect( TQT_TQOBJECT(widget->comboHotkey), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(updateOptionsCommand()));
- connect( TQT_TQOBJECT(widget->comboHotkey), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changed()));
- connect( TQT_TQOBJECT(widget->comboModel), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changed()));
+ connect( widget->comboHotkey, TQT_SIGNAL(activated(int)), this, TQT_SLOT(hotkeyComboChanged()));
+ connect( widget->comboHotkey, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateOptionsCommand()));
+ connect( widget->comboHotkey, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed()));
+ connect( widget->comboModel, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed()));
- connect( TQT_TQOBJECT(widget->listLayoutsSrc), TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&, int)),
- TQT_TQOBJECT(this), TQT_SLOT(add()));
- connect( TQT_TQOBJECT(widget->btnAdd), TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(add()));
- connect( TQT_TQOBJECT(widget->btnRemove), TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(remove()));
+ connect( widget->listLayoutsSrc, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&, int)),
+ this, TQT_SLOT(add()));
+ connect( widget->btnAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(add()));
+ connect( widget->btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(remove()));
- connect( TQT_TQOBJECT(widget->comboVariant), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changed()));
- connect( TQT_TQOBJECT(widget->comboVariant), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(variantChanged()));
- connect( TQT_TQOBJECT(widget->listLayoutsDst), TQT_SIGNAL(selectionChanged(TQListViewItem *)),
- TQT_TQOBJECT(this), TQT_SLOT(layoutSelChanged(TQListViewItem *)));
+ connect( widget->comboVariant, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed()));
+ connect( widget->comboVariant, TQT_SIGNAL(activated(int)), this, TQT_SLOT(variantChanged()));
+ connect( widget->listLayoutsDst, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
+ this, TQT_SLOT(layoutSelChanged(TQListViewItem *)));
- connect( widget->editDisplayName, TQT_SIGNAL(textChanged(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(displayNameChanged(const TQString&)));
+ connect( widget->editDisplayName, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(displayNameChanged(const TQString&)));
widget->btnUp->setIconSet(SmallIconSet("1uparrow"));
- connect( widget->btnUp, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(changed()));
- connect( widget->btnUp, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(moveUp()));
+ connect( widget->btnUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+ connect( widget->btnUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveUp()));
widget->btnDown->setIconSet(SmallIconSet("1downarrow"));
- connect( widget->btnDown, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(changed()));
- connect( widget->btnDown, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(moveDown()));
+ connect( widget->btnDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+ connect( widget->btnDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveDown()));
connect( widget->grpStyle, TQT_SIGNAL( clicked( int ) ), TQT_SLOT(changed()));
connect( widget->grpSwitching, TQT_SIGNAL( clicked( int ) ), TQT_SLOT(changed()));
connect( widget->grpLabel, TQT_SIGNAL( clicked( int ) ), TQT_SLOT(changed()));
- connect( widget->bgColor, TQT_SIGNAL( changed(const TQColor&) ), TQT_TQOBJECT(this), TQT_SLOT(changed()));
- connect( widget->fgColor, TQT_SIGNAL( changed(const TQColor&) ), TQT_TQOBJECT(this), TQT_SLOT(changed()));
- connect( widget->labelFont, TQT_SIGNAL( fontSelected(const TQFont&) ), TQT_TQOBJECT(this), TQT_SLOT(changed()));
- connect( widget->chkLabelShadow, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(this), TQT_SLOT(changed()));
- connect( widget->shColor, TQT_SIGNAL( changed(const TQColor&) ), TQT_TQOBJECT(this), TQT_SLOT(changed()));
+ connect( widget->bgColor, TQT_SIGNAL( changed(const TQColor&) ), this, TQT_SLOT(changed()));
+ connect( widget->fgColor, TQT_SIGNAL( changed(const TQColor&) ), this, TQT_SLOT(changed()));
+ connect( widget->labelFont, TQT_SIGNAL( fontSelected(const TQFont&) ), this, TQT_SLOT(changed()));
+ connect( widget->chkLabelShadow, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT(changed()));
+ connect( widget->shColor, TQT_SIGNAL( changed(const TQColor&) ), this, TQT_SLOT(changed()));
- connect( widget->chkEnableSticky, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(changed()));
- connect( widget->spinStickyDepth, TQT_SIGNAL(valueChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(changed()));
+ connect( widget->chkEnableSticky, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(changed()));
+ connect( widget->spinStickyDepth, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
connect(widget->chkEnableNotify, SIGNAL(toggled(bool)), SLOT(changed()));
connect(widget->chkNotifyUseKMilo, SIGNAL(toggled(bool)), SLOT(changed()));
@@ -175,7 +175,7 @@ LayoutConfig::LayoutConfig(TQWidget *parent, const char *name)
// Load global shortcuts
#define NOSLOTS
- keys = new TDEGlobalAccel(TQT_TQOBJECT(this));
+ keys = new TDEGlobalAccel(this);
#include "kxkbbindings.cpp"
makeOptionsTab();
diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp
index f38263645..7a76a19e5 100644
--- a/kxkb/kxkb.cpp
+++ b/kxkb/kxkb.cpp
@@ -78,7 +78,7 @@ KXKBApp::KXKBApp(bool allowStyles, bool GUIenabled)
m_layoutOwnerMap = new LayoutMap(kxkbConfig);
// keep in sync with kcmlayout.cpp
- keys = new TDEGlobalAccel(TQT_TQOBJECT(this));
+ keys = new TDEGlobalAccel(this);
#include "kxkbbindings.cpp"
connect( this, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)) );
diff --git a/kxkb/kxkbbindings.cpp b/kxkb/kxkbbindings.cpp
index f4a0fb5c3..4662918f2 100644
--- a/kxkb/kxkbbindings.cpp
+++ b/kxkb/kxkbbindings.cpp
@@ -1,6 +1,6 @@
#ifndef NOSLOTS
# define DEF( name, key3, key4, fnSlot ) \
- keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) )
+ keys->insert( name, i18n(name), TQString(), key3, key4, this, TQT_SLOT(fnSlot) )
#else
# define DEF( name, key3, key4, fnSlot ) \
keys->insert( name, i18n(name), TQString(), key3, key4, 0, 0 )
diff --git a/libkonq/konq_iconviewwidget.cpp b/libkonq/konq_iconviewwidget.cpp
index 6022f1850..3f785604e 100644
--- a/libkonq/konq_iconviewwidget.cpp
+++ b/libkonq/konq_iconviewwidget.cpp
@@ -308,7 +308,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
if (!hasPixmap && backgroundMode() != NoBackground)
d->m_movie->setBackgroundColor( viewport()->backgroundColor() );
d->m_movie->connectUpdate( this, TQT_SLOT( slotMovieUpdate(const TQRect &) ) );
- d->m_movie->connectStatus( TQT_TQOBJECT(this), TQT_SLOT( slotMovieStatus(int) ) );
+ d->m_movie->connectStatus( this, TQT_SLOT( slotMovieStatus(int) ) );
d->movieFileName = d->pActiveItem->mouseOverAnimation();
d->pActiveItem->setAnimated( true );
}
@@ -840,7 +840,7 @@ void KonqIconViewWidget::startImagePreview( const TQStringList &, bool force )
KLibFactory *factory = KLibLoader::self()->factory("konq_sound");
if (factory)
d->pSoundPlayer = static_cast<KonqSoundPlayer *>(
- factory->create(TQT_TQOBJECT(this), 0, "KonqSoundPlayer"));
+ factory->create(this, 0, "KonqSoundPlayer"));
d->bSoundPreviews = (d->pSoundPlayer != 0L);
}
diff --git a/libkonq/konq_pixmapprovider.cpp b/libkonq/konq_pixmapprovider.cpp
index 20a740eb4..b814af2f3 100644
--- a/libkonq/konq_pixmapprovider.cpp
+++ b/libkonq/konq_pixmapprovider.cpp
@@ -32,7 +32,7 @@ KonqPixmapProvider * KonqPixmapProvider::s_self = 0L;
KonqPixmapProvider * KonqPixmapProvider::self()
{
if ( !s_self )
- s_self = new KonqPixmapProvider( TQT_TQOBJECT(kapp), "KonqPixmapProvider" );
+ s_self = new KonqPixmapProvider( kapp, "KonqPixmapProvider" );
return s_self;
}
diff --git a/libkonq/konq_popupmenu.cpp b/libkonq/konq_popupmenu.cpp
index fa096a239..4c90b651a 100644
--- a/libkonq/konq_popupmenu.cpp
+++ b/libkonq/konq_popupmenu.cpp
@@ -287,7 +287,7 @@ int KonqPopupMenu::insertServices(const ServiceList& list,
name.setNum( id );
name.prepend( isBuiltin ? "builtinservice_" : "userservice_" );
TDEAction * act = new TDEAction( TQString((*it).m_strName).replace('&',"&&"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotRunService() ),
+ this, TQT_SLOT( slotRunService() ),
&m_ownActions, name );
if ( !(*it).m_strIcon.isEmpty() )
@@ -501,7 +501,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
if ( ((kpf & ShowNewWindow) != 0) && sReading && !isEncryptedMediaFile)
{
TQString openStr = isKDesktop ? i18n( "&Open" ) : i18n( "Open in New &Window" );
- TDEAction *actNewWindow = new TDEAction( openStr, "window-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewView() ), &m_ownActions, "newview" );
+ TDEAction *actNewWindow = new TDEAction( openStr, "window-new", 0, this, TQT_SLOT( slotPopupNewView() ), &m_ownActions, "newview" );
actNewWindow->setToolTip( i18n( "Open item in a new window" ) );
addAction( actNewWindow );
addSeparator();
@@ -523,14 +523,14 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
{
if (d->m_itemFlags & KParts::BrowserExtension::ShowCreateDirectory)
{
- TDEAction *actNewDir = new TDEAction( i18n( "Create &Folder..." ), "folder-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewDir() ), &m_ownActions, "newdir" );
+ TDEAction *actNewDir = new TDEAction( i18n( "Create &Folder..." ), "folder-new", 0, this, TQT_SLOT( slotPopupNewDir() ), &m_ownActions, "newdir" );
addAction( actNewDir );
addSeparator();
}
}
} else if ( isIntoTrash ) {
// Trashed item, offer restoring
- act = new TDEAction( i18n( "&Restore" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupRestoreTrashedItems() ), &m_ownActions, "restore" );
+ act = new TDEAction( i18n( "&Restore" ), 0, this, TQT_SLOT( slotPopupRestoreTrashedItems() ), &m_ownActions, "restore" );
addAction( act );
}
@@ -598,7 +598,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
}
if ( isCurrentTrash )
{
- act = new TDEAction( i18n( "&Empty Trash Bin" ), "emptytrash", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupEmptyTrashBin() ), &m_ownActions, "empytrash" );
+ act = new TDEAction( i18n( "&Empty Trash Bin" ), "emptytrash", 0, this, TQT_SLOT( slotPopupEmptyTrashBin() ), &m_ownActions, "empytrash" );
KSimpleConfig trashConfig( "trashrc", true );
trashConfig.setGroup( "Status" );
act->setEnabled( !trashConfig.readBoolEntry( "Empty", true ) );
@@ -631,7 +631,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
else
caption = i18n("&Bookmark This File");
- act = new TDEAction( caption, "bookmark_add", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupAddToBookmark() ), &m_ownActions, "bookmark_add" );
+ act = new TDEAction( caption, "bookmark_add", 0, this, TQT_SLOT( slotPopupAddToBookmark() ), &m_ownActions, "bookmark_add" );
if (m_lstItems.count() > 1)
act->setEnabled(false);
if (kapp->authorizeTDEAction("bookmarks"))
@@ -915,7 +915,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
actionName = i18n( "Open with %1" ).arg( actionName );
act = new TDEAction( actionName, (*it)->pixmap( TDEIcon::Small ), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotRunService() ),
+ this, TQT_SLOT( slotRunService() ),
&m_ownActions, nam.prepend( "appservice_" ) );
addAction( act, menu );
@@ -932,12 +932,12 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
{
openWithActionName = i18n( "&Open With..." );
}
- TDEAction *openWithAct = new TDEAction( openWithActionName, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" );
+ TDEAction *openWithAct = new TDEAction( openWithActionName, 0, this, TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" );
addAction( openWithAct, menu );
}
else // no app offers -> Open With...
{
- act = new TDEAction( i18n( "&Open With..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" );
+ act = new TDEAction( i18n( "&Open With..." ), 0, this, TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" );
addAction( act );
}
@@ -991,7 +991,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
if ( KPropertiesDialog::canDisplay( m_lstItems ) && (kpf & ShowProperties) )
{
- act = new TDEAction( i18n( "&Properties" ), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupProperties() ),
+ act = new TDEAction( i18n( "&Properties" ), "edit", 0, this, TQT_SLOT( slotPopupProperties() ),
&m_ownActions, "properties" );
addAction( act );
}
@@ -1005,7 +1005,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
if ( KFileShare::authorization() == KFileShare::Authorized )
{
addSeparator();
- act = new TDEAction( i18n("Share"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenShareFileDialog() ),
+ act = new TDEAction( i18n("Share"), 0, this, TQT_SLOT( slotOpenShareFileDialog() ),
&m_ownActions, "sharefile" );
addAction( act );
}
@@ -1185,7 +1185,7 @@ void KonqPopupMenu::addPlugins()
KonqPopupMenuPlugin *plugin =
KParts::ComponentFactory::
createInstanceFromLibrary<KonqPopupMenuPlugin>( TQFile::encodeName( (*iterator)->library() ),
- TQT_TQOBJECT(this),
+ this,
(*iterator)->name().latin1() );
if ( !plugin )
continue;
diff --git a/libkonq/konq_sound.cpp b/libkonq/konq_sound.cpp
index 687e9eed2..a0c95c19b 100644
--- a/libkonq/konq_sound.cpp
+++ b/libkonq/konq_sound.cpp
@@ -122,7 +122,7 @@ TQObject *KonqSoundFactory::createObject(TQObject *, const char *,
const char *className, const TQStringList &)
{
if (qstrcmp(className, "KonqSoundPlayer") == 0)
- return TQT_TQOBJECT(new KonqSoundPlayerImpl());
+ return new KonqSoundPlayerImpl();
return 0;
}
diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
index 9094b8e56..457c2cc55 100644
--- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
+++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
@@ -143,7 +143,7 @@ void MountHelper::eject(const Medium &medium)
#endif
// Otherwise fall back to tdeeject
- TDEProcess *proc = new TDEProcess(TQT_TQOBJECT(this));
+ TDEProcess *proc = new TDEProcess(this);
*proc << "tdeeject";
*proc << medium.deviceNode();
connect(proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(ejectFinished(TDEProcess*)));
diff --git a/tdeprint/kprinter/printwrapper.cpp b/tdeprint/kprinter/printwrapper.cpp
index 6ee4bbc4a..0ee7c2352 100644
--- a/tdeprint/kprinter/printwrapper.cpp
+++ b/tdeprint/kprinter/printwrapper.cpp
@@ -265,7 +265,7 @@ void PrintWrapper::slotPrint()
connect(dlg, TQT_SIGNAL(printRequested(KPrinter*)), TQT_SLOT(slotPrintRequested(KPrinter*)));
if( check_stdin )
{
- notif = new TQSocketNotifier( 0, TQSocketNotifier::Read, TQT_TQOBJECT(this) );
+ notif = new TQSocketNotifier( 0, TQSocketNotifier::Read, this );
connect( notif, TQT_SIGNAL( activated( int )), this, TQT_SLOT( slotGotStdin()));
kdDebug( 500 ) << "waiting for input on stdin" << endl;
}
diff --git a/tdeprint/tdeprintfax/tdeprintfax.cpp b/tdeprint/tdeprintfax/tdeprintfax.cpp
index 4cf67d0ca..7a95e5485 100644
--- a/tdeprint/tdeprintfax/tdeprintfax.cpp
+++ b/tdeprint/tdeprintfax/tdeprintfax.cpp
@@ -178,7 +178,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)
updateState();
resize(550,500);
- TQWidget *d = TQT_TQWIDGET(kapp->desktop());
+ TQWidget *d = kapp->desktop();
move((d->width()-width())/2, (d->height()-height())/2);
}
@@ -188,19 +188,19 @@ KdeprintFax::~KdeprintFax()
void KdeprintFax::initActions()
{
- new TDEAction(i18n("&Add File..."), "document-new", TQt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotAdd()), actionCollection(), "file_add");
- new TDEAction(i18n("&Remove File"), "remove", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), actionCollection(), "file_remove");
- new TDEAction(i18n("&Send Fax"), "connect_established", TQt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotFax()), actionCollection(), "fax_send");
- new TDEAction(i18n("A&bort"), "process-stop", TQt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotAbort()), actionCollection(), "fax_stop");
- new TDEAction(i18n("A&ddress Book"), "kaddressbook", TQt::CTRL+TQt::Key_A, TQT_TQOBJECT(this), TQT_SLOT(slotKab()), actionCollection(), "fax_ab");
- new TDEAction(i18n("V&iew Log"), "contents", TQt::CTRL+TQt::Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotViewLog()), actionCollection(), "fax_log");
- new TDEAction(i18n("Vi&ew File"), "filefind", TQt::CTRL+TQt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "file_view");
- new TDEAction( i18n( "&New Fax Recipient..." ), "edit", TQt::CTRL+TQt::Key_N, TQT_TQOBJECT(this), TQT_SLOT( slotFaxAdd() ), actionCollection(), "fax_add" );
+ new TDEAction(i18n("&Add File..."), "document-new", TQt::Key_Insert, this, TQT_SLOT(slotAdd()), actionCollection(), "file_add");
+ new TDEAction(i18n("&Remove File"), "remove", TQt::Key_Delete, this, TQT_SLOT(slotRemove()), actionCollection(), "file_remove");
+ new TDEAction(i18n("&Send Fax"), "connect_established", TQt::Key_Return, this, TQT_SLOT(slotFax()), actionCollection(), "fax_send");
+ new TDEAction(i18n("A&bort"), "process-stop", TQt::Key_Escape, this, TQT_SLOT(slotAbort()), actionCollection(), "fax_stop");
+ new TDEAction(i18n("A&ddress Book"), "kaddressbook", TQt::CTRL+TQt::Key_A, this, TQT_SLOT(slotKab()), actionCollection(), "fax_ab");
+ new TDEAction(i18n("V&iew Log"), "contents", TQt::CTRL+TQt::Key_L, this, TQT_SLOT(slotViewLog()), actionCollection(), "fax_log");
+ new TDEAction(i18n("Vi&ew File"), "filefind", TQt::CTRL+TQt::Key_O, this, TQT_SLOT(slotView()), actionCollection(), "file_view");
+ new TDEAction( i18n( "&New Fax Recipient..." ), "edit", TQt::CTRL+TQt::Key_N, this, TQT_SLOT( slotFaxAdd() ), actionCollection(), "fax_add" );
- KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection());
+ KStdAction::quit(this, TQT_SLOT(slotQuit()), actionCollection());
setStandardToolBarMenuEnabled(true);
- KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(slotToggleMenuBar()), actionCollection());
- KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection());
+ KStdAction::showMenubar(this, TQT_SLOT(slotToggleMenuBar()), actionCollection());
+ KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actionCollection());
KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
actionCollection());
actionCollection()->action("fax_stop")->setEnabled(false);
diff --git a/tdm/kfrontend/kchooser.cpp b/tdm/kfrontend/kchooser.cpp
index 9f0c714c0..3076d4a3c 100644
--- a/tdm/kfrontend/kchooser.cpp
+++ b/tdm/kfrontend/kchooser.cpp
@@ -106,7 +106,7 @@ ChooserDlg::ChooserDlg()
vbox->addWidget( consoleView );
#endif
- sn = new TQSocketNotifier( rfd, TQSocketNotifier::Read, TQT_TQOBJECT(this) );
+ sn = new TQSocketNotifier( rfd, TQSocketNotifier::Read, this );
connect( sn, TQT_SIGNAL(activated( int )), TQT_SLOT(slotReadPipe()) );
connect( pingButton, TQT_SIGNAL(clicked()), TQT_SLOT(pingHosts()) );
diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp
index 521c624f2..c7d694608 100644
--- a/tdm/kfrontend/kgapp.cpp
+++ b/tdm/kfrontend/kgapp.cpp
@@ -411,7 +411,7 @@ kg_main( const char *argv0 )
}
if (cmd == G_ErrorGreet) {
- if (KGVerify::handleFailVerify( TQT_TQWIDGET(tqApp->desktop()->screen( _greeterScreen )) ))
+ if (KGVerify::handleFailVerify( tqApp->desktop()->screen( _greeterScreen ) ))
break;
_autoLoginDelay = 0;
cmd = G_Greet;
diff --git a/tdm/kfrontend/krootimage.cpp b/tdm/kfrontend/krootimage.cpp
index 7145eb18a..889f41e58 100644
--- a/tdm/kfrontend/krootimage.cpp
+++ b/tdm/kfrontend/krootimage.cpp
@@ -72,8 +72,8 @@ MyApplication::renderDone()
TQPixmap pm = renderer.pixmap();
// ...set it to the desktop widget...
- TQT_TQWIDGET(desktop())->setBackgroundPixmap( pm );
- TQT_TQWIDGET(desktop())->repaint( true );
+ desktop()->setBackgroundPixmap( pm );
+ desktop()->repaint( true );
// ...and export it via Esetroot-style so that composition managers can use it!
Pixmap bgPm = pm.handle(); // fetch the actual X handle to it
diff --git a/tdm/kfrontend/themer/tdmthemer.cpp b/tdm/kfrontend/themer/tdmthemer.cpp
index 0a0e7fabb..16fdf7c89 100644
--- a/tdm/kfrontend/themer/tdmthemer.cpp
+++ b/tdm/kfrontend/themer/tdmthemer.cpp
@@ -432,8 +432,8 @@ KdmThemer::slotPaintRoot()
}
else return;
- TQT_TQWIDGET(TQApplication::desktop()->screen())->setErasePixmap(pm);
- TQT_TQWIDGET(TQApplication::desktop()->screen())->erase();
+ TQApplication::desktop()->screen()->setErasePixmap(pm);
+ TQApplication::desktop()->screen()->erase();
}
#include "tdmthemer.moc"
diff --git a/twin/kcmtwin/twinrules/kcm.cpp b/twin/kcmtwin/twinrules/kcm.cpp
index 2f28bc5dd..6e7b54890 100644
--- a/twin/kcmtwin/twinrules/kcm.cpp
+++ b/twin/kcmtwin/twinrules/kcm.cpp
@@ -44,7 +44,7 @@ KCMRules::KCMRules( TQWidget *parent, const char *name )
{
TQVBoxLayout *layout = new TQVBoxLayout( this );
widget = new KCMRulesList( this );
- layout->addWidget( TQT_TQWIDGET(widget) );
+ layout->addWidget( widget );
connect( widget, TQT_SIGNAL( changed( bool )), TQT_SLOT( moduleChanged( bool )));
TDEAboutData *about = new TDEAboutData(I18N_NOOP( "kcmtwinrules" ),
I18N_NOOP( "Window-Specific Settings Configuration Module" ),
diff --git a/twin/sm.cpp b/twin/sm.cpp
index 53d2a5f29..316322edd 100644
--- a/twin/sm.cpp
+++ b/twin/sm.cpp
@@ -416,7 +416,7 @@ SessionSaveDoneHelper::SessionSaveDoneHelper()
SmProp* p[ 5 ] = { &props[ 0 ], &props[ 1 ], &props[ 2 ], &props[ 3 ], &props[ 4 ] };
SmcSetProperties( conn, 5, p );
notifier = new TQSocketNotifier( IceConnectionNumber( SmcGetIceConnection( conn )),
- TQSocketNotifier::Read, TQT_TQOBJECT(this) );
+ TQSocketNotifier::Read, this );
connect( notifier, TQT_SIGNAL( activated( int )), TQT_SLOT( processData()));
}