From d692068c75ce7e200fd5c92928f3c45655f14e9c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:03:43 -0600 Subject: [PATCH] Rename a number of classes to enhance compatibility with KDE4 --- konversation/src/alias_preferences.cpp | 4 +- konversation/src/alias_preferencesui.ui | 2 +- konversation/src/autoreplace_preferencesui.ui | 2 +- konversation/src/awaymanager.cpp | 2 +- konversation/src/channel.cpp | 8 +- konversation/src/channellistpanel.cpp | 12 +-- konversation/src/channellistpanel.h | 6 +- konversation/src/channellistviewitem.cpp | 6 +- konversation/src/channellistviewitem.h | 4 +- konversation/src/channeloptionsdialog.cpp | 18 ++-- konversation/src/channeloptionsdialog.h | 4 +- konversation/src/channeloptionsui.ui | 8 +- konversation/src/dccchat.cpp | 2 +- konversation/src/dccrecipientdialog.cpp | 2 +- konversation/src/dcctransferpanel.cpp | 6 +- konversation/src/dcctransferpanel.h | 10 +- konversation/src/dcctransferpanelitem.cpp | 4 +- konversation/src/dcctransferpanelitem.h | 2 +- .../src/fontappearance_preferences.ui | 6 +- konversation/src/highlight_preferencesui.ui | 2 +- konversation/src/highlightviewitem.cpp | 2 +- konversation/src/highlightviewitem.h | 4 +- konversation/src/ignore_preferences.cpp | 2 +- konversation/src/ignore_preferencesui.ui | 2 +- konversation/src/ignorelistviewitem.cpp | 2 +- konversation/src/ignorelistviewitem.h | 2 +- konversation/src/ircview.cpp | 22 ++-- konversation/src/ircview.h | 10 +- konversation/src/konversationmainwindow.cpp | 100 +++++++++--------- konversation/src/konversationmainwindow.h | 8 +- konversation/src/konvibookmarkhandler.cpp | 2 +- konversation/src/konvibookmarkhandler.h | 6 +- konversation/src/konvibookmarkmenu.cpp | 14 +-- konversation/src/konvibookmarkmenu.h | 12 +-- konversation/src/konvisettingsdialog.cpp | 2 +- .../src/linkaddressbook/addresseeitem.cpp | 2 +- .../src/linkaddressbook/addresseeitem.h | 2 +- .../src/linkaddressbook/linkaddressbookui.cpp | 2 +- .../linkaddressbook/linkaddressbookui_base.ui | 4 +- .../linkaddressbook/nicksonlinetooltip.cpp | 2 +- konversation/src/logfilereader.cpp | 2 +- konversation/src/logfilereader.h | 4 +- konversation/src/nick.cpp | 6 +- konversation/src/nick.h | 4 +- .../src/nicklistbehavior_preferences.cpp | 12 +-- .../src/nicklistbehavior_preferencesui.ui | 2 +- konversation/src/nicklistview.cpp | 16 +-- konversation/src/nicklistview.h | 2 +- konversation/src/nicksonline.cpp | 4 +- konversation/src/nicksonline.h | 6 +- konversation/src/nicksonlineitem.cpp | 4 +- konversation/src/nicksonlineitem.h | 2 +- konversation/src/osd_preferencesui.ui | 2 +- konversation/src/quickbuttons_preferences.cpp | 4 +- .../src/quickbuttons_preferencesui.ui | 2 +- konversation/src/servergroupdialogui.ui | 4 +- konversation/src/serverlistdialog.cpp | 8 +- konversation/src/serverlistdialog.h | 4 +- konversation/src/serverlistview.cpp | 6 +- konversation/src/serverlistview.h | 4 +- konversation/src/theme_preferencesui.ui | 2 +- konversation/src/topiclabel.cpp | 2 +- konversation/src/topiclabel.h | 4 +- konversation/src/urlcatcher.cpp | 6 +- konversation/src/urlcatcher.h | 8 +- konversation/src/valuelistviewitem.cpp | 8 +- konversation/src/valuelistviewitem.h | 6 +- konversation/src/viewcontainer.cpp | 62 +++++------ konversation/src/viewcontainer.h | 4 +- konversation/src/viewtree.cpp | 24 ++--- konversation/src/viewtree.h | 2 +- konversation/src/warnings_preferences.h | 2 +- konversation/src/warnings_preferencesui.ui | 2 +- .../src/watchednicknames_preferences.cpp | 16 +-- .../src/watchednicknames_preferencesui.ui | 2 +- 75 files changed, 280 insertions(+), 280 deletions(-) diff --git a/konversation/src/alias_preferences.cpp b/konversation/src/alias_preferences.cpp index 3f6289d..e30f887 100644 --- a/konversation/src/alias_preferences.cpp +++ b/konversation/src/alias_preferences.cpp @@ -86,7 +86,7 @@ void Alias_Config::setAliasListView(const TQStringList& aliasList) for(int index=aliasList.count(); index!=0; index--) { TQString item=aliasList[index-1]; - new KListViewItem(aliasListView,item.section(' ',0,0),item.section(' ',1)); + new TDEListViewItem(aliasListView,item.section(' ',0,0),item.section(' ',1)); } aliasListView->setSelected(aliasListView->firstChild(), true); @@ -170,7 +170,7 @@ void Alias_Config::actionChanged(const TQString& newAction) void Alias_Config::addEntry() { // add new item at the bottom of list view - KListViewItem* newItem = new KListViewItem(aliasListView,aliasListView->lastChild(),i18n("New"),TQString()); + TDEListViewItem* newItem = new TDEListViewItem(aliasListView,aliasListView->lastChild(),i18n("New"),TQString()); // if successful ... if (newItem) { diff --git a/konversation/src/alias_preferencesui.ui b/konversation/src/alias_preferencesui.ui index 10d926a..f173c4f 100644 --- a/konversation/src/alias_preferencesui.ui +++ b/konversation/src/alias_preferencesui.ui @@ -67,7 +67,7 @@ - + Alias diff --git a/konversation/src/autoreplace_preferencesui.ui b/konversation/src/autoreplace_preferencesui.ui index 494427f..5c1d185 100644 --- a/konversation/src/autoreplace_preferencesui.ui +++ b/konversation/src/autoreplace_preferencesui.ui @@ -63,7 +63,7 @@ - + RegEx diff --git a/konversation/src/awaymanager.cpp b/konversation/src/awaymanager.cpp index 9b7d41b..99a5751 100644 --- a/konversation/src/awaymanager.cpp +++ b/konversation/src/awaymanager.cpp @@ -340,7 +340,7 @@ void AwayManager::toggleGlobalAway(bool away) void AwayManager::updateGlobalAwayAction(bool away) { KonversationApplication* konvApp = static_cast(kapp); - KToggleAction* awayAction = static_cast(konvApp->getMainWindow()->actionCollection()->action("toggle_away")); + TDEToggleAction* awayAction = static_cast(konvApp->getMainWindow()->actionCollection()->action("toggle_away")); if (!awayAction) return; diff --git a/konversation/src/channel.cpp b/konversation/src/channel.cpp index 1531b59..d3dc7d0 100644 --- a/konversation/src/channel.cpp +++ b/konversation/src/channel.cpp @@ -197,17 +197,17 @@ Channel::Channel(TQWidget* parent, TQString _name) : ChatWindow(parent) nicknameListView=new NickListView(nickListButtons, this); nicknameListView->setHScrollBarMode(TQScrollView::AlwaysOff); - nicknameListView->setSelectionModeExt(KListView::Extended); + nicknameListView->setSelectionModeExt(TDEListView::Extended); nicknameListView->setAllColumnsShowFocus(true); nicknameListView->setSorting(1,true); nicknameListView->addColumn(TQString()); nicknameListView->addColumn(TQString()); - nicknameListView->setColumnWidthMode(1,KListView::Maximum); + nicknameListView->setColumnWidthMode(1,TDEListView::Maximum); nicknameListView->header()->hide(); // setResizeMode must be called after all the columns are added - nicknameListView->setResizeMode(KListView::LastColumn); + nicknameListView->setResizeMode(TDEListView::LastColumn); // separate LED from Text a little more nicknameListView->setColumnWidth(0, 10); @@ -2450,7 +2450,7 @@ void Channel::setAutoUserhost(bool state) { // re-add the hostmask column nicknameListView->addColumn(TQString()); - nicknameListView->setColumnWidthMode(2,KListView::Maximum); + nicknameListView->setColumnWidthMode(2,TDEListView::Maximum); nicknameListView->setResizeMode(TQListView::NoColumn); // re-add already known hostmasks diff --git a/konversation/src/channellistpanel.cpp b/konversation/src/channellistpanel.cpp index 1e19f01..44a1ae0 100644 --- a/konversation/src/channellistpanel.cpp +++ b/konversation/src/channellistpanel.cpp @@ -101,13 +101,13 @@ ChannelListPanel::ChannelListPanel(TQWidget* parent) : ChatWindow(parent) targetBox->setStretchFactor(topicFilter,10); - channelListView=new KListView(this,"channel_list_view"); + channelListView=new TDEListView(this,"channel_list_view"); TQWhatsThis::add(channelListView, i18n("The filtered list of channels is displayed here. Notice that if you do not use regular expressions, Konversation lists any channel whose name contains the filter string you entered. The channel name does not have to start with the string you entered.\n\nSelect a channel you want to join by clicking on it. Right click on the channel to get a list of all web addresses mentioned in the channel's topic.")); channelListView->addColumn(i18n("Channel Name")); channelListView->addColumn(i18n("Users")); channelListView->addColumn(i18n("Channel Topic")); channelListView->setAllColumnsShowFocus(true); - channelListView->setResizeMode( KListView::LastColumn ); + channelListView->setResizeMode( TDEListView::LastColumn ); channelListView->setSortColumn(-1); //Disable sorting TQHBox* statsBox=new TQHBox(this); @@ -132,8 +132,8 @@ ChannelListPanel::ChannelListPanel(TQWidget* parent) : ChatWindow(parent) connect(channelListView,TQT_SIGNAL (doubleClicked(TQListViewItem*)), this,TQT_SLOT (joinChannelClicked()) ); - connect(channelListView,TQT_SIGNAL (contextMenu (KListView*, TQListViewItem*, const TQPoint&) ), - this, TQT_SLOT (contextMenu (KListView*, TQListViewItem*, const TQPoint&)) ); + connect(channelListView,TQT_SIGNAL (contextMenu (TDEListView*, TQListViewItem*, const TQPoint&) ), + this, TQT_SLOT (contextMenu (TDEListView*, TQListViewItem*, const TQPoint&)) ); connect(minUsersSpin,TQT_SIGNAL (valueChanged(int)),this,TQT_SLOT(setMinUsers(int)) ); connect(maxUsersSpin,TQT_SIGNAL (valueChanged(int)),this,TQT_SLOT(setMaxUsers(int)) ); @@ -498,11 +498,11 @@ void ChannelListPanel::childAdjustFocus() { } -void ChannelListPanel::contextMenu (KListView* /* l */, TQListViewItem* i, const TQPoint& p) +void ChannelListPanel::contextMenu (TDEListView* /* l */, TQListViewItem* i, const TQPoint& p) { if(!i) return; - KPopupMenu* showURLmenu = new KPopupMenu(this); + TDEPopupMenu* showURLmenu = new TDEPopupMenu(this); showURLmenu->insertTitle( i18n("Open URL") ); TQString filteredLine(i->text(2)); diff --git a/konversation/src/channellistpanel.h b/konversation/src/channellistpanel.h index b0a7e69..1aa3238 100644 --- a/konversation/src/channellistpanel.h +++ b/konversation/src/channellistpanel.h @@ -27,7 +27,7 @@ class TQListView; class TQListViewItem; class TQPushButton; -class KListView; +class TDEListView; class KLineEdit; class ChannelListViewItem; @@ -73,7 +73,7 @@ class ChannelListPanel : public ChatWindow void topicTargetClicked(); void regExpClicked(); - void contextMenu (KListView* l, TQListViewItem* i, const TQPoint& p); + void contextMenu (TDEListView* l, TQListViewItem* i, const TQPoint& p); //Used to disable functions when not connected virtual void serverOnline(bool online); @@ -137,7 +137,7 @@ class ChannelListPanel : public ChatWindow TQPushButton* refreshListButton; TQPushButton* joinChannelButton; - KListView* channelListView; + TDEListView* channelListView; KLineEdit* filterInput; diff --git a/konversation/src/channellistviewitem.cpp b/konversation/src/channellistviewitem.cpp index 4a6b0f5..5fb3bbc 100644 --- a/konversation/src/channellistviewitem.cpp +++ b/konversation/src/channellistviewitem.cpp @@ -15,8 +15,8 @@ #include "channellistviewitem.h" -ChannelListViewItem::ChannelListViewItem(KListView* parent, const TQString& channel, const TQString& users, const TQString& topic) -: KListViewItem(parent,channel,users,topic) +ChannelListViewItem::ChannelListViewItem(TDEListView* parent, const TQString& channel, const TQString& users, const TQString& topic) +: TDEListViewItem(parent,channel,users,topic) { } @@ -36,5 +36,5 @@ int ChannelListViewItem::compare(TQListViewItem* item, int col, bool ascending) if(ok) return (ij) ? 1 : 0; } } - return KListViewItem::compare(item,col,ascending); + return TDEListViewItem::compare(item,col,ascending); } diff --git a/konversation/src/channellistviewitem.h b/konversation/src/channellistviewitem.h index c44f9e0..aa2fae0 100644 --- a/konversation/src/channellistviewitem.h +++ b/konversation/src/channellistviewitem.h @@ -20,10 +20,10 @@ #include -class ChannelListViewItem : public KListViewItem +class ChannelListViewItem : public TDEListViewItem { public: - ChannelListViewItem(KListView* parent, const TQString& channel, const TQString& users, const TQString& topic); + ChannelListViewItem(TDEListView* parent, const TQString& channel, const TQString& users, const TQString& topic); ~ChannelListViewItem(); int compare(TQListViewItem* item, int col, bool ascending) const; diff --git a/konversation/src/channeloptionsdialog.cpp b/konversation/src/channeloptionsdialog.cpp index e52776b..58711d4 100644 --- a/konversation/src/channeloptionsdialog.cpp +++ b/konversation/src/channeloptionsdialog.cpp @@ -172,7 +172,7 @@ namespace Konversation { TQDateTime date; date.setTime_t((*it).section(' ', 0 ,0).toUInt()); - new KListViewItem(m_widget->topicHistoryList, (*it).section(' ', 1, 1), date.toString(Qt::LocalDate), (*it).section(' ', 2)); + new TDEListViewItem(m_widget->topicHistoryList, (*it).section(' ', 1, 1), date.toString(Qt::LocalDate), (*it).section(' ', 2)); } // update topic preview @@ -468,26 +468,26 @@ namespace Konversation // This is our implementation of BanListViewItem BanListViewItem::BanListViewItem(TQListView *parent) - : KListViewItem(parent) + : TDEListViewItem(parent) { m_isNewBan = 0; } BanListViewItem::BanListViewItem(TQListView *parent, bool isNew) - : KListViewItem(parent) + : TDEListViewItem(parent) { m_isNewBan = isNew; } BanListViewItem::BanListViewItem (TQListView *parent, const TQString& label1, const TQString& label2, - uint timestamp) : KListViewItem(parent, label1, label2) + uint timestamp) : TDEListViewItem(parent, label1, label2) { m_isNewBan = 0; m_timestamp.setTime_t(timestamp); } BanListViewItem::BanListViewItem (TQListView *parent, bool isNew, const TQString& label1, const TQString& label2, - uint timestamp) : KListViewItem(parent, label1, label2) + uint timestamp) : TDEListViewItem(parent, label1, label2) { m_isNewBan = isNew; m_timestamp.setTime_t(timestamp); @@ -498,7 +498,7 @@ namespace Konversation if (column == 2) return TDEGlobal::locale()->formatDateTime(m_timestamp, true, true); - return KListViewItem::text(column); + return TDEListViewItem::text(column); } int BanListViewItem::compare(TQListViewItem *i, int col, bool ascending) const @@ -515,14 +515,14 @@ namespace Konversation return 1; } - return KListViewItem::compare(i, col, ascending); + return TDEListViewItem::compare(i, col, ascending); } void BanListViewItem::startRename( int col ) { m_oldValue = text(col); - KListViewItem::startRename(col); + TDEListViewItem::startRename(col); } void BanListViewItem::cancelRename( int col ) @@ -530,7 +530,7 @@ namespace Konversation if (text(col).isEmpty() && m_isNewBan) delete this; else - KListViewItem::cancelRename(col); + TDEListViewItem::cancelRename(col); } } diff --git a/konversation/src/channeloptionsdialog.h b/konversation/src/channeloptionsdialog.h index 793a77f..f5763a9 100644 --- a/konversation/src/channeloptionsdialog.h +++ b/konversation/src/channeloptionsdialog.h @@ -72,10 +72,10 @@ namespace Konversation }; - // This is needed to overcome two deficiencies in KListViewItem + // This is needed to overcome two deficiencies in TDEListViewItem // First there is no signal emitted when a rename is canceled // Second there is no way to get the old value of an item after a rename - class BanListViewItem : public KListViewItem + class BanListViewItem : public TDEListViewItem { public: explicit BanListViewItem( TQListView *parent ); diff --git a/konversation/src/channeloptionsui.ui b/konversation/src/channeloptionsui.ui index 529207d..535aec0 100644 --- a/konversation/src/channeloptionsui.ui +++ b/konversation/src/channeloptionsui.ui @@ -47,7 +47,7 @@ the Free Software Foundation; either version 2 of the License, or Vertical - + Nickname @@ -328,7 +328,7 @@ the Free Software Foundation; either version 2 of the License, or - + Mode @@ -435,7 +435,7 @@ the Free Software Foundation; either version 2 of the License, or &Add Ban - + Hostmask @@ -511,7 +511,7 @@ the Free Software Foundation; either version 2 of the License, or Search: - + banListSearchLine diff --git a/konversation/src/dccchat.cpp b/konversation/src/dccchat.cpp index fc51e65..290acd1 100644 --- a/konversation/src/dccchat.cpp +++ b/konversation/src/dccchat.cpp @@ -80,7 +80,7 @@ DccChat::DccChat(TQWidget* parent, bool listen, Server* server, const TQString& if (popup) { - KAction* action = KonversationApplication::instance()->getMainWindow()->actionCollection()->action("open_logfile"); + TDEAction* action = KonversationApplication::instance()->getMainWindow()->actionCollection()->action("open_logfile"); if (action) { diff --git a/konversation/src/dccrecipientdialog.cpp b/konversation/src/dccrecipientdialog.cpp index bb5d334..3489c84 100644 --- a/konversation/src/dccrecipientdialog.cpp +++ b/konversation/src/dccrecipientdialog.cpp @@ -34,7 +34,7 @@ DccRecipientDialog::DccRecipientDialog(TQWidget* parent, const TQStringList &lis TQVBoxLayout* dialogLayout=new TQVBoxLayout(page); dialogLayout->setSpacing(spacingHint()); // Add the nickname list widget - KListBox* nicknameList=new KListBox(page,"recipient_list"); + TDEListBox* nicknameList=new TDEListBox(page,"recipient_list"); nicknameList->insertStringList(list); nicknameList->sort(true); diff --git a/konversation/src/dcctransferpanel.cpp b/konversation/src/dcctransferpanel.cpp index 348f566..7233405 100644 --- a/konversation/src/dcctransferpanel.cpp +++ b/konversation/src/dcctransferpanel.cpp @@ -63,7 +63,7 @@ void DccTransferPanel::initGUI() { setSpacing( 0 ); - m_listView = new KListView(this,"dcc_control_panel"); + m_listView = new TDEListView(this,"dcc_control_panel"); m_listView->setSelectionMode(TQListView::Extended); m_listView->setDragEnabled(true); @@ -135,7 +135,7 @@ void DccTransferPanel::initGUI() // popup menu - m_popup = new KPopupMenu(this); + m_popup = new TDEPopupMenu(this); m_popup->insertItem( i18n("&Select All Items"), Popup::SelectAll); m_popup->insertItem( i18n("S&elect All Completed Items"), Popup::SelectAllCompleted); m_popup->insertSeparator(); // ----- @@ -451,7 +451,7 @@ void DccTransferPanel::childAdjustFocus() { } -KListView* DccTransferPanel::getListView() +TDEListView* DccTransferPanel::getListView() { return m_listView; } diff --git a/konversation/src/dcctransferpanel.h b/konversation/src/dcctransferpanel.h index 52ed4ed..fb73b9b 100644 --- a/konversation/src/dcctransferpanel.h +++ b/konversation/src/dcctransferpanel.h @@ -21,8 +21,8 @@ class TQContextMenuEvent; class TQPushButton; -class KListView; -class KPopupMenu; +class TDEListView; +class TDEPopupMenu; class DccTransferDetailedInfoPanel; @@ -70,7 +70,7 @@ class DccTransferPanel : public ChatWindow DccTransferPanel(TQWidget* parent); ~DccTransferPanel(); - KListView* getListView(); + TDEListView* getListView(); protected slots: void slotNewTransferAdded( DccTransfer* transfer ); @@ -100,8 +100,8 @@ class DccTransferPanel : public ChatWindow void initGUI(); - KListView* m_listView; - KPopupMenu* m_popup; + TDEListView* m_listView; + TDEPopupMenu* m_popup; DccTransferDetailedInfoPanel* m_detailPanel; diff --git a/konversation/src/dcctransferpanelitem.cpp b/konversation/src/dcctransferpanelitem.cpp index 6c2a4b4..04862d5 100644 --- a/konversation/src/dcctransferpanelitem.cpp +++ b/konversation/src/dcctransferpanelitem.cpp @@ -35,7 +35,7 @@ DccTransferPanelItem::DccTransferPanelItem( DccTransferPanel* panel, DccTransfer* transfer ) - : KListViewItem( panel->getListView() ) + : TDEListViewItem( panel->getListView() ) , m_panel( panel ) , m_transfer( transfer ) , m_isTransferInstanceBackup( false ) @@ -158,7 +158,7 @@ void DccTransferPanelItem::stopAutoViewUpdate() void DccTransferPanelItem::paintCell( TQPainter* painter, const TQColorGroup& colorgroup, int column, int width, int alignment ) // virtual public { - KListViewItem::paintCell( painter, colorgroup, column, width, alignment ); + TDEListViewItem::paintCell( painter, colorgroup, column, width, alignment ); if ( column == DccTransferPanel::Column::Progress ) showProgressBar(); } diff --git a/konversation/src/dcctransferpanelitem.h b/konversation/src/dcctransferpanelitem.h index e6a0a63..9820b69 100644 --- a/konversation/src/dcctransferpanelitem.h +++ b/konversation/src/dcctransferpanelitem.h @@ -37,7 +37,7 @@ namespace TDEIO class DccTransferPanel; -class DccTransferPanelItem : public TQObject, public KListViewItem +class DccTransferPanelItem : public TQObject, public TDEListViewItem { Q_OBJECT diff --git a/konversation/src/fontappearance_preferences.ui b/konversation/src/fontappearance_preferences.ui index a50b3a0..1e288a2 100644 --- a/konversation/src/fontappearance_preferences.ui +++ b/konversation/src/fontappearance_preferences.ui @@ -72,7 +72,7 @@ the Free Software Foundation; either version 2 of the License, or Chat text: - + kcfg_TextFont @@ -80,7 +80,7 @@ the Free Software Foundation; either version 2 of the License, or false - + kcfg_ListFont @@ -88,7 +88,7 @@ the Free Software Foundation; either version 2 of the License, or false - + kcfg_TabFont diff --git a/konversation/src/highlight_preferencesui.ui b/konversation/src/highlight_preferencesui.ui index df28e7e..d44ec8c 100644 --- a/konversation/src/highlight_preferencesui.ui +++ b/konversation/src/highlight_preferencesui.ui @@ -30,7 +30,7 @@ unnamed - + RegEx diff --git a/konversation/src/highlightviewitem.cpp b/konversation/src/highlightviewitem.cpp index f6784a6..3339db0 100644 --- a/konversation/src/highlightviewitem.cpp +++ b/konversation/src/highlightviewitem.cpp @@ -19,7 +19,7 @@ #include -HighlightViewItem::HighlightViewItem(KListView* parent, Highlight* passed_Highlight) +HighlightViewItem::HighlightViewItem(TDEListView* parent, Highlight* passed_Highlight) : TQCheckListItem(parent, TQString(), TQCheckListItem::CheckBox) { setText(1,passed_Highlight->getPattern()); diff --git a/konversation/src/highlightviewitem.h b/konversation/src/highlightviewitem.h index d2d15dc..7b97800 100644 --- a/konversation/src/highlightviewitem.h +++ b/konversation/src/highlightviewitem.h @@ -22,12 +22,12 @@ class KURL; -class KListView; +class TDEListView; class HighlightViewItem : public TQCheckListItem { public: - HighlightViewItem(KListView* parent, Highlight* passed_Highlight); + HighlightViewItem(TDEListView* parent, Highlight* passed_Highlight); ~HighlightViewItem(); TQString getPattern(); diff --git a/konversation/src/ignore_preferences.cpp b/konversation/src/ignore_preferences.cpp index 8c705bc..ea4281e 100644 --- a/konversation/src/ignore_preferences.cpp +++ b/konversation/src/ignore_preferences.cpp @@ -170,7 +170,7 @@ void Ignore_Config::updateEnabledness() void Ignore_Config::select(TQListViewItem* item) { updateEnabledness(); - // FIXME: Cast to IgnoreListViewItem, maybe derive from KListView some day + // FIXME: Cast to IgnoreListViewItem, maybe derive from TDEListView some day IgnoreListViewItem* selectedItem=static_cast(item); if(selectedItem) diff --git a/konversation/src/ignore_preferencesui.ui b/konversation/src/ignore_preferencesui.ui index 501fa89..d310614 100644 --- a/konversation/src/ignore_preferencesui.ui +++ b/konversation/src/ignore_preferencesui.ui @@ -39,7 +39,7 @@ the Free Software Foundation; either version 2 of the License, or 0 - + Pattern diff --git a/konversation/src/ignorelistviewitem.cpp b/konversation/src/ignorelistviewitem.cpp index 7bae577..1e40457 100644 --- a/konversation/src/ignorelistviewitem.cpp +++ b/konversation/src/ignorelistviewitem.cpp @@ -19,7 +19,7 @@ IgnoreListViewItem::IgnoreListViewItem(TQListView* parent,const TQString& name,int newFlags): -KListViewItem(parent,name) +TDEListViewItem(parent,name) { setFlags(newFlags); } diff --git a/konversation/src/ignorelistviewitem.h b/konversation/src/ignorelistviewitem.h index c892c54..7718811 100644 --- a/konversation/src/ignorelistviewitem.h +++ b/konversation/src/ignorelistviewitem.h @@ -19,7 +19,7 @@ #include -class IgnoreListViewItem : public KListViewItem +class IgnoreListViewItem : public TDEListViewItem { public: IgnoreListViewItem(TQListView* parent,const TQString& name,int flags); diff --git a/konversation/src/ircview.cpp b/konversation/src/ircview.cpp index 6c010ca..cad6dfd 100644 --- a/konversation/src/ircview.cpp +++ b/konversation/src/ircview.cpp @@ -175,7 +175,7 @@ void IRCView::setServer(Server* newServer) if (newServer) { - KAction *action = newServer->getViewContainer()->actionCollection()->action("open_logfile"); + TDEAction *action = newServer->getViewContainer()->actionCollection()->action("open_logfile"); Q_ASSERT(action); if(!action) return; m_popup->insertSeparator(); @@ -1306,8 +1306,8 @@ bool IRCView::contextMenu(TQContextMenuEvent* ce) } else { - KActionCollection* actionCollection = KonversationApplication::instance()->getMainWindow()->actionCollection(); - KToggleAction* toggleMenuBarAction = static_cast(actionCollection->action("options_show_menubar")); + TDEActionCollection* actionCollection = KonversationApplication::instance()->getMainWindow()->actionCollection(); + TDEToggleAction* toggleMenuBarAction = static_cast(actionCollection->action("options_show_menubar")); if (toggleMenuBarAction && !toggleMenuBarAction->isChecked()) { @@ -1317,7 +1317,7 @@ bool IRCView::contextMenu(TQContextMenuEvent* ce) m_popup->setItemEnabled(Copy,(hasSelectedText())); - KAction* channelSettingsAction = 0; + TDEAction* channelSettingsAction = 0; if (m_chatWin->getType() == ChatWindow::Channel) { @@ -1386,9 +1386,9 @@ bool IRCView::contextMenu(TQContextMenuEvent* ce) void IRCView::setupNickPopupMenu() { - m_nickPopup = new KPopupMenu(this,"nicklist_context_menu"); - m_modes = new KPopupMenu(this,"nicklist_modes_context_submenu"); - m_kickban = new KPopupMenu(this,"nicklist_kick_ban_context_submenu"); + m_nickPopup = new TDEPopupMenu(this,"nicklist_context_menu"); + m_modes = new TDEPopupMenu(this,"nicklist_modes_context_submenu"); + m_kickban = new TDEPopupMenu(this,"nicklist_kick_ban_context_submenu"); m_nickPopupId= m_nickPopup->insertTitle(m_currentNick); m_nickPopup->insertItem(i18n("&Whois"),Konversation::Whois); @@ -1469,7 +1469,7 @@ void IRCView::updateNickMenuEntries(TQPopupMenu* popup, const TQString& nickname void IRCView::setupQueryPopupMenu() { - m_nickPopup = new KPopupMenu(this,"query_context_menu"); + m_nickPopup = new TDEPopupMenu(this,"query_context_menu"); m_nickPopupId = m_nickPopup->insertTitle(m_currentNick); m_nickPopup->insertItem(i18n("&Whois"),Konversation::Whois); m_nickPopup->insertItem(i18n("&Version"),Konversation::Version); @@ -1491,7 +1491,7 @@ void IRCView::setupQueryPopupMenu() void IRCView::setupChannelPopupMenu() { - m_channelPopup = new KPopupMenu(this,"channel_context_menu"); + m_channelPopup = new TDEPopupMenu(this,"channel_context_menu"); m_channelPopupId = m_channelPopup->insertTitle(m_currentChannel); m_channelPopup->insertItem(i18n("&Join"),Konversation::Join); m_channelPopup->insertItem(i18n("Get &user list"),Konversation::Names); @@ -1738,13 +1738,13 @@ void IRCView::keyPressEvent(TQKeyEvent* e) { KKey key(e); - if (KStdAccel::copy().contains(key)) + if (TDEStdAccel::copy().contains(key)) { copy(); e->accept(); return; } - else if (KStdAccel::paste().contains(key)) + else if (TDEStdAccel::paste().contains(key)) { emit textPasted(false); e->accept(); diff --git a/konversation/src/ircview.h b/konversation/src/ircview.h index 26b6297..1387bd9 100644 --- a/konversation/src/ircview.h +++ b/konversation/src/ircview.h @@ -28,7 +28,7 @@ class TQDropEvent; class TQDragEnterEvent; class TQEvent; -class KPopupMenu; +class TDEPopupMenu; class Server; class ChatWindow; @@ -195,10 +195,10 @@ class IRCView : public KTextBrowser TQPopupMenu* m_popup; int toggleMenuBarSeparator; int copyUrlMenuSeparator; - KPopupMenu* m_nickPopup; - KPopupMenu* m_channelPopup; - KPopupMenu* m_modes; - KPopupMenu* m_kickban; + TDEPopupMenu* m_nickPopup; + TDEPopupMenu* m_channelPopup; + TDEPopupMenu* m_modes; + TDEPopupMenu* m_kickban; static TQChar LRM; static TQChar RLM; diff --git a/konversation/src/konversationmainwindow.cpp b/konversation/src/konversationmainwindow.cpp index db72205..2d644e7 100644 --- a/konversation/src/konversationmainwindow.cpp +++ b/konversation/src/konversationmainwindow.cpp @@ -60,7 +60,7 @@ #endif -KonversationMainWindow::KonversationMainWindow() : KMainWindow(0,"main_window", WStyle_ContextHelp | WType_TopLevel | WDestructiveClose) +KonversationMainWindow::KonversationMainWindow() : TDEMainWindow(0,"main_window", WStyle_ContextHelp | WType_TopLevel | WDestructiveClose) { m_hasDirtySettings = false; m_closeApp = false; @@ -123,98 +123,98 @@ KonversationMainWindow::KonversationMainWindow() : KMainWindow(0,"main_window", KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolbar()), actionCollection()); KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(openKeyBindings()), actionCollection()); - KAction *preferencesAction = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(openPrefsDialog()), actionCollection()); + TDEAction *preferencesAction = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(openPrefsDialog()), actionCollection()); #ifdef USE_KNOTIFY // options_configure_notifications - KAction *configureNotificationsAction = KStdAction::configureNotifications(TQT_TQOBJECT(this),TQT_SLOT(openNotifications()), actionCollection()); + TDEAction *configureNotificationsAction = KStdAction::configureNotifications(TQT_TQOBJECT(this),TQT_SLOT(openNotifications()), actionCollection()); #endif - KAction* action; + TDEAction* action; - (new KAction(i18n("&Server List..."), "server", KShortcut("F2"), TQT_TQOBJECT(this), TQT_SLOT(openServerList()), + (new TDEAction(i18n("&Server List..."), "server", TDEShortcut("F2"), TQT_TQOBJECT(this), TQT_SLOT(openServerList()), actionCollection(), "open_server_list"))->setToolTip(i18n("Manage networks and servers")); - (new KAction(i18n("Quick &Connect..."), "connect_creating", KShortcut("F7"), TQT_TQOBJECT(this), TQT_SLOT(openQuickConnectDialog()), + (new TDEAction(i18n("Quick &Connect..."), "connect_creating", TDEShortcut("F7"), TQT_TQOBJECT(this), TQT_SLOT(openQuickConnectDialog()), actionCollection(), "quick_connect_dialog"))->setToolTip(i18n("Type in the address of a new IRC server to connect to")); - action = new KAction(i18n("&Reconnect"), "connect_creating", 0, m_viewContainer, TQT_SLOT(reconnectFrontServer()), actionCollection(), "reconnect_server"); + action = new TDEAction(i18n("&Reconnect"), "connect_creating", 0, m_viewContainer, TQT_SLOT(reconnectFrontServer()), actionCollection(), "reconnect_server"); action->setEnabled(false); action->setToolTip(i18n("Reconnect to the current server.")); - action = new KAction(i18n("&Disconnect"), "connect_no", 0, m_viewContainer, TQT_SLOT(disconnectFrontServer()), actionCollection(), "disconnect_server"); + action = new TDEAction(i18n("&Disconnect"), "connect_no", 0, m_viewContainer, TQT_SLOT(disconnectFrontServer()), actionCollection(), "disconnect_server"); action->setEnabled(false); action->setToolTip(i18n("Disconnect from the current server.")); - (new KAction(i18n("&Identities..."), "identity", KShortcut("F8"), TQT_TQOBJECT(this), TQT_SLOT(openIdentitiesDialog()), + (new TDEAction(i18n("&Identities..."), "identity", TDEShortcut("F8"), TQT_TQOBJECT(this), TQT_SLOT(openIdentitiesDialog()), actionCollection(), "identities_dialog"))->setToolTip(i18n("Manage your nick, away and other identity settings")); - new KToggleAction(i18n("&Watched Nicks Online"), "kontact_contacts", KShortcut("F4"), m_viewContainer, TQT_SLOT(openNicksOnlinePanel()), actionCollection(), "open_nicksonline_window"); - new KToggleAction(i18n("&DCC Status"), "2rightarrow", KShortcut("F9"), m_viewContainer, TQT_SLOT(toggleDccPanel()), actionCollection(), "open_dccstatus_window"); - action = new KAction(i18n("&Open Logfile"), "history", KShortcut("Ctrl+O"), m_viewContainer, TQT_SLOT(openLogFile()), actionCollection(), "open_logfile"); + new TDEToggleAction(i18n("&Watched Nicks Online"), "kontact_contacts", TDEShortcut("F4"), m_viewContainer, TQT_SLOT(openNicksOnlinePanel()), actionCollection(), "open_nicksonline_window"); + new TDEToggleAction(i18n("&DCC Status"), "2rightarrow", TDEShortcut("F9"), m_viewContainer, TQT_SLOT(toggleDccPanel()), actionCollection(), "open_dccstatus_window"); + action = new TDEAction(i18n("&Open Logfile"), "history", TDEShortcut("Ctrl+O"), m_viewContainer, TQT_SLOT(openLogFile()), actionCollection(), "open_logfile"); action->setEnabled(false); action->setToolTip(i18n("Open the known history for this channel in a new tab")); - action = new KAction(i18n("&Channel Settings..."), "edit", m_viewContainer, TQT_SLOT(openChannelSettings()), actionCollection(), "channel_settings"); + action = new TDEAction(i18n("&Channel Settings..."), "edit", m_viewContainer, TQT_SLOT(openChannelSettings()), actionCollection(), "channel_settings"); action->setEnabled(false); action->setToolTip(i18n("Open the channel settings dialog for this tab")); - KToggleAction* channelListAction = new KToggleAction(i18n("Channel &List"), "view_text", KShortcut("F5"), m_viewContainer, TQT_SLOT(openChannelList()), actionCollection(), "open_channel_list"); + TDEToggleAction* channelListAction = new TDEToggleAction(i18n("Channel &List"), "view_text", TDEShortcut("F5"), m_viewContainer, TQT_SLOT(openChannelList()), actionCollection(), "open_channel_list"); channelListAction->setEnabled(false); channelListAction->setToolTip(i18n("Show a list of all the known channels on this server")); - action = new KToggleAction(i18n("&URL Catcher"), "enhanced_browsing", KShortcut("F6"), m_viewContainer, TQT_SLOT(addUrlCatcher()), actionCollection(), "open_url_catcher"); + action = new TDEToggleAction(i18n("&URL Catcher"), "enhanced_browsing", TDEShortcut("F6"), m_viewContainer, TQT_SLOT(addUrlCatcher()), actionCollection(), "open_url_catcher"); action->setToolTip(i18n("List all URLs that have been mentioned recently in a new tab")); if (kapp->authorize("shell_access")) { - action = new KAction(i18n("New &Konsole"), "openterm", 0, m_viewContainer, TQT_SLOT(addKonsolePanel()), actionCollection(), "open_konsole"); + action = new TDEAction(i18n("New &Konsole"), "openterm", 0, m_viewContainer, TQT_SLOT(addKonsolePanel()), actionCollection(), "open_konsole"); action->setToolTip(i18n("Open a terminal in a new tab")); } // Actions to navigate through the different pages - KShortcut nextShortcut = KStdAccel::tabNext(); + TDEShortcut nextShortcut = TDEStdAccel::tabNext(); nextShortcut.setSeq(1, KKeySequence("Alt+Right")); - KShortcut prevShortcut = KStdAccel::tabPrev(); + TDEShortcut prevShortcut = TDEStdAccel::tabPrev(); prevShortcut.setSeq(1, KKeySequence("Alt+Left")); - action = new KAction(i18n("&Next Tab"), TQApplication::reverseLayout() ? "previous" : "next", + action = new TDEAction(i18n("&Next Tab"), TQApplication::reverseLayout() ? "previous" : "next", TQApplication::reverseLayout() ? prevShortcut : nextShortcut, m_viewContainer, TQT_SLOT(showNextView()), actionCollection(), "next_tab"); action->setEnabled(false); - action = new KAction(i18n("&Previous Tab"), TQApplication::reverseLayout() ? "next" : "previous", + action = new TDEAction(i18n("&Previous Tab"), TQApplication::reverseLayout() ? "next" : "previous", TQApplication::reverseLayout() ? nextShortcut : prevShortcut, m_viewContainer, TQT_SLOT(showPreviousView()),actionCollection(),"previous_tab"); action->setEnabled(false); - action = new KAction(i18n("Close &Tab"),"tab_remove",KShortcut("Ctrl+w"), m_viewContainer, TQT_SLOT(closeCurrentView()),actionCollection(),"close_tab"); + action = new TDEAction(i18n("Close &Tab"),"tab_remove",TDEShortcut("Ctrl+w"), m_viewContainer, TQT_SLOT(closeCurrentView()),actionCollection(),"close_tab"); action->setEnabled(false); - action = new KAction(i18n("Next Active Tab"), 0, KShortcut("Ctrl+Alt+Space"), m_viewContainer, TQT_SLOT(showNextActiveView()), + action = new TDEAction(i18n("Next Active Tab"), 0, TDEShortcut("Ctrl+Alt+Space"), m_viewContainer, TQT_SLOT(showNextActiveView()), actionCollection(), "next_active_tab"); action->setEnabled(false); if (Preferences::tabPlacement()==PreferencesBase::Left) { - action = new KAction(i18n("Move Tab Up"), "1uparrow", KShortcut("Alt+Shift+Left"), + action = new TDEAction(i18n("Move Tab Up"), "1uparrow", TDEShortcut("Alt+Shift+Left"), m_viewContainer, TQT_SLOT(moveViewLeft()), actionCollection(), "move_tab_left"); action->setEnabled(false); action->setToolTip("Move this tab"); - action = new KAction(i18n("Move Tab Down"), "1downarrow", KShortcut("Alt+Shift+Right"), + action = new TDEAction(i18n("Move Tab Down"), "1downarrow", TDEShortcut("Alt+Shift+Right"), m_viewContainer, TQT_SLOT(moveViewRight()), actionCollection(), "move_tab_right"); action->setEnabled(false); action->setToolTip("Move this tab"); } else { - KAction* action2; + TDEAction* action2; if (TQApplication::reverseLayout()) { - action2 = new KAction(i18n("Move Tab Right"), "1rightarrow", KShortcut("Alt+Shift+Right"), + action2 = new TDEAction(i18n("Move Tab Right"), "1rightarrow", TDEShortcut("Alt+Shift+Right"), m_viewContainer, TQT_SLOT(moveViewLeft()), actionCollection(), "move_tab_left"); - action = new KAction(i18n("Move Tab Left"), "1leftarrow", KShortcut("Alt+Shift+Left"), + action = new TDEAction(i18n("Move Tab Left"), "1leftarrow", TDEShortcut("Alt+Shift+Left"), m_viewContainer, TQT_SLOT(moveViewRight()), actionCollection(), "move_tab_right"); } else { - action = new KAction(i18n("Move Tab Left"), "1leftarrow", KShortcut("Alt+Shift+Left"), + action = new TDEAction(i18n("Move Tab Left"), "1leftarrow", TDEShortcut("Alt+Shift+Left"), m_viewContainer, TQT_SLOT(moveViewLeft()), actionCollection(), "move_tab_left"); - action2 = new KAction(i18n("Move Tab Right"), "1rightarrow", KShortcut("Alt+Shift+Right"), + action2 = new TDEAction(i18n("Move Tab Right"), "1rightarrow", TDEShortcut("Alt+Shift+Right"), m_viewContainer, TQT_SLOT(moveViewRight()), actionCollection(), "move_tab_right"); } @@ -224,16 +224,16 @@ KonversationMainWindow::KonversationMainWindow() : KMainWindow(0,"main_window", action2->setToolTip("Move this tab"); } - action = new KAction(i18n("Rejoin Channel"), 0, m_viewContainer, TQT_SLOT(rejoinChannel()), actionCollection(), "rejoin_channel"); + action = new TDEAction(i18n("Rejoin Channel"), 0, m_viewContainer, TQT_SLOT(rejoinChannel()), actionCollection(), "rejoin_channel"); action->setEnabled(false); - action = new KToggleAction(i18n("Enable Notifications"), 0, 0, m_viewContainer, TQT_SLOT(toggleViewNotifications()), actionCollection(), "tab_notifications"); + action = new TDEToggleAction(i18n("Enable Notifications"), 0, 0, m_viewContainer, TQT_SLOT(toggleViewNotifications()), actionCollection(), "tab_notifications"); action->setEnabled(false); - action = new KToggleAction(i18n("Join on Connect"), 0, 0, m_viewContainer, TQT_SLOT(toggleAutoJoin()), actionCollection(), "tab_autojoin"); + action = new TDEToggleAction(i18n("Join on Connect"), 0, 0, m_viewContainer, TQT_SLOT(toggleAutoJoin()), actionCollection(), "tab_autojoin"); action->setEnabled(false); - KSelectAction* selectAction = new KSelectAction(i18n("Set Encoding"), "charset", 0, actionCollection(), "tab_encoding"); + TDESelectAction* selectAction = new TDESelectAction(i18n("Set Encoding"), "charset", 0, actionCollection(), "tab_encoding"); selectAction->setEditable(false); TQStringList encodingDescs = Konversation::IRCCharsets::self()->availableEncodingDescriptiveNames(); encodingDescs.prepend(i18n("Default")); @@ -246,26 +246,26 @@ KonversationMainWindow::KonversationMainWindow() : KMainWindow(0,"main_window", for (uint i = 1; i <= 10; ++i) { - KAction* tabSelectionAction = new KAction(i18n("Go to Tab %1").arg(i), 0, KShortcut(TQString("Alt+%1").arg(i%10)), + TDEAction* tabSelectionAction = new TDEAction(i18n("Go to Tab %1").arg(i), 0, TDEShortcut(TQString("Alt+%1").arg(i%10)), tabSelectionMapper, TQT_SLOT(map()), actionCollection(), TQString("go_to_tab_%1").arg(i).local8Bit()); tabSelectionMapper->setMapping( tabSelectionAction, i-1); } - action = new KAction(i18n("Clear &Marker Lines"), 0, KShortcut("CTRL+SHIFT+R"), m_viewContainer, TQT_SLOT(clearViewLines()),actionCollection(),"clear_lines"); + action = new TDEAction(i18n("Clear &Marker Lines"), 0, TDEShortcut("CTRL+SHIFT+R"), m_viewContainer, TQT_SLOT(clearViewLines()),actionCollection(),"clear_lines"); action->setToolTip(i18n("Clear marker lines in the current tab")); action->setEnabled(false); - action = new KAction(i18n("&Clear Window"), 0, KShortcut("Ctrl+L"), m_viewContainer, TQT_SLOT(clearView()),actionCollection(),"clear_window"); + action = new TDEAction(i18n("&Clear Window"), 0, TDEShortcut("Ctrl+L"), m_viewContainer, TQT_SLOT(clearView()),actionCollection(),"clear_window"); action->setToolTip(i18n("Clear the contents of the current tab")); action->setEnabled(false); - action = new KAction(i18n("Clear &All Windows"),0,KShortcut("CTRL+SHIFT+L"), m_viewContainer, TQT_SLOT(clearAllViews()),actionCollection(),"clear_tabs"); + action = new TDEAction(i18n("Clear &All Windows"),0,TDEShortcut("CTRL+SHIFT+L"), m_viewContainer, TQT_SLOT(clearAllViews()),actionCollection(),"clear_tabs"); action->setToolTip(i18n("Clear the contents of all open tabs")); action->setEnabled(false); - KToggleAction* awayAction = new KToggleAction(i18n("Global Away"), KShortcut("Ctrl+Shift+A"), actionCollection(), "toggle_away"); + TDEToggleAction* awayAction = new TDEToggleAction(i18n("Global Away"), TDEShortcut("Ctrl+Shift+A"), actionCollection(), "toggle_away"); connect(awayAction, TQT_SIGNAL(toggled(bool)), static_cast(kapp)->getAwayManager(), TQT_SLOT(toggleGlobalAway(bool))); awayAction->setEnabled(false); - action = new KAction(i18n("&Join Channel..."), "add", KShortcut("Ctrl+J"), m_viewContainer, TQT_SLOT(showJoinChannelDialog()), actionCollection(), "join_channel"); + action = new TDEAction(i18n("&Join Channel..."), "add", TDEShortcut("Ctrl+J"), m_viewContainer, TQT_SLOT(showJoinChannelDialog()), actionCollection(), "join_channel"); action->setEnabled(false); action->setToolTip("Join a new channel on this server"); @@ -276,21 +276,21 @@ KonversationMainWindow::KonversationMainWindow() : KMainWindow(0,"main_window", action = KStdAction::findPrev(m_viewContainer, TQT_SLOT(findPrevText()), actionCollection()); action->setEnabled(false); - action = new KAction(i18n("&IRC Color..."), "colorize", CTRL+Key_K, m_viewContainer, TQT_SLOT(insertIRCColor()), actionCollection(), "irc_colors"); + action = new TDEAction(i18n("&IRC Color..."), "colorize", CTRL+Key_K, m_viewContainer, TQT_SLOT(insertIRCColor()), actionCollection(), "irc_colors"); action->setToolTip(i18n("Set the color of your current IRC message")); action->setEnabled(false); - action = new KAction(i18n("&Marker Line"), 0, KShortcut("Ctrl+R") , m_viewContainer, TQT_SLOT(insertMarkerLine()), actionCollection(), "insert_marker_line"); + action = new TDEAction(i18n("&Marker Line"), 0, TDEShortcut("Ctrl+R") , m_viewContainer, TQT_SLOT(insertMarkerLine()), actionCollection(), "insert_marker_line"); action->setToolTip(i18n("Insert a horizontal line into the current tab that only you can see")); action->setEnabled(false); - action = new KAction(i18n("Special &Character..."), "char", KShortcut("Alt+Shift+C"), m_viewContainer, TQT_SLOT(insertCharacter()), actionCollection(), "insert_character"); + action = new TDEAction(i18n("Special &Character..."), "char", TDEShortcut("Alt+Shift+C"), m_viewContainer, TQT_SLOT(insertCharacter()), actionCollection(), "insert_character"); action->setToolTip(i18n("Insert any character into your current IRC message")); action->setEnabled(false); - action = new KAction(i18n("Close &All Open Queries"), 0, KShortcut("F11"), m_viewContainer, TQT_SLOT(closeQueries()), actionCollection(), "close_queries"); + action = new TDEAction(i18n("Close &All Open Queries"), 0, TDEShortcut("F11"), m_viewContainer, TQT_SLOT(closeQueries()), actionCollection(), "close_queries"); action->setEnabled(false); - KToggleAction* toggleChannelNickListsAction = new KToggleAction(i18n("Hide Nicklist"), 0, - KShortcut("Ctrl+H"), m_viewContainer, TQT_SLOT(toggleChannelNicklists()), actionCollection(), "hide_nicknamelist"); + TDEToggleAction* toggleChannelNickListsAction = new TDEToggleAction(i18n("Hide Nicklist"), 0, + TDEShortcut("Ctrl+H"), m_viewContainer, TQT_SLOT(toggleChannelNicklists()), actionCollection(), "hide_nicknamelist"); if (!Preferences::showNickList()) toggleChannelNickListsAction->setChecked(true); @@ -299,7 +299,7 @@ KonversationMainWindow::KonversationMainWindow() : KMainWindow(0,"main_window", connect(TQT_TQOBJECT(this), TQT_SIGNAL(endNotification()), m_trayIcon, TQT_SLOT(endNotification())); connect(KonversationApplication::instance(), TQT_SIGNAL(iconChanged(int)), m_trayIcon, TQT_SLOT(updateAppearance())); connect(m_trayIcon, TQT_SIGNAL(quitSelected()), TQT_TQOBJECT(this), TQT_SLOT(quitProgram())); - KPopupMenu *trayMenu = m_trayIcon->contextMenu(); + TDEPopupMenu *trayMenu = m_trayIcon->contextMenu(); #ifdef USE_KNOTIFY configureNotificationsAction->plug(trayMenu); #endif @@ -413,21 +413,21 @@ void KonversationMainWindow::hideEvent(TQHideEvent *e) m_statusBar->clearMainLabelTempText(); - KMainWindow::hideEvent(e); + TDEMainWindow::hideEvent(e); } void KonversationMainWindow::showEvent(TQShowEvent *e) { emit cancelRememberLine(); - KMainWindow::showEvent(e); + TDEMainWindow::showEvent(e); } void KonversationMainWindow::leaveEvent(TQEvent* e) { m_statusBar->clearMainLabelTempText(); - KMainWindow::leaveEvent(e); + TDEMainWindow::leaveEvent(e); } bool KonversationMainWindow::event(TQEvent* e) @@ -445,7 +445,7 @@ bool KonversationMainWindow::event(TQEvent* e) emit triggerRememberLine(); } - return KMainWindow::event(e); + return TDEMainWindow::event(e); } void KonversationMainWindow::settingsChangedSlot() diff --git a/konversation/src/konversationmainwindow.h b/konversation/src/konversationmainwindow.h index 99136cd..a891778 100644 --- a/konversation/src/konversationmainwindow.h +++ b/konversation/src/konversationmainwindow.h @@ -28,7 +28,7 @@ #include -class KToggleAction; +class TDEToggleAction; class KScriptManager; class KonviBookmarkHandler; @@ -45,7 +45,7 @@ namespace Konversation class TrayIcon; } -class KonversationMainWindow : public KMainWindow +class KonversationMainWindow : public TDEMainWindow { Q_OBJECT @@ -134,9 +134,9 @@ class KonversationMainWindow : public KMainWindow KonversationStatusBar* m_statusBar; Konversation::TrayIcon* m_trayIcon; - KToggleAction* hideMenuBarAction; + TDEToggleAction* hideMenuBarAction; - KPopupMenu* m_bookmarks; + TDEPopupMenu* m_bookmarks; KonviBookmarkHandler* m_bookmarkHandler; KonviSettingsDialog *m_settingsDialog; Konversation::ServerListDialog* m_serverListDialog; diff --git a/konversation/src/konvibookmarkhandler.cpp b/konversation/src/konvibookmarkhandler.cpp index 9002484..af645a8 100644 --- a/konversation/src/konvibookmarkhandler.cpp +++ b/konversation/src/konvibookmarkhandler.cpp @@ -32,7 +32,7 @@ KonviBookmarkHandler::KonviBookmarkHandler(KonversationMainWindow* mainWindow) KBookmarkOwner(), m_mainWindow(mainWindow) { - m_menu = static_cast(mainWindow->factory()->container("bookmarks", mainWindow)); + m_menu = static_cast(mainWindow->factory()->container("bookmarks", mainWindow)); m_file = locate( "data", "konversation/bookmarks.xml" ); diff --git a/konversation/src/konvibookmarkhandler.h b/konversation/src/konvibookmarkhandler.h index 515aa4a..af40f3e 100644 --- a/konversation/src/konvibookmarkhandler.h +++ b/konversation/src/konvibookmarkhandler.h @@ -22,7 +22,7 @@ Copyright (C) 2002 Carsten Pfeiffer class TQString; -class KPopupMenu; +class TDEPopupMenu; class KonversationMainWindow; class KonviBookmarkMenu; @@ -35,7 +35,7 @@ class KonviBookmarkHandler : public TQObject, public KBookmarkOwner explicit KonviBookmarkHandler(KonversationMainWindow *mainWindow); ~KonviBookmarkHandler(); - KPopupMenu* popupMenu(); + TDEPopupMenu* popupMenu(); // KBookmarkOwner interface: virtual void openBookmarkURL(const TQString& url, const TQString& title); @@ -49,7 +49,7 @@ class KonviBookmarkHandler : public TQObject, public KBookmarkOwner private: KonversationMainWindow* m_mainWindow; - KPopupMenu *m_menu; + TDEPopupMenu *m_menu; KonviBookmarkMenu *m_bookmarkMenu; TQString m_file; }; diff --git a/konversation/src/konvibookmarkmenu.cpp b/konversation/src/konvibookmarkmenu.cpp index 183f2d7..14687b4 100644 --- a/konversation/src/konvibookmarkmenu.cpp +++ b/konversation/src/konvibookmarkmenu.cpp @@ -25,8 +25,8 @@ Copyright (C) 2002 Carsten Pfeiffer KonviBookmarkMenu::KonviBookmarkMenu( KBookmarkManager* mgr, -KonviBookmarkHandler * _owner, KPopupMenu * _parentMenu, -KActionCollection *collec, bool _isRoot, bool _add, +KonviBookmarkHandler * _owner, TDEPopupMenu * _parentMenu, +TDEActionCollection *collec, bool _isRoot, bool _add, const TQString & parentAddress ) : KBookmarkMenu( mgr, _owner, _parentMenu, collec, _isRoot, _add, parentAddress), m_kOwner(_owner) @@ -48,7 +48,7 @@ m_kOwner(_owner) * * Why did I do this? * - when KBookmarkMenu::fillbBookmarkMenu() creates sub-KBookmarkMenus. - * - when ... adds KActions, it uses KBookmarkMenu::slotBookmarkSelected() + * - when ... adds TDEActions, it uses KBookmarkMenu::slotBookmarkSelected() * instead of KonviBookmarkMenu::slotBookmarkSelected(). */ void KonviBookmarkMenu::slotAboutToShow2() @@ -64,7 +64,7 @@ void KonviBookmarkMenu::slotAboutToShow2() void KonviBookmarkMenu::refill() { m_lstSubMenus.clear(); - TQPtrListIterator it( m_actions ); + TQPtrListIterator it( m_actions ); for (; it.current(); ++it ) it.current()->unplug( m_parentMenu ); m_parentMenu->clear(); @@ -109,7 +109,7 @@ void KonviBookmarkMenu::fillBookmarkMenu() { // kdDebug(1203) << "Creating URL bookmark menu item for " << bm.text() << endl; // create a normal URL item, with ID as a name - KAction * action = new KAction( text, bm.icon(), 0, + TDEAction * action = new TDEAction( text, bm.icon(), 0, this, TQT_SLOT( slotBookmarkSelected() ), m_actionCollection, bm.url().url().utf8() ); @@ -122,7 +122,7 @@ void KonviBookmarkMenu::fillBookmarkMenu() else { // kdDebug(1203) << "Creating bookmark submenu named " << bm.text() << endl; - KActionMenu * actionMenu = new KActionMenu( text, bm.icon(), + TDEActionMenu * actionMenu = new TDEActionMenu( text, bm.icon(), m_actionCollection, 0L ); actionMenu->plug( m_parentMenu ); m_actions.append( actionMenu ); @@ -148,7 +148,7 @@ void KonviBookmarkMenu::slotBookmarkSelected() if ( !m_pOwner ) return; // this view doesn't handle bookmarks... /* URL */ m_kOwner->openBookmarkURL( TQString::fromUtf8(TQT_TQOBJECT(const_cast(sender()))->name()), - ( (KAction *)sender() )->text() /* Title */ ); + ( (TDEAction *)sender() )->text() /* Title */ ); } #include "konvibookmarkmenu.moc" diff --git a/konversation/src/konvibookmarkmenu.h b/konversation/src/konvibookmarkmenu.h index 4e68e75..a4f53de 100644 --- a/konversation/src/konvibookmarkmenu.h +++ b/konversation/src/konvibookmarkmenu.h @@ -25,12 +25,12 @@ Copyright (C) 2002 Carsten Pfeiffer class TQString; class KBookmark; -class KAction; -class KActionMenu; -class KActionCollection; +class TDEAction; +class TDEActionMenu; +class TDEActionCollection; class KBookmarkOwner; class KBookmarkMenu; -class KPopupMenu; +class TDEPopupMenu; class KonviBookmarkHandler; class KonviBookmarkMenu; class KonviBookmarkMenuPrivate; @@ -42,8 +42,8 @@ class KonviBookmarkMenu : public KBookmarkMenu public: KonviBookmarkMenu( KBookmarkManager* mgr, - KonviBookmarkHandler * _owner, KPopupMenu * _parentMenu, - KActionCollection *collec, bool _isRoot, + KonviBookmarkHandler * _owner, TDEPopupMenu * _parentMenu, + TDEActionCollection *collec, bool _isRoot, bool _add = true, const TQString & parentAddress = ""); void fillBookmarkMenu(); diff --git a/konversation/src/konvisettingsdialog.cpp b/konversation/src/konvisettingsdialog.cpp index 7cfccd2..b2549fc 100644 --- a/konversation/src/konvisettingsdialog.cpp +++ b/konversation/src/konvisettingsdialog.cpp @@ -220,7 +220,7 @@ void KonviSettingsDialog::showEvent(TQShowEvent* e) KonviConfigDialog::showEvent(e); TQSplitter* splitter = ((TQSplitter*)child(0, TQSPLITTER_OBJECT_NAME_STRING, true)); - KListView* listView = ((KListView*)child(0, "KListView", true)); + TDEListView* listView = ((TDEListView*)child(0, "TDEListView", true)); if (splitter && listView) { diff --git a/konversation/src/linkaddressbook/addresseeitem.cpp b/konversation/src/linkaddressbook/addresseeitem.cpp index 46c3f62..0628a21 100644 --- a/konversation/src/linkaddressbook/addresseeitem.cpp +++ b/konversation/src/linkaddressbook/addresseeitem.cpp @@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA AddresseeItem::AddresseeItem( TQListView *parent, const KABC::Addressee &addressee) : -KListViewItem( parent ), +TDEListViewItem( parent ), mAddressee( addressee ) { //We can't save showphoto because we don't have a d pointer diff --git a/konversation/src/linkaddressbook/addresseeitem.h b/konversation/src/linkaddressbook/addresseeitem.h index fd5943b..702a487 100644 --- a/konversation/src/linkaddressbook/addresseeitem.h +++ b/konversation/src/linkaddressbook/addresseeitem.h @@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA /** @short Special ListViewItem */ -class AddresseeItem : public KListViewItem +class AddresseeItem : public TDEListViewItem { public: diff --git a/konversation/src/linkaddressbook/linkaddressbookui.cpp b/konversation/src/linkaddressbook/linkaddressbookui.cpp index 1a452a9..ea13141 100644 --- a/konversation/src/linkaddressbook/linkaddressbookui.cpp +++ b/konversation/src/linkaddressbook/linkaddressbookui.cpp @@ -71,7 +71,7 @@ LinkAddressbookUI::LinkAddressbookUI( TQWidget *parent, const char *name, const connect( m_addressBook, TQT_SIGNAL( addressBookChanged( AddressBook * ) ), this, TQT_SLOT( slotLoadAddressees() ) ); connect( Konversation::Addressbook::self(), TQT_SIGNAL(addresseesChanged()), this, TQT_SLOT(slotLoadAddressees())); - //We should add a clear KAction here. But we can't really do that with a designer file :\ this sucks + //We should add a clear TDEAction here. But we can't really do that with a designer file :\ this sucks m_ircnick = ircnick; m_lower_ircnick = m_ircnick.lower(); diff --git a/konversation/src/linkaddressbook/linkaddressbookui_base.ui b/konversation/src/linkaddressbook/linkaddressbookui_base.ui index 1fa3c3e..7ff10a2 100644 --- a/konversation/src/linkaddressbook/linkaddressbookui_base.ui +++ b/konversation/src/linkaddressbook/linkaddressbookui_base.ui @@ -68,7 +68,7 @@ - + Photo @@ -150,7 +150,7 @@ kListViewSearchLine - + kListViewSearchLine diff --git a/konversation/src/linkaddressbook/nicksonlinetooltip.cpp b/konversation/src/linkaddressbook/nicksonlinetooltip.cpp index 9c4df71..8a16628 100644 --- a/konversation/src/linkaddressbook/nicksonlinetooltip.cpp +++ b/konversation/src/linkaddressbook/nicksonlinetooltip.cpp @@ -42,7 +42,7 @@ namespace Konversation { if( !parentWidget() || !m_nicksOnline || !m_nicksOnline->getNickListView() ) return; - KListView *m_listView = m_nicksOnline->getNickListView(); + TDEListView *m_listView = m_nicksOnline->getNickListView(); TQListViewItem *item = m_listView->itemAt( pos ); if( !item ) return; diff --git a/konversation/src/logfilereader.cpp b/konversation/src/logfilereader.cpp index 53cc3a0..2e6e2bc 100644 --- a/konversation/src/logfilereader.cpp +++ b/konversation/src/logfilereader.cpp @@ -43,7 +43,7 @@ LogfileReader::LogfileReader(TQWidget* parent, const TQString& log) : ChatWindow fileName = log; TQDockArea* toolBarDock = new TQDockArea(Qt::Horizontal,TQDockArea::Normal,this,"logfile_toolbar_dock"); - toolBar = new KToolBar(toolBarDock,"logfile_toolbar",true,true); + toolBar = new TDEToolBar(toolBarDock,"logfile_toolbar",true,true); toolBar->insertButton("filesaveas",0,TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(saveLog()),true,i18n("Save As...")); diff --git a/konversation/src/logfilereader.h b/konversation/src/logfilereader.h index 46bc7a5..57c864f 100644 --- a/konversation/src/logfilereader.h +++ b/konversation/src/logfilereader.h @@ -20,7 +20,7 @@ #include -class KToolBar; +class TDEToolBar; class TQSpinBox; class LogfileReader : public ChatWindow @@ -53,7 +53,7 @@ class LogfileReader : public ChatWindow /** Called from ChatWindow adjustFocus */ virtual void childAdjustFocus(); - KToolBar* toolBar; + TDEToolBar* toolBar; TQSpinBox* sizeSpin; TQString fileName; }; diff --git a/konversation/src/nick.cpp b/konversation/src/nick.cpp index 2f44e4d..0bfa9cb 100644 --- a/konversation/src/nick.cpp +++ b/konversation/src/nick.cpp @@ -24,10 +24,10 @@ #include "konversationapplication.h" #include "preferences.h" -Nick::Nick(KListView *listView, +Nick::Nick(TDEListView *listView, const ChannelNickPtr& channelnick) : TQObject (), - KListViewItem (listView, listView->lastItem(), TQString(), + TDEListViewItem (listView, listView->lastItem(), TQString(), channelnick->getNickname(), channelnick->getHostmask()) { m_channelnickptr = channelnick; @@ -241,7 +241,7 @@ void Nick::paintCell(TQPainter * p, const TQColorGroup & cg, int column, int wid cg2.setColor(TQColorGroup::Text, kapp->palette(listView()).disabled().text()); } - KListViewItem::paintCell(p,cg2,column,width,align); + TDEListViewItem::paintCell(p,cg2,column,width,align); } int Nick::getSortingValue() const diff --git a/konversation/src/nick.h b/konversation/src/nick.h index 933061e..c7f1a5c 100644 --- a/konversation/src/nick.h +++ b/konversation/src/nick.h @@ -20,12 +20,12 @@ #include "channelnick.h" -class Nick : public TQObject, public KListViewItem +class Nick : public TQObject, public TDEListViewItem { Q_OBJECT public: - Nick(KListView *listView, + Nick(TDEListView *listView, const ChannelNickPtr& channelnick); ~Nick(); diff --git a/konversation/src/nicklistbehavior_preferences.cpp b/konversation/src/nicklistbehavior_preferences.cpp index ad66c18..711d8c7 100644 --- a/konversation/src/nicklistbehavior_preferences.cpp +++ b/konversation/src/nicklistbehavior_preferences.cpp @@ -60,12 +60,12 @@ void NicklistBehavior_Config::setNickList(const TQString &sortingOrder) // get next mode char TQChar mode=sortingOrder[index-1]; // find appropriate description - if(mode=='-') new KListViewItem(sortOrder,mode,i18n("Normal Users")); - if(mode=='v') new KListViewItem(sortOrder,mode,i18n("Voice (+v)")); - if(mode=='h') new KListViewItem(sortOrder,mode,i18n("Halfops (+h)")); - if(mode=='o') new KListViewItem(sortOrder,mode,i18n("Operators (+o)")); - if(mode=='p') new KListViewItem(sortOrder,mode,i18n("Channel Admins (+p)")); - if(mode=='q') new KListViewItem(sortOrder,mode,i18n("Channel Owners (+q)")); + if(mode=='-') new TDEListViewItem(sortOrder,mode,i18n("Normal Users")); + if(mode=='v') new TDEListViewItem(sortOrder,mode,i18n("Voice (+v)")); + if(mode=='h') new TDEListViewItem(sortOrder,mode,i18n("Halfops (+h)")); + if(mode=='o') new TDEListViewItem(sortOrder,mode,i18n("Operators (+o)")); + if(mode=='p') new TDEListViewItem(sortOrder,mode,i18n("Channel Admins (+p)")); + if(mode=='q') new TDEListViewItem(sortOrder,mode,i18n("Channel Owners (+q)")); } } diff --git a/konversation/src/nicklistbehavior_preferencesui.ui b/konversation/src/nicklistbehavior_preferencesui.ui index 53b06ae..7d8335f 100644 --- a/konversation/src/nicklistbehavior_preferencesui.ui +++ b/konversation/src/nicklistbehavior_preferencesui.ui @@ -68,7 +68,7 @@ the Free Software Foundation; either version 2 of the License, or Sort b&y user status - + Mode diff --git a/konversation/src/nicklistview.cpp b/konversation/src/nicklistview.cpp index 26e6bdd..ba8cab9 100644 --- a/konversation/src/nicklistview.cpp +++ b/konversation/src/nicklistview.cpp @@ -28,15 +28,15 @@ NickListView::NickListView(TQWidget* parent, Channel *chan) : -KListView(parent) +TDEListView(parent) { - KListView::setSorting(-1); + TDEListView::setSorting(-1); setWhatsThis(); channel=chan; - popup=new KPopupMenu(this,"nicklist_context_menu"); - modes=new KPopupMenu(this,"nicklist_modes_context_submenu"); - kickban=new KPopupMenu(this,"nicklist_kick_ban_context_submenu"); - addressbook= new KPopupMenu(this,"nicklist_addressbook_context_submenu"); + popup=new TDEPopupMenu(this,"nicklist_context_menu"); + modes=new TDEPopupMenu(this,"nicklist_modes_context_submenu"); + kickban=new TDEPopupMenu(this,"nicklist_kick_ban_context_submenu"); + addressbook= new TDEPopupMenu(this,"nicklist_addressbook_context_submenu"); setAcceptDrops(true); setDropHighlighter(true); setDropVisualizer(false); @@ -191,9 +191,9 @@ void NickListView::startResortTimer() void NickListView::resort() { - KListView::setSorting(m_column, m_ascending); + TDEListView::setSorting(m_column, m_ascending); sort(); - KListView::setSorting(-1); + TDEListView::setSorting(-1); } void NickListView::contextMenuEvent(TQContextMenuEvent* ce) diff --git a/konversation/src/nicklistview.h b/konversation/src/nicklistview.h index 2f9906e..a7a2e8f 100644 --- a/konversation/src/nicklistview.h +++ b/konversation/src/nicklistview.h @@ -27,7 +27,7 @@ class TQPopupMenu; class TQContextMenuEvent; class TQTimer; -class NickListView : public KListView +class NickListView : public TDEListView { Q_OBJECT diff --git a/konversation/src/nicksonline.cpp b/konversation/src/nicksonline.cpp index 5549754..8213a60 100644 --- a/konversation/src/nicksonline.cpp +++ b/konversation/src/nicksonline.cpp @@ -52,7 +52,7 @@ NicksOnline::NicksOnline(TQWidget* parent): ChatWindow(parent) setName(i18n("Watched Nicks Online")); setType(ChatWindow::NicksOnline); - m_nickListView=new KListView(this); + m_nickListView=new TDEListView(this); // Set to false every 8 seconds to permit a whois on watched nicks lacking information. // Remove when server or addressbook does this automatically. @@ -159,7 +159,7 @@ NicksOnline::~NicksOnline() delete m_nickListView; } -KListView* NicksOnline::getNickListView() +TDEListView* NicksOnline::getNickListView() { return m_nickListView; } diff --git a/konversation/src/nicksonline.h b/konversation/src/nicksonline.h index 5f41730..b51f62a 100644 --- a/konversation/src/nicksonline.h +++ b/konversation/src/nicksonline.h @@ -25,7 +25,7 @@ #include -class KListView; +class TDEListView; class TQPushButton; class TQPopupMenu; @@ -65,7 +65,7 @@ class NicksOnline : public ChatWindow ~NicksOnline(); // These are here for the benefit of NicksOnlineTooltip. - KListView* getNickListView(); + TDEListView* getNickListView(); NickInfoPtr getNickInfo(const TQListViewItem* item); virtual bool canBeFrontView() { return true; } @@ -240,7 +240,7 @@ class NicksOnline : public ChatWindow void requestWhois(TQString& networkName, TQString& nickname); // The main display of networks, nicks, and channels. - KListView* m_nickListView; + TDEListView* m_nickListView; // Buttons on screen. TQPushButton* m_editContactButton; TQPushButton* m_changeAssociationButton; diff --git a/konversation/src/nicksonlineitem.cpp b/konversation/src/nicksonlineitem.cpp index 1ad2824..db3f7ba 100644 --- a/konversation/src/nicksonlineitem.cpp +++ b/konversation/src/nicksonlineitem.cpp @@ -13,13 +13,13 @@ NicksOnlineItem::NicksOnlineItem(int type, TQListView* parent, const TQString& name, const TQString& col2) : - KListViewItem(parent, name, col2) + TDEListViewItem(parent, name, col2) { m_type=type; } NicksOnlineItem::NicksOnlineItem(int type, TQListViewItem* parent, const TQString& name, const TQString& col2) : - KListViewItem(parent, name, col2) + TDEListViewItem(parent, name, col2) { m_type=type; } diff --git a/konversation/src/nicksonlineitem.h b/konversation/src/nicksonlineitem.h index e7e911d..3fed49a 100644 --- a/konversation/src/nicksonlineitem.h +++ b/konversation/src/nicksonlineitem.h @@ -15,7 +15,7 @@ #include -class NicksOnlineItem : public KListViewItem +class NicksOnlineItem : public TDEListViewItem { public: enum NickListViewColumn diff --git a/konversation/src/osd_preferencesui.ui b/konversation/src/osd_preferencesui.ui index 2837552..8e51e34 100644 --- a/konversation/src/osd_preferencesui.ui +++ b/konversation/src/osd_preferencesui.ui @@ -86,7 +86,7 @@ kFontRequester1 - + kcfg_OSDFont diff --git a/konversation/src/quickbuttons_preferences.cpp b/konversation/src/quickbuttons_preferences.cpp index b309feb..674126f 100644 --- a/konversation/src/quickbuttons_preferences.cpp +++ b/konversation/src/quickbuttons_preferences.cpp @@ -72,7 +72,7 @@ void QuickButtons_Config::setButtonsListView(const TQStringList &buttonList) // get button definition TQString definition=buttonList[index-1]; // cut definition apart in name and action, and create a new listview item - new KListViewItem(buttonListView,definition.section(',',0,0),definition.section(',',1)); + new TDEListViewItem(buttonListView,definition.section(',',0,0),definition.section(',',1)); } // for buttonListView->setSelected(buttonListView->firstChild(), true); } @@ -209,7 +209,7 @@ void QuickButtons_Config::actionChanged(const TQString& newAction) void QuickButtons_Config::addEntry() { // add new item at the bottom of list view - KListViewItem* newItem=new KListViewItem(buttonListView,buttonListView->lastChild(),i18n("New"),TQString()); + TDEListViewItem* newItem=new TDEListViewItem(buttonListView,buttonListView->lastChild(),i18n("New"),TQString()); // if successful ... if(newItem) { diff --git a/konversation/src/quickbuttons_preferencesui.ui b/konversation/src/quickbuttons_preferencesui.ui index c0fd88f..1aac4ca 100644 --- a/konversation/src/quickbuttons_preferencesui.ui +++ b/konversation/src/quickbuttons_preferencesui.ui @@ -19,7 +19,7 @@ 0 - + Button Name diff --git a/konversation/src/servergroupdialogui.ui b/konversation/src/servergroupdialogui.ui index 933e019..bca7cac 100644 --- a/konversation/src/servergroupdialogui.ui +++ b/konversation/src/servergroupdialogui.ui @@ -112,7 +112,7 @@ unnamed - + m_serverLBox @@ -205,7 +205,7 @@ unnamed - + m_channelLBox diff --git a/konversation/src/serverlistdialog.cpp b/konversation/src/serverlistdialog.cpp index 11cc11a..b4de8d8 100644 --- a/konversation/src/serverlistdialog.cpp +++ b/konversation/src/serverlistdialog.cpp @@ -36,9 +36,9 @@ namespace Konversation // ServerListItem // - ServerListItem::ServerListItem(KListView* parent, int serverGroupId, int sortIndex, + ServerListItem::ServerListItem(TDEListView* parent, int serverGroupId, int sortIndex, const TQString& serverGroup, const TQString& identity, const TQString& channels) - : KListViewItem(parent, serverGroup, identity, channels) + : TDEListViewItem(parent, serverGroup, identity, channels) { m_serverGroupId = serverGroupId; m_sortIndex = sortIndex; @@ -48,7 +48,7 @@ namespace Konversation ServerListItem::ServerListItem(TQListViewItem* parent, int serverGroupId, int sortIndex, const TQString& name, const ServerSettings& server) - : KListViewItem(parent, name) + : TDEListViewItem(parent, name) { m_serverGroupId = serverGroupId; m_sortIndex = sortIndex; @@ -116,7 +116,7 @@ namespace Konversation m_serverList->addColumn(i18n("Network")); m_serverList->addColumn(i18n("Identity")); m_serverList->addColumn(i18n("Channels")); - m_serverList->setSelectionModeExt(KListView::Extended); + m_serverList->setSelectionModeExt(TDEListView::Extended); m_serverList->setShowSortIndicator(true); m_serverList->setSortColumn(0); m_serverList->setDragEnabled(true); diff --git a/konversation/src/serverlistdialog.h b/konversation/src/serverlistdialog.h index 9d8ba24..cc4c6d6 100644 --- a/konversation/src/serverlistdialog.h +++ b/konversation/src/serverlistdialog.h @@ -26,10 +26,10 @@ class TQStringList; namespace Konversation { - class ServerListItem : public KListViewItem + class ServerListItem : public TDEListViewItem { public: - ServerListItem(KListView* parent, int serverGroupId, int sortIndex, + ServerListItem(TDEListView* parent, int serverGroupId, int sortIndex, const TQString& serverGroup, const TQString& identity, const TQString& channels); ServerListItem(TQListViewItem* parent, int serverGroupId, int sortIndex, const TQString& name, const ServerSettings& server); diff --git a/konversation/src/serverlistview.cpp b/konversation/src/serverlistview.cpp index be33e43..0d590cc 100644 --- a/konversation/src/serverlistview.cpp +++ b/konversation/src/serverlistview.cpp @@ -6,7 +6,7 @@ */ /* - ServerListView is derived from KListView and implements custom + ServerListView is derived from TDEListView and implements custom drag'n'drop behavior needed in ServerListDialog. Copyright (C) 2006 Eike Hein @@ -19,7 +19,7 @@ ServerListView::ServerListView(TQWidget *parent) - : KListView(parent) + : TDEListView(parent) { } @@ -30,7 +30,7 @@ ServerListView::~ServerListView() TQPtrList ServerListView::selectedServerListItems() { - TQPtrList selectedItems = KListView::selectedItems(); + TQPtrList selectedItems = TDEListView::selectedItems(); TQPtrList selectedServerListItems; TQListViewItem* item = selectedItems.first(); diff --git a/konversation/src/serverlistview.h b/konversation/src/serverlistview.h index b8117a2..0e4434b 100644 --- a/konversation/src/serverlistview.h +++ b/konversation/src/serverlistview.h @@ -6,7 +6,7 @@ */ /* - ServerListView is derived from KListView and implements custom + ServerListView is derived from TDEListView and implements custom drag'n'drop behavior needed in ServerListDialog. Copyright (C) 2006 Eike Hein @@ -20,7 +20,7 @@ class TQDragObject; -class ServerListView : public KListView +class ServerListView : public TDEListView { Q_OBJECT diff --git a/konversation/src/theme_preferencesui.ui b/konversation/src/theme_preferencesui.ui index f804677..696ab55 100644 --- a/konversation/src/theme_preferencesui.ui +++ b/konversation/src/theme_preferencesui.ui @@ -22,7 +22,7 @@ 0 - + iconThemeIndex diff --git a/konversation/src/topiclabel.cpp b/konversation/src/topiclabel.cpp index 75e9500..889ea3f 100644 --- a/konversation/src/topiclabel.cpp +++ b/konversation/src/topiclabel.cpp @@ -224,7 +224,7 @@ namespace Konversation void TopicLabel::setupChannelPopupMenu() { - m_channelPopup = new KPopupMenu(this,"channel_context_menu"); + m_channelPopup = new TDEPopupMenu(this,"channel_context_menu"); m_channelPopupId = m_channelPopup->insertTitle(m_currentChannel); m_channelPopup->insertItem(i18n("&Join"),Konversation::Join); m_channelPopup->insertItem(i18n("Get &user list"),Konversation::Names); diff --git a/konversation/src/topiclabel.h b/konversation/src/topiclabel.h index 8161656..e8d6653 100644 --- a/konversation/src/topiclabel.h +++ b/konversation/src/topiclabel.h @@ -19,7 +19,7 @@ class TQFontMetrics; class Server; -class KPopupMenu; +class TDEPopupMenu; namespace Konversation { @@ -70,7 +70,7 @@ namespace Konversation Server* m_server; TQPopupMenu* m_popup; - KPopupMenu* m_channelPopup; + TDEPopupMenu* m_channelPopup; TQString m_fullText; bool mousePressed; diff --git a/konversation/src/urlcatcher.cpp b/konversation/src/urlcatcher.cpp index b91e0a4..f4234bc 100644 --- a/konversation/src/urlcatcher.cpp +++ b/konversation/src/urlcatcher.cpp @@ -44,7 +44,7 @@ UrlCatcher::UrlCatcher(TQWidget* parent) : ChatWindow(parent) setName(i18n("URL Catcher")); setType(ChatWindow::UrlCatcher); - urlListView=new KListView(this,"url_list_view"); + urlListView=new TDEListView(this,"url_list_view"); urlListView->addColumn(i18n("Nick")); urlListView->addColumn(i18n("URL")); urlListView->setFullWidth(true); @@ -54,7 +54,7 @@ UrlCatcher::UrlCatcher(TQWidget* parent) : ChatWindow(parent) "during this session."); TQWhatsThis::add(urlListView, urlListViewWT); - searchWidget = new KListViewSearchLineWidget(urlListView, this, "search_line"); + searchWidget = new TDEListViewSearchLineWidget(urlListView, this, "search_line"); searchWidget->setEnabled(false); TQHBox* buttonBox=new TQHBox(this); @@ -127,7 +127,7 @@ void UrlCatcher::urlSelected() void UrlCatcher::addUrl(const TQString& who,const TQString& url) { - new KListViewItem(urlListView,who,url); + new TDEListViewItem(urlListView,who,url); clearListButton->setEnabled(true); saveListButton->setEnabled(true); searchWidget->setEnabled(true); diff --git a/konversation/src/urlcatcher.h b/konversation/src/urlcatcher.h index 8787d40..6ff5de2 100644 --- a/konversation/src/urlcatcher.h +++ b/konversation/src/urlcatcher.h @@ -18,11 +18,11 @@ #include "chatwindow.h" -class KListView; +class TDEListView; class TQListViewItem; class TQPushButton; class ViewContainer; -class KListViewSearchLineWidget; +class TDEListViewSearchLineWidget; class UrlCatcher : public ChatWindow { @@ -53,8 +53,8 @@ class UrlCatcher : public ChatWindow void clearListClicked(); protected: - KListView* urlListView; - KListViewSearchLineWidget* searchWidget; + TDEListView* urlListView; + TDEListViewSearchLineWidget* searchWidget; /** Called from ChatWindow adjustFocus */ virtual void childAdjustFocus(); diff --git a/konversation/src/valuelistviewitem.cpp b/konversation/src/valuelistviewitem.cpp index 9be09ef..f54a4cf 100644 --- a/konversation/src/valuelistviewitem.cpp +++ b/konversation/src/valuelistviewitem.cpp @@ -16,15 +16,15 @@ #include "valuelistviewitem.h" -ValueListViewItem::ValueListViewItem(int newValue, KListView* parent, const TQString& label) -: KListViewItem(parent,label) +ValueListViewItem::ValueListViewItem(int newValue, TDEListView* parent, const TQString& label) +: TDEListViewItem(parent,label) { m_value=newValue; enforceSortOrder(); } -ValueListViewItem::ValueListViewItem(int newValue, KListView* parent, TQListViewItem* after, const TQString& label) -: KListViewItem(parent,after,label) +ValueListViewItem::ValueListViewItem(int newValue, TDEListView* parent, TQListViewItem* after, const TQString& label) +: TDEListViewItem(parent,after,label) { m_value=newValue; enforceSortOrder(); diff --git a/konversation/src/valuelistviewitem.h b/konversation/src/valuelistviewitem.h index 4eeac1e..9aa2864 100644 --- a/konversation/src/valuelistviewitem.h +++ b/konversation/src/valuelistviewitem.h @@ -18,11 +18,11 @@ #include -class ValueListViewItem : public KListViewItem +class ValueListViewItem : public TDEListViewItem { public: - ValueListViewItem(int newValue, KListView* parent, const TQString& label); - ValueListViewItem(int newValue, KListView* parent, TQListViewItem* after, const TQString& label); + ValueListViewItem(int newValue, TDEListView* parent, const TQString& label); + ValueListViewItem(int newValue, TDEListView* parent, TQListViewItem* after, const TQString& label); ~ValueListViewItem(); int getValue() const; diff --git a/konversation/src/viewcontainer.cpp b/konversation/src/viewcontainer.cpp index bb77ac1..30005fd 100644 --- a/konversation/src/viewcontainer.cpp +++ b/konversation/src/viewcontainer.cpp @@ -186,7 +186,7 @@ void ViewContainer::setupViewTree() connect(m_viewTree, TQT_SIGNAL(sizeChanged()), this, TQT_SLOT(saveSplitterSizes())); connect(m_viewTree, TQT_SIGNAL(syncTabBarToTree()), this, TQT_SLOT(syncTabBarToTree())); - KAction* action; + TDEAction* action; action = actionCollection()->action("move_tab_left"); @@ -287,7 +287,7 @@ void ViewContainer::removeViewTree() disconnect(m_viewTree, TQT_SIGNAL(sizeChanged()), this, TQT_SLOT(saveSplitterSizes())); disconnect(m_viewTree, TQT_SIGNAL(syncTabBarToTree()), this, TQT_SLOT(syncTabBarToTree())); - KAction* action; + TDEAction* action; action = actionCollection()->action("move_tab_left"); @@ -353,7 +353,7 @@ void ViewContainer::updateAppearance() updateViews(); updateTabWidgetAppearance(); - KToggleAction* action = static_cast(actionCollection()->action("hide_nicknamelist")); + TDEToggleAction* action = static_cast(actionCollection()->action("hide_nicknamelist")); action->setChecked(!Preferences::showNickList()); if(m_insertCharDialog) @@ -399,7 +399,7 @@ void ViewContainer::updateViewActions(int index) { if (!m_tabWidget) return; - KAction* action; + TDEAction* action; ChatWindow* view = static_cast(m_tabWidget->page(index)); @@ -453,7 +453,7 @@ void ViewContainer::updateViewActions(int index) if (action) action->setEnabled(false); } - KToggleAction* notifyAction = static_cast(actionCollection()->action("tab_notifications")); + TDEToggleAction* notifyAction = static_cast(actionCollection()->action("tab_notifications")); if (notifyAction) { notifyAction->setEnabled(viewType == ChatWindow::Channel || viewType == ChatWindow::Query || @@ -462,7 +462,7 @@ void ViewContainer::updateViewActions(int index) notifyAction->setChecked(view->notificationsEnabled()); } - KToggleAction* autoJoinAction = static_cast(actionCollection()->action("tab_autojoin")); + TDEToggleAction* autoJoinAction = static_cast(actionCollection()->action("tab_autojoin")); Channel* channel = static_cast(view); if (autoJoinAction && viewType == ChatWindow::Channel && channel->getServer()->getServerGroup()) { @@ -533,7 +533,7 @@ void ViewContainer::updateViewActions(int index) action = actionCollection()->action("edit_find_last"); if (action) action->setEnabled(view->searchView()); - KToggleAction* channelListAction = static_cast(actionCollection()->action("open_channel_list")); + TDEToggleAction* channelListAction = static_cast(actionCollection()->action("open_channel_list")); if (channelListAction) { if (m_frontServer) @@ -1132,14 +1132,14 @@ void ViewContainer::toggleViewNotifications() { view->setNotificationsEnabled(true); updateViews(); - KToggleAction* action = static_cast(actionCollection()->action("tab_notifications")); + TDEToggleAction* action = static_cast(actionCollection()->action("tab_notifications")); if (action) action->setChecked(view->notificationsEnabled()); } else { view->setNotificationsEnabled(false); unsetViewNotification(view); - KToggleAction* action = static_cast(actionCollection()->action("tab_notifications")); + TDEToggleAction* action = static_cast(actionCollection()->action("tab_notifications")); if (action) action->setChecked(view->notificationsEnabled()); } } @@ -1574,7 +1574,7 @@ void ViewContainer::cleanupAfterClose(ChatWindow* view) if (m_queryViewCount == 0 && actionCollection()) { - KAction* action = actionCollection()->action("close_queries"); + TDEAction* action = actionCollection()->action("close_queries"); if (action) action->setEnabled(false); } } @@ -1620,7 +1620,7 @@ void ViewContainer::updateViewEncoding(ChatWindow* view) if (view) { ChatWindow::WindowType viewType = view->getType(); - KSelectAction* codecAction = static_cast(actionCollection()->action("tab_encoding")); + TDESelectAction* codecAction = static_cast(actionCollection()->action("tab_encoding")); if (codecAction) { @@ -1661,8 +1661,8 @@ void ViewContainer::showViewContextMenu(TQWidget* tab, const TQPoint& pos) if (!menu) return; ChatWindow* view = static_cast(tab); - KToggleAction* autoJoinAction = static_cast(actionCollection()->action("tab_autojoin")); - KAction* rejoinAction = actionCollection()->action("rejoin_channel"); + TDEToggleAction* autoJoinAction = static_cast(actionCollection()->action("tab_autojoin")); + TDEAction* rejoinAction = actionCollection()->action("rejoin_channel"); if (view) { @@ -1684,14 +1684,14 @@ void ViewContainer::showViewContextMenu(TQWidget* tab, const TQPoint& pos) if (viewType == ChatWindow::Status) { - TQPtrList serverActions; - KAction* action = actionCollection()->action("disconnect_server"); + TQPtrList serverActions; + TDEAction* action = actionCollection()->action("disconnect_server"); if (action) serverActions.append(action); action = actionCollection()->action("reconnect_server"); if (action) serverActions.append(action); action = actionCollection()->action("join_channel"); if (action) serverActions.append(action); - action = new KActionSeparator(); + action = new TDEActionSeparator(); if (action) serverActions.append(action); m_window->plugActionList("server_actions", serverActions); m_contextServer = view->getServer(); @@ -1887,7 +1887,7 @@ void ViewContainer::clearViewLines() { m_frontView->getTextView()->clearLines(); - KAction* action = actionCollection()->action("clear_lines"); + TDEAction* action = actionCollection()->action("clear_lines"); if (action) action->setEnabled(false); } } @@ -1918,7 +1918,7 @@ void ViewContainer::cancelRememberLine() { m_frontView->getTextView()->cancelRememberLine(); - KAction* action = actionCollection()->action("clear_lines"); + TDEAction* action = actionCollection()->action("clear_lines"); if (action) action->setEnabled(m_frontView->getTextView()->hasLines()); } } @@ -1945,7 +1945,7 @@ void ViewContainer::insertMarkerLine() if (m_frontView && m_frontView->isInsertSupported()) { - KAction* action = actionCollection()->action("clear_lines"); + TDEAction* action = actionCollection()->action("clear_lines"); if (action) action->setEnabled(m_frontView->getTextView()->hasLines()); } } @@ -2004,7 +2004,7 @@ void ViewContainer::addUrlCatcher() TQString urlItem=urlList[index]; m_urlCatcherPanel->addUrl(urlItem.section(' ',0,0),urlItem.section(' ',1,1)); } // for - (dynamic_cast(actionCollection()->action("open_url_catcher")))->setChecked(true); + (dynamic_cast(actionCollection()->action("open_url_catcher")))->setChecked(true); } else closeUrlCatcher(); @@ -2017,7 +2017,7 @@ void ViewContainer::closeUrlCatcher() { delete m_urlCatcherPanel; m_urlCatcherPanel = 0; - (dynamic_cast(actionCollection()->action("open_url_catcher")))->setChecked(false); + (dynamic_cast(actionCollection()->action("open_url_catcher")))->setChecked(false); } } @@ -2035,7 +2035,7 @@ void ViewContainer::addDccPanel() { addView(m_dccPanel, i18n("DCC Status")); m_dccPanelOpen=true; - (dynamic_cast(actionCollection()->action("open_dccstatus_window")))->setChecked(true); + (dynamic_cast(actionCollection()->action("open_dccstatus_window")))->setChecked(true); } } @@ -2048,7 +2048,7 @@ void ViewContainer::closeDccPanel() emit removeView(m_dccPanel); if (m_tabWidget) m_tabWidget->removePage(m_dccPanel); m_dccPanelOpen=false; - (dynamic_cast(actionCollection()->action("open_dccstatus_window")))->setChecked(false); + (dynamic_cast(actionCollection()->action("open_dccstatus_window")))->setChecked(false); } } @@ -2189,7 +2189,7 @@ void ViewContainer::connectionStateChanged(Server* server, Konversation::Connect if (updateServer && updateServer == server) { - KAction* action = actionCollection()->action("disconnect_server"); + TDEAction* action = actionCollection()->action("disconnect_server"); if (action) action->setEnabled(state == Konversation::SSConnected); @@ -2215,7 +2215,7 @@ void ViewContainer::channelJoined(Channel* channel) if (view == channel) { - KAction* action = actionCollection()->action("rejoin_channel"); + TDEAction* action = actionCollection()->action("rejoin_channel"); if (action) action->setEnabled(false); } } @@ -2259,7 +2259,7 @@ void ViewContainer::openChannelSettings() void ViewContainer::toggleChannelNicklists() { - KToggleAction* action = static_cast(actionCollection()->action("hide_nicknamelist")); + TDEToggleAction* action = static_cast(actionCollection()->action("hide_nicknamelist")); if (action) { @@ -2341,7 +2341,7 @@ ChannelListPanel* ViewContainer::addChannelListPanel(Server* server) channelListPanel->setServer(server); addView(channelListPanel, i18n("Channel List")); - KToggleAction* action = static_cast(actionCollection()->action("open_channel_list")); + TDEToggleAction* action = static_cast(actionCollection()->action("open_channel_list")); if ((server == m_frontServer) && action) action->setChecked(true); return channelListPanel; @@ -2356,7 +2356,7 @@ void ViewContainer::openChannelList(const TQString& filter, bool getList) if (panel) { closeView(panel); - KToggleAction* action = static_cast(actionCollection()->action("open_channel_list")); + TDEToggleAction* action = static_cast(actionCollection()->action("open_channel_list")); if (action) action->setChecked(false); } else @@ -2404,12 +2404,12 @@ void ViewContainer::openNicksOnlinePanel() connect(m_nicksOnlinePanel, TQT_SIGNAL(doubleClicked(const TQString&,const TQString&)), m_window, TQT_SLOT(notifyAction(const TQString&,const TQString&))); connect(m_nicksOnlinePanel, TQT_SIGNAL(showView(ChatWindow*)), this, TQT_SLOT(showView(ChatWindow*))); connect(m_window, TQT_SIGNAL(nicksNowOnline(Server*)), m_nicksOnlinePanel, TQT_SLOT(updateServerOnlineList(Server*))); - (dynamic_cast(actionCollection()->action("open_nicksonline_window")))->setChecked(true); + (dynamic_cast(actionCollection()->action("open_nicksonline_window")))->setChecked(true); } else { closeNicksOnlinePanel(); - (dynamic_cast(actionCollection()->action("open_nicksonline_window")))->setChecked(false); + (dynamic_cast(actionCollection()->action("open_nicksonline_window")))->setChecked(false); } } @@ -2421,7 +2421,7 @@ void ViewContainer::closeNicksOnlinePanel() delete m_nicksOnlinePanel; m_nicksOnlinePanel = 0; } - (dynamic_cast(actionCollection()->action("open_nicksonline_window")))->setChecked(false); + (dynamic_cast(actionCollection()->action("open_nicksonline_window")))->setChecked(false); } void ViewContainer::showNextActiveView() diff --git a/konversation/src/viewcontainer.h b/konversation/src/viewcontainer.h index 8e291fe..625e56c 100644 --- a/konversation/src/viewcontainer.h +++ b/konversation/src/viewcontainer.h @@ -23,7 +23,7 @@ class TQSplitter; class KTabWidget; -class KActionCollection; +class TDEActionCollection; class KonversationMainWindow; class ViewTree; @@ -52,7 +52,7 @@ class ViewContainer : public TQObject TQSplitter* getWidget() { return m_viewTreeSplitter; } KonversationMainWindow* getWindow() { return m_window; } - KActionCollection* actionCollection() { return m_window->actionCollection(); } + TDEActionCollection* actionCollection() { return m_window->actionCollection(); } TQGuardedPtr getFrontView() { return m_frontView; } Server* getFrontServer() { return m_frontServer; } diff --git a/konversation/src/viewtree.cpp b/konversation/src/viewtree.cpp index 79f6209..ba271c1 100644 --- a/konversation/src/viewtree.cpp +++ b/konversation/src/viewtree.cpp @@ -35,17 +35,17 @@ class ViewTree::ToolTip : public TQToolTip { public: - ToolTip(TQWidget *parent, KListView *viewTree); + ToolTip(TQWidget *parent, TDEListView *viewTree); virtual ~ToolTip() {} protected: virtual void maybeTip(const TQPoint &pos); private: - KListView* viewTree; + TDEListView* viewTree; }; -ViewTree::ToolTip::ToolTip(TQWidget *parent, KListView *viewTree) +ViewTree::ToolTip::ToolTip(TQWidget *parent, TDEListView *viewTree) : TQToolTip(parent), viewTree(viewTree) { } @@ -61,7 +61,7 @@ void ViewTree::ToolTip::maybeTip (const TQPoint &pos) ViewTree::ViewTree(TQWidget *parent) - : KListView(parent) + : TDEListView(parent) { header()->hide(); setHScrollBarMode(TQScrollView::AlwaysOff); @@ -71,7 +71,7 @@ ViewTree::ViewTree(TQWidget *parent) setSortOrder(TQt::Ascending); setResizeMode(TQListView::AllColumns); - setSelectionModeExt(KListView::Single); + setSelectionModeExt(TDEListView::Single); setRootIsDecorated(false); setDragEnabled(true); @@ -544,12 +544,12 @@ void ViewTree::contentsMousePressEvent(TQMouseEvent* e) if (Preferences::closeButtons() && e->button() == Qt::LeftButton && isAboveIcon(vp, item)) { m_pressedAboveCloseButton = true; - if (!item->getCloseButtonEnabled()) KListView::contentsMousePressEvent(e); + if (!item->getCloseButtonEnabled()) TDEListView::contentsMousePressEvent(e); } else { m_pressedAboveCloseButton = false; - KListView::contentsMousePressEvent(e); + TDEListView::contentsMousePressEvent(e); } m_middleClickItem = (Preferences::middleClickClose() && e->button() == Qt::MidButton) ? item : 0; } @@ -581,7 +581,7 @@ void ViewTree::contentsMouseReleaseEvent(TQMouseEvent* e) } } else - KListView::contentsMouseReleaseEvent(e); + TDEListView::contentsMouseReleaseEvent(e); } void ViewTree::contentsMouseMoveEvent(TQMouseEvent* e) @@ -598,7 +598,7 @@ void ViewTree::contentsMouseMoveEvent(TQMouseEvent* e) // Allow dragging only with the middle mouse button, just // like for the tab bar. if ((e->state() & Qt::MidButton) == Qt::MidButton) - KListView::contentsMouseMoveEvent(e); + TDEListView::contentsMouseMoveEvent(e); else if ((e->state() & Qt::LeftButton) == Qt::LeftButton) { if (item && (item != selectedItem()) && !item->isSeparator()) @@ -646,7 +646,7 @@ void ViewTree::contentsContextMenuEvent(TQContextMenuEvent* e) emit showViewContextMenu(atpos->getView(),e->globalPos()); } - KListView::contentsContextMenuEvent(e); + TDEListView::contentsContextMenuEvent(e); } void ViewTree::contentsWheelEvent(TQWheelEvent* e) @@ -730,7 +730,7 @@ void ViewTree::selectLower(bool wrap) void ViewTree::resizeEvent(TQResizeEvent* e) { - KListView::resizeEvent(e); + TDEListView::resizeEvent(e); emit sizeChanged(); } @@ -944,7 +944,7 @@ ViewTreeItem* ViewTree::getLastChild(TQListViewItem* parent) void ViewTree::paintEmptyArea(TQPainter* p, const TQRect& rect) { - KListView::paintEmptyArea(p, rect); + TDEListView::paintEmptyArea(p, rect); ViewTreeItem* last = static_cast(lastItem()); diff --git a/konversation/src/viewtree.h b/konversation/src/viewtree.h index 9dbabb4..b9f115c 100644 --- a/konversation/src/viewtree.h +++ b/konversation/src/viewtree.h @@ -18,7 +18,7 @@ class ViewTreeItem; class ChatWindow; -class ViewTree : public KListView +class ViewTree : public TDEListView { Q_OBJECT diff --git a/konversation/src/warnings_preferences.h b/konversation/src/warnings_preferences.h index bf5733d..77eed48 100644 --- a/konversation/src/warnings_preferences.h +++ b/konversation/src/warnings_preferences.h @@ -16,7 +16,7 @@ #include "warnings_preferencesui.h" #include "konvisettingspage.h" -class KListView; +class TDEListView; class TQListViewItem; class Warnings_Config : public Warnings_ConfigUI, public KonviSettingsPage diff --git a/konversation/src/warnings_preferencesui.ui b/konversation/src/warnings_preferencesui.ui index b93ecb6..62b7226 100644 --- a/konversation/src/warnings_preferencesui.ui +++ b/konversation/src/warnings_preferencesui.ui @@ -19,7 +19,7 @@ 0 - + Warning Dialogs to Show diff --git a/konversation/src/watchednicknames_preferences.cpp b/konversation/src/watchednicknames_preferences.cpp index a39b029..a7c47f8 100644 --- a/konversation/src/watchednicknames_preferences.cpp +++ b/konversation/src/watchednicknames_preferences.cpp @@ -99,7 +99,7 @@ void WatchedNicknames_Config::addNetworkBranch(Konversation::ServerGroupSettings // add nicknames to group branch (reverse order again) for(unsigned int index=nicks.count();index;index--) { - new KListViewItem(groupItem,nicks[index-1]); + new TDEListViewItem(groupItem,nicks[index-1]); } // for // unfold group branch notifyListView->setOpen(groupItem,true); @@ -112,7 +112,7 @@ void WatchedNicknames_Config::saveSettings() TQMap notifyList; // get first notify group - KListView* listView=notifyListView; + TDEListView* listView=notifyListView; TQListViewItem* group=listView->firstChild(); // loop as long as there are more groups in the listview @@ -154,7 +154,7 @@ TQStringList WatchedNicknames_Config::currentNotifyList() TQStringList newList; // get first item - KListView* listView=notifyListView; + TDEListView* listView=notifyListView; TQListViewItem* item=listView->firstChild(); // loop as long as there are more groups in the listview @@ -179,7 +179,7 @@ bool WatchedNicknames_Config::hasChanged() void WatchedNicknames_Config::updateNetworkNames() { // get first notify group - KListView* listView=notifyListView; + TDEListView* listView=notifyListView; TQListViewItem* group=listView->firstChild(); // make sure all widgets are disabled @@ -269,7 +269,7 @@ void WatchedNicknames_Config::checkIfEmptyListview(bool state) void WatchedNicknames_Config::newNotify() { // get listview object and possible first selected item - KListView* listView=notifyListView; + TDEListView* listView=notifyListView; TQListViewItem* item=listView->selectedItem(); // if there was an item selected, try to find the group it belongs to, @@ -301,7 +301,7 @@ void WatchedNicknames_Config::newNotify() void WatchedNicknames_Config::removeNotify() { // get listview pointer and the selected item - KListView* listView=notifyListView; + TDEListView* listView=notifyListView; TQListViewItem* item=listView->selectedItem(); // sanity check @@ -367,7 +367,7 @@ void WatchedNicknames_Config::enableEditWidgets(bool enabled) void WatchedNicknames_Config::networkChanged(const TQString& newNetwork) { // get listview pointer and selected entry - KListView* listView=notifyListView; + TDEListView* listView=notifyListView; TQListViewItem* item=listView->selectedItem(); // sanity check @@ -404,7 +404,7 @@ void WatchedNicknames_Config::networkChanged(const TQString& newNetwork) void WatchedNicknames_Config::nicknameChanged(const TQString& newNickname) { // get listview pointer and selected item - KListView* listView=notifyListView; + TDEListView* listView=notifyListView; TQListViewItem* item=listView->selectedItem(); // sanity check diff --git a/konversation/src/watchednicknames_preferencesui.ui b/konversation/src/watchednicknames_preferencesui.ui index 9df9782..16341e8 100644 --- a/konversation/src/watchednicknames_preferencesui.ui +++ b/konversation/src/watchednicknames_preferencesui.ui @@ -226,7 +226,7 @@ When the nickname watcher is turned on, you will be notified when the nicknames The nick (username) of the selected person to watch - + Watched Networks/Nicknames