summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dcoprss/feedbrowser.cpp2
-rw-r--r--filesharing/advanced/nfs/nfsdialog.cpp2
-rw-r--r--kdict/toplevel.cpp44
-rw-r--r--kget/dlgIndividual.cpp2
-rw-r--r--kget/kget_plug_in/kget_linkview.cpp4
-rw-r--r--kget/tdemainwidget.cpp62
-rw-r--r--knewsticker/knewsticker.cpp2
-rw-r--r--knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp2
-rw-r--r--kopete/kopete/chatwindow/chatview.cpp4
-rw-r--r--kopete/kopete/chatwindow/kopetechatwindow.cpp52
-rw-r--r--kopete/kopete/chatwindow/kopeteemailwindow.cpp14
-rw-r--r--kopete/kopete/chatwindow/krichtexteditpart.cpp6
-rw-r--r--kopete/kopete/contactlist/kopetecontactlistview.cpp28
-rw-r--r--kopete/kopete/kopetewindow.cpp48
-rw-r--r--kopete/libkopete/kcautoconfigmodule.cpp8
-rw-r--r--kopete/libkopete/knotification.cpp2
-rw-r--r--kopete/libkopete/kopetechatsessionmanager.cpp2
-rw-r--r--kopete/libkopete/kopetecontact.cpp14
-rw-r--r--kopete/libkopete/ui/kopetepasswordwidget.cpp2
-rw-r--r--kopete/plugins/cryptography/popuppublic.cpp2
-rw-r--r--kopete/plugins/history/historydialog.cpp12
-rw-r--r--kopete/plugins/webpresence/webpresencepreferences.cpp2
-rw-r--r--kopete/protocols/gadu/gaduregisteraccount.cpp2
-rw-r--r--kopete/protocols/irc/ircprotocol.cpp2
-rw-r--r--kopete/protocols/irc/ui/irceditaccountwidget.cpp6
-rw-r--r--kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp2
-rw-r--r--kopete/protocols/msn/ui/msneditaccountwidget.cpp2
-rw-r--r--kpf/src/ActiveMonitorWindow.cpp2
-rw-r--r--kpf/src/DirSelectWidget.cpp2
-rw-r--r--kppp/connect.cpp2
-rw-r--r--kppp/kpppwidget.cpp2
-rw-r--r--kppp/loginterm.cpp2
-rw-r--r--kppp/miniterm.cpp8
-rw-r--r--kppp/modeminfo.cpp2
-rw-r--r--krdc/krdc.cpp18
-rw-r--r--krdc/rdp/krdpview.cpp4
-rw-r--r--krfb/krfb/trayicon.cpp4
-rw-r--r--ksirc/KSTicker/ksticker.cpp14
-rw-r--r--ksirc/dccNew.cpp2
-rw-r--r--ksirc/dccToplevel.cpp6
-rw-r--r--ksirc/displayMgrMDI.cpp2
-rw-r--r--ksirc/dockservercontroller.cpp8
-rw-r--r--ksirc/objFinder.cpp2
-rw-r--r--ksirc/servercontroller.cpp10
-rw-r--r--ksirc/toplevel.cpp22
-rw-r--r--ktalkd/ktalkdlg/ktalkdlg.cpp6
-rw-r--r--wifi/kwifimanager.cpp18
47 files changed, 233 insertions, 233 deletions
diff --git a/dcoprss/feedbrowser.cpp b/dcoprss/feedbrowser.cpp
index e91cd703..7ba86c51 100644
--- a/dcoprss/feedbrowser.cpp
+++ b/dcoprss/feedbrowser.cpp
@@ -91,7 +91,7 @@ FeedBrowserDlg::FeedBrowserDlg( TQWidget *parent, const char *name )
: KDialogBase( parent, name, true, i18n( "DCOPRSS Feed Browser" ),
Close, Close, true )
{
- m_dcopIface = new DCOPRSSIface( TQT_TQOBJECT(this), "m_dcopIface" );
+ m_dcopIface = new DCOPRSSIface( this, "m_dcopIface" );
connect( m_dcopIface, TQT_SIGNAL( gotCategories( const TQStringList & ) ),
this, TQT_SLOT( gotTopCategories( const TQStringList & ) ) );
diff --git a/filesharing/advanced/nfs/nfsdialog.cpp b/filesharing/advanced/nfs/nfsdialog.cpp
index ed009db1..9636b5cb 100644
--- a/filesharing/advanced/nfs/nfsdialog.cpp
+++ b/filesharing/advanced/nfs/nfsdialog.cpp
@@ -66,7 +66,7 @@ void NFSDialog::initGUI() {
layout->addWidget( m_gui );
TDEAccel* accel = new TDEAccel( m_gui->listView );
- accel->insert( "Delete", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveHost()));
+ accel->insert( "Delete", TQt::Key_Delete, this, TQT_SLOT(slotRemoveHost()));
}
void NFSDialog::initSlots()
diff --git a/kdict/toplevel.cpp b/kdict/toplevel.cpp
index 862d83ab..d6ac7302 100644
--- a/kdict/toplevel.cpp
+++ b/kdict/toplevel.cpp
@@ -314,46 +314,46 @@ bool TopLevel::queryClose()
void TopLevel::setupActions()
{
// file menu...
- actSave = KStdAction::save(TQT_TQOBJECT(queryView), TQT_SLOT(saveQuery()), actionCollection());
+ actSave = KStdAction::save(queryView, TQT_SLOT(saveQuery()), actionCollection());
actSave->setText(i18n("&Save As..."));
actSave->setEnabled(false);
- actPrint = KStdAction::print(TQT_TQOBJECT(queryView), TQT_SLOT(printQuery()), actionCollection());
+ actPrint = KStdAction::print(queryView, TQT_SLOT(printQuery()), actionCollection());
actPrint->setEnabled(false);
- actStartQuery = new TDEAction(i18n("St&art Query"),"reload", 0 , TQT_TQOBJECT(this),
+ actStartQuery = new TDEAction(i18n("St&art Query"),"reload", 0 , this,
TQT_SLOT(doDefine()), actionCollection(), "start_query");
- actStopQuery = new TDEAction(i18n("St&op Query"),"process-stop", 0 , TQT_TQOBJECT(this),
+ actStopQuery = new TDEAction(i18n("St&op Query"),"process-stop", 0 , this,
TQT_SLOT(stopClients()), actionCollection(), "stop_query");
actStopQuery->setEnabled(false);
- KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(closeAllWindows()), actionCollection());
+ KStdAction::quit(kapp, TQT_SLOT(closeAllWindows()), actionCollection());
// edit menu...
- actCopy = KStdAction::copy(TQT_TQOBJECT(queryView), TQT_SLOT(copySelection()), actionCollection());
+ actCopy = KStdAction::copy(queryView, TQT_SLOT(copySelection()), actionCollection());
actCopy->setEnabled(false);
- KStdAction::selectAll(TQT_TQOBJECT(queryView), TQT_SLOT(selectAll()), actionCollection());
- new TDEAction(i18n("&Define Clipboard Content"), "define_clip", 0 , TQT_TQOBJECT(this),
+ KStdAction::selectAll(queryView, TQT_SLOT(selectAll()), actionCollection());
+ new TDEAction(i18n("&Define Clipboard Content"), "define_clip", 0 , this,
TQT_SLOT(defineClipboard()), actionCollection(), "define_clipboard");
- new TDEAction(i18n("&Match Clipboard Content"), 0 , TQT_TQOBJECT(this),
+ new TDEAction(i18n("&Match Clipboard Content"), 0 , this,
TQT_SLOT(matchClipboard()), actionCollection(), "match_clipboard");
- KStdAction::find(TQT_TQOBJECT(queryView), TQT_SLOT(showFindDialog()), actionCollection());
+ KStdAction::find(queryView, TQT_SLOT(showFindDialog()), actionCollection());
// history menu...
actBack = new TDEToolBarPopupAction(i18n("&Back"), "back", TDEStdAccel::shortcut(TDEStdAccel::Back),
- TQT_TQOBJECT(queryView), TQT_SLOT(browseBack()), actionCollection(),"browse_back");
+ queryView, TQT_SLOT(browseBack()), actionCollection(),"browse_back");
actBack->setDelayed(true);
actBack->setStickyMenu(false);
actBack->setEnabled(false);
actForward = new TDEToolBarPopupAction(i18n("&Forward"), "forward", TDEStdAccel::shortcut(TDEStdAccel::Forward),
- TQT_TQOBJECT(queryView), TQT_SLOT(browseForward()), actionCollection(),"browse_forward");
+ queryView, TQT_SLOT(browseForward()), actionCollection(),"browse_forward");
actForward->setDelayed(true);
actForward->setStickyMenu(false);
actForward->setEnabled(false);
- new TDEAction(i18n("&Clear History"), 0 , TQT_TQOBJECT(this),
+ new TDEAction(i18n("&Clear History"), 0 , this,
TQT_SLOT(clearQueryHistory()), actionCollection(), "clear_history");
// server menu...
new TDEAction(i18n("&Get Capabilities"), 0 , interface,
TQT_SLOT(updateServer()), actionCollection(), "get_capabilities");
- new TDEAction(i18n("Edit &Database Sets..."), "edit", 0 , TQT_TQOBJECT(this),
+ new TDEAction(i18n("Edit &Database Sets..."), "edit", 0 , this,
TQT_SLOT(showSetsDialog()), actionCollection(), "edit_sets");
new TDEAction(i18n("&Summary"), 0 , interface,
TQT_SLOT(showDatabases()), actionCollection(), "db_summary");
@@ -366,17 +366,17 @@ void TopLevel::setupActions()
createStandardStatusBarAction();
setStandardToolBarMenuEnabled(true);
- actShowMatchList = new TDEToggleAction(i18n("Show &Match List"), 0 , TQT_TQOBJECT(this),
+ actShowMatchList = new TDEToggleAction(i18n("Show &Match List"), 0 , this,
TQT_SLOT(toggleMatchListShow()), actionCollection(), "show_match");
actShowMatchList->setCheckedState(i18n("Hide &Match List"));
actShowMatchList->setChecked(global->showMatchList);
KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
actionCollection());
- KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbar()), actionCollection());
- KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showOptionsDialog()), actionCollection());
+ KStdAction::configureToolbars(this, TQT_SLOT(slotConfToolbar()), actionCollection());
+ KStdAction::preferences(this, TQT_SLOT(showOptionsDialog()), actionCollection());
// toolbar...
- new TDEAction(i18n("Clear Input Field"), "query_erase", 0 , TQT_TQOBJECT(this),
+ new TDEAction(i18n("Clear Input Field"), "query_erase", 0 , this,
TQT_SLOT(clearInput()), actionCollection(), "clear_query");
actQueryLabel = new DictLabelAction(i18n("&Look for:"), actionCollection(), "look_label");
@@ -386,8 +386,8 @@ actionCollection());
actDbLabel = new DictLabelAction(i18n("&in"), actionCollection(), "in_label");
actDbCombo = new DictComboAction(i18n("Databases"), actionCollection(), "db_combo",false,false);
connect(actDbCombo,TQT_SIGNAL(activated(int)),TQT_SLOT(databaseSelected(int)));
- actDefineBtn = new DictButtonAction(i18n("&Define"), TQT_TQOBJECT(this), TQT_SLOT(doDefine()), actionCollection(), "define_btn");
- actMatchBtn = new DictButtonAction(i18n("&Match"), TQT_TQOBJECT(this), TQT_SLOT(doMatch()), actionCollection(), "match_btn");
+ actDefineBtn = new DictButtonAction(i18n("&Define"), this, TQT_SLOT(doDefine()), actionCollection(), "define_btn");
+ actMatchBtn = new DictButtonAction(i18n("&Match"), this, TQT_SLOT(doMatch()), actionCollection(), "match_btn");
queryView->setActions(actBack,actForward,actQueryCombo);
}
@@ -509,7 +509,7 @@ void TopLevel::buildHistMenu()
unsigned int i = 0;
while ((i<10)&&(i<global->queryHistory.count())) {
- historyActionList.append( new TDEAction(getShortString(global->queryHistory[i],70), 0, TQT_TQOBJECT(this), TQT_SLOT(queryHistMenu()),
+ historyActionList.append( new TDEAction(getShortString(global->queryHistory[i],70), 0, this, TQT_SLOT(queryHistMenu()),
(TQObject*)0, global->queryHistory[i].utf8().data()) );
i++;
}
@@ -548,7 +548,7 @@ void TopLevel::stratDbChanged()
dbActionList.clear();
for (unsigned int i=0;i<global->serverDatabases.count();i++)
- dbActionList.append( new TDEAction(global->serverDatabases[i], 0, TQT_TQOBJECT(this), TQT_SLOT(dbInfoMenuClicked()),
+ dbActionList.append( new TDEAction(global->serverDatabases[i], 0, this, TQT_SLOT(dbInfoMenuClicked()),
(TQObject*)0, global->serverDatabases[i].utf8().data()) );
plugActionList("db_detail", dbActionList);
diff --git a/kget/dlgIndividual.cpp b/kget/dlgIndividual.cpp
index eeaa018d..c8a939e2 100644
--- a/kget/dlgIndividual.cpp
+++ b/kget/dlgIndividual.cpp
@@ -63,7 +63,7 @@ DlgIndividual::DlgIndividual(Transfer * _item)
// Actions
- m_paDock = new TDEToggleAction(i18n("&Dock"),"tool_dock.png", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleDock()), TQT_TQOBJECT(this), "dockIndividual");
+ m_paDock = new TDEToggleAction(i18n("&Dock"),"tool_dock.png", 0, this, TQT_SLOT(slotToggleDock()), this, "dockIndividual");
TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(),KDialog::spacingHint() );
diff --git a/kget/kget_plug_in/kget_linkview.cpp b/kget/kget_plug_in/kget_linkview.cpp
index 0cf512f9..9a77e95f 100644
--- a/kget/kget_plug_in/kget_linkview.cpp
+++ b/kget/kget_plug_in/kget_linkview.cpp
@@ -44,10 +44,10 @@ KGetLinkView::KGetLinkView( TQWidget *parent, const char *name )
TDEAction* actionDownload = new TDEAction( i18n("Download Selected Files"),
"kget", CTRL+Key_D,
- TQT_TQOBJECT(this), TQT_SLOT( slotStartLeech() ),
+ this, TQT_SLOT( slotStartLeech() ),
actionCollection(), "startDownload" );
- TDEAction* actionSelectAll = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ),
+ TDEAction* actionSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ),
actionCollection() );
m_links.setAutoDelete( true );
diff --git a/kget/tdemainwidget.cpp b/kget/tdemainwidget.cpp
index 2fd09b3d..0e6cd31a 100644
--- a/kget/tdemainwidget.cpp
+++ b/kget/tdemainwidget.cpp
@@ -342,65 +342,65 @@ void TDEMainWidget::setupGUI()
connect(myTransferList, TQT_SIGNAL(popupMenu(Transfer *)), this, TQT_SLOT(slotPopupMenu(Transfer *)));
// file actions
- m_paOpenTransfer = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotOpenTransfer()), coll, "open_transfer");
- m_paPasteTransfer = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPasteTransfer()), coll, "paste_transfer");
+ m_paOpenTransfer = KStdAction::open(this, TQT_SLOT(slotOpenTransfer()), coll, "open_transfer");
+ m_paPasteTransfer = KStdAction::paste(this, TQT_SLOT(slotPasteTransfer()), coll, "paste_transfer");
- m_paExportTransfers = new TDEAction(i18n("&Export Transfer List..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportTransfers()), coll, "export_transfers");
- m_paImportTransfers = new TDEAction(i18n("&Import Transfer List..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportTransfers()), coll, "import_transfers");
+ m_paExportTransfers = new TDEAction(i18n("&Export Transfer List..."), 0, this, TQT_SLOT(slotExportTransfers()), coll, "export_transfers");
+ m_paImportTransfers = new TDEAction(i18n("&Import Transfer List..."), 0, this, TQT_SLOT(slotImportTransfers()), coll, "import_transfers");
- m_paImportText = new TDEAction(i18n("Import Text &File..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportTextFile()), coll, "import_text");
+ m_paImportText = new TDEAction(i18n("Import Text &File..."), 0, this, TQT_SLOT(slotImportTextFile()), coll, "import_text");
- m_paQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), coll, "quit");
+ m_paQuit = KStdAction::quit(this, TQT_SLOT(slotQuit()), coll, "quit");
// transfer actions
- m_paCopy = new TDEAction(i18n("&Copy URL to Clipboard"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCopyToClipboard()), coll, "copy_url");
- m_paIndividual = new TDEAction(i18n("&Open Individual Window"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenIndividual()), coll, "open_individual");
+ m_paCopy = new TDEAction(i18n("&Copy URL to Clipboard"), 0, this, TQT_SLOT(slotCopyToClipboard()), coll, "copy_url");
+ m_paIndividual = new TDEAction(i18n("&Open Individual Window"), 0, this, TQT_SLOT(slotOpenIndividual()), coll, "open_individual");
- m_paMoveToBegin = new TDEAction(i18n("Move to &Beginning"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMoveToBegin()), coll, "move_begin");
+ m_paMoveToBegin = new TDEAction(i18n("Move to &Beginning"), 0, this, TQT_SLOT(slotMoveToBegin()), coll, "move_begin");
- m_paMoveToEnd = new TDEAction(i18n("Move to &End"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMoveToEnd()), coll, "move_end");
+ m_paMoveToEnd = new TDEAction(i18n("Move to &End"), 0, this, TQT_SLOT(slotMoveToEnd()), coll, "move_end");
#ifdef _DEBUG
sDebug << "Loading pics" << endl;
#endif
- m_paResume = new TDEAction(i18n("&Resume"),"tool_resume", 0, TQT_TQOBJECT(this), TQT_SLOT(slotResumeCurrent()), coll, "resume");
- m_paPause = new TDEAction(i18n("&Pause"),"tool_pause", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPauseCurrent()), coll, "pause");
- m_paDelete = new TDEAction(i18n("&Delete"),"edit-delete", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCurrent()), coll, "delete");
- m_paRestart = new TDEAction(i18n("Re&start"),"tool_restart", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRestartCurrent()), coll, "restart");
+ m_paResume = new TDEAction(i18n("&Resume"),"tool_resume", 0, this, TQT_SLOT(slotResumeCurrent()), coll, "resume");
+ m_paPause = new TDEAction(i18n("&Pause"),"tool_pause", 0, this, TQT_SLOT(slotPauseCurrent()), coll, "pause");
+ m_paDelete = new TDEAction(i18n("&Delete"),"edit-delete", TQt::Key_Delete, this, TQT_SLOT(slotDeleteCurrent()), coll, "delete");
+ m_paRestart = new TDEAction(i18n("Re&start"),"tool_restart", 0, this, TQT_SLOT(slotRestartCurrent()), coll, "restart");
- m_paQueue = new TDERadioAction(i18n("&Queue"),"tool_queue", 0, TQT_TQOBJECT(this), TQT_SLOT(slotQueueCurrent()), coll, "queue");
- m_paTimer = new TDERadioAction(i18n("&Timer"),"tool_timer", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTimerCurrent()), coll, "timer");
- m_paDelay = new TDERadioAction(i18n("De&lay"),"tool_delay", 0, TQT_TQOBJECT(this), TQT_SLOT(slotDelayCurrent()), coll, "delay");
+ m_paQueue = new TDERadioAction(i18n("&Queue"),"tool_queue", 0, this, TQT_SLOT(slotQueueCurrent()), coll, "queue");
+ m_paTimer = new TDERadioAction(i18n("&Timer"),"tool_timer", 0, this, TQT_SLOT(slotTimerCurrent()), coll, "timer");
+ m_paDelay = new TDERadioAction(i18n("De&lay"),"tool_delay", 0, this, TQT_SLOT(slotDelayCurrent()), coll, "delay");
m_paQueue->setExclusiveGroup("TransferMode");
m_paTimer->setExclusiveGroup("TransferMode");
m_paDelay->setExclusiveGroup("TransferMode");
// options actions
- m_paUseAnimation = new TDEToggleAction(i18n("Use &Animation"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleAnimation()), coll, "toggle_animation");
- m_paExpertMode = new TDEToggleAction(i18n("&Expert Mode"),"tool_expert", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleExpertMode()), coll, "expert_mode");
- m_paUseLastDir = new TDEToggleAction(i18n("&Use-Last-Folder Mode"),"tool_uselastdir", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleUseLastDir()), coll, "use_last_dir");
- m_paAutoDisconnect = new TDEToggleAction(i18n("Auto-&Disconnect Mode"),"tool_disconnect", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleAutoDisconnect()), coll, "auto_disconnect");
- m_paAutoShutdown = new TDEToggleAction(i18n("Auto-S&hutdown Mode"), "tool_shutdown", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleAutoShutdown()), coll, "auto_shutdown");
- m_paOfflineMode = new TDEToggleAction(i18n("&Offline Mode"),"tool_offline_mode_off", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleOfflineMode()), coll, "offline_mode");
- m_paAutoPaste = new TDEToggleAction(i18n("Auto-Pas&te Mode"),"tool_clipboard", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleAutoPaste()), coll, "auto_paste");
+ m_paUseAnimation = new TDEToggleAction(i18n("Use &Animation"), 0, this, TQT_SLOT(slotToggleAnimation()), coll, "toggle_animation");
+ m_paExpertMode = new TDEToggleAction(i18n("&Expert Mode"),"tool_expert", 0, this, TQT_SLOT(slotToggleExpertMode()), coll, "expert_mode");
+ m_paUseLastDir = new TDEToggleAction(i18n("&Use-Last-Folder Mode"),"tool_uselastdir", 0, this, TQT_SLOT(slotToggleUseLastDir()), coll, "use_last_dir");
+ m_paAutoDisconnect = new TDEToggleAction(i18n("Auto-&Disconnect Mode"),"tool_disconnect", 0, this, TQT_SLOT(slotToggleAutoDisconnect()), coll, "auto_disconnect");
+ m_paAutoShutdown = new TDEToggleAction(i18n("Auto-S&hutdown Mode"), "tool_shutdown", 0, this, TQT_SLOT(slotToggleAutoShutdown()), coll, "auto_shutdown");
+ m_paOfflineMode = new TDEToggleAction(i18n("&Offline Mode"),"tool_offline_mode_off", 0, this, TQT_SLOT(slotToggleOfflineMode()), coll, "offline_mode");
+ m_paAutoPaste = new TDEToggleAction(i18n("Auto-Pas&te Mode"),"tool_clipboard", 0, this, TQT_SLOT(slotToggleAutoPaste()), coll, "auto_paste");
- m_paPreferences = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), coll);
+ m_paPreferences = KStdAction::preferences(this, TQT_SLOT(slotPreferences()), coll);
KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), coll);
- KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbars()), coll);
- KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureNotifications()), coll);
+ KStdAction::configureToolbars(this, TQT_SLOT(slotConfigureToolbars()), coll);
+ KStdAction::configureNotifications(this, TQT_SLOT(slotConfigureNotifications()), coll);
- m_menubarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(slotShowMenubar()), coll, "settings_showmenubar" );
+ m_menubarAction = KStdAction::showMenubar(this, TQT_SLOT(slotShowMenubar()), coll, "settings_showmenubar" );
m_menubarAction->setChecked( !menuBar()->isHidden() );
// view actions
createStandardStatusBarAction();
- m_paShowLog = new TDEToggleAction(i18n("Show &Log Window"),"tool_logwindow", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleLogWindow()), coll, "toggle_log");
+ m_paShowLog = new TDEToggleAction(i18n("Show &Log Window"),"tool_logwindow", 0, this, TQT_SLOT(slotToggleLogWindow()), coll, "toggle_log");
m_paShowLog->setCheckedState(i18n("Hide &Log Window"));
- m_paDropTarget = new TDEAction(i18n("Show Drop &Target"),"tool_drop_target", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleDropTarget()), coll, "drop_target");
- m_paKonquerorIntegration = new TDEAction(i18n("Enable &KGet as Konqueror Download Manager"), "konqueror", 0, TQT_TQOBJECT(this), TQT_SLOT(slotKonquerorIntegration()), coll, "konqueror_integration");
+ m_paDropTarget = new TDEAction(i18n("Show Drop &Target"),"tool_drop_target", 0, this, TQT_SLOT(slotToggleDropTarget()), coll, "drop_target");
+ m_paKonquerorIntegration = new TDEAction(i18n("Enable &KGet as Konqueror Download Manager"), "konqueror", 0, this, TQT_SLOT(slotKonquerorIntegration()), coll, "konqueror_integration");
if (ksettings.b_KonquerorIntegration) {
m_paKonquerorIntegration->setText(i18n("Disable &KGet as Konqueror Download Manager"));
}
diff --git a/knewsticker/knewsticker.cpp b/knewsticker/knewsticker.cpp
index 9fb5a2e6..0d41c26e 100644
--- a/knewsticker/knewsticker.cpp
+++ b/knewsticker/knewsticker.cpp
@@ -429,7 +429,7 @@ void KNewsTickerMenu::populateMenu()
NewsSourceBase::Ptr ns = *nIt;
TDEPopupMenu *submenu = new TDEPopupMenu;
- int checkNewsId = submenu->insertItem(lookIcon, i18n("Check News"), TQT_TQOBJECT(this), TQT_SLOT(slotCheckNews(int)), 0, sources.findIndex(ns) + 1000);
+ int checkNewsId = submenu->insertItem(lookIcon, i18n("Check News"), this, TQT_SLOT(slotCheckNews(int)), 0, sources.findIndex(ns) + 1000);
setItemParameter(checkNewsId, sources.findIndex(ns));
submenu->insertSeparator();
diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
index 8076c304..7f085134 100644
--- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
+++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
@@ -112,7 +112,7 @@ TQObject *KntSrcFilePropsFactory::createObject(TQObject *parent, const char *,
if (!parent->inherits("KPropertiesDialog"))
return 0L;
- TQObject *obj = new KntSrcFilePropsDlg(static_cast<KPropertiesDialog *>(TQT_TQWIDGET(parent)));
+ TQObject *obj = new KntSrcFilePropsDlg(static_cast<KPropertiesDialog *>(parent));
return obj;
}
return 0L;
diff --git a/kopete/kopete/chatwindow/chatview.cpp b/kopete/kopete/chatwindow/chatview.cpp
index a60902d9..bc4d3227 100644
--- a/kopete/kopete/chatwindow/chatview.cpp
+++ b/kopete/kopete/chatwindow/chatview.cpp
@@ -161,8 +161,8 @@ ChatView::ChatView( Kopete::ChatSession *mgr, ChatWindowPlugin *parent, const ch
editPart()->widget()->setFocus();
// init actions
- KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(copy()), actionCollection() );
- KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT(closeView()),actionCollection() );
+ KStdAction::copy( this, TQT_SLOT(copy()), actionCollection() );
+ KStdAction::close( this, TQT_SLOT(closeView()),actionCollection() );
setCaption( m_manager->displayName(), false );
diff --git a/kopete/kopete/chatwindow/kopetechatwindow.cpp b/kopete/kopete/chatwindow/kopetechatwindow.cpp
index 919f669b..eef4ab09 100644
--- a/kopete/kopete/chatwindow/kopetechatwindow.cpp
+++ b/kopete/kopete/chatwindow/kopetechatwindow.cpp
@@ -314,28 +314,28 @@ void KopeteChatWindow::initActions(void)
createStandardStatusBarAction();
chatSend = new TDEAction( i18n( "&Send Message" ), TQString::fromLatin1( "mail-send" ), TQKeySequence(Key_Return) ,
- TQT_TQOBJECT(this), TQT_SLOT( slotSendMessage() ), coll, "chat_send" );
+ this, TQT_SLOT( slotSendMessage() ), coll, "chat_send" );
chatSend->setEnabled( false );
- KStdAction::save ( TQT_TQOBJECT(this), TQT_SLOT(slotChatSave()), coll );
- KStdAction::print ( TQT_TQOBJECT(this), TQT_SLOT(slotChatPrint()), coll );
- TDEAction* quitAction = KStdAction::quit ( TQT_TQOBJECT(this), TQT_SLOT(close()), coll );
+ KStdAction::save ( this, TQT_SLOT(slotChatSave()), coll );
+ KStdAction::print ( this, TQT_SLOT(slotChatPrint()), coll );
+ TDEAction* quitAction = KStdAction::quit ( this, TQT_SLOT(close()), coll );
quitAction->setText( i18n("Close All Chats") );
- tabClose = KStdAction::close ( TQT_TQOBJECT(this), TQT_SLOT(slotChatClosed()), coll, "tabs_close" );
+ tabClose = KStdAction::close ( this, TQT_SLOT(slotChatClosed()), coll, "tabs_close" );
tabRight=new TDEAction( i18n( "&Activate Next Tab" ), 0, TDEStdAccel::tabNext(),
- TQT_TQOBJECT(this), TQT_SLOT( slotNextTab() ), coll, "tabs_right" );
+ this, TQT_SLOT( slotNextTab() ), coll, "tabs_right" );
tabLeft=new TDEAction( i18n( "&Activate Previous Tab" ), 0, TDEStdAccel::tabPrev(),
- TQT_TQOBJECT(this), TQT_SLOT( slotPreviousTab() ), coll, "tabs_left" );
+ this, TQT_SLOT( slotPreviousTab() ), coll, "tabs_left" );
tabLeft->setEnabled( false );
tabRight->setEnabled( false );
- nickComplete = new TDEAction( i18n( "Nic&k Completion" ), TQString(), 0, TQT_TQOBJECT(this), TQT_SLOT( slotNickComplete() ), coll , "nick_compete");
+ nickComplete = new TDEAction( i18n( "Nic&k Completion" ), TQString(), 0, this, TQT_SLOT( slotNickComplete() ), coll , "nick_compete");
nickComplete->setShortcut( TQKeySequence( Key_Tab ) );
tabDetach = new TDEAction( i18n( "&Detach Chat" ), TQString::fromLatin1( "tab_breakoff" ), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotDetachChat() ), coll, "tabs_detach" );
+ this, TQT_SLOT( slotDetachChat() ), coll, "tabs_detach" );
tabDetach->setEnabled( false );
actionDetachMenu = new TDEActionMenu( i18n( "&Move Tab to Window" ), TQString::fromLatin1( "tab_breakoff" ), coll, "tabs_detachmove" );
@@ -350,36 +350,36 @@ void KopeteChatWindow::initActions(void)
tabDetach->setShortcut( TQKeySequence(CTRL + SHIFT + Key_B) );
- KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(slotCut()), coll);
- KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), coll);
- KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), coll);
+ KStdAction::cut( this, TQT_SLOT(slotCut()), coll);
+ KStdAction::copy( this, TQT_SLOT(slotCopy()), coll);
+ KStdAction::paste( this, TQT_SLOT(slotPaste()), coll);
- new TDEAction( i18n( "Set Default &Font..." ), TQString::fromLatin1( "charset" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetFont() ), coll, "format_font" );
- new TDEAction( i18n( "Set Default Text &Color..." ), TQString::fromLatin1( "pencil" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetFgColor() ), coll, "format_fgcolor" );
- new TDEAction( i18n( "Set &Background Color..." ), TQString::fromLatin1( "fill" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetBgColor() ), coll, "format_bgcolor" );
+ new TDEAction( i18n( "Set Default &Font..." ), TQString::fromLatin1( "charset" ), 0, this, TQT_SLOT( slotSetFont() ), coll, "format_font" );
+ new TDEAction( i18n( "Set Default Text &Color..." ), TQString::fromLatin1( "pencil" ), 0, this, TQT_SLOT( slotSetFgColor() ), coll, "format_fgcolor" );
+ new TDEAction( i18n( "Set &Background Color..." ), TQString::fromLatin1( "fill" ), 0, this, TQT_SLOT( slotSetBgColor() ), coll, "format_bgcolor" );
historyUp = new TDEAction( i18n( "Previous History" ), TQString(), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotHistoryUp() ), coll, "history_up" );
+ this, TQT_SLOT( slotHistoryUp() ), coll, "history_up" );
historyUp->setShortcut( TQKeySequence(CTRL + Key_Up) );
historyDown = new TDEAction( i18n( "Next History" ), TQString(), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotHistoryDown() ), coll, "history_down" );
+ this, TQT_SLOT( slotHistoryDown() ), coll, "history_down" );
historyDown->setShortcut( TQKeySequence(CTRL + Key_Down) );
- KStdAction::prior( TQT_TQOBJECT(this), TQT_SLOT( slotPageUp() ), coll, "scroll_up" );
- KStdAction::next( TQT_TQOBJECT(this), TQT_SLOT( slotPageDown() ), coll, "scroll_down" );
+ KStdAction::prior( this, TQT_SLOT( slotPageUp() ), coll, "scroll_up" );
+ KStdAction::next( this, TQT_SLOT( slotPageDown() ), coll, "scroll_down" );
- KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(slotViewMenuBar()), coll );
+ KStdAction::showMenubar( this, TQT_SLOT(slotViewMenuBar()), coll );
membersLeft = new TDEToggleAction( i18n( "Place to Left of Chat Area" ), TQString(), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotViewMembersLeft() ), coll, "options_membersleft" );
+ this, TQT_SLOT( slotViewMembersLeft() ), coll, "options_membersleft" );
membersRight = new TDEToggleAction( i18n( "Place to Right of Chat Area" ), TQString(), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotViewMembersRight() ), coll, "options_membersright" );
+ this, TQT_SLOT( slotViewMembersRight() ), coll, "options_membersright" );
toggleMembers = new TDEToggleAction( i18n( "Show" ), TQString(), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotToggleViewMembers() ), coll, "options_togglemembers" );
+ this, TQT_SLOT( slotToggleViewMembers() ), coll, "options_togglemembers" );
toggleMembers->setCheckedState(i18n("Hide"));
toggleAutoSpellCheck = new TDEToggleAction( i18n( "Automatic Spell Checking" ), TQString(), 0,
- TQT_TQOBJECT(this), TQT_SLOT( toggleAutoSpellChecking() ), coll, "enable_auto_spell_check" );
+ this, TQT_SLOT( toggleAutoSpellChecking() ), coll, "enable_auto_spell_check" );
toggleAutoSpellCheck->setChecked( true );
actionSmileyMenu = new KopeteEmoticonAction( coll, "format_smiley" );
@@ -393,7 +393,7 @@ void KopeteChatWindow::initActions(void)
// add configure key bindings menu item
KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), coll );
- KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbar()), coll);
+ KStdAction::configureToolbars(this, TQT_SLOT(slotConfToolbar()), coll);
KopeteStdAction::preferences( coll , "settings_prefs" );
//The Sending movie
@@ -994,7 +994,7 @@ void KopeteChatWindow::slotPrepareContactMenu(void)
if( ++contactCount == 15 && contact != m_them.getLast() )
{
TDEActionMenu *moreMenu = new TDEActionMenu( i18n("More..."),
- TQString::fromLatin1("folder_open"), TQT_TQOBJECT(contactsMenu) );
+ TQString::fromLatin1("folder_open"), contactsMenu );
connect ( actionContactMenu->popupMenu(), TQT_SIGNAL(aboutToHide()),
moreMenu, TQT_SLOT(deleteLater() ) );
moreMenu->plug( contactsMenu );
diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
index 9bd4aaf6..4f0b24ea 100644
--- a/kopete/kopete/chatwindow/kopeteemailwindow.cpp
+++ b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
@@ -207,15 +207,15 @@ void KopeteEmailWindow::initActions(void)
TDEActionCollection *coll = actionCollection();
d->chatSend = new TDEAction( i18n( "&Send Message" ), TQString::fromLatin1( "mail-send" ), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotReplySend() ), coll, "chat_send" );
+ this, TQT_SLOT( slotReplySend() ), coll, "chat_send" );
//Default to 'Return' for sending messages
d->chatSend->setShortcut( TQKeySequence( Key_Return ) );
- KStdAction::quit ( TQT_TQOBJECT(this), TQT_SLOT( slotCloseView() ), coll );
+ KStdAction::quit ( this, TQT_SLOT( slotCloseView() ), coll );
- KStdAction::cut( TQT_TQOBJECT(d->editPart->widget()), TQT_SLOT( cut() ), coll );
- KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), coll);
- KStdAction::paste( TQT_TQOBJECT(d->editPart->widget()), TQT_SLOT( paste() ), coll );
+ KStdAction::cut( d->editPart->widget(), TQT_SLOT( cut() ), coll );
+ KStdAction::copy( this, TQT_SLOT(slotCopy()), coll);
+ KStdAction::paste( d->editPart->widget(), TQT_SLOT( paste() ), coll );
new TDEAction( i18n( "&Set Font..." ), TQString::fromLatin1( "charset" ), 0,
d->editPart, TQT_SLOT( setFont() ), coll, "format_font" );
@@ -224,7 +224,7 @@ void KopeteEmailWindow::initActions(void)
new TDEAction( i18n( "Set &Background Color..." ), TQString::fromLatin1( "fill" ), 0,
d->editPart, TQT_SLOT( setBgColor() ), coll, "format_bgcolor" );
- KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotViewMenuBar() ), coll );
+ KStdAction::showMenubar( this, TQT_SLOT( slotViewMenuBar() ), coll );
setStandardToolBarMenuEnabled( true );
d->actionSmileyMenu = new KopeteEmoticonAction( coll, "format_smiley" );
@@ -233,7 +233,7 @@ void KopeteEmailWindow::initActions(void)
// add configure key bindings menu item
KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), coll );
- KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT( slotConfToolbar() ), coll);
+ KStdAction::configureToolbars(this, TQT_SLOT( slotConfToolbar() ), coll);
//FIXME: no longer works?
KopeteStdAction::preferences( coll , "settings_prefs" );
diff --git a/kopete/kopete/chatwindow/krichtexteditpart.cpp b/kopete/kopete/chatwindow/krichtexteditpart.cpp
index 19b67ff6..70b0692f 100644
--- a/kopete/kopete/chatwindow/krichtexteditpart.cpp
+++ b/kopete/kopete/chatwindow/krichtexteditpart.cpp
@@ -36,13 +36,13 @@ public:
};
KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *wparent, const char *wname, TQObject*, const char*, const TQStringList& )
- : KParts::ReadOnlyPart( TQT_TQOBJECT(wparent), wname ? wname : "rich_text_part" )
+ : KParts::ReadOnlyPart( wparent, wname ? wname : "rich_text_part" )
{
KopeteRichTextEditPart( wparent, wname, false );
}
KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *parent, const char *name, int capabilities )
- : KParts::ReadOnlyPart( TQT_TQOBJECT(parent), name ? name : "rich_text_part" ),
+ : KParts::ReadOnlyPart( parent, name ? name : "rich_text_part" ),
m_capabilities( capabilities ),
m_richTextEnabled( true )
{
@@ -131,7 +131,7 @@ void KopeteRichTextEditPart::createActions( TDEActionCollection *ac )
this, TQT_SLOT( slotSetRichTextEnabled(bool) ) );
checkSpelling = new TDEAction( i18n("Check &Spelling"), "tools-check-spelling", 0,
- TQT_TQOBJECT(editor), TQT_SLOT( checkSpelling() ), ac, "check_spelling" );
+ editor, TQT_SLOT( checkSpelling() ), ac, "check_spelling" );
//Fg Color
actionFgColor = new TDEAction( i18n("Text &Color..."), "color_line", 0,
diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp
index a7b214b6..adf8ea32 100644
--- a/kopete/kopete/contactlist/kopetecontactlistview.cpp
+++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp
@@ -461,33 +461,33 @@ KopeteContactListView::KopeteContactListView( TQWidget *parent, const char *name
void KopeteContactListView::initActions( TDEActionCollection *ac )
{
- actionUndo = KStdAction::undo( TQT_TQOBJECT(this) , TQT_SLOT( slotUndo() ) , ac );
- actionRedo = KStdAction::redo( TQT_TQOBJECT(this) , TQT_SLOT( slotRedo() ) , ac );
+ actionUndo = KStdAction::undo( this , TQT_SLOT( slotUndo() ) , ac );
+ actionRedo = KStdAction::redo( this , TQT_SLOT( slotRedo() ) , ac );
actionUndo->setEnabled(false);
actionRedo->setEnabled(false);
- new TDEAction( i18n( "Create New Group..." ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( addGroup() ),
+ new TDEAction( i18n( "Create New Group..." ), 0, 0, this, TQT_SLOT( addGroup() ),
ac, "AddGroup" );
actionSendMessage = KopeteStdAction::sendMessage(
- TQT_TQOBJECT(this), TQT_SLOT( slotSendMessage() ), ac, "contactSendMessage" );
- actionStartChat = KopeteStdAction::chat( TQT_TQOBJECT(this), TQT_SLOT( slotStartChat() ),
+ this, TQT_SLOT( slotSendMessage() ), ac, "contactSendMessage" );
+ actionStartChat = KopeteStdAction::chat( this, TQT_SLOT( slotStartChat() ),
ac, "contactStartChat" );
actionMove = new KopeteGroupListAction( i18n( "&Move To" ), TQString::fromLatin1( "edit-cut" ),
- 0, TQT_TQOBJECT(this), TQT_SLOT( slotMoveToGroup() ), ac, "contactMove" );
+ 0, this, TQT_SLOT( slotMoveToGroup() ), ac, "contactMove" );
actionCopy = new KopeteGroupListAction( i18n( "&Copy To" ), TQString::fromLatin1( "edit-copy" ), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotCopyToGroup() ), ac, "contactCopy" );
+ this, TQT_SLOT( slotCopyToGroup() ), ac, "contactCopy" );
- actionRemove = KopeteStdAction::deleteContact( TQT_TQOBJECT(this), TQT_SLOT( slotRemove() ),
+ actionRemove = KopeteStdAction::deleteContact( this, TQT_SLOT( slotRemove() ),
ac, "contactRemove" );
actionSendEmail = new TDEAction( i18n( "Send Email..." ), TQString::fromLatin1( "mail_generic" ),
- 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendEmail() ), ac, "contactSendEmail" );
+ 0, this, TQT_SLOT( slotSendEmail() ), ac, "contactSendEmail" );
/* this actionRename is buggy, and useless with properties, removed in kopeteui.rc*/
actionRename = new TDEAction( i18n( "Rename" ), "document-save-as", 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotRename() ), ac, "contactRename" );
- actionSendFile = KopeteStdAction::sendFile( TQT_TQOBJECT(this), TQT_SLOT( slotSendFile() ),
+ this, TQT_SLOT( slotRename() ), ac, "contactRename" );
+ actionSendFile = KopeteStdAction::sendFile( this, TQT_SLOT( slotSendFile() ),
ac, "contactSendFile" );
actionAddContact = new TDEActionMenu( i18n( "&Add Contact" ),
@@ -495,7 +495,7 @@ void KopeteContactListView::initActions( TDEActionCollection *ac )
actionAddContact->popupMenu()->insertTitle( i18n("Select Account") );
actionAddTemporaryContact = new TDEAction( i18n( "Add to Your Contact List" ), "add_user", 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotAddTemporaryContact() ), ac, "contactAddTemporaryContact" );
+ this, TQT_SLOT( slotAddTemporaryContact() ), ac, "contactAddTemporaryContact" );
connect( Kopete::ContactList::self(), TQT_SIGNAL( metaContactSelected( bool ) ), this, TQT_SLOT( slotMetaContactSelected( bool ) ) );
@@ -503,7 +503,7 @@ void KopeteContactListView::initActions( TDEActionCollection *ac )
connect( Kopete::AccountManager::self(), TQT_SIGNAL(accountUnregistered( const Kopete::Account* )), TQT_SLOT(slotAddSubContactActionAccountDeleted(const Kopete::Account *)));
actionProperties = new TDEAction( i18n( "&Properties" ), "edit_user", TQt::Key_Alt + TQt::Key_Return,
- TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ), ac, "contactProperties" );
+ this, TQT_SLOT( slotProperties() ), ac, "contactProperties" );
// Update enabled/disabled actions
slotViewSelectionChanged();
@@ -516,7 +516,7 @@ KopeteContactListView::~KopeteContactListView()
void KopeteContactListView::slotAddSubContactActionNewAccount(Kopete::Account* account)
{
- TDEAction *action = new TDEAction( account->accountLabel(), account->accountIcon(), 0 , TQT_TQOBJECT(this), TQT_SLOT(slotAddContact()), account);
+ TDEAction *action = new TDEAction( account->accountLabel(), account->accountIcon(), 0 , this, TQT_SLOT(slotAddContact()), account);
m_accountAddContactMap.insert( account, action);
actionAddContact->insert( action );
}
diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp
index 329f4944..80cddf94 100644
--- a/kopete/kopete/kopetewindow.cpp
+++ b/kopete/kopete/kopetewindow.cpp
@@ -209,7 +209,7 @@ void KopeteWindow::initActions()
actionCollection(), "AddContact" );
actionAddContact->setDelayed( false );
// this signal mapper is needed to call slotAddContact with the correct arguments
- addContactMapper = new TQSignalMapper( TQT_TQOBJECT(this) );
+ addContactMapper = new TQSignalMapper( this );
connect( addContactMapper, TQT_SIGNAL( mapped( const TQString & ) ),
this, TQT_SLOT( slotAddContactDialogInternal( const TQString & ) ) );
@@ -220,10 +220,10 @@ void KopeteWindow::initActions()
*/
actionDisconnect = new TDEAction( i18n( "O&ffline" ), "connect_no",
- 0, TQT_TQOBJECT(this), TQT_SLOT( slotDisconnectAll() ),
+ 0, this, TQT_SLOT( slotDisconnectAll() ),
actionCollection(), "DisconnectAll" );
- actionExportContacts = new TDEAction( i18n( "&Export Contacts..." ), "", 0, TQT_TQOBJECT(this),
+ actionExportContacts = new TDEAction( i18n( "&Export Contacts..." ), "", 0, this,
TQT_SLOT( showExportDialog() ),actionCollection(), "ExportContacts" );
/* the connection menu has been replaced by the set status menu
@@ -238,16 +238,16 @@ void KopeteWindow::initActions()
actionDisconnect->setEnabled(false);
selectAway = new TDEAction( i18n("&Away"), SmallIcon("kopeteaway"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotGlobalAway() ), actionCollection(),
+ this, TQT_SLOT( slotGlobalAway() ), actionCollection(),
"SetAwayAll" );
selectBusy = new TDEAction( i18n("&Busy"), SmallIcon("kopeteaway"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotGlobalBusy() ), actionCollection(),
+ this, TQT_SLOT( slotGlobalBusy() ), actionCollection(),
"SetBusyAll" );
actionSetInvisible = new TDEAction( i18n( "&Invisible" ), "kopeteavailable", 0 ,
- TQT_TQOBJECT(this), TQT_SLOT( slotSetInvisibleAll() ), actionCollection(),
+ this, TQT_SLOT( slotSetInvisibleAll() ), actionCollection(),
"SetInvisibleAll" );
@@ -258,7 +258,7 @@ void KopeteWindow::initActions()
"SetAvailableAll" );*/
actionSetAvailable = new TDEAction( i18n("&Online"),
- SmallIcon("kopeteavailable"), 0, TQT_TQOBJECT(this),
+ SmallIcon("kopeteavailable"), 0, this,
TQT_SLOT( slotGlobalAvailable() ), actionCollection(),
"SetAvailableAll" );
@@ -273,25 +273,25 @@ void KopeteWindow::initActions()
actionPrefs = KopeteStdAction::preferences( actionCollection(), "settings_prefs" );
- KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection());
+ KStdAction::quit(this, TQT_SLOT(slotQuit()), actionCollection());
setStandardToolBarMenuEnabled(true);
- menubarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(showMenubar()), actionCollection(), "settings_showmenubar" );
- statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(showStatusbar()), actionCollection(), "settings_showstatusbar");
+ menubarAction = KStdAction::showMenubar(this, TQT_SLOT(showMenubar()), actionCollection(), "settings_showmenubar" );
+ statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(showStatusbar()), actionCollection(), "settings_showstatusbar");
KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection(), "settings_keys" );
- new TDEAction( i18n( "Configure Plugins..." ), "preferences-desktop-peripherals", 0, TQT_TQOBJECT(this),
+ new TDEAction( i18n( "Configure Plugins..." ), "preferences-desktop-peripherals", 0, this,
TQT_SLOT( slotConfigurePlugins() ), actionCollection(), "settings_plugins" );
- new TDEAction( i18n( "Configure &Global Shortcuts..." ), "configure_shortcuts", 0, TQT_TQOBJECT(this),
+ new TDEAction( i18n( "Configure &Global Shortcuts..." ), "configure_shortcuts", 0, this,
TQT_SLOT( slotConfGlobalKeys() ), actionCollection(), "settings_global" );
- KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbar()), actionCollection() );
- KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(slotConfNotifications()), actionCollection(), "settings_notifications" );
+ KStdAction::configureToolbars( this, TQT_SLOT(slotConfToolbar()), actionCollection() );
+ KStdAction::configureNotifications(this, TQT_SLOT(slotConfNotifications()), actionCollection(), "settings_notifications" );
actionShowOffliners = new TDEToggleAction( i18n( "Show Offline &Users" ), "show_offliners", CTRL + Key_U,
- TQT_TQOBJECT(this), TQT_SLOT( slotToggleShowOffliners() ), actionCollection(), "settings_show_offliners" );
+ this, TQT_SLOT( slotToggleShowOffliners() ), actionCollection(), "settings_show_offliners" );
actionShowEmptyGroups = new TDEToggleAction( i18n( "Show Empty &Groups" ), "folder", CTRL + Key_G,
- TQT_TQOBJECT(this), TQT_SLOT( slotToggleShowEmptyGroups() ), actionCollection(), "settings_show_empty_groups" );
+ this, TQT_SLOT( slotToggleShowEmptyGroups() ), actionCollection(), "settings_show_empty_groups" );
actionShowOffliners->setCheckedState(i18n("Hide Offline &Users"));
actionShowEmptyGroups->setCheckedState(i18n("Hide Empty &Groups"));
@@ -306,7 +306,7 @@ void KopeteWindow::initActions()
// quick search bar - clear button
TDEAction *resetQuickSearch = new TDEAction( i18n( "Reset Quick Search" ),
TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase",
- 0, TQT_TQOBJECT(searchBar), TQT_SLOT( clear() ), actionCollection(), "quicksearch_reset" );
+ 0, searchBar, TQT_SLOT( clear() ), actionCollection(), "quicksearch_reset" );
resetQuickSearch->setWhatsThis( i18n( "Reset Quick Search\n"
"Resets the quick search so that all contacts and groups are shown again." ) );
@@ -323,18 +323,18 @@ void KopeteWindow::initActions()
connect( setStatusMenu->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_SLOT(slotStatusMessageSelected( int ) ) );
// sync actions, config and prefs-dialog
- connect ( KopetePrefs::prefs(), TQT_SIGNAL(saved()), TQT_TQOBJECT(this), TQT_SLOT(slotConfigChanged()) );
+ connect ( KopetePrefs::prefs(), TQT_SIGNAL(saved()), this, TQT_SLOT(slotConfigChanged()) );
slotConfigChanged();
- globalAccel = new TDEGlobalAccel( TQT_TQOBJECT(this) );
+ globalAccel = new TDEGlobalAccel( this );
globalAccel->insert( TQString::fromLatin1("Read Message"), i18n("Read Message"), i18n("Read the next pending message"),
CTRL+SHIFT+Key_I, KKey::QtWIN+CTRL+Key_I, Kopete::ChatSessionManager::self(), TQT_SLOT(slotReadMessage()) );
globalAccel->insert( TQString::fromLatin1("Show/Hide Contact List"), i18n("Show/Hide Contact List"), i18n("Show or hide the contact list"),
- CTRL+SHIFT+Key_S, KKey::QtWIN+CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotShowHide()) );
+ CTRL+SHIFT+Key_S, KKey::QtWIN+CTRL+Key_S, this, TQT_SLOT(slotShowHide()) );
globalAccel->insert( TQString::fromLatin1("Set Away/Back"), i18n("Set Away/Back"), i18n("Sets away from keyboard or sets back"),
- CTRL+SHIFT+Key_W, KKey::QtWIN+CTRL+SHIFT+Key_W, TQT_TQOBJECT(this), TQT_SLOT(slotToggleAway()) );
+ CTRL+SHIFT+Key_W, KKey::QtWIN+CTRL+SHIFT+Key_W, this, TQT_SLOT(slotToggleAway()) );
globalAccel->readSettings();
globalAccel->updateConnections();
@@ -722,7 +722,7 @@ void KopeteWindow::slotAccountRegistered( Kopete::Account *account )
TQT_SLOT( slotAccountStatusIconRightClicked( Kopete::Account *,
const TQPoint & ) ) );
- m_accountStatusBarIcons.insert( account, TQT_TQOBJECT(sbIcon) );
+ m_accountStatusBarIcons.insert( account, sbIcon );
slotAccountStatusIconChanged( account->myself() );
// add an item for this account to the add contact actionmenu
@@ -744,7 +744,7 @@ void KopeteWindow::slotAccountUnregistered( const Kopete::Account *account)
}
// the (void*) is to remove the const. i don't know why TQPtrList doesn't accept const ptr as key.
- KopeteAccountStatusBarIcon *sbIcon = static_cast<KopeteAccountStatusBarIcon *>( TQT_TQWIDGET(m_accountStatusBarIcons[ (void*)account ]) );
+ KopeteAccountStatusBarIcon *sbIcon = static_cast<KopeteAccountStatusBarIcon *>( m_accountStatusBarIcons[ (void*)account ] );
if( !sbIcon )
return;
@@ -816,7 +816,7 @@ void KopeteWindow::slotAccountStatusIconChanged( Kopete::Contact *contact )
}
}
- KopeteAccountStatusBarIcon *i = static_cast<KopeteAccountStatusBarIcon *>( TQT_TQWIDGET(m_accountStatusBarIcons[ contact->account() ]) );
+ KopeteAccountStatusBarIcon *i = static_cast<KopeteAccountStatusBarIcon *>( m_accountStatusBarIcons[ contact->account() ] );
if( !i )
return;
diff --git a/kopete/libkopete/kcautoconfigmodule.cpp b/kopete/libkopete/kcautoconfigmodule.cpp
index 751a0c01..d079984a 100644
--- a/kopete/libkopete/kcautoconfigmodule.cpp
+++ b/kopete/libkopete/kcautoconfigmodule.cpp
@@ -34,7 +34,7 @@ KCAutoConfigModule::KCAutoConfigModule( TQWidget * parent, const char * name, co
: TDECModule( parent, name, args )
, d( new KCAutoConfigModulePrivate )
{
- d->kautoconfig = new KAutoConfig( TQT_TQOBJECT(this) );
+ d->kautoconfig = new KAutoConfig( this );
connect(d->kautoconfig, TQT_SIGNAL(widgetModified()), TQT_SLOT(slotWidgetModified()));
connect(d->kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(widgetModified()));
}
@@ -43,7 +43,7 @@ KCAutoConfigModule::KCAutoConfigModule( TDEInstance * instance, TQWidget * paren
: TDECModule( instance, parent, args )
, d( new KCAutoConfigModulePrivate )
{
- d->kautoconfig = new KAutoConfig( TQT_TQOBJECT(this) );
+ d->kautoconfig = new KAutoConfig( this );
connect(d->kautoconfig, TQT_SIGNAL(widgetModified()), TQT_SLOT(slotWidgetModified()));
connect(d->kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(slotWidgetModified()));
}
@@ -53,7 +53,7 @@ KCAutoConfigModule::KCAutoConfigModule( TDEInstance * instance, TQWidget * paren
KCAutoConfigModule::KCAutoConfigModule( TDEConfig *config,TQWidget * parent, const char * name, const TQStringList & args )
: TDECModule( parent, name, args ) , d( new KCAutoConfigModulePrivate )
{
- d->kautoconfig = new KAutoConfig( config, TQT_TQOBJECT(this) );
+ d->kautoconfig = new KAutoConfig( config, this );
connect(d->kautoconfig, TQT_SIGNAL(widgetModified()), TQT_SLOT(slotWidgetModified()));
connect(d->kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(slotWidgetModified()));
}
@@ -62,7 +62,7 @@ KCAutoConfigModule::KCAutoConfigModule( TDEConfig *config , TDEInstance * instan
: TDECModule( instance, parent, args )
, d( new KCAutoConfigModulePrivate )
{
- d->kautoconfig = new KAutoConfig( config, TQT_TQOBJECT(this) );
+ d->kautoconfig = new KAutoConfig( config, this );
connect(d->kautoconfig, TQT_SIGNAL(widgetModified()), TQT_SLOT(slotWidgetModified()));
connect(d->kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(slotWidgetModified()));
}
diff --git a/kopete/libkopete/knotification.cpp b/kopete/libkopete/knotification.cpp
index 9730d100..e7bfdfe2 100644
--- a/kopete/libkopete/knotification.cpp
+++ b/kopete/libkopete/knotification.cpp
@@ -368,7 +368,7 @@ KNotification *KNotification::userEvent( const TQString& text, const TQPixmap& p
*/
- KNotification *notify=new KNotification(TQT_TQOBJECT(widget));
+ KNotification *notify=new KNotification(widget);
notify->d->widget=widget;
notify->d->text=text;
notify->d->actions=actions;
diff --git a/kopete/libkopete/kopetechatsessionmanager.cpp b/kopete/libkopete/kopetechatsessionmanager.cpp
index df4353ad..57cc1752 100644
--- a/kopete/libkopete/kopetechatsessionmanager.cpp
+++ b/kopete/libkopete/kopetechatsessionmanager.cpp
@@ -38,7 +38,7 @@ ChatSessionManager* ChatSessionManager::s_self = 0L;
ChatSessionManager* ChatSessionManager::self()
{
if( !s_self )
- s_self = new ChatSessionManager( TQT_TQOBJECT(kapp) );
+ s_self = new ChatSessionManager( kapp );
return s_self;
}
diff --git a/kopete/libkopete/kopetecontact.cpp b/kopete/libkopete/kopetecontact.cpp
index b1d9005e..35520c83 100644
--- a/kopete/libkopete/kopetecontact.cpp
+++ b/kopete/libkopete/kopetecontact.cpp
@@ -210,7 +210,7 @@ TDEPopupMenu* Contact::popupMenu( ChatSession *manager )
if( metaContact() && metaContact()->isTemporary() && contactId() != account()->myself()->contactId() )
{
TDEAction *actionAddContact = new TDEAction( i18n( "&Add to Your Contact List" ), TQString::fromLatin1( "add_user" ),
- 0, TQT_TQOBJECT(this), TQT_SLOT( slotAddContact() ), TQT_TQOBJECT(menu), "actionAddContact" );
+ 0, this, TQT_SLOT( slotAddContact() ), menu, "actionAddContact" );
actionAddContact->plug( menu );
menu->insertSeparator();
}
@@ -219,15 +219,15 @@ TDEPopupMenu* Contact::popupMenu( ChatSession *manager )
bool reach = account()->isConnected() && isReachable();
bool myself = (this == account()->myself());
- TDEAction *actionSendMessage = KopeteStdAction::sendMessage( TQT_TQOBJECT(this), TQT_SLOT( sendMessage() ), TQT_TQOBJECT(menu), "actionSendMessage" );
+ TDEAction *actionSendMessage = KopeteStdAction::sendMessage( this, TQT_SLOT( sendMessage() ), menu, "actionSendMessage" );
actionSendMessage->setEnabled( reach && !myself );
actionSendMessage->plug( menu );
- TDEAction *actionChat = KopeteStdAction::chat( TQT_TQOBJECT(this), TQT_SLOT( startChat() ), TQT_TQOBJECT(menu), "actionChat" );
+ TDEAction *actionChat = KopeteStdAction::chat( this, TQT_SLOT( startChat() ), menu, "actionChat" );
actionChat->setEnabled( reach && !myself );
actionChat->plug( menu );
- TDEAction *actionSendFile = KopeteStdAction::sendFile( TQT_TQOBJECT(this), TQT_SLOT( sendFile() ), TQT_TQOBJECT(menu), "actionSendFile" );
+ TDEAction *actionSendFile = KopeteStdAction::sendFile( this, TQT_SLOT( sendFile() ), menu, "actionSendFile" );
actionSendFile->setEnabled( reach && d->fileCapable && !myself );
actionSendFile->plug( menu );
@@ -248,9 +248,9 @@ TDEPopupMenu* Contact::popupMenu( ChatSession *manager )
menu->insertSeparator();
if( metaContact() && !metaContact()->isTemporary() )
- KopeteStdAction::changeMetaContact( TQT_TQOBJECT(this), TQT_SLOT( changeMetaContact() ), TQT_TQOBJECT(menu), "actionChangeMetaContact" )->plug( menu );
+ KopeteStdAction::changeMetaContact( this, TQT_SLOT( changeMetaContact() ), menu, "actionChangeMetaContact" )->plug( menu );
- KopeteStdAction::contactInfo( TQT_TQOBJECT(this), TQT_SLOT( slotUserInfo() ), TQT_TQOBJECT(menu), "actionUserInfo" )->plug( menu );
+ KopeteStdAction::contactInfo( this, TQT_SLOT( slotUserInfo() ), menu, "actionUserInfo" )->plug( menu );
#if 0 //this is not fully implemented yet (and doesn't work). disable for now - Olivier 2005-01-11
if ( account()->isBlocked( d->contactId ) )
@@ -260,7 +260,7 @@ TDEPopupMenu* Contact::popupMenu( ChatSession *manager )
#endif
if( metaContact() && !metaContact()->isTemporary() )
- KopeteStdAction::deleteContact( TQT_TQOBJECT(this), TQT_SLOT( slotDelete() ), TQT_TQOBJECT(menu), "actionDeleteContact" )->plug( menu );
+ KopeteStdAction::deleteContact( this, TQT_SLOT( slotDelete() ), menu, "actionDeleteContact" )->plug( menu );
return menu;
}
diff --git a/kopete/libkopete/ui/kopetepasswordwidget.cpp b/kopete/libkopete/ui/kopetepasswordwidget.cpp
index da41a35f..10f6117f 100644
--- a/kopete/libkopete/ui/kopetepasswordwidget.cpp
+++ b/kopete/libkopete/ui/kopetepasswordwidget.cpp
@@ -49,7 +49,7 @@ void Kopete::UI::PasswordWidget::load( Kopete::Password *source )
{
mRemembered->setTristate();
mRemembered->setNoChange();
- source->requestWithoutPrompt( TQT_TQOBJECT(this), TQT_SLOT( receivePassword( const TQString & ) ) );
+ source->requestWithoutPrompt( this, TQT_SLOT( receivePassword( const TQString & ) ) );
}
else
{
diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp
index c5ef4fa5..def0bd40 100644
--- a/kopete/plugins/cryptography/popuppublic.cpp
+++ b/kopete/plugins/cryptography/popuppublic.cpp
@@ -144,7 +144,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
boutonboxoptions=new TQButtonGroup(5,TQt::Vertical ,page,0);
TDEActionCollection *actcol=new TDEActionCollection(this);
- (void) new TDEAction(i18n("&Go to Default Key"),goDefaultKey, TQT_TQOBJECT(this), TQT_SLOT(slotGotoDefaultKey()),actcol,"go_default_key");
+ (void) new TDEAction(i18n("&Go to Default Key"),goDefaultKey, this, TQT_SLOT(slotGotoDefaultKey()),actcol,"go_default_key");
CBarmor=new TQCheckBox(i18n("ASCII armored encryption"),boutonboxoptions);
diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp
index 7a4e1795..01bff360 100644
--- a/kopete/plugins/history/historydialog.cpp
+++ b/kopete/plugins/history/historydialog.cpp
@@ -174,8 +174,8 @@ HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent,
//initActions
TDEActionCollection* ac = new TDEActionCollection(this);
- mCopyAct = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), ac );
- mCopyURLAct = new TDEAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "edit-copy" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL() ), ac );
+ mCopyAct = KStdAction::copy( this, TQT_SLOT(slotCopy()), ac );
+ mCopyURLAct = new TDEAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "edit-copy" ), 0, this, TQT_SLOT( slotCopyURL() ), ac );
resize(650, 700);
centerOnScreen(this);
@@ -196,7 +196,7 @@ void HistoryDialog::init()
{
if(mMetaContact)
{
- HistoryLogger logger(mMetaContact, TQT_TQOBJECT(this));
+ HistoryLogger logger(mMetaContact, this);
init(mMetaContact);
}
else
@@ -204,7 +204,7 @@ void HistoryDialog::init()
TQPtrListIterator<Kopete::MetaContact> it(mMetaContactList);
for(; it.current(); ++it)
{
- HistoryLogger logger(*it, TQT_TQOBJECT(this));
+ HistoryLogger logger(*it, this);
init(*it);
}
@@ -226,7 +226,7 @@ void HistoryDialog::slotLoadDays()
DMPair pair(mInit.dateMCList.first());
mInit.dateMCList.pop_front();
- HistoryLogger logger(pair.metaContact(), TQT_TQOBJECT(this));
+ HistoryLogger logger(pair.metaContact(), this);
TQValueList<int> dayList = logger.getDaysForMonth(pair.date());
for (unsigned int i=0; i<dayList.count(); i++)
{
@@ -325,7 +325,7 @@ void HistoryDialog::dateSelected(TQListViewItem* it)
TQDate chosenDate = item->date();
- HistoryLogger logger(item->metaContact(), TQT_TQOBJECT(this));
+ HistoryLogger logger(item->metaContact(), this);
TQValueList<Kopete::Message> msgs=logger.readMessages(chosenDate);
setMessages(msgs);
diff --git a/kopete/plugins/webpresence/webpresencepreferences.cpp b/kopete/plugins/webpresence/webpresencepreferences.cpp
index 849d736d..209bc0bc 100644
--- a/kopete/plugins/webpresence/webpresencepreferences.cpp
+++ b/kopete/plugins/webpresence/webpresencepreferences.cpp
@@ -37,7 +37,7 @@ WebPresencePreferences::WebPresencePreferences(TQWidget *parent, const char* /*n
preferencesDialog->formatStylesheetURL->setFilter( "*.xsl" );
// KAutoConfig stuff
- kautoconfig = new KAutoConfig(TDEGlobal::config(), TQT_TQOBJECT(this), "kautoconfig");
+ kautoconfig = new KAutoConfig(TDEGlobal::config(), this, "kautoconfig");
connect(kautoconfig, TQT_SIGNAL(widgetModified()), TQT_SLOT(widgetModified()));
connect(kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(widgetModified()));
kautoconfig->addWidget(preferencesDialog, "Web Presence Plugin");
diff --git a/kopete/protocols/gadu/gaduregisteraccount.cpp b/kopete/protocols/gadu/gaduregisteraccount.cpp
index dd143de4..497f58b0 100644
--- a/kopete/protocols/gadu/gaduregisteraccount.cpp
+++ b/kopete/protocols/gadu/gaduregisteraccount.cpp
@@ -45,7 +45,7 @@ GaduRegisterAccount::GaduRegisterAccount( TQWidget* parent, const char* name )
setButtonText( Ok, i18n( "&Cancel" ) );
enableButton( User1, false );
- cRegister = new RegisterCommand( TQT_TQOBJECT(this) );
+ cRegister = new RegisterCommand( this );
emailRegexp = new TQRegExp( "[\\w\\d.+_-]{1,}@[\\w\\d.-]{1,}" );
hintPixmap = TDEGlobal::iconLoader()->loadIcon ( "gadu_protocol", TDEIcon::Small );
diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp
index 15eba5dc..6229a294 100644
--- a/kopete/protocols/irc/ircprotocol.cpp
+++ b/kopete/protocols/irc/ircprotocol.cpp
@@ -770,7 +770,7 @@ void IRCProtocol::editNetworks( const TQString &networkName )
if( !netConf )
{
netConf = new NetworkConfig( Kopete::UI::Global::mainWidget(), "network_config", true );
- netConf->host->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[\\w-\\.]*$"), TQT_TQOBJECT(netConf) ) );
+ netConf->host->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[\\w-\\.]*$"), netConf ) );
netConf->upButton->setIconSet( SmallIconSet( "go-up" ) );
netConf->downButton->setIconSet( SmallIconSet( "go-down" ) );
diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp
index 854eff97..2304bcd5 100644
--- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp
+++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp
@@ -91,9 +91,9 @@ IRCEditAccountWidget::IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *ident
new TQListViewItem( ctcpList, it.key(), it.data() );
}
- mUserName->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[^\\s]*$"), TQT_TQOBJECT(mUserName) ) );
- mNickName->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[^#+&][^\\s]*$"), TQT_TQOBJECT(mNickName) ) );
- mAltNickname->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[^#+&][^\\s]*$"), TQT_TQOBJECT(mAltNickname) ) );
+ mUserName->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[^\\s]*$"), mUserName ) );
+ mNickName->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[^#+&][^\\s]*$"), mNickName ) );
+ mAltNickname->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[^#+&][^\\s]*$"), mAltNickname ) );
charset->insertStringList( KCodecAction::supportedEncodings() );
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp
index 1309ec01..cabd62b3 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp
@@ -88,7 +88,7 @@ void BSocket::reset(bool clear)
appendRead(block);
}
- d->sd.deleteLater(TQT_TQOBJECT(d->qsock));
+ d->sd.deleteLater(d->qsock);
d->qsock = 0;
}
else {
diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
index 3947de3e..37cc1dd8 100644
--- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp
+++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
@@ -76,7 +76,7 @@ MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account
d->ui = new MSNEditAccountUI( this );
- d->autoConfig = new KAutoConfig( TQT_TQOBJECT(d->ui) );
+ d->autoConfig = new KAutoConfig( d->ui );
d->autoConfig->addWidget( d->ui->global_settings_page, "MSN" );
d->autoConfig->addWidget( d->ui->privacy_page, "MSN" );
//the JabberAccount need to be saved as text, and can't be handled by kautoconfig
diff --git a/kpf/src/ActiveMonitorWindow.cpp b/kpf/src/ActiveMonitorWindow.cpp
index f0cb82a4..ac7fbe31 100644
--- a/kpf/src/ActiveMonitorWindow.cpp
+++ b/kpf/src/ActiveMonitorWindow.cpp
@@ -51,7 +51,7 @@ namespace KPF
i18n("&Cancel Selected Transfers"),
"process-stop",
0,
- TQT_TQOBJECT(monitor_),
+ monitor_,
TQT_SLOT(slotKillSelected()),
actionCollection(),
"kill"
diff --git a/kpf/src/DirSelectWidget.cpp b/kpf/src/DirSelectWidget.cpp
index 9ea47b30..3b6acdd5 100644
--- a/kpf/src/DirSelectWidget.cpp
+++ b/kpf/src/DirSelectWidget.cpp
@@ -71,7 +71,7 @@ namespace KPF
void
DirSelectWidget::timerEvent(TQTimerEvent *)
{
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
if (0 != firstChild())
firstChild()->setOpen(true);
diff --git a/kppp/connect.cpp b/kppp/connect.cpp
index eba8da1e..4e494ea1 100644
--- a/kppp/connect.cpp
+++ b/kppp/connect.cpp
@@ -259,7 +259,7 @@ void ConnectWidget::init() {
semaphore = false;
Modem::modem->stop();
- Modem::modem->notify(TQT_TQOBJECT(this), TQT_SLOT(readChar(unsigned char)));
+ Modem::modem->notify(this, TQT_SLOT(readChar(unsigned char)));
// if we are stuck anywhere we will time out
timeout_timer->start(gpppdata.modemTimeout()*1000);
diff --git a/kppp/kpppwidget.cpp b/kppp/kpppwidget.cpp
index 4597540f..3599145a 100644
--- a/kppp/kpppwidget.cpp
+++ b/kppp/kpppwidget.cpp
@@ -912,7 +912,7 @@ void KPPPWidget::startAccounting() {
TQString d = AccountingBase::getAccountingFile(gpppdata.accountingFile());
// if(::access(d.data(), X_OK) != 0)
- acct = new Accounting(TQT_TQOBJECT(this), stats);
+ acct = new Accounting(this, stats);
// else
// acct = new ExecutableAccounting(this);
diff --git a/kppp/loginterm.cpp b/kppp/loginterm.cpp
index badf77df..a663e9b2 100644
--- a/kppp/loginterm.cpp
+++ b/kppp/loginterm.cpp
@@ -136,7 +136,7 @@ LoginTerm::LoginTerm (TQWidget *parent, const char *name)
cont = false;
- Modem::modem->notify(TQT_TQOBJECT(text_window), TQT_SLOT(readChar(unsigned char)));
+ Modem::modem->notify(text_window, TQT_SLOT(readChar(unsigned char)));
}
diff --git a/kppp/miniterm.cpp b/kppp/miniterm.cpp
index 336076c8..55f526fd 100644
--- a/kppp/miniterm.cpp
+++ b/kppp/miniterm.cpp
@@ -103,15 +103,15 @@ void MiniTerm::setupToolbar() {
toolbar = new TDEToolBar( this );
toolbar->insertButton("system-log-out", 0,
- TQT_SIGNAL(clicked()), TQT_TQOBJECT(this),
+ TQT_SIGNAL(clicked()), this,
TQT_SLOT(cancelbutton()), TRUE, i18n("Close MiniTerm"));
toolbar->insertButton("back", 0,
- TQT_SIGNAL(clicked()), TQT_TQOBJECT(this),
+ TQT_SIGNAL(clicked()), this,
TQT_SLOT(resetModem()), TRUE, i18n("Reset Modem"));
toolbar->insertButton("help", 0,
- TQT_SIGNAL(clicked()), TQT_TQOBJECT(this),
+ TQT_SIGNAL(clicked()), this,
TQT_SLOT(help()), TRUE, i18n("Help"));
toolbar->setBarPos( TDEToolBar::Top );
@@ -154,7 +154,7 @@ void MiniTerm::init() {
kapp->processEvents();
kapp->processEvents();
- Modem::modem->notify(TQT_TQOBJECT(this), TQT_SLOT(readChar(unsigned char)));
+ Modem::modem->notify(this, TQT_SLOT(readChar(unsigned char)));
return;
}
}
diff --git a/kppp/modeminfo.cpp b/kppp/modeminfo.cpp
index b91fe671..75a6c00a 100644
--- a/kppp/modeminfo.cpp
+++ b/kppp/modeminfo.cpp
@@ -151,7 +151,7 @@ void ModemTransfer::init() {
// clear modem buffer
Modem::modem->flush();
- Modem::modem->notify(TQT_TQOBJECT(this), TQT_SLOT(readChar(unsigned char)));
+ Modem::modem->notify(this, TQT_SLOT(readChar(unsigned char)));
return;
}
}
diff --git a/krdc/krdc.cpp b/krdc/krdc.cpp
index 31e90d55..0c82cdf1 100644
--- a/krdc/krdc.cpp
+++ b/krdc/krdc.cpp
@@ -490,14 +490,14 @@ void KRDC::switchToFullscreen(bool scaling)
pinButton->setIconSet(pinIconSet);
TQToolTip::add(pinButton, i18n("Autohide on/off"));
t->setToggle(FS_AUTOHIDE_ID);
- t->addConnection(FS_AUTOHIDE_ID, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(setFsToolbarAutoHide(bool)));
+ t->addConnection(FS_AUTOHIDE_ID, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setFsToolbarAutoHide(bool)));
t->insertButton("view-restore", FS_FULLSCREEN_ID);
TDEToolBarButton *fullscreenButton = t->getButton(FS_FULLSCREEN_ID);
TQToolTip::add(fullscreenButton, i18n("Fullscreen"));
t->setToggle(FS_FULLSCREEN_ID);
t->setButton(FS_FULLSCREEN_ID, true);
- t->addConnection(FS_FULLSCREEN_ID, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(enableFullscreen(bool)));
+ t->addConnection(FS_FULLSCREEN_ID, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(enableFullscreen(bool)));
m_popup = createPopupMenu(t);
t->insertButton("configure", FS_ADVANCED_ID, m_popup, true, i18n("Advanced options"));
@@ -517,18 +517,18 @@ void KRDC::switchToFullscreen(bool scaling)
TQToolTip::add(scaleButton, i18n("Scale view"));
t->setToggle(FS_SCALE_ID);
t->setButton(FS_SCALE_ID, scaling);
- t->addConnection(FS_SCALE_ID, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(switchToFullscreen(bool)));
+ t->addConnection(FS_SCALE_ID, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(switchToFullscreen(bool)));
}
t->insertButton("iconify", FS_ICONIFY_ID);
TDEToolBarButton *iconifyButton = t->getButton(FS_ICONIFY_ID);
TQToolTip::add(iconifyButton, i18n("Minimize"));
- t->addConnection(FS_ICONIFY_ID, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(iconify()));
+ t->addConnection(FS_ICONIFY_ID, TQT_SIGNAL(clicked()), this, TQT_SLOT(iconify()));
t->insertButton("close", FS_CLOSE_ID);
TDEToolBarButton *closeButton = t->getButton(FS_CLOSE_ID);
TQToolTip::add(closeButton, i18n("Close"));
- t->addConnection(FS_CLOSE_ID, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(quit()));
+ t->addConnection(FS_CLOSE_ID, TQT_SIGNAL(clicked()), this, TQT_SLOT(quit()));
m_fsToolbar->setChild(t);
@@ -598,7 +598,7 @@ void KRDC::switchToNormal(bool scaling)
TQWhatsThis::add(fullscreenButton, i18n("Switches to full screen. If the remote desktop has a different screen resolution, Remote Desktop Connection will automatically switch to the nearest resolution."));
t->setToggle(0);
t->setButton(0, false);
- t->addConnection(0, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(enableFullscreen(bool)));
+ t->addConnection(0, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(enableFullscreen(bool)));
if (m_view->supportsScaling()) {
t->insertButton("zoom-fit-best", 1, true, i18n("Scale"));
@@ -607,14 +607,14 @@ void KRDC::switchToNormal(bool scaling)
TQWhatsThis::add(scaleButton, i18n("This option scales the remote screen to fit your window size."));
t->setToggle(1);
t->setButton(1, scaling);
- t->addConnection(1, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(switchToNormal(bool)));
+ t->addConnection(1, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(switchToNormal(bool)));
}
t->insertButton("key_enter", 2, true, i18n("Special Keys"));
TDEToolBarButton *skButton = t->getButton(2);
TQToolTip::add(skButton, i18n("Enter special keys."));
TQWhatsThis::add(skButton, i18n("This option allows you to send special key combinations like Ctrl-Alt-Del to the remote host."));
- t->addConnection(2, TQT_SIGNAL(clicked()), TQT_TQOBJECT(m_keyCaptureDialog), TQT_SLOT(execute()));
+ t->addConnection(2, TQT_SIGNAL(clicked()), m_keyCaptureDialog, TQT_SLOT(execute()));
if (m_popup) {
m_popup->deleteLater();
@@ -749,7 +749,7 @@ void KRDC::setSize(int w, int h)
{
int dw, dh;
- TQWidget *desktop = TQT_TQWIDGET(TQApplication::desktop());
+ TQWidget *desktop = TQApplication::desktop();
dw = desktop->width();
dh = desktop->height();
diff --git a/krdc/rdp/krdpview.cpp b/krdc/rdp/krdpview.cpp
index 4494fcfd..057c6fe6 100644
--- a/krdc/rdp/krdpview.cpp
+++ b/krdc/rdp/krdpview.cpp
@@ -209,7 +209,7 @@ bool KRdpView::start()
SmartPtr<RdpHostPref> hp, rdpDefaults;
bool useTDEWallet = false;
- TQWidget *desktop = TQT_TQWIDGET(TQApplication::desktop());
+ TQWidget *desktop = TQApplication::desktop();
if(!rdpAppDataConfigured)
{
@@ -228,7 +228,7 @@ bool KRdpView::start()
m_container->show();
- m_process = new TDEProcess(TQT_TQOBJECT(m_container));
+ m_process = new TDEProcess(m_container);
*m_process << "rdesktop";
// Check for fullscreen mode
if ((hp->width() == 0) && (hp->height() == 0)) {
diff --git a/krfb/krfb/trayicon.cpp b/krfb/krfb/trayicon.cpp
index 7464fd03..92d0d494 100644
--- a/krfb/krfb/trayicon.cpp
+++ b/krfb/krfb/trayicon.cpp
@@ -61,7 +61,7 @@ TrayIcon::TrayIcon(KDialog *d, Configuration *c) :
TQToolTip::add(this, i18n("Desktop Sharing - connecting"));
manageInvitationsAction = new TDEAction(i18n("Manage &Invitations"), TQString(),
- 0, TQT_TQOBJECT(this), TQT_SIGNAL(showManageInvitations()),
+ 0, this, TQT_SIGNAL(showManageInvitations()),
&actionCollection);
manageInvitationsAction->plug(contextMenu());
@@ -75,7 +75,7 @@ TrayIcon::TrayIcon(KDialog *d, Configuration *c) :
contextMenu()->insertSeparator();
- aboutAction = KStdAction::aboutApp(TQT_TQOBJECT(this), TQT_SLOT(showAbout()), &actionCollection);
+ aboutAction = KStdAction::aboutApp(this, TQT_SLOT(showAbout()), &actionCollection);
aboutAction->plug(contextMenu());
show();
diff --git a/ksirc/KSTicker/ksticker.cpp b/ksirc/KSTicker/ksticker.cpp
index a94d281e..8e81ae1d 100644
--- a/ksirc/KSTicker/ksticker.cpp
+++ b/ksirc/KSTicker/ksticker.cpp
@@ -90,7 +90,7 @@ KSTicker::KSTicker(TQWidget * parent, const char * name, WFlags f)
KSTicker::~KSTicker()
{
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
delete pic;
}
@@ -115,14 +115,14 @@ void KSTicker::show()
void KSTicker::hide()
{
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
TQFrame::hide();
}
void KSTicker::iconify()
{
TQFrame::showMinimized();
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
}
void KSTicker::setString(TQString str)
@@ -376,7 +376,7 @@ void KSTicker::resizeEvent( TQResizeEvent *e)
TQFrame::resizeEvent(e);
onechar = fontMetrics().width("X");
chars = this->width() / onechar;
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
TQPixmap *new_pic = new TQPixmap(width() + onechar, height());
new_pic->fill(backgroundColor());
bitBlt(new_pic,
@@ -393,19 +393,19 @@ void KSTicker::resizeEvent( TQResizeEvent *e)
void KSTicker::closeEvent( TQCloseEvent *)
{
emit closing();
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
// delete this;
}
void KSTicker::startTicker()
{
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
startTimer(tickRate);
}
void KSTicker::stopTicker()
{
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
}
void KSTicker::mouseDoubleClickEvent( TQMouseEvent * )
diff --git a/ksirc/dccNew.cpp b/ksirc/dccNew.cpp
index b0e065c5..fe30011d 100644
--- a/ksirc/dccNew.cpp
+++ b/ksirc/dccNew.cpp
@@ -47,7 +47,7 @@ dccNew::dccNew( TQWidget *parent, const char *name, int type, TQString nick )
TQString name = (*it).section("::", 1);
kdDebug(5008) << "Looking at: " << *it << "/" << name << endl;
- aListBox *a = static_cast<aListBox *>(TQT_TQWIDGET(objFinder::find(name.latin1(), "aListBox")));
+ aListBox *a = static_cast<aListBox *>(objFinder::find(name.latin1(), "aListBox"));
if(a){
TQListBoxItem *i;
for(i = a->firstItem(); i != 0x0; i = i->next()){
diff --git a/ksirc/dccToplevel.cpp b/ksirc/dccToplevel.cpp
index d251c3cf..4e6e9353 100644
--- a/ksirc/dccToplevel.cpp
+++ b/ksirc/dccToplevel.cpp
@@ -18,14 +18,14 @@ extern DisplayMgr *displayMgr;
dccTopLevel::dccTopLevel(TQWidget *parent, const char *name)
: TDEMainWindow(parent, name, TQt::WDestructiveClose)
{
- m_mgr = new dccManager(this, TQCString(TQT_TQOBJECT(this)->name()) + "_dccManager");
+ m_mgr = new dccManager(this, TQCString(this->name()) + "_dccManager");
// m_mgr->show();
setCentralWidget(m_mgr);
connect(m_mgr, TQT_SIGNAL(changed(bool, TQString)), this, TQT_SIGNAL(changed(bool, TQString)));
- TQPopupMenu *win = new TQPopupMenu(this, TQCString(TQT_TQOBJECT(this)->name()) + "_popup_window");
- TDEAction *act = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
+ TQPopupMenu *win = new TQPopupMenu(this, TQCString(this->name()) + "_popup_window");
+ TDEAction *act = KStdAction::close(this, TQT_SLOT( close() ), actionCollection() );
act->plug(win);
menuBar()->insertItem(i18n("&File"), win, DTL_WINDOW_ID, -1);
diff --git a/ksirc/displayMgrMDI.cpp b/ksirc/displayMgrMDI.cpp
index d6c4f923..9dbbc981 100644
--- a/ksirc/displayMgrMDI.cpp
+++ b/ksirc/displayMgrMDI.cpp
@@ -183,7 +183,7 @@ void DisplayMgrMDI::reparentReq()
if(o == NULL){
kdDebug(5008) << "Kapp says no widget has focus!" << endl;
- o = TQT_TQWIDGET(kapp->activeWindow());
+ o = kapp->activeWindow();
if(o->inherits("TDEMainWindow") == false)
return;
diff --git a/ksirc/dockservercontroller.cpp b/ksirc/dockservercontroller.cpp
index 1766a824..be5bb6bc 100644
--- a/ksirc/dockservercontroller.cpp
+++ b/ksirc/dockservercontroller.cpp
@@ -72,9 +72,9 @@ dockServerController::dockServerController(servercontroller *sc, TQWidget *paren
pop->insertItem(SmallIcon( "filter" ), i18n("&Filter Rule Editor..."),
m_sc, TQT_SLOT(filter_rule_editor()));
- KStdAction::preferences(TQT_TQOBJECT(m_sc), TQT_SLOT(general_prefs()),
+ KStdAction::preferences(m_sc, TQT_SLOT(general_prefs()),
m_sc->actionCollection())->plug(pop);
- KStdAction::configureNotifications(TQT_TQOBJECT(m_sc), TQT_SLOT(notification_prefs()), actionCollection())->plug(pop);
+ KStdAction::configureNotifications(m_sc, TQT_SLOT(notification_prefs()), actionCollection())->plug(pop);
pop->insertSeparator();
pop->insertItem(i18n("New &Server..."),
@@ -106,14 +106,14 @@ dockServerController::dockServerController(servercontroller *sc, TQWidget *paren
->insert("Raise Last Window", i18n("Raise Last Window"),
i18n("If someone said your nick in a window, this action "
"will make that window active for you."),
- ALT+CTRL+Key_A, KKey::QtWIN+CTRL+Key_A, TQT_TQOBJECT(this),
+ ALT+CTRL+Key_A, KKey::QtWIN+CTRL+Key_A, this,
TQT_SLOT(raiseLastActiveWindow()));
servercontroller::self()
->getGlobalAccel()
->insert("Clear Blink", i18n("Clear Blinking Dock Icon"),
i18n("If the dock icon is blinking, but you don't want "
"to go to the window this will clear the blinking."),
- ALT+CTRL+Key_Down, KKey::QtWIN+CTRL+Key_Down, TQT_TQOBJECT(this),
+ ALT+CTRL+Key_Down, KKey::QtWIN+CTRL+Key_Down, this,
TQT_SLOT(blinkClear()));
// mainPop = new TDEPopupMenu(this, "dockServerController_main_pop");
diff --git a/ksirc/objFinder.cpp b/ksirc/objFinder.cpp
index 4c986e49..993fd743 100644
--- a/ksirc/objFinder.cpp
+++ b/ksirc/objFinder.cpp
@@ -76,7 +76,7 @@ TQObject *objFinder::find(const char *name, const char *inherits){
++itW;
continue;
}
- found = TQT_TQOBJECT(itW.current());
+ found = itW.current();
delete all;
return found;
}
diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp
index d47791e6..273fd6ef 100644
--- a/ksirc/servercontroller.cpp
+++ b/ksirc/servercontroller.cpp
@@ -151,7 +151,7 @@ servercontroller::servercontroller( TQWidget*, const char* name )
setFrameBorderWidth(5);
TQPopupMenu *file = new TQPopupMenu(this, TQCString(name) + "_menu_file");
- KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(endksirc()), actionCollection())->plug(file);
+ KStdAction::quit(this, TQT_SLOT(endksirc()), actionCollection())->plug(file);
#ifndef NDEBUG
file->insertItem(i18n("Dump Object Tree"), this, TQT_SLOT(dump_obj()));
file->insertItem(i18n("Server Debug Window"), this, TQT_SLOT(server_debug()));
@@ -173,21 +173,21 @@ servercontroller::servercontroller( TQWidget*, const char* name )
options->insertItem(SmallIcon( "filter" ), i18n("&Filter Rule Editor..."),
this, TQT_SLOT(filter_rule_editor()));
options->insertSeparator();
- KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(notification_prefs()), actionCollection())->plug(options);
+ KStdAction::configureNotifications(this, TQT_SLOT(notification_prefs()), actionCollection())->plug(options);
- KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(general_prefs()), actionCollection())->plug(options);
+ KStdAction::preferences(this, TQT_SLOT(general_prefs()), actionCollection())->plug(options);
MenuBar->insertItem(i18n("&Settings"), options);
KHelpMenu *help = new KHelpMenu( this, kapp->aboutData() );
MenuBar->insertItem( KStdGuiItem::help().text(), help->menu() );
- m_kga = new TDEGlobalAccel(TQT_TQOBJECT(this), "globalAccess");
+ m_kga = new TDEGlobalAccel(this, "globalAccess");
m_kga->insert("New Server", i18n("New Server"),
i18n("This action allows you to open a new server more easily "
"when in docked mode, since you don't need to click on the "
"dock icon."),
- ALT+CTRL+Key_C, KKey::QtWIN+CTRL+Key_C, TQT_TQOBJECT(this),
+ ALT+CTRL+Key_C, KKey::QtWIN+CTRL+Key_C, this,
TQT_SLOT(new_connection()));
open_toplevels = 0;
diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp
index beb96799..840987f9 100644
--- a/ksirc/toplevel.cpp
+++ b/ksirc/toplevel.cpp
@@ -121,7 +121,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf
m_topic = TQString();
- TQCString kstl_name = TQCString(TQT_TQOBJECT(this)->name()) + "_" + "toplevel";
+ TQCString kstl_name = TQCString(this->name()) + "_" + "toplevel";
setName(kstl_name);
if(!m_channelInfo.channel().isEmpty()) {
@@ -152,10 +152,10 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf
connect(selector, TQT_SIGNAL(clicked()), this, TQT_SLOT(insertText()));
selector->setFont(ksopts->defaultFont.family());
- file = new TQPopupMenu(this, TQCString(TQT_TQOBJECT(this)->name()) + "_popup_file");
+ file = new TQPopupMenu(this, TQCString(this->name()) + "_popup_file");
file->setCheckable(true);
- TDEAction *act = KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT( newWindow() ), actionCollection() );
+ TDEAction *act = KStdAction::openNew( this, TQT_SLOT( newWindow() ), actionCollection() );
act->plug( file );
file->insertItem(i18n("New Ser&ver..."), servercontroller::self(), TQT_SLOT(new_connection()), Key_F2);
file->insertSeparator();
@@ -172,7 +172,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf
beepitem = file->insertItem(i18n("N&otify on Change"), this, TQT_SLOT(toggleBeep()), CTRL + Key_P);
file->setItemChecked(beepitem, ksopts->chan(m_channelInfo).beepOnMsg);
- encodingAction = new TDESelectAction( i18n( "&Encoding" ), 0, TQT_TQOBJECT(this) );
+ encodingAction = new TDESelectAction( i18n( "&Encoding" ), 0, this );
connect( encodingAction, TQT_SIGNAL( activated() ), this, TQT_SLOT( setEncoding() ) );
TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames();
@@ -208,7 +208,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf
setEncoding();
file->insertSeparator();
- act = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( terminate() ), actionCollection() );
+ act = KStdAction::close( this, TQT_SLOT( terminate() ), actionCollection() );
act->plug( file );
kmenu = menuBar();
@@ -234,7 +234,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf
connect( ksTopic, TQT_SIGNAL( topicChange( const TQString & ) ),
this, TQT_SLOT( setTopicIntern( const TQString & ) ) );
- TQCString kstn = TQCString(TQT_TQOBJECT(this)->name()) + "_";
+ TQCString kstn = TQCString(this->name()) + "_";
pan = new TQSplitter(TQt::Horizontal, top, kstn + "splitter");
#if KDE_IS_VERSION(3,1,92)
@@ -312,9 +312,9 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf
mainw->enableTimeStamps(ksopts->chan(m_channelInfo).timeStamp);
edit = new TQPopupMenu(this);
- act = KStdAction::copy( TQT_TQOBJECT(mainw), TQT_SLOT( copy() ), actionCollection() );
+ act = KStdAction::copy( mainw, TQT_SLOT( copy() ), actionCollection() );
act->plug( edit );
- act = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( pasteToWindow() ), actionCollection() );
+ act = KStdAction::paste( this, TQT_SLOT( pasteToWindow() ), actionCollection() );
act->plug( edit );
edit->insertItem(i18n("C&lear Window"), this, TQT_SLOT(clearWindow()), CTRL + Key_L);
kmenu->insertItem(i18n("&Edit"), edit, -1, -1);
@@ -1285,9 +1285,9 @@ void KSircTopLevel::control_message(int command, TQString str)
logFile->open();
}
setName(m_channelInfo.server().utf8() + "_" + m_channelInfo.channel().utf8() + "_" + "toplevel");
- pan->setName(TQCString(TQT_TQOBJECT(this)->name()) + "_" + "TQSplitter");
- kmenu->setName(TQCString(TQT_TQOBJECT(this)->name()) + "_tdetoolframe");
- linee->setName(TQCString(TQT_TQOBJECT(this)->name()) + "_" + "LineEnter");
+ pan->setName(TQCString(this->name()) + "_" + "TQSplitter");
+ kmenu->setName(TQCString(this->name()) + "_tdetoolframe");
+ linee->setName(TQCString(this->name()) + "_" + "LineEnter");
kmenu->show();
setCaption(m_channelInfo.channel());
emit currentWindow(this);
diff --git a/ktalkd/ktalkdlg/ktalkdlg.cpp b/ktalkd/ktalkdlg/ktalkdlg.cpp
index 1fbf43b9..a4904638 100644
--- a/ktalkd/ktalkdlg/ktalkdlg.cpp
+++ b/ktalkd/ktalkdlg/ktalkdlg.cpp
@@ -54,10 +54,10 @@ class TimeoutDialog : public TQMessageBox {
{startTimer (timeout_ms);}
~TimeoutDialog ()
- {TQT_TQOBJECT(this)->killTimers ();}
+ {this->killTimers ();}
virtual void timerEvent (TQTimerEvent *)
- {TQT_TQOBJECT(this)->killTimers (); done (Rejected);}
+ {this->killTimers (); done (Rejected);}
};
static TDECmdLineOptions option[] =
@@ -135,7 +135,7 @@ int main (int argc, char **argv)
int result = dialog.exec ();
if (result == TQMessageBox::Yes) {
- TQT_TQOBJECT(&dialog)->killTimers ();
+ dialog.killTimers ();
kdDebug() << "Running talk client..." << endl;
TQString konsole = locate("exe", "konsole");
diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp
index 1c3bc57e..8a7a4d0d 100644
--- a/wifi/kwifimanager.cpp
+++ b/wifi/kwifimanager.cpp
@@ -304,43 +304,43 @@ KWiFiManagerApp::initActions ()
TDEConfig* config = kapp->config();
if (config->hasGroup("General"))
config->setGroup("General");
- fileDisableRadio = new TDEToggleAction (i18n ("&Disable Radio"), 0, TQT_TQOBJECT(this),
+ fileDisableRadio = new TDEToggleAction (i18n ("&Disable Radio"), 0, this,
TQT_SLOT (slotDisableRadio ()), actionCollection (), "disable_radio");
fileDisableRadio->setChecked( false );
settingsUseAlternateCalc =
- new TDEToggleAction (i18n ("&Use Alternate Strength Calculation"), 0, TQT_TQOBJECT(this),
+ new TDEToggleAction (i18n ("&Use Alternate Strength Calculation"), 0, this,
TQT_SLOT (slotToggleStrengthCalc ()), actionCollection (), "use_alt_calculation");
settingsUseAlternateCalc->setChecked( config->readBoolEntry("useAlternateStrengthCalculation") );
slotToggleStrengthCalc(); //set to value saved by TDEConfig
settingsShowStatsNoise =
- new TDEToggleAction (i18n ("Show &Noise Graph in Statistics Window"), 0, TQT_TQOBJECT(this),
+ new TDEToggleAction (i18n ("Show &Noise Graph in Statistics Window"), 0, this,
TQT_SLOT (slotShowStatsNoise ()), actionCollection (), "show_stats_noise");
settingsShowStatsNoise->setChecked( config->readBoolEntry("showStatsNoise") );
slotShowStatsNoise(); //set to value saved by TDEConfig
- settingsShowStrengthNumber = new TDEToggleAction (i18n ("&Show Strength Number in System Tray"), 0, TQT_TQOBJECT(this),
+ settingsShowStrengthNumber = new TDEToggleAction (i18n ("&Show Strength Number in System Tray"), 0, this,
TQT_SLOT (slotToggleShowStrengthNumber ()), actionCollection (), "show_strength_number_in_tray");
settingsShowStrengthNumber->setChecked( config->readBoolEntry("showStrengthNumberInTray") );
slotToggleShowStrengthNumber (); //set to value saved by TDEConfig
- KStdAction::quit (TQT_TQOBJECT(this), TQT_SLOT (slotFileQuit ()), actionCollection ());
+ KStdAction::quit (this, TQT_SLOT (slotFileQuit ()), actionCollection ());
- new TDEAction (i18n ("Configuration &Editor..."), 0, TQT_TQOBJECT(this),
+ new TDEAction (i18n ("Configuration &Editor..."), 0, this,
TQT_SLOT (slotStartConfigEditor ()), actionCollection (), "configuration_editor");
- new TDEAction (i18n ("Connection &Statistics"), 0, TQT_TQOBJECT(this),
+ new TDEAction (i18n ("Connection &Statistics"), 0, this,
TQT_SLOT (slotStartStatViewer ()), actionCollection (), "connection_statistics");
- settingsAcousticScanning = new TDEToggleAction (i18n ("&Acoustic Scanning"), 0, TQT_TQOBJECT(this),
+ settingsAcousticScanning = new TDEToggleAction (i18n ("&Acoustic Scanning"), 0, this,
TQT_SLOT (slotToggleTric ()),
actionCollection (), "acoustic_scanning");
settingsAcousticScanning->setChecked( config->readBoolEntry("acousticScanning") );
#ifdef WITHOUT_ARTS
settingsAcousticScanning->setEnabled( false);
#endif
- settingsStayInSystrayOnClose = new TDEToggleAction (i18n ("Stay in System &Tray on Close"), 0, TQT_TQOBJECT(this),
+ settingsStayInSystrayOnClose = new TDEToggleAction (i18n ("Stay in System &Tray on Close"), 0, this,
TQT_SLOT (slotToggleStayInSystray()),
actionCollection (), "stay_in_systray_on_close");
settingsStayInSystrayOnClose->setChecked( config->readBoolEntry("stayInSystrayOnClose") );