summaryrefslogtreecommitdiffstats
path: root/ksirc
diff options
context:
space:
mode:
Diffstat (limited to 'ksirc')
-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
8 files changed, 33 insertions, 33 deletions
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);
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-28 21:27:54 +0000