diff options
Diffstat (limited to 'ksirc')
-rw-r--r-- | ksirc/KSPrefs/page_autoconnectbase.ui | 2 | ||||
-rw-r--r-- | ksirc/KSPrefs/page_font.cpp | 2 | ||||
-rw-r--r-- | ksirc/KSPrefs/page_font.h | 2 | ||||
-rw-r--r-- | ksirc/KSTicker/ksticker.cpp | 4 | ||||
-rw-r--r-- | ksirc/ahistlineedit.cpp | 4 | ||||
-rw-r--r-- | ksirc/chanButtons.cpp | 2 | ||||
-rw-r--r-- | ksirc/chanButtons.h | 4 | ||||
-rw-r--r-- | ksirc/dccManager.cpp | 18 | ||||
-rw-r--r-- | ksirc/dccManager.h | 12 | ||||
-rw-r--r-- | ksirc/dccManagerbase.ui | 2 | ||||
-rw-r--r-- | ksirc/dccToplevel.cpp | 4 | ||||
-rw-r--r-- | ksirc/dccToplevel.h | 2 | ||||
-rw-r--r-- | ksirc/displayMgrMDI.cpp | 18 | ||||
-rw-r--r-- | ksirc/dockservercontroller.cpp | 8 | ||||
-rw-r--r-- | ksirc/dockservercontroller.h | 4 | ||||
-rw-r--r-- | ksirc/ksirc.cpp | 2 | ||||
-rw-r--r-- | ksirc/ksview.cpp | 2 | ||||
-rw-r--r-- | ksirc/mditoplevel.cpp | 10 | ||||
-rw-r--r-- | ksirc/mditoplevel.h | 6 | ||||
-rw-r--r-- | ksirc/servercontroller.cpp | 8 | ||||
-rw-r--r-- | ksirc/servercontroller.h | 6 | ||||
-rw-r--r-- | ksirc/toplevel.cpp | 14 | ||||
-rw-r--r-- | ksirc/toplevel.h | 6 |
23 files changed, 71 insertions, 71 deletions
diff --git a/ksirc/KSPrefs/page_autoconnectbase.ui b/ksirc/KSPrefs/page_autoconnectbase.ui index 0c385e7b..664bf30f 100644 --- a/ksirc/KSPrefs/page_autoconnectbase.ui +++ b/ksirc/KSPrefs/page_autoconnectbase.ui @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Auto Connect List</string> diff --git a/ksirc/KSPrefs/page_font.cpp b/ksirc/KSPrefs/page_font.cpp index 5ea0dd9b..a4a59c1b 100644 --- a/ksirc/KSPrefs/page_font.cpp +++ b/ksirc/KSPrefs/page_font.cpp @@ -4,7 +4,7 @@ PageFont::PageFont( TQWidget *parent, const char *name ) : TQWidget( parent, name) { layout = new TQHBoxLayout(this); - fontchooser = new KFontChooser(this); + fontchooser = new TDEFontChooser(this); layout->addWidget(fontchooser); connect(fontchooser,TQT_SIGNAL(fontSelected ( const TQFont&)), this, TQT_SLOT(update())); } diff --git a/ksirc/KSPrefs/page_font.h b/ksirc/KSPrefs/page_font.h index 89462313..154ff014 100644 --- a/ksirc/KSPrefs/page_font.h +++ b/ksirc/KSPrefs/page_font.h @@ -56,7 +56,7 @@ class PageFont : public TQWidget void modified(); private: - KFontChooser* fontchooser; /** The font choosing widget from kdelib */ + TDEFontChooser* fontchooser; /** The font choosing widget from kdelib */ TQHBoxLayout* layout; }; diff --git a/ksirc/KSTicker/ksticker.cpp b/ksirc/KSTicker/ksticker.cpp index f2d77e39..60e137bf 100644 --- a/ksirc/KSTicker/ksticker.cpp +++ b/ksirc/KSTicker/ksticker.cpp @@ -424,8 +424,8 @@ void KSTicker::mousePressEvent( TQMouseEvent *e) } void KSTicker::fontSelector() { - int result = KFontDialog::getFont( ourFont, true ); - if ( result == KFontDialog::Accepted ) { + int result = TDEFontDialog::getFont( ourFont, true ); + if ( result == TDEFontDialog::Accepted ) { updateFont(ourFont); } } diff --git a/ksirc/ahistlineedit.cpp b/ksirc/ahistlineedit.cpp index 686c530a..f741646f 100644 --- a/ksirc/ahistlineedit.cpp +++ b/ksirc/ahistlineedit.cpp @@ -309,9 +309,9 @@ bool aHistLineEdit::processKeyEvent( TQKeyEvent *e ) bool eat = false; -// kdDebug(5008) << "Key: " << KShortcut( KKey( e ) ).toString() << " StdAccel: " << KStdAccel::paste().toString() << endl; +// kdDebug(5008) << "Key: " << TDEShortcut( KKey( e ) ).toString() << " StdAccel: " << TDEStdAccel::paste().toString() << endl; - if ( KStdAccel::paste().contains(KKey( e ))) { + if ( TDEStdAccel::paste().contains(KKey( e ))) { e->ignore(); eat = true; } diff --git a/ksirc/chanButtons.cpp b/ksirc/chanButtons.cpp index 5aafba1c..ad56d000 100644 --- a/ksirc/chanButtons.cpp +++ b/ksirc/chanButtons.cpp @@ -26,7 +26,7 @@ chanButtons::chanButtons(KSircProcess *proc, TQWidget *parent, const char *name) : TQWidget(parent, name), m_proc(proc) { - Popupmenu = new KPopupMenu( this ); + Popupmenu = new TDEPopupMenu( this ); Popupmenu->insertTitle(i18n("Channel Modes")); toggleMenu[0] = Popupmenu->insertItem(i18n("i (invite-only)"), this, TQT_SLOT(invite())); toggleMenu[1] = Popupmenu->insertItem(i18n("l (limited users)"), this, TQT_SLOT(limited())); diff --git a/ksirc/chanButtons.h b/ksirc/chanButtons.h index b26f6e3d..223390c1 100644 --- a/ksirc/chanButtons.h +++ b/ksirc/chanButtons.h @@ -9,7 +9,7 @@ class TQHBoxLayout; class TQVBoxLayout; -class KPopupMenu; +class TDEPopupMenu; class chanbuttonsDialog; class KIntSpinBox; class TQLineEdit; @@ -53,7 +53,7 @@ class chanButtons : public TQWidget TQPushButton *moderateButton; TQPushButton *outsideButton; TQPushButton *menuButton; - KPopupMenu *Popupmenu; + TDEPopupMenu *Popupmenu; chanbuttonsDialog *chanDialog; KSircProcess *m_proc; }; diff --git a/ksirc/dccManager.cpp b/ksirc/dccManager.cpp index 386644b9..cc741d25 100644 --- a/ksirc/dccManager.cpp +++ b/ksirc/dccManager.cpp @@ -22,8 +22,8 @@ #define COL_CPS 4 #define COL_PER 5 -dccItem::dccItem( KListView *parent, dccManager *manager, enum dccType type, const TQString &file, const TQString& who, enum dccStatus status, unsigned int size ) - : TQObject(), KListViewItem(parent), m_who(who), m_file(file), m_type(type) +dccItem::dccItem( TDEListView *parent, dccManager *manager, enum dccType type, const TQString &file, const TQString& who, enum dccStatus status, unsigned int size ) + : TQObject(), TDEListViewItem(parent), m_who(who), m_file(file), m_type(type) { m_percent = 0; m_status = status; @@ -43,8 +43,8 @@ dccItem::dccItem( KListView *parent, dccManager *manager, enum dccType type, con } -dccItem::dccItem( KListViewItem *parent, dccManager *manager, enum dccType type, const TQString &file, const TQString& who, enum dccStatus status, unsigned int size ) -: TQObject(), KListViewItem(parent), m_who(who), m_file(file), m_type(type) +dccItem::dccItem( TDEListViewItem *parent, dccManager *manager, enum dccType type, const TQString &file, const TQString& who, enum dccStatus status, unsigned int size ) +: TQObject(), TDEListViewItem(parent), m_who(who), m_file(file), m_type(type) { m_percent = 0; m_status = status; @@ -175,7 +175,7 @@ void dccItem::doRename() void dccItem::okRename(int col) { - KListViewItem::okRename(col); + TDEListViewItem::okRename(col); if(type() == dccGet){ TQString oldfile = m_file; changeFilename(text(COL_FILE)); @@ -193,7 +193,7 @@ void dccItem::okRename(int col) void dccItem::cancelRename(int col) { - KListViewItem::cancelRename(col); + TDEListViewItem::cancelRename(col); if(type() == dccChat){ setWhoPostfix(m_post); } @@ -203,9 +203,9 @@ dccManager::dccManager( TQWidget *parent, const char *name ) : dccManagerbase( p { dccNewDialog = 0x0; - m_getit = new KListViewItem(klvBox, i18n("Get")); - m_sendit = new KListViewItem(klvBox, i18n("Send")); - m_chatit = new KListViewItem(klvBox, i18n("Chat")); + m_getit = new TDEListViewItem(klvBox, i18n("Get")); + m_sendit = new TDEListViewItem(klvBox, i18n("Send")); + m_chatit = new TDEListViewItem(klvBox, i18n("Chat")); m_getit->setOpen(true); m_sendit->setOpen(true); diff --git a/ksirc/dccManager.h b/ksirc/dccManager.h index 89cfcc02..519c0dca 100644 --- a/ksirc/dccManager.h +++ b/ksirc/dccManager.h @@ -23,7 +23,7 @@ class TQSignal; class TQObject; class dccItem : public TQObject, - public KListViewItem + public TDEListViewItem { Q_OBJECT @@ -47,8 +47,8 @@ public: dccSend }; - dccItem( KListView *, dccManager *, enum dccType, const TQString &file, const TQString &who, enum dccStatus, unsigned int size ); - dccItem( KListViewItem *, dccManager *, enum dccType, const TQString &file, const TQString &who, enum dccStatus, unsigned int size ); + dccItem( TDEListView *, dccManager *, enum dccType, const TQString &file, const TQString &who, enum dccStatus, unsigned int size ); + dccItem( TDEListViewItem *, dccManager *, enum dccType, const TQString &file, const TQString &who, enum dccStatus, unsigned int size ); virtual ~dccItem(); void changeStatus(enum dccStatus); @@ -130,9 +130,9 @@ protected slots: private: - KListViewItem *m_getit; - KListViewItem *m_sendit; - KListViewItem *m_chatit; + TDEListViewItem *m_getit; + TDEListViewItem *m_sendit; + TDEListViewItem *m_chatit; dccNew *dccNewDialog; }; diff --git a/ksirc/dccManagerbase.ui b/ksirc/dccManagerbase.ui index 542a28eb..7c768f47 100644 --- a/ksirc/dccManagerbase.ui +++ b/ksirc/dccManagerbase.ui @@ -25,7 +25,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Who</string> diff --git a/ksirc/dccToplevel.cpp b/ksirc/dccToplevel.cpp index 86d07d5e..e5288290 100644 --- a/ksirc/dccToplevel.cpp +++ b/ksirc/dccToplevel.cpp @@ -16,7 +16,7 @@ extern DisplayMgr *displayMgr; #define DTL_WINDOW_ID 10 dccTopLevel::dccTopLevel(TQWidget *parent, const char *name) - : KMainWindow(parent, name, TQt::WDestructiveClose) + : TDEMainWindow(parent, name, TQt::WDestructiveClose) { m_mgr = new dccManager(this, TQCString(TQT_TQOBJECT(this)->name()) + "_dccManager"); // m_mgr->show(); @@ -25,7 +25,7 @@ dccTopLevel::dccTopLevel(TQWidget *parent, const char *name) 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"); - KAction *act = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); + TDEAction *act = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); act->plug(win); menuBar()->insertItem(i18n("&File"), win, DTL_WINDOW_ID, -1); diff --git a/ksirc/dccToplevel.h b/ksirc/dccToplevel.h index 4b2265fa..d7a64341 100644 --- a/ksirc/dccToplevel.h +++ b/ksirc/dccToplevel.h @@ -7,7 +7,7 @@ class dccManager; -class dccTopLevel : public KMainWindow +class dccTopLevel : public TDEMainWindow { Q_OBJECT diff --git a/ksirc/displayMgrMDI.cpp b/ksirc/displayMgrMDI.cpp index d554004a..ec488275 100644 --- a/ksirc/displayMgrMDI.cpp +++ b/ksirc/displayMgrMDI.cpp @@ -38,8 +38,8 @@ void DisplayMgrMDI::newTopLevel( TQWidget *w, bool show ) KSircTopLevel *t = static_cast<KSircTopLevel *>(w); connect(m_topLevel->tabWidget(), TQT_SIGNAL(currentChanged(TQWidget *)), t, TQT_SLOT(focusChange(TQWidget *))); } - if(w->inherits("KMainWindow")){ - KMainWindow *t = static_cast<KMainWindow *>(w); + if(w->inherits("TDEMainWindow")){ + TDEMainWindow *t = static_cast<TDEMainWindow *>(w); TQMenuBar *cmenu = t->menuBar(); if(cmenu){ @@ -60,11 +60,11 @@ void DisplayMgrMDI::newTopLevel( TQWidget *w, bool show ) TQPopupMenu *sm = new TQPopupMenu(t, "settings" ); - KToggleAction *showmenu = KStdAction::showMenubar( 0, 0, t->actionCollection() ); + TDEToggleAction *showmenu = KStdAction::showMenubar( 0, 0, t->actionCollection() ); showmenu->plug( sm ); connect( showmenu, TQT_SIGNAL(toggled(bool)), cmenu, TQT_SLOT(setShown(bool)) ); - KSelectAction *selectTabbar = new KSelectAction(i18n("&Tab Bar"), 0, this, "tabbar" ); + TDESelectAction *selectTabbar = new TDESelectAction(i18n("&Tab Bar"), 0, this, "tabbar" ); TQStringList tabbaritems; tabbaritems << i18n("&Top") << i18n("&Bottom"); selectTabbar->setItems(tabbaritems); @@ -72,7 +72,7 @@ void DisplayMgrMDI::newTopLevel( TQWidget *w, bool show ) selectTabbar->plug( sm ); connect( selectTabbar, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setTabPosition(int)) ); - KToggleAction *showfull = KStdAction::fullScreen( 0, 0, t->actionCollection(), t ); + TDEToggleAction *showfull = KStdAction::fullScreen( 0, 0, t->actionCollection(), t ); showfull->plug( sm ); connect( showfull, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setFullScreen(bool)) ); @@ -185,7 +185,7 @@ void DisplayMgrMDI::reparentReq() kdDebug(5008) << "Kapp says no widget has focus!" << endl; o = TQT_TQWIDGET(kapp->activeWindow()); - if(o->inherits("KMainWindow") == false) + if(o->inherits("TDEMainWindow") == false) return; s = o; @@ -199,7 +199,7 @@ void DisplayMgrMDI::reparentReq() while(s->parentWidget()){ kdDebug(5008) << "Got a: " << s->className() << endl; s = s->parentWidget(); - if(s->inherits("KMainWindow")) + if(s->inherits("TDEMainWindow")) break; } @@ -208,7 +208,7 @@ void DisplayMgrMDI::reparentReq() // TQWidget *s = m_topLevel->tabWidget()->currentPage(); can't do this since you can never reattach if(s){ - KMainWindow *kst = static_cast<KMainWindow *>(s); + TDEMainWindow *kst = static_cast<TDEMainWindow *>(s); kdDebug(5008) << "Top is: " << kst->name("none give") <<endl; TQMenuData *tmenu = kst->menuBar(); @@ -238,7 +238,7 @@ MDITopLevel *DisplayMgrMDI::topLevel() m_topLevel = new MDITopLevel(0x0, "MDITopLevel"); m_topLevel->show(); - KAccel *a = new KAccel( m_topLevel ); + TDEAccel *a = new TDEAccel( m_topLevel ); a->insert( "cycle left", i18n("Cycle left"), TQString(), ALT+Key_Left, ALT+Key_Left, this, TQT_SLOT(slotCycleTabsLeft()) ); a->insert( "cycle right", i18n("Cycle right"), TQString(), ALT+Key_Right, ALT+Key_Right, this, TQT_SLOT(slotCycleTabsRight()) ); } diff --git a/ksirc/dockservercontroller.cpp b/ksirc/dockservercontroller.cpp index 7deb5b2f..a433c99b 100644 --- a/ksirc/dockservercontroller.cpp +++ b/ksirc/dockservercontroller.cpp @@ -59,7 +59,7 @@ dockServerController::dockServerController(servercontroller *sc, TQWidget *paren { m_nicks.setAutoDelete(true); - KPopupMenu *pop = contextMenu(); + TDEPopupMenu *pop = contextMenu(); pop->setName("dockServerController_menu_pop"); #ifndef NDEBUG @@ -116,7 +116,7 @@ dockServerController::dockServerController(servercontroller *sc, TQWidget *paren ALT+CTRL+Key_Down, KKey::QtWIN+CTRL+Key_Down, TQT_TQOBJECT(this), TQT_SLOT(blinkClear())); -// mainPop = new KPopupMenu(this, "dockServerController_main_pop"); +// mainPop = new TDEPopupMenu(this, "dockServerController_main_pop"); // mainPop->setTitle(i18n("KSirc Dock Menu")); } @@ -160,7 +160,7 @@ void dockServerController::createMainPopup() if(mainPop) delete mainPop; - mainPop = new KPopupMenu(this, "dockservercontrller_main_pop"); + mainPop = new TDEPopupMenu(this, "dockservercontrller_main_pop"); connect(mainPop, TQT_SIGNAL(activated(int)), this, TQT_SLOT(mainActivated(int))); connect(mainPop, TQT_SIGNAL(aboutToShow()), @@ -171,7 +171,7 @@ void dockServerController::createMainPopup() TQDictIterator<dscNickInfo> it( m_nicks ); for( ; it.current(); ++it){ - KPopupMenu *sub = new KPopupMenu(mainPop); + TDEPopupMenu *sub = new TDEPopupMenu(mainPop); if(it.current()->status() == dscNickInfo::isOnline){ sub->insertItem(i18n("Came Online: ") + it.current()->online().toString("hh:mm")); if( ! it.current()->offline().isNull() ){ diff --git a/ksirc/dockservercontroller.h b/ksirc/dockservercontroller.h index 0d037b52..03b673c3 100644 --- a/ksirc/dockservercontroller.h +++ b/ksirc/dockservercontroller.h @@ -13,7 +13,7 @@ class TQPopupMenu; class TQWidget; class servercontroller; class TQMouseEvent; -class KPopupMenu; +class TDEPopupMenu; class TQTimer; class dscNickInfo @@ -89,7 +89,7 @@ private: void raiseWindow(TQString server, TQString name); TQDict<dscNickInfo> m_nicks; servercontroller *m_sc; - KPopupMenu *mainPop; + TDEPopupMenu *mainPop; TQString m_last_nick; TQString m_last_server; diff --git a/ksirc/ksirc.cpp b/ksirc/ksirc.cpp index ba9dbcda..1664f607 100644 --- a/ksirc/ksirc.cpp +++ b/ksirc/ksirc.cpp @@ -98,7 +98,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) servercontroller *sc = new servercontroller(0, "servercontroller"); app.setMainWidget(sc); - if (KMainWindow::canBeRestored(1)) + if (TDEMainWindow::canBeRestored(1)) { sc->restore(1, false ); } diff --git a/ksirc/ksview.cpp b/ksirc/ksview.cpp index 3d895513..e093450f 100644 --- a/ksirc/ksview.cpp +++ b/ksirc/ksview.cpp @@ -282,7 +282,7 @@ void KSircView::anchorClicked(const TQMouseEvent *ev, const TQString &url) static const int copyLinkLocationID = 1; // Adding a nice contextmenu - KPopupMenu* menu = new KPopupMenu( this ); + TDEPopupMenu* menu = new TDEPopupMenu( this ); menu->insertTitle( i18n( "URL" ) ); menu->insertItem( i18n("Open URL"), openURLID ); menu->insertItem( i18n("Copy Link Address"), copyLinkLocationID ); diff --git a/ksirc/mditoplevel.cpp b/ksirc/mditoplevel.cpp index c6047674..55992ccb 100644 --- a/ksirc/mditoplevel.cpp +++ b/ksirc/mditoplevel.cpp @@ -30,7 +30,7 @@ void KSTabWidget::mousePressEvent(TQMouseEvent *e) } MDITopLevel::MDITopLevel(TQWidget *parent, const char *name) - : KMainWindow(parent, name) + : TDEMainWindow(parent, name) { m_closing = false; @@ -53,7 +53,7 @@ MDITopLevel::MDITopLevel(TQWidget *parent, const char *name) m_dirtyIcon = UserIcon( "star" ); m_addressedIcon = UserIcon( "info" ); - m_pop = new KPopupMenu(m_tab, ""); + m_pop = new TDEPopupMenu(m_tab, ""); m_pop->insertItem( SmallIcon("fileclose"), i18n("Close"), this, TQT_SLOT( slotCloseLastWid() )); } @@ -161,7 +161,7 @@ void MDITopLevel::closeEvent( TQCloseEvent *ev ) delete (TQWidget *)w; } - KMainWindow::closeEvent( ev ); + TDEMainWindow::closeEvent( ev ); m_closing = false; } @@ -207,7 +207,7 @@ void MDITopLevel::slotMarkPageDirty( bool addressed ) { // This is called when a line appeared in this channel. // addressed is true if it was addressed to the user - KMainWindow *window = dynamic_cast<KMainWindow *>( TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME *>( sender() )) ); + TDEMainWindow *window = dynamic_cast<TDEMainWindow *>( TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME *>( sender() )) ); if ( !window ) return; @@ -225,7 +225,7 @@ void MDITopLevel::slotMarkPageDirty( bool addressed ) void MDITopLevel::slotChangeChannelName( const TQString &, const TQString &channelName ) { - KMainWindow *window = dynamic_cast<KMainWindow *>( TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME *>( sender() )) ); + TDEMainWindow *window = dynamic_cast<TDEMainWindow *>( TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME *>( sender() )) ); if ( !window ) return; diff --git a/ksirc/mditoplevel.h b/ksirc/mditoplevel.h index 53dfc1c3..78350561 100644 --- a/ksirc/mditoplevel.h +++ b/ksirc/mditoplevel.h @@ -25,9 +25,9 @@ signals: }; class TQLabel; -class KPopupMenu; +class TDEPopupMenu; -class MDITopLevel : public KMainWindow +class MDITopLevel : public TDEMainWindow { Q_OBJECT @@ -65,7 +65,7 @@ private slots: private: KSTabWidget *m_tab; - KPopupMenu *m_pop; + TDEPopupMenu *m_pop; TQWidget *m_last_pop_wid; TQPtrList<TQWidget> m_tabWidgets; TQPtrList<TQWidget> m_addressed; diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp index 4eea7003..58d46517 100644 --- a/ksirc/servercontroller.cpp +++ b/ksirc/servercontroller.cpp @@ -117,7 +117,7 @@ DisplayMgr *displayMgr; servercontroller *servercontroller::s_self = 0; servercontroller::servercontroller( TQWidget*, const char* name ) - : KMainWindow( 0, name ) + : TDEMainWindow( 0, name ) { we_are_exiting = false; m_notificationCount = 0; @@ -625,7 +625,7 @@ void servercontroller::readGlobalProperties(TDEConfig *ksc) // ksc == K Session Config - // KMainWindow silently disables our menubar, when we quit in a docked + // TDEMainWindow silently disables our menubar, when we quit in a docked // state, so we have to force showing it here. menuBar()->show(); @@ -754,7 +754,7 @@ void servercontroller::closeEvent( TQCloseEvent *e ) { we_are_exiting = true; saveSessionConfig(); - KMainWindow::closeEvent( e ); + TDEMainWindow::closeEvent( e ); } void servercontroller::WindowSelected(TQListViewItem *item) @@ -953,7 +953,7 @@ scInside::scInside ( TQWidget * parent, const char * name, WFlags asfont.setBold(TRUE); ASConn->setFont(asfont); - ConnectionTree = new KListView(this, "connectiontree"); + ConnectionTree = new TDEListView(this, "connectiontree"); ConnectionTree->addColumn(TQString()); ConnectionTree->setRootIsDecorated( true ); ConnectionTree->setSorting( 0 ); diff --git a/ksirc/servercontroller.h b/ksirc/servercontroller.h index 7115f23a..7111a458 100644 --- a/ksirc/servercontroller.h +++ b/ksirc/servercontroller.h @@ -77,12 +77,12 @@ class scInside : TQFrame virtual void resizeEvent ( TQResizeEvent * ); private: - KListView *ConnectionTree; + TDEListView *ConnectionTree; TQLabel *ASConn; }; -class servercontroller : public KMainWindow +class servercontroller : public TDEMainWindow { Q_OBJECT @@ -216,7 +216,7 @@ private: // La raison d'etre. We don't run ConnectionTree ourselves, but // we get it from our helper class scInside. - KListView *ConnectionTree; + TDEListView *ConnectionTree; scInside *sci; diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp index 3d502a52..a6b7518d 100644 --- a/ksirc/toplevel.cpp +++ b/ksirc/toplevel.cpp @@ -107,7 +107,7 @@ KSircTopLevel::initColors() } KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInfo, const char * name) - : KMainWindow(0, name, 0/*no WDestructiveClose !*/), + : TDEMainWindow(0, name, 0/*no WDestructiveClose !*/), UnicodeMessageReceiver(_proc), lastBeep( TQTime::currentTime() ), m_channelInfo(channelInfo) @@ -115,7 +115,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf { // prevent us from being quitted when closing a channel-window. Only // closing the servercontroller shall quit. - // KMainWindow will deref() us in closeEvent + // TDEMainWindow will deref() us in closeEvent kapp->ref(); @@ -155,7 +155,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf file = new TQPopupMenu(this, TQCString(TQT_TQOBJECT(this)->name()) + "_popup_file"); file->setCheckable(true); - KAction *act = KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT( newWindow() ), actionCollection() ); + TDEAction *act = KStdAction::openNew( TQT_TQOBJECT(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 KSelectAction( i18n( "&Encoding" ), 0, TQT_TQOBJECT(this) ); + encodingAction = new TDESelectAction( i18n( "&Encoding" ), 0, TQT_TQOBJECT(this) ); connect( encodingAction, TQT_SIGNAL( activated() ), this, TQT_SLOT( setEncoding() ) ); TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames(); @@ -683,7 +683,7 @@ void KSircTopLevel::insertText() void KSircTopLevel::show() { - KMainWindow::show(); + TDEMainWindow::show(); linee->setFocus(); mainw->scrollToBottom(true); } @@ -1199,7 +1199,7 @@ void KSircTopLevel::newWindow() void KSircTopLevel::closeEvent(TQCloseEvent *e) { - KMainWindow::closeEvent( e ); + TDEMainWindow::closeEvent( e ); e->accept(); //Let's not part the channel till we are acutally delete. @@ -1654,7 +1654,7 @@ bool KSircTopLevel::event( TQEvent *e) TQTimer::singleShot(750, this, TQT_SLOT(initColors())); initColors(); } - return KMainWindow::event(e); + return TDEMainWindow::event(e); } void KSircTopLevel::saveCurrLog() diff --git a/ksirc/toplevel.h b/ksirc/toplevel.h index 52e18be0..de5e2a27 100644 --- a/ksirc/toplevel.h +++ b/ksirc/toplevel.h @@ -20,14 +20,14 @@ class UserControlMenu; class ChannelParser; class charSelector; class LogFile; -class KSelectAction; +class TDESelectAction; class TQLabel; class TQVBox; class TQListBoxItem; class TQPopupMenu; -class KSircTopLevel : public KMainWindow, +class KSircTopLevel : public TDEMainWindow, public UnicodeMessageReceiver { Q_OBJECT @@ -521,7 +521,7 @@ private: LogFile *logFile; - KSelectAction *encodingAction; + TDESelectAction *encodingAction; static TQStringList cmd_menu; |