diff options
author | Timothy Pearson <[email protected]> | 2013-02-01 15:14:03 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-01 15:14:03 -0600 |
commit | 9c9412b30c54468adc9e506cc76c5d113fbf5056 (patch) | |
tree | 68a0c0d5bc770fc58596b8c5624cdf33d8625027 /kopete/plugins | |
parent | 2e53bd0b77676f879fad7baeecea5879bf496a7d (diff) | |
download | tdenetwork-9c9412b30c54468adc9e506cc76c5d113fbf5056.tar.gz tdenetwork-9c9412b30c54468adc9e506cc76c5d113fbf5056.zip |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kopete/plugins')
34 files changed, 79 insertions, 79 deletions
diff --git a/kopete/plugins/alias/aliasdialog.ui b/kopete/plugins/alias/aliasdialog.ui index 5b6a832c..6e52c0ce 100644 --- a/kopete/plugins/alias/aliasdialog.ui +++ b/kopete/plugins/alias/aliasdialog.ui @@ -86,7 +86,7 @@ Do not include the '/' in the command (if you do it will be stripped off anyway) <string>&Cancel</string> </property> </widget> - <widget class="KListView" row="2" column="1" rowspan="1" colspan="2"> + <widget class="TDEListView" row="2" column="1" rowspan="1" colspan="2"> <column> <property name="text"> <string>Protocols</string> diff --git a/kopete/plugins/alias/aliasdialogbase.ui b/kopete/plugins/alias/aliasdialogbase.ui index 1121c24d..2bdc2e77 100644 --- a/kopete/plugins/alias/aliasdialogbase.ui +++ b/kopete/plugins/alias/aliasdialogbase.ui @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListView" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TDEListView" row="0" column="0" rowspan="1" colspan="3"> <column> <property name="text"> <string>Alias</string> diff --git a/kopete/plugins/contactnotes/contactnotesplugin.cpp b/kopete/plugins/contactnotes/contactnotesplugin.cpp index ce67e663..db3d1302 100644 --- a/kopete/plugins/contactnotes/contactnotesplugin.cpp +++ b/kopete/plugins/contactnotes/contactnotesplugin.cpp @@ -37,7 +37,7 @@ ContactNotesPlugin::ContactNotesPlugin( TQObject *parent, const char *name, cons else pluginStatic_ = this; - KAction *m_actionEdit=new KAction( i18n("&Notes"), "identity", 0, this, TQT_SLOT (slotEditInfo()), actionCollection() , "editContactNotes"); + TDEAction *m_actionEdit=new TDEAction( i18n("&Notes"), "identity", 0, this, TQT_SLOT (slotEditInfo()), actionCollection() , "editContactNotes"); connect ( Kopete::ContactList::self() , TQT_SIGNAL( metaContactSelected(bool)) , m_actionEdit , TQT_SLOT(setEnabled(bool))); m_actionEdit->setEnabled(Kopete::ContactList::self()->selectedMetaContacts().count()==1 ); diff --git a/kopete/plugins/contactnotes/contactnotesplugin.h b/kopete/plugins/contactnotes/contactnotesplugin.h index ebd2cade..34335186 100644 --- a/kopete/plugins/contactnotes/contactnotesplugin.h +++ b/kopete/plugins/contactnotes/contactnotesplugin.h @@ -25,8 +25,8 @@ #include "kopeteplugin.h" class TQString; -class KAction; -class KActionCollection; +class TDEAction; +class TDEActionCollection; namespace Kopete { class MetaContact; } diff --git a/kopete/plugins/cryptography/cryptographyguiclient.cpp b/kopete/plugins/cryptography/cryptographyguiclient.cpp index 4892afb1..df66c608 100644 --- a/kopete/plugins/cryptography/cryptographyguiclient.cpp +++ b/kopete/plugins/cryptography/cryptographyguiclient.cpp @@ -48,7 +48,7 @@ CryptographyGUIClient::CryptographyGUIClient(Kopete::ChatSession *parent ) setInstance( KGenericFactory<CryptographyPlugin>::instance() ); - m_action=new KToggleAction( i18n("Encrypt Messages" ), TQString::fromLatin1( "encrypted" ), 0, this, TQT_SLOT(slotToggled()), actionCollection() , "cryptographyToggle" ); + m_action=new TDEToggleAction( i18n("Encrypt Messages" ), TQString::fromLatin1( "encrypted" ), 0, this, TQT_SLOT(slotToggled()), actionCollection() , "cryptographyToggle" ); m_action->setChecked( first->pluginData( CryptographyPlugin::plugin() , "encrypt_messages") != TQString::fromLatin1("off") ) ; setXMLFile("cryptographychatui.rc"); diff --git a/kopete/plugins/cryptography/cryptographyguiclient.h b/kopete/plugins/cryptography/cryptographyguiclient.h index 530a1172..f9c29a49 100644 --- a/kopete/plugins/cryptography/cryptographyguiclient.h +++ b/kopete/plugins/cryptography/cryptographyguiclient.h @@ -19,7 +19,7 @@ #include <kxmlguiclient.h> namespace Kopete { class ChatSession; } -class KToggleAction; +class TDEToggleAction; /** *@author Olivier Goffart @@ -33,7 +33,7 @@ public: ~CryptographyGUIClient(); private: - KToggleAction *m_action; + TDEToggleAction *m_action; private slots: void slotToggled(); diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp index 06412936..1085da9c 100644 --- a/kopete/plugins/cryptography/cryptographyplugin.cpp +++ b/kopete/plugins/cryptography/cryptographyplugin.cpp @@ -68,7 +68,7 @@ CryptographyPlugin::CryptographyPlugin( TQObject *parent, const char *name, cons TQObject::connect(m_cachedPass_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotForgetCachedPass() )); - KAction *action=new KAction( i18n("&Select Cryptography Public Key..."), "encrypted", 0, this, TQT_SLOT (slotSelectContactKey()), actionCollection() , "contactSelectKey"); + TDEAction *action=new TDEAction( i18n("&Select Cryptography Public Key..."), "encrypted", 0, this, TQT_SLOT (slotSelectContactKey()), actionCollection() , "contactSelectKey"); connect ( Kopete::ContactList::self() , TQT_SIGNAL( metaContactSelected(bool)) , action , TQT_SLOT(setEnabled(bool))); action->setEnabled(Kopete::ContactList::self()->selectedMetaContacts().count()==1 ); @@ -138,12 +138,12 @@ bool CryptographyPlugin::passphraseHandling() } -/*KActionCollection *CryptographyPlugin::customChatActions(Kopete::ChatSession *KMM) +/*TDEActionCollection *CryptographyPlugin::customChatActions(Kopete::ChatSession *KMM) { delete m_actionCollection; - m_actionCollection = new KActionCollection(this); - KAction *actionTranslate = new KAction( i18n ("Translate"), 0, + m_actionCollection = new TDEActionCollection(this); + TDEAction *actionTranslate = new TDEAction( i18n ("Translate"), 0, this, TQT_SLOT( slotTranslateChat() ), m_actionCollection, "actionTranslate" ); m_actionCollection->insert( actionTranslate ); diff --git a/kopete/plugins/cryptography/kgpgselkey.cpp b/kopete/plugins/cryptography/kgpgselkey.cpp index 37a0d8ab..63d26510 100644 --- a/kopete/plugins/cryptography/kgpgselkey.cpp +++ b/kopete/plugins/cryptography/kgpgselkey.cpp @@ -48,7 +48,7 @@ KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialo keyPair=loader->loadIcon("kgpg_key2",KIcon::Small,20); setMinimumSize(300,200); - keysListpr = new KListView( page ); + keysListpr = new TDEListView( page ); keysListpr->setRootIsDecorated(true); keysListpr->addColumn( i18n( "Name" ) ); keysListpr->setShowSortIndicator(true); @@ -146,8 +146,8 @@ KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialo pclose(fp2); if (!tst.isEmpty() && (!dead)) { - KListViewItem *item=new KListViewItem(keysListpr,extractKeyName(tst)); - KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, expiration: %3").arg(id).arg(tr).arg(val)); + TDEListViewItem *item=new TDEListViewItem(keysListpr,extractKeyName(tst)); + TDEListViewItem *sub= new TDEListViewItem(item,i18n("ID: %1, trust: %2, expiration: %3").arg(id).arg(tr).arg(val)); sub->setSelectable(false); item->setPixmap(0,keyPair); } diff --git a/kopete/plugins/cryptography/kgpgselkey.h b/kopete/plugins/cryptography/kgpgselkey.h index 0742082a..a832c886 100644 --- a/kopete/plugins/cryptography/kgpgselkey.h +++ b/kopete/plugins/cryptography/kgpgselkey.h @@ -23,7 +23,7 @@ #include <kdialogbase.h> -class KListView; +class TDEListView; class TQCheckBox; struct gpgKey { @@ -45,7 +45,7 @@ class KgpgSelKey : public KDialogBase public: KgpgSelKey( TQWidget *parent = 0, const char *name = 0,bool showlocal=true); - KListView *keysListpr; + TDEListView *keysListpr; TQPixmap keyPair; TQCheckBox *local; private slots: diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp index e3d2e630..7764d3b3 100644 --- a/kopete/plugins/cryptography/popuppublic.cpp +++ b/kopete/plugins/cryptography/popuppublic.cpp @@ -54,7 +54,7 @@ ///////////////// klistviewitem special -class UpdateViewItem2 : public KListViewItem +class UpdateViewItem2 : public TDEListViewItem { public: UpdateViewItem2(TQListView *parent, TQString name,TQString mail,TQString id,bool isDefault); @@ -64,7 +64,7 @@ public: }; UpdateViewItem2::UpdateViewItem2(TQListView *parent, TQString name,TQString mail,TQString id,bool isDefault) - : KListViewItem(parent) + : TDEListViewItem(parent) { def=isDefault; setText(0,name); @@ -80,7 +80,7 @@ void UpdateViewItem2::paintCell(TQPainter *p, const TQColorGroup &cg,int column, font.setBold(true); p->setFont(font); } - KListViewItem::paintCell(p, cg, column, width, alignment); + TDEListViewItem::paintCell(p, cg, column, width, alignment); } TQString UpdateViewItem2 :: key(int c,bool ) const @@ -90,7 +90,7 @@ TQString UpdateViewItem2 :: key(int c,bool ) const /////////////// main view -popupPublic::popupPublic(TQWidget *parent, const char *name,TQString sfile,bool filemode,KShortcut goDefaultKey): +popupPublic::popupPublic(TQWidget *parent, const char *name,TQString sfile,bool filemode,TDEShortcut goDefaultKey): KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent, name,true) { TQWidget *page = plainPage(); @@ -120,10 +120,10 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent clearSearch->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase")); (void) new TQLabel(i18n("Search: "),hBar); - KListViewSearchLine* listViewSearch = new KListViewSearchLine(hBar); + TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(hBar); connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear())); - keysList = new KListView( page ); + keysList = new TDEListView( page ); keysList->addColumn(i18n("Name")); keysList->addColumn(i18n("Email")); keysList->addColumn(i18n("ID")); @@ -135,7 +135,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent keysList->setShowSortIndicator(true); keysList->setFullWidth(true); keysList->setAllColumnsShowFocus(true); - keysList->setSelectionModeExt(KListView::Extended); + keysList->setSelectionModeExt(TDEListView::Extended); keysList->setColumnWidthMode(0,TQListView::Manual); keysList->setColumnWidthMode(1,TQListView::Manual); keysList->setColumnWidth(0,210); @@ -143,8 +143,8 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent boutonboxoptions=new TQButtonGroup(5,Qt::Vertical ,page,0); - KActionCollection *actcol=new KActionCollection(this); - (void) new KAction(i18n("&Go to Default Key"),goDefaultKey, TQT_TQOBJECT(this), TQT_SLOT(slotGotoDefaultKey()),actcol,"go_default_key"); + TDEActionCollection *actcol=new TDEActionCollection(this); + (void) new TDEAction(i18n("&Go to Default Key"),goDefaultKey, TQT_TQOBJECT(this), TQT_SLOT(slotGotoDefaultKey()),actcol,"go_default_key"); CBarmor=new TQCheckBox(i18n("ASCII armored encryption"),boutonboxoptions); @@ -452,7 +452,7 @@ void popupPublic::slotprocread(KProcIO *p) bool isDefaultKey=false; if (id.right(8)==defaultKey) isDefaultKey=true; UpdateViewItem2 *item=new UpdateViewItem2(keysList,keyname,keymail,id,isDefaultKey); - //KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, validity: %3").arg(id).arg(tr).arg(val)); + //TDEListViewItem *sub= new TDEListViewItem(item,i18n("ID: %1, trust: %2, validity: %3").arg(id).arg(tr).arg(val)); //sub->setSelectable(false); if (seclist.find(tst,0,FALSE)!=-1) item->setPixmap(0,keyPair); diff --git a/kopete/plugins/cryptography/popuppublic.h b/kopete/plugins/cryptography/popuppublic.h index 02570ef2..83ac5102 100644 --- a/kopete/plugins/cryptography/popuppublic.h +++ b/kopete/plugins/cryptography/popuppublic.h @@ -27,7 +27,7 @@ class TQPushButton; class TQCheckBox; -class KListView; +class TDEListView; class TQButtonGroup; class KProcIO; @@ -37,9 +37,9 @@ class popupPublic : public KDialogBase //TQDialog public: - popupPublic(TQWidget *parent=0, const char *name=0,TQString sfile="",bool filemode=false,KShortcut goDefaultKey=TQKeySequence(CTRL+TQt::Key_Home)); + popupPublic(TQWidget *parent=0, const char *name=0,TQString sfile="",bool filemode=false,TDEShortcut goDefaultKey=TQKeySequence(CTRL+TQt::Key_Home)); ~popupPublic(); - KListView *keysList; + TDEListView *keysList; TQCheckBox *CBarmor,*CBuntrusted,*CBshred,*CBsymmetric,*CBhideid; bool fmode,trusted; TQPixmap keyPair,keySingle,keyGroup; diff --git a/kopete/plugins/highlight/highlightprefsbase.ui b/kopete/plugins/highlight/highlightprefsbase.ui index 4d39a0ca..b820151d 100644 --- a/kopete/plugins/highlight/highlightprefsbase.ui +++ b/kopete/plugins/highlight/highlightprefsbase.ui @@ -69,7 +69,7 @@ <string>Rename...</string> </property> </widget> - <widget class="KListView" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TDEListView" row="0" column="0" rowspan="1" colspan="3"> <column> <property name="text"> <string>Filters</string> diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp index 1dd63cc3..992d586f 100644 --- a/kopete/plugins/history/historydialog.cpp +++ b/kopete/plugins/history/historydialog.cpp @@ -57,10 +57,10 @@ #include <kstdaction.h> #include <kaction.h> -class KListViewDateItem : public KListViewItem +class TDEListViewDateItem : public TDEListViewItem { public: - KListViewDateItem(KListView* parent, TQDate date, Kopete::MetaContact *mc); + TDEListViewDateItem(TDEListView* parent, TQDate date, Kopete::MetaContact *mc); TQDate date() { return mDate; } Kopete::MetaContact *metaContact() { return mMetaContact; } @@ -73,20 +73,20 @@ private: -KListViewDateItem::KListViewDateItem(KListView* parent, TQDate date, Kopete::MetaContact *mc) - : KListViewItem(parent, date.toString(Qt::ISODate), mc->displayName()) +TDEListViewDateItem::TDEListViewDateItem(TDEListView* parent, TQDate date, Kopete::MetaContact *mc) + : TDEListViewItem(parent, date.toString(Qt::ISODate), mc->displayName()) { mDate = date; mMetaContact = mc; } -int KListViewDateItem::compare(TQListViewItem *i, int col, bool ascending) const +int TDEListViewDateItem::compare(TQListViewItem *i, int col, bool ascending) const { if (col) return TQListViewItem::compare(i, col, ascending); //compare dates - do NOT use ascending var here - KListViewDateItem* item = static_cast<KListViewDateItem*>(i); + TDEListViewDateItem* item = static_cast<TDEListViewDateItem*>(i); if ( mDate < item->date() ) return -1; return ( mDate > item->date() ); @@ -173,9 +173,9 @@ HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent, connect(mHtmlPart, TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQT_SLOT(slotRightClick(const TQString &, const TQPoint &))); //initActions - KActionCollection* ac = new KActionCollection(this); + TDEActionCollection* ac = new TDEActionCollection(this); mCopyAct = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), ac ); - mCopyURLAct = new KAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "editcopy" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL() ), ac ); + mCopyURLAct = new TDEAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "editcopy" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL() ), ac ); resize(650, 700); centerOnScreen(this); @@ -232,7 +232,7 @@ void HistoryDialog::slotLoadDays() { TQDate c2Date(pair.date().year(),pair.date().month(),dayList[i]); if (mInit.dateMCList.find(pair) == mInit.dateMCList.end()) - new KListViewDateItem(mMainWidget->dateListView, c2Date, pair.metaContact()); + new TDEListViewDateItem(mMainWidget->dateListView, c2Date, pair.metaContact()); } mMainWidget->searchProgress->advance(1); TQTimer::singleShot(0,this,TQT_SLOT(slotLoadDays())); @@ -319,7 +319,7 @@ void HistoryDialog::init(Kopete::Contact *c) void HistoryDialog::dateSelected(TQListViewItem* it) { - KListViewDateItem *item = static_cast<KListViewDateItem*>(it); + TDEListViewDateItem *item = static_cast<TDEListViewDateItem*>(it); if (!item) return; @@ -420,11 +420,11 @@ void HistoryDialog::slotSearchTextChanged(const TQString& searchText) void HistoryDialog::listViewShowElements(bool s) { - KListViewDateItem* item = static_cast<KListViewDateItem*>(mMainWidget->dateListView->firstChild()); + TDEListViewDateItem* item = static_cast<TDEListViewDateItem*>(mMainWidget->dateListView->firstChild()); while (item != 0) { item->setVisible(s); - item = static_cast<KListViewDateItem*>(item->nextSibling()); + item = static_cast<TDEListViewDateItem*>(item->nextSibling()); } } @@ -440,7 +440,7 @@ void HistoryDialog::slotSearchErase() * How does the search work * ------------------------ * We do the search respecting the current metacontact filter item. To do this, we iterate over the -* elements in the KListView (KListViewDateItems) and, for each one, we iterate over its subcontacts, +* elements in the TDEListView (TDEListViewDateItems) and, for each one, we iterate over its subcontacts, * manually searching the log files of each one. To avoid searching files twice, the months that have * been searched already are stored in searchedMonths. The matches are placed in the matches TQMap. * Finally, the current date item is checked in the matches TQMap, and if it is present, it is shown. @@ -472,9 +472,9 @@ void HistoryDialog::slotSearch() mSearching = true; // iterate over items in the date list widget - for(KListViewDateItem *curItem = static_cast<KListViewDateItem*>(mMainWidget->dateListView->firstChild()); + for(TDEListViewDateItem *curItem = static_cast<TDEListViewDateItem*>(mMainWidget->dateListView->firstChild()); curItem != 0; - curItem = static_cast<KListViewDateItem *>(curItem->nextSibling()) + curItem = static_cast<TDEListViewDateItem *>(curItem->nextSibling()) ) { tqApp->processEvents(); @@ -574,8 +574,8 @@ void HistoryDialog::doneProgressBar() void HistoryDialog::slotRightClick(const TQString &url, const TQPoint &point) { - KPopupMenu *chatWindowPopup = 0L; - chatWindowPopup = new KPopupMenu(); + TDEPopupMenu *chatWindowPopup = 0L; + chatWindowPopup = new TDEPopupMenu(); if ( !url.isEmpty() ) { diff --git a/kopete/plugins/history/historydialog.h b/kopete/plugins/history/historydialog.h index 4df323d6..daa45362 100644 --- a/kopete/plugins/history/historydialog.h +++ b/kopete/plugins/history/historydialog.h @@ -40,7 +40,7 @@ class KURL; namespace KParts { struct URLArgs; class Part; } -class KListViewDateItem; +class TDEListViewDateItem; class DMPair { @@ -117,7 +117,7 @@ class HistoryDialog : public KDialogBase /** * Search if @param item already has @param text child */ - bool hasChild(KListViewItem* item, int month); + bool hasChild(TDEListViewItem* item, int month); /** * We show history dialog to look at the log for a metacontact. Here is this metacontact. @@ -139,8 +139,8 @@ class HistoryDialog : public KDialogBase bool mSearching; - KAction *mCopyAct; - KAction *mCopyURLAct; + TDEAction *mCopyAct; + TDEAction *mCopyURLAct; TQString mURL; }; diff --git a/kopete/plugins/history/historyguiclient.cpp b/kopete/plugins/history/historyguiclient.cpp index 4b1798ae..21bde3b5 100644 --- a/kopete/plugins/history/historyguiclient.cpp +++ b/kopete/plugins/history/historyguiclient.cpp @@ -41,7 +41,7 @@ HistoryGUIClient::HistoryGUIClient(Kopete::ChatSession *parent, const char *name TQPtrList<Kopete::Contact> mb=m_manager->members(); m_logger=new HistoryLogger( mb.first() , this ); - actionLast=new KAction( i18n("History Last" ), TQString::fromLatin1( "finish" ), 0, this, TQT_SLOT(slotLast()), actionCollection() , "historyLast" ); + actionLast=new TDEAction( i18n("History Last" ), TQString::fromLatin1( "finish" ), 0, this, TQT_SLOT(slotLast()), actionCollection() , "historyLast" ); actionPrev = KStdAction::back( this, TQT_SLOT(slotPrevious()), actionCollection() , "historyPrevious" ); actionNext = KStdAction::forward( this, TQT_SLOT(slotNext()), actionCollection() , "historyNext" ); diff --git a/kopete/plugins/history/historyguiclient.h b/kopete/plugins/history/historyguiclient.h index 356afe29..86c4ae21 100644 --- a/kopete/plugins/history/historyguiclient.h +++ b/kopete/plugins/history/historyguiclient.h @@ -21,7 +21,7 @@ namespace Kopete { class ChatSession; } class HistoryLogger; -class KAction; +class TDEAction; /** *@author Olivier Goffart @@ -48,9 +48,9 @@ private: //int m_nbAutoChatWindow; //unsigned int m_nbChatWindow; - KAction *actionPrev; - KAction *actionNext; - KAction *actionLast; + TDEAction *actionPrev; + TDEAction *actionNext; + TDEAction *actionLast; }; #endif diff --git a/kopete/plugins/history/historyplugin.cpp b/kopete/plugins/history/historyplugin.cpp index c9dc5fd6..d4791952 100644 --- a/kopete/plugins/history/historyplugin.cpp +++ b/kopete/plugins/history/historyplugin.cpp @@ -44,7 +44,7 @@ K_EXPORT_COMPONENT_FACTORY( kopete_history, HistoryPluginFactory( &aboutdata ) HistoryPlugin::HistoryPlugin( TQObject *parent, const char *name, const TQStringList & /* args */ ) : Kopete::Plugin( HistoryPluginFactory::instance(), parent, name ), m_loggerFactory( this ) { - KAction *viewMetaContactHistory = new KAction( i18n("View &History" ), + TDEAction *viewMetaContactHistory = new TDEAction( i18n("View &History" ), TQString::fromLatin1( "history" ), 0, this, TQT_SLOT(slotViewHistory()), actionCollection(), "viewMetaContactHistory" ); viewMetaContactHistory->setEnabled( diff --git a/kopete/plugins/history/historyplugin.h b/kopete/plugins/history/historyplugin.h index 85aa2a3e..d20a28c9 100644 --- a/kopete/plugins/history/historyplugin.h +++ b/kopete/plugins/history/historyplugin.h @@ -28,7 +28,7 @@ #include "kopetemessagehandler.h" class KopeteView; -class KActionCollection; +class TDEActionCollection; namespace Kopete { diff --git a/kopete/plugins/history/historyviewer.ui b/kopete/plugins/history/historyviewer.ui index 8d7ca4b2..6711dd31 100644 --- a/kopete/plugins/history/historyviewer.ui +++ b/kopete/plugins/history/historyviewer.ui @@ -145,7 +145,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="KListViewSearchLine"> + <widget class="TDEListViewSearchLine"> <property name="name"> <cstring>dateSearchLine</cstring> </property> @@ -173,7 +173,7 @@ </size> </property> </widget> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Date</string> diff --git a/kopete/plugins/latex/latexguiclient.cpp b/kopete/plugins/latex/latexguiclient.cpp index ea9420fb..7b67f119 100644 --- a/kopete/plugins/latex/latexguiclient.cpp +++ b/kopete/plugins/latex/latexguiclient.cpp @@ -41,7 +41,7 @@ LatexGUIClient::LatexGUIClient( Kopete::ChatSession *parent, const char *name ) m_manager = parent; - new KAction( i18n( "Preview Latex Images" ), "latex", CTRL + Key_L, this, TQT_SLOT( slotPreview() ), actionCollection(), "latexPreview" ); + new TDEAction( i18n( "Preview Latex Images" ), "latex", CTRL + Key_L, this, TQT_SLOT( slotPreview() ), actionCollection(), "latexPreview" ); setXMLFile( "latexchatui.rc" ); } diff --git a/kopete/plugins/netmeeting/netmeetingguiclient.cpp b/kopete/plugins/netmeeting/netmeetingguiclient.cpp index 9dffde7f..d01d0df0 100644 --- a/kopete/plugins/netmeeting/netmeetingguiclient.cpp +++ b/kopete/plugins/netmeeting/netmeetingguiclient.cpp @@ -38,7 +38,7 @@ NetMeetingGUIClient::NetMeetingGUIClient( MSNChatSession *parent, const char *n setInstance(KGenericFactory<NetMeetingPlugin>::instance()); m_manager=parent; - new KAction( i18n( "Invite to Use NetMeeting" ), 0, this, TQT_SLOT( slotStartInvitation() ), actionCollection() , "netmeeting" ) ; + new TDEAction( i18n( "Invite to Use NetMeeting" ), 0, this, TQT_SLOT( slotStartInvitation() ), actionCollection() , "netmeeting" ) ; setXMLFile("netmeetingchatui.rc"); } diff --git a/kopete/plugins/nowlistening/DESIGN b/kopete/plugins/nowlistening/DESIGN index d2be5d5f..1cfb105b 100644 --- a/kopete/plugins/nowlistening/DESIGN +++ b/kopete/plugins/nowlistening/DESIGN @@ -36,7 +36,7 @@ How contact specific plugin data works Each metacontact has a method pluginData(KopetePlugin *). This takes a pointer to a plugin, and returns a QStringList containing the metacontact's data for that plugin. A corresponding setPluginData() method changes this. Who is responsible for making sure this data persists? What about custom actions? -KopetePlugin::custom[Chat|ContextMenuActions] both return a set of KActions that the plugin wants to have added to the UI. Looking at contactnotes, it seems that this set is recreated every time thses methods are called and they change the state of the plugin (currentContact). Is this so that the context menu is generated individually for each MC, so that the method that is called when the men item is clicked know which MC it applies to? +KopetePlugin::custom[Chat|ContextMenuActions] both return a set of TDEActions that the plugin wants to have added to the UI. Looking at contactnotes, it seems that this set is recreated every time thses methods are called and they change the state of the plugin (currentContact). Is this so that the context menu is generated individually for each MC, so that the method that is called when the men item is clicked know which MC it applies to? Choosing whether to advertise to all contacts We can either advertise periodically to (some) contacts, or we could just add an Action to advertise what we're currently listening to. diff --git a/kopete/plugins/nowlistening/nowlisteningguiclient.cpp b/kopete/plugins/nowlistening/nowlisteningguiclient.cpp index c5e47ef0..29f03175 100644 --- a/kopete/plugins/nowlistening/nowlisteningguiclient.cpp +++ b/kopete/plugins/nowlistening/nowlisteningguiclient.cpp @@ -34,7 +34,7 @@ NowListeningGUIClient::NowListeningGUIClient( Kopete::ChatSession *parent, NowLi { connect(plugin, TQT_SIGNAL(readyForUnload()), TQT_SLOT(slotPluginUnloaded())); m_msgManager = parent; - m_action = new KAction( i18n( "Send Media Info" ), 0, this, + m_action = new TDEAction( i18n( "Send Media Info" ), 0, this, TQT_SLOT( slotAdvertToCurrentChat() ), actionCollection(), "actionSendAdvert" ); setXMLFile("nowlisteningchatui.rc"); } diff --git a/kopete/plugins/nowlistening/nowlisteningguiclient.h b/kopete/plugins/nowlistening/nowlisteningguiclient.h index f4c4b47f..95642ede 100644 --- a/kopete/plugins/nowlistening/nowlisteningguiclient.h +++ b/kopete/plugins/nowlistening/nowlisteningguiclient.h @@ -24,7 +24,7 @@ #include <tqobject.h> #include <kxmlguiclient.h> -class KAction; +class TDEAction; class NowListeningPlugin; namespace Kopete { @@ -46,7 +46,7 @@ protected slots: private: Kopete::ChatSession* m_msgManager; - KAction* m_action; + TDEAction* m_action; }; #endif diff --git a/kopete/plugins/nowlistening/nowlisteningprefs.ui b/kopete/plugins/nowlistening/nowlisteningprefs.ui index 125ff80b..ff3307e9 100644 --- a/kopete/plugins/nowlistening/nowlisteningprefs.ui +++ b/kopete/plugins/nowlistening/nowlisteningprefs.ui @@ -295,7 +295,7 @@ in place of your status message.</string> <string>Use &specified media player</string> </property> </widget> - <widget class="KListBox"> + <widget class="TDEListBox"> <property name="name"> <cstring>kcfg_SelectedMediaPlayer</cstring> </property> diff --git a/kopete/plugins/smpppdcs/smpppdcsprefs.ui b/kopete/plugins/smpppdcs/smpppdcsprefs.ui index efe7ede5..747398d4 100644 --- a/kopete/plugins/smpppdcs/smpppdcsprefs.ui +++ b/kopete/plugins/smpppdcs/smpppdcsprefs.ui @@ -218,7 +218,7 @@ <string>Choose the accounts to ignore:</string> </property> </widget> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Account</string> diff --git a/kopete/plugins/statistics/statisticsdialog.cpp b/kopete/plugins/statistics/statisticsdialog.cpp index 02a5f4b7..27c8b565 100644 --- a/kopete/plugins/statistics/statisticsdialog.cpp +++ b/kopete/plugins/statistics/statisticsdialog.cpp @@ -359,7 +359,7 @@ void StatisticsDialog::generatePageFromTQStringList(TQStringList values, const T // TQDateTime listViewDT1, listViewDT2; // listViewDT1.setTime_t(values[i+1].toInt()); // listViewDT2.setTime_t(values[i+2].toInt()); - // new KListViewItem(mainWidget->listView, values[i], values[i+1], values[i+2], listViewDT1.toString(), listViewDT2.toString()); + // new TDEListViewItem(mainWidget->listView, values[i], values[i+1], values[i+2], listViewDT1.toString(), listViewDT2.toString()); } diff --git a/kopete/plugins/statistics/statisticsplugin.cpp b/kopete/plugins/statistics/statisticsplugin.cpp index 8bb3c16d..14490e30 100644 --- a/kopete/plugins/statistics/statisticsplugin.cpp +++ b/kopete/plugins/statistics/statisticsplugin.cpp @@ -52,7 +52,7 @@ StatisticsPlugin::StatisticsPlugin( TQObject *parent, const char *name, const TQ { - KAction *viewMetaContactStatistics = new KAction( i18n("View &Statistics" ), + TDEAction *viewMetaContactStatistics = new TDEAction( i18n("View &Statistics" ), TQString::fromLatin1( "log" ), 0, this, TQT_SLOT(slotViewStatistics()), actionCollection(), "viewMetaContactStatistics" ); viewMetaContactStatistics->setEnabled(Kopete::ContactList::self()->selectedMetaContacts().count() == 1); diff --git a/kopete/plugins/statistics/statisticsplugin.h b/kopete/plugins/statistics/statisticsplugin.h index 0fe1e7b6..1f4da69c 100644 --- a/kopete/plugins/statistics/statisticsplugin.h +++ b/kopete/plugins/statistics/statisticsplugin.h @@ -39,7 +39,7 @@ class StatisticsContact; class StatisticsDCOPIface; class KopeteView; -class KActionCollection; +class TDEActionCollection; /** \section Kopete Statistics Plugin * diff --git a/kopete/plugins/texteffect/texteffectprefs.ui b/kopete/plugins/texteffect/texteffectprefs.ui index 2dd1ab85..2278c2a5 100644 --- a/kopete/plugins/texteffect/texteffectprefs.ui +++ b/kopete/plugins/texteffect/texteffectprefs.ui @@ -49,7 +49,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListBox" row="0" column="0" rowspan="5" colspan="1"> + <widget class="TDEListBox" row="0" column="0" rowspan="5" colspan="1"> <property name="name"> <cstring>mColorsListBox</cstring> </property> diff --git a/kopete/plugins/translator/translatorguiclient.cpp b/kopete/plugins/translator/translatorguiclient.cpp index ef5ac9ac..1d1eaec8 100644 --- a/kopete/plugins/translator/translatorguiclient.cpp +++ b/kopete/plugins/translator/translatorguiclient.cpp @@ -41,7 +41,7 @@ TranslatorGUIClient::TranslatorGUIClient( Kopete::ChatSession *parent, const cha m_manager = parent; - new KAction( i18n( "Translate" ), "locale", CTRL + Key_T, this, TQT_SLOT( slotTranslateChat() ), actionCollection(), "translateCurrentMessage" ); + new TDEAction( i18n( "Translate" ), "locale", CTRL + Key_T, this, TQT_SLOT( slotTranslateChat() ), actionCollection(), "translateCurrentMessage" ); setXMLFile( "translatorchatui.rc" ); } diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp index 066f93a9..5113e358 100644 --- a/kopete/plugins/translator/translatorplugin.cpp +++ b/kopete/plugins/translator/translatorplugin.cpp @@ -76,7 +76,7 @@ TranslatorPlugin::TranslatorPlugin( TQObject *parent, const char *name, const TQ for ( int k = 0; k <= m_languages->numLanguages(); k++ ) keys << m[ m_languages->languageKey( k ) ]; - m_actionLanguage = new KSelectAction( i18n( "Set &Language" ), "locale", 0, actionCollection(), "contactLanguage" ); + m_actionLanguage = new TDESelectAction( i18n( "Set &Language" ), "locale", 0, actionCollection(), "contactLanguage" ); m_actionLanguage->setItems( keys ); connect( m_actionLanguage, TQT_SIGNAL( activated() ), this, TQT_SLOT(slotSetLanguage() ) ); connect( Kopete::ContactList::self(), TQT_SIGNAL( metaContactSelected( bool ) ), this, TQT_SLOT( slotSelectionChanged( bool ) ) ); diff --git a/kopete/plugins/translator/translatorplugin.h b/kopete/plugins/translator/translatorplugin.h index d7700d8e..eb65e1d1 100644 --- a/kopete/plugins/translator/translatorplugin.h +++ b/kopete/plugins/translator/translatorplugin.h @@ -34,7 +34,7 @@ class TQString; -class KSelectAction; +class TDESelectAction; namespace Kopete { class Message; } namespace Kopete { class MetaContact; } @@ -93,7 +93,7 @@ private: TQMap< TDEIO::Job *, TQCString> m_data; TQMap< TDEIO::Job *, bool> m_completed; - KSelectAction* m_actionLanguage; + TDESelectAction* m_actionLanguage; static TranslatorPlugin* pluginStatic_; TranslatorLanguages *m_languages; diff --git a/kopete/plugins/webpresence/webpresenceplugin.h b/kopete/plugins/webpresence/webpresenceplugin.h index c739d10e..9b25be07 100644 --- a/kopete/plugins/webpresence/webpresenceplugin.h +++ b/kopete/plugins/webpresence/webpresenceplugin.h @@ -30,8 +30,8 @@ class TQTimer; class KTempFile; namespace Kopete { class MetaContact; } -class KToggleAction; -class KActionCollection; +class TDEToggleAction; +class TDEActionCollection; typedef TQValueList<Kopete::Protocol*> ProtocolList; |