From 4ae0c208b66e0f7954e194384464fe2d0a2c56dd Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:51:49 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1157652 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kbabel/kbabeldict/dictionarymenu.cpp | 44 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'kbabel/kbabeldict/dictionarymenu.cpp') diff --git a/kbabel/kbabeldict/dictionarymenu.cpp b/kbabel/kbabeldict/dictionarymenu.cpp index 2ed57d5f..5d648697 100644 --- a/kbabel/kbabeldict/dictionarymenu.cpp +++ b/kbabel/kbabeldict/dictionarymenu.cpp @@ -36,11 +36,11 @@ #include #include -#include +#include DictionaryMenu::DictionaryMenu(KPopupMenu *popupMenu, KActionCollection *collection - , QObject *parent) - : QObject(parent, "dictionarymenu") + , TQObject *parent) + : TQObject(parent, "dictionarymenu") , popup(popupMenu) , actionCollection(collection) , maxId(10) @@ -50,12 +50,12 @@ DictionaryMenu::DictionaryMenu(KPopupMenu *popupMenu, KActionCollection *collect if(popup) { - connect(popup,SIGNAL(activated(int)),this,SLOT(activated(int))); + connect(popup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(activated(int))); } - dictionaryMapper = new QSignalMapper( this ); - connect( dictionaryMapper, SIGNAL( mapped( int ) ), - this, SLOT( activated( int ) ) ); + dictionaryMapper = new TQSignalMapper( this ); + connect( dictionaryMapper, TQT_SIGNAL( mapped( int ) ), + this, TQT_SLOT( activated( int ) ) ); } @@ -68,7 +68,7 @@ void DictionaryMenu::clear() { if(popup) { - QIntDictIterator it( num2id ); // iterator for dict + TQIntDictIterator it( num2id ); // iterator for dict while ( it.current() ) { popup->removeItem(it.currentKey()); @@ -80,49 +80,49 @@ void DictionaryMenu::clear() // create new mapper delete dictionaryMapper; - dictionaryMapper = new QSignalMapper( this ); - connect( dictionaryMapper, SIGNAL( mapped( int ) ), - this, SLOT( activated( int ) ) ); + dictionaryMapper = new TQSignalMapper( this ); + connect( dictionaryMapper, TQT_SIGNAL( mapped( int ) ), + this, TQT_SLOT( activated( int ) ) ); } -void DictionaryMenu::add(const QString& name, const QString& moduleId) +void DictionaryMenu::add(const TQString& name, const TQString& moduleId) { if(popup) { - KAction* dictionaryAction = new KAction( name, 0, dictionaryMapper, SLOT(map()), actionCollection, moduleId.utf8() ); + KAction* dictionaryAction = new KAction( name, 0, dictionaryMapper, TQT_SLOT(map()), actionCollection, moduleId.utf8() ); uint id = maxId++; dictionaryAction->plug(popup, id); dictionaryMapper->setMapping( dictionaryAction, id ); - QString *idString = new QString(moduleId); + TQString *idString = new TQString(moduleId); num2id.insert(id,idString); } } -void DictionaryMenu::add(const QString& n, const QString& moduleId - , const QString& key) +void DictionaryMenu::add(const TQString& n, const TQString& moduleId + , const TQString& key) { if(popup) { - QString name=n; + TQString name=n; - QString keyString=key; + TQString keyString=key; if(keyString.contains("%1")) { keyString=key.arg(accel2id.count()+1); } KShortcut k(keyString); - KAction* dictionaryAction = new KAction( name, k, dictionaryMapper, SLOT(map()), actionCollection, key.arg(moduleId).utf8() ); + KAction* dictionaryAction = new KAction( name, k, dictionaryMapper, TQT_SLOT(map()), actionCollection, key.arg(moduleId).utf8() ); uint id = maxId++; dictionaryAction->plug(popup,id); if(!k.isNull()) { - QString *idString = new QString(moduleId); + TQString *idString = new TQString(moduleId); accel2id.insert(id,idString); dictionaryMapper->setMapping( dictionaryAction, id ); @@ -135,7 +135,7 @@ void DictionaryMenu::add(const QString& n, const QString& moduleId kdWarning() << "key not valid" << endl; } - QString *idString = new QString(moduleId); + TQString *idString = new TQString(moduleId); num2id.insert(id,idString); } } @@ -143,7 +143,7 @@ void DictionaryMenu::add(const QString& n, const QString& moduleId void DictionaryMenu::activated(int id) { - QString *idString = num2id[id]; + TQString *idString = num2id[id]; if(idString) { -- cgit v1.2.1