diff options
Diffstat (limited to 'ksirc/dockservercontroller.cpp')
-rw-r--r-- | ksirc/dockservercontroller.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/ksirc/dockservercontroller.cpp b/ksirc/dockservercontroller.cpp index 6053e5ab..cdb3d2ae 100644 --- a/ksirc/dockservercontroller.cpp +++ b/ksirc/dockservercontroller.cpp @@ -53,8 +53,8 @@ dscNickInfo::~dscNickInfo() } -dockServerController::dockServerController(servercontroller *sc, TQWidget *parent, const char *_name) -: KSystemTray(parent, _name), +dockServerController::dockServerController(servercontroller *sc, TQWidget *tqparent, const char *_name) +: KSystemTray(tqparent, _name), m_sc(sc) { @@ -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(m_sc, TQT_SLOT(general_prefs()), + KStdAction::preferences(TQT_TQOBJECT(m_sc), TQT_SLOT(general_prefs()), m_sc->actionCollection())->plug(pop); - KStdAction::configureNotifications(m_sc, TQT_SLOT(notification_prefs()), actionCollection())->plug(pop); + KStdAction::configureNotifications(TQT_TQOBJECT(m_sc), TQT_SLOT(notification_prefs()), actionCollection())->plug(pop); pop->insertSeparator(); pop->insertItem(i18n("New &Server..."), @@ -98,7 +98,7 @@ dockServerController::dockServerController(servercontroller *sc, TQWidget *paren m_blinkTimer = new TQTimer( this ); connect( m_blinkTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT( blinkDockedIcon() ) ); - m_blinkStatus = false; + m_blinktqStatus = false; m_blinkActive = false; servercontroller::self() @@ -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, this, + ALT+CTRL+Key_A, KKey::QtWIN+CTRL+Key_A, TQT_TQOBJECT(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, this, + ALT+CTRL+Key_Down, KKey::QtWIN+CTRL+Key_Down, TQT_TQOBJECT(this), TQT_SLOT(blinkClear())); // mainPop = new KPopupMenu(this, "dockServerController_main_pop"); @@ -240,9 +240,9 @@ void dockServerController::subItemActivated(int sub_id) servercontroller::self()->new_toplevel(KSircChannel(server, nick)); } else { - KSircProcess *kp = servercontroller::self()->processes().find(server); + KSircProcess *kp = servercontroller::self()->processes().tqfind(server); if(kp){ - KSircTopLevel *wm = dynamic_cast<KSircTopLevel *>(kp->getWindowList().find("!default")); + KSircTopLevel *wm = dynamic_cast<KSircTopLevel *>(kp->getWindowList().tqfind("!default")); if(wm){ if(cmd == i18n("Ping")){ wm->sirc_line_return("/ping " + nick + "\n"); @@ -261,7 +261,7 @@ void dockServerController::subItemActivated(int sub_id) void dockServerController::mousePressEvent( TQMouseEvent *e ) { - if(e->button() == LeftButton){ + if(e->button() == Qt::LeftButton){ showPopupMenu(mainPop); } else { @@ -316,14 +316,14 @@ void dockServerController::startBlink(const TQString& reason, const TQString& te if(m_blinkActive == false){ // change icon (to "someone's talking to you" icon) setPixmap( m_pic_info ); - m_blinkStatus = true; + m_blinktqStatus = true; m_blinkActive = true; m_blinkTimer->start( 500 ); // half a second } if(!reason.isNull()){ TQString br(reason); if(text.isNull() && ksopts->runDocked && ksopts->dockPopups) - KPassivePopup::message(TQString("Notify: %1").arg(reason), this); + KPassivePopup::message(TQString("Notify: %1").tqarg(reason), this); else { TQStringList sl; TQString cutup = text; @@ -338,7 +338,7 @@ void dockServerController::startBlink(const TQString& reason, const TQString& te cutup = sl.join("\n"); cutup.truncate(cutup.length()-1); if(ksopts->runDocked && ksopts->dockPopups) - KPassivePopup::message(TQString("%1").arg(reason), cutup, this); + KPassivePopup::message(TQString("%1").tqarg(reason), cutup, this); } m_blink_reason.append(br); createMainPopup(); @@ -395,8 +395,8 @@ void dockServerController::raiseLastActiveWindow() void dockServerController::blinkDockedIcon() { - m_blinkStatus = !m_blinkStatus; - setPixmap( m_blinkStatus ? m_pic_info : m_pic_dock ); + m_blinktqStatus = !m_blinktqStatus; + setPixmap( m_blinktqStatus ? m_pic_info : m_pic_dock ); } void dockServerController::helpNotice() @@ -433,10 +433,10 @@ void dockServerController::configNotify() void dockServerController::raiseWindow(TQString server, TQString name) { TQCString txt = server.utf8() + "_" + name.utf8() + "_toplevel"; - TQWidget *obj = dynamic_cast<TQWidget *>( objFinder::find(txt, "KSircTopLevel")); + TQWidget *obj = dynamic_cast<TQWidget *>( objFinder::tqfind(txt, "KSircTopLevel")); if(obj == 0x0){ txt = server.utf8() + "_!" + name.utf8() + "_toplevel"; - obj = dynamic_cast<TQWidget *>( objFinder::find(txt, "KSircTopLevel")); + obj = dynamic_cast<TQWidget *>( objFinder::tqfind(txt, "KSircTopLevel")); } if(obj != 0x0){ |