From 7be55ffa061c026e35e2d6a0effe1161ddb0d41f Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:53:50 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- knode/knfiltermanager.cpp | 52 +++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'knode/knfiltermanager.cpp') diff --git a/knode/knfiltermanager.cpp b/knode/knfiltermanager.cpp index ce8469512..be57996f9 100644 --- a/knode/knfiltermanager.cpp +++ b/knode/knfiltermanager.cpp @@ -29,12 +29,12 @@ #include "knconfigwidgets.h" -KNFilterSelectAction::KNFilterSelectAction( const QString& text, const QString& pix, - QObject* parent, const char *name ) +KNFilterSelectAction::KNFilterSelectAction( const TQString& text, const TQString& pix, + TQObject* parent, const char *name ) : KActionMenu(text,pix,parent,name), currentItem(-42) { popupMenu()->setCheckable(true); - connect(popupMenu(),SIGNAL(activated(int)),this,SLOT(slotMenuActivated(int))); + connect(popupMenu(),TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotMenuActivated(int))); setDelayed(false); } @@ -61,8 +61,8 @@ void KNFilterSelectAction::slotMenuActivated(int id) //============================================================================== -KNFilterManager::KNFilterManager(QObject * parent, const char * name) - : QObject(parent,name), fset(0), currFilter(0), a_ctFilter(0) +KNFilterManager::KNFilterManager(TQObject * parent, const char * name) + : TQObject(parent,name), fset(0), currFilter(0), a_ctFilter(0) { loadFilters(); @@ -75,7 +75,7 @@ KNFilterManager::KNFilterManager(QObject * parent, const char * name) KNFilterManager::~KNFilterManager() { - for ( QValueList::Iterator it = mFilterList.begin(); it != mFilterList.end(); ++it ) + for ( TQValueList::Iterator it = mFilterList.begin(); it != mFilterList.end(); ++it ) delete (*it); } @@ -104,15 +104,15 @@ void KNFilterManager::prepareShutdown() void KNFilterManager::loadFilters() { - QString fname(locate("data","knode/filters/filters.rc") ); + TQString fname(locate("data","knode/filters/filters.rc") ); if (!fname.isNull()) { KSimpleConfig conf(fname,true); - QValueList activeFilters = conf.readIntListEntry("Active"); + TQValueList activeFilters = conf.readIntListEntry("Active"); menuOrder = conf.readIntListEntry("Menu"); - QValueList::Iterator it = activeFilters.begin(); + TQValueList::Iterator it = activeFilters.begin(); while (it != activeFilters.end()) { KNArticleFilter *f=new KNArticleFilter((*it)); if (f->loadInfo()) @@ -129,15 +129,15 @@ void KNFilterManager::loadFilters() void KNFilterManager::saveFilterLists() { - QString dir(locateLocal("data","knode/")+"filters/"); + TQString dir(locateLocal("data","knode/")+"filters/"); if (dir.isNull()) { KNHelper::displayInternalFileError(); return; } KSimpleConfig conf(dir+"filters.rc"); - QValueList activeFilters; - for ( QValueList::Iterator it = mFilterList.begin(); it != mFilterList.end(); ++it ) + TQValueList activeFilters; + for ( TQValueList::Iterator it = mFilterList.begin(); it != mFilterList.end(); ++it ) activeFilters << (*it)->id(); conf.writeEntry("Active",activeFilters); @@ -151,10 +151,10 @@ void KNFilterManager::startConfig(KNConfig::FilterListWidget *fs) fset=fs; commitNeeded = false; - for ( QValueList::Iterator it = mFilterList.begin(); it != mFilterList.end(); ++it ) + for ( TQValueList::Iterator it = mFilterList.begin(); it != mFilterList.end(); ++it ) fset->addItem( (*it) ); - QValueList::Iterator it = menuOrder.begin(); + TQValueList::Iterator it = menuOrder.begin(); while (it != menuOrder.end()) { if ((*it)!=-1) fset->addMenuItem(byID((*it))); @@ -200,9 +200,9 @@ void KNFilterManager::newFilter() void KNFilterManager::addFilter(KNArticleFilter *f) { if ( f->id() == -1 ) { // new filter, find suitable ID - QValueList activeFilters; + TQValueList activeFilters; // ok, this is a ugly hack: we want to reuse old id's, so we try to find the first unused id - for ( QValueList::Iterator it = mFilterList.begin(); it != mFilterList.end(); ++it ) + for ( TQValueList::Iterator it = mFilterList.begin(); it != mFilterList.end(); ++it ) activeFilters << (*it)->id(); int newId = 1; while ( activeFilters.contains( newId ) > 0 ) @@ -262,7 +262,7 @@ void KNFilterManager::copyFilter(KNArticleFilter *f) void KNFilterManager::deleteFilter(KNArticleFilter *f) { if ( KMessageBox::warningContinueCancel( fset ? fset : knGlobals.topWidget, - i18n("Do you really want to delete this filter?"), QString::null, KGuiItem( i18n("&Delete"), "editdelete" ) ) + i18n("Do you really want to delete this filter?"), TQString::null, KGuiItem( i18n("&Delete"), "editdelete" ) ) == KMessageBox::Continue ) { if ( mFilterList.remove( f ) ) { // does not delete surplus config files if ( fset ) { // we reuse ids to reduce the number of dead files @@ -278,9 +278,9 @@ void KNFilterManager::deleteFilter(KNArticleFilter *f) } -bool KNFilterManager::newNameIsOK(KNArticleFilter *f, const QString &newName) +bool KNFilterManager::newNameIsOK(KNArticleFilter *f, const TQString &newName) { - for ( QValueList::Iterator it = mFilterList.begin(); it != mFilterList.end(); ++it ) + for ( TQValueList::Iterator it = mFilterList.begin(); it != mFilterList.end(); ++it ) if ( (*it) != f && newName == (*it)->translatedName() ) return false; @@ -309,7 +309,7 @@ KNArticleFilter* KNFilterManager::setFilter(const int id) KNArticleFilter* KNFilterManager::byID(int id) { - for ( QValueList::Iterator it = mFilterList.begin(); it != mFilterList.end(); ++it ) + for ( TQValueList::Iterator it = mFilterList.begin(); it != mFilterList.end(); ++it ) if ( (*it)->id() == id ) return (*it); @@ -326,7 +326,7 @@ void KNFilterManager::updateMenu() a_ctFilter->popupMenu()->clear(); KNArticleFilter *f=0; - QValueList::Iterator it = menuOrder.begin(); + TQValueList::Iterator it = menuOrder.begin(); while (it != menuOrder.end()) { if ((*it)!=-1) { if ((f=byID((*it)))) @@ -354,10 +354,10 @@ void KNFilterManager::slotMenuActivated(int id) void KNFilterManager::slotShowFilterChooser() { KNArticleFilter *f=0; - QStringList items; - QValueList ids; + TQStringList items; + TQValueList ids; - QValueList::Iterator it = menuOrder.begin(); + TQValueList::Iterator it = menuOrder.begin(); while (it != menuOrder.end()) { if ((*it)!=-1) if ((f=byID((*it)))) { @@ -383,10 +383,10 @@ void KNFilterManager::setMenuAction(KNFilterSelectAction *a, KAction *keybA) { if(a) { a_ctFilter = a; - connect(a_ctFilter, SIGNAL(activated(int)), this, SLOT(slotMenuActivated(int))); + connect(a_ctFilter, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuActivated(int))); } if(keybA) - connect(keybA, SIGNAL(activated()), this, SLOT(slotShowFilterChooser())); + connect(keybA, TQT_SIGNAL(activated()), this, TQT_SLOT(slotShowFilterChooser())); updateMenu(); } -- cgit v1.2.1