diff options
Diffstat (limited to 'src/kvirc')
417 files changed, 12456 insertions, 12450 deletions
diff --git a/src/kvirc/kernel/kvi_action.cpp b/src/kvirc/kernel/kvi_action.cpp index 4764fcf..0c10f99 100644 --- a/src/kvirc/kernel/kvi_action.cpp +++ b/src/kvirc/kernel/kvi_action.cpp @@ -37,7 +37,7 @@ #include "kvi_query.h" #include "kvi_styled_controls.h" -#include <qtoolbutton.h> +#include <tqtoolbutton.h> #include "kvi_tal_popupmenu.h" @@ -45,19 +45,19 @@ KviAction::~KviAction() { if(m_pWidgetList) { - for(QWidget * b = m_pWidgetList->first();b;b = m_pWidgetList->next()) - disconnect(b,SIGNAL(destroyed()),this,SLOT(widgetDestroyed())); + for(TQWidget * b = m_pWidgetList->first();b;b = m_pWidgetList->next()) + disconnect(b,TQT_SIGNAL(destroyed()),this,TQT_SLOT(widgetDestroyed())); m_pWidgetList->setAutoDelete(true); delete m_pWidgetList; } } -const QString & KviAction::visibleName() +const TQString & KviAction::visibleName() { return m_szVisibleName; } -const QString & KviAction::description() +const TQString & KviAction::description() { return m_szDescription; } @@ -70,7 +70,7 @@ bool KviAction::isKviUserActionNeverOverrideThis() void KviAction::registerAccelerator() { if(!m_szKeySequence.isEmpty()) - m_iAccelId = g_pFrame->registerAccelerator(m_szKeySequence,this,SLOT(activate())); + m_iAccelId = g_pFrame->registerAccelerator(m_szKeySequence,this,TQT_SLOT(activate())); } void KviAction::unregisterAccelerator() @@ -94,10 +94,10 @@ void KviAction::setEnabled(bool bEnabled) { if(bEnabled) { - for(QWidget * t = m_pWidgetList->first();t;t = m_pWidgetList->next()) + for(TQWidget * t = m_pWidgetList->first();t;t = m_pWidgetList->next()) if(!t->isEnabled())t->setEnabled(true); } else { - for(QWidget * t = m_pWidgetList->first();t;t = m_pWidgetList->next()) + for(TQWidget * t = m_pWidgetList->first();t;t = m_pWidgetList->next()) if(t->isEnabled())t->setEnabled(false); } } @@ -117,31 +117,31 @@ int KviAction::validateFlags(int iFlagsToValidate) return iFlagsToValidate; } -QPixmap * KviAction::smallIcon() +TQPixmap * KviAction::smallIcon() { if(m_iSmallIconId != 0)return g_pIconManager->getSmallIcon(m_iSmallIconId); return 0; } -QPixmap * KviAction::bigIcon() +TQPixmap * KviAction::bigIcon() { return g_pIconManager->getBigIcon(m_szBigIcon); } void KviAction::setup() { - connect(g_pApp,SIGNAL(reloadImages()),this,SLOT(reloadImages())); + connect(g_pApp,TQT_SIGNAL(reloadImages()),this,TQT_SLOT(reloadImages())); if(m_uFlags & InternalWindowMask) { - connect(g_pFrame,SIGNAL(activeWindowChanged()),this,SLOT(activeWindowChanged())); + connect(g_pFrame,TQT_SIGNAL(activeWindowChanged()),this,TQT_SLOT(activeWindowChanged())); if((m_uFlags & WindowOnlyIfUsersSelected) && (m_uFlags & (WindowChannel | WindowConsole | WindowQuery))) - connect(g_pFrame,SIGNAL(activeWindowSelectionStateChanged(bool)),this,SLOT(activeWindowSelectionStateChanged(bool))); + connect(g_pFrame,TQT_SIGNAL(activeWindowSelectionStateChanged(bool)),this,TQT_SLOT(activeWindowSelectionStateChanged(bool))); activeWindowChanged(); } else { if(m_uFlags & NeedsConnection) { - connect(g_pFrame,SIGNAL(activeContextChanged()),this,SLOT(activeContextChanged())); - connect(g_pFrame,SIGNAL(activeContextStateChanged()),this,SLOT(activeContextStateChanged())); + connect(g_pFrame,TQT_SIGNAL(activeContextChanged()),this,TQT_SLOT(activeContextChanged())); + connect(g_pFrame,TQT_SIGNAL(activeContextStateChanged()),this,TQT_SLOT(activeContextStateChanged())); KviIrcContext * c = g_pFrame->activeContext(); if(!c)setEnabled(false); else { @@ -161,7 +161,7 @@ void KviAction::setup() } else { if(m_uFlags & NeedsContext) { - connect(g_pFrame,SIGNAL(activeContextChanged()),this,SLOT(activeContextChanged())); + connect(g_pFrame,TQT_SIGNAL(activeContextChanged()),this,TQT_SLOT(activeContextChanged())); if(!g_pFrame->activeContext())setEnabled(false); else setEnabled(true); } @@ -175,11 +175,11 @@ void KviAction::setup() void KviAction::reloadImages() { if(!m_pWidgetList)return; - QPixmap * p = bigIcon(); - for(QWidget * b = m_pWidgetList->first();b;b = m_pWidgetList->next()) + TQPixmap * p = bigIcon(); + for(TQWidget * b = m_pWidgetList->first();b;b = m_pWidgetList->next()) { - if(b->inherits("QToolButton")) - ((QToolButton *)b)->setIconSet(p ? *p : QPixmap()); + if(b->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING)) + ((TQToolButton *)b)->setIconSet(p ? *p : TQPixmap()); } } @@ -251,7 +251,7 @@ void KviAction::activeWindowChanged() if(isEnabled())setEnabled(false); } break; - case KVI_WINDOW_TYPE_QUERY: + case KVI_WINDOW_TYPE_TQUERY: if(m_uFlags & WindowQuery) { if(m_uFlags & WindowOnlyIfUsersSelected) @@ -305,7 +305,7 @@ void KviAction::activeWindowSelectionStateChanged(bool bSelectedNow) if(isEnabled())setEnabled(false); } break; - case KVI_WINDOW_TYPE_QUERY: + case KVI_WINDOW_TYPE_TQUERY: if(m_uFlags & WindowQuery) { if(bSelectedNow != isEnabled())setEnabled(bSelectedNow); @@ -377,15 +377,15 @@ void KviAction::activeContextStateChanged() bool KviAction::addToPopupMenu(KviTalPopupMenu *pMenu) { if(!setupDone())setup(); - QPixmap * p = smallIcon(); + TQPixmap * p = smallIcon(); int id; - QString t = visibleName(); + TQString t = visibleName(); if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence; if(p) { - id = pMenu->insertItem(*p,t,this,SLOT(activate())); + id = pMenu->insertItem(*p,t,this,TQT_SLOT(activate())); } else { - id = pMenu->insertItem(t,this,SLOT(activate())); + id = pMenu->insertItem(t,this,TQT_SLOT(activate())); } if(!isEnabled())pMenu->setItemEnabled(id,false); return true; @@ -394,30 +394,30 @@ bool KviAction::addToPopupMenu(KviTalPopupMenu *pMenu) void KviAction::widgetDestroyed() { if(!m_pWidgetList)return; - QWidget * b = (QWidget *)sender(); + TQWidget * b = (TQWidget *)sender(); m_pWidgetList->removeRef(b); } -void KviAction::registerWidget(QWidget * b) +void KviAction::registerWidget(TQWidget * b) { - connect(b,SIGNAL(destroyed()),this,SLOT(widgetDestroyed())); + connect(b,TQT_SIGNAL(destroyed()),this,TQT_SLOT(widgetDestroyed())); if(!m_pWidgetList) { - m_pWidgetList = new KviPointerList<QWidget>; + m_pWidgetList = new KviPointerList<TQWidget>; m_pWidgetList->setAutoDelete(false); } m_pWidgetList->append(b); } -QWidget * KviAction::addToCustomToolBar(KviCustomToolBar *pParentToolBar) +TQWidget * KviAction::addToCustomToolBar(KviCustomToolBar *pParentToolBar) { if(!setupDone())setup(); - QPixmap * p = bigIcon(); - QToolButton * b = new KviStyledToolButton( - p ? *p : QPixmap(), + TQPixmap * p = bigIcon(); + TQToolButton * b = new KviStyledToolButton( + p ? *p : TQPixmap(), visibleName(), visibleName(), - this,SLOT(activate()),pParentToolBar,m_szName); + this,TQT_SLOT(activate()),pParentToolBar,m_szName); #ifdef COMPILE_USE_QT4 pParentToolBar->addWidget(b); #endif diff --git a/src/kvirc/kernel/kvi_action.h b/src/kvirc/kernel/kvi_action.h index 1866963..37a397e 100644 --- a/src/kvirc/kernel/kvi_action.h +++ b/src/kvirc/kernel/kvi_action.h @@ -27,8 +27,8 @@ #include "kvi_settings.h" #include "kvi_pointerlist.h" -#include <qobject.h> -#include <qstring.h> +#include <tqobject.h> +#include <tqstring.h> // The action name is INTERNAL: it should be never shown to the user // if it contains a dot then the part before the dot is considered to @@ -38,46 +38,47 @@ // class KviTalPopupMenu; -class QWidget; +class TQWidget; class KviCustomToolBar; -class QPixmap; +class TQPixmap; class KviKvsScript; class KVIRC_API KviActionCategory { protected: - QString m_szName; - QString m_szVisibleName; - QString m_szDescription; + TQString m_szName; + TQString m_szVisibleName; + TQString m_szDescription; public: - KviActionCategory(const QString &szName,const QString &szVisibleName,const QString &szDescription) + KviActionCategory(const TQString &szName,const TQString &szVisibleName,const TQString &szDescription) : m_szName(szName), m_szVisibleName(szVisibleName), m_szDescription(szDescription) {}; ~KviActionCategory(){}; public: - const QString & name(){ return m_szName; }; - const QString & visibleName(){ return m_szVisibleName; }; - const QString & description(){ return m_szDescription; }; + const TQString & name(){ return m_szName; }; + const TQString & visibleName(){ return m_szVisibleName; }; + const TQString & description(){ return m_szDescription; }; }; // these flags are INTERNAL #define KVI_ACTION_FLAG_ENABLED 1 #define KVI_ACTION_FLAG_SETUPDONE 2 -class KVIRC_API KviAction : public QObject +class KVIRC_API KviAction : public TQObject { friend class KviActionManager; Q_OBJECT + TQ_OBJECT protected: - QString m_szName; // the internal name of the action, must be in form [module.]name - QString m_szVisibleName; - QString m_szDescription; + TQString m_szName; // the internal name of the action, must be in form [module.]name + TQString m_szVisibleName; + TQString m_szDescription; KviActionCategory * m_pCategory; // may be 0, not owned! - QString m_szBigIcon; + TQString m_szBigIcon; int m_iSmallIconId; - KviPointerList<QWidget> * m_pWidgetList; + KviPointerList<TQWidget> * m_pWidgetList; unsigned short int m_uInternalFlags; unsigned int m_uFlags; - QString m_szKeySequence; + TQString m_szKeySequence; int m_iAccelId; public: enum Flags { @@ -92,16 +93,16 @@ public: WindowOnlyIfUsersSelected = 128 // implies at least one of WindowConsole | WindowChannel | WindowQuery }; public: - KviAction(QObject * pParent, // can be 0, but using a QObject will help in deleting this action :) - const QString &szName, // internal name of this action, in form [module.]name - const QString &szVisibleName, // permanent visible name, visible at least in the action drawer - const QString &szDescription, // what this action does ? + KviAction(TQObject * pParent, // can be 0, but using a TQObject will help in deleting this action :) + const TQString &szName, // internal name of this action, in form [module.]name + const TQString &szVisibleName, // permanent visible name, visible at least in the action drawer + const TQString &szDescription, // what this action does ? KviActionCategory * pCategory = 0, // one of KviActionManager::category*() or 0 (default category) - const QString &szBigIcon = QString::null, + const TQString &szBigIcon = TQString(), int iSmallIconId = 0, unsigned int uFlags = 0, - const QString &szKeySequence = QString::null) - : QObject(pParent), + const TQString &szKeySequence = TQString()) + : TQObject(pParent), m_szName(szName), m_szVisibleName(szVisibleName), m_szDescription(szDescription), @@ -116,29 +117,29 @@ public: virtual ~KviAction(); public: static int validateFlags(int iFlagsToValidate); - const QString & name() const { return m_szName; }; - virtual const QString & visibleName(); - virtual const QString & description(); - const QString & keySequence() const { return m_szKeySequence; }; - const QString & bigIconString() const { return m_szBigIcon; }; + const TQString & name() const { return m_szName; }; + virtual const TQString & visibleName(); + virtual const TQString & description(); + const TQString & keySequence() const { return m_szKeySequence; }; + const TQString & bigIconString() const { return m_szBigIcon; }; KviActionCategory * category() const { return m_pCategory; }; bool isEnabled() const { return (m_uInternalFlags & KVI_ACTION_FLAG_ENABLED); }; unsigned int flags(){ return m_uFlags; }; virtual bool isKviUserActionNeverOverrideThis(); virtual void setEnabled(bool bEnabled); - virtual QPixmap * smallIcon(); - virtual QPixmap * bigIcon(); + virtual TQPixmap * smallIcon(); + virtual TQPixmap * bigIcon(); virtual bool addToPopupMenu(KviTalPopupMenu *pMenu); - virtual QWidget * addToCustomToolBar(KviCustomToolBar *pParentToolBar); + virtual TQWidget * addToCustomToolBar(KviCustomToolBar *pParentToolBar); void suicide() { delete this; }; protected: // called once before the FIRST button or menu item is created bool setupDone() const { return (m_uInternalFlags & KVI_ACTION_FLAG_SETUPDONE); }; virtual void setup(); - KviPointerList<QWidget> * widgetList(){ return m_pWidgetList; }; + KviPointerList<TQWidget> * widgetList(){ return m_pWidgetList; }; void registerAccelerator(); void unregisterAccelerator(); - void registerWidget(QWidget * b); + void registerWidget(TQWidget * b); protected slots: virtual void widgetDestroyed(); virtual void reloadImages(); diff --git a/src/kvirc/kernel/kvi_actionmanager.cpp b/src/kvirc/kernel/kvi_actionmanager.cpp index 3a325a6..296de6a 100644 --- a/src/kvirc/kernel/kvi_actionmanager.cpp +++ b/src/kvirc/kernel/kvi_actionmanager.cpp @@ -50,17 +50,17 @@ KviCustomToolBar * KviActionManager::m_pCurrentToolBar = 0; extern void register_core_actions(KviActionManager *); KviActionManager::KviActionManager() -: QObject() +: TQObject() { - m_pActions = new KviPointerHashTable<QString,KviAction>(101); + m_pActions = new KviPointerHashTable<TQString,KviAction>(101); m_pActions->setAutoDelete(false); - m_pCategories = new KviPointerHashTable<QString,KviActionCategory>(17,false); + m_pCategories = new KviPointerHashTable<TQString,KviActionCategory>(17,false); m_pCategories->setAutoDelete(true); #define CATEGORY(__var,__name,__vname,__descr) \ __var = new KviActionCategory(__name,__vname,__descr); \ - m_pCategories->replace(__name,__var) + m_pCategories->tqreplace(__name,__var) CATEGORY(m_pCategoryIrc,"irc",__tr2qs("IRC"),__tr2qs("IRC Context related actions")); CATEGORY(m_pCategoryGeneric,"generic",__tr2qs("Generic"),__tr2qs("Generic actions")); @@ -82,10 +82,10 @@ KviActionManager::~KviActionManager() // killed all the modules at this point... //KviActionDialog::cleanup(); - KviPointerHashTableIterator<QString,KviAction> it(*m_pActions); + KviPointerHashTableIterator<TQString,KviAction> it(*m_pActions); while(KviAction * a = it.current()) { - disconnect(a,SIGNAL(destroyed()),this,SLOT(actionDestroyed())); + disconnect(a,TQT_SIGNAL(destroyed()),this,TQT_SLOT(actionDestroyed())); ++it; } delete m_pActions; @@ -93,7 +93,7 @@ KviActionManager::~KviActionManager() delete m_pCategories; } -void KviActionManager::load(const QString &szFileName) +void KviActionManager::load(const TQString &szFileName) { KviConfig cfg(szFileName,KviConfig::Read); @@ -108,12 +108,12 @@ void KviActionManager::load(const QString &szFileName) } } -void KviActionManager::save(const QString &szFileName) +void KviActionManager::save(const TQString &szFileName) { KviConfig cfg(szFileName,KviConfig::Write); cfg.clear(); - KviPointerHashTableIterator<QString,KviAction> it(*m_pActions); + KviPointerHashTableIterator<TQString,KviAction> it(*m_pActions); while(KviAction * a = it.current()) { if(a->isKviUserActionNeverOverrideThis()) @@ -130,7 +130,7 @@ void KviActionManager::killAllKvsUserActions() KviPointerList<KviKvsUserAction> dying; dying.setAutoDelete(true); - KviPointerHashTableIterator<QString,KviAction> it(*m_pActions); + KviPointerHashTableIterator<TQString,KviAction> it(*m_pActions); while(KviAction * a = it.current()) { if(a->isKviUserActionNeverOverrideThis()) @@ -144,22 +144,22 @@ void KviActionManager::killAllKvsUserActions() } -bool KviActionManager::coreActionExists(const QString &szName) +bool KviActionManager::coreActionExists(const TQString &szName) { - KviAction *a = m_pActions->find(szName); + KviAction *a = m_pActions->tqfind(szName); if(a)return (!a->isKviUserActionNeverOverrideThis()); return false; } -QString KviActionManager::nameForAutomaticAction(const QString &szTemplate) +TQString KviActionManager::nameForAutomaticAction(const TQString &szTemplate) { - QString ret; + TQString ret; int i = 1; do { - KviQString::sprintf(ret,"%Q%d",&szTemplate,i); + KviTQString::sprintf(ret,"%Q%d",&szTemplate,i); i++; - } while(m_pActions->find(ret)); + } while(m_pActions->tqfind(ret)); return ret; } @@ -169,11 +169,11 @@ void KviActionManager::emitRemoveActionsHintRequest() emit removeActionsHintRequest(); } -KviActionCategory * KviActionManager::category(const QString &szName) +KviActionCategory * KviActionManager::category(const TQString &szName) { if(!szName.isEmpty()) { - KviActionCategory * c = m_pCategories->find(szName); + KviActionCategory * c = m_pCategories->tqfind(szName); if(c)return c; } return m_pCategoryGeneric; @@ -238,7 +238,7 @@ void KviActionManager::done() void KviActionManager::delayedRegisterAccelerators() { - KviPointerHashTableIterator<QString,KviAction> it(*m_pActions); + KviPointerHashTableIterator<TQString,KviAction> it(*m_pActions); while(KviAction * a = it.current()) { a->registerAccelerator(); @@ -248,8 +248,8 @@ void KviActionManager::delayedRegisterAccelerators() bool KviActionManager::registerAction(KviAction * a) { - if(m_pActions->find(a->name()))return false; - connect(a,SIGNAL(destroyed()),this,SLOT(actionDestroyed())); + if(m_pActions->tqfind(a->name()))return false; + connect(a,TQT_SIGNAL(destroyed()),this,TQT_SLOT(actionDestroyed())); m_pActions->insert(a->name(),a); if(g_pFrame)a->registerAccelerator(); // otherwise it is delayed! return true; @@ -261,26 +261,26 @@ void KviActionManager::actionDestroyed() m_pActions->remove(a->name()); } -bool KviActionManager::unregisterAction(const QString &szName) +bool KviActionManager::unregisterAction(const TQString &szName) { - KviAction * a = m_pActions->find(szName); + KviAction * a = m_pActions->tqfind(szName); if(!a)return false; - disconnect(a,SIGNAL(destroyed()),this,SLOT(actionDestroyed())); + disconnect(a,TQT_SIGNAL(destroyed()),this,TQT_SLOT(actionDestroyed())); a->unregisterAccelerator(); return m_pActions->remove(szName); } -KviAction * KviActionManager::getAction(const QString &szName) +KviAction * KviActionManager::getAction(const TQString &szName) { - KviAction * a = m_pActions->find(szName); + KviAction * a = m_pActions->tqfind(szName); if(a)return a; - int idx = szName.find('.'); + int idx = szName.tqfind('.'); if(idx < 0) { // backward compatibility: try to lookup the name with the kvirc. prefix - QString s = "kvirc."; + TQString s = "kvirc."; s += szName; - return m_pActions->find(s); + return m_pActions->tqfind(s); } if((idx == 5) && (!m_bCoreActionsRegistered)) { @@ -293,24 +293,24 @@ KviAction * KviActionManager::getAction(const QString &szName) { register_core_actions(this); m_bCoreActionsRegistered = true; - a = m_pActions->find(szName); + a = m_pActions->tqfind(szName); return a; } } // try to preload the module that might register this action... - QString szModule = szName.left(idx); + TQString szModule = szName.left(idx); if(!g_pModuleManager->getModule(szModule))return 0; - return m_pActions->find(szName); + return m_pActions->tqfind(szName); } -void KviActionManager::listActionsByCategory(const QString &szCatName,KviPointerList<KviAction> * pBuffer) +void KviActionManager::listActionsByCategory(const TQString &szCatName,KviPointerList<KviAction> * pBuffer) { loadAllAvailableActions(); KviActionCategory * pCat = category(szCatName); pBuffer->setAutoDelete(false); pBuffer->clear(); if(!pCat)return; - KviPointerHashTableIterator<QString,KviAction> it(*m_pActions); + KviPointerHashTableIterator<TQString,KviAction> it(*m_pActions); while(KviAction * a = it.current()) { if(a->category() == pCat) diff --git a/src/kvirc/kernel/kvi_actionmanager.h b/src/kvirc/kernel/kvi_actionmanager.h index c68e3f8..d707e88 100644 --- a/src/kvirc/kernel/kvi_actionmanager.h +++ b/src/kvirc/kernel/kvi_actionmanager.h @@ -27,26 +27,27 @@ #include "kvi_settings.h" #include "kvi_action.h" -#include <qobject.h> +#include <tqobject.h> #include "kvi_pointerhashtable.h" class KviActionDrawer; class KviCustomToolBar; -class KVIRC_API KviActionManager : public QObject +class KVIRC_API KviActionManager : public TQObject { friend class KviActionDrawer; friend class KviCustomizeToolBarsDialog; friend class KviCustomToolBar; friend class KviFrame; Q_OBJECT + TQ_OBJECT public: KviActionManager(); ~KviActionManager(); protected: static KviActionManager * m_pInstance; - KviPointerHashTable<QString,KviAction> * m_pActions; - KviPointerHashTable<QString,KviActionCategory> * m_pCategories; + KviPointerHashTable<TQString,KviAction> * m_pActions; + KviPointerHashTable<TQString,KviActionCategory> * m_pCategories; static bool m_bCustomizingToolBars; // action categories @@ -74,28 +75,28 @@ public: static KviActionCategory * categoryChannel(){ return m_pCategoryChannel; }; static KviActionCategory * categoryTools(){ return m_pCategoryTools; }; - KviPointerHashTable<QString,KviAction> * actions(){ return m_pActions; }; - KviActionCategory * category(const QString &szName); - KviPointerHashTable<QString,KviActionCategory> * categories(){ return m_pCategories; }; + KviPointerHashTable<TQString,KviAction> * actions(){ return m_pActions; }; + KviActionCategory * category(const TQString &szName); + KviPointerHashTable<TQString,KviActionCategory> * categories(){ return m_pCategories; }; void killAllKvsUserActions(); static KviCustomToolBar * currentToolBar(){ return m_pCurrentToolBar; }; - KviAction * getAction(const QString &szName); - void listActionsByCategory(const QString &szCatName,KviPointerList<KviAction> * pBuffer); - QString nameForAutomaticAction(const QString &szTemplate); - bool coreActionExists(const QString &szName); + KviAction * getAction(const TQString &szName); + void listActionsByCategory(const TQString &szCatName,KviPointerList<KviAction> * pBuffer); + TQString nameForAutomaticAction(const TQString &szTemplate); + bool coreActionExists(const TQString &szName); - void load(const QString &szFileName); - void save(const QString &szFileName); + void load(const TQString &szFileName); + void save(const TQString &szFileName); bool registerAction(KviAction * a); - bool unregisterAction(const QString &szName); + bool unregisterAction(const TQString &szName); void emitRemoveActionsHintRequest(); protected: void setCurrentToolBar(KviCustomToolBar * t); - KviAction * findAction(const QString &szName){ return m_pActions->find(szName); }; + KviAction * findAction(const TQString &szName){ return m_pActions->tqfind(szName); }; void customizeToolBarsDialogCreated(); void customizeToolBarsDialogDestroyed(); void tryFindCurrentToolBar(); diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp index 2e66d2b..3b2944b 100644 --- a/src/kvirc/kernel/kvi_app.cpp +++ b/src/kvirc/kernel/kvi_app.cpp @@ -86,18 +86,18 @@ #include "kvi_sourcesdate.h" #include "kvi_tal_popupmenu.h" -#include <qsplitter.h> -#include <qstringlist.h> +#include <tqsplitter.h> +#include <tqstringlist.h> #include "kvi_pointerhashtable.h" -#include <qmime.h> +#include <tqmime.h> #ifdef COMPILE_USE_QT4 - #include <q3mimefactory.h> + #include <tq3mimefactory.h> #endif #include "kvi_tal_listbox.h" -#include <qclipboard.h> -#include <qmessagebox.h> -#include <qtextcodec.h> -#include <qmetaobject.h> +#include <tqclipboard.h> +#include <tqmessagebox.h> +#include <tqtextcodec.h> +#include <tqmetaobject.h> #ifdef COMPILE_SSL_SUPPORT #include "kvi_ssl.h" @@ -105,14 +105,14 @@ #ifdef COMPILE_USE_QT4 #ifdef COMPILE_ON_WINDOWS -#include <QPluginLoader> +#include <TQPluginLoader> #endif #endif #ifdef COMPILE_USE_QT4 - #include <QTextDocument> + #include <TQTextDocument> #else - #include <qstylesheet.h> + #include <tqstylesheet.h> #endif KVIRC_API KviApp * g_pApp = 0; // global application pointer @@ -126,8 +126,8 @@ KVIRC_API KviProxyDataBase * g_pProxyDataBase = 0; KVIRC_API KviColorWindow * g_pColorWindow = 0; KVIRC_API KviTextIconWindow * g_pTextIconWindow = 0; KVIRC_API KviTalPopupMenu * g_pInputPopup = 0; -KVIRC_API QStringList * g_pRecentTopicList = 0; -//KVIRC_API QStringList * g_pBookmarkList = 0; +KVIRC_API TQStringList * g_pRecentTopicList = 0; +//KVIRC_API TQStringList * g_pBookmarkList = 0; KVIRC_API KviPointerHashTable<const char *,KviWindow> * g_pGlobalWindowDict = 0; KVIRC_API KviMediaManager * g_pMediaManager = 0; //KVIRC_API KviRegisteredUserDataBase * g_pRegisteredUserDataBase = 0; @@ -147,8 +147,8 @@ KVIRC_API KviSplashScreen * g_pSplashScreen = 0; // Loaded and destroyed by KviIconManager -QPixmap * g_pUserChanStatePixmap = 0; -QPixmap * g_pActivityMeterPixmap = 0; +TQPixmap * g_pUserChanStatePixmap = 0; +TQPixmap * g_pActivityMeterPixmap = 0; #ifdef COMPILE_PSEUDO_TRANSPARENCY @@ -158,16 +158,16 @@ QPixmap * g_pActivityMeterPixmap = 0; #include <netwm.h> #include <kimageeffect.h> #include <dcopclient.h> - #include <qdatastream.h> - #include <qcstring.h> + #include <tqdatastream.h> + #include <tqcstring.h> KSharedPixmap * g_pKdeDesktopBackground = 0; // the shared pixmap that we get from KWin #endif - #include <qimage.h> + #include <tqimage.h> - KVIRC_API QPixmap * g_pShadedParentGlobalDesktopBackground = 0; // the pixmap that we use for MdiManager - KVIRC_API QPixmap * g_pShadedChildGlobalDesktopBackground = 0; // the pixmap that we use for MdiChild + KVIRC_API TQPixmap * g_pShadedParentGlobalDesktopBackground = 0; // the pixmap that we use for MdiManager + KVIRC_API TQPixmap * g_pShadedChildGlobalDesktopBackground = 0; // the pixmap that we use for MdiChild #endif #ifdef COMPILE_CRYPT_SUPPORT @@ -180,7 +180,7 @@ KviApp::KviApp(int &argc,char ** argv) { // Ok...everything begins here g_pApp = this; - m_szConfigFile = QString::null; + m_szConfigFile = TQString(); m_bCreateConfig = false; m_bShowSplashScreen = true; m_bUpdateGuiPending = false; @@ -226,9 +226,9 @@ void KviApp::setup() #ifdef COMPILE_USE_QT4 #ifdef COMPILE_ON_WINDOWS //need to load image plugins:( - QString szPluginsDir; + TQString szPluginsDir; getGlobalKvircDirectory(szPluginsDir,None,"qt-plugins/"); - setLibraryPaths(QStringList(szPluginsDir)); + tqsetLibraryPaths(TQStringList(szPluginsDir)); //KviMessageBox::information(libraryPaths().join(";")); //debug("%1",loader.isLoaded()); #endif @@ -237,7 +237,7 @@ void KviApp::setup() // check if we want to permanently disable the splash screen // we do it once for every version: the user should see the new splash screens at least once - QString szSplashDisableFile; + TQString szSplashDisableFile; getLocalKvircDirectory(szSplashDisableFile,Pics,"disable-splash." KVI_VERSION); if(KviFileUtils::fileExists(szSplashDisableFile)) @@ -252,11 +252,11 @@ void KviApp::setup() // Make sure that the C strings are translated to utf8 // This is a fallback solution anyway: we should use the appropriate // encoding every time. - QTextCodec::setCodecForCStrings(KviLocale::codecForName("UTF-8")); + TQTextCodec::setCodecForCStrings(KviLocale::codecForName("UTF-8")); // Set the default help files search path - QStringList list; - QString tmp; + TQStringList list; + TQString tmp; getLocalKvircDirectory(tmp,Help); // localized help/lang or help if help/lang doesn't exist list.append(tmp); getLocalKvircDirectory(tmp,HelpEN); // help/en @@ -272,7 +272,7 @@ void KviApp::setup() #ifdef COMPILE_USE_QT4 Q3MimeSourceFactory::defaultFactory()->setFilePath(list); #else - QMimeSourceFactory::defaultFactory()->setFilePath(list); + TQMimeSourceFactory::defaultFactory()->setFilePath(list); #endif KVI_SPLASH_SET_PROGRESS(1) @@ -395,8 +395,8 @@ void KviApp::setup() KVI_SPLASH_SET_PROGRESS(80) // load the recent data lists - g_pRecentTopicList = new QStringList(); - //g_pBookmarkList = new QStringList(); + g_pRecentTopicList = new TQStringList(); + //g_pBookmarkList = new TQStringList(); loadRecentEntries(); KVI_SPLASH_SET_PROGRESS(81) @@ -476,14 +476,14 @@ void KviApp::setup() KviDoubleBuffer::init(); #ifdef COMPILE_USE_QT4 - QString szStylesheetFile; + TQString szStylesheetFile; getGlobalKvircDirectory(szStylesheetFile,Config,"style.css"); if(KviFileUtils::fileExists(szStylesheetFile)) { - QString szStyleData; + TQString szStyleData; KviFileUtils::readFile(szStylesheetFile,szStyleData); - szStyleData.replace("global://",m_szGlobalKvircDir); - szStyleData.replace("local://",m_szLocalKvircDir); + szStyleData.tqreplace("global://",m_szGlobalKvircDir); + szStyleData.tqreplace("local://",m_szLocalKvircDir); setStyleSheet(szStyleData); } #endif @@ -656,12 +656,12 @@ int KviApp::getGloballyUniqueId() typedef struct _NotifierMessageSupaDupaParameterStruct { KviWindow * pWindow; - QString szIcon; - QString szMessage; + TQString szIcon; + TQString szMessage; unsigned int uMessageLifetime; // 0 means no hide } NotifierMessageSupaDupaParameterStruct; -void KviApp::notifierMessage(KviWindow * pWnd,int iIconId,const QString &szMsg,unsigned int uMessageLifetime) +void KviApp::notifierMessage(KviWindow * pWnd,int iIconId,const TQString &szMsg,unsigned int uMessageLifetime) { KviModule * m = g_pModuleManager->getModule("notifier"); if(!m)return; @@ -675,15 +675,15 @@ void KviApp::notifierMessage(KviWindow * pWnd,int iIconId,const QString &szMsg,u m->ctrl("notifier::message",(void *)&s); } -QTextCodec * KviApp::defaultTextCodec() +TQTextCodec * KviApp::defaultTextCodec() { - QTextCodec * c = 0; + TQTextCodec * c = 0; if(!KVI_OPTION_STRING(KviOption_stringDefaultTextEncoding).isEmpty()) { c = KviLocale::codecForName(KVI_OPTION_STRING(KviOption_stringDefaultTextEncoding).latin1()); if(c)return c; } - c = QTextCodec::codecForLocale(); + c = TQTextCodec::codecForLocale(); if(c)return c; c = KviLocale::codecForName("UTF-8"); if(!c)debug("KviApp::defaultTextCodec(): cannot find a suitable text codec for locale :/"); @@ -692,26 +692,26 @@ QTextCodec * KviApp::defaultTextCodec() void KviApp::contextSensitiveHelp() { - // this stuff doesn't work with Qt 4.x + // this stuff doesn't work with TQt 4.x #ifndef COMPILE_USE_QT4 // the F1 Key has been pressed - // try to pass it to the active widget or one of its parents - QWidget * w = g_pApp->focusWidget(); + // try to pass it to the active widget or one of its tqparents + TQWidget * w = g_pApp->tqfocusWidget(); while(w) { - //QVariant v = w->property("contextSensitiveHelp"); <-- this prints a lot of warnings: this is a QT BUG - QMetaObject * o = w->metaObject(); + //TQVariant v = w->property("contextSensitiveHelp"); <-- this prints a lot of warnings: this is a QT BUG + TQMetaObject * o = w->tqmetaObject(); if(o) { - int i = o->findProperty("contextSensitiveHelp",true); + int i = o->tqfindProperty("contextSensitiveHelp",true); if(i != -1) { - QVariant v = w->property("contextSensitiveHelp"); + TQVariant v = w->property("contextSensitiveHelp"); if(v.isValid() && v.toBool()) return; // done! } } - w = w->parentWidget(); + w = w->tqparentWidget(); } // no way // FIXME: just show up simple plain online help @@ -720,7 +720,7 @@ void KviApp::contextSensitiveHelp() } -void KviApp::collectGarbage(QObject * garbage) +void KviApp::collectGarbage(TQObject * garbage) { // if(!g_pGarbageCollector)debug("Ops... no garbage collector ?"); g_pGarbageCollector->collect(garbage); @@ -728,17 +728,17 @@ void KviApp::collectGarbage(QObject * garbage) void KviApp::loadDefaultScript() { - QString cmd; + TQString cmd; getGlobalKvircDirectory(cmd,KviApp::DefScript,"default.kvs"); cmd.prepend("parse \""); cmd.append("\""); #ifdef COMPILE_ON_WINDOWS - cmd.replace("\\","\\\\"); + cmd.tqreplace("\\","\\\\"); #endif KviKvsScript::run(cmd,g_pFrame->firstConsole()); // now line up the toolbars (they may get messed while loading the script) #ifndef COMPILE_USE_QT4 - g_pFrame->lineUpDockWindows(); // missing on Qt 4.x + g_pFrame->lineUpDockWindows(); // missing on TQt 4.x #endif } @@ -793,7 +793,7 @@ void KviApp::checkSuggestRestoreDefaultScript() bSuggestedOnce = true; - switch(QMessageBox::question(0,__tr2qs("Installation problems ?"), + switch(TQMessageBox::question(0,__tr2qs("Installation problems ?"), __tr2qs("<b>Ooops...</b><br><br>" \ "<b>There are some reasons that make me think that your KVIrc installation is incomplete.</b><br><br>" \ "I might be wrong, but you seem to miss some of the features that the default KVIrc script provides." \ @@ -831,9 +831,9 @@ void KviApp::checkSuggestRestoreDefaultScript() void KviApp::restoreDefaultScript() { - if(QMessageBox::warning(0,__tr2qs("Restore Default Script - KVIrc"), + if(TQMessageBox::warning(0,__tr2qs("Restore Default Script - KVIrc"), __tr2qs("You are about to restore the default script.<br>This will erase any script changes you have made.<br>Do you wish to proceed?"), - QMessageBox::Yes,QMessageBox::No|QMessageBox::Default|QMessageBox::Escape) != QMessageBox::Yes)return; + TQMessageBox::Yes,TQMessageBox::No|TQMessageBox::Default|TQMessageBox::Escape) != TQMessageBox::Yes)return; KviKvs::clearAliases(); KviKvs::clearAppEvents(); @@ -895,16 +895,16 @@ void KviApp::destroySplashScreen() } -QString KviApp::getClipboardText() +TQString KviApp::getClipboardText() { /* - QString buffer; -#if QT_VERSION >= 300 + TQString buffer; +#if [[[TQT_VERSION IS DEPRECATED]]] >= 300 bool bOldMode = clipboard()->selectionModeEnabled(); clipboard()->setSelectionMode(false); #endif buffer = clipboard()->text(); -#if QT_VERSION >= 300 +#if [[[TQT_VERSION IS DEPRECATED]]] >= 300 if(buffer.isEmpty()) { // lookup the global clipboard @@ -916,8 +916,8 @@ QString KviApp::getClipboardText() return buffer; */ - QString buffer = clipboard()->text(QClipboard::Clipboard); - if(buffer.isEmpty())return clipboard()->text(QClipboard::Selection); + TQString buffer = tqclipboard()->text(TQClipboard::Clipboard); + if(buffer.isEmpty())return tqclipboard()->text(TQClipboard::Selection); return buffer; } @@ -927,10 +927,10 @@ void KviApp::getClipboardText(KviStr &buffer) buffer = getClipboardText(); } -void KviApp::setClipboardText(const QString &str) +void KviApp::setClipboardText(const TQString &str) { /* -#if QT_VERSION >= 300 +#if [[[TQT_VERSION IS DEPRECATED]]] >= 300 if(clipboard()->supportsSelection()) { bool bOldMode = clipboard()->selectionModeEnabled(); @@ -942,17 +942,17 @@ void KviApp::setClipboardText(const QString &str) } else { #endif clipboard()->setText(str); -#if QT_VERSION >= 300 +#if [[[TQT_VERSION IS DEPRECATED]]] >= 300 } #endif*/ - clipboard()->setText(str,QClipboard::Clipboard); - clipboard()->setText(str,QClipboard::Selection); + tqclipboard()->setText(str,TQClipboard::Clipboard); + tqclipboard()->setText(str,TQClipboard::Selection); } void KviApp::setClipboardText(const KviStr &str) { debug("WARNING : KviApp::setClipboardText(const KviStr &) is deprecated!"); - setClipboardText(QString(str.ptr())); + setClipboardText(TQString(str.ptr())); } void KviApp::setAvatarFromOptions() @@ -970,7 +970,7 @@ void KviApp::setAvatarFromOptions() } -void KviApp::setAvatarOnFileReceived(KviConsole * pConsole,const QString &szRemoteUrl,const QString &szNick,const QString &szUser,const QString &szHost) +void KviApp::setAvatarOnFileReceived(KviConsole * pConsole,const TQString &szRemoteUrl,const TQString &szNick,const TQString &szUser,const TQString &szHost) { if(!m_pPendingAvatarChanges) { @@ -993,7 +993,7 @@ void KviApp::setAvatarOnFileReceived(KviConsole * pConsole,const QString &szRemo m_pPendingAvatarChanges->append(p); } -KviPendingAvatarChange * KviApp::findPendingAvatarChange(KviConsole * pConsole,const QString &szNick,const QString &szRemoteUrl) +KviPendingAvatarChange * KviApp::findPendingAvatarChange(KviConsole * pConsole,const TQString &szNick,const TQString &szRemoteUrl) { if(!m_pPendingAvatarChanges)return 0; @@ -1013,7 +1013,7 @@ KviPendingAvatarChange * KviApp::findPendingAvatarChange(KviConsole * pConsole,c return 0; } -void KviApp::fileDownloadTerminated(bool bSuccess,const QString &szRemoteUrl,const QString &szLocalFileName,const QString &szNick,const QString &szError,bool bQuiet) +void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,const TQString &szLocalFileName,const TQString &szNick,const TQString &szError,bool bQuiet) { KviPendingAvatarChange * p; @@ -1030,7 +1030,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const QString &szRemoteUrl,con { if(!g_pActiveWindow)return; if(g_pActiveWindow->hasAttention())return; - QString szMsg; + TQString szMsg; int iIconId; if(!bSuccess) { @@ -1038,7 +1038,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const QString &szRemoteUrl,con if(szNick.isEmpty()) szMsg = __tr2qs("File download failed"); else - szMsg = __tr2qs("File download from %1 failed").arg(szNick); + szMsg = __tr2qs("File download from %1 failed").tqarg(szNick); szMsg += ": "; szMsg += szError; szMsg += " ("; @@ -1049,15 +1049,15 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const QString &szRemoteUrl,con if(szNick.isEmpty()) szMsg = __tr2qs("File download successfully complete"); else - szMsg = __tr2qs("File download from %1 successfully complete").arg(szNick); + szMsg = __tr2qs("File download from %1 successfully complete").tqarg(szNick); szMsg += " ("; szMsg += szLocalFileName; szMsg += ")"; } #ifdef COMPILE_USE_QT4 - notifierMessage(0,iIconId,Qt::escape(szMsg),30); + notifierMessage(0,iIconId,TQt::escape(szMsg),30); #else - notifierMessage(0,iIconId,QStyleSheet::escape(szMsg),30); + notifierMessage(0,iIconId,TQStyleSheet::escape(szMsg),30); #endif } return; @@ -1068,7 +1068,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const QString &szRemoteUrl,con if(windowExists(p->pConsole)) { p->pConsole->setAvatar(p->szNick,p->szUser,p->szHost, - szLocalFileName,KviQString::equalCIN("http://",szRemoteUrl,7) ? szRemoteUrl : QString::null); + szLocalFileName,KviTQString::equalCIN("http://",szRemoteUrl,7) ? szRemoteUrl : TQString()); } } else { if((!_OUTPUT_MUTE) && (!bQuiet)) @@ -1102,7 +1102,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const QString &szRemoteUrl,con delete g_pKdeDesktopBackground; g_pKdeDesktopBackground = 0; // this signal shouldn't be connected ,but well.. let's make sure - disconnect(this,SIGNAL(backgroundChanged(int)),this,SLOT(kdeRootPixmapChanged(int))); + disconnect(this,TQT_SIGNAL(backgroundChanged(int)),this,TQT_SLOT(kdeRootPixmapChanged(int))); } g_pKdeDesktopBackground = 0; @@ -1117,10 +1117,10 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const QString &szRemoteUrl,con #endif rinfo.activate(); - QString name = QString("DESKTOP%1").arg(rinfo.currentDesktop()); + TQString name = TQString("DESKTOP%1").tqarg(rinfo.currentDesktop()); g_pKdeDesktopBackground = new KSharedPixmap(); - connect(g_pKdeDesktopBackground,SIGNAL(done(bool)),this,SLOT(kdeRootPixmapDownloadComplete(bool))); + connect(g_pKdeDesktopBackground,TQT_SIGNAL(done(bool)),this,TQT_SLOT(kdeRootPixmapDownloadComplete(bool))); if(!(g_pKdeDesktopBackground->isAvailable(name))) { @@ -1131,17 +1131,17 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const QString &szRemoteUrl,con // Send a request to kdesktop.... DCOPClient *client = kapp->dcopClient(); if(!client->isAttached())client->attach(); - QByteArray data; - QDataStream args(data,IO_WriteOnly); + TQByteArray data; + TQDataStream args(data,IO_WriteOnly); args << 1; client->send("kdesktop","KBackgroundIface","setExport(int)",data); m_bUpdatePseudoTransparencyPending = true; // Now wait a while and try again.... - QTimer::singleShot(500,this,SLOT(updatePseudoTransparency())); + TQTimer::singleShot(500,this,TQT_SLOT(updatePseudoTransparency())); return; } - if(!g_pKdeDesktopBackground->loadFromShared(QString("DESKTOP%1").arg(rinfo.currentDesktop()))) + if(!g_pKdeDesktopBackground->loadFromShared(TQString("DESKTOP%1").tqarg(rinfo.currentDesktop()))) { debug("Can't load the KDE root background image..."); delete g_pKdeDesktopBackground; @@ -1162,7 +1162,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const QString &szRemoteUrl,con g_pKdeDesktopBackground = 0; } // forget the backgroundChanged signal (will do nothing if it is not connected) - disconnect(this,SIGNAL(backgroundChanged(int)),this,SLOT(kdeRootPixmapChanged(int))); + disconnect(this,TQT_SIGNAL(backgroundChanged(int)),this,TQT_SLOT(kdeRootPixmapChanged(int))); #endif //COMPILE_KDE_SUPPORT if(g_pShadedParentGlobalDesktopBackground) { @@ -1180,7 +1180,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const QString &szRemoteUrl,con { if(m_bUpdatePseudoTransparencyPending)return; m_bUpdatePseudoTransparencyPending = true; - QTimer::singleShot(0,this,SLOT(updatePseudoTransparency())); + TQTimer::singleShot(0,this,TQT_SLOT(updatePseudoTransparency())); } #ifdef COMPILE_KDE_SUPPORT @@ -1198,7 +1198,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const QString &szRemoteUrl,con // (C) 2000 Josef Weidendorfer <weidendo@in.tum.de> // - QImage& kimageeffect_fade(QImage &img,float val,const QColor &color) + TQImage& kimageeffect_fade(TQImage &img,float val,const TQColor &color) { if(img.width() == 0 || img.height() == 0)return img; @@ -1212,7 +1212,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const QString &szRemoteUrl,con int green = color.green(); int blue = color.blue(); - QRgb col; + TQRgb col; int r, g, b, cr, cg, cb; if (img.depth() <= 8) @@ -1221,31 +1221,31 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const QString &szRemoteUrl,con for(int i=0; i<img.numColors(); i++) { col = img.color(i); - cr = qRed(col); cg = qGreen(col); cb = qBlue(col); + cr = tqRed(col); cg = tqGreen(col); cb = tqBlue(col); if (cr > red)r = cr - tbl[cr - red]; else r = cr + tbl[red - cr]; if (cg > green)g = cg - tbl[cg - green]; else g = cg + tbl[green - cg]; if (cb > blue)b = cb - tbl[cb - blue]; else b = cb + tbl[blue - cb]; - img.setColor(i, qRgb(r, g, b)); + img.setColor(i, tqRgb(r, g, b)); } } else { // truecolor for(int y=0; y<img.height(); y++) { - QRgb *data = (QRgb *) img.scanLine(y); + TQRgb *data = (TQRgb *) img.scanLine(y); for (int x=0; x<img.width(); x++) { col = *data; - cr = qRed(col); cg = qGreen(col); cb = qBlue(col); + cr = tqRed(col); cg = tqGreen(col); cb = tqBlue(col); if (cr > red)r = cr - tbl[cr - red]; else r = cr + tbl[red - cr]; if (cg > green)g = cg - tbl[cg - green]; else g = cg + tbl[green - cg]; if (cb > blue)b = cb - tbl[cb - blue]; else b = cb + tbl[blue - cb]; - *data++ = qRgb(r, g, b); + *data++ = tqRgb(r, g, b); } } } @@ -1254,14 +1254,14 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const QString &szRemoteUrl,con #endif //!COMPILE_KDE_SUPPORT - void KviApp::createGlobalBackgrounds(QPixmap * pix) + void KviApp::createGlobalBackgrounds(TQPixmap * pix) { // create shaded copies... if(g_pShadedParentGlobalDesktopBackground)delete g_pShadedParentGlobalDesktopBackground; if(g_pShadedChildGlobalDesktopBackground)delete g_pShadedChildGlobalDesktopBackground; - g_pShadedParentGlobalDesktopBackground = new QPixmap(); - g_pShadedChildGlobalDesktopBackground = new QPixmap(); - QImage img = pix->convertToImage(); + g_pShadedParentGlobalDesktopBackground = new TQPixmap(); + g_pShadedChildGlobalDesktopBackground = new TQPixmap(); + TQImage img = pix->convertToImage(); // play with the fade factors KVI_OPTION_UINT(KviOption_uintGlobalTransparencyParentFadeFactor) %= 100; if(KVI_OPTION_UINT(KviOption_uintGlobalTransparencyParentFadeFactor) > 0) @@ -1309,9 +1309,9 @@ void KviApp::kdeRootPixmapDownloadComplete(bool bSuccess) // create shaded copies... createGlobalBackgrounds(g_pKdeDesktopBackground); // make sure that this signal is not connected twice - disconnect(this,SIGNAL(backgroundChanged(int)),this,SLOT(kdeRootPixmapChanged(int))); + disconnect(this,TQT_SIGNAL(backgroundChanged(int)),this,TQT_SLOT(kdeRootPixmapChanged(int))); // connect it - connect(this,SIGNAL(backgroundChanged(int)),this,SLOT(kdeRootPixmapChanged(int))); + connect(this,TQT_SIGNAL(backgroundChanged(int)),this,TQT_SLOT(kdeRootPixmapChanged(int))); } delete g_pKdeDesktopBackground; g_pKdeDesktopBackground = 0; @@ -1354,7 +1354,7 @@ void KviApp::triggerUpdateGui() { if(m_bUpdateGuiPending)return; m_bUpdateGuiPending = true; - QTimer::singleShot(0,this,SLOT(updateGui())); + TQTimer::singleShot(0,this,TQT_SLOT(updateGui())); } void KviApp::updateGui() @@ -1368,22 +1368,22 @@ void KviApp::updateApplicationFont() if(KVI_OPTION_BOOL(KviOption_boolUseGlobalApplicationFont)) { if(font() != KVI_OPTION_FONT(KviOption_fontApplication)) - setFont(KVI_OPTION_FONT(KviOption_fontApplication),true); + tqsetFont(KVI_OPTION_FONT(KviOption_fontApplication),true); } // FIXME: #warning "And what if this option is turned off ?...a reboot only" } void KviApp::loadRecentEntries() { - QString tmp; + TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_RECENT); KviConfig cfg(tmp,KviConfig::Read); - *g_pRecentTopicList = cfg.readStringListEntry("RecentTopicList",QStringList()); - //*g_pBookmarkList = cfg.readStringListEntry("Bookmarks",QStringList()); + *g_pRecentTopicList = cfg.readStringListEntry("RecentTopicList",TQStringList()); + //*g_pBookmarkList = cfg.readStringListEntry("Bookmarks",TQStringList()); } void KviApp::saveRecentEntries() { - QString tmp; + TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_RECENT); KviConfig cfg(tmp,KviConfig::Write); cfg.writeEntry("RecentTopicList",*g_pRecentTopicList); @@ -1392,7 +1392,7 @@ void KviApp::saveRecentEntries() void KviApp::saveAvatarCache() { - QString tmp; + TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_AVATARCACHE); KviAvatarCache::instance()->save(tmp); } @@ -1400,14 +1400,14 @@ void KviApp::saveAvatarCache() void KviApp::saveToolBars() { - QString tmp; + TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_CUSTOMTOOLBARS); KviCustomToolBarManager::instance()->save(tmp); } void KviApp::savePopups() { - QString tmp; + TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_POPUPS); KviKvs::savePopups(tmp); } @@ -1416,7 +1416,7 @@ void KviApp::saveInputHistory() { if(!KVI_OPTION_BOOL(KviOption_boolDisableInputHistory)) { - QString tmp; + TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_INPUTHISTORY); g_pInputHistory->save(tmp); } @@ -1425,14 +1425,14 @@ void KviApp::saveInputHistory() void KviApp::saveAliases() { - QString tmp; + TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_ALIASES); KviKvs::saveAliases(tmp); } void KviApp::saveScriptAddons() { - QString tmp; + TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_SCRIPTADDONS); KviKvs::saveScriptAddons(tmp); } @@ -1444,21 +1444,21 @@ void KviApp::saveTextIcons() void KviApp::saveAppEvents() { - QString tmp; + TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_EVENTS); KviKvs::saveAppEvents(tmp); } void KviApp::saveRawEvents() { - QString tmp; + TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_RAWEVENTS); KviKvs::saveRawEvents(tmp); } void KviApp::saveMediaTypes() { - QString tmp; + TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_MEDIATYPES); g_pMediaManager->lock(); g_pMediaManager->save(tmp); @@ -1467,56 +1467,56 @@ void KviApp::saveMediaTypes() void KviApp::saveIrcServerDataBase() { - QString tmp; + TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_SERVERDB); g_pIrcServerDataBase->save(tmp); } void KviApp::saveProxyDataBase() { - QString tmp; + TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_PROXYDB); g_pProxyDataBase->save(tmp); } void KviApp::saveRegisteredUsers() { - QString tmp; + TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_REGUSERDB); g_pRegisteredUserDataBase->save(tmp); } void KviApp::saveRegisteredChannels() { - QString tmp; + TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_REGCHANDB); g_pRegisteredChannelDataBase->save(tmp); } void KviApp::saveNickServ() { - QString tmp; + TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_NICKSERVDATABASE); g_pNickServRuleSet->save(tmp); } void KviApp::saveSharedFiles() { - QString tmp; + TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_SHAREDFILES); g_pSharedFilesManager->save(tmp); } void KviApp::saveActions() { - QString tmp; + TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_USERACTIONS); KviActionManager::instance()->save(tmp); } void KviApp::saveIdentities() { - QString tmp; + TQString tmp; getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_IDENTITIES); KviUserIdentityManager::instance()->save(tmp); } @@ -1556,7 +1556,7 @@ void KviApp::autoConnectToServers() { for(KviIrcServer * s = l->first();s;s = l->next()) { - QString szCommand = "server -u \"id:"; + TQString szCommand = "server -u \"id:"; if(s->id().isEmpty())s->generateUniqueId(); szCommand += s->id(); szCommand += "\""; @@ -1570,7 +1570,7 @@ void KviApp::autoConnectToServers() { for(KviIrcServerDataBaseRecord * r = lr->first();r;r = lr->next()) { - QString szCommandx = "server -u \"net:"; + TQString szCommandx = "server -u \"net:"; szCommandx += r->network()->name(); szCommandx += "\""; KviKvsScript::run(szCommandx,activeConsole()); @@ -1588,7 +1588,7 @@ void KviApp::createFrame() if(m_szExecAfterStartup.hasData()) { - // FIXME , this should be a QString + // FIXME , this should be a TQString KviKvsScript::run(m_szExecAfterStartup.ptr(),g_pFrame->firstConsole()); m_szExecAfterStartup = ""; } @@ -1652,7 +1652,7 @@ unsigned int KviApp::windowCount() return g_pGlobalWindowDict->count(); } -KviConsole * KviApp::findConsole(QString &server,QString &nick) +KviConsole * KviApp::findConsole(TQString &server,TQString &nick) { KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); @@ -1664,12 +1664,12 @@ KviConsole * KviApp::findConsole(QString &server,QString &nick) { if(!server.isEmpty()) { - if(KviQString::equalCI(server, + if(KviTQString::equalCI(server, ((KviConsole *)it.current())->connection()->currentServerName())) { if(!nick.isEmpty()) { - if(KviQString::equalCI(nick, + if(KviTQString::equalCI(nick, ((KviConsole *)it.current())->connection()->currentNickName())) return ((KviConsole *)it.current()); } else return ((KviConsole *)it.current()); @@ -1677,7 +1677,7 @@ KviConsole * KviApp::findConsole(QString &server,QString &nick) } else { if(!nick.isEmpty()) { - if(KviQString::equalCI(nick, + if(KviTQString::equalCI(nick, ((KviConsole *)it.current())->connection()->currentNickName())) return ((KviConsole *)it.current()); } @@ -1692,8 +1692,8 @@ KviConsole * KviApp::findConsole(QString &server,QString &nick) KviConsole * KviApp::findConsole(KviStr &server,KviStr &nick) { // DEPRECATED: TO BE KILLED (if nobody is using it) - QString s = server.ptr(); - QString n = nick.ptr(); + TQString s = server.ptr(); + TQString n = nick.ptr(); return findConsole(s,n); } @@ -1785,16 +1785,16 @@ KviConsole * KviApp::topmostConnectedConsole() KviWindow * KviApp::findWindow(const char * windowId) { - return g_pGlobalWindowDict->find(windowId); + return g_pGlobalWindowDict->tqfind(windowId); } -KviWindow * KviApp::findWindowByCaption(const QString &windowCaption,int iContextId) +KviWindow * KviApp::findWindowByCaption(const TQString &windowCaption,int iContextId) { KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); while(it.current()) { - if(KviQString::equalCI(windowCaption,it.current()->plainTextCaption()) && + if(KviTQString::equalCI(windowCaption,it.current()->plainTextCaption()) && (iContextId==-1 || it.current()->context()->id() == iContextId)) return it.current(); ++it; @@ -1827,13 +1827,13 @@ KviConsole * KviApp::activeConsole() /////////////////// RECENT STUFF LISTS & POPUPS HANDLING // Helper for KviApp::addRecent*() -static void merge_to_stringlist_option(const QString &item,int iOption,int iMaxEntries) +static void merge_to_stringlist_option(const TQString &item,int iOption,int iMaxEntries) { - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(iOption).begin(); + for(TQStringList::Iterator it = KVI_OPTION_STRINGLIST(iOption).begin(); it != KVI_OPTION_STRINGLIST(iOption).end(); ++it) { // Do a case-insensitive search (for nicknames, servers, and channels) - if(!QString::compare(item.lower(),(*it).lower())) + if(!TQString::compare(item.lower(),(*it).lower())) { // In the recent list, remove and put as first so more recent items // are always first @@ -1848,7 +1848,7 @@ static void merge_to_stringlist_option(const QString &item,int iOption,int iMaxE KVI_OPTION_STRINGLIST(iOption).prepend(item); } -void KviApp::addRecentUrl(const QString& text) +void KviApp::addRecentUrl(const TQString& text) { merge_to_stringlist_option(text,KviOption_stringlistRecentIrcUrls,50); emit(recentUrlsChanged()); @@ -1856,27 +1856,27 @@ void KviApp::addRecentUrl(const QString& text) void KviApp::addRecentNickname(const char * newNick) { - QString nk(newNick); + TQString nk(newNick); merge_to_stringlist_option(nk,KviOption_stringlistRecentNicknames,KVI_MAX_RECENT_NICKNAMES); } -void KviApp::addRecentNickname(const QString& newNick) +void KviApp::addRecentNickname(const TQString& newNick) { merge_to_stringlist_option(newNick,KviOption_stringlistRecentNicknames,KVI_MAX_RECENT_NICKNAMES); } -void KviApp::addRecentChannel(const QString& szChan,const QString& net) +void KviApp::addRecentChannel(const TQString& szChan,const TQString& net) { if(!m_pRecentChannelsDict) buildRecentChannels(); - QStringList* pList=m_pRecentChannelsDict->find(net.utf8().data()); + TQStringList* pList=m_pRecentChannelsDict->tqfind(net.utf8().data()); if(pList) { - if(!pList->contains(szChan)) pList->append(szChan); + if(!pList->tqcontains(szChan)) pList->append(szChan); } else { - pList=new QStringList(szChan); + pList=new TQStringList(szChan); m_pRecentChannelsDict->insert(net.utf8().data(),pList); } } @@ -1885,11 +1885,11 @@ void KviApp::buildRecentChannels() { if(m_pRecentChannelsDict) delete m_pRecentChannelsDict; - m_pRecentChannelsDict = new KviPointerHashTable<const char *,QStringList>; + m_pRecentChannelsDict = new KviPointerHashTable<const char *,TQStringList>; m_pRecentChannelsDict->setAutoDelete(TRUE); - QString szChan,szNet; + TQString szChan,szNet; for ( - QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentChannels).begin(); + TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentChannels).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentChannels).end(); ++it ) @@ -1900,14 +1900,14 @@ void KviApp::buildRecentChannels() szNet = (*it).section( KVI_RECENT_CHANNELS_SEPARATOR, 1 ); if(!szNet.isEmpty()) { - QStringList* pList=m_pRecentChannelsDict->find(szNet.utf8().data()); + TQStringList* pList=m_pRecentChannelsDict->tqfind(szNet.utf8().data()); if(pList) { - if(!pList->contains(szChan)) pList->append(szChan); + if(!pList->tqcontains(szChan)) pList->append(szChan); } else { - pList=new QStringList(szChan); + pList=new TQStringList(szChan); m_pRecentChannelsDict->insert(szNet.utf8().data(),pList); } } @@ -1918,12 +1918,12 @@ void KviApp::buildRecentChannels() void KviApp::saveRecentChannels() { if(!m_pRecentChannelsDict) return; - QString szTmp; + TQString szTmp; KVI_OPTION_STRINGLIST(KviOption_stringlistRecentChannels).clear(); - KviPointerHashTableIterator<const char *,QStringList> it( *m_pRecentChannelsDict ); + KviPointerHashTableIterator<const char *,TQStringList> it( *m_pRecentChannelsDict ); for( ; it.current(); ++it ) { - for ( QStringList::Iterator it_str = it.current()->begin(); it_str != it.current()->end(); ++it_str ) { + for ( TQStringList::Iterator it_str = it.current()->begin(); it_str != it.current()->end(); ++it_str ) { szTmp=*it_str; szTmp.append(KVI_RECENT_CHANNELS_SEPARATOR); szTmp.append(it.currentKey()); @@ -1932,14 +1932,14 @@ void KviApp::saveRecentChannels() } } -QStringList* KviApp::getRecentChannels(const QString& net) +TQStringList* KviApp::getRecentChannels(const TQString& net) { if(!m_pRecentChannelsDict) buildRecentChannels(); - return m_pRecentChannelsDict->find(net.utf8().data()); + return m_pRecentChannelsDict->tqfind(net.utf8().data()); } -void KviApp::addRecentServer(const QString& server) +void KviApp::addRecentServer(const TQString& server) { merge_to_stringlist_option(server,KviOption_stringlistRecentServers,KVI_MAX_RECENT_SERVERS); } @@ -1948,7 +1948,7 @@ void KviApp::fillRecentServersPopup(KviTalPopupMenu * m) { // FIXME: #warning "MAYBE DISABLE THE SERVERS THAT WE ARE ALREADY CONNECTED TO ?" m->clear(); - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).end(); ++it) + for(TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).end(); ++it) { m->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),*it); } @@ -1959,14 +1959,14 @@ void KviApp::fillRecentNicknamesPopup(KviTalPopupMenu * m,KviConsole * pConsole) m->clear(); int id; bool bAlreadyFound = false; - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentNicknames).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentNicknames).end(); ++it) + for(TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentNicknames).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentNicknames).end(); ++it) { id = m->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NICK)),*it); if(!pConsole->isConnected())m->setItemEnabled(id,false); else { if(!bAlreadyFound) { - bool bIsCurrent = KviQString::equalCS(pConsole->connection()->currentNickName(),*it); + bool bIsCurrent = KviTQString::equalCS(pConsole->connection()->currentNickName(),*it); m->setItemEnabled(id,!bIsCurrent); if(bIsCurrent)bAlreadyFound = true; } @@ -1978,10 +1978,10 @@ void KviApp::fillRecentChannelsPopup(KviTalPopupMenu * m,KviConsole * pConsole) { m->clear(); int id; - QStringList* pList=getRecentChannels(pConsole->currentNetworkName()); + TQStringList* pList=getRecentChannels(pConsole->currentNetworkName()); if(pList) { - for(QStringList::Iterator it = pList->begin(); it != pList->end(); ++it) + for(TQStringList::Iterator it = pList->begin(); it != pList->end(); ++it) { id = m->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),*it); if(!pConsole->isConnected())m->setItemEnabled(id,false); @@ -1997,7 +1997,7 @@ void KviApp::fillRecentChannelsPopup(KviTalPopupMenu * m,KviConsole * pConsole) void KviApp::fillRecentServersListBox(KviTalListBox * l) { l->clear(); - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).end(); ++it) + for(TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).end(); ++it) l->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),*it); } */ @@ -2017,7 +2017,7 @@ bool KviApp::playFile(const char * filename,KviStr &error,KviWindow * w) if(szCommandline.hasData()) { KviKvsVariantList l; - l.append(new KviKvsVariant(QString(filename))); + l.append(new KviKvsVariant(TQString(filename))); if(!KviKvsScript::run(szCommandline.ptr(),w ? w : g_pActiveWindow,&l)) { @@ -2050,11 +2050,11 @@ void KviApp::heartbeat(kvi_time_t tNow) KviDoubleBuffer::heartbeat(); } -void KviApp::timerEvent(QTimerEvent *e) +void KviApp::timerEvent(TQTimerEvent *e) { if(e->timerId() != m_iHeartbeatTimerId) { - QObject::timerEvent(e); + TQT_BASE_OBJECT_NAME::timerEvent(e); return; } @@ -2065,7 +2065,7 @@ void KviApp::timerEvent(QTimerEvent *e) heartbeat(tNow); } -// qvariant.h uses this , and it is included by the qt generated moc file for Qt >= 3.0.0 +// qvariant.h uses this , and it is included by the qt generated tqmoc file for TQt >= 3.0.0 #ifdef Bool #undef Bool #endif diff --git a/src/kvirc/kernel/kvi_app.h b/src/kvirc/kernel/kvi_app.h index d31bd40..30e49f9 100644 --- a/src/kvirc/kernel/kvi_app.h +++ b/src/kvirc/kernel/kvi_app.h @@ -49,10 +49,10 @@ #endif // !COMPILE_NO_IPC class KviTalPopupMenu; -class QPixmap; +class TQPixmap; class KviTalListBox; -class QTextCodec; -class QDomElement; +class TQTextCodec; +class TQDomElement; class KviConsole; class KviConfig; @@ -63,10 +63,10 @@ class KviIrcServerDataBase; typedef struct _KviPendingAvatarChange { KviConsole * pConsole; - QString szRemoteUrl; - QString szNick; - QString szUser; - QString szHost; + TQString szRemoteUrl; + TQString szNick; + TQString szUser; + TQString szHost; } KviPendingAvatarChange; #ifdef Unsorted @@ -82,21 +82,22 @@ class KVIRC_API KviApp : public KviTalApplication friend class KviWindow; friend class KviSetupWizard; // this resides in a module! Q_OBJECT + TQ_OBJECT public: KviApp(int &argc,char ** argv); ~KviApp(); protected: // directories - QString m_szGlobalKvircDir; - QString m_szLocalKvircDir; + TQString m_szGlobalKvircDir; + TQString m_szLocalKvircDir; int m_iHeartbeatTimerId; bool m_bFirstTimeRun; KviWindow * m_pActiveWindow; bool m_bUpdateGuiPending; KviPointerList<KviPendingAvatarChange> * m_pPendingAvatarChanges; bool m_bSetupDone; - KviPointerHashTable<const char *,QStringList> * m_pRecentChannelsDict; + KviPointerHashTable<const char *,TQStringList> * m_pRecentChannelsDict; #ifdef COMPILE_PSEUDO_TRANSPARENCY bool m_bUpdatePseudoTransparencyPending; #endif @@ -105,7 +106,7 @@ protected: #endif public: // setup stuff (accessed from kvi_main.cpp: consider private othwerise) - QString m_szConfigFile; // setup + TQString m_szConfigFile; // setup bool m_bCreateConfig; // setup KviStr m_szExecAfterStartup; bool m_bShowSplashScreen; @@ -129,11 +130,11 @@ public: void getClipboardText(KviStr &buffer); void setClipboardText(const KviStr &str); - QString getClipboardText(); - void setClipboardText(const QString &str); + TQString getClipboardText(); + void setClipboardText(const TQString &str); - void collectGarbage(QObject * garbage); + void collectGarbage(TQObject * garbage); void destroyFrame(); void setup(); // THIS SHOULD BE PRIVATE! (but is accessed from kvi_main.cpp) @@ -142,7 +143,7 @@ public: void ipcMessage(char * message); #endif - //static QTextCodec * defaultTextCodec(); + //static TQTextCodec * defaultTextCodec(); //static const char * defaultTextEncoding(); static int getGloballyUniqueId(); // returns an unique integer identifier across the application @@ -178,22 +179,22 @@ public: void saveOptions(); void listAvailableOptions(KviWindow *wnd); - bool getOptionString(const char * optName,QString &buffer); - bool setOptionValue(const char * optName,const QString &value); + bool getOptionString(const char * optName,TQString &buffer); + bool setOptionValue(const char * optName,const TQString &value); void optionResetUpdate(int flags); void contextSensitiveHelp(); // kvi_app_fs.cpp : Filesystem thingies - void getGlobalKvircDirectory(QString &szData,KvircSubdir dir,const QString &appendFile = QString::null); - void getGlobalKvircDirectory(KviStr &szData,KvircSubdir dir,const QString &appendFile = QString::null); - void getLocalKvircDirectory(KviStr &szData,KvircSubdir dir,const QString &appendFile = QString::null,bool bCreateIfNeeded = true); - void getLocalKvircDirectory(QString &szData,KvircSubdir dir,const QString &appendFile = QString::null,bool bCreateIfNeeded = true); - void getTmpFileName(QString &szBuffer,const QString &szEndingFileName = QString::null); + void getGlobalKvircDirectory(TQString &szData,KvircSubdir dir,const TQString &appendFile = TQString()); + void getGlobalKvircDirectory(KviStr &szData,KvircSubdir dir,const TQString &appendFile = TQString()); + void getLocalKvircDirectory(KviStr &szData,KvircSubdir dir,const TQString &appendFile = TQString(),bool bCreateIfNeeded = true); + void getLocalKvircDirectory(TQString &szData,KvircSubdir dir,const TQString &appendFile = TQString(),bool bCreateIfNeeded = true); + void getTmpFileName(TQString &szBuffer,const TQString &szEndingFileName = TQString()); bool trashFile(const char *filename); - void getChannelDumpLogFileName(QString &str); + void getChannelDumpLogFileName(TQString &str); - static QTextCodec * defaultTextCodec(); + static TQTextCodec * defaultTextCodec(); // if the mediatype can be guessed ,it is looked up in the media type save path // if found , true is returned @@ -201,21 +202,21 @@ public: bool findFileByMediaType(KviStr &szRetPath,const char * filename); bool findImageInImageSearchPath(KviStr &szRetPath,const char * filename); - bool findImageInImageSearchPath(QString &szRetPath,const char * filename); + bool findImageInImageSearchPath(TQString &szRetPath,const char * filename); bool findUserFile(KviStr &szRetPath,const char *filename); bool findImage(KviStr &szRetPath,const char *filename); - bool findImage(QString &szRetPath,const char *filename); - bool findImageThemeOnlyCompat(QString &szRetPath,const char *filename); // temporary compat, will be removed soon (do not use) - bool findSmallIcon(QString &szRetPath,const char *filename); + bool findImage(TQString &szRetPath,const char *filename); + bool findImageThemeOnlyCompat(TQString &szRetPath,const char *filename); // temporary compat, will be removed soon (do not use) + bool findSmallIcon(TQString &szRetPath,const char *filename); // tries to map the full path filename to one of the KVIrc's mapped directories // if it doesn't succeed it just returns the complete filename in szRetPath bool mapImageFile(KviStr &szRetPath,const char * filename); - bool mapImageFile(QString &szRetPath,const char * filename); + bool mapImageFile(TQString &szRetPath,const char * filename); //void getDefaultDccSaveFilePath(KviStr &path,const char *filename); - void completeDirectory(const QString &word,KviPointerList<QString> * matches); + void completeDirectory(const TQString &word,KviPointerList<TQString> * matches); // // Returns a config path suitable for reading (at least) // First lookups the user local config directory, @@ -226,14 +227,14 @@ public: // directory is used // bool getReadOnlyConfigPath(KviStr &buffer,const char *config_name,KvircSubdir sbd = Config,bool bNoFail = false); - bool getReadOnlyConfigPath(QString &buffer,const char *config_name,KvircSubdir sbd = Config,bool bNoFail = false); + bool getReadOnlyConfigPath(TQString &buffer,const char *config_name,KvircSubdir sbd = Config,bool bNoFail = false); // kvi_app.cpp : Window stuff KviWindow * findWindow(const char * windowId); - KviWindow * findWindowByCaption(const QString &windowCaption,int iContextId=-1); + KviWindow * findWindowByCaption(const TQString &windowCaption,int iContextId=-1); KviConsole * findConsole(unsigned int ircContextId); KviConsole * findConsole(KviStr & server,KviStr & nick); - KviConsole * findConsole(QString & servr,QString & nick); + KviConsole * findConsole(TQString & servr,TQString & nick); KviConsole * topmostConnectedConsole(); KviConsole * activeConsole(); bool windowExists(KviWindow *wnd); @@ -250,24 +251,24 @@ public: #endif // kvi_app.cpp : DCC (and CTCP AVATAR & SOUND) related stuff - void setAvatarOnFileReceived(KviConsole * pConsole,const QString &szRemoteUrl,const QString &szNick,const QString &szUser,const QString &szHost); - KviPendingAvatarChange * findPendingAvatarChange(KviConsole * pConsole,const QString &szNick,const QString &szRemoteUrl); - void fileDownloadTerminated(bool bSuccess,const QString &szRemoteUrl,const QString &szLocalFileName,const QString &szNick = QString::null,const QString &szError = QString::null,bool bQuiet = false); + void setAvatarOnFileReceived(KviConsole * pConsole,const TQString &szRemoteUrl,const TQString &szNick,const TQString &szUser,const TQString &szHost); + KviPendingAvatarChange * findPendingAvatarChange(KviConsole * pConsole,const TQString &szNick,const TQString &szRemoteUrl); + void fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,const TQString &szLocalFileName,const TQString &szNick = TQString(),const TQString &szError = TQString(),bool bQuiet = false); void setAvatarFromOptions(); bool playFile(const char * filename,KviStr &error,KviWindow * w = 0); // uMessageLifetime is in seconds! and 0 means "forever" - void notifierMessage(KviWindow * pWnd,int iIconId,const QString &szMsg,unsigned int uMessageLifetime); + void notifierMessage(KviWindow * pWnd,int iIconId,const TQString &szMsg,unsigned int uMessageLifetime); void addRecentNickname(const char * newNick); - void addRecentNickname(const QString& newNick); - void addRecentChannel(const QString& chan,const QString& net); - QStringList* getRecentChannels(const QString& net); + void addRecentNickname(const TQString& newNick); + void addRecentChannel(const TQString& chan,const TQString& net); + TQStringList* getRecentChannels(const TQString& net); - void addRecentServer(const QString& server); + void addRecentServer(const TQString& server); void fillRecentServersPopup(KviTalPopupMenu * m); void fillRecentNicknamesPopup(KviTalPopupMenu * m,KviConsole * pConsole); void fillRecentChannelsPopup(KviTalPopupMenu * m,KviConsole * pConsole); @@ -285,7 +286,7 @@ protected: void unregisterWindow(KviWindow *wnd); void frameDestructorCallback(); void heartbeat(kvi_time_t tNow); - virtual void timerEvent(QTimerEvent *e); + virtual void timerEvent(TQTimerEvent *e); public slots: // kvi_app.cpp : Slots void saveConfiguration(); @@ -294,7 +295,7 @@ public slots: void kdeRootPixmapChanged(int iDesktop); void updatePseudoTransparency(); void restoreDefaultScript(); - void addRecentUrl(const QString& text); + void addRecentUrl(const TQString& text); private: void createSplashScreen(); void destroySplashScreen(); @@ -303,8 +304,8 @@ private: void loadDirectories(); void findGlobalKvircDirectory(); bool findLocalKvircDirectory(); - bool checkGlobalKvircDirectory(const QString); - bool checkLocalKvircDirectory(const QString); + bool checkGlobalKvircDirectory(const TQString); + bool checkLocalKvircDirectory(const TQString); bool checkFileAssociations(); void setupFileAssociations(); @@ -317,7 +318,7 @@ private: void updateApplicationFont(); #ifdef COMPILE_PSEUDO_TRANSPARENCY - void createGlobalBackgrounds(QPixmap * pix); + void createGlobalBackgrounds(TQPixmap * pix); void destroyPseudoTransparency(); #ifdef COMPILE_KDE_SUPPORT void downloadKdeRootPixmap(); diff --git a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/kvi_app_fs.cpp index ee5eacd..61272d1 100644 --- a/src/kvirc/kernel/kvi_app_fs.cpp +++ b/src/kvirc/kernel/kvi_app_fs.cpp @@ -35,18 +35,18 @@ #include "kvi_defaults.h" #include "kvi_iconmanager.h" -#include <qdir.h> -#include <qfileinfo.h> -#include <qdatetime.h> +#include <tqdir.h> +#include <tqfileinfo.h> +#include <tqdatetime.h> extern KviMediaManager * g_pMediaManager; //============ getGlobalKvircDirectory ================// -void KviApp::getGlobalKvircDirectory(QString &szData,KvircSubdir dir,const QString &appendFile) +void KviApp::getGlobalKvircDirectory(TQString &szData,KvircSubdir dir,const TQString &appendFile) { szData=m_szGlobalKvircDir; - KviQString::ensureLastCharIs(szData,KVI_PATH_SEPARATOR_CHAR); + KviTQString::ensureLastCharIs(szData,KVI_PATH_SEPARATOR_CHAR); switch(dir) { @@ -58,23 +58,23 @@ void KviApp::getGlobalKvircDirectory(QString &szData,KvircSubdir dir,const QStri case Plugins : szData = "/opt/kde3/lib/kvirc/" KVI_VERSION_BRANCH "/modules"; break; case EasyPlugins : szData.append("easyplugins"); break; - case ConfigPlugins : KviQString::appendFormatted(szData,"config%smodules",KVI_PATH_SEPARATOR); break; - case ConfigScripts : KviQString::appendFormatted(szData,"config%sscripts",KVI_PATH_SEPARATOR); break; + case ConfigPlugins : KviTQString::appendFormatted(szData,"config%smodules",KVI_PATH_SEPARATOR); break; + case ConfigScripts : KviTQString::appendFormatted(szData,"config%sscripts",KVI_PATH_SEPARATOR); break; case Help : szData.append("help"); { // Localized help - QString tmp(KviLocale::localeName().ptr()); + TQString tmp(KviLocale::localeName().ptr()); tmp.prepend(KVI_PATH_SEPARATOR_CHAR); tmp.prepend(szData); if(KviFileUtils::directoryExists(tmp))szData = tmp; else { - tmp = szData; KviQString::appendFormatted(tmp,"%sen",KVI_PATH_SEPARATOR); + tmp = szData; KviTQString::appendFormatted(tmp,"%sen",KVI_PATH_SEPARATOR); if(KviFileUtils::directoryExists(tmp))szData = tmp; } } break; - case HelpEN : KviQString::appendFormatted(szData,"help%sen",KVI_PATH_SEPARATOR); break; + case HelpEN : KviTQString::appendFormatted(szData,"help%sen",KVI_PATH_SEPARATOR); break; case HelpNoIntl : szData.append("help"); break; case Log : debug("WARNING Global log directory requested!"); break; case Incoming : debug("WARNING Global incoming directory requested!"); break; @@ -97,17 +97,17 @@ void KviApp::getGlobalKvircDirectory(QString &szData,KvircSubdir dir,const QStri if(!appendFile.isEmpty()) { - KviQString::ensureLastCharIs(szData,KVI_PATH_SEPARATOR_CHAR); + KviTQString::ensureLastCharIs(szData,KVI_PATH_SEPARATOR_CHAR); szData.append(appendFile); } KviFileUtils::adjustFilePath(szData); } -void KviApp::getLocalKvircDirectory(QString &szData,KvircSubdir dir,const QString & appendFile,bool bCreateIfNeeded) +void KviApp::getLocalKvircDirectory(TQString &szData,KvircSubdir dir,const TQString & appendFile,bool bCreateIfNeeded) { szData=m_szLocalKvircDir; - KviQString::ensureLastCharIs(szData,KVI_PATH_SEPARATOR_CHAR); + KviTQString::ensureLastCharIs(szData,KVI_PATH_SEPARATOR_CHAR); switch(dir) { @@ -123,13 +123,13 @@ void KviApp::getLocalKvircDirectory(QString &szData,KvircSubdir dir,const QStrin // we should take special care here // the user is likely to mess the path behind our back // try to recover from most common problems - while(KviQString::lastCharIs(szData,KVI_PATH_SEPARATOR_CHAR)) + while(KviTQString::lastCharIs(szData,KVI_PATH_SEPARATOR_CHAR)) szData = szData.remove(szData.length()-1,1); if(szData.isEmpty()) { // unset ? - KVI_OPTION_STRING(KviOption_stringIncomingPath) = QDir::homeDirPath(); - if(!KVI_OPTION_STRING(KviOption_stringIncomingPath).endsWith(QString(QChar(KVI_PATH_SEPARATOR_CHAR)))) + KVI_OPTION_STRING(KviOption_stringIncomingPath) = TQDir::homeDirPath(); + if(!KVI_OPTION_STRING(KviOption_stringIncomingPath).endsWith(TQString(TQChar(KVI_PATH_SEPARATOR_CHAR)))) KVI_OPTION_STRING(KviOption_stringIncomingPath).append(KVI_PATH_SEPARATOR_CHAR); KVI_OPTION_STRING(KviOption_stringIncomingPath).append(KVI_DEFAULT_INCOMING_SUBDIRECTORY_NAME); } @@ -138,7 +138,7 @@ void KviApp::getLocalKvircDirectory(QString &szData,KvircSubdir dir,const QStrin szData.append("help"); { // Localized help - QString tmp = KviLocale::localeName().ptr(); + TQString tmp = KviLocale::localeName().ptr(); tmp.prepend(KVI_PATH_SEPARATOR_CHAR); tmp.prepend(szData); if(KviFileUtils::directoryExists(tmp))szData = tmp; @@ -171,7 +171,7 @@ void KviApp::getLocalKvircDirectory(QString &szData,KvircSubdir dir,const QStrin if(!appendFile.isEmpty()) { - KviQString::ensureLastCharIs(szData,KVI_PATH_SEPARATOR_CHAR); + KviTQString::ensureLastCharIs(szData,KVI_PATH_SEPARATOR_CHAR); szData.append(appendFile); } @@ -179,9 +179,9 @@ void KviApp::getLocalKvircDirectory(QString &szData,KvircSubdir dir,const QStrin } -void KviApp::getGlobalKvircDirectory(KviStr &szData,KvircSubdir dir,const QString &appendFile) +void KviApp::getGlobalKvircDirectory(KviStr &szData,KvircSubdir dir,const TQString &appendFile) { - QString szBuffer = szData.ptr(); + TQString szBuffer = szData.ptr(); getGlobalKvircDirectory(szBuffer,dir,appendFile); szData=szBuffer; @@ -189,26 +189,26 @@ void KviApp::getGlobalKvircDirectory(KviStr &szData,KvircSubdir dir,const QStrin //=============== getLocalKvircDirectory ================// -void KviApp::getLocalKvircDirectory(KviStr &szData,KvircSubdir dir,const QString &appendFile,bool bCreateIfNeeded) +void KviApp::getLocalKvircDirectory(KviStr &szData,KvircSubdir dir,const TQString &appendFile,bool bCreateIfNeeded) { - QString szBuffer = szData.ptr(); + TQString szBuffer = szData.ptr(); getLocalKvircDirectory(szBuffer,dir,appendFile,bCreateIfNeeded); szData=szBuffer; } -void KviApp::getTmpFileName(QString &szBuffer,const QString &szEndingFileName) +void KviApp::getTmpFileName(TQString &szBuffer,const TQString &szEndingFileName) { - QString tmp; + TQString tmp; getLocalKvircDirectory(tmp,Tmp); - KviQString::ensureLastCharIs(tmp,KVI_PATH_SEPARATOR_CHAR); + KviTQString::ensureLastCharIs(tmp,KVI_PATH_SEPARATOR_CHAR); struct timeval tmv; kvi_gettimeofday(&tmv,0); - QString szFileName = szEndingFileName.isNull() ? QString("file.tmp") : szEndingFileName; + TQString szFileName = szEndingFileName.isNull() ? TQString("file.tmp") : szEndingFileName; do { szBuffer = tmp; - KviQString::appendFormatted(szBuffer,"kvirc_%d_%Q",tmv.tv_usec,&szFileName); + KviTQString::appendFormatted(szBuffer,"kvirc_%d_%Q",tmv.tv_usec,&szFileName); tmv.tv_usec++; } while(KviFileUtils::fileExists(szBuffer)); } @@ -221,14 +221,14 @@ void KviApp::getTmpFileName(QString &szBuffer,const QString &szEndingFileName) bool KviApp::trashFile(const char *filename) { // Exists ? - QFileInfo fi = QFileInfo(QString::fromUtf8(filename)); + TQFileInfo fi = TQFileInfo(TQString::fromUtf8(filename)); if( !fi.exists() ) return false; // nothing to trash // Build the filename KviStr lastPart = filename; lastPart.cutToLast(KVI_PATH_SEPARATOR_CHAR); // need only the filename lastPart.append(".bak_"); - QDateTime tm(QDateTime::currentDateTime()); + TQDateTime tm(TQDateTime::tqcurrentDateTime()); lastPart.append(tm.toString()); lastPart.replaceAll(' ',"_"); // Ok...have lastPart.bak_Dec_11_31_1999 @@ -246,31 +246,31 @@ bool KviApp::trashFile(const char *filename) return KviFileUtils::renameFile(filename,trashFile.ptr()); } -void KviApp::completeDirectory(const QString &word,KviPointerList<QString> * matches) +void KviApp::completeDirectory(const TQString &word,KviPointerList<TQString> * matches) { - QString szDir = word; - QString szFile = word; - KviQString::cutToLast(szFile,KVI_PATH_SEPARATOR_CHAR); - KviQString::cutFromLast(szDir,KVI_PATH_SEPARATOR_CHAR); + TQString szDir = word; + TQString szFile = word; + KviTQString::cutToLast(szFile,KVI_PATH_SEPARATOR_CHAR); + KviTQString::cutFromLast(szDir,KVI_PATH_SEPARATOR_CHAR); KviFileUtils::adjustFilePath(szDir); - KviQString::ensureLastCharIs(szDir,KVI_PATH_SEPARATOR_CHAR); - QDir d(szDir); + KviTQString::ensureLastCharIs(szDir,KVI_PATH_SEPARATOR_CHAR); + TQDir d(szDir); // FIXME: maybe check timestamps ? (old modules) - QStringList sl = d.entryList(QDir::Dirs); - QStringList::Iterator it; + TQStringList sl = d.entryList(TQDir::Dirs); + TQStringList::Iterator it; for(it = sl.begin();it != sl.end();++it) { - QString * t = new QString(*it); - if(KviQString::equalCS(*t,".") || KviQString::equalCS(*t,"..")) + TQString * t = new TQString(*it); + if(KviTQString::equalCS(*t,".") || KviTQString::equalCS(*t,"..")) { delete t; } else { #ifdef COMPILE_ON_WINDOWS - if(KviQString::equalCIN(szFile,*t,szFile.length())) + if(KviTQString::equalCIN(szFile,*t,szFile.length())) #else //!COMPILE_ON_WINDOWS - if(KviQString::equalCSN(szFile,*t,szFile.length())) + if(KviTQString::equalCSN(szFile,*t,szFile.length())) #endif //COMPILE_ON_WINDOWS { t->prepend(szDir); @@ -282,15 +282,15 @@ void KviApp::completeDirectory(const QString &word,KviPointerList<QString> * mat } } - sl = d.entryList(QDir::Files); + sl = d.entryList(TQDir::Files); for(it = sl.begin();it != sl.end();++it) { - QString * t = new QString(*it); + TQString * t = new TQString(*it); #ifdef COMPILE_ON_WINDOWS - if(KviQString::equalCIN(szFile,*t,szFile.length())) + if(KviTQString::equalCIN(szFile,*t,szFile.length())) #else //!COMPILE_ON_WINDOWS - if(KviQString::equalCSN(szFile,*t,szFile.length())) + if(KviTQString::equalCSN(szFile,*t,szFile.length())) #endif //COMPILE_ON_WINDOWS { t->prepend(szDir); @@ -307,13 +307,13 @@ void KviApp::completeDirectory(const QString &word,KviPointerList<QString> * mat // Returns a valid filename for the channel dump log // -void KviApp::getChannelDumpLogFileName(QString &str) +void KviApp::getChannelDumpLogFileName(TQString &str) { unsigned int logN = 0; - QString fPrefix="kick_"; + TQString fPrefix="kick_"; do{ - QString fName; - KviQString::sprintf(fName,"%Q%u.log",&fPrefix,logN); + TQString fName; + KviTQString::sprintf(fName,"%Q%u.log",&fPrefix,logN); getLocalKvircDirectory(str,Log,fName); logN++; if(logN > 9999) @@ -346,7 +346,7 @@ bool KviApp::findFileByMediaType(KviStr &szRetPath,const char * filename) { g_pMediaManager->unlock(); //if(retMediaType)*retMediaType = mt; - QString szTmp = szRetPath.ptr(); // FIXME + TQString szTmp = szRetPath.ptr(); // FIXME KviFileUtils::adjustFilePath(szTmp); szRetPath = szTmp; return true; @@ -373,7 +373,7 @@ bool KviApp::findUserFile(KviStr &szRetPath,const char *filename) if(kvi_isAbsolutePath(filename)) { szRetPath=filename; - QString szTmp = szRetPath.ptr(); // FIXME + TQString szTmp = szRetPath.ptr(); // FIXME KviFileUtils::adjustFilePath(szTmp); szRetPath = szTmp; return KviFileUtils::fileExists(filename); @@ -402,7 +402,7 @@ bool KviApp::findUserFile(KviStr &szRetPath,const char *filename) if(findImageInImageSearchPath(szRetPath,filename))return true; // Last resort ... - szRetPath = QDir::homeDirPath(); + szRetPath = TQDir::homeDirPath(); szRetPath.ensureLastCharIs(KVI_PATH_SEPARATOR_CHAR); szRetPath.append(filename); if(KviFileUtils::fileExists(szRetPath.ptr()))return true;; @@ -430,7 +430,7 @@ bool KviApp::findUserFile(KviStr &szRetPath,const char *filename) bool KviApp::findImageInImageSearchPath(KviStr &szRetPath,const char * filename) { // first lookup the user defined paths - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).begin(); + for(TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).end();++it) { szRetPath = *it; @@ -443,14 +443,14 @@ bool KviApp::findImageInImageSearchPath(KviStr &szRetPath,const char * filename) return false; } -bool KviApp::findImageInImageSearchPath(QString &szRetPath,const char * filename) +bool KviApp::findImageInImageSearchPath(TQString &szRetPath,const char * filename) { // first lookup the user defined paths - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).begin(); + for(TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).end();++it) { szRetPath = *it; - KviQString::ensureLastCharIs(szRetPath,KVI_PATH_SEPARATOR_CHAR); + KviTQString::ensureLastCharIs(szRetPath,KVI_PATH_SEPARATOR_CHAR); szRetPath.append(filename); //debug("LOOK FOR %s",szRetPath.ptr()); if(KviFileUtils::fileExists(szRetPath))return true; @@ -464,13 +464,13 @@ static KviApp::KvircSubdir pics_globalsubdirs[2]={ KviApp::Pics , KviApp::Avatar bool KviApp::mapImageFile(KviStr &szRetPath,const char * filename) { - QString buff; + TQString buff; bool ret=mapImageFile(buff,filename); szRetPath=buff; return ret; } -bool KviApp::mapImageFile(QString &szRetPath,const char * filename) +bool KviApp::mapImageFile(TQString &szRetPath,const char * filename) { szRetPath = filename; // can't map non absolute paths @@ -478,15 +478,15 @@ bool KviApp::mapImageFile(QString &szRetPath,const char * filename) // can't map non existing paths if(!KviFileUtils::fileExists(filename))return false; - QFileInfo fi = QFileInfo(QString::fromUtf8(filename)); + TQFileInfo fi = TQFileInfo(TQString::fromUtf8(filename)); unsigned int size = fi.size(); KviStr szBestMatch; - while(szRetPath.find(KVI_PATH_SEPARATOR) != -1) + while(szRetPath.tqfind(KVI_PATH_SEPARATOR) != -1) { - KviQString::cutToFirst(szRetPath,KVI_PATH_SEPARATOR); + KviTQString::cutToFirst(szRetPath,KVI_PATH_SEPARATOR); if(szRetPath.isEmpty())break; @@ -499,7 +499,7 @@ bool KviApp::mapImageFile(QString &szRetPath,const char * filename) getLocalKvircDirectory(szBuffer,pics_localsubdirs[i],szRetPath); if(KviFileUtils::fileExists(szBuffer.ptr())) { - QFileInfo fi2(QString::fromUtf8(szBuffer.ptr())); + TQFileInfo fi2(TQString::fromUtf8(szBuffer.ptr())); if(size == fi2.size()) { // probably the same file @@ -514,7 +514,7 @@ bool KviApp::mapImageFile(QString &szRetPath,const char * filename) //debug("CHECK %s",szBuffer.ptr()); if(KviFileUtils::fileExists(szBuffer.ptr())) { - QFileInfo fi2(QString::fromUtf8(szBuffer.ptr())); + TQFileInfo fi2(TQString::fromUtf8(szBuffer.ptr())); if(size == fi2.size()) { // probably the same file @@ -524,12 +524,12 @@ bool KviApp::mapImageFile(QString &szRetPath,const char * filename) } // Last resort - szBuffer = QDir::homeDirPath(); + szBuffer = TQDir::homeDirPath(); szBuffer.ensureLastCharIs(KVI_PATH_SEPARATOR_CHAR); szBuffer.append(szRetPath); if(KviFileUtils::fileExists(szBuffer.ptr())) { - QFileInfo fi2(QString::fromUtf8(szBuffer.ptr())); + TQFileInfo fi2(TQString::fromUtf8(szBuffer.ptr())); if(size == fi2.size()) { // prolly the same file @@ -553,13 +553,13 @@ bool KviApp::mapImageFile(QString &szRetPath,const char * filename) bool KviApp::findImage(KviStr &szRetPath,const char *filename) { - QString buff; + TQString buff; bool ret=findImage(buff,filename); szRetPath=buff; return ret; } -bool KviApp::findImage(QString &szRetPath,const char *filename) +bool KviApp::findImage(TQString &szRetPath,const char *filename) { // Find an user file... if(kvi_isAbsolutePath(filename)) @@ -571,7 +571,7 @@ bool KviApp::findImage(QString &szRetPath,const char *filename) // if we have a theme, look it up as first if(!KVI_OPTION_STRING(KviOption_stringIconThemeSubdir).isEmpty()) { - QString szTmp = KVI_OPTION_STRING(KviOption_stringIconThemeSubdir); + TQString szTmp = KVI_OPTION_STRING(KviOption_stringIconThemeSubdir); szTmp.append(KVI_PATH_SEPARATOR_CHAR); szTmp.append(filename); @@ -599,8 +599,8 @@ bool KviApp::findImage(QString &szRetPath,const char *filename) if(findImageInImageSearchPath(szRetPath,filename))return true; // Last resort - szRetPath = QDir::homeDirPath(); - KviQString::ensureLastCharIs(szRetPath,KVI_PATH_SEPARATOR_CHAR); + szRetPath = TQDir::homeDirPath(); + KviTQString::ensureLastCharIs(szRetPath,KVI_PATH_SEPARATOR_CHAR); szRetPath.append(filename); if(KviFileUtils::fileExists(szRetPath))return true; @@ -609,12 +609,12 @@ bool KviApp::findImage(QString &szRetPath,const char *filename) return false; } -bool KviApp::findImageThemeOnlyCompat(QString &szRetPath,const char *filename) +bool KviApp::findImageThemeOnlyCompat(TQString &szRetPath,const char *filename) { // if we have a theme, look it up as first if(!KVI_OPTION_STRING(KviOption_stringIconThemeSubdir).isEmpty()) { - QString szTmp = KVI_OPTION_STRING(KviOption_stringIconThemeSubdir); + TQString szTmp = KVI_OPTION_STRING(KviOption_stringIconThemeSubdir); szTmp.append(KVI_PATH_SEPARATOR_CHAR); szTmp.append(filename); @@ -636,7 +636,7 @@ bool KviApp::findImageThemeOnlyCompat(QString &szRetPath,const char *filename) return false; } -bool KviApp::findSmallIcon(QString &szRetPath,const char *filename) +bool KviApp::findSmallIcon(TQString &szRetPath,const char *filename) { // this is a bit optimized for the small builtin icons // looks up less places. @@ -651,7 +651,7 @@ bool KviApp::findSmallIcon(QString &szRetPath,const char *filename) // if we have a theme, look it up as first if(!KVI_OPTION_STRING(KviOption_stringIconThemeSubdir).isEmpty()) { - QString szTmp = KVI_OPTION_STRING(KviOption_stringIconThemeSubdir); + TQString szTmp = KVI_OPTION_STRING(KviOption_stringIconThemeSubdir); szTmp.append(KVI_PATH_SEPARATOR_CHAR); szTmp.append(KVI_SMALLICONS_SUBDIRECTORY); szTmp.append(KVI_PATH_SEPARATOR_CHAR); @@ -680,8 +680,8 @@ bool KviApp::findSmallIcon(QString &szRetPath,const char *filename) if(findImageInImageSearchPath(szRetPath,filename))return true; // Last resort... bleah :/ - szRetPath = QDir::homeDirPath(); - KviQString::ensureLastCharIs(szRetPath,KVI_PATH_SEPARATOR_CHAR); + szRetPath = TQDir::homeDirPath(); + KviTQString::ensureLastCharIs(szRetPath,KVI_PATH_SEPARATOR_CHAR); szRetPath.append(filename); if(KviFileUtils::fileExists(szRetPath))return true; @@ -699,13 +699,13 @@ bool KviApp::findSmallIcon(QString &szRetPath,const char *filename) bool KviApp::getReadOnlyConfigPath(KviStr &buffer,const char *config_name,KvircSubdir sbd,bool bNoFail) { // DEPRECATED - QString tmp; + TQString tmp; bool bRet = getReadOnlyConfigPath(tmp,config_name,sbd,bNoFail); buffer = tmp; return bRet; } -bool KviApp::getReadOnlyConfigPath(QString &buffer,const char *config_name,KvircSubdir sbd,bool bNoFail) +bool KviApp::getReadOnlyConfigPath(TQString &buffer,const char *config_name,KvircSubdir sbd,bool bNoFail) { // Take a look in the local directory.... getLocalKvircDirectory(buffer,sbd,config_name); @@ -713,7 +713,7 @@ bool KviApp::getReadOnlyConfigPath(QString &buffer,const char *config_name,Kvirc if(!KviFileUtils::fileExists(buffer)) { // No saved config yet... check for defaults - QString tmp; + TQString tmp; getGlobalKvircDirectory(tmp,sbd,config_name); if(!KviFileUtils::fileExists(tmp)) { diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp index 1c9f388..4d2f255 100644 --- a/src/kvirc/kernel/kvi_app_setup.cpp +++ b/src/kvirc/kernel/kvi_app_setup.cpp @@ -27,7 +27,7 @@ //#define _KVI_DEBUG_CHECK_RANGE_ //#include "kvi_debug.h" -#include <qtextcodec.h> +#include <tqtextcodec.h> #include "kvi_settings.h" #include "kvi_defaults.h" @@ -62,9 +62,9 @@ #endif //COMPILE_ON_WINDOWS -#include <qfile.h> -#include <qtextstream.h> -#include <qdir.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqdir.h> @@ -76,14 +76,14 @@ // and if it is not found , ask the user to choose one // -bool KviApp::checkGlobalKvircDirectory(const QString dir) +bool KviApp::checkGlobalKvircDirectory(const TQString dir) { //First check if the help subdir exists - QString szDir2 = dir; + TQString szDir2 = dir; szDir2+=KVI_PATH_SEPARATOR"help"; if(!KviFileUtils::directoryExists(szDir2))return false; //Then check if the pics subdir exists - QString szDir = dir; + TQString szDir = dir; szDir+=KVI_PATH_SEPARATOR"pics"; if(!KviFileUtils::directoryExists(szDir))return false; //Now make sure that it is the dir that we're looking for. @@ -93,13 +93,13 @@ bool KviApp::checkGlobalKvircDirectory(const QString dir) return KviFileUtils::isReadable(szDir); } -bool KviApp::checkLocalKvircDirectory(const QString szDir) +bool KviApp::checkLocalKvircDirectory(const TQString szDir) { //First check if the dir exists if(!KviFileUtils::directoryExists(szDir))return false; - if(!QFileInfo(szDir).isWritable()) return false; + if(!TQFileInfo(szDir).isWritable()) return false; - QString szBuff; + TQString szBuff; getLocalKvircDirectory(szBuff,Config); if(!KviFileUtils::directoryExists(szBuff)) return false; @@ -109,9 +109,9 @@ bool KviApp::checkLocalKvircDirectory(const QString szDir) bool KviApp::checkFileAssociations() { #ifdef COMPILE_ON_WINDOWS -#define QUERY_BUFFER 2048 +#define TQUERY_BUFFER 2048 char* buffer; - DWORD len = QUERY_BUFFER; + DWORD len = TQUERY_BUFFER; DWORD err; buffer = (char*)malloc(len*sizeof(char)); HKEY hKey; @@ -130,7 +130,7 @@ bool KviApp::checkFileAssociations() } } - len = QUERY_BUFFER; + len = TQUERY_BUFFER; if(RegOpenKeyEx(HKEY_CLASSES_ROOT,"KVIrcScript",0,KEY_READ,&hKey) != ERROR_SUCCESS ) return false; @@ -145,7 +145,7 @@ bool KviApp::checkFileAssociations() } } - len = QUERY_BUFFER; + len = TQUERY_BUFFER; if(RegOpenKeyEx(HKEY_CLASSES_ROOT,"KVIrcScript\\DefaultIcon",0,KEY_READ,&hKey) != ERROR_SUCCESS ) return false; @@ -154,15 +154,15 @@ bool KviApp::checkFileAssociations() free(buffer); return false; } else { - QString szIcon = applicationFilePath()+",1"; - szIcon.replace('/',"\\"); + TQString szIcon = applicationFilePath()+",1"; + szIcon.tqreplace('/',"\\"); if(!kvi_strEqualCI(szIcon.local8Bit().data(),buffer)){ free(buffer); return false; } } - len = QUERY_BUFFER; + len = TQUERY_BUFFER; if(RegOpenKeyEx(HKEY_CLASSES_ROOT,"KVIrcScript\\Shell\\Parse",0,KEY_READ,&hKey) != ERROR_SUCCESS ) return false; @@ -177,7 +177,7 @@ bool KviApp::checkFileAssociations() } } - len = QUERY_BUFFER; + len = TQUERY_BUFFER; if(RegOpenKeyEx(HKEY_CLASSES_ROOT,"KVIrcScript\\Shell\\Parse\\command",0,KEY_READ,&hKey) != ERROR_SUCCESS ) return false; @@ -186,8 +186,8 @@ bool KviApp::checkFileAssociations() free(buffer); return false; } else { - QString szCmd = applicationFilePath()+" \"%1\""; - szCmd.replace('/',"\\"); + TQString szCmd = applicationFilePath()+" \"%1\""; + szCmd.tqreplace('/',"\\"); if(!kvi_strEqualCI(szCmd.local8Bit().data(),buffer)) { free(buffer); return false; @@ -210,7 +210,7 @@ bool KviApp::checkFileAssociations() } } - len = QUERY_BUFFER; + len = TQUERY_BUFFER; if(RegOpenKeyEx(HKEY_CLASSES_ROOT,"KVIrcConfig",0,KEY_READ,&hKey) != ERROR_SUCCESS ) return false; @@ -229,7 +229,7 @@ bool KviApp::checkFileAssociations() } } - len = QUERY_BUFFER; + len = TQUERY_BUFFER; if(RegOpenKeyEx(HKEY_CLASSES_ROOT,"KVIrcAddon",0,KEY_READ,&hKey) != ERROR_SUCCESS ) return false; //Theme @@ -247,7 +247,7 @@ bool KviApp::checkFileAssociations() } } - len = QUERY_BUFFER; + len = TQUERY_BUFFER; if(RegOpenKeyEx(HKEY_CLASSES_ROOT,"KVIrcTheme",0,KEY_READ,&hKey) != ERROR_SUCCESS ) return false; @@ -261,9 +261,9 @@ bool KviApp::checkFileAssociations() bool KviApp::checkUriAssociations(char * proto) { #ifdef COMPILE_ON_WINDOWS -#define QUERY_BUFFER 2048 +#define TQUERY_BUFFER 2048 char* buffer; - DWORD len = QUERY_BUFFER; + DWORD len = TQUERY_BUFFER; DWORD err; buffer = (char*)malloc(len*sizeof(char)); HKEY hKey; @@ -272,7 +272,7 @@ bool KviApp::checkUriAssociations(char * proto) KviStr key=storedKey; - len = QUERY_BUFFER; + len = TQUERY_BUFFER; if(RegOpenKeyEx(HKEY_CLASSES_ROOT,key,0,KEY_READ,&hKey) != ERROR_SUCCESS ) return false; @@ -287,7 +287,7 @@ bool KviApp::checkUriAssociations(char * proto) } } - len = QUERY_BUFFER; + len = TQUERY_BUFFER; if( (err=RegQueryValueEx( hKey,"URL Protocol",0,0,(LPBYTE)buffer,&len)) != ERROR_SUCCESS) { free(buffer); @@ -295,7 +295,7 @@ bool KviApp::checkUriAssociations(char * proto) } key = storedKey+"\\DefaultIcon"; - len = QUERY_BUFFER; + len = TQUERY_BUFFER; if(RegOpenKeyEx(HKEY_CLASSES_ROOT,key,0,KEY_READ,&hKey) != ERROR_SUCCESS ) return false; @@ -304,15 +304,15 @@ bool KviApp::checkUriAssociations(char * proto) free(buffer); return false; } else { - QString szIcon = applicationFilePath()+",0"; - szIcon.replace('/',"\\"); + TQString szIcon = applicationFilePath()+",0"; + szIcon.tqreplace('/',"\\"); if(!kvi_strEqualCI(szIcon.local8Bit().data(),buffer)){ free(buffer); return false; } } - len = QUERY_BUFFER; + len = TQUERY_BUFFER; key = storedKey+"\\Shell\\open"; if(RegOpenKeyEx(HKEY_CLASSES_ROOT,key,0,KEY_READ,&hKey) != ERROR_SUCCESS ) return false; @@ -328,7 +328,7 @@ bool KviApp::checkUriAssociations(char * proto) } } - len = QUERY_BUFFER; + len = TQUERY_BUFFER; key = storedKey+"\\Shell\\open\\command"; if(RegOpenKeyEx(HKEY_CLASSES_ROOT,key,0,KEY_READ,&hKey) != ERROR_SUCCESS ) return false; @@ -338,8 +338,8 @@ bool KviApp::checkUriAssociations(char * proto) free(buffer); return false; } else { - QString szCmd = applicationFilePath()+" \"%1\""; - szCmd.replace('/',"\\"); + TQString szCmd = applicationFilePath()+" \"%1\""; + szCmd.tqreplace('/',"\\"); if(!kvi_strEqualCI(szCmd.local8Bit().data(),buffer)) { free(buffer); return false; @@ -363,9 +363,9 @@ void KviApp::setupUriAssociations(char * proto) KviStr key=storedKey; - KviQCString tmp; - QString appPath = applicationFilePath(); - appPath.replace('/',"\\"); + KviTQCString tmp; + TQString appPath = applicationFilePath(); + appPath.tqreplace('/',"\\"); SHDeleteKey(HKEY_CLASSES_ROOT,key); @@ -375,7 +375,7 @@ void KviApp::setupUriAssociations(char * proto) key=storedKey+"\\DefaultIcon"; RegCreateKeyEx(HKEY_CLASSES_ROOT,key,0,0,0,KEY_WRITE,0,&hKey,0); - tmp=QString(appPath+",0").local8Bit(); + tmp=TQString(appPath+",0").local8Bit(); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)tmp.data(),tmp.length()); key=storedKey+"\\Shell\\open"; @@ -385,7 +385,7 @@ void KviApp::setupUriAssociations(char * proto) key=storedKey+"\\Shell\\open\\command"; RegCreateKeyEx(HKEY_CLASSES_ROOT,key,0,0,0,KEY_WRITE,0,&hKey,0); - tmp=QString(appPath+" \"%1\"").local8Bit(); + tmp=TQString(appPath+" \"%1\"").local8Bit(); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)tmp.data(),tmp.length()); #endif @@ -397,9 +397,9 @@ void KviApp::setupFileAssociations() HKEY hKey; DWORD err; - KviQCString tmp; - QString appPath = applicationFilePath(); - appPath.replace('/',"\\"); + KviTQCString tmp; + TQString appPath = applicationFilePath(); + appPath.tqreplace('/',"\\"); SHDeleteKey(HKEY_CLASSES_ROOT,".kvs"); @@ -413,7 +413,7 @@ void KviApp::setupFileAssociations() RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)tmp.data(),tmp.length()); RegCreateKeyEx(HKEY_CLASSES_ROOT,"KVIrcScript\\DefaultIcon",0,0,0,KEY_WRITE,0,&hKey,0); - tmp=QString(appPath+",1").local8Bit(); + tmp=TQString(appPath+",1").local8Bit(); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)tmp.data(),tmp.length()); RegCreateKeyEx(HKEY_CLASSES_ROOT,"KVIrcScript\\Shell\\Parse",0,0,0,KEY_WRITE,0,&hKey,0); @@ -421,7 +421,7 @@ void KviApp::setupFileAssociations() RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)tmp.data(),tmp.length()); RegCreateKeyEx(HKEY_CLASSES_ROOT,"KVIrcScript\\Shell\\Parse\\command",0,0,0,KEY_WRITE,0,&hKey,0); - tmp=QString(appPath+" \"%1\"").local8Bit(); + tmp=TQString(appPath+" \"%1\"").local8Bit(); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)tmp.data(),tmp.length()); //Configs @@ -437,7 +437,7 @@ void KviApp::setupFileAssociations() RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)tmp.data(),tmp.length()); RegCreateKeyEx(HKEY_CLASSES_ROOT,"KVIrcConfig\\DefaultIcon",0,0,0,KEY_WRITE,0,&hKey,0); - tmp=QString(appPath+",2").local8Bit(); + tmp=TQString(appPath+",2").local8Bit(); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)tmp.data(),tmp.length()); // Themes @@ -454,7 +454,7 @@ void KviApp::setupFileAssociations() RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)tmp.data(),tmp.length()); RegCreateKeyEx(HKEY_CLASSES_ROOT,"KVIrcTheme\\DefaultIcon",0,0,0,KEY_WRITE,0,&hKey,0); - tmp=QString(appPath+",3").local8Bit(); + tmp=TQString(appPath+",3").local8Bit(); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)tmp.data(),tmp.length()); RegCreateKeyEx(HKEY_CLASSES_ROOT,"KVIrcTheme\\Shell\\Install",0,0,0,KEY_WRITE,0,&hKey,0); @@ -462,7 +462,7 @@ void KviApp::setupFileAssociations() RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)tmp.data(),tmp.length()); RegCreateKeyEx(HKEY_CLASSES_ROOT,"KVIrcTheme\\Shell\\Install\\command",0,0,0,KEY_WRITE,0,&hKey,0); - tmp=QString(appPath+" \"%1\"").local8Bit(); + tmp=TQString(appPath+" \"%1\"").local8Bit(); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)tmp.data(),tmp.length()); //Addons @@ -479,7 +479,7 @@ void KviApp::setupFileAssociations() RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)tmp.data(),tmp.length()); RegCreateKeyEx(HKEY_CLASSES_ROOT,"KVIrcAddon\\DefaultIcon",0,0,0,KEY_WRITE,0,&hKey,0); - tmp=QString(appPath+",4").local8Bit(); + tmp=TQString(appPath+",4").local8Bit(); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)tmp.data(),tmp.length()); RegCreateKeyEx(HKEY_CLASSES_ROOT,"KVIrcAddon\\Shell\\Install",0,0,0,KEY_WRITE,0,&hKey,0); @@ -487,7 +487,7 @@ void KviApp::setupFileAssociations() RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)tmp.data(),tmp.length()); RegCreateKeyEx(HKEY_CLASSES_ROOT,"KVIrcAddon\\Shell\\Install\\command",0,0,0,KEY_WRITE,0,&hKey,0); - tmp=QString(appPath+" \"%1\"").local8Bit(); + tmp=TQString(appPath+" \"%1\"").local8Bit(); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)tmp.data(),tmp.length()); #endif @@ -589,7 +589,7 @@ void KviApp::findGlobalKvircDirectory() //Last resource , try $HOME and $HOME/.kde for(int k=0;usualKvircGlobalDir[k] != 0;k++){ - m_szGlobalKvircDir = QDir::homeDirPath(); + m_szGlobalKvircDir = TQDir::homeDirPath(); m_szGlobalKvircDir+= usualKvircGlobalDir[k]; m_szGlobalKvircDir+= KVI_VERSION_BRANCH; if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return; @@ -597,7 +597,7 @@ void KviApp::findGlobalKvircDirectory() #ifdef COMPILE_KDE_SUPPORT for(int k=0;usualKvircGlobalDir[k] != 0;k++){ - m_szGlobalKvircDir = QDir::homeDirPath(); + m_szGlobalKvircDir = TQDir::homeDirPath(); m_szGlobalKvircDir+= "/.kde"; m_szGlobalKvircDir+= usualKvircGlobalDir[k]; m_szGlobalKvircDir+= KVI_VERSION_BRANCH; @@ -673,12 +673,12 @@ bool KviApp::findLocalKvircDirectory() } #endif //Check if we have a special .kvirc.rc in $HOME - QString szF = QDir::homeDirPath(); + TQString szF = TQDir::homeDirPath(); if(!m_szConfigFile.isEmpty()) { - QString szConfig = m_szConfigFile; - if(QDir::isRelativePath(szConfig)) + TQString szConfig = m_szConfigFile; + if(TQDir::isRelativePath(szConfig)) { szF+=KVI_PATH_SEPARATOR; szF+=szConfig; @@ -710,7 +710,7 @@ void KviApp::loadDirectories() // First find the global (readable) one... findGlobalKvircDirectory(); // Init locale - QString szLocalePath = m_szGlobalKvircDir; + TQString szLocalePath = m_szGlobalKvircDir; szLocalePath.append(KVI_PATH_SEPARATOR); szLocalePath.append("locale"); szLocalePath.append(KVI_PATH_SEPARATOR); @@ -735,9 +735,9 @@ static kvi_library_t g_hSetupLibrary = 0; void KviApp::setupBegin() { //We must do the setup...ask the user.. - QString szSetupLib; + TQString szSetupLib; getGlobalKvircDirectory(szSetupLib,KviApp::Modules); - KviQString::ensureLastCharIs(szSetupLib,KVI_PATH_SEPARATOR_CHAR); + KviTQString::ensureLastCharIs(szSetupLib,KVI_PATH_SEPARATOR_CHAR); #ifdef COMPILE_ON_WINDOWS szSetupLib.append("kvisetup.dll"); #else @@ -839,11 +839,11 @@ void KviApp::saveKvircDirectory() #endif //COMPILE_KDE_SUPPORT // In NON-KDE we use $HOME/.kvirc.rc or $HOME/kvirc.ini - QString szF = QDir::homeDirPath(); + TQString szF = TQDir::homeDirPath(); if(!m_szConfigFile.isEmpty()) - {//Must be changed from QString::fromLocal8Bit to QTextCodec::codecForLocale() - QString szConfig = m_szConfigFile; - if(QDir::isRelativePath(szConfig)) + {//Must be changed from TQString::fromLocal8Bit to TQTextCodec::codecForLocale() + TQString szConfig = m_szConfigFile; + if(TQDir::isRelativePath(szConfig)) { szF+=KVI_PATH_SEPARATOR; szF+=szConfig; diff --git a/src/kvirc/kernel/kvi_asynchronousconnectiondata.h b/src/kvirc/kernel/kvi_asynchronousconnectiondata.h index 35c41ed..2018289 100644 --- a/src/kvirc/kernel/kvi_asynchronousconnectiondata.h +++ b/src/kvirc/kernel/kvi_asynchronousconnectiondata.h @@ -36,18 +36,18 @@ public: KviAsynchronousConnectionData(); ~KviAsynchronousConnectionData(); public: - QString szServer; + TQString szServer; bool bUseLastServerInContext; // this is checked ONLY if szServer is empty kvi_u32_t uPort; bool bPortIsOk; bool bUseIpV6; bool bUseSSL; - QString szBindAddress; // ip address (or interface name) to bind the connection to - QString szCommandToExecAfterConnect; - QString szLinkFilter; - QString szPass; - QString szNick; - QString szInitUMode; + TQString szBindAddress; // ip address (or interface name) to bind the connection to + TQString szCommandToExecAfterConnect; + TQString szLinkFilter; + TQString szPass; + TQString szNick; + TQString szInitUMode; KviIrcServerReconnectInfo * m_pReconnectInfo; }; diff --git a/src/kvirc/kernel/kvi_coreactionnames.h b/src/kvirc/kernel/kvi_coreactionnames.h index 7309e28..2c211ed 100644 --- a/src/kvirc/kernel/kvi_coreactionnames.h +++ b/src/kvirc/kernel/kvi_coreactionnames.h @@ -45,7 +45,7 @@ #define KVI_COREACTION_TILEWINDOWS (KVI_COREACTION_NAME_PREFIX "tilewindows") #define KVI_COREACTION_MINIMIZEALLWINDOWS (KVI_COREACTION_NAME_PREFIX "minimizeallwindows") #define KVI_COREACTION_NEWIRCCONTEXT (KVI_COREACTION_NAME_PREFIX "newirccontext") -#define KVI_COREACTION_QUITKVIRC (KVI_COREACTION_NAME_PREFIX "quitkvirc") +#define KVI_COREACTION_TQUITKVIRC (KVI_COREACTION_NAME_PREFIX "quitkvirc") #define KVI_COREACTION_IRCCONTEXTDISPLAY (KVI_COREACTION_NAME_PREFIX "irccontextdisplay") #define KVI_COREACTION_SEPARATOR (KVI_COREACTION_NAME_PREFIX "separator") #define KVI_COREACTION_CONNECT (KVI_COREACTION_NAME_PREFIX "connect") diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp index 071f4ac..7f32861 100644 --- a/src/kvirc/kernel/kvi_coreactions.cpp +++ b/src/kvirc/kernel/kvi_coreactions.cpp @@ -47,7 +47,7 @@ #include "kvi_kvs_script.h" #include "kvi_tal_popupmenu.h" -#include <qobject.h> +#include <tqobject.h> // Ctrl+Alt+A : KviGoAwayAction @@ -72,7 +72,7 @@ void register_core_actions(KviActionManager * m) { - m->registerAction(new KviConnectAction(m)); // this as parent will destroy it on exit! + m->registerAction(new KviConnectAction(m)); // this as tqparent will destroy it on exit! m->registerAction(new KviSeparatorAction(m)); m->registerAction(new KviIrcContextDisplayAction(m)); m->registerAction(new KviJoinChannelAction(m)); @@ -87,12 +87,12 @@ void register_core_actions(KviActionManager * m) #define SCRIPT_ACTION(__name,__code,__visible,__description,__category,__icon,__smallicon,__flags,__accel) \ a = new KviKvsAction(m, \ - QString(__name), \ - QString(__code), \ - QString(__visible), \ - QString(__description), \ + TQString(__name), \ + TQString(__code), \ + TQString(__visible), \ + TQString(__description), \ __category, \ - QString(__icon), \ + TQString(__icon), \ __smallicon, \ __flags, \ __accel); \ @@ -100,15 +100,15 @@ void register_core_actions(KviActionManager * m) #define SLOT_ACTION(__name,__object,__slot,__visible,__description,__category,__icon,__smallicon,__flags,__accel) \ a = new KviAction(m, \ - QString(__name), \ - QString(__visible), \ - QString(__description), \ + TQString(__name), \ + TQString(__visible), \ + TQString(__description), \ __category, \ - QString(__icon), \ + TQString(__icon), \ __smallicon, \ __flags, \ __accel); \ - QObject::connect(a,SIGNAL(activated()),__object,__slot); \ + TQObject::connect(a,TQT_SIGNAL(activated()),__object,__slot); \ m->registerAction(a) SCRIPT_ACTION( @@ -164,7 +164,7 @@ void register_core_actions(KviActionManager * m) "kvi_bigicon_socketspy.png", KVI_SMALLICON_SPY, KviAction::NeedsContext, - QString::null); + TQString()); SCRIPT_ACTION( KVI_COREACTION_NETWORKLINKS, @@ -175,7 +175,7 @@ void register_core_actions(KviActionManager * m) "kvi_bigicon_networklinks.png", KVI_SMALLICON_LINKS, KviAction::NeedsContext, - QString::null); + TQString()); SCRIPT_ACTION( KVI_COREACTION_CHANNELLIST, @@ -186,7 +186,7 @@ void register_core_actions(KviActionManager * m) "kvi_bigicon_channellist.png", KVI_SMALLICON_LIST, KviAction::NeedsContext, - QString::null); + TQString()); SCRIPT_ACTION( KVI_COREACTION_GENERALOPTIONS, @@ -309,7 +309,7 @@ void register_core_actions(KviActionManager * m) "kvi_bigicon_codetester.png", KVI_SMALLICON_BOMB, 0, - QString::null); + TQString()); SCRIPT_ACTION( KVI_COREACTION_EXECUTEKVS, @@ -342,7 +342,7 @@ void register_core_actions(KviActionManager * m) "kvi_bigicon_mailinglist.png", KVI_SMALLICON_MESSAGE, 0, - QString::null); + TQString()); SCRIPT_ACTION( KVI_COREACTION_KVIRCHOMEPAGE, @@ -353,7 +353,7 @@ void register_core_actions(KviActionManager * m) "kvi_bigicon_kvircwww.png", KVI_SMALLICON_KVIRC, 0, - QString::null); + TQString()); SCRIPT_ACTION( KVI_COREACTION_KVIRCRUHOMEPAGE, @@ -364,7 +364,7 @@ void register_core_actions(KviActionManager * m) "kvi_bigicon_kvircwww.png", KVI_SMALLICON_KVIRC, 0, - QString::null); + TQString()); SCRIPT_ACTION( KVI_COREACTION_SCREENSHOT, @@ -375,49 +375,49 @@ void register_core_actions(KviActionManager * m) "kvi_bigicon_screenshot.png", KVI_SMALLICON_SCREENSHOT, 0, - QString::null); + TQString()); SLOT_ACTION( KVI_COREACTION_CASCADEWINDOWS, g_pFrame->mdiManager(), - SLOT(cascadeMaximized()), + TQT_SLOT(cascadeMaximized()), __tr2qs("Cascade windows"), __tr2qs("Arranges the MDI windows in a maximized-cascade fashion"), KviActionManager::categoryGUI(), "kvi_bigicon_cascadewindows.png", KVI_SMALLICON_CASCADEWINDOWS, 0, - QString::null); + TQString()); SLOT_ACTION( KVI_COREACTION_TILEWINDOWS, g_pFrame->mdiManager(), - SLOT(tile()), + TQT_SLOT(tile()), __tr2qs("Tile windows"), __tr2qs("Tiles the MDI windows with the currently selected tile method"), KviActionManager::categoryGUI(), "kvi_bigicon_tilewindows.png", KVI_SMALLICON_TILEWINDOWS, 0, - QString::null); + TQString()); SLOT_ACTION( KVI_COREACTION_MINIMIZEALLWINDOWS, g_pFrame->mdiManager(), - SLOT(minimizeAll()), + TQT_SLOT(minimizeAll()), __tr2qs("Minimize all windows"), __tr2qs("Minimized all the currently visible MDI windows"), KviActionManager::categoryGUI(), "kvi_bigicon_minimizeallwindows.png", KVI_SMALLICON_MINIMIZE, 0, - QString::null); + TQString()); SLOT_ACTION( KVI_COREACTION_NEWIRCCONTEXT, g_pFrame, - SLOT(newConsole()), + TQT_SLOT(newConsole()), __tr2qs("New IRC Context"), __tr2qs("Creates a new IRC context console"), KviActionManager::categoryIrc(), @@ -427,24 +427,24 @@ void register_core_actions(KviActionManager * m) "Ctrl+Alt+N"); SLOT_ACTION( - KVI_COREACTION_QUITKVIRC, + KVI_COREACTION_TQUITKVIRC, g_pApp, - SLOT(quit()), + TQT_SLOT(quit()), __tr2qs("Quit KVIrc"), __tr2qs("Quits KVIrc closing all the current connections"), KviActionManager::categoryGeneric(), "kvi_bigicon_quit.png", - KVI_SMALLICON_QUITAPP, + KVI_SMALLICON_TQUITAPP, 0, - QString::null); + TQString()); } -KviIrcContextDisplayAction::KviIrcContextDisplayAction(QObject * pParent) +KviIrcContextDisplayAction::KviIrcContextDisplayAction(TQObject * pParent) : KviAction(pParent, - QString(KVI_COREACTION_IRCCONTEXTDISPLAY), + TQString(KVI_COREACTION_IRCCONTEXTDISPLAY), __tr2qs("IRC Context Display"), __tr2qs("Shows a small display with IRC context informations"), KviActionManager::categoryIrc(), @@ -457,11 +457,11 @@ KviIrcContextDisplayAction::KviIrcContextDisplayAction(QObject * pParent) void KviIrcContextDisplayAction::setup() { KviAction::setup(); - connect(g_pFrame,SIGNAL(activeConnectionServerInfoChanged()),this,SLOT(activeContextStateChanged())); - connect(g_pFrame,SIGNAL(activeConnectionNickNameChanged()),this,SLOT(activeContextStateChanged())); - connect(g_pFrame,SIGNAL(activeConnectionUserModeChanged()),this,SLOT(activeContextStateChanged())); - connect(g_pFrame,SIGNAL(activeConnectionAwayStateChanged()),this,SLOT(activeContextStateChanged())); - connect(g_pFrame,SIGNAL(activeConnectionLagChanged()),this,SLOT(activeContextStateChanged())); + connect(g_pFrame,TQT_SIGNAL(activeConnectionServerInfoChanged()),this,TQT_SLOT(activeContextStateChanged())); + connect(g_pFrame,TQT_SIGNAL(activeConnectionNickNameChanged()),this,TQT_SLOT(activeContextStateChanged())); + connect(g_pFrame,TQT_SIGNAL(activeConnectionUserModeChanged()),this,TQT_SLOT(activeContextStateChanged())); + connect(g_pFrame,TQT_SIGNAL(activeConnectionAwayStateChanged()),this,TQT_SLOT(activeContextStateChanged())); + connect(g_pFrame,TQT_SIGNAL(activeConnectionLagChanged()),this,TQT_SLOT(activeContextStateChanged())); } bool KviIrcContextDisplayAction::addToPopupMenu(KviTalPopupMenu *p) @@ -476,7 +476,7 @@ bool KviIrcContextDisplayAction::addToPopupMenu(KviTalPopupMenu *p) return true; } -QWidget * KviIrcContextDisplayAction::addToCustomToolBar(KviCustomToolBar *t) +TQWidget * KviIrcContextDisplayAction::addToCustomToolBar(KviCustomToolBar *t) { if(!setupDone())setup(); KviIrcContextDisplay * w = new KviIrcContextDisplay(t,"kvirc.irccontextdisplay"); @@ -491,7 +491,7 @@ void KviIrcContextDisplayAction::activeContextChanged() { if(m_pWidgetList) { - for(QWidget * w = m_pWidgetList->first();w;w = m_pWidgetList->next()) + for(TQWidget * w = m_pWidgetList->first();w;w = m_pWidgetList->next()) w->update(); } } @@ -500,7 +500,7 @@ void KviIrcContextDisplayAction::activeContextStateChanged() { if(m_pWidgetList) { - for(QWidget * w = m_pWidgetList->first();w;w = m_pWidgetList->next()) + for(TQWidget * w = m_pWidgetList->first();w;w = m_pWidgetList->next()) w->update(); } } @@ -513,9 +513,9 @@ void KviIrcContextDisplayAction::setEnabled(bool) -KviSeparatorAction::KviSeparatorAction(QObject * pParent) +KviSeparatorAction::KviSeparatorAction(TQObject * pParent) : KviAction(pParent, - QString(KVI_COREACTION_SEPARATOR), + TQString(KVI_COREACTION_SEPARATOR), __tr2qs("Separator"), __tr2qs("Acts as a separator for other items: performs no action"), KviActionManager::categoryGeneric(), @@ -533,10 +533,10 @@ bool KviSeparatorAction::addToPopupMenu(KviTalPopupMenu *p) return true; } -QWidget * KviSeparatorAction::addToCustomToolBar(KviCustomToolBar *t) +TQWidget * KviSeparatorAction::addToCustomToolBar(KviCustomToolBar *t) { if(!setupDone())setup(); - QWidget * w = new KviCustomToolBarSeparator(t,"kvirc.separator"); + TQWidget * w = new KviCustomToolBarSeparator(t,"kvirc.separator"); registerWidget(w); #ifdef COMPILE_USE_QT4 t->addWidget(w); @@ -548,16 +548,16 @@ QWidget * KviSeparatorAction::addToCustomToolBar(KviCustomToolBar *t) -KviConnectAction::KviConnectAction(QObject * pParent) +KviConnectAction::KviConnectAction(TQObject * pParent) : KviAction(pParent, - QString(KVI_COREACTION_CONNECT), + TQString(KVI_COREACTION_CONNECT), __tr2qs("Connect/Disconnect"), __tr2qs("Allows you to connect to a server or to terminate the current connection"), KviActionManager::categoryIrc(), KVI_BIGICON_CONNECTED, KVI_SMALLICON_NONE, // no small icon for now NeedsContext | NeedsConnection, - QString("Ctrl+Alt+C")) + TQString("Ctrl+Alt+C")) { } @@ -575,11 +575,11 @@ void KviConnectAction::activeContextChanged() void KviConnectAction::activeContextStateChanged() { - KviPointerList<QWidget> * bl = widgetList(); + KviPointerList<TQWidget> * bl = widgetList(); if(!bl)return; - QPixmap * p; - QString txt; + TQPixmap * p; + TQString txt; KviIrcContext * c = g_pFrame->activeContext(); if(c) { @@ -608,14 +608,14 @@ void KviConnectAction::activeContextStateChanged() if(p) { - for(QToolButton * b = (QToolButton *)bl->first();b;b =(QToolButton *)bl->next()) + for(TQToolButton * b = (TQToolButton *)bl->first();b;b =(TQToolButton *)bl->next()) { if(!b->isEnabled())b->setEnabled(true); b->setPixmap(*p); b->setTextLabel(txt); } } else { - for(QToolButton * b = (QToolButton *)bl->first();b;b = (QToolButton *)bl->next()) + for(TQToolButton * b = (TQToolButton *)bl->first();b;b = (TQToolButton *)bl->next()) { if(b->isEnabled())b->setEnabled(false); } @@ -643,7 +643,7 @@ bool KviConnectAction::addToPopupMenu(KviTalPopupMenu *p) int id; - QString t; + TQString t; if(c) { switch(c->state()) @@ -651,43 +651,43 @@ bool KviConnectAction::addToPopupMenu(KviTalPopupMenu *p) case KviIrcContext::Idle: t = m_szConnectString; if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence; - p->insertItem(t,this,SLOT(activate())); + p->insertItem(t,this,TQT_SLOT(activate())); break; case KviIrcContext::Connecting: case KviIrcContext::LoggingIn: t = m_szAbortConnectionString; if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence; - p->insertItem(t,this,SLOT(activate())); + p->insertItem(t,this,TQT_SLOT(activate())); break; case KviIrcContext::Connected: t = m_szDisconnectString; if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence; - p->insertItem(t,this,SLOT(activate())); + p->insertItem(t,this,TQT_SLOT(activate())); break; default: t = m_szConnectString; if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence; - id = p->insertItem(t,this,SLOT(activate())); + id = p->insertItem(t,this,TQT_SLOT(activate())); p->setItemEnabled(id,false); break; } } else { t = m_szConnectString; if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence; - id = p->insertItem(t,this,SLOT(activate())); + id = p->insertItem(t,this,TQT_SLOT(activate())); p->setItemEnabled(id,false); } return true; } -QWidget * KviConnectAction::addToCustomToolBar(KviCustomToolBar *t) +TQWidget * KviConnectAction::addToCustomToolBar(KviCustomToolBar *t) { if(!setupDone())setup(); - QToolButton * b = new KviStyledToolButton( + TQToolButton * b = new KviStyledToolButton( *(g_pIconManager->getBigIcon(KVI_BIGICON_DISCONNECTED)), m_szConnectString, m_szConnectString, - this,SLOT(activate()),t,name()); + this,TQT_SLOT(activate()),t,name()); registerWidget(b); #ifdef COMPILE_USE_QT4 t->addWidget(b); @@ -702,13 +702,13 @@ QWidget * KviConnectAction::addToCustomToolBar(KviCustomToolBar *t) -KviSubmenuAction::KviSubmenuAction(QObject * pParent, - const QString &szName, - const QString &szScriptCode, - const QString &szVisibleName, - const QString &szDescription, +KviSubmenuAction::KviSubmenuAction(TQObject * pParent, + const TQString &szName, + const TQString &szScriptCode, + const TQString &szVisibleName, + const TQString &szDescription, KviActionCategory * pCategory, - const QString &szBigIcon, + const TQString &szBigIcon, int iSmallIconId, unsigned int uFlags) : KviKvsAction(pParent, @@ -735,8 +735,8 @@ void KviSubmenuAction::setup() if(!m_pPopup) { m_pPopup = new KviTalPopupMenu(); - connect(m_pPopup,SIGNAL(aboutToShow()),this,SLOT(popupAboutToShow())); - connect(m_pPopup,SIGNAL(activated(int)),this,SLOT(popupActivated(int))); + connect(m_pPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(popupAboutToShow())); + connect(m_pPopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(popupActivated(int))); } } @@ -756,18 +756,18 @@ bool KviSubmenuAction::addToPopupMenu(KviTalPopupMenu *p) return true; } -QWidget * KviSubmenuAction::addToCustomToolBar(KviCustomToolBar *t) +TQWidget * KviSubmenuAction::addToCustomToolBar(KviCustomToolBar *t) { if(!setupDone())setup(); KviStyledToolButton * b = new KviStyledToolButton( *(bigIcon()), visibleName(), visibleName(), - this,SLOT(activate()),t,name()); + this,TQT_SLOT(activate()),t,name()); b->setPopup(m_pPopup); #ifdef COMPILE_USE_QT4 - b->setPopupMode( scriptCode().isEmpty() ? QToolButton::InstantPopup : QToolButton::MenuButtonPopup); + b->setPopupMode( scriptCode().isEmpty() ? TQToolButton::InstantPopup : TQToolButton::MenuButtonPopup); t->addWidget(b); #else b->setShowSubmenuIndicator(true); @@ -783,10 +783,10 @@ QWidget * KviSubmenuAction::addToCustomToolBar(KviCustomToolBar *t) -KviJoinChannelAction::KviJoinChannelAction(QObject * pParent) +KviJoinChannelAction::KviJoinChannelAction(TQObject * pParent) : KviSubmenuAction(pParent, - QString(KVI_COREACTION_CHANNELMENU), - QString("channelsjoin.open"), + TQString(KVI_COREACTION_CHANNELMENU), + TQString("channelsjoin.open"), __tr2qs("Join Channel"), __tr2qs("Shows a popup menu that allows quickly selecting a channel to join"), KviActionManager::categoryIrc(), @@ -812,10 +812,10 @@ void KviJoinChannelAction::popupActivated(int id) KviConsole * c = g_pActiveWindow->console(); if(!c)return; - QString text = m_pPopup->text(id); + TQString text = m_pPopup->text(id); if(!text.isEmpty()) { - QString szText; + TQString szText; if(__tr2qs("Other...") == text)szText = "channelsjoin.open"; else { szText = text; @@ -827,10 +827,10 @@ void KviJoinChannelAction::popupActivated(int id) -KviChangeNickAction::KviChangeNickAction(QObject * pParent) +KviChangeNickAction::KviChangeNickAction(TQObject * pParent) : KviSubmenuAction(pParent, - QString(KVI_COREACTION_NICKNAMEMENU), - QString("dialog.textinput(\"Change Nickname\",\"Please enter the new nickname\",\"Cancel\",\"default=OK\"){ if($0 == 1)nick $1; }"), + TQString(KVI_COREACTION_NICKNAMEMENU), + TQString("dialog.textinput(\"Change Nickname\",\"Please enter the new nickname\",\"Cancel\",\"default=OK\"){ if($0 == 1)nick $1; }"), __tr2qs("Change Nickname"), __tr2qs("Shows a popup menu that allows quickly changing the nickname"), KviActionManager::categoryIrc(), @@ -856,10 +856,10 @@ void KviChangeNickAction::popupActivated(int id) KviConsole * c = g_pActiveWindow->console(); if(!c)return; - QString text = m_pPopup->text(id); + TQString text = m_pPopup->text(id); if(!text.isEmpty()) { - QString szText; + TQString szText; if(__tr2qs("Other...") == text) { activate(); @@ -876,10 +876,10 @@ void KviChangeNickAction::popupActivated(int id) -KviConnectToServerAction::KviConnectToServerAction(QObject * pParent) +KviConnectToServerAction::KviConnectToServerAction(TQObject * pParent) : KviSubmenuAction(pParent, - QString(KVI_COREACTION_SERVERMENU), - QString("options.edit KviServerOptionsWidget"), + TQString(KVI_COREACTION_SERVERMENU), + TQString("options.edit KviServerOptionsWidget"), __tr2qs("Connect To"), __tr2qs("Shows a popup menu that allows quickly connecting to a server"), KviActionManager::categoryIrc(), @@ -901,7 +901,7 @@ void KviConnectToServerAction::popupActivated(int id) KviConsole * c = g_pActiveWindow->console(); if(!c)return; - QString text = m_pPopup->text(id); + TQString text = m_pPopup->text(id); if(!text.isEmpty()) { if(__tr2qs("Other...") == text) @@ -922,10 +922,10 @@ void KviConnectToServerAction::popupActivated(int id) -KviChangeUserModeAction::KviChangeUserModeAction(QObject * pParent) +KviChangeUserModeAction::KviChangeUserModeAction(TQObject * pParent) : KviSubmenuAction(pParent, - QString(KVI_COREACTION_USERMODEMENU), - QString(""), + TQString(KVI_COREACTION_USERMODEMENU), + TQString(""), __tr2qs("User Mode"), __tr2qs("Shows a popup menu that allows quickly changing user modes"), KviActionManager::categoryIrc(), @@ -942,7 +942,7 @@ void KviChangeUserModeAction::popupAboutToShow() m_pPopup->clear(); int id; - QString szModes = g_pActiveWindow->console()->connection()->serverInfo()->supportedUserModes(); + TQString szModes = g_pActiveWindow->console()->connection()->serverInfo()->supportedUserModes(); id = m_pPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WALLOPS)),__tr2qs("Wallops (+w)")); m_pPopup->setItemChecked(id,c->connection()->userInfo()->hasUserMode('w')); @@ -951,14 +951,14 @@ void KviChangeUserModeAction::popupAboutToShow() id = m_pPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_INVISIBLE)),__tr2qs("Invisible (+i)")); m_pPopup->setItemChecked(id,c->connection()->userInfo()->hasUserMode('i')); - szModes.replace("w",""); - szModes.replace("s",""); - szModes.replace("i",""); + szModes.tqreplace("w",""); + szModes.tqreplace("s",""); + szModes.tqreplace("i",""); while(!szModes.isEmpty()) { - QChar ccc = szModes[0]; + TQChar ccc = szModes[0]; szModes.remove(0,1); - id = m_pPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MODE)),QString("+%1 Mode").arg(ccc)); + id = m_pPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MODE)),TQString("+%1 Mode").tqarg(ccc)); m_pPopup->setItemChecked(id,c->connection()->userInfo()->hasUserMode(ccc.latin1())); } } @@ -968,18 +968,18 @@ void KviChangeUserModeAction::popupActivated(int id) KviConsole * c = g_pActiveWindow->console(); if(!c)return; - QString text = m_pPopup->text(id); + TQString text = m_pPopup->text(id); if(!c->isConnected())return; if(!text.isEmpty()) { - int idx = text.find('+'); + int idx = text.tqfind('+'); if(idx != -1) { idx++; if(idx < text.length()) { - QChar m = text[idx]; - QString command = "mode "; + TQChar m = text[idx]; + TQString command = "mode "; command.append(c->connection()->userInfo()->nickName()); command.append(c->connection()->userInfo()->hasUserMode(m) ? " -" : " +"); command.append(m); @@ -990,10 +990,10 @@ void KviChangeUserModeAction::popupActivated(int id) } -KviGoAwayAction::KviGoAwayAction(QObject * pParent) +KviGoAwayAction::KviGoAwayAction(TQObject * pParent) : KviKvsAction(pParent, - QString(KVI_COREACTION_AWAYBACK), - QString("if($away())back; else away;"), + TQString(KVI_COREACTION_AWAYBACK), + TQString("if($away())back; else away;"), __tr2qs("Away/Back"), __tr2qs("Allows entering and leaving away state"), KviActionManager::categoryIrc(), @@ -1016,11 +1016,11 @@ void KviGoAwayAction::activeContextChanged() void KviGoAwayAction::activeContextStateChanged() { - KviPointerList<QWidget> * bl = widgetList(); + KviPointerList<TQWidget> * bl = widgetList(); if(!bl)return; - QPixmap * p; - QString txt; + TQPixmap * p; + TQString txt; KviIrcContext * c = g_pFrame->activeContext(); if(c) { @@ -1043,7 +1043,7 @@ void KviGoAwayAction::activeContextStateChanged() if(p) { - for(QToolButton * b = (QToolButton *)bl->first();b;b =(QToolButton *)bl->next()) + for(TQToolButton * b = (TQToolButton *)bl->first();b;b =(TQToolButton *)bl->next()) { if(!b->isEnabled())b->setEnabled(true); b->setPixmap(*p); @@ -1052,7 +1052,7 @@ void KviGoAwayAction::activeContextStateChanged() m_uInternalFlags |= KVI_ACTION_FLAG_ENABLED; setEnabled(true); } else { - for(QToolButton * b = (QToolButton *)bl->first();b;b = (QToolButton *)bl->next()) + for(TQToolButton * b = (TQToolButton *)bl->first();b;b = (TQToolButton *)bl->next()) { if(b->isEnabled())b->setEnabled(false); } @@ -1066,7 +1066,7 @@ void KviGoAwayAction::setup() KviKvsAction::setup(); m_szAwayString = __tr2qs("Enter Away Mode"); m_szBackString = __tr2qs("Leave Away Mode"); - connect(g_pFrame,SIGNAL(activeConnectionAwayStateChanged()),this,SLOT(activeContextStateChanged())); + connect(g_pFrame,TQT_SIGNAL(activeConnectionAwayStateChanged()),this,TQT_SLOT(activeContextStateChanged())); } bool KviGoAwayAction::addToPopupMenu(KviTalPopupMenu *p) @@ -1074,7 +1074,7 @@ bool KviGoAwayAction::addToPopupMenu(KviTalPopupMenu *p) if(!setupDone())setup(); KviIrcContext * c = g_pFrame->activeContext(); int id; - QString t; + TQString t; if(c) { if(c->state() == KviIrcContext::Connected) @@ -1083,35 +1083,35 @@ bool KviGoAwayAction::addToPopupMenu(KviTalPopupMenu *p) { t = m_szBackString; if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence; - p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_AWAY)),t,this,SLOT(activate())); + p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_AWAY)),t,this,TQT_SLOT(activate())); } else { t = m_szAwayString; if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence; - p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NOTAWAY)),t,this,SLOT(activate())); + p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NOTAWAY)),t,this,TQT_SLOT(activate())); } } else { t = m_szAwayString; if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence; - id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NOTAWAY)),t,this,SLOT(activate())); + id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NOTAWAY)),t,this,TQT_SLOT(activate())); p->setItemEnabled(id,false); } } else { t = m_szAwayString; if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence; - id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NOTAWAY)),t,this,SLOT(activate())); + id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NOTAWAY)),t,this,TQT_SLOT(activate())); p->setItemEnabled(id,false); } return true; } -QWidget * KviGoAwayAction::addToCustomToolBar(KviCustomToolBar *t) +TQWidget * KviGoAwayAction::addToCustomToolBar(KviCustomToolBar *t) { if(!setupDone())setup(); - QToolButton * b = new KviStyledToolButton( + TQToolButton * b = new KviStyledToolButton( *(g_pIconManager->getBigIcon("kvi_bigicon_nokeyboard.png")), m_szAwayString, m_szAwayString, - this,SLOT(activate()),t,name()); + this,TQT_SLOT(activate()),t,name()); registerWidget(b); #ifdef COMPILE_USE_QT4 t->addWidget(b); @@ -1130,10 +1130,10 @@ QWidget * KviGoAwayAction::addToCustomToolBar(KviCustomToolBar *t) -KviIrcToolsAction::KviIrcToolsAction(QObject * pParent) +KviIrcToolsAction::KviIrcToolsAction(TQObject * pParent) : KviSubmenuAction(pParent, - QString(KVI_COREACTION_IRCTOOLS), - QString(""), + TQString(KVI_COREACTION_IRCTOOLS), + TQString(""), __tr2qs("Irc Tools"), __tr2qs("Shows a popup menu with some IRC Tools"), KviActionManager::categoryIrc(), @@ -1166,10 +1166,10 @@ void KviIrcToolsAction::popupActivated(int id) -KviIrcOperationsAction::KviIrcOperationsAction(QObject * pParent) +KviIrcOperationsAction::KviIrcOperationsAction(TQObject * pParent) : KviSubmenuAction(pParent, - QString(KVI_COREACTION_IRCACTIONS), - QString(""), + TQString(KVI_COREACTION_IRCACTIONS), + TQString(""), __tr2qs("Irc Actions"), __tr2qs("Shows a popup menu with some IRC Actions"), KviActionManager::categoryIrc(), diff --git a/src/kvirc/kernel/kvi_coreactions.h b/src/kvirc/kernel/kvi_coreactions.h index 4e79fd3..b4ee3c6 100644 --- a/src/kvirc/kernel/kvi_coreactions.h +++ b/src/kvirc/kernel/kvi_coreactions.h @@ -29,20 +29,21 @@ #include "kvi_kvs_action.h" #include "kvi_pointerlist.h" -#include <qtoolbutton.h> +#include <tqtoolbutton.h> class KviConnectAction : public KviAction { Q_OBJECT + TQ_OBJECT public: - KviConnectAction(QObject * pParent); + KviConnectAction(TQObject * pParent); protected: - QString m_szConnectString; - QString m_szAbortConnectionString; - QString m_szDisconnectString; + TQString m_szConnectString; + TQString m_szAbortConnectionString; + TQString m_szDisconnectString; public: virtual bool addToPopupMenu(KviTalPopupMenu *p); - virtual QWidget * addToCustomToolBar(KviCustomToolBar *t); + virtual TQWidget * addToCustomToolBar(KviCustomToolBar *t); protected: virtual void setup(); virtual void reloadImages(); @@ -54,11 +55,12 @@ protected: class KviSeparatorAction : public KviAction { Q_OBJECT + TQ_OBJECT public: - KviSeparatorAction(QObject * pParent); + KviSeparatorAction(TQObject * pParent); public: virtual bool addToPopupMenu(KviTalPopupMenu *p); - virtual QWidget * addToCustomToolBar(KviCustomToolBar *t); + virtual TQWidget * addToCustomToolBar(KviCustomToolBar *t); }; class KviTalPopupMenu; @@ -66,14 +68,15 @@ class KviTalPopupMenu; class KviSubmenuAction : public KviKvsAction { Q_OBJECT + TQ_OBJECT public: - KviSubmenuAction(QObject * pParent, - const QString &szName, - const QString &szScriptCode, - const QString &szVisibleName, - const QString &szDescription, + KviSubmenuAction(TQObject * pParent, + const TQString &szName, + const TQString &szScriptCode, + const TQString &szVisibleName, + const TQString &szDescription, KviActionCategory * pCategory = 0, - const QString &szBigIcon = QString::null, + const TQString &szBigIcon = TQString(), int iSmallIconId = 0, unsigned int uFlags = 0); ~KviSubmenuAction(); @@ -83,7 +86,7 @@ protected: virtual void setup(); public: virtual bool addToPopupMenu(KviTalPopupMenu *p); - virtual QWidget * addToCustomToolBar(KviCustomToolBar *t); + virtual TQWidget * addToCustomToolBar(KviCustomToolBar *t); protected slots: virtual void popupAboutToShow(); virtual void popupActivated(int id); @@ -92,8 +95,9 @@ protected slots: class KviJoinChannelAction : public KviSubmenuAction { Q_OBJECT + TQ_OBJECT public: - KviJoinChannelAction(QObject * pParent); + KviJoinChannelAction(TQObject * pParent); protected slots: virtual void popupAboutToShow(); virtual void popupActivated(int); @@ -102,8 +106,9 @@ protected slots: class KviChangeNickAction : public KviSubmenuAction { Q_OBJECT + TQ_OBJECT public: - KviChangeNickAction(QObject * pParent); + KviChangeNickAction(TQObject * pParent); protected slots: void popupAboutToShow(); void popupActivated(int); @@ -112,8 +117,9 @@ protected slots: class KviConnectToServerAction : public KviSubmenuAction { Q_OBJECT + TQ_OBJECT public: - KviConnectToServerAction(QObject * pParent); + KviConnectToServerAction(TQObject * pParent); protected slots: void popupAboutToShow(); void popupActivated(int); @@ -122,8 +128,9 @@ protected slots: class KviChangeUserModeAction : public KviSubmenuAction { Q_OBJECT + TQ_OBJECT public: - KviChangeUserModeAction(QObject * pParent); + KviChangeUserModeAction(TQObject * pParent); protected slots: void popupAboutToShow(); void popupActivated(int); @@ -132,8 +139,9 @@ protected slots: class KviIrcToolsAction : public KviSubmenuAction { Q_OBJECT + TQ_OBJECT public: - KviIrcToolsAction(QObject * pParent); + KviIrcToolsAction(TQObject * pParent); protected slots: void popupAboutToShow(); void popupActivated(int); @@ -143,8 +151,9 @@ protected slots: class KviIrcOperationsAction : public KviSubmenuAction { Q_OBJECT + TQ_OBJECT public: - KviIrcOperationsAction(QObject * pParent); + KviIrcOperationsAction(TQObject * pParent); protected slots: void popupAboutToShow(); void popupActivated(int); @@ -155,11 +164,12 @@ protected slots: class KviIrcContextDisplayAction : public KviAction { Q_OBJECT + TQ_OBJECT public: - KviIrcContextDisplayAction(QObject * pParent); + KviIrcContextDisplayAction(TQObject * pParent); public: virtual bool addToPopupMenu(KviTalPopupMenu *p); - virtual QWidget * addToCustomToolBar(KviCustomToolBar *t); + virtual TQWidget * addToCustomToolBar(KviCustomToolBar *t); virtual void activeContextStateChanged(); virtual void activeContextChanged(); virtual void setEnabled(bool); @@ -170,14 +180,15 @@ public: class KviGoAwayAction : public KviKvsAction { Q_OBJECT + TQ_OBJECT public: - KviGoAwayAction(QObject * pParent); + KviGoAwayAction(TQObject * pParent); protected: - QString m_szAwayString; - QString m_szBackString; + TQString m_szAwayString; + TQString m_szBackString; public: virtual bool addToPopupMenu(KviTalPopupMenu *p); - virtual QWidget * addToCustomToolBar(KviCustomToolBar *t); + virtual TQWidget * addToCustomToolBar(KviCustomToolBar *t); protected: virtual void setup(); virtual void reloadImages(); diff --git a/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp b/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp index d8c246b..2e3b8fa 100644 --- a/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp +++ b/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp @@ -34,11 +34,11 @@ #include "kvi_kvs_script.h" #include "kvi_window.h" -KviCustomToolBarDescriptor::KviCustomToolBarDescriptor(const QString &szId,const QString &szLabelCode) +KviCustomToolBarDescriptor::KviCustomToolBarDescriptor(const TQString &szId,const TQString &szLabelCode) { m_iInternalId = g_pApp->getGloballyUniqueId(); m_szId = szId; - m_pActions = new KviPointerList<QString>; + m_pActions = new KviPointerList<TQString>; m_pActions->setAutoDelete(true); m_pToolBar = 0; m_bVisibleAtStartup = false; @@ -52,31 +52,31 @@ KviCustomToolBarDescriptor::~KviCustomToolBarDescriptor() delete m_pLabelScript; } -void KviCustomToolBarDescriptor::createLabelScript(const QString &szLabelCode) +void KviCustomToolBarDescriptor::createLabelScript(const TQString &szLabelCode) { - QString szTmp = "toolbar::"; + TQString szTmp = "toolbar::"; szTmp += m_szId; szTmp += "::label"; m_pLabelScript = new KviKvsScript(szTmp,szLabelCode,KviKvsScript::Parameter); } -const QString & KviCustomToolBarDescriptor::label() +const TQString & KviCustomToolBarDescriptor::label() { if(!m_pLabelScript->run(g_pActiveWindow,0,m_szParsedLabel))m_szParsedLabel = m_pLabelScript->code(); return m_szParsedLabel; } -const QString & KviCustomToolBarDescriptor::labelCode() +const TQString & KviCustomToolBarDescriptor::labelCode() { return m_pLabelScript->code(); } -bool KviCustomToolBarDescriptor::addAction(const QString &szAction) +bool KviCustomToolBarDescriptor::addAction(const TQString &szAction) { KviAction *a = KviActionManager::instance()->getAction(szAction); if(a) { - m_pActions->append(new QString(szAction)); + m_pActions->append(new TQString(szAction)); if(m_pToolBar)a->addToCustomToolBar(m_pToolBar); return true; } @@ -96,9 +96,9 @@ bool KviCustomToolBarDescriptor::removeAction(unsigned int iAction) return true; } -bool KviCustomToolBarDescriptor::removeAction(const QString &szAction) +bool KviCustomToolBarDescriptor::removeAction(const TQString &szAction) { - for(QString *s = m_pActions->first();s;s = m_pActions->next()) + for(TQString *s = m_pActions->first();s;s = m_pActions->next()) { if(*s == szAction) { @@ -127,18 +127,18 @@ void KviCustomToolBarDescriptor::fillToolBar() { if(m_pActions->count() == 0) { - // force layout of the toolbar - QApplication::postEvent(m_pToolBar,new QEvent(QEvent::LayoutHint)); + // force tqlayout of the toolbar + TQApplication::postEvent(m_pToolBar,new TQEvent(TQEvent::LayoutHint)); } else { - KviPointerList<QString> dying; + KviPointerList<TQString> dying; dying.setAutoDelete(false); - for(QString *p = m_pActions->first();p;p = m_pActions->next()) + for(TQString *p = m_pActions->first();p;p = m_pActions->next()) { KviAction *a = KviActionManager::instance()->getAction(*p); if(a)a->addToCustomToolBar(m_pToolBar); else dying.append(p); } - for(QString *d = dying.first();d;d = dying.next()) + for(TQString *d = dying.first();d;d = dying.next()) m_pActions->removeRef(d); } } @@ -147,7 +147,7 @@ KviCustomToolBar * KviCustomToolBarDescriptor::createToolBar() { if(!m_pToolBar) { - m_pToolBar = new KviCustomToolBar(this,label(),QT_DOCK_TOP,false,id().utf8().data()); + m_pToolBar = new KviCustomToolBar(this,label(),TQT_DOCK_TOP,false,id().utf8().data()); fillToolBar(); } return m_pToolBar; @@ -163,7 +163,7 @@ void KviCustomToolBarDescriptor::unregisterToolBar(KviCustomToolBar * t) m_pToolBar = 0; } -void KviCustomToolBarDescriptor::rename(const QString &szNewLabelCode) +void KviCustomToolBarDescriptor::rename(const TQString &szNewLabelCode) { delete m_pLabelScript; createLabelScript(szNewLabelCode); @@ -190,9 +190,9 @@ bool KviCustomToolBarDescriptor::loadScripttoolbarCompat(const char * szPrefix,K m_pActions->clear(); KviStr tmp; tmp.sprintf("%s_Name",szPrefix); - m_szId = cfg->readQStringEntry(tmp.ptr(),""); + m_szId = cfg->readTQStringEntry(tmp.ptr(),""); tmp.sprintf("%s_Label",szPrefix); - QString szLabelCode = cfg->readQStringEntry(tmp.ptr(),""); + TQString szLabelCode = cfg->readTQStringEntry(tmp.ptr(),""); if(szLabelCode.isEmpty())szLabelCode = "$tr(Unnamed)"; delete m_pLabelScript; createLabelScript(szLabelCode); @@ -210,13 +210,13 @@ bool KviCustomToolBarDescriptor::loadScripttoolbarCompat(const char * szPrefix,K if(kvi_strEqualCI(tmp2.ptr(),"button")) { tmp2.sprintf("%s_Name",tmp.ptr()); - QString szName = cfg->readQStringEntry(tmp2.ptr(),""); + TQString szName = cfg->readTQStringEntry(tmp2.ptr(),""); tmp2.sprintf("%s_Code",tmp.ptr()); - QString szCode = cfg->readQStringEntry(tmp2.ptr(),""); + TQString szCode = cfg->readTQStringEntry(tmp2.ptr(),""); tmp2.sprintf("%s_Icon",tmp.ptr()); - QString szIcon = cfg->readQStringEntry(tmp2.ptr(),""); + TQString szIcon = cfg->readTQStringEntry(tmp2.ptr(),""); tmp2.sprintf("%s_Text",tmp.ptr()); - QString szText = cfg->readQStringEntry(tmp2.ptr(),""); + TQString szText = cfg->readTQStringEntry(tmp2.ptr(),""); //tmp2.sprintf("%s_Enabled",tmp.ptr()); //bool bEnabled = cfg->readBoolEntry(tmp2.ptr(),true); @@ -230,9 +230,9 @@ bool KviCustomToolBarDescriptor::loadScripttoolbarCompat(const char * szPrefix,K __tr2qs("Backward compatibility action for toolbar.define"), "generic",szIcon,szIcon,0); KviActionManager::instance()->registerAction(a); - m_pActions->append(new QString(szName)); + m_pActions->append(new TQString(szName)); } else { - m_pActions->append(new QString("separator")); + m_pActions->append(new TQString("separator")); } } return true; @@ -243,17 +243,17 @@ bool KviCustomToolBarDescriptor::load(KviConfig * cfg) { m_pActions->clear(); m_szId = cfg->group(); - QString szLabelCode = cfg->readQStringEntry("Label"); + TQString szLabelCode = cfg->readTQStringEntry("Label"); if(szLabelCode.isEmpty())szLabelCode = "$tr(Unnamed)"; delete m_pLabelScript; createLabelScript(szLabelCode); - m_szIconId = cfg->readQStringEntry("IconId",""); + m_szIconId = cfg->readTQStringEntry("IconId",""); unsigned int n = cfg->readUIntEntry("Count",0); - QString tmp; + TQString tmp; for(unsigned int i=0;i<n;i++) { tmp.setNum(i); - QString * p = new QString(cfg->readQStringEntry(tmp)); + TQString * p = new TQString(cfg->readTQStringEntry(tmp)); if(p->isEmpty())delete p; else m_pActions->append(p); } @@ -267,8 +267,8 @@ void KviCustomToolBarDescriptor::save(KviConfig * cfg) cfg->writeEntry("Count",m_pActions->count()); if(!m_szIconId.isEmpty())cfg->writeEntry("IconId",m_szIconId); int i = 0; - QString tmp; - for(QString * p = m_pActions->first();p;p = m_pActions->next()) + TQString tmp; + for(TQString * p = m_pActions->first();p;p = m_pActions->next()) { tmp.setNum(i); cfg->writeEntry(tmp,*p); diff --git a/src/kvirc/kernel/kvi_customtoolbardescriptor.h b/src/kvirc/kernel/kvi_customtoolbardescriptor.h index f900d63..a369f15 100644 --- a/src/kvirc/kernel/kvi_customtoolbardescriptor.h +++ b/src/kvirc/kernel/kvi_customtoolbardescriptor.h @@ -41,36 +41,36 @@ class KVIRC_API KviCustomToolBarDescriptor friend class KviCustomToolBar; friend class KviCustomToolBarManager; protected: - KviCustomToolBarDescriptor(const QString &szId,const QString &szLabelCode); + KviCustomToolBarDescriptor(const TQString &szId,const TQString &szLabelCode); public: ~KviCustomToolBarDescriptor(); protected: - QString m_szId; - QString m_szIconId; - QString m_szParsedLabel; - KviPointerList<QString> * m_pActions; + TQString m_szId; + TQString m_szIconId; + TQString m_szParsedLabel; + KviPointerList<TQString> * m_pActions; KviCustomToolBar * m_pToolBar; int m_iInternalId; bool m_bVisibleAtStartup; KviKvsScript * m_pLabelScript; public: - const QString & iconId(){ return m_szIconId; }; - const QString & label(); - const QString & labelCode(); - const QString & id(){ return m_szId; }; + const TQString & iconId(){ return m_szIconId; }; + const TQString & label(); + const TQString & labelCode(); + const TQString & id(){ return m_szId; }; int internalId(){ return m_iInternalId; }; // useful only for KviFrame KviCustomToolBar * toolBar(){ return m_pToolBar; }; KviCustomToolBar * createToolBar(); - void setIconId(const QString &szIconId){ m_szIconId = szIconId; }; - bool addAction(const QString &szAction); - bool removeAction(const QString &szAction); + void setIconId(const TQString &szIconId){ m_szIconId = szIconId; }; + bool addAction(const TQString &szAction); + bool removeAction(const TQString &szAction); bool removeAction(unsigned int iAction); void clear(); - void rename(const QString &szNewName); - KviPointerList<QString> * actions(){ return m_pActions; }; + void rename(const TQString &szNewName); + KviPointerList<TQString> * actions(){ return m_pActions; }; void updateToolBar(); protected: - void createLabelScript(const QString &szNewLabelCode); + void createLabelScript(const TQString &szNewLabelCode); void fillToolBar(); bool load(KviConfig * cfg); #ifdef SCRIPTTOOLBARDESCRIPTOR_COMPAT diff --git a/src/kvirc/kernel/kvi_customtoolbarmanager.cpp b/src/kvirc/kernel/kvi_customtoolbarmanager.cpp index 62ea6ca..eac0cdf 100644 --- a/src/kvirc/kernel/kvi_customtoolbarmanager.cpp +++ b/src/kvirc/kernel/kvi_customtoolbarmanager.cpp @@ -33,7 +33,7 @@ KviCustomToolBarManager * KviCustomToolBarManager::m_pInstance = 0; KviCustomToolBarManager::KviCustomToolBarManager() { - m_pDescriptors = new KviPointerHashTable<QString,KviCustomToolBarDescriptor>(17,false); + m_pDescriptors = new KviPointerHashTable<TQString,KviCustomToolBarDescriptor>(17,false); m_pDescriptors->setAutoDelete(true); } @@ -44,7 +44,7 @@ KviCustomToolBarManager::~KviCustomToolBarManager() KviCustomToolBar * KviCustomToolBarManager::firstExistingToolBar() { - KviPointerHashTableIterator<QString,KviCustomToolBarDescriptor> it(*m_pDescriptors); + KviPointerHashTableIterator<TQString,KviCustomToolBarDescriptor> it(*m_pDescriptors); while(KviCustomToolBarDescriptor * d = it.current()) { if(d->toolBar())return d->toolBar(); @@ -67,10 +67,10 @@ void KviCustomToolBarManager::done() } } -QString KviCustomToolBarManager::idForNewToolBar(const QString &szTemplate) +TQString KviCustomToolBarManager::idForNewToolBar(const TQString &szTemplate) { - QString s; - QString szTT = szTemplate.lower(); + TQString s; + TQString szTT = szTemplate.lower(); szTT.remove(" "); szTT.remove("$tr"); szTT.remove("("); @@ -82,11 +82,11 @@ QString KviCustomToolBarManager::idForNewToolBar(const QString &szTemplate) s = szTT; if(idx > 0) { - QString tmp; + TQString tmp; tmp.setNum(idx); s += tmp; } - if(!m_pDescriptors->find(s))return s; + if(!m_pDescriptors->tqfind(s))return s; idx++; } return s; @@ -94,7 +94,7 @@ QString KviCustomToolBarManager::idForNewToolBar(const QString &szTemplate) KviCustomToolBarDescriptor * KviCustomToolBarManager::findDescriptorByInternalId(int id) { - KviPointerHashTableIterator<QString,KviCustomToolBarDescriptor> it(*m_pDescriptors); + KviPointerHashTableIterator<TQString,KviCustomToolBarDescriptor> it(*m_pDescriptors); while(KviCustomToolBarDescriptor * d = it.current()) { if(d->internalId() == id)return d; @@ -103,22 +103,22 @@ KviCustomToolBarDescriptor * KviCustomToolBarManager::findDescriptorByInternalId return 0; } -bool KviCustomToolBarManager::renameDescriptor(const QString &szId,const QString &szNewId,const QString &szNewLabelCode) +bool KviCustomToolBarManager::renameDescriptor(const TQString &szId,const TQString &szNewId,const TQString &szNewLabelCode) { - KviCustomToolBarDescriptor * d = m_pDescriptors->find(szId); + KviCustomToolBarDescriptor * d = m_pDescriptors->tqfind(szId); if(!d)return false; d->rename(szNewLabelCode); if(szId == szNewId)return true; // already done m_pDescriptors->setAutoDelete(false); m_pDescriptors->remove(szId); - m_pDescriptors->replace(szNewId,d); + m_pDescriptors->tqreplace(szNewId,d); m_pDescriptors->setAutoDelete(true); return true; } -bool KviCustomToolBarManager::destroyDescriptor(const QString &szId) +bool KviCustomToolBarManager::destroyDescriptor(const TQString &szId) { - KviCustomToolBarDescriptor * d = m_pDescriptors->find(szId); + KviCustomToolBarDescriptor * d = m_pDescriptors->tqfind(szId); if(!d)return false; m_pDescriptors->remove(szId); // will delete it too! return true; @@ -129,18 +129,18 @@ void KviCustomToolBarManager::clear() m_pDescriptors->clear(); // bye! } -KviCustomToolBarDescriptor * KviCustomToolBarManager::create(const QString &szId,const QString &szLabelCode) +KviCustomToolBarDescriptor * KviCustomToolBarManager::create(const TQString &szId,const TQString &szLabelCode) { - KviCustomToolBarDescriptor * d = m_pDescriptors->find(szId); + KviCustomToolBarDescriptor * d = m_pDescriptors->tqfind(szId); if(d)return d; d = new KviCustomToolBarDescriptor(szId,szLabelCode); - m_pDescriptors->replace(szId,d); + m_pDescriptors->tqreplace(szId,d); return d; } void KviCustomToolBarManager::storeVisibilityState() { - KviPointerHashTableIterator<QString,KviCustomToolBarDescriptor> it(*m_pDescriptors); + KviPointerHashTableIterator<TQString,KviCustomToolBarDescriptor> it(*m_pDescriptors); while(KviCustomToolBarDescriptor * d = it.current()) { d->m_bVisibleAtStartup = d->toolBar() != 0; @@ -152,7 +152,7 @@ void KviCustomToolBarManager::storeVisibilityState() int KviCustomToolBarManager::visibleToolBarCount() { int cnt = 0; - KviPointerHashTableIterator<QString,KviCustomToolBarDescriptor> it(*m_pDescriptors); + KviPointerHashTableIterator<TQString,KviCustomToolBarDescriptor> it(*m_pDescriptors); while(KviCustomToolBarDescriptor * d = it.current()) { if(d->toolBar() != 0)cnt++; @@ -163,7 +163,7 @@ int KviCustomToolBarManager::visibleToolBarCount() void KviCustomToolBarManager::createToolBarsVisibleAtStartup() { - KviPointerHashTableIterator<QString,KviCustomToolBarDescriptor> it(*m_pDescriptors); + KviPointerHashTableIterator<TQString,KviCustomToolBarDescriptor> it(*m_pDescriptors); while(KviCustomToolBarDescriptor * d = it.current()) { if(d->m_bVisibleAtStartup && (!d->toolBar())) @@ -174,7 +174,7 @@ void KviCustomToolBarManager::createToolBarsVisibleAtStartup() void KviCustomToolBarManager::updateVisibleToolBars() { - KviPointerHashTableIterator<QString,KviCustomToolBarDescriptor> it(*m_pDescriptors); + KviPointerHashTableIterator<TQString,KviCustomToolBarDescriptor> it(*m_pDescriptors); while(KviCustomToolBarDescriptor * d = it.current()) { if(d->toolBar())d->updateToolBar(); @@ -182,7 +182,7 @@ void KviCustomToolBarManager::updateVisibleToolBars() } } -void KviCustomToolBarManager::load(const QString &szFileName) +void KviCustomToolBarManager::load(const TQString &szFileName) { KviConfig cfg(szFileName,KviConfig::Read); @@ -190,18 +190,18 @@ void KviCustomToolBarManager::load(const QString &szFileName) while(it.current()) { cfg.setGroup(it.currentKey()); - KviCustomToolBarDescriptor * d = new KviCustomToolBarDescriptor(it.currentKey(),QString::null); + KviCustomToolBarDescriptor * d = new KviCustomToolBarDescriptor(it.currentKey(),TQString()); d->m_bVisibleAtStartup = (cfg.readIntEntry("Visible",0) > 0); if(!d->load(&cfg))delete d; - else m_pDescriptors->replace(it.currentKey(),d); + else m_pDescriptors->tqreplace(it.currentKey(),d); ++it; } } -void KviCustomToolBarManager::save(const QString &szFileName) +void KviCustomToolBarManager::save(const TQString &szFileName) { KviConfig cfg(szFileName,KviConfig::Write); - KviPointerHashTableIterator<QString,KviCustomToolBarDescriptor> it(*m_pDescriptors); + KviPointerHashTableIterator<TQString,KviCustomToolBarDescriptor> it(*m_pDescriptors); while(KviCustomToolBarDescriptor * d = it.current()) { cfg.setGroup(d->id()); @@ -215,8 +215,8 @@ void KviCustomToolBarManager::save(const QString &szFileName) // THIS IS A COMPATIBILITY ENTRY ADDED AT 3.0.2 TIME THAT SHOULD BE DROPPED IN A COUPLE OF VERSION BUMPS! #ifdef SCRIPTTOOLBAR_COMPAT -#include <qdir.h> -void KviCustomToolBarManager::loadScripttoolbarsCompat(const QString &szFileName) +#include <tqdir.h> +void KviCustomToolBarManager::loadScripttoolbarsCompat(const TQString &szFileName) { KviConfig cfg(szFileName,KviConfig::Read); @@ -226,14 +226,14 @@ void KviCustomToolBarManager::loadScripttoolbarsCompat(const QString &szFileName for(unsigned int i=0;i<cnt;i++) { tmp.sprintf("%d",i); - KviCustomToolBarDescriptor * d = new KviCustomToolBarDescriptor(QString::null,QString::null); + KviCustomToolBarDescriptor * d = new KviCustomToolBarDescriptor(TQString(),TQString()); if(!d->loadScripttoolbarCompat(tmp.ptr(),&cfg))delete d; - else m_pDescriptors->replace(d->id(),d); + else m_pDescriptors->tqreplace(d->id(),d); } // get rid of the file now... - QString szNewFileName = szFileName + ".old"; - QDir d; + TQString szNewFileName = szFileName + ".old"; + TQDir d; d.rename(szFileName,szNewFileName); } #endif diff --git a/src/kvirc/kernel/kvi_customtoolbarmanager.h b/src/kvirc/kernel/kvi_customtoolbarmanager.h index eec1921..cafe743 100644 --- a/src/kvirc/kernel/kvi_customtoolbarmanager.h +++ b/src/kvirc/kernel/kvi_customtoolbarmanager.h @@ -45,7 +45,7 @@ protected: ~KviCustomToolBarManager(); protected: static KviCustomToolBarManager * m_pInstance; - KviPointerHashTable<QString,KviCustomToolBarDescriptor> * m_pDescriptors; + KviPointerHashTable<TQString,KviCustomToolBarDescriptor> * m_pDescriptors; public: static KviCustomToolBarManager * instance(){ return m_pInstance; }; static void init(); @@ -53,23 +53,23 @@ public: void clear(); int descriptorCount(){ return m_pDescriptors->count(); }; int visibleToolBarCount(); - QString idForNewToolBar(const QString &szTemplate); - KviPointerHashTable<QString,KviCustomToolBarDescriptor> * descriptors(){ return m_pDescriptors; }; + TQString idForNewToolBar(const TQString &szTemplate); + KviPointerHashTable<TQString,KviCustomToolBarDescriptor> * descriptors(){ return m_pDescriptors; }; KviCustomToolBar * firstExistingToolBar(); - KviCustomToolBarDescriptor * create(const QString &szId,const QString &szLabelCode); - KviCustomToolBarDescriptor * find(const QString &szId){ return m_pDescriptors->find(szId); }; + KviCustomToolBarDescriptor * create(const TQString &szId,const TQString &szLabelCode); + KviCustomToolBarDescriptor * tqfind(const TQString &szId){ return m_pDescriptors->tqfind(szId); }; KviCustomToolBarDescriptor * findDescriptorByInternalId(int id); void updateVisibleToolBars(); void createToolBarsVisibleAtStartup(); void storeVisibilityState(); - bool renameDescriptor(const QString &szId,const QString &szNewId,const QString &szNewLabelCode); - bool destroyDescriptor(const QString &szId); - void load(const QString &szFileName); + bool renameDescriptor(const TQString &szId,const TQString &szNewId,const TQString &szNewLabelCode); + bool destroyDescriptor(const TQString &szId); + void load(const TQString &szFileName); // THIS IS A COMPATIBILITY ENTRY ADDED AT 3.0.2 TIME THAT SHOULD BE DROPPED IN A COUPLE OF VERSION BUMPS! #ifdef SCRIPTTOOLBAR_COMPAT - void loadScripttoolbarsCompat(const QString &szFileName); + void loadScripttoolbarsCompat(const TQString &szFileName); #endif - void save(const QString &szFileName); + void save(const TQString &szFileName); }; diff --git a/src/kvirc/kernel/kvi_filetransfer.cpp b/src/kvirc/kernel/kvi_filetransfer.cpp index 507c96f..5c72e7c 100644 --- a/src/kvirc/kernel/kvi_filetransfer.cpp +++ b/src/kvirc/kernel/kvi_filetransfer.cpp @@ -35,7 +35,7 @@ static KviFileTransferManager * g_pFileTransferManager = 0; KviFileTransferManager::KviFileTransferManager() -: QObject() +: TQObject() { m_pTransferList = 0; m_pTransferWindow = 0; @@ -88,10 +88,10 @@ void KviFileTransferManager::invokeTransferWindow(KviWindow * pWnd,bool bCreateM { if(!m_pTransferWindow) { - KviPointerHashTable<QString,QVariant> d(7,false); + KviPointerHashTable<TQString,TQVariant> d(7,false); d.setAutoDelete(true); - d.replace("bCreateMinimized",new QVariant(bCreateMinimized,0)); - d.replace("bNoRaise",new QVariant(bNoRaise,0)); + d.tqreplace("bCreateMinimized",new TQVariant(bCreateMinimized,0)); + d.tqreplace("bNoRaise",new TQVariant(bNoRaise,0)); KviModuleExtensionManager::instance()->allocateExtension( "tool", @@ -135,7 +135,7 @@ void KviFileTransferManager::unregisterTransfer(KviFileTransfer * t) KviFileTransfer::KviFileTransfer() -: QObject() +: TQObject() { m_pDisplayItem = 0; m_iId = g_pApp->getGloballyUniqueId(); @@ -159,14 +159,14 @@ void KviFileTransfer::invokeTransferWindow(KviWindow * pWnd,bool bCreateMinimize manager()->invokeTransferWindow(pWnd,bCreateMinimized,bNoRaise); } -QString KviFileTransfer::localFileName() +TQString KviFileTransfer::localFileName() { - return QString::null; + return TQString(); } -QString KviFileTransfer::retryCommand() +TQString KviFileTransfer::retryCommand() { - return QString::null; + return TQString(); } bool KviFileTransfer::terminated() @@ -174,9 +174,9 @@ bool KviFileTransfer::terminated() return !active(); } -QString KviFileTransfer::tipText() +TQString KviFileTransfer::tipText() { - return QString::null; + return TQString(); } int KviFileTransfer::displayHeight(int iLineSpacing) @@ -186,5 +186,5 @@ int KviFileTransfer::displayHeight(int iLineSpacing) void KviFileTransfer::displayUpdate() { - if(m_pDisplayItem)m_pDisplayItem->repaint(); + if(m_pDisplayItem)m_pDisplayItem->tqrepaint(); } diff --git a/src/kvirc/kernel/kvi_filetransfer.h b/src/kvirc/kernel/kvi_filetransfer.h index e6071ff..819de8e 100644 --- a/src/kvirc/kernel/kvi_filetransfer.h +++ b/src/kvirc/kernel/kvi_filetransfer.h @@ -27,7 +27,7 @@ #include "kvi_settings.h" -#include <qobject.h> +#include <tqobject.h> #include "kvi_pointerlist.h" #include "kvi_tal_listview.h" @@ -35,18 +35,19 @@ class KviFileTransfer; class KviWindow; class KviTalPopupMenu; -class QPainter; +class TQPainter; // This is for the external extension #define KVI_FILE_TRANSFER_WINDOW_EXTENSION_NAME "File transfer extension" -class KVIRC_API KviFileTransferManager : public QObject +class KVIRC_API KviFileTransferManager : public TQObject { friend class KviApp; friend class KviFileTransfer; friend class KviFileTransferWindow; Q_OBJECT + TQ_OBJECT public: KviFileTransferManager(); ~KviFileTransferManager(); @@ -76,9 +77,10 @@ signals: #define COLUMN_PROGRESS 2 -class KVIRC_API KviFileTransfer : public QObject +class KVIRC_API KviFileTransfer : public TQObject { Q_OBJECT + TQ_OBJECT public: KviFileTransfer(); ~KviFileTransfer(); @@ -104,10 +106,10 @@ public: // this must be implemented by the transfer virtual bool active() = 0; - virtual void displayPaint(QPainter * p,int column,int width,int height) = 0; - virtual QString tipText(); - virtual QString localFileName(); - virtual QString retryCommand(); + virtual void displayPaint(TQPainter * p,int column,int width,int height) = 0; + virtual TQString tipText(); + virtual TQString localFileName(); + virtual TQString retryCommand(); virtual int displayHeight(int iLineSpacing); virtual void fillContextPopup(KviTalPopupMenu * m,int column) = 0; virtual void die() = 0; diff --git a/src/kvirc/kernel/kvi_iconmanager.cpp b/src/kvirc/kernel/kvi_iconmanager.cpp index 1876b11..f50e6f6 100644 --- a/src/kvirc/kernel/kvi_iconmanager.cpp +++ b/src/kvirc/kernel/kvi_iconmanager.cpp @@ -36,22 +36,22 @@ #include "kvi_fileutils.h" #include "kvi_options.h" -#include <qlayout.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqlabel.h> #ifndef COMPILE_USE_QT4 - // In Qt.4 we need to use QMimeData ? - #include <qdragobject.h> + // In TQt.4 we need to use TQMimeData ? + #include <tqdragobject.h> #endif -#include <qcursor.h> +#include <tqcursor.h> #ifdef COMPILE_USE_QT4 - #include <qevent.h> + #include <tqevent.h> #endif // kvi_app.cpp -extern QPixmap * g_pUserChanStatePixmap; -extern QPixmap * g_pActivityMeterPixmap; +extern TQPixmap * g_pUserChanStatePixmap; +extern TQPixmap * g_pActivityMeterPixmap; KviIconManager * g_pIconManager = 0; @@ -353,16 +353,16 @@ static const char * g_szIconNames[KVI_NUM_SMALL_ICONS]= KviIconWidget::KviIconWidget() #ifdef COMPILE_USE_QT4 -: QWidget(0,"global_icon_widget" /*,WType_TopLevel | WStyle_Customize | WStyle_Title | WStyle_StaysOnTop | WStyle_DialogBorder | WStyle_SysMenu | WStyle_Minimize*/) +: TQWidget(0,"global_icon_widget" /*,WType_TopLevel | WStyle_Customize | WStyle_Title | WStyle_StaysOnTop | WStyle_DialogBorder | WStyle_SysMenu | WStyle_Minimize*/) #else -: QWidget(0,"global_icon_widget",WType_TopLevel | WStyle_Customize | WStyle_Title | WStyle_StaysOnTop | WStyle_DialogBorder | WStyle_SysMenu | WStyle_Minimize) +: TQWidget(0,"global_icon_widget",WType_TopLevel | WStyle_Customize | WStyle_Title | WStyle_StaysOnTop | WStyle_DialogBorder | WStyle_SysMenu | WStyle_Minimize) #endif { init(); } -KviIconWidget::KviIconWidget(QWidget * par) -: QWidget(par,"global_icon_widget") +KviIconWidget::KviIconWidget(TQWidget * par) +: TQWidget(par,"global_icon_widget") { init(); } @@ -374,24 +374,24 @@ void KviIconWidget::init() int rows = KVI_NUM_SMALL_ICONS / 10; if((rows * 10) < KVI_NUM_SMALL_ICONS)rows++; - QGridLayout * g = new QGridLayout(this,rows + 1,11,0,2); + TQGridLayout * g = new TQGridLayout(this,rows + 1,11,0,2); int i; for(i = 0;i < 10;i++) { KviStr tmp(KviStr::Format,"%d",i); - QLabel * l = new QLabel(tmp.ptr(),this); + TQLabel * l = new TQLabel(tmp.ptr(),this); g->addWidget(l,0,i + 1); } for(i = 0;i < rows;i++) { KviStr tmp(KviStr::Format,"%d",i * 10); - QLabel * l = new QLabel(tmp.ptr(),this); + TQLabel * l = new TQLabel(tmp.ptr(),this); g->addWidget(l,i + 1,0); } for(i = 0;i < KVI_NUM_SMALL_ICONS;i++) { KviStr tmp(KviStr::Format,"%d",i); - QLabel * l = new QLabel(this,tmp.ptr()); + TQLabel * l = new TQLabel(this,tmp.ptr()); l->setPixmap(*(g_pIconManager->getSmallIcon(i))); g->addWidget(l,(i / 10) + 1,(i % 10) + 1); l->installEventFilter(this); @@ -403,51 +403,51 @@ KviIconWidget::~KviIconWidget() { } -void KviIconWidget::closeEvent(QCloseEvent * e) +void KviIconWidget::closeEvent(TQCloseEvent * e) { e->ignore(); emit closed(); } -bool KviIconWidget::eventFilter(QObject * o,QEvent *e) +bool KviIconWidget::eventFilter(TQObject * o,TQEvent *e) { - if(e->type() == QEvent::MouseButtonPress) + if(e->type() == TQEvent::MouseButtonPress) { - if(o->inherits("QLabel")) + if(o->inherits(TQLABEL_OBJECT_NAME_STRING)) { - KviStr szName = ((QLabel *)o)->name(); + KviStr szName = ((TQLabel *)o)->name(); bool bOk; int iVal = szName.toInt(&bOk); if(bOk)emit selected(iVal); - if(parentWidget() && isVisible() && parentWidget()->inherits("KviTalPopupMenu")) + if(tqparentWidget() && isVisible() && tqparentWidget()->inherits("KviTalPopupMenu")) { - parentWidget()->close(); + tqparentWidget()->close(); return true; } else { - if(const QPixmap * pix = ((QLabel *)o)->pixmap()) + if(const TQPixmap * pix = ((TQLabel *)o)->pixmap()) { -// FIXME: In Qt 4.x this stuff needs to be ported to a different api.. which one ? +// FIXME: In TQt 4.x this stuff needs to be ported to a different api.. which one ? #ifndef COMPILE_USE_QT4 - QDragObject * drobj = new QTextDrag(o->name(),this); - drobj->setPixmap(*pix,((QLabel *)o)->mapFromGlobal(QCursor::pos())); + TQDragObject * drobj = new TQTextDrag(o->name(),this); + drobj->setPixmap(*pix,((TQLabel *)o)->mapFromGlobal(TQCursor::pos())); drobj->dragCopy(); #endif return true; } } } - } else if(e->type() == QEvent::DragEnter) + } else if(e->type() == TQEvent::DragEnter) { - ((QDragEnterEvent *)e)->accept(true); + ((TQDragEnterEvent *)e)->accept(true); return true; } - return QWidget::eventFilter(o,e); + return TQWidget::eventFilter(o,e); } -KviCachedPixmap::KviCachedPixmap(QPixmap * ptr,const QString &szPath) +KviCachedPixmap::KviCachedPixmap(TQPixmap * ptr,const TQString &szPath) { m_szPath = szPath; m_tLastAccess = kvi_unixTime(); @@ -475,7 +475,7 @@ KviIconManager::KviIconManager() //loadSmallIcons(); - m_pCachedImages = new KviPointerHashTable<QString,KviCachedPixmap>(21,true); + m_pCachedImages = new KviPointerHashTable<TQString,KviCachedPixmap>(21,true); m_pCachedImages->setAutoDelete(true); m_uCacheTotalSize = 0; @@ -487,10 +487,10 @@ KviIconManager::KviIconManager() // Load the userchanstate image g_pApp->findImage(buffer,KVI_USERCHANSTATE_IMAGE_NAME); - g_pUserChanStatePixmap = new QPixmap(buffer.ptr()); + g_pUserChanStatePixmap = new TQPixmap(TQString(buffer.ptr())); g_pApp->findImage(buffer,KVI_ACTIVITYMETER_IMAGE_NAME); - g_pActivityMeterPixmap = new QPixmap(buffer.ptr()); + g_pActivityMeterPixmap = new TQPixmap(TQString(buffer.ptr())); m_pIconNames = 0; @@ -499,8 +499,8 @@ KviIconManager::KviIconManager() /* for(i=0;i<KVI_NUM_SMALL_ICONS;i++) { - QPixmap * tmp = getSmallIcon(i); - QString nnn = "/home/pragma/kvismallicons/kcs_"; + TQPixmap * tmp = getSmallIcon(i); + TQString nnn = "/home/pragma/kvismallicons/kcs_"; nnn += g_szIconNames[i]; nnn += ".png"; if(tmp->isNull()) @@ -536,21 +536,21 @@ const char * KviIconManager::getSmallIconName(int idx) return g_szIconNames[idx]; } -int KviIconManager::getSmallIconIdFromName(const QString &szName) +int KviIconManager::getSmallIconIdFromName(const TQString &szName) { if(!m_pIconNames) { - m_pIconNames = new KviPointerHashTable<QString,int>(257,false); + m_pIconNames = new KviPointerHashTable<TQString,int>(257,false); m_pIconNames->setAutoDelete(true); for(int i=0;i<KVI_NUM_SMALL_ICONS;i++) { int * pInt = new int; *pInt = i; - m_pIconNames->replace(QString(g_szIconNames[i]),pInt); + m_pIconNames->tqreplace(TQString(g_szIconNames[i]),pInt); } } - int * pInt = m_pIconNames->find(szName); + int * pInt = m_pIconNames->tqfind(szName); if(!pInt)return 0; return *pInt; } @@ -561,7 +561,7 @@ void KviIconManager::showIconWidget() if(!m_pIconWidget) { m_pIconWidget = new KviIconWidget(); - connect(m_pIconWidget,SIGNAL(closed()),this,SLOT(iconWidgetClosed())); + connect(m_pIconWidget,TQT_SIGNAL(closed()),this,TQT_SLOT(iconWidgetClosed())); } m_pIconWidget->show(); m_pIconWidget->raise(); @@ -606,11 +606,11 @@ void KviIconManager::iconWidgetClosed() and in the current directory.[br] */ -KviCachedPixmap * KviIconManager::getPixmapWithCache(const QString &szName) +KviCachedPixmap * KviIconManager::getPixmapWithCache(const TQString &szName) { if(szName.isEmpty())return 0; - KviCachedPixmap * p = m_pCachedImages->find(szName); + KviCachedPixmap * p = m_pCachedImages->tqfind(szName); if(p) { @@ -618,13 +618,13 @@ KviCachedPixmap * KviIconManager::getPixmapWithCache(const QString &szName) return p; } - QPixmap * pix = 0; + TQPixmap * pix = 0; - QString szRetPath; + TQString szRetPath; if(g_pApp->findImage(szRetPath,szName)) { - pix = new QPixmap(szRetPath); + pix = new TQPixmap(szRetPath); if(pix->isNull()) { delete pix; // it is not an valid image!!! (really bad situation...) @@ -635,17 +635,17 @@ KviCachedPixmap * KviIconManager::getPixmapWithCache(const QString &szName) return 0; } - p = new KviCachedPixmap(pix,QString(szRetPath)); + p = new KviCachedPixmap(pix,TQString(szRetPath)); addToCache(szName,p); return p; } -KviCachedPixmap * KviIconManager::getPixmapWithCacheScaleOnLoad(const QString &szName,int iMaxWidth,int iMaxHeight) +KviCachedPixmap * KviIconManager::getPixmapWithCacheScaleOnLoad(const TQString &szName,int iMaxWidth,int iMaxHeight) { if(szName.isEmpty())return 0; - KviCachedPixmap * p = m_pCachedImages->find(szName); + KviCachedPixmap * p = m_pCachedImages->tqfind(szName); if(p) { @@ -653,13 +653,13 @@ KviCachedPixmap * KviIconManager::getPixmapWithCacheScaleOnLoad(const QString &s return p; } - QPixmap * pix = 0; + TQPixmap * pix = 0; - QString szRetPath; + TQString szRetPath; if(g_pApp->findImage(szRetPath,szName)) { - pix = new QPixmap(szRetPath); + pix = new TQPixmap(szRetPath); if(pix->isNull()) { delete pix; // it is not an valid image!!! (really bad situation...) @@ -678,21 +678,21 @@ KviCachedPixmap * KviIconManager::getPixmapWithCacheScaleOnLoad(const QString &s scaleW = (scaleH * pix->width()) / pix->height(); } - QImage img = pix->convertToImage(); + TQImage img = pix->convertToImage(); pix->convertFromImage(img.smoothScale(scaleW,scaleH)); } } else { return 0; } - p = new KviCachedPixmap(pix,QString(szRetPath)); + p = new KviCachedPixmap(pix,TQString(szRetPath)); addToCache(szName,p); return p; } -void KviIconManager::addToCache(const QString &szName,KviCachedPixmap * p) +void KviIconManager::addToCache(const TQString &szName,KviCachedPixmap * p) { if((m_uCacheTotalSize + p->size()) >= m_uCacheMaxSize)cacheCleanup(); @@ -700,13 +700,13 @@ void KviIconManager::addToCache(const QString &szName,KviCachedPixmap * p) m_uCacheTotalSize += p->size(); } -QPixmap * KviIconManager::getImage(const char * id,bool bCanBeNumber,QString* pRetPath) +TQPixmap * KviIconManager::getImage(const char * id,bool bCanBeNumber,TQString* pRetPath) { if(!id)return 0; if(bCanBeNumber) { bool bOk; - QString tmp = id; + TQString tmp = id; int idx = tmp.toInt(&bOk); if(bOk) { @@ -723,9 +723,9 @@ QPixmap * KviIconManager::getImage(const char * id,bool bCanBeNumber,QString* pR -QPixmap * KviIconManager::getBigIcon(const QString &szName) +TQPixmap * KviIconManager::getBigIcon(const TQString &szName) { - QPixmap * p = getPixmap(szName); + TQPixmap * p = getPixmap(szName); if(p)return p; bool bOk; @@ -734,16 +734,16 @@ QPixmap * KviIconManager::getBigIcon(const QString &szName) { // was a number : this is not a filename // it was a small icon: scale it and cache it - QString tmpName = szName; + TQString tmpName = szName; tmpName += ".scaled16to32"; p = getPixmap(tmpName); if(p)return p; p = getSmallIcon(idx % KVI_NUM_SMALL_ICONS); if(p) { - QImage tmpi = p->convertToImage(); - QImage tmp2 = tmpi.smoothScale(32,32); - KviCachedPixmap * cp = new KviCachedPixmap(new QPixmap(tmp2),QString::null); + TQImage tmpi = p->convertToImage(); + TQImage tmp2 = tmpi.smoothScale(32,32); + KviCachedPixmap * cp = new KviCachedPixmap(new TQPixmap(tmp2),TQString()); addToCache(tmpName,cp); return cp->pixmap(); } @@ -751,7 +751,7 @@ QPixmap * KviIconManager::getBigIcon(const QString &szName) p = getPixmap("kvi_bigicon_unknown.png"); if(p)return p; - KviCachedPixmap * cp = new KviCachedPixmap(new QPixmap(32,32),QString::null); + KviCachedPixmap * cp = new KviCachedPixmap(new TQPixmap(32,32),TQString()); addToCache(szName,cp); return cp->pixmap(); } @@ -770,28 +770,28 @@ void KviIconManager::urlToCachedFileName(KviStr &szFName) szFName.replaceAll("___","."); } -void KviIconManager::urlToCachedFileName(QString &szFName) +void KviIconManager::urlToCachedFileName(TQString &szFName) { - szFName.replace(":","_"); - szFName.replace(";","_"); - szFName.replace("/","_"); - szFName.replace("\\","_"); - szFName.replace("\"","_"); - szFName.replace("\'","_"); - szFName.replace("(","_"); - szFName.replace(")","_"); - szFName.replace("?","_"); - szFName.replace("___","."); + szFName.tqreplace(":","_"); + szFName.tqreplace(";","_"); + szFName.tqreplace("/","_"); + szFName.tqreplace("\\","_"); + szFName.tqreplace("\"","_"); + szFName.tqreplace("\'","_"); + szFName.tqreplace("(","_"); + szFName.tqreplace(")","_"); + szFName.tqreplace("?","_"); + szFName.tqreplace("___","."); } -KviAvatar * KviIconManager::getAvatar(const QString &szLocalPath,const QString &szName) +KviAvatar * KviIconManager::getAvatar(const TQString &szLocalPath,const TQString &szName) { - QString szP,szN; + TQString szP,szN; if(szLocalPath.isEmpty()) { if(szName.isEmpty())return 0; - if(KviQString::equalCIN("http://",szName,7)) + if(KviTQString::equalCIN("http://",szName,7)) { szN = szName; szP = szName; @@ -816,7 +816,7 @@ KviAvatar * KviIconManager::getAvatar(const QString &szLocalPath,const QString & ,KVI_OPTION_UINT(KviOption_uintScaleAvatarsOnLoadHeight)) : getPixmapWithCache(szP); if(!p)return 0; - return new KviAvatar(p->path(),szN,new QPixmap(*(p->pixmap()))); + return new KviAvatar(p->path(),szN,new TQPixmap(*(p->pixmap()))); } void KviIconManager::clearCache() @@ -835,7 +835,7 @@ void KviIconManager::reloadImages() } -QPixmap * KviIconManager::loadSmallIcon(int idx) +TQPixmap * KviIconManager::loadSmallIcon(int idx) { if(idx >= KVI_NUM_SMALL_ICONS)return 0; if(idx < 0)return 0; @@ -846,14 +846,14 @@ QPixmap * KviIconManager::loadSmallIcon(int idx) // to preserve backward compatibility with old themes. // We lookup such files ONLY in the themes directories. - QString szFileName = KVI_SMALLICONS_IMAGELIB_PREFIX; + TQString szFileName = KVI_SMALLICONS_IMAGELIB_PREFIX; int fileidx = idx / 16; - if(fileidx >= 10)KviQString::appendFormatted(szFileName,"%d.png",fileidx); - else KviQString::appendFormatted(szFileName,"0%d.png",fileidx); + if(fileidx >= 10)KviTQString::appendFormatted(szFileName,"%d.png",fileidx); + else KviTQString::appendFormatted(szFileName,"0%d.png",fileidx); - QString buffer; + TQString buffer; if(g_pApp->findImageThemeOnlyCompat(buffer,szFileName)) { KviImageLibrary l1(buffer,16,16); @@ -865,18 +865,18 @@ QPixmap * KviIconManager::loadSmallIcon(int idx) int io = i + offset; if(io >= KVI_NUM_SMALL_ICONS)break; if(m_smallIcons[io])delete m_smallIcons[io]; - m_smallIcons[io] = new QPixmap(l1.getImage(i)); + m_smallIcons[io] = new TQPixmap(l1.getImage(i)); } return m_smallIcons[idx]; } // otherwise we use the NEW method: separate small icons in the "coresmall" subdirectory. - QString szPath; - KviQString::sprintf(szPath,KVI_SMALLICONS_PREFIX "%s.png",g_szIconNames[idx]); + TQString szPath; + KviTQString::sprintf(szPath,KVI_SMALLICONS_PREFIX "%s.png",g_szIconNames[idx]); g_pApp->findSmallIcon(buffer,szPath); - m_smallIcons[idx] = new QPixmap(buffer); + m_smallIcons[idx] = new TQPixmap(buffer); //if(m_smallIcon[idx]->isNull()) //{ @@ -887,9 +887,9 @@ QPixmap * KviIconManager::loadSmallIcon(int idx) void KviIconManager::cacheCleanup() { - QStringList l; + TQStringList l; - KviPointerHashTableIterator<QString,KviCachedPixmap> it(*m_pCachedImages); + KviPointerHashTableIterator<TQString,KviCachedPixmap> it(*m_pCachedImages); //#warning "IMPLEMENT CLEANUP" @@ -907,7 +907,7 @@ void KviIconManager::cacheCleanup() ++it; } - for(QStringList::Iterator it = l.begin();it != l.end();++it) + for(TQStringList::Iterator it = l.begin();it != l.end();++it) { m_pCachedImages->remove(*it); } diff --git a/src/kvirc/kernel/kvi_iconmanager.h b/src/kvirc/kernel/kvi_iconmanager.h index d8f2abb..62188f9 100644 --- a/src/kvirc/kernel/kvi_iconmanager.h +++ b/src/kvirc/kernel/kvi_iconmanager.h @@ -30,9 +30,9 @@ #include "kvi_avatar.h" #include "kvi_time.h" -#include <qpixmap.h> -#include <qobject.h> -#include <qwidget.h> +#include <tqpixmap.h> +#include <tqobject.h> +#include <tqwidget.h> #include "kvi_pointerhashtable.h" @@ -45,7 +45,7 @@ #define KVI_SMALLICON_DEFAULTICON 5 #define KVI_SMALLICON_DOCK 6 #define KVI_SMALLICON_UNDOCK 7 -#define KVI_SMALLICON_QUITAPP 8 +#define KVI_SMALLICON_TQUITAPP 8 #define KVI_SMALLICON_CONSOLE 9 #define KVI_SMALLICON_FLOPPY 10 #define KVI_SMALLICON_PARSERERROR 11 @@ -84,8 +84,8 @@ #define KVI_SMALLICON_DISCARD 44 #define KVI_SMALLICON_OWNPRIVMSG 45 #define KVI_SMALLICON_CHANPRIVMSG 46 -#define KVI_SMALLICON_QUERY 47 -#define KVI_SMALLICON_QUERYPRIVMSG 48 +#define KVI_SMALLICON_TQUERY 47 +#define KVI_SMALLICON_TQUERYPRIVMSG 48 #define KVI_SMALLICON_HELP 49 #define KVI_SMALLICON_MDIHELP 50 #define KVI_SMALLICON_CTCPREPLY 51 @@ -95,9 +95,9 @@ #define KVI_SMALLICON_CTCPREQUESTUNKNOWN 55 #define KVI_SMALLICON_ACTION 56 #define KVI_SMALLICON_AVATAR 57 -#define KVI_SMALLICON_QUIT 58 +#define KVI_SMALLICON_TQUIT 58 #define KVI_SMALLICON_SPLIT 59 -#define KVI_SMALLICON_QUITSPLIT 60 +#define KVI_SMALLICON_TQUITSPLIT 60 #define KVI_SMALLICON_NICK 61 #define KVI_SMALLICON_DEOP 62 #define KVI_SMALLICON_DEVOICE 63 @@ -139,7 +139,7 @@ #define KVI_SMALLICON_UNLOCKEDOFF 99 #define KVI_SMALLICON_OWNPRIVMSGCRYPTED 100 #define KVI_SMALLICON_CHANPRIVMSGCRYPTED 101 -#define KVI_SMALLICON_QUERYPRIVMSGCRYPTED 102 +#define KVI_SMALLICON_TQUERYPRIVMSGCRYPTED 102 #define KVI_SMALLICON_DCCCHATMSG 103 #define KVI_SMALLICON_DCCCHATMSGCRYPTED 104 #define KVI_SMALLICON_IRC 105 @@ -160,11 +160,11 @@ #define KVI_SMALLICON_SPAM 120 #define KVI_SMALLICON_FILE 121 #define KVI_SMALLICON_ICQ 122 -#define KVI_SMALLICON_ICQYELLOW 123 -#define KVI_SMALLICON_ICQRED 124 -#define KVI_SMALLICON_ICQBLUE 125 -#define KVI_SMALLICON_ICQLIGHTGREEN 126 -#define KVI_SMALLICON_ICQLIGHTYELLOW 127 +#define KVI_SMALLICON_ICTQYELLOW 123 +#define KVI_SMALLICON_ICTQRED 124 +#define KVI_SMALLICON_ICTQBLUE 125 +#define KVI_SMALLICON_ICTQLIGHTGREEN 126 +#define KVI_SMALLICON_ICTQLIGHTYELLOW 127 #define KVI_SMALLICON_MESSAGE 128 #define KVI_SMALLICON_MESSAGESENT 129 #define KVI_SMALLICON_BLUESQUARE 130 @@ -192,8 +192,8 @@ #define KVI_SMALLICON_ALIAS 152 #define KVI_SMALLICON_CHANNELNOTICE 153 #define KVI_SMALLICON_CHANNELNOTICECRYPTED 154 -#define KVI_SMALLICON_QUERYNOTICE 155 -#define KVI_SMALLICON_QUERYNOTICECRYPTED 156 +#define KVI_SMALLICON_TQUERYNOTICE 155 +#define KVI_SMALLICON_TQUERYNOTICECRYPTED 156 // FIXME: rename the icon 157: it was colliding with 141 #define KVI_SMALLICON_SERVNOTICE 157 #define KVI_SMALLICON_POPUP 158 @@ -219,7 +219,7 @@ #define KVI_SMALLICON_LOOK 178 #define KVI_SMALLICON_INPUT 179 #define KVI_SMALLICON_MESSAGES 180 -#define KVI_SMALLICON_QUERYTRACE 181 +#define KVI_SMALLICON_TQUERYTRACE 181 #define KVI_SMALLICON_NOCHANNEL 182 #define KVI_SMALLICON_BROADCASTPRIVMSG 183 #define KVI_SMALLICON_BROADCASTNOTICE 184 @@ -271,7 +271,7 @@ #define KVI_SMALLICON_CRY 230 #define KVI_SMALLICON_EYE 231 #define KVI_SMALLICON_DEADCHANNEL 232 -#define KVI_SMALLICON_DEADQUERY 233 +#define KVI_SMALLICON_DEADTQUERY 233 #define KVI_SMALLICON_SOUND 234 #define KVI_SMALLICON_TOOLBAR 235 #define KVI_SMALLICON_TEXTENCODING 236 @@ -376,34 +376,35 @@ class KviIconManager; class KVIRC_API KviCachedPixmap { public: - // the pixmap MUST be allocated with new QPixmap() + // the pixmap MUST be allocated with new TQPixmap() // this calss takes the ownership - KviCachedPixmap(QPixmap * ptr,const QString &szPath); + KviCachedPixmap(TQPixmap * ptr,const TQString &szPath); ~KviCachedPixmap(); private: - QString m_szPath; + TQString m_szPath; kvi_time_t m_tLastAccess; - QPixmap * m_pPixmap; + TQPixmap * m_pPixmap; unsigned int m_uSize; public: - QPixmap * pixmap(){ return m_pPixmap; }; - const QString & path(){ return m_szPath; }; + TQPixmap * pixmap(){ return m_pPixmap; }; + const TQString & path(){ return m_szPath; }; unsigned int size(){ return m_uSize; }; kvi_time_t lastAccessTime(){ return m_tLastAccess; }; void updateLastAccessTime(); }; -class KVIRC_API KviIconWidget : public QWidget +class KVIRC_API KviIconWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: KviIconWidget(); - KviIconWidget(QWidget * par); + KviIconWidget(TQWidget * par); ~KviIconWidget(); protected: void init(); - virtual void closeEvent(QCloseEvent *e); - virtual bool eventFilter(QObject * o,QEvent *e); + virtual void closeEvent(TQCloseEvent *e); + virtual bool eventFilter(TQObject * o,TQEvent *e); signals: void closed(); void selected(int iIcon); @@ -420,7 +421,7 @@ signals: // since it's a linear search...), are 16x16 in size and are indexed by numbers in a way that their // access is really fast. The icons used here are used mostly in KviIrcView (but not exclusively). // -// The generic images are just "any" image that the underlying Qt engine +// The generic images are just "any" image that the underlying TQt engine // is able to load. They are loaded by (relative) path and // cached by name. // @@ -430,66 +431,67 @@ signals: // to the size of 32x32 as a big icon too. // -class KVIRC_API KviIconManager : public QObject +class KVIRC_API KviIconManager : public TQObject { Q_OBJECT + TQ_OBJECT public: KviIconManager(); ~KviIconManager(); private: - QPixmap * m_smallIcons[KVI_NUM_SMALL_ICONS]; + TQPixmap * m_smallIcons[KVI_NUM_SMALL_ICONS]; KviIconWidget * m_pIconWidget; - KviPointerHashTable<QString,KviCachedPixmap> * m_pCachedImages; - KviPointerHashTable<QString,int> * m_pIconNames; + KviPointerHashTable<TQString,KviCachedPixmap> * m_pCachedImages; + KviPointerHashTable<TQString,int> * m_pIconNames; unsigned int m_uCacheTotalSize; unsigned int m_uCacheMaxSize; public: // WARNING: Don't store this pointer! // id == filename | number that indicates an internal pixmap // 0 stands for "any" - QPixmap * getImage(const char * id,bool bCanBeNumber = true,QString* pRetPath = 0); + TQPixmap * getImage(const char * id,bool bCanBeNumber = true,TQString* pRetPath = 0); // The returned pointer is owned by the icon manager // and can be deleted at any time : so don't store it - KviCachedPixmap * getPixmapWithCache(const QString &szName); + KviCachedPixmap * getPixmapWithCache(const TQString &szName); // The returned pointer is owned by the icon manager // and can be deleted at any time : so don't store it - KviCachedPixmap * getPixmapWithCacheScaleOnLoad(const QString &szName,int iMaxWidth,int iMaxHeight); + KviCachedPixmap * getPixmapWithCacheScaleOnLoad(const TQString &szName,int iMaxWidth,int iMaxHeight); // The returned pointer is owned by the icon manager // and can be deleted at any time : so don't store it - QPixmap * getPixmap(const QString &szName) + TQPixmap * getPixmap(const TQString &szName) { KviCachedPixmap * p = getPixmapWithCache(szName); return p ? p->pixmap() : 0; }; // this one never fails... if the image can't be found // a default 32x32 image is returned - QPixmap * getBigIcon(const QString &szName); + TQPixmap * getBigIcon(const TQString &szName); // this one never fails... if the icon isn't there // then a default 16x16 image is returned - QPixmap * getSmallIcon(int idx){ return idx < KVI_NUM_SMALL_ICONS ? (m_smallIcons[idx] ? m_smallIcons[idx] : loadSmallIcon(idx) ) : 0; }; + TQPixmap * getSmallIcon(int idx){ return idx < KVI_NUM_SMALL_ICONS ? (m_smallIcons[idx] ? m_smallIcons[idx] : loadSmallIcon(idx) ) : 0; }; const char * getSmallIconName(int idx); - int getSmallIconIdFromName(const QString &szName); + int getSmallIconIdFromName(const TQString &szName); // if szLocalPath is empty then szName can be the identification // string for the avatar // if szName is empty then it is found from szLocalPath - KviAvatar * getAvatar(const QString &szLocalPath,const QString &szName); + KviAvatar * getAvatar(const TQString &szLocalPath,const TQString &szName); void urlToCachedFileName(KviStr &szFName); - void urlToCachedFileName(QString &szFName); + void urlToCachedFileName(TQString &szFName); void clearCache(); void reloadImages(); void cacheCleanup(); protected: - void addToCache(const QString &szName,KviCachedPixmap * p); + void addToCache(const TQString &szName,KviCachedPixmap * p); //void loadSmallIcons(); - QPixmap * loadSmallIcon(int idx); + TQPixmap * loadSmallIcon(int idx); public slots: void showIconWidget(); protected slots: diff --git a/src/kvirc/kernel/kvi_internalcmd.h b/src/kvirc/kernel/kvi_internalcmd.h index 533dfc0..8ac0343 100644 --- a/src/kvirc/kernel/kvi_internalcmd.h +++ b/src/kvirc/kernel/kvi_internalcmd.h @@ -56,7 +56,7 @@ #define KVI_INTERNALCOMMAND_POPUPEDITOR_OPEN 29 #define KVI_INTERNALCOMMAND_EXECUTE_SCRIPT_FROM_DISK 30 #define KVI_INTERNALCOMMAND_ACTIONEDITOR_OPEN 31 -#define KVI_INTERNALCOMMAND_QUIT 32 +#define KVI_INTERNALCOMMAND_TQUIT 32 #define KVI_INTERNALCOMMAND_KVIRC_HOMEPAGE_RU 33 #define KVI_INTERNALCOMMAND_OPENURL_KVIRC_ON_FREENODE 34 #define KVI_INTERNALCOMMAND_OPENURL_KVIRC_ON_IRCNET 35 diff --git a/src/kvirc/kernel/kvi_ipc.cpp b/src/kvirc/kernel/kvi_ipc.cpp index 3927f27..376ce7a 100644 --- a/src/kvirc/kernel/kvi_ipc.cpp +++ b/src/kvirc/kernel/kvi_ipc.cpp @@ -38,11 +38,11 @@ static HWND kvi_win_findIpcSentinel() { - HWND hWnd = ::FindWindow("QWidget","[Non-Commercial] - kvirc_ipc_sentinel"); + HWND hWnd = ::FindWindow(TQWIDGET_OBJECT_NAME_STRING,"[Non-Commercial] - kvirc_ipc_sentinel"); if(hWnd)return hWnd; - hWnd = ::FindWindow("QWidget","[Freeware] - kvirc_ipc_sentinel"); + hWnd = ::FindWindow(TQWIDGET_OBJECT_NAME_STRING,"[Freeware] - kvirc_ipc_sentinel"); if(hWnd)return hWnd; - hWnd = ::FindWindow("QWidget","kvirc_ipc_sentinel"); + hWnd = ::FindWindow(TQWIDGET_OBJECT_NAME_STRING,"kvirc_ipc_sentinel"); return hWnd; } @@ -55,7 +55,7 @@ #include <sys/types.h> // for getuid #ifdef COMPILE_USE_QT4 - #include <qx11info_x11.h> + #include <tqx11info_x11.h> #define kvi_ipc_get_xdisplay QX11Info::display #define kvi_ipc_get_xrootwin QX11Info::appRootWindow #else @@ -107,22 +107,22 @@ } } - Window root,parent; - Window * children; + Window root,tqparent; + Window * tqchildren; unsigned int nChildren; - if(!XQueryTree(kvi_ipc_get_xdisplay(),win,&root,&parent,&children,&nChildren)) + if(!XQueryTree(kvi_ipc_get_xdisplay(),win,&root,&tqparent,&tqchildren,&nChildren)) { - if(children)XFree((char *)children); + if(tqchildren)XFree((char *)tqchildren); return 0; } Window found = 0; for(int i=nChildren-1;(!found) && (i >= 0);i--) - found = kvi_x11_findIpcSentinel(children[i]); + found = kvi_x11_findIpcSentinel(tqchildren[i]); - if(children)XFree((char *)children); + if(tqchildren)XFree((char *)tqchildren); return found; } @@ -186,7 +186,7 @@ ////////////////////////////////////////////////////////////////////// KviIpcSentinel::KviIpcSentinel() - : QWidget(0,"kvirc_ipc_sentinel") + : TQWidget(0,"kvirc_ipc_sentinel") { #ifdef COMPILE_ON_WINDOWS setCaption("kvirc_ipc_sentinel"); diff --git a/src/kvirc/kernel/kvi_ipc.h b/src/kvirc/kernel/kvi_ipc.h index 432c261..7317baa 100644 --- a/src/kvirc/kernel/kvi_ipc.h +++ b/src/kvirc/kernel/kvi_ipc.h @@ -31,7 +31,7 @@ #include "kvi_string.h" - #include <qwidget.h> + #include <tqwidget.h> #ifdef COMPILE_ON_WINDOWS #include <winsock2.h> @@ -41,7 +41,7 @@ #ifdef COMPILE_USE_QT4 // We need this to be included BEFORE X11/Xlib.h // because of preprocessor constant collisions... - #include <qcoreevent.h> + #include <tqcoreevent.h> #endif #include "kvi_xlib.h" // for XEvent #endif //!COMPILE_NO_X @@ -52,9 +52,10 @@ // ////////////////////////////////////////////////////////////////////// - class KVIRC_API KviIpcSentinel : public QWidget + class KVIRC_API KviIpcSentinel : public TQWidget { Q_OBJECT + TQ_OBJECT public: KviIpcSentinel(); ~KviIpcSentinel(); diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp index 4bf5905..0748501 100644 --- a/src/kvirc/kernel/kvi_ircconnection.cpp +++ b/src/kvirc/kernel/kvi_ircconnection.cpp @@ -66,15 +66,15 @@ #include "kvi_mirccntrl.h" #include "kvi_useridentity.h" -#include <qtimer.h> -#include <qtextcodec.h> +#include <tqtimer.h> +#include <tqtextcodec.h> extern KVIRC_API KviIrcServerDataBase * g_pIrcServerDataBase; extern KVIRC_API KviProxyDataBase * g_pProxyDataBase; extern KVIRC_API KviGarbageCollector * g_pGarbageCollector; KviIrcConnection::KviIrcConnection(KviIrcContext * pContext,KviIrcConnectionTarget * pTarget,KviUserIdentity * pIdentity) -: QObject() +: TQObject() { m_bIdentdAttached = false; m_pContext = pContext; @@ -109,7 +109,7 @@ KviIrcConnection::~KviIrcConnection() m_bIdentdAttached = false; if(m_pLocalhostDns) { - QObject::disconnect(m_pLocalhostDns,SIGNAL(lookupDone(KviDns *)),0,0); + TQObject::disconnect(m_pLocalhostDns,TQT_SIGNAL(lookupDone(KviDns *)),0,0); if(m_pLocalhostDns->isRunning()) { g_pGarbageCollector->collect(m_pLocalhostDns); @@ -149,16 +149,16 @@ KviIrcConnection::~KviIrcConnection() delete m_pUserIdentity; } -void KviIrcConnection::setEncoding(const QString &szEncoding) +void KviIrcConnection::setEncoding(const TQString &szEncoding) { - QTextCodec * c = KviLocale::codecForName(szEncoding.latin1()); + TQTextCodec * c = KviLocale::codecForName(szEncoding.latin1()); if(c == m_pTextCodec)return; if(!c) { m_pConsole->output(KVI_OUT_SYSTEMERROR,__tr2qs("Failed to set the encoding to %Q: mapping not available."),&szEncoding); return; } - QString tmp = c->name(); + TQString tmp = c->name(); for(KviChannel * ch = m_pChannelList->first();ch;ch = m_pChannelList->next()) { if((ch->textCodec() != c) && (ch->textCodec() != ch->defaultTextCodec())) // actually not using the default! @@ -186,7 +186,7 @@ void KviIrcConnection::setupTextCodec() if(!m_pTarget->server()->encoding().isEmpty()) { m_pTextCodec = KviLocale::codecForName(m_pTarget->server()->encoding().latin1()); - if(!m_pTextCodec)debug("KviIrcConnection: can't find QTextCodec for encoding %s",m_pTarget->server()->encoding().utf8().data()); + if(!m_pTextCodec)debug("KviIrcConnection: can't find TQTextCodec for encoding %s",m_pTarget->server()->encoding().utf8().data()); } if(!m_pTextCodec) { @@ -194,29 +194,29 @@ void KviIrcConnection::setupTextCodec() if(!m_pTarget->network()->encoding().isEmpty()) { m_pTextCodec = KviLocale::codecForName(m_pTarget->network()->encoding().latin1()); - if(!m_pTextCodec)debug("KviIrcConnection: can't find QTextCodec for encoding %s",m_pTarget->network()->encoding().utf8().data()); + if(!m_pTextCodec)debug("KviIrcConnection: can't find TQTextCodec for encoding %s",m_pTarget->network()->encoding().utf8().data()); } } if(!m_pTextCodec) { m_pTextCodec = KviApp::defaultTextCodec(); } - m_pConsole->setTextEncoding(QString(m_pTextCodec->name())); + m_pConsole->setTextEncoding(TQString(m_pTextCodec->name())); } -KviQCString KviIrcConnection::encodeText(const QString &szText) +KviTQCString KviIrcConnection::encodeText(const TQString &szText) { if(!m_pTextCodec)return szText.utf8(); return m_pTextCodec->fromUnicode(szText); } -QString KviIrcConnection::decodeText(const char * szText) +TQString KviIrcConnection::decodeText(const char * szText) { - if(!m_pTextCodec)return QString(szText); + if(!m_pTextCodec)return TQString(szText); return m_pTextCodec->toUnicode(szText); } -void KviIrcConnection::serverInfoReceived(const QString &szServerName,const QString &szUserModes,const QString &szChanModes) +void KviIrcConnection::serverInfoReceived(const TQString &szServerName,const TQString &szUserModes,const TQString &szChanModes) { serverInfo()->setName(szServerName); serverInfo()->setSupportedUserModes(szUserModes); @@ -225,17 +225,17 @@ void KviIrcConnection::serverInfoReceived(const QString &szServerName,const QStr m_pFrame->childConnectionServerInfoChange(this); } -const QString & KviIrcConnection::currentServerName() +const TQString & KviIrcConnection::currentServerName() { return serverInfo()->name(); } -const QString & KviIrcConnection::currentNickName() +const TQString & KviIrcConnection::currentNickName() { return userInfo()->nickName(); } -const QString & KviIrcConnection::currentUserName() +const TQString & KviIrcConnection::currentUserName() { return userInfo()->userName(); } @@ -250,7 +250,7 @@ KviProxy * KviIrcConnection::proxy() return m_pTarget->proxy(); } -const QString & KviIrcConnection::networkName() +const TQString & KviIrcConnection::networkName() { return m_pTarget->networkName(); } @@ -341,16 +341,16 @@ void KviIrcConnection::linkAttemptFailed(int iError) context()->connectionFailed(iError); } -KviChannel * KviIrcConnection::findChannel(const QString &name) +KviChannel * KviIrcConnection::findChannel(const TQString &name) { for(KviChannel * c = m_pChannelList->first();c;c = m_pChannelList->next()) { - if(KviQString::equalCI(name,c->windowName()))return c; + if(KviTQString::equalCI(name,c->windowName()))return c; } return 0; } -int KviIrcConnection::getCommonChannels(const QString &nick,QString &szChansBuffer,bool bAddEscapeSequences) +int KviIrcConnection::getCommonChannels(const TQString &nick,TQString &szChansBuffer,bool bAddEscapeSequences) { int count = 0; for(KviChannel * c = m_pChannelList->first();c;c = m_pChannelList->next()) @@ -361,9 +361,9 @@ int KviIrcConnection::getCommonChannels(const QString &nick,QString &szChansBuff char uFlag = c->getUserFlag(nick); if(uFlag) { - KviQString::appendFormatted(szChansBuffer,bAddEscapeSequences ? "%c\r!c\r%Q\r" : "%c%Q",uFlag,&(c->windowName())); + KviTQString::appendFormatted(szChansBuffer,bAddEscapeSequences ? "%c\r!c\r%Q\r" : "%c%Q",uFlag,&(c->windowName())); } else { - if(bAddEscapeSequences)KviQString::appendFormatted(szChansBuffer,"\r!c\r%Q\r",&(c->windowName())); + if(bAddEscapeSequences)KviTQString::appendFormatted(szChansBuffer,"\r!c\r%Q\r",&(c->windowName())); else szChansBuffer.append(c->windowName()); } count++; @@ -408,7 +408,7 @@ void KviIrcConnection::closeAllQueries() } } -KviChannel * KviIrcConnection::createChannel(const QString &szName) +KviChannel * KviIrcConnection::createChannel(const TQString &szName) { KviChannel * c = m_pContext->findDeadChannel(szName); if(c) @@ -427,7 +427,7 @@ KviChannel * KviIrcConnection::createChannel(const QString &szName) return c; } -KviQuery * KviIrcConnection::createQuery(const QString &szNick) +KviQuery * KviIrcConnection::createQuery(const TQString &szNick) { KviQuery * q = m_pContext->findDeadQuery(szNick); if(!q) @@ -451,11 +451,11 @@ KviQuery * KviIrcConnection::createQuery(const QString &szNick) return q; } -KviQuery * KviIrcConnection::findQuery(const QString &name) +KviQuery * KviIrcConnection::findQuery(const TQString &name) { for(KviQuery * c = m_pQueryList->first();c;c = m_pQueryList->next()) { - if(KviQString::equalCI(name,c->windowName()))return c; + if(KviTQString::equalCI(name,c->windowName()))return c; } return 0; } @@ -599,8 +599,8 @@ void KviIrcConnection::delayedStartNotifyList() __range_invalid(m_pNotifyListTimer); if(m_pNotifyListTimer)delete m_pNotifyListTimer; - m_pNotifyListTimer = new QTimer(); - connect(m_pNotifyListTimer,SIGNAL(timeout()),this,SLOT(restartNotifyList())); + m_pNotifyListTimer = new TQTimer(); + connect(m_pNotifyListTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(restartNotifyList())); m_pNotifyListTimer->start(15000,true); // This delay is large enough to fire after the MOTD has been sent, @@ -663,7 +663,7 @@ void KviIrcConnection::restartLagMeter() void KviIrcConnection::resolveLocalHost() { - QString szIp; + TQString szIp; if(!socket()->getLocalHostIp(szIp,server()->isIpV6())) { @@ -697,7 +697,7 @@ void KviIrcConnection::resolveLocalHost() } } else { m_pUserInfo->setLocalHostIp(szIp); - if(!_OUTPUT_QUIET) + if(!_OUTPUT_TQUIET) m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Local host address is %Q"), &(m_pUserInfo->localHostIp())); } @@ -718,12 +718,12 @@ void KviIrcConnection::changeAwayState(bool bAway) emit awayStateChanged(); } -void KviIrcConnection::userInfoReceived(const QString &szUserName,const QString &szHostName) +void KviIrcConnection::userInfoReceived(const TQString &szUserName,const TQString &szHostName) { userInfo()->setUserName(szUserName); - QString szUnmaskedHost = m_pUserInfo->unmaskedHostName(); + TQString szUntqmaskedHost = m_pUserInfo->untqmaskedHostName(); // Update the user entry - KviIrcUserEntry * e = userDataBase()->find(userInfo()->nickName()); + KviIrcUserEntry * e = userDataBase()->tqfind(userInfo()->nickName()); if(e) // should be there! (we have the permanent entry in the notify list view) { e->setUser(szUserName); @@ -732,13 +732,13 @@ void KviIrcConnection::userInfoReceived(const QString &szUserName,const QString if(szHostName.isEmpty())return; // nothing to do anyway - if(KviQString::equalCS(m_pUserInfo->hostName(),szHostName))return; // again nothing to do + if(KviTQString::equalCS(m_pUserInfo->hostName(),szHostName))return; // again nothing to do static bool warned_once = false; if(!warned_once) { - if(!(m_pUserInfo->hostName().isEmpty() || KviQString::equalCS(m_pUserInfo->hostName(),m_pUserInfo->localHostIp()))) + if(!(m_pUserInfo->hostName().isEmpty() || KviTQString::equalCS(m_pUserInfo->hostName(),m_pUserInfo->localHostIp()))) { // ok, something weird is probably going on // is is non-empty and it is NOT the IP address we have set @@ -792,27 +792,27 @@ void KviIrcConnection::userInfoReceived(const QString &szUserName,const QString m_pUserInfo->setHostIp(szHostName); } else #ifdef COMPILE_IPV6_SUPPORT - if(KviNetUtils::isValidStringIp(szUnmaskedHost) || KviNetUtils::isValidStringIp_V6(szUnmaskedHost)) + if(KviNetUtils::isValidStringIp(szUntqmaskedHost) || KviNetUtils::isValidStringIp_V6(szUntqmaskedHost)) #else - if(KviNetUtils::isValidStringIp(szUnmaskedHost)) + if(KviNetUtils::isValidStringIp(szUntqmaskedHost)) #endif { if(!_OUTPUT_MUTE) - m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("The local IP address as seen by the IRC server is %Q"),&szUnmaskedHost); - m_pUserInfo->setHostIp(szUnmaskedHost); + m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("The local IP address as seen by the IRC server is %Q"),&szUntqmaskedHost); + m_pUserInfo->setHostIp(szUntqmaskedHost); } else { // look it up too if(m_pLocalhostDns)delete m_pLocalhostDns; // it could be only another local host lookup m_pLocalhostDns = new KviDns(); - connect(m_pLocalhostDns,SIGNAL(lookupDone(KviDns *)),this,SLOT(hostNameLookupTerminated(KviDns *))); + connect(m_pLocalhostDns,TQT_SIGNAL(lookupDone(KviDns *)),this,TQT_SLOT(hostNameLookupTerminated(KviDns *))); if(!m_pLocalhostDns->lookup(szHostName,KviDns::Any)) { if(!_OUTPUT_MUTE) { // don't change the string to aid the translators - QString szTmp = __tr2qs("Can't start the DNS slave thread"); + TQString szTmp = __tr2qs("Can't start the DNS slave thread"); m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Unable to resolve the local hostname as seen by the IRC server: %Q"),&szTmp); } delete m_pLocalhostDns; @@ -838,7 +838,7 @@ void KviIrcConnection::hostNameLookupTerminated(KviDns *pDns) if(m_pLocalhostDns->state() != KviDns::Success) { - QString szErr = KviError::getDescription(m_pLocalhostDns->error()); + TQString szErr = KviError::getDescription(m_pLocalhostDns->error()); if(!m_pUserInfo->hostIp().isEmpty()) m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Unable to resolve the local hostname as seen by the IRC server: %Q, using previously resolved %Q"), &szErr,&(m_pUserInfo->hostIp())); @@ -846,7 +846,7 @@ void KviIrcConnection::hostNameLookupTerminated(KviDns *pDns) m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Unable to resolve the local hostname as seen by the IRC server: %Q"), &szErr); } else { - QString szIpAddr = m_pLocalhostDns->firstIpAddress(); + TQString szIpAddr = m_pLocalhostDns->firstIpAddress(); m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Local hostname as seen by the IRC server resolved to %Q"),&szIpAddr); m_pUserInfo->setHostIp(m_pLocalhostDns->firstIpAddress()); } @@ -936,9 +936,9 @@ void KviIrcConnection::loginToIrcServer() // FIXME: The server's encoding! setupTextCodec(); - KviQCString szNick = encodeText(m_pUserInfo->nickName()); // never empty - KviQCString szUser = encodeText(m_pUserInfo->userName()); // never empty - KviQCString szReal = encodeText(m_pUserInfo->realName()); // may be empty + KviTQCString szNick = encodeText(m_pUserInfo->nickName()); // never empty + KviTQCString szUser = encodeText(m_pUserInfo->userName()); // never empty + KviTQCString szReal = encodeText(m_pUserInfo->realName()); // may be empty if(!szReal.data())szReal = ""; @@ -977,23 +977,23 @@ void KviIrcConnection::loginToIrcServer() return; } - QString szGenderTag; + TQString szGenderTag; if(KVI_OPTION_BOOL(KviOption_boolPrependGenderInfoToRealname) && !KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).isEmpty()) { szGenderTag.append(KVI_TEXT_COLOR); - if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).startsWith("m",false)) + if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).tqstartsWith("m",false)) { szGenderTag.append("1"); - } else if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).startsWith("f",false)) + } else if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).tqstartsWith("f",false)) { szGenderTag.append("2"); } szGenderTag.append(KVI_TEXT_RESET); - szReal.prepend(KviQString::toUtf8(szGenderTag)); + szReal.prepend(KviTQString::toUtf8(szGenderTag)); } if(!sendFmtData("USER %s 0 %s :%s",szUser.data(), - KviQString::toUtf8(pServer->m_szHostname).data(),szReal.data())) + KviTQString::toUtf8(pServer->m_szHostname).data(),szReal.data())) { // disconnected in the meantime! return; @@ -1003,7 +1003,7 @@ void KviIrcConnection::loginToIrcServer() m_pConsole->notifyListView()->join(m_pUserInfo->nickName(),"*","*"); // set own avatar if we have it - KviIrcUserEntry * e = userDataBase()->find(userInfo()->nickName()); + KviIrcUserEntry * e = userDataBase()->tqfind(userInfo()->nickName()); if(e) // should be there! { if(!e->avatar()) @@ -1017,15 +1017,15 @@ void KviIrcConnection::loginToIrcServer() } } // else buuug - if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).startsWith("m",false)){ + if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).tqstartsWith("m",false)){ e->setGender(KviIrcUserEntry::Male); - } else if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).startsWith("f",false)){ + } else if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).tqstartsWith("f",false)){ e->setGender(KviIrcUserEntry::Female); } // on connect stuff ? - QString tmp = pNet->onConnectCommand(); + TQString tmp = pNet->onConnectCommand(); tmp.stripWhiteSpace(); if(!tmp.isEmpty()) { @@ -1055,7 +1055,7 @@ void KviIrcConnection::loginToIrcServer() // and wait for the server to agree... } -void KviIrcConnection::nickChange(const QString &szNewNick) +void KviIrcConnection::nickChange(const TQString &szNewNick) { // FIXME: should the new nickname be decoded in some way ? m_pConsole->notifyListView()->nickChange(m_pUserInfo->nickName(),szNewNick); @@ -1084,7 +1084,7 @@ bool KviIrcConnection::changeUserMode(char mode,bool bSet) return true; } -void KviIrcConnection::loginComplete(const QString &szNickName) +void KviIrcConnection::loginComplete(const TQString &szNickName) { if(context()->state() == KviIrcContext::Connected)return; @@ -1115,7 +1115,7 @@ void KviIrcConnection::loginComplete(const QString &szNickName) resurrectDeadQueries(); // on connect stuff ? - QString tmp = target()->network()->onLoginCommand(); + TQString tmp = target()->network()->onLoginCommand(); tmp.stripWhiteSpace(); if(!tmp.isEmpty()) { @@ -1151,7 +1151,7 @@ void KviIrcConnection::loginComplete(const QString &szNickName) { if(_OUTPUT_VERBOSE) m_pConsole->output(KVI_OUT_VERBOSE,__tr2qs("Setting configured user mode")); - sendFmtData("MODE %s +%s",encodeText(QString(m_pUserInfo->nickName())).data(),modeStr.ptr()); + sendFmtData("MODE %s +%s",encodeText(TQString(m_pUserInfo->nickName())).data(),modeStr.ptr()); } delayedStartNotifyList(); @@ -1162,7 +1162,7 @@ void KviIrcConnection::loginComplete(const QString &szNickName) // join saved channels - QString szChannels,szProtectedChannels,szPasswords,szCurPass,szCurChan; + TQString szChannels,szProtectedChannels,szPasswords,szCurPass,szCurChan; if(!(m_pStateData->commandToExecAfterConnect().isEmpty())) { @@ -1177,19 +1177,19 @@ void KviIrcConnection::loginComplete(const QString &szNickName) KviQuery * query; - for(QStringList::Iterator it = target()->server()->m_pReconnectInfo->m_szOpenQueryes.begin(); + for(TQStringList::Iterator it = target()->server()->m_pReconnectInfo->m_szOpenQueryes.begin(); it != target()->server()->m_pReconnectInfo->m_szOpenQueryes.end();it++) { - QString szNick = *it; + TQString szNick = *it; query = findQuery(szNick); if(!query) { query = createQuery(szNick); - QString user; - QString host; + TQString user; + TQString host; KviIrcUserDataBase * db = userDataBase(); if(db) { - KviIrcUserEntry * e = db->find(szNick); + KviIrcUserEntry * e = db->tqfind(szNick); if(e) { user = e->user(); @@ -1209,10 +1209,10 @@ void KviIrcConnection::loginComplete(const QString &szNickName) if(_OUTPUT_VERBOSE) m_pConsole->output(KVI_OUT_VERBOSE,__tr2qs("Auto-joining network specific channels")); - QStringList * l = target()->network()->autoJoinChannelList(); + TQStringList * l = target()->network()->autoJoinChannelList(); if(l->count()!=0) { - for ( QStringList::Iterator it = l->begin(); it != l->end(); ++it ) { + for ( TQStringList::Iterator it = l->begin(); it != l->end(); ++it ) { szCurPass=(*it).section(':',1); if(szCurPass.isEmpty()) @@ -1243,10 +1243,10 @@ void KviIrcConnection::loginComplete(const QString &szNickName) if(_OUTPUT_VERBOSE) m_pConsole->output(KVI_OUT_VERBOSE,__tr2qs("Auto-joining server specific channels")); - QStringList * l = server()->autoJoinChannelList(); + TQStringList * l = server()->autoJoinChannelList(); if(l->count()!=0) { - for ( QStringList::Iterator it = l->begin(); it != l->end(); ++it ) { + for ( TQStringList::Iterator it = l->begin(); it != l->end(); ++it ) { szCurPass=(*it).section(':',1); if(szCurPass.isEmpty()) { @@ -1271,7 +1271,7 @@ void KviIrcConnection::loginComplete(const QString &szNickName) } } - QString szCommand; + TQString szCommand; if( (!szChannels.isEmpty()) || (!szProtectedChannels.isEmpty()) ) { szCommand.append(szProtectedChannels); @@ -1336,7 +1336,7 @@ void KviIrcConnection::heartbeat(kvi_time_t tNow) { // ok, sent the request for this channel stateData()->setLastSentChannelWhoRequest(tNow); - QString szChanName = encodeText(pOldest->name()); + TQString szChanName = encodeText(pOldest->name()); if(_OUTPUT_PARANOIC) console()->output(KVI_OUT_VERBOSE,__tr2qs("Updating away state for channel %Q"),&szChanName); if(lagMeter()) @@ -1345,7 +1345,7 @@ void KviIrcConnection::heartbeat(kvi_time_t tNow) lagMeter()->lagCheckRegister(tmp.ptr(),70); } pOldest->setSentSyncWhoRequest(); - if(!sendFmtData("WHO %s",encodeText(QString(pOldest->name())).data()))return; + if(!sendFmtData("WHO %s",encodeText(TQString(pOldest->name())).data()))return; } } } diff --git a/src/kvirc/kernel/kvi_ircconnection.h b/src/kvirc/kernel/kvi_ircconnection.h index fc6acf2..28609ea 100644 --- a/src/kvirc/kernel/kvi_ircconnection.h +++ b/src/kvirc/kernel/kvi_ircconnection.h @@ -29,7 +29,7 @@ #include "kvi_qcstring.h" #include "kvi_pointerlist.h" #include "kvi_time.h" -#include <qobject.h> +#include <tqobject.h> class KviConsole; class KviIrcNetworkData; @@ -56,17 +56,18 @@ class KviNotifyListManager; class KviDns; class KviUserIdentity; -class QTimer; -class QTextCodec; +class TQTimer; +class TQTextCodec; -class KVIRC_API KviIrcConnection : public QObject +class KVIRC_API KviIrcConnection : public TQObject { friend class KviConsole; friend class KviIrcContext; friend class KviIrcLink; friend class KviServerParser; Q_OBJECT + TQ_OBJECT public: // only KviConsole can create this // pContext must NOT be null @@ -104,7 +105,7 @@ private: KviIrcUserDataBase * m_pUserDataBase; // owned, never null KviNotifyListManager * m_pNotifyListManager; // owned, see restartNotifyList() - QTimer * m_pNotifyListTimer; // delayed startup timer for the notify lists + TQTimer * m_pNotifyListTimer; // delayed startup timer for the notify lists KviLagMeter * m_pLagMeter; // owned, may be null (when not running) @@ -116,7 +117,7 @@ private: KviDns * m_pLocalhostDns; // FIXME: this should go to an aux structure - QTextCodec * m_pTextCodec; // connection codec: never null + TQTextCodec * m_pTextCodec; // connection codec: never null public: // returns a pointer to the owning console // the pointer is NEVER null @@ -138,7 +139,7 @@ public: // the current state State state(){ return m_eState; }; // forwarder from KviIrcConnectionTarget, always non-empty string - const QString & networkName(); + const TQString & networkName(); // never null! KviIrcUserDataBase * userDataBase(){ return m_pUserDataBase; }; // never null. Use #include "kvi_ircconnectionuserinfo.h" @@ -160,14 +161,14 @@ public: // may be null (when not running) KviLagMeter * lagMeter(){ return m_pLagMeter; }; // should be never null.. but if really everything goes wrong, it might be... - QTextCodec * textCodec(){ return m_pTextCodec; }; + TQTextCodec * textCodec(){ return m_pTextCodec; }; public: // helper (really common access to userInfo()->nickName()) - const QString & currentNickName(); + const TQString & currentNickName(); // helper (really common access to userInfo()->userName()) - const QString & currentUserName(); + const TQString & currentUserName(); // helper (really common access to serverInfo()->name()) - const QString & currentServerName(); + const TQString & currentServerName(); // world interface: the following three functions use m_pLink->sendPacket() bool sendData(const char *buffer,int buflen = -1); @@ -176,15 +177,15 @@ public: // channel management // // ----> KviChannelManager ? - KviChannel * findChannel(const QString &name); + KviChannel * findChannel(const TQString &name); KviPointerList<KviChannel> * channelList(){ return m_pChannelList; }; - int getCommonChannels(const QString &nick,QString &szChansBuffer,bool bAddEscapeSequences = true); - KviChannel * createChannel(const QString &name); + int getCommonChannels(const TQString &nick,TQString &szChansBuffer,bool bAddEscapeSequences = true); + KviChannel * createChannel(const TQString &name); void registerChannel(KviChannel *c); void unregisterChannel(KviChannel *c); void keepChannelsOpenAfterDisconnect(); void closeAllChannels(); - void setEncoding(const QString &szEncoding); + void setEncoding(const TQString &szEncoding); public slots: void partAllChannels(); void unhighlightAllChannels(); @@ -196,9 +197,9 @@ public: // query management // // ----> KviQueryManager ? - KviQuery * findQuery(const QString &nick); + KviQuery * findQuery(const TQString &nick); KviPointerList<KviQuery> * queryList(){ return m_pQueryList; }; - KviQuery * createQuery(const QString &nick); + KviQuery * createQuery(const TQString &nick); void registerQuery(KviQuery *q); void unregisterQuery(KviQuery *q); void keepQueriesOpenAfterDisconnect(); @@ -221,17 +222,17 @@ protected: // called to start the notify lists when RPL_ENDOFMOTD is received void endOfMotdReceived(); // called when RPL_SERVINFO (004) is received - void serverInfoReceived(const QString &szServerName,const QString &szUserModes,const QString &szChanModes); + void serverInfoReceived(const TQString &szServerName,const TQString &szUserModes,const TQString &szChanModes); // called to update the away state void changeAwayState(bool bAway); // called on each JOIN (but meaningful almost only on the first one) (FIXME: call it also on other messages ?) - void userInfoReceived(const QString &szUserName,const QString &szHostName); + void userInfoReceived(const TQString &szUserName,const TQString &szHostName); // called when NICK is received - void nickChange(const QString &szNewNick); + void nickChange(const TQString &szNewNick); // called when MODE is received for each mode character bool changeUserMode(char mode,bool bSet); // called on the first numerics received from server - void loginComplete(const QString &szNickName); + void loginComplete(const TQString &szNickName); private slots: void hostNameLookupTerminated(KviDns * pDns); protected: @@ -268,8 +269,8 @@ signals: void channelUnregistered(KviChannel*); void chanListChanged(); public: - QString decodeText(const char * szText); - KviQCString encodeText(const QString &szText); + TQString decodeText(const char * szText); + KviTQCString encodeText(const TQString &szText); private: void setupTextCodec(); }; diff --git a/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.cpp b/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.cpp index fce0a23..ecbd786 100644 --- a/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.cpp +++ b/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.cpp @@ -59,12 +59,12 @@ void KviIrcConnectionAsyncWhoisData::add(KviAsyncWhoisInfo * i) m_pWhoisInfoList->append(i); } -KviAsyncWhoisInfo * KviIrcConnectionAsyncWhoisData::lookup(const QString &nick) +KviAsyncWhoisInfo * KviIrcConnectionAsyncWhoisData::lookup(const TQString &nick) { if(!m_pWhoisInfoList)return 0; for(KviAsyncWhoisInfo * i = m_pWhoisInfoList->first();i;i = m_pWhoisInfoList->next()) { - if(KviQString::equalCI(nick,i->szNick))return i; + if(KviTQString::equalCI(nick,i->szNick))return i; } return 0; } diff --git a/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.h b/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.h index c623f64..96d0c3c 100644 --- a/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.h +++ b/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.h @@ -35,19 +35,19 @@ class KviKvsVariant; class KVIRC_API KviAsyncWhoisInfo { public: - QString szNick; - QString szUser; - QString szHost; - QString szReal; - QString szServer; - QString szIdle; - QString szSignon; - QString szChannels; - QString szSpecial; + TQString szNick; + TQString szUser; + TQString szHost; + TQString szReal; + TQString szServer; + TQString szIdle; + TQString szSignon; + TQString szChannels; + TQString szSpecial; KviKvsScript * pCallback; KviKvsVariant * pMagic; - QString szCode; // <-- kill this when KVS is hardwired! - QString szMagic; // <-- kill this when KVS is hardwired! + TQString szCode; // <-- kill this when KVS is hardwired! + TQString szMagic; // <-- kill this when KVS is hardwired! KviWindow * pWindow; public: KviAsyncWhoisInfo(); @@ -65,7 +65,7 @@ protected: KviPointerList<KviAsyncWhoisInfo> * m_pWhoisInfoList; // awhois pending stuff public: void add(KviAsyncWhoisInfo * i); - KviAsyncWhoisInfo * lookup(const QString &nick); + KviAsyncWhoisInfo * lookup(const TQString &nick); void remove(KviAsyncWhoisInfo * i); }; diff --git a/src/kvirc/kernel/kvi_ircconnectionnetsplitdetectordata.h b/src/kvirc/kernel/kvi_ircconnectionnetsplitdetectordata.h index 3aa9652..66ae4c0 100644 --- a/src/kvirc/kernel/kvi_ircconnectionnetsplitdetectordata.h +++ b/src/kvirc/kernel/kvi_ircconnectionnetsplitdetectordata.h @@ -34,11 +34,11 @@ public: KviIrcConnectionNetsplitDetectorData(); ~KviIrcConnectionNetsplitDetectorData(); protected: - QString m_szLastNetsplitOnQuitReason; + TQString m_szLastNetsplitOnQuitReason; kvi_time_t m_tLastNetsplitOnQuit; public: - const QString & lastNetsplitOnQuitReason(){ return m_szLastNetsplitOnQuitReason; }; - void setLastNetsplitOnQuitReason(const QString &szReason){ m_szLastNetsplitOnQuitReason = szReason; }; + const TQString & lastNetsplitOnQuitReason(){ return m_szLastNetsplitOnQuitReason; }; + void setLastNetsplitOnQuitReason(const TQString &szReason){ m_szLastNetsplitOnQuitReason = szReason; }; kvi_time_t lastNetsplitOnQuitTime(){ return m_tLastNetsplitOnQuit; }; void setLastNetsplitOnQuitTime(kvi_time_t t){ m_tLastNetsplitOnQuit = t; }; }; diff --git a/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp b/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp index e057aa0..ec82da5 100644 --- a/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp +++ b/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp @@ -53,29 +53,29 @@ KviIrcConnectionServerInfo::~KviIrcConnectionServerInfo() if(m_pModePrefixTable) kvi_free(m_pModePrefixTable); } -void KviIrcConnectionServerInfo::setSupportedChannelModes(const QString &szSupportedChannelModes) +void KviIrcConnectionServerInfo::setSupportedChannelModes(const TQString &szSupportedChannelModes) { int pos=-1; - pos=szSupportedChannelModes.find(','); + pos=szSupportedChannelModes.tqfind(','); if(pos>=0) m_szListModes=szSupportedChannelModes.left(pos); - pos=szSupportedChannelModes.findRev(','); + pos=szSupportedChannelModes.tqfindRev(','); if(pos>=0) m_szPlainModes=szSupportedChannelModes.right(szSupportedChannelModes.length()+pos-1); m_szSupportedChannelModes = szSupportedChannelModes; - m_bSupportsModesIe = (szSupportedChannelModes.contains('e') && szSupportedChannelModes.contains('I')); + m_bSupportsModesIe = (szSupportedChannelModes.tqcontains('e') && szSupportedChannelModes.tqcontains('I')); - QChar* aux=(QChar*)szSupportedChannelModes.ucs2(); - while(aux->unicode()) + TQChar* aux=(TQChar*)szSupportedChannelModes.ucs2(); + while(aux->tqunicode()) { - if(!m_szSupportedChannelModes.contains(*aux)) + if(!m_szSupportedChannelModes.tqcontains(*aux)) m_szSupportedChannelModes.append(*aux); aux++; } } -void KviIrcConnectionServerInfo::setSupportedModePrefixes(const QString &szSupportedModePrefixes,const QString &szSupportedModeFlags) +void KviIrcConnectionServerInfo::setSupportedModePrefixes(const TQString &szSupportedModePrefixes,const TQString &szSupportedModeFlags) { m_szSupportedModeFlags = szSupportedModeFlags; m_szSupportedModePrefixes = szSupportedModePrefixes; @@ -85,11 +85,11 @@ void KviIrcConnectionServerInfo::setSupportedModePrefixes(const QString &szSuppo void KviIrcConnectionServerInfo::buildModePrefixTable() { if(m_pModePrefixTable) kvi_free(m_pModePrefixTable); - const QChar * cPrefix = KviQString::nullTerminatedArray(m_szSupportedModePrefixes); - const QChar * cFlag = KviQString::nullTerminatedArray(m_szSupportedModeFlags); + const TQChar * cPrefix = KviTQString::nullTerminatedArray(m_szSupportedModePrefixes); + const TQChar * cFlag = KviTQString::nullTerminatedArray(m_szSupportedModeFlags); if(!cPrefix || !cFlag)return; // eh ? - m_uPrefixes=QMIN(m_szSupportedModePrefixes.length(),m_szSupportedModePrefixes.length()); + m_uPrefixes=TQMIN(m_szSupportedModePrefixes.length(),m_szSupportedModePrefixes.length()); m_pModePrefixTable=(kvi_u32_t*)kvi_malloc(sizeof(kvi_u32_t)*3*m_uPrefixes); unsigned short uPrefix,uFlag; @@ -98,7 +98,7 @@ void KviIrcConnectionServerInfo::buildModePrefixTable() // Alexey: FIXED: rethinked:) // Pragma: LOL :DDDD int i=0; - while( (uPrefix = cPrefix->unicode()) && (uFlag = cFlag->unicode()) && i<m_uPrefixes*3) + while( (uPrefix = cPrefix->tqunicode()) && (uFlag = cFlag->tqunicode()) && i<m_uPrefixes*3) { m_pModePrefixTable[i]=uPrefix; m_pModePrefixTable[i+1]=uFlag; @@ -126,81 +126,81 @@ void KviIrcConnectionServerInfo::buildModePrefixTable() } } -bool KviIrcConnectionServerInfo::isSupportedModePrefix(QChar c) +bool KviIrcConnectionServerInfo::isSupportedModePrefix(TQChar c) { if(!m_pModePrefixTable) return false; for(int i=0;i<m_uPrefixes;i++) { - if(m_pModePrefixTable[i*3]==c.unicode()) return true; + if(m_pModePrefixTable[i*3]==c.tqunicode()) return true; } return false; } -bool KviIrcConnectionServerInfo::isSupportedModeFlag(QChar c) +bool KviIrcConnectionServerInfo::isSupportedModeFlag(TQChar c) { if(!m_pModePrefixTable) return false; for(int i=0;i<m_uPrefixes;i++) { - if(m_pModePrefixTable[(i*3)+1]==c.unicode()) return true; + if(m_pModePrefixTable[(i*3)+1]==c.tqunicode()) return true; } return false; } -QChar KviIrcConnectionServerInfo::modePrefixChar(kvi_u32_t flag) +TQChar KviIrcConnectionServerInfo::modePrefixChar(kvi_u32_t flag) { - if(!m_pModePrefixTable) return QChar(0); + if(!m_pModePrefixTable) return TQChar(0); for(int i=0;i<m_uPrefixes;i++) { - if(m_pModePrefixTable[i*3+2] & flag) return QChar(m_pModePrefixTable[i*3]); + if(m_pModePrefixTable[i*3+2] & flag) return TQChar(m_pModePrefixTable[i*3]); } - return QChar(0); + return TQChar(0); } -QChar KviIrcConnectionServerInfo::modeFlagChar(kvi_u32_t flag) +TQChar KviIrcConnectionServerInfo::modeFlagChar(kvi_u32_t flag) { - if(!m_pModePrefixTable) return QChar(0); + if(!m_pModePrefixTable) return TQChar(0); for(int i=0;i<m_uPrefixes;i++) { - if(m_pModePrefixTable[i*3+2] & flag ) return QChar(m_pModePrefixTable[i*3+1]); + if(m_pModePrefixTable[i*3+2] & flag ) return TQChar(m_pModePrefixTable[i*3+1]); } - return QChar(0); + return TQChar(0); } -kvi_u32_t KviIrcConnectionServerInfo::modeFlagFromPrefixChar(QChar c) +kvi_u32_t KviIrcConnectionServerInfo::modeFlagFromPrefixChar(TQChar c) { if(!m_pModePrefixTable) return 0; for(int i=0;i<m_uPrefixes;i++) { - if(m_pModePrefixTable[i*3]==c.unicode()) return m_pModePrefixTable[i*3+2]; + if(m_pModePrefixTable[i*3]==c.tqunicode()) return m_pModePrefixTable[i*3+2]; } return 0; } -kvi_u32_t KviIrcConnectionServerInfo::modeFlagFromModeChar(QChar c) +kvi_u32_t KviIrcConnectionServerInfo::modeFlagFromModeChar(TQChar c) { if(!m_pModePrefixTable) return 0; for(int i=0;i<m_uPrefixes;i++) { - if(m_pModePrefixTable[i*3+1]==c.unicode()) return m_pModePrefixTable[i*3+2]; + if(m_pModePrefixTable[i*3+1]==c.tqunicode()) return m_pModePrefixTable[i*3+2]; } return 0; } -void KviIrcConnectionServerInfo::setServerVersion(const QString & version) +void KviIrcConnectionServerInfo::setServerVersion(const TQString & version) { if(m_pServInfo) delete m_pServInfo; - if(version.contains("unreal",false)) + if(version.tqcontains("unreal",false)) m_pServInfo = new KviUnrealIrcServerInfo(version); - else if(version.contains("bahamut",false)) + else if(version.tqcontains("bahamut",false)) m_pServInfo = new KviBahamutIrcServerInfo(version); - else if(version.contains("hyperion",false)) + else if(version.tqcontains("hyperion",false)) m_pServInfo = new KviHyperionIrcServerInfo(version); else m_pServInfo = new KviBasicIrcServerInfo(version); } -KviBasicIrcServerInfo::KviBasicIrcServerInfo(const QString & version) +KviBasicIrcServerInfo::KviBasicIrcServerInfo(const TQString & version) { m_szServerVersion = version; } @@ -209,31 +209,31 @@ KviBasicIrcServerInfo::~KviBasicIrcServerInfo() { } -const QString & KviBasicIrcServerInfo::getChannelModeDescription(QChar mode) +const TQString & KviBasicIrcServerInfo::getChannelModeDescription(TQChar mode) { - QString tmp=getCustomChannelModeDescription(mode); + TQString tmp=getCustomChannelModeDescription(mode); if(tmp.isNull()) return getBasicChannelModeDescription(mode); - return KviQString::empty; + return KviTQString::empty; } -const QString & KviBasicIrcServerInfo::getUserModeDescription(QChar mode) +const TQString & KviBasicIrcServerInfo::getUserModeDescription(TQChar mode) { - QString tmp=getCustomUserModeDescription(mode); + TQString tmp=getCustomUserModeDescription(mode); if(tmp.isNull()) return getBasicUserModeDescription(mode); - return KviQString::empty; + return KviTQString::empty; } -const QString & KviBasicIrcServerInfo::getBasicChannelModeDescription(QChar mode) +const TQString & KviBasicIrcServerInfo::getBasicChannelModeDescription(TQChar mode) { - switch(mode.unicode()) + switch(mode.tqunicode()) { case 'o': return __tr2qs("Channel operators"); break; case 'v': return __tr2qs("Voiced users"); break; case 'h': return __tr2qs("Half-operators");break; - case 'b': return __tr2qs("Ban masks"); break; + case 'b': return __tr2qs("Ban tqmasks"); break; case 'c': return __tr2qs("Color free (no ANSI colors)"); break; - case 'e': return __tr2qs("Ban exception masks"); break; - case 'I': return __tr2qs("Invite exception masks or forbid /INVITE"); break; + case 'e': return __tr2qs("Ban exception tqmasks"); break; + case 'I': return __tr2qs("Invite exception tqmasks or forbid /INVITE"); break; case 's': return __tr2qs("Secret"); break; case 'p': return __tr2qs("Private"); break; case 't': return __tr2qs("Topic change restricted"); break; @@ -260,12 +260,12 @@ const QString & KviBasicIrcServerInfo::getBasicChannelModeDescription(QChar mode case '7': return __tr2qs("Only 7-bit letters in nicknames allowed"); break; case 'x': return __tr2qs("Impossible to use both 7-bit and 8-bit letters in nicknames"); break; } - return KviQString::empty; + return KviTQString::empty; } -const QString & KviBasicIrcServerInfo::getBasicUserModeDescription(QChar mode) +const TQString & KviBasicIrcServerInfo::getBasicUserModeDescription(TQChar mode) { - switch(mode.unicode()) + switch(mode.tqunicode()) { case 'o': return __tr2qs("o: IRC operator (OPER)"); break; case 'O': return __tr2qs("O: Local IRC operator (LOCOP)"); break; @@ -281,5 +281,5 @@ const QString & KviBasicIrcServerInfo::getBasicUserModeDescription(QChar mode) case 'd': return __tr2qs("d: Obscure 'DEBUG' flag"); break; case 'n': return __tr2qs("n: Recipient for nick changes"); break; } - return KviQString::empty; + return KviTQString::empty; } diff --git a/src/kvirc/kernel/kvi_ircconnectionserverinfo.h b/src/kvirc/kernel/kvi_ircconnectionserverinfo.h index 8ab8943..f27a806 100644 --- a/src/kvirc/kernel/kvi_ircconnectionserverinfo.h +++ b/src/kvirc/kernel/kvi_ircconnectionserverinfo.h @@ -31,26 +31,26 @@ class KVIRC_API KviBasicIrcServerInfo { protected: - QString m_szServerVersion; + TQString m_szServerVersion; public: - KviBasicIrcServerInfo(const QString & version = KviQString::empty); + KviBasicIrcServerInfo(const TQString & version = KviTQString::empty); ~KviBasicIrcServerInfo(); protected: - virtual const QString & getCustomChannelModeDescription(QChar mode) { return KviQString::empty; }; - virtual const QString & getCustomUserModeDescription(QChar mode) { return KviQString::empty; }; + virtual const TQString & getCustomChannelModeDescription(TQChar mode) { return KviTQString::empty; }; + virtual const TQString & getCustomUserModeDescription(TQChar mode) { return KviTQString::empty; }; private: - const QString & getBasicChannelModeDescription(QChar mode); - const QString & getBasicUserModeDescription(QChar mode); + const TQString & getBasicChannelModeDescription(TQChar mode); + const TQString & getBasicUserModeDescription(TQChar mode); public: - const QString & getChannelModeDescription(QChar mode); - const QString & getUserModeDescription(QChar mode); + const TQString & getChannelModeDescription(TQChar mode); + const TQString & getUserModeDescription(TQChar mode); virtual char getRegisterModeChar() { return 0; }; }; class KVIRC_API KviUnrealIrcServerInfo : public KviBasicIrcServerInfo { public: - KviUnrealIrcServerInfo(const QString & version = KviQString::empty) + KviUnrealIrcServerInfo(const TQString & version = KviTQString::empty) :KviBasicIrcServerInfo(version) {;}; virtual char getRegisterModeChar() { return 'r'; }; }; @@ -58,7 +58,7 @@ public: class KVIRC_API KviBahamutIrcServerInfo : public KviBasicIrcServerInfo { public: - KviBahamutIrcServerInfo(const QString & version = KviQString::empty) + KviBahamutIrcServerInfo(const TQString & version = KviTQString::empty) :KviBasicIrcServerInfo(version) {;}; virtual char getRegisterModeChar() { return 'r'; }; }; @@ -66,7 +66,7 @@ public: class KVIRC_API KviHyperionIrcServerInfo : public KviBasicIrcServerInfo { public: - KviHyperionIrcServerInfo(const QString & version = KviQString::empty) + KviHyperionIrcServerInfo(const TQString & version = KviTQString::empty) :KviBasicIrcServerInfo(version) {;}; virtual char getRegisterModeChar() { return 'e'; }; }; @@ -81,31 +81,31 @@ protected: ~KviIrcConnectionServerInfo(); private: KviBasicIrcServerInfo * m_pServInfo; - QString m_szName; // the most actual server name (may be the one we specify or the one that the server wants to be known as) - QString m_szSupportedUserModes; // the supported user modes - QString m_szSupportedChannelModes; // the supported channel modes - QString m_szSupportedModePrefixes; // the actually used mode prefixes @+ + TQString m_szName; // the most actual server name (may be the one we specify or the one that the server wants to be known as) + TQString m_szSupportedUserModes; // the supported user modes + TQString m_szSupportedChannelModes; // the supported channel modes + TQString m_szSupportedModePrefixes; // the actually used mode prefixes @+ kvi_u32_t * m_pModePrefixTable; // the mode prefixes above in a table unsigned int m_uPrefixes; - QString m_szSupportedModeFlags; // the actually used mode flags ov - QString m_szSupportedChannelTypes; // the supported channel types + TQString m_szSupportedModeFlags; // the actually used mode flags ov + TQString m_szSupportedChannelTypes; // the supported channel types bool m_bSupportsModesIe; // supports the channel modes I and e ? bool m_bSupportsWatchList; // supports the watch list ? bool m_bSupportsCodePages; // supports the /CODEPAGE command ? int m_iMaxTopicLen; int m_iMaxModeChanges; - QString m_szListModes; - QString m_szPlainModes; + TQString m_szListModes; + TQString m_szPlainModes; public: char registerModeChar() { return m_pServInfo ? m_pServInfo->getRegisterModeChar() : 0; }; - const QString & name(){ return m_szName; }; - const QString & supportedUserModes(){ return m_szSupportedUserModes; }; - const QString & supportedChannelModes(){ return m_szSupportedChannelModes; }; - const QString & supportedChannelTypes(){ return m_szSupportedChannelTypes; }; - const QString & supportedModePrefixes(){ return m_szSupportedModePrefixes; }; - const QString & supportedModeFlags(){ return m_szSupportedModeFlags; }; - const QString & supportedListModes(){ return m_szListModes; }; - const QString & supportedPlainModes(){ return m_szPlainModes; }; + const TQString & name(){ return m_szName; }; + const TQString & supportedUserModes(){ return m_szSupportedUserModes; }; + const TQString & supportedChannelModes(){ return m_szSupportedChannelModes; }; + const TQString & supportedChannelTypes(){ return m_szSupportedChannelTypes; }; + const TQString & supportedModePrefixes(){ return m_szSupportedModePrefixes; }; + const TQString & supportedModeFlags(){ return m_szSupportedModeFlags; }; + const TQString & supportedListModes(){ return m_szListModes; }; + const TQString & supportedPlainModes(){ return m_szPlainModes; }; bool supportsModesIe(){ return m_bSupportsModesIe; }; bool supportsWatchList(){ return m_bSupportsWatchList; }; bool supportsCodePages(){ return m_bSupportsCodePages; }; @@ -113,23 +113,23 @@ public: int maxTopicLen() { return m_iMaxTopicLen; }; int maxModeChanges() { return m_iMaxModeChanges; }; - void setServerVersion(const QString & version); + void setServerVersion(const TQString & version); - const QString & getChannelModeDescription(QChar mode) { return m_pServInfo->getChannelModeDescription(mode); }; - const QString & getUserModeDescription(QChar mode) { return m_pServInfo->getUserModeDescription(mode); }; + const TQString & getChannelModeDescription(TQChar mode) { return m_pServInfo->getChannelModeDescription(mode); }; + const TQString & getUserModeDescription(TQChar mode) { return m_pServInfo->getUserModeDescription(mode); }; - bool isSupportedModePrefix(QChar c); - bool isSupportedModeFlag(QChar c); - QChar modePrefixChar(kvi_u32_t flag); - QChar modeFlagChar(kvi_u32_t flag); - kvi_u32_t modeFlagFromPrefixChar(QChar c); - kvi_u32_t modeFlagFromModeChar(QChar c); + bool isSupportedModePrefix(TQChar c); + bool isSupportedModeFlag(TQChar c); + TQChar modePrefixChar(kvi_u32_t flag); + TQChar modeFlagChar(kvi_u32_t flag); + kvi_u32_t modeFlagFromPrefixChar(TQChar c); + kvi_u32_t modeFlagFromModeChar(TQChar c); protected: - void setName(const QString &szName){ m_szName = szName; }; - void setSupportedUserModes(const QString &szSupportedUserModes){ m_szSupportedUserModes = szSupportedUserModes; }; - void setSupportedChannelModes(const QString &szSupportedChannelModes); - void setSupportedModePrefixes(const QString &szSupportedModePrefixes,const QString &szSupportedModeFlags); - void setSupportedChannelTypes(const QString &szSupportedChannelTypes){ m_szSupportedChannelTypes = szSupportedChannelTypes; }; + void setName(const TQString &szName){ m_szName = szName; }; + void setSupportedUserModes(const TQString &szSupportedUserModes){ m_szSupportedUserModes = szSupportedUserModes; }; + void setSupportedChannelModes(const TQString &szSupportedChannelModes); + void setSupportedModePrefixes(const TQString &szSupportedModePrefixes,const TQString &szSupportedModeFlags); + void setSupportedChannelTypes(const TQString &szSupportedChannelTypes){ m_szSupportedChannelTypes = szSupportedChannelTypes; }; void setSupportsWatchList(bool bSupportsWatchList){ m_bSupportsWatchList = bSupportsWatchList; }; void setSupportsCodePages(bool bSupportsCodePages){ m_bSupportsCodePages = bSupportsCodePages; }; void setMaxTopicLen( int iTopLen ) { m_iMaxTopicLen=iTopLen; }; diff --git a/src/kvirc/kernel/kvi_ircconnectionstatedata.h b/src/kvirc/kernel/kvi_ircconnectionstatedata.h index 3a70c74..7c9df71 100644 --- a/src/kvirc/kernel/kvi_ircconnectionstatedata.h +++ b/src/kvirc/kernel/kvi_ircconnectionstatedata.h @@ -46,7 +46,7 @@ public: protected: bool m_bSentQuit; // have we sent the quit message for this connection ? unsigned int m_uLoginNickIndex; // the index of the identity nicknames used until now (see KviIrcConnection::loginToIrcServer()) - QString m_szCommandToExecAfterConnect; // yes.. this is a special command to execute after connection + TQString m_szCommandToExecAfterConnect; // yes.. this is a special command to execute after connection bool m_bSimulateUnexpectedDisconnect; // this is set to true if we have to simulate an unexpected disconnect even if we have sent a normal quit message kvi_time_t m_tLastReceivedChannelWhoReply; // the time that we have received our last channel who reply kvi_time_t m_tLastSentChannelWhoRequest; // the time that we have sent our last channel who request @@ -70,8 +70,8 @@ public: unsigned int loginNickIndex(){ return m_uLoginNickIndex; }; void setLoginNickIndex(unsigned int uNickIdx){ m_uLoginNickIndex = uNickIdx; }; - const QString & commandToExecAfterConnect(){ return m_szCommandToExecAfterConnect; }; - void setCommandToExecAfterConnect(const QString &szCmd){ m_szCommandToExecAfterConnect = szCmd; }; + const TQString & commandToExecAfterConnect(){ return m_szCommandToExecAfterConnect; }; + void setCommandToExecAfterConnect(const TQString &szCmd){ m_szCommandToExecAfterConnect = szCmd; }; }; #endif //!_KVI_IRCCONNECTIONSTATEDATA_H_ diff --git a/src/kvirc/kernel/kvi_ircconnectiontarget.cpp b/src/kvirc/kernel/kvi_ircconnectiontarget.cpp index 1c7e3bb..a2bb2e2 100644 --- a/src/kvirc/kernel/kvi_ircconnectiontarget.cpp +++ b/src/kvirc/kernel/kvi_ircconnectiontarget.cpp @@ -31,7 +31,7 @@ KviIrcConnectionTarget::KviIrcConnectionTarget(const KviIrcNetwork * pNetwork, const KviIrcServer * pServer, const KviProxy * pProxy, - const QString &szBindAddress) + const TQString &szBindAddress) { m_pNetwork = new KviIrcNetwork(*pNetwork); m_pServer = new KviIrcServer(*pServer); @@ -46,12 +46,12 @@ KviIrcConnectionTarget::~KviIrcConnectionTarget() if(m_pProxy)delete m_pProxy; } -const QString & KviIrcConnectionTarget::networkName() +const TQString & KviIrcConnectionTarget::networkName() { return m_pNetwork->name(); } -void KviIrcConnectionTarget::setNetworkName(const QString &szNetName) +void KviIrcConnectionTarget::setNetworkName(const TQString &szNetName) { m_pNetwork->setName(szNetName); } diff --git a/src/kvirc/kernel/kvi_ircconnectiontarget.h b/src/kvirc/kernel/kvi_ircconnectiontarget.h index 31e179d..fa5d3ad 100644 --- a/src/kvirc/kernel/kvi_ircconnectiontarget.h +++ b/src/kvirc/kernel/kvi_ircconnectiontarget.h @@ -41,29 +41,29 @@ public: KviIrcConnectionTarget(const KviIrcNetwork * pNetwork, const KviIrcServer * pServer, const KviProxy * pProxy = 0, - const QString &szBindAddress = QString::null); + const TQString &szBindAddress = TQString()); ~KviIrcConnectionTarget(); private: KviIrcNetwork * m_pNetwork; // owned, never null KviIrcServer * m_pServer; // owned, never null KviProxy * m_pProxy; // owned, may be null - QString m_szBindAddress; // forced bind address + TQString m_szBindAddress; // forced bind address public: KviIrcServer * server(){ return m_pServer; }; KviIrcNetwork * network(){ return m_pNetwork; }; KviProxy * proxy(){ return m_pProxy; }; - const QString & bindAddress(){ return m_szBindAddress; }; + const TQString & bindAddress(){ return m_szBindAddress; }; bool hasBindAddress(){ return (!m_szBindAddress.isEmpty()); }; - const QString & networkName(); + const TQString & networkName(); // this allows to force the network name: it should be used only by KviConsole // but it's KviServerParser (kvi_sp_numeric.cpp) that first // gets the new network name... thus we make it public // to remove one level of indirection. - void setNetworkName(const QString &szNetName); + void setNetworkName(const TQString &szNetName); protected: // this is for KviIrcConnectionTargetResolver only void clearProxy(); - void setBindAddress(const QString &szBindAddress){ m_szBindAddress = szBindAddress; }; + void setBindAddress(const TQString &szBindAddress){ m_szBindAddress = szBindAddress; }; }; #endif //!_KVI_IRCCONNECTIONTARGET_H_ diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp index 824993b..49e8864 100644 --- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp +++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp @@ -50,7 +50,7 @@ #define __KVI_DEBUG__ #include "kvi_debug.h" -#include <qtimer.h> +#include <tqtimer.h> extern KVIRC_API KviIrcServerDataBase * g_pIrcServerDataBase; extern KVIRC_API KviProxyDataBase * g_pProxyDataBase; @@ -59,7 +59,7 @@ extern KVIRC_API KviGarbageCollector * g_pGarbageCollector; KviIrcConnectionTargetResolver::KviIrcConnectionTargetResolver(KviIrcConnection * pConnection) -: QObject() +: TQObject() { m_pConnection = pConnection; m_pTarget = 0; @@ -70,7 +70,7 @@ KviIrcConnectionTargetResolver::KviIrcConnectionTargetResolver(KviIrcConnection m_pServerDns = 0; m_eState = Idle; - m_eStatus = Success; + m_etqStatus = Success; m_iLastError = KviError_success; } @@ -126,8 +126,8 @@ void KviIrcConnectionTargetResolver::start(KviIrcConnectionTarget * t) delete m_pStartTimer; m_pStartTimer = 0; } - m_pStartTimer = new QTimer(this); - connect(m_pStartTimer,SIGNAL(timeout()),this,SLOT(asyncStartResolve())); + m_pStartTimer = new TQTimer(this); + connect(m_pStartTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(asyncStartResolve())); m_pTarget = t; @@ -189,7 +189,7 @@ void KviIrcConnectionTargetResolver::lookupProxyHostname() if(bValidIp) { - if(!_OUTPUT_QUIET) + if(!_OUTPUT_TQUIET) m_pConsole->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs("Using cached proxy IP address (%s)"), m_pTarget->proxy()->m_szIp.ptr()); @@ -228,7 +228,7 @@ void KviIrcConnectionTargetResolver::lookupProxyHostname() } m_pProxyDns = new KviDns(); - connect(m_pProxyDns,SIGNAL(lookupDone(KviDns *)),this,SLOT(proxyLookupTerminated(KviDns *))); + connect(m_pProxyDns,TQT_SIGNAL(lookupDone(KviDns *)),this,TQT_SLOT(proxyLookupTerminated(KviDns *))); if(!m_pProxyDns->lookup(m_pTarget->proxy()->m_szHostname.ptr(), m_pTarget->proxy()->isIpV6() ? KviDns::IpV6 : KviDns::IpV4)) @@ -256,7 +256,7 @@ void KviIrcConnectionTargetResolver::proxyLookupTerminated(KviDns *) { if(m_pProxyDns->state() != KviDns::Success) { - QString szErr = KviError::getDescription(m_pProxyDns->error()); + TQString szErr = KviError::getDescription(m_pProxyDns->error()); m_pConsole->output(KVI_OUT_SYSTEMERROR, __tr2qs("Can't find the proxy IP address: %Q"), &szErr); @@ -265,7 +265,7 @@ void KviIrcConnectionTargetResolver::proxyLookupTerminated(KviDns *) __tr2qs("Resuming direct server connection")); m_pTarget->clearProxy(); } else { - QString szFirstIpAddress = m_pProxyDns->firstIpAddress(); + TQString szFirstIpAddress = m_pProxyDns->firstIpAddress(); if(!_OUTPUT_MUTE) m_pConsole->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs("Proxy hostname resolved to %Q"),&szFirstIpAddress); @@ -275,11 +275,11 @@ void KviIrcConnectionTargetResolver::proxyLookupTerminated(KviDns *) if(m_pProxyDns->hostnameCount() > 1) { - QString szFirstHostname = m_pProxyDns->firstHostname(); + TQString szFirstHostname = m_pProxyDns->firstHostname(); - for(QString * addr = m_pProxyDns->hostnameList()->next();addr;addr = m_pProxyDns->hostnameList()->next()) + for(TQString * addr = m_pProxyDns->hostnameList()->next();addr;addr = m_pProxyDns->hostnameList()->next()) { - if(!_OUTPUT_QUIET) + if(!_OUTPUT_TQUIET) m_pConsole->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs("Proxy %Q has a nickname: %Q"),&szFirstHostname,addr); } @@ -317,7 +317,7 @@ void KviIrcConnectionTargetResolver::lookupServerHostname() if(bValidIp && m_pTarget->server()->cacheIp()) { - if(!_OUTPUT_QUIET) + if(!_OUTPUT_TQUIET) m_pConsole->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs("Using cached server IP address (%s)"), m_pTarget->server()->m_szIp.utf8().data()); @@ -345,8 +345,8 @@ void KviIrcConnectionTargetResolver::lookupServerHostname() m_pServerDns = 0; } m_pServerDns = new KviDns(); - connect(m_pServerDns,SIGNAL(lookupDone(KviDns *)),this, - SLOT(serverLookupTerminated(KviDns *))); + connect(m_pServerDns,TQT_SIGNAL(lookupDone(KviDns *)),this, + TQT_SLOT(serverLookupTerminated(KviDns *))); if(!m_pServerDns->lookup(m_pTarget->server()->m_szHostname, m_pTarget->server()->isIpV6() ? KviDns::IpV6 : KviDns::IpV4)) { @@ -368,7 +368,7 @@ void KviIrcConnectionTargetResolver::serverLookupTerminated(KviDns *) { if(m_pServerDns->state() != KviDns::Success) { - QString szErr = KviError::getDescription(m_pServerDns->error()); + TQString szErr = KviError::getDescription(m_pServerDns->error()); m_pConsole->output(KVI_OUT_SYSTEMERROR, __tr2qs("Can't find the server IP address: %Q"), &szErr); @@ -384,18 +384,18 @@ void KviIrcConnectionTargetResolver::serverLookupTerminated(KviDns *) terminate(Error,m_pServerDns->error()); return; } - QString szFirstIpAddress = m_pServerDns->firstIpAddress(); + TQString szFirstIpAddress = m_pServerDns->firstIpAddress(); if(!_OUTPUT_MUTE) m_pConsole->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs("Server hostname resolved to %Q"), &szFirstIpAddress); g_pIrcServerDataBase->updateServerIp(m_pTarget->server(),szFirstIpAddress); - QString szFirstHostname = m_pServerDns->firstHostname(); + TQString szFirstHostname = m_pServerDns->firstHostname(); - if(!KviQString::equalCI(m_pTarget->server()->m_szHostname,m_pServerDns->firstHostname())) + if(!KviTQString::equalCI(m_pTarget->server()->m_szHostname,m_pServerDns->firstHostname())) { - if(!_OUTPUT_QUIET) + if(!_OUTPUT_TQUIET) m_pConsole->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs("Real hostname for %Q is %Q"), &(m_pTarget->server()->m_szHostname), @@ -407,9 +407,9 @@ void KviIrcConnectionTargetResolver::serverLookupTerminated(KviDns *) if(m_pServerDns->hostnameCount() > 1) { - for(QString * addr = m_pServerDns->hostnameList()->next();addr;addr = m_pServerDns->hostnameList()->next()) + for(TQString * addr = m_pServerDns->hostnameList()->next();addr;addr = m_pServerDns->hostnameList()->next()) { - if(!_OUTPUT_QUIET) + if(!_OUTPUT_TQUIET) m_pConsole->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs("Server %Q has a nickname: %Q"), &szFirstHostname,addr); @@ -421,7 +421,7 @@ void KviIrcConnectionTargetResolver::serverLookupTerminated(KviDns *) haveServerIp(); } -bool KviIrcConnectionTargetResolver::validateLocalAddress(const QString &szAddress,QString &szBuffer) +bool KviIrcConnectionTargetResolver::validateLocalAddress(const TQString &szAddress,TQString &szBuffer) { // szAddress may be an ip address or an interface name #ifdef COMPILE_IPV6_SUPPORT @@ -453,15 +453,15 @@ void KviIrcConnectionTargetResolver::haveServerIp() if(KVI_OPTION_BOOL(KviOption_boolUseIdentService) && !KVI_OPTION_BOOL(KviOption_boolUseIdentServiceOnlyOnConnect)) m_pConsole->frame()->executeInternalCommand(KVI_INTERNALCOMMAND_IDENT_START); - QString bindAddress; + TQString bindAddress; if(m_pTarget->hasBindAddress()) { if(!validateLocalAddress(m_pTarget->bindAddress(),bindAddress)) { - QString szBindAddress = m_pTarget->bindAddress(); - if((szBindAddress.find('.') != -1) || - (szBindAddress.find(':') != -1)) + TQString szBindAddress = m_pTarget->bindAddress(); + if((szBindAddress.tqfind('.') != -1) || + (szBindAddress.tqfind(':') != -1)) { if(!_OUTPUT_MUTE) m_pConsole->output(KVI_OUT_SYSTEMWARNING, @@ -486,7 +486,7 @@ void KviIrcConnectionTargetResolver::haveServerIp() if(!validateLocalAddress(KVI_OPTION_STRING(KviOption_stringIpV6ConnectionBindAddress),bindAddress)) { // if it is not an interface name , kill it for now and let the user correct the address - if(KVI_OPTION_STRING(KviOption_stringIpV6ConnectionBindAddress).find(':') != -1) + if(KVI_OPTION_STRING(KviOption_stringIpV6ConnectionBindAddress).tqfind(':') != -1) { if(!_OUTPUT_MUTE) m_pConsole->output(KVI_OUT_SYSTEMWARNING, @@ -515,7 +515,7 @@ void KviIrcConnectionTargetResolver::haveServerIp() if(!validateLocalAddress(KVI_OPTION_STRING(KviOption_stringIpV4ConnectionBindAddress),bindAddress)) { // if it is not an interface name , kill it for now and let the user correct the address - if(KVI_OPTION_STRING(KviOption_stringIpV4ConnectionBindAddress).find(':') != -1) + if(KVI_OPTION_STRING(KviOption_stringIpV4ConnectionBindAddress).tqfind(':') != -1) { if(!_OUTPUT_MUTE) m_pConsole->output(KVI_OUT_SYSTEMWARNING, @@ -544,12 +544,12 @@ void KviIrcConnectionTargetResolver::haveServerIp() terminate(Success,KviError_success); } -void KviIrcConnectionTargetResolver::terminate(Status s,int iLastError) +void KviIrcConnectionTargetResolver::terminate(tqStatus s,int iLastError) { __ASSERT(m_eState != Terminated); cleanup(); // do a cleanup anyway m_eState = Terminated; - m_eStatus = s; + m_etqStatus = s; m_iLastError = iLastError; emit terminated(); } diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h index 947cc71..4d5d72c 100644 --- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h +++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h @@ -26,34 +26,35 @@ #include "kvi_settings.h" #include "kvi_qstring.h" -#include <qobject.h> +#include <tqobject.h> class KviConsole; class KviDns; class KviIrcConnection; class KviIrcConnectionTarget; -class QTimer; +class TQTimer; -class KVIRC_API KviIrcConnectionTargetResolver : public QObject +class KVIRC_API KviIrcConnectionTargetResolver : public TQObject { friend class KviIrcLink; // upper protocol in the stack Q_OBJECT + TQ_OBJECT protected: KviIrcConnectionTargetResolver(KviIrcConnection * pConnection); ~KviIrcConnectionTargetResolver(); public: - enum Status { Success, Error }; + enum tqStatus { Success, Error }; enum State { Idle, Running, Terminated }; private: KviIrcConnection * m_pConnection; // shallow, never null KviIrcConnectionTarget * m_pTarget; // shallow, never null KviConsole * m_pConsole; // shallow, never null - Status m_eStatus; + tqStatus m_etqStatus; State m_eState; // Auxiliary stuff - QTimer * m_pStartTimer; // timer used to start the connection + TQTimer * m_pStartTimer; // timer used to start the connection KviDns * m_pProxyDns; // the dns object for the proxy hostnames KviDns * m_pServerDns; // the dns object for the server hostnames @@ -65,7 +66,7 @@ private: public: void start(KviIrcConnectionTarget * t); // valid only after the terminated() signal - Status status(){ return m_eStatus; }; + tqStatus status(){ return m_etqStatus; }; int lastError(){ return m_iLastError; }; // causes the resolver to terminate with iLastError == KviError_operationAborted // the terminated() signal is emitted. @@ -79,8 +80,8 @@ private: void lookupProxyHostname(); void lookupServerHostname(); void haveServerIp(); - bool validateLocalAddress(const QString &szAddress,QString &szBuffer); - void terminate(Status s,int iLastError); + bool validateLocalAddress(const TQString &szAddress,TQString &szBuffer); + void terminate(tqStatus s,int iLastError); signals: void terminated(); }; diff --git a/src/kvirc/kernel/kvi_ircconnectionuserinfo.cpp b/src/kvirc/kernel/kvi_ircconnectionuserinfo.cpp index f4d0ae4..22674f0 100644 --- a/src/kvirc/kernel/kvi_ircconnectionuserinfo.cpp +++ b/src/kvirc/kernel/kvi_ircconnectionuserinfo.cpp @@ -31,23 +31,23 @@ KviIrcConnectionUserInfo::KviIrcConnectionUserInfo() m_bAway = false; } -bool KviIrcConnectionUserInfo::hasUserMode(const QChar &m) +bool KviIrcConnectionUserInfo::hasUserMode(const TQChar &m) { - return m_szUserMode.contains(m) > 0; + return m_szUserMode.tqcontains(m) > 0; } -bool KviIrcConnectionUserInfo::addUserMode(const QChar &m) +bool KviIrcConnectionUserInfo::addUserMode(const TQChar &m) { if(hasUserMode(m))return false; m_szUserMode.append(m); return true; } -bool KviIrcConnectionUserInfo::removeUserMode(const QChar &m) +bool KviIrcConnectionUserInfo::removeUserMode(const TQChar &m) { - int idx = m_szUserMode.find(m,0); + int idx = m_szUserMode.tqfind(m,0); if(idx == -1)return false; - m_szUserMode.replace(m,QString("")); + m_szUserMode.tqreplace(m,TQString("")); return true; } diff --git a/src/kvirc/kernel/kvi_ircconnectionuserinfo.h b/src/kvirc/kernel/kvi_ircconnectionuserinfo.h index fbb66ff..ba1f1b8 100644 --- a/src/kvirc/kernel/kvi_ircconnectionuserinfo.h +++ b/src/kvirc/kernel/kvi_ircconnectionuserinfo.h @@ -37,50 +37,50 @@ protected: KviIrcConnectionUserInfo(); ~KviIrcConnectionUserInfo(){}; private: - QString m_szRealName; // the actual real name sent from the server - QString m_szNickName; // the actual nick name acknowledged by the server - QString m_szUserMode; // the actual user mode - QString m_szUserName; // user name with ident char - QString m_szLocalHostIp; // the local host ip as found by resolveLocalHost() at connection startup - QString m_szHostName; // the local host name that the server reports - QString m_szHostIp; // the host name above resolved, if possible - QString m_szAwayReason; + TQString m_szRealName; // the actual real name sent from the server + TQString m_szNickName; // the actual nick name acknowledged by the server + TQString m_szUserMode; // the actual user mode + TQString m_szUserName; // user name with ident char + TQString m_szLocalHostIp; // the local host ip as found by resolveLocalHost() at connection startup + TQString m_szHostName; // the local host name that the server reports + TQString m_szHostIp; // the host name above resolved, if possible + TQString m_szAwayReason; bool m_bAway; // is the user away ? kvi_time_t m_tAway; // time at that the user went away - QString m_szNickBeforeAway; // the nickname that the user had just before going away + TQString m_szNickBeforeAway; // the nickname that the user had just before going away // From bugtrack: - // On many IRC networks the host is masked or hashed, and if one also is connected through a LAN, + // On many IRC networks the host is tqmasked or hashed, and if one also is connected through a LAN, // it is basically impossible to initiate DCC transfers, as 192.168.0.13 or similar will be sent as IP. - // But IRC servers usually (at least in my experience) send the unmasked host in the 001 raw event + // But IRC servers usually (at least in my experience) send the untqmasked host in the 001 raw event // with something like ":Welcome to the Internet Relay Chat network, nick!ident@host". I think // it'd be a good idea to just grab the IP from that event and use it for DCC transfers by default. - QString m_szUnmaskedHostName; + TQString m_szUntqmaskedHostName; public: - const QString & realName(){ return m_szRealName; }; - const QString & nickName(){ return m_szNickName; }; - const QString & userMode(){ return m_szUserMode; }; - const QString & userName(){ return m_szUserName; }; - const QString & localHostIp(){ return m_szLocalHostIp; }; - const QString & hostName(){ return m_szHostName; }; - const QString & unmaskedHostName(){ return m_szUnmaskedHostName; }; - const QString & hostIp(){ return m_szHostIp; }; - const QString & awayReason() { return m_szAwayReason; }; - bool hasUserMode(const QChar & m); + const TQString & realName(){ return m_szRealName; }; + const TQString & nickName(){ return m_szNickName; }; + const TQString & userMode(){ return m_szUserMode; }; + const TQString & userName(){ return m_szUserName; }; + const TQString & localHostIp(){ return m_szLocalHostIp; }; + const TQString & hostName(){ return m_szHostName; }; + const TQString & untqmaskedHostName(){ return m_szUntqmaskedHostName; }; + const TQString & hostIp(){ return m_szHostIp; }; + const TQString & awayReason() { return m_szAwayReason; }; + bool hasUserMode(const TQChar & m); bool isAway(){ return m_bAway; }; time_t awayTime(){ return m_tAway; }; - const QString & nickNameBeforeAway(){ return m_szNickBeforeAway; }; + const TQString & nickNameBeforeAway(){ return m_szNickBeforeAway; }; protected: - void setRealName(const QString &szRealName){ m_szRealName = szRealName; }; - void setNickName(const QString &szNickName){ m_szNickName = szNickName; }; - void setUserMode(const QString &szUserMode){ m_szUserMode = szUserMode; }; - void setUserName(const QString &szUserName){ m_szUserName = szUserName; }; - void setHostName(const QString &szHostName){ m_szHostName = szHostName; }; - void setUnmaskedHostName(const QString &szHostName){ m_szUnmaskedHostName = szHostName; }; - void setHostIp(const QString &szHostIp){ m_szHostIp = szHostIp; }; - void setLocalHostIp(const QString &szLocalHostIp){ m_szLocalHostIp = szLocalHostIp; }; - bool addUserMode(const QChar &m); // returns false if the mode was already there - bool removeUserMode(const QChar &m); // returns fales if the mode was not there - void setAwayReason(const QString& szReazon) { m_szAwayReason=szReazon; }; + void setRealName(const TQString &szRealName){ m_szRealName = szRealName; }; + void setNickName(const TQString &szNickName){ m_szNickName = szNickName; }; + void setUserMode(const TQString &szUserMode){ m_szUserMode = szUserMode; }; + void setUserName(const TQString &szUserName){ m_szUserName = szUserName; }; + void setHostName(const TQString &szHostName){ m_szHostName = szHostName; }; + void setUntqmaskedHostName(const TQString &szHostName){ m_szUntqmaskedHostName = szHostName; }; + void setHostIp(const TQString &szHostIp){ m_szHostIp = szHostIp; }; + void setLocalHostIp(const TQString &szLocalHostIp){ m_szLocalHostIp = szLocalHostIp; }; + bool addUserMode(const TQChar &m); // returns false if the mode was already there + bool removeUserMode(const TQChar &m); // returns fales if the mode was not there + void setAwayReason(const TQString& szReazon) { m_szAwayReason=szReazon; }; void setAway(); void setBack(); }; diff --git a/src/kvirc/kernel/kvi_irccontext.cpp b/src/kvirc/kernel/kvi_irccontext.cpp index 3425758..ce71efa 100644 --- a/src/kvirc/kernel/kvi_irccontext.cpp +++ b/src/kvirc/kernel/kvi_irccontext.cpp @@ -56,7 +56,7 @@ #define __KVI_DEBUG__ #include "kvi_debug.h" -#include <qtimer.h> +#include <tqtimer.h> // the irc context identifiers start from 1 static unsigned int g_uNextIrcContextId = 1; @@ -66,7 +66,7 @@ extern KVIRC_API KviProxyDataBase * g_pProxyDataBase; KviIrcContext::KviIrcContext(KviConsole * pConsole) -: QObject(0) +: TQObject(0) { m_uId = g_uNextIrcContextId; g_uNextIrcContextId++; @@ -194,24 +194,24 @@ void KviIrcContext::closeAllContextWindows() } } -KviChannel * KviIrcContext::findDeadChannel(const QString &name) +KviChannel * KviIrcContext::findDeadChannel(const TQString &name) { if(!m_pDeadChannels)return 0; for(KviChannel * c = m_pDeadChannels->first();c;c = m_pDeadChannels->next()) { __range_valid(c->isDeadChan()); - if(KviQString::equalCI(name,c->windowName()))return c; + if(KviTQString::equalCI(name,c->windowName()))return c; } return 0; } -KviQuery * KviIrcContext::findDeadQuery(const QString &name) +KviQuery * KviIrcContext::findDeadQuery(const TQString &name) { if(!m_pDeadQueries)return 0; for(KviQuery * c = m_pDeadQueries->first();c;c = m_pDeadQueries->next()) { __range_valid(c->isDeadQuery()); - if(KviQString::equalCI(name,c->windowName()))return c; + if(KviTQString::equalCI(name,c->windowName()))return c; } return 0; } @@ -458,7 +458,7 @@ void KviIrcContext::connectToCurrentServer() d.szPass = m_pAsynchronousConnectionData->szPass; d.szNick = m_pAsynchronousConnectionData->szNick; d.szInitUMode = m_pAsynchronousConnectionData->szInitUMode; - QString szError; + TQString szError; if(!g_pIrcServerDataBase->makeCurrentServer(&d,szError)) { m_pConsole->outputNoFmt(KVI_OUT_SYSTEMERROR,szError); @@ -518,7 +518,7 @@ void KviIrcContext::connectToCurrentServer() const KviUserIdentity * pIdentity = 0; - QString szUserIdentityId = srv->userIdentityId(); + TQString szUserIdentityId = srv->userIdentityId(); if(!szUserIdentityId.isEmpty()) pIdentity = KviUserIdentityManager::instance()->findIdentity(szUserIdentityId); @@ -596,21 +596,21 @@ void KviIrcContext::connectionFailed(int iError) //FIXME: Multiply the delay by (m_uConnectAttemptCount / 2) so later connects are less frequent. if(!_OUTPUT_MUTE) { - QString tmp; - KviQString::sprintf(tmp,__tr2qs("Will attempt to reconnect in %d seconds"),KVI_OPTION_UINT(KviOption_uintAutoReconnectDelay)); - QString num; + TQString tmp; + KviTQString::sprintf(tmp,__tr2qs("Will attempt to reconnect in %d seconds"),KVI_OPTION_UINT(KviOption_uintAutoReconnectDelay)); + TQString num; if(!KVI_OPTION_UINT(KviOption_uintMaxAutoReconnectAttempts)) - KviQString::sprintf(num,__tr2qs("%d"),m_uConnectAttemptCount); + KviTQString::sprintf(num,__tr2qs("%d"),m_uConnectAttemptCount); else - KviQString::sprintf(num,__tr2qs("%d of %d"), + KviTQString::sprintf(num,__tr2qs("%d of %d"), m_uConnectAttemptCount,KVI_OPTION_UINT(KviOption_uintMaxAutoReconnectAttempts)); tmp += " [" + num + "]"; m_pConsole->outputNoFmt(KVI_OUT_SYSTEMMESSAGE,tmp); } KviIrcServer oldServer(*(connection()->server())); - QString oldNickname = connection()->userInfo()->isAway() ? connection()->userInfo()->nickNameBeforeAway() : connection()->userInfo()->nickName(); + TQString oldNickname = connection()->userInfo()->isAway() ? connection()->userInfo()->nickNameBeforeAway() : connection()->userInfo()->nickName(); KviAsynchronousConnectionData * d = new KviAsynchronousConnectionData(); d->szServer = oldServer.m_szHostname; @@ -678,7 +678,7 @@ void KviIrcContext::connectionEstabilished() } // Add to recent server list (build the url of type irc[6]://<server>:<port> - QString url; + TQString url; KviIrcUrl::join(url,connection()->server()); g_pApp->addRecentServer(url); @@ -698,12 +698,12 @@ void KviIrcContext::connectionTerminated() pInfo->m_bIsAway=connection()->userInfo()->isAway(); pInfo->m_szAwayReason=connection()->userInfo()->awayReason(); - // we consider it unexpected when we haven't sent a QUIT message and we're connected + // we consider it unexpected when we haven't sent a TQUIT message and we're connected // or alternatively when a simulation of such a termination is requested (this is used to keep the queries open etc..) bool bUnexpectedDisconnect = (!(connection()->stateData()->sentQuit())) && (m_eState == KviIrcContext::Connected) || connection()->stateData()->simulateUnexpectedDisconnect(); - QString szChannels,szProtectedChannels,szPasswords,szCurPass,szCurChan; + TQString szChannels,szProtectedChannels,szPasswords,szCurPass,szCurChan; if(bUnexpectedDisconnect) { @@ -714,7 +714,7 @@ void KviIrcContext::connectionTerminated() // FIXME: THIS SHOULD BE A KviIrcConnection FUNCTION int idx = 0; KviChannel * c; - QString szChannels,szProtectedChannels,szPasswords,szCurPass,szCurChan; + TQString szChannels,szProtectedChannels,szPasswords,szCurPass,szCurChan; // first only chans without key, in groups of 4 for(c = connection()->channelList()->first();c;c = connection()->channelList()->next()) { @@ -807,8 +807,8 @@ void KviIrcContext::connectionTerminated() void KviIrcContext::beginAsynchronousConnect(unsigned int uDelayInMSecs) { if(m_pReconnectTimer)delete m_pReconnectTimer; - m_pReconnectTimer = new QTimer(this); - connect(m_pReconnectTimer,SIGNAL(timeout()),this,SLOT(asynchronousConnect())); + m_pReconnectTimer = new TQTimer(this); + connect(m_pReconnectTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(asynchronousConnect())); m_pReconnectTimer->start(uDelayInMSecs); } @@ -828,7 +828,7 @@ void KviIrcContext::asynchronousConnect() } -void KviIrcContext::terminateConnectionRequest(bool bForce,const QString &szQuitMsg,bool bSimulateUnexpectedDisconnect) +void KviIrcContext::terminateConnectionRequest(bool bForce,const TQString &szQuitMsg,bool bSimulateUnexpectedDisconnect) { if(!connection())return; // hm ? @@ -843,20 +843,20 @@ void KviIrcContext::terminateConnectionRequest(bool bForce,const QString &szQuit if(!connection()->stateData()->sentQuit()) { KVS_TRIGGER_EVENT_0(KviEvent_OnDisconnectRequest,m_pConsole); - QString szQuit = szQuitMsg; + TQString szQuit = szQuitMsg; if(szQuit.isEmpty())szQuit = KVI_OPTION_STRING(KviOption_stringQuitMessage); - szQuit.replace(";","\\;"); - szQuit.replace("\n"," "); - QString buffer; + szQuit.tqreplace(";","\\;"); + szQuit.tqreplace("\n"," "); + TQString buffer; KviKvsVariant ret; if(KviKvsScript::evaluate(szQuit,console(),0,&ret)) ret.asString(buffer); else buffer = szQuit; - KviQCString dat = console()->encodeText(buffer); + KviTQCString dat = console()->encodeText(buffer); bWasSentQuit = false; connection()->stateData()->setSentQuit(); - connection()->sendFmtData("QUIT :%s",dat.data() ? dat.data() : ""); // here theoretically we COULD get disconnected + connection()->sendFmtData("TQUIT :%s",dat.data() ? dat.data() : ""); // here theoretically we COULD get disconnected } // else it was already sent anyway if(KVI_OPTION_BOOL(KviOption_boolForceBrutalQuit) || bWasSentQuit || bForce) @@ -871,7 +871,7 @@ void KviIrcContext::terminateConnectionRequest(bool bForce,const QString &szQuit if(connection())connection()->abort(); } else { if(!bWasSentQuit) - m_pConsole->outputNoFmt(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Sent QUIT, waiting for the server to close the connection...")); + m_pConsole->outputNoFmt(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Sent TQUIT, waiting for the server to close the connection...")); // else it was already sent anyway } } @@ -888,11 +888,11 @@ void KviIrcContext::terminateConnectionRequest(bool bForce,const QString &szQuit } } -void KviIrcContext::timerEvent(QTimerEvent *e) +void KviIrcContext::timerEvent(TQTimerEvent *e) { if(e->timerId() != m_iHeartbeatTimerId) { - QObject::timerEvent(e); + TQObject::timerEvent(e); return; } diff --git a/src/kvirc/kernel/kvi_irccontext.h b/src/kvirc/kernel/kvi_irccontext.h index 07c6ef9..8cad675 100644 --- a/src/kvirc/kernel/kvi_irccontext.h +++ b/src/kvirc/kernel/kvi_irccontext.h @@ -26,7 +26,7 @@ #include "kvi_settings.h" #include "kvi_pointerlist.h" -#include <qobject.h> +#include <tqobject.h> class KviChannel; class KviQuery; @@ -37,7 +37,7 @@ class KviExternalServerDataParser; class KviAsynchronousConnectionData; class KviIrcDataStreamMonitor; class KviWindow; -class QTimer; +class TQTimer; class KviConsole; class KviIrcNetwork; class KviIrcServer; @@ -55,7 +55,7 @@ class KviIrcServer; in the KviConsole destructor. No other class can allocate KviIrcContext objects. */ -class KVIRC_API KviIrcContext : public QObject +class KVIRC_API KviIrcContext : public TQObject { friend class KviConsole; friend class KviChannel; @@ -63,6 +63,7 @@ class KVIRC_API KviIrcContext : public QObject friend class KviIrcConnection; friend class KviIrcContextToolBar; Q_OBJECT + TQ_OBJECT protected: KviIrcContext(KviConsole * pConsole); // only KviConsole can create this public: @@ -94,7 +95,7 @@ protected: KviAsynchronousConnectionData * m_pSavedAsynchronousConnectionData; // owned, may be null, this is used to reconnect to the last server in this context unsigned int m_uConnectAttemptCount; - QTimer * m_pReconnectTimer; + TQTimer * m_pReconnectTimer; KviPointerList<KviIrcDataStreamMonitor> * m_pMonitorList; // owned, may be null @@ -124,8 +125,8 @@ public: bool unregisterDeadQuery(KviQuery * q); void registerDeadChannel(KviChannel * c); void registerDeadQuery(KviQuery * q); - KviChannel * findDeadChannel(const QString &name); - KviQuery * findDeadQuery(const QString &nick); + KviChannel * findDeadChannel(const TQString &name); + KviQuery * findDeadQuery(const TQString &nick); KviQuery * firstDeadQuery(); // other windows bound to the context void closeAllContextWindows(); @@ -155,7 +156,7 @@ public: void registerDataStreamMonitor(KviIrcDataStreamMonitor * m); void unregisterDataStreamMonitor(KviIrcDataStreamMonitor *m); - void terminateConnectionRequest(bool bForce,const QString &szQuitMessage = QString::null,bool bSimulateUnexpectedDisconnect = false); + void terminateConnectionRequest(bool bForce,const TQString &szQuitMessage = TQString(),bool bSimulateUnexpectedDisconnect = false); protected: // called by KviIrcContextToolBar: this will DIE in favor of connectOrDisconnect() @@ -167,7 +168,7 @@ protected: // called by KviIrcConnection void loginComplete(); // our heartbeat timer event - virtual void timerEvent(QTimerEvent *e); + virtual void timerEvent(TQTimerEvent *e); public: void connectOrDisconnect(){ connectButtonClicked(); }; protected: diff --git a/src/kvirc/kernel/kvi_irclink.cpp b/src/kvirc/kernel/kvi_irclink.cpp index 8c79507..132da95 100644 --- a/src/kvirc/kernel/kvi_irclink.cpp +++ b/src/kvirc/kernel/kvi_irclink.cpp @@ -50,7 +50,7 @@ #define __KVI_DEBUG__ #include "kvi_debug.h" -#include <qtimer.h> +#include <tqtimer.h> extern KVIRC_API KviIrcServerDataBase * g_pIrcServerDataBase; extern KVIRC_API KviProxyDataBase * g_pProxyDataBase; @@ -59,7 +59,7 @@ extern KVIRC_API KviGarbageCollector * g_pGarbageCollector; KviIrcLink::KviIrcLink(KviIrcConnection * pConnection) -: QObject() +: TQObject() { m_pConnection = pConnection; m_pTarget = pConnection->target(); @@ -105,7 +105,7 @@ void KviIrcLink::destroySocket() { if(m_pLinkFilter) { - QObject::disconnect(m_pLinkFilter,0,this,0); + TQObject::disconnect(m_pLinkFilter,0,this,0); // the module extension server links must be destroyed in the module that provided it m_pLinkFilter->die(); m_pLinkFilter = 0; @@ -118,7 +118,7 @@ void KviIrcLink::destroySocket() } } -void KviIrcLink::createSocket(const QString &szLinkFilterName) +void KviIrcLink::createSocket(const TQString &szLinkFilterName) { destroySocket(); // make sure we do not leak memory @@ -126,14 +126,14 @@ void KviIrcLink::createSocket(const QString &szLinkFilterName) if(szLinkFilterName.isEmpty())return; - if(KviQString::equalCI(szLinkFilterName,"irc"))return; + if(KviTQString::equalCI(szLinkFilterName,"irc"))return; m_pLinkFilter = (KviMexLinkFilter *)g_pModuleExtensionManager->allocateExtension("linkfilter", szLinkFilterName.utf8().data(),m_pConsole,0,this,szLinkFilterName.utf8().data()); if(m_pLinkFilter) { - connect(m_pLinkFilter,SIGNAL(destroyed()),this,SLOT(linkFilterDestroyed())); + connect(m_pLinkFilter,TQT_SIGNAL(destroyed()),this,TQT_SLOT(linkFilterDestroyed())); m_pConsole->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs("Using filtered IRC protocol: Link filter is \"%Q\""),&szLinkFilterName); return; @@ -167,7 +167,7 @@ void KviIrcLink::start() m_eState = Connecting; if(m_pResolver)delete m_pResolver; // this should never happen m_pResolver = new KviIrcConnectionTargetResolver(m_pConnection); - connect(m_pResolver,SIGNAL(terminated()),this,SLOT(resolverTerminated())); + connect(m_pResolver,TQT_SIGNAL(terminated()),this,TQT_SLOT(resolverTerminated())); m_pResolver->start(m_pTarget); } @@ -197,7 +197,7 @@ void KviIrcLink::resolverTerminated() if(iErr != KviError_success) { - QString strDescription(KviError::getDescription(iErr)); + TQString strDescription(KviError::getDescription(iErr)); m_pConsole->output(KVI_OUT_SYSTEMERROR, __tr2qs("Failed to start the connection: %Q"), &strDescription); @@ -276,7 +276,7 @@ void KviIrcLink::processData(char * buffer,int len) // handler event that disconnects explicitly) // // We handle it by simply returning control to readData() which - // will return immediately (and safely) control to Qt + // will return immediately (and safely) control to TQt kvi_free(messageBuffer); return; } diff --git a/src/kvirc/kernel/kvi_irclink.h b/src/kvirc/kernel/kvi_irclink.h index bb220ec..1426d2e 100644 --- a/src/kvirc/kernel/kvi_irclink.h +++ b/src/kvirc/kernel/kvi_irclink.h @@ -26,7 +26,7 @@ #include "kvi_settings.h" #include "kvi_qstring.h" -#include <qobject.h> +#include <tqobject.h> class KviConsole; class KviIrcServer; @@ -40,11 +40,12 @@ class KviDataBuffer; class KviMexLinkFilter; -class KVIRC_API KviIrcLink : public QObject +class KVIRC_API KviIrcLink : public TQObject { friend class KviIrcConnection; // upper protocol in the stack friend class KviIrcSocket; // lower protocol in the stack Q_OBJECT + TQ_OBJECT public: enum State { Idle, Connecting, Connected }; protected: @@ -112,7 +113,7 @@ protected slots: void linkFilterDestroyed(); private: void destroySocket(); - void createSocket(const QString &szLinkFilterName); + void createSocket(const TQString &szLinkFilterName); signals: void connectionFailed(); // the connection attempt has failed private slots: diff --git a/src/kvirc/kernel/kvi_ircsocket.cpp b/src/kvirc/kernel/kvi_ircsocket.cpp index 45df561..4585276 100644 --- a/src/kvirc/kernel/kvi_ircsocket.cpp +++ b/src/kvirc/kernel/kvi_ircsocket.cpp @@ -47,8 +47,8 @@ #include "kvi_sslmaster.h" #endif -#include <qtimer.h> -#include <qsocketnotifier.h> +#include <tqtimer.h> +#include <tqsocketnotifier.h> #ifndef COMPILE_ON_WINDOWS #include <unistd.h> //for gettimeofday() @@ -63,7 +63,7 @@ unsigned int g_uNextIrcLinkId = 1; KviIrcSocket::KviIrcSocket(KviIrcLink * pLink) -: QObject() +: TQObject() { m_uId = g_uNextIrcLinkId; g_uNextIrcLinkId++; @@ -103,8 +103,8 @@ KviIrcSocket::KviIrcSocket(KviIrcLink * pLink) m_bInProcessData = false; - m_pFlushTimer = new QTimer(); // queue flush timer - connect(m_pFlushTimer,SIGNAL(timeout()),this,SLOT(flushSendQueue())); + m_pFlushTimer = new TQTimer(); // queue flush timer + connect(m_pFlushTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(flushSendQueue())); } KviIrcSocket::~KviIrcSocket() @@ -171,49 +171,49 @@ void KviIrcSocket::reset() setState(Idle); } -void KviIrcSocket::outputSSLMessage(const QString &szMsg) +void KviIrcSocket::outputSSLMessage(const TQString &szMsg) { m_pConsole->output(KVI_OUT_SSL,__tr2qs("[SSL]: %Q"),&szMsg); } -void KviIrcSocket::outputSSLError(const QString &szMsg) +void KviIrcSocket::outputSSLError(const TQString &szMsg) { m_pConsole->output(KVI_OUT_SSL,__tr2qs("[SSL ERROR]: %Q"),&szMsg); } -void KviIrcSocket::outputProxyMessage(const QString &szMsg) +void KviIrcSocket::outputProxyMessage(const TQString &szMsg) { - QStringList list=QStringList::split("\n",szMsg); - for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) + TQStringList list=TQStringList::split("\n",szMsg); + for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) { - QString szTemporary = (*it).stripWhiteSpace(); + TQString szTemporary = (*it).stripWhiteSpace(); m_pConsole->output(KVI_OUT_SOCKETMESSAGE,__tr2qs("[PROXY]: %Q"),&(szTemporary)); } } -void KviIrcSocket::outputProxyError(const QString &szMsg) +void KviIrcSocket::outputProxyError(const TQString &szMsg) { - QStringList list=QStringList::split("\n",szMsg); - for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) + TQStringList list=TQStringList::split("\n",szMsg); + for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) { - QString szTemporary = (*it).stripWhiteSpace(); + TQString szTemporary = (*it).stripWhiteSpace(); m_pConsole->output(KVI_OUT_SOCKETERROR,__tr2qs("[PROXY ERROR]: %Q"),&(szTemporary)); } } -void KviIrcSocket::outputSocketMessage(const QString &szMsg) +void KviIrcSocket::outputSocketMessage(const TQString &szMsg) { m_pConsole->output(KVI_OUT_SOCKETMESSAGE,__tr2qs("[SOCKET]: %Q"),&szMsg); } -void KviIrcSocket::outputSocketError(const QString &szMsg) +void KviIrcSocket::outputSocketError(const TQString &szMsg) { m_pConsole->output(KVI_OUT_SOCKETERROR,__tr2qs("[SOCKET ERROR]: %Q"),&szMsg); } -void KviIrcSocket::outputSocketWarning(const QString &szMsg) +void KviIrcSocket::outputSocketWarning(const TQString &szMsg) { m_pConsole->output(KVI_OUT_SOCKETWARNING,__tr2qs("[SOCKET WARNING]: %Q"),&szMsg); } @@ -273,7 +273,7 @@ int KviIrcSocket::startConnection(KviIrcServer *srv,KviProxy * prx,const char * // check the proxy IP address if(m_pProxy->isIpV6()) { - // IpV6 proxy :) (STILL QUITE UNTESTED ?) + // IpV6 proxy :) (STILL TQUITE UNTESTED ?) #ifdef COMPILE_IPV6_SUPPORT bTargetIpV6 = true; if(!kvi_isValidStringIp_V6(m_pProxy->ip()))return KviError_invalidProxyAddress; @@ -330,15 +330,15 @@ int KviIrcSocket::startConnection(KviIrcServer *srv,KviProxy * prx,const char * bBindOk = kvi_socket_bind(m_sock,localSa.socketAddress(),((int)(localSa.addressLength()))); } - QString tmp; + TQString tmp; if(bBindOk) { if(_OUTPUT_VERBOSE) - KviQString::sprintf(tmp,__tr2qs("Binding to local address %s"),bindAddress); + KviTQString::sprintf(tmp,__tr2qs("Binding to local address %s"),bindAddress); outputSocketMessage(tmp); } else { if(_OUTPUT_VERBOSE) - KviQString::sprintf(tmp,__tr2qs("Binding to local address %s failed: the kernel will choose the correct interface"),bindAddress); + KviTQString::sprintf(tmp,__tr2qs("Binding to local address %s failed: the kernel will choose the correct interface"),bindAddress); outputSocketWarning(tmp); } } @@ -374,14 +374,14 @@ int KviIrcSocket::startConnection(KviIrcServer *srv,KviProxy * prx,const char * } // and setup the WRITE notifier... - m_pWsn = new QSocketNotifier((int)m_sock,QSocketNotifier::Write); - QObject::connect(m_pWsn,SIGNAL(activated(int)),this,SLOT(writeNotifierFired(int))); + m_pWsn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Write); + TQObject::connect(m_pWsn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(writeNotifierFired(int))); m_pWsn->setEnabled(true); // set the timer if(KVI_OPTION_UINT(KviOption_uintIrcSocketTimeout) < 5)KVI_OPTION_UINT(KviOption_uintIrcSocketTimeout) = 5; - m_pTimeoutTimer = new QTimer(); - QObject::connect(m_pTimeoutTimer,SIGNAL(timeout()),this,SLOT(connectionTimedOut())); + m_pTimeoutTimer = new TQTimer(); + TQObject::connect(m_pTimeoutTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(connectionTimedOut())); m_pTimeoutTimer->start(KVI_OPTION_UINT(KviOption_uintIrcSocketTimeout) * 1000,true); // and wait for connect @@ -456,9 +456,9 @@ void KviIrcSocket::connectedToProxy() m_pRsn = 0; } - m_pRsn = new QSocketNotifier((int)m_sock,QSocketNotifier::Read); + m_pRsn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Read); - QObject::connect(m_pRsn,SIGNAL(activated(int)),this,SLOT(readProxyData(int))); + TQObject::connect(m_pRsn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(readProxyData(int))); switch(m_pProxy->protocol()) { @@ -696,7 +696,7 @@ void KviIrcSocket::proxyLoginV4() char *bufToSend = new char[iLen]; bufToSend[0]=(unsigned char)4; //Version 4 bufToSend[1]=(unsigned char)1; //Connect - Q_UINT16 port=(Q_UINT16)htons(m_pIrcServer->port()); + TQ_UINT16 port=(TQ_UINT16)htons(m_pIrcServer->port()); kvi_memmove((void *)(bufToSend+2),(void *)&port,2); struct in_addr ircInAddr; @@ -704,7 +704,7 @@ void KviIrcSocket::proxyLoginV4() if(!kvi_stringIpToBinaryIp(m_pIrcServer->ip(),&ircInAddr)) debug("SOCKET INTERNAL ERROR IN IPV4 (SOCKS4) ADDR CONVERSION"); - Q_UINT32 host=(Q_UINT32)ircInAddr.s_addr; + TQ_UINT32 host=(TQ_UINT32)ircInAddr.s_addr; kvi_memmove((void *)(bufToSend+4),(void *)&host,4); kvi_memmove((void *)(bufToSend+8),(void *)(szUserAndPass.ptr()),szUserAndPass.len()); // send it into hyperspace... @@ -741,9 +741,9 @@ void KviIrcSocket::proxyLoginV5() // The VER field is set to X'05' for this version of the protocol. The // NMETHODS field contains the number of method identifier octets that // appear in the METHODS field. - // The values currently defined for METHOD are: + // The values currently defined for TQT_METHOD are: // - // o X'00' NO AUTHENTICATION REQUIRED + // o X'00' NO AUTHENTICATION RETQUIRED // o X'01' GSSAPI // o X'02' USERNAME/PASSWORD // o X'03' CHAP @@ -908,7 +908,7 @@ void KviIrcSocket::proxySendTargetDataV5() kvi_memmove((void *)(bufToSend + 5), (void *)(m_pIrcServer->hostName().utf8().data()), m_pIrcServer->hostName().utf8().length()); - Q_UINT16 port = (Q_UINT16)htons(m_pIrcServer->port()); + TQ_UINT16 port = (TQ_UINT16)htons(m_pIrcServer->port()); kvi_memmove((void *)(bufToSend + 4 + 1 + m_pIrcServer->hostName().utf8().length()),(void *)&port,2); } else if(m_pIrcServer->isIpV6()) { #ifdef COMPILE_IPV6_SUPPORT @@ -916,16 +916,16 @@ void KviIrcSocket::proxySendTargetDataV5() if(!kvi_stringIpToBinaryIp_V6(m_pIrcServer->ip(),&ircInAddr))debug("SOCKET INTERNAL ERROR IN IPV6 ADDR CONVERSION"); kvi_memmove((void *)(bufToSend + 4),(void *)(&ircInAddr),4); - Q_UINT16 port = (Q_UINT16)htons(m_pIrcServer->port()); + TQ_UINT16 port = (TQ_UINT16)htons(m_pIrcServer->port()); kvi_memmove((void *)(bufToSend + 20),(void *)&port,2); #endif } else { struct in_addr ircInAddr; if(!kvi_stringIpToBinaryIp(m_pIrcServer->ip(),&ircInAddr))debug("SOCKET INTERNAL ERROR IN IPV4 ADDR CONVERSION"); - Q_UINT32 host = (Q_UINT32)ircInAddr.s_addr; + TQ_UINT32 host = (TQ_UINT32)ircInAddr.s_addr; kvi_memmove((void *)(bufToSend + 4),(void *)&host,4); - Q_UINT16 port = (Q_UINT16)htons(m_pIrcServer->port()); + TQ_UINT16 port = (TQ_UINT16)htons(m_pIrcServer->port()); kvi_memmove((void *)(bufToSend + 8),(void *)&port,2); } @@ -966,20 +966,20 @@ void KviIrcSocket::proxyHandleV5AuthReply(unsigned char reply) void KviIrcSocket::proxyHandleV5MethodReply(unsigned char reply) { // The server selects from one of the methods given in METHODS, and - // sends a METHOD selection message: + // sends a TQT_METHOD selection message: // // +----+--------+ - // |VER | METHOD | + // |VER | TQT_METHOD | // +----+--------+ // | 1 | 1 | // +----+--------+ // - // If the selected METHOD is X'FF', none of the methods listed by the + // If the selected TQT_METHOD is X'FF', none of the methods listed by the // client are acceptable, and the client MUST close the connection. // - // The values currently defined for METHOD are: + // The values currently defined for TQT_METHOD are: // - // o X'00' NO AUTHENTICATION REQUIRED + // o X'00' NO AUTHENTICATION RETQUIRED // o X'01' GSSAPI // o X'02' USERNAME/PASSWORD // o X'03' CHAP @@ -1150,7 +1150,7 @@ void KviIrcSocket::proxyHandleHttpFinalReply(const char * buffer,int bufLen) { if(idx == tmp.findFirstIdx(' ')) { - QString msg = __tr2qs("Proxy response: "); + TQString msg = __tr2qs("Proxy response: "); msg += tmp.ptr(); if(_OUTPUT_VERBOSE) outputProxyMessage(msg); @@ -1178,8 +1178,8 @@ void KviIrcSocket::proxyHandleHttpFinalReply(const char * buffer,int bufLen) m_pRsn = 0; } - m_pRsn = new QSocketNotifier((int)m_sock,QSocketNotifier::Read); - QObject::connect(m_pRsn,SIGNAL(activated(int)),this,SLOT(readHttpProxyErrorData(int))); + m_pRsn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Read); + TQObject::connect(m_pRsn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(readHttpProxyErrorData(int))); m_pRsn->setEnabled(true); setState(ProxyHttpError); @@ -1268,13 +1268,13 @@ void KviIrcSocket::doSSLHandshake(int) linkUp(); break; case KviSSL::WantRead: - m_pRsn = new QSocketNotifier((int)m_sock,QSocketNotifier::Read); - QObject::connect(m_pRsn,SIGNAL(activated(int)),this,SLOT(doSSLHandshake(int))); + m_pRsn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Read); + TQObject::connect(m_pRsn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(doSSLHandshake(int))); m_pRsn->setEnabled(true); break; case KviSSL::WantWrite: - m_pWsn = new QSocketNotifier((int)m_sock,QSocketNotifier::Write); - QObject::connect(m_pWsn,SIGNAL(activated(int)),this,SLOT(doSSLHandshake(int))); + m_pWsn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Write); + TQObject::connect(m_pWsn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(doSSLHandshake(int))); m_pWsn->setEnabled(true); break; case KviSSL::RemoteEndClosedConnection: @@ -1296,8 +1296,8 @@ void KviIrcSocket::doSSLHandshake(int) raiseError((err ? KviError::translateSystemError(err) : KviError_unknownError)); } else { // can recover ? (EAGAIN , EINTR ?) - m_pWsn = new QSocketNotifier((int)m_sock,QSocketNotifier::Write); - QObject::connect(m_pWsn,SIGNAL(activated(int)),this,SLOT(doSSLHandshake(int))); + m_pWsn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Write); + TQObject::connect(m_pWsn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(doSSLHandshake(int))); m_pWsn->setEnabled(true); return; } @@ -1340,8 +1340,8 @@ void KviIrcSocket::linkUp() m_pRsn = 0; } - m_pRsn = new QSocketNotifier((int)m_sock,QSocketNotifier::Read); - QObject::connect(m_pRsn,SIGNAL(activated(int)),this,SLOT(readData(int))); + m_pRsn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Read); + TQObject::connect(m_pRsn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(readData(int))); m_pRsn->setEnabled(true); // yahoo! @@ -1505,7 +1505,7 @@ void KviIrcSocket::processData(char * buffer,int) // handler event that disconnects explicitly) // // We handle it by simply returning control to readData() which - // will return immediately (and safely) control to Qt + // will return immediately (and safely) control to TQt kvi_free(messageBuffer); m_bInProcessData = false; return; @@ -1647,7 +1647,7 @@ void KviIrcSocket::queue_removeAllMessages() // // Attempts to send as much as possible to the server // If fails (happens only on really lagged servers) -// calls itself with a QTimer shot after KVI_OPTION_UINT(KviOption_uintSocketQueueFlushTimeout) ms +// calls itself with a TQTimer shot after KVI_OPTION_UINT(KviOption_uintSocketQueueFlushTimeout) ms // to retry again... // void KviIrcSocket::flushSendQueue() @@ -1800,7 +1800,7 @@ handle_system_error: //flushed completely ... } -bool KviIrcSocket::getLocalHostIp(QString &szIp,bool bIpV6) +bool KviIrcSocket::getLocalHostIp(TQString &szIp,bool bIpV6) { if(m_state != Connected)return false; diff --git a/src/kvirc/kernel/kvi_ircsocket.h b/src/kvirc/kernel/kvi_ircsocket.h index 4946fd2..b17f935 100644 --- a/src/kvirc/kernel/kvi_ircsocket.h +++ b/src/kvirc/kernel/kvi_ircsocket.h @@ -30,7 +30,7 @@ #include "kvi_time.h" #include "kvi_pointerlist.h" -#include <qobject.h> +#include <tqobject.h> class KviIrcServer; class KviProxy; @@ -41,8 +41,8 @@ class KviSSL; class KviConsole; class KviDataBuffer; -class QTimer; -class QSocketNotifier; +class TQTimer; +class TQSocketNotifier; // // This class is the lowest level of the KVIrc networking stack @@ -58,9 +58,10 @@ typedef struct _KviIrcSocketMsgEntry } KviIrcSocketMsgEntry; -class KVIRC_API KviIrcSocket : public QObject +class KVIRC_API KviIrcSocket : public TQObject { Q_OBJECT + TQ_OBJECT public: KviIrcSocket(KviIrcLink * pLink); ~KviIrcSocket(); @@ -84,18 +85,18 @@ protected: KviConsole * m_pConsole; kvi_socket_t m_sock; SocketState m_state; - QSocketNotifier * m_pWsn; - QSocketNotifier * m_pRsn; + TQSocketNotifier * m_pWsn; + TQSocketNotifier * m_pRsn; KviIrcServer * m_pIrcServer; KviProxy * m_pProxy; - QTimer * m_pTimeoutTimer; + TQTimer * m_pTimeoutTimer; unsigned int m_uReadBytes; unsigned int m_uSentBytes; int m_iLastError; unsigned int m_uSentPackets; KviIrcSocketMsgEntry * m_pSendQueueHead; KviIrcSocketMsgEntry * m_pSendQueueTail; - QTimer * m_pFlushTimer; + TQTimer * m_pFlushTimer; struct timeval m_tAntiFloodLastMessageTime; bool m_bInProcessData; #ifdef COMPILE_SSL_SUPPORT @@ -123,7 +124,7 @@ public: //bool sendFmtData(const char *fmt,...) KVI_DEPRECATED; bool sendPacket(KviDataBuffer * pData); void abort(); - bool getLocalHostIp(QString &szIp,bool bIpV6); + bool getLocalHostIp(TQString &szIp,bool bIpV6); protected slots: void connectionTimedOut(); void writeNotifierFired(int); @@ -162,13 +163,13 @@ protected: virtual void queue_insertMessage(KviIrcSocketMsgEntry *msg_ptr); virtual void setState(SocketState st); private: - void outputSSLMessage(const QString &szMsg); - void outputSSLError(const QString &szMsg); - void outputProxyMessage(const QString &szMsg); - void outputProxyError(const QString &szMsg); - void outputSocketMessage(const QString &szMsg); - void outputSocketWarning(const QString &szMsg); - void outputSocketError(const QString &szMsg); + void outputSSLMessage(const TQString &szMsg); + void outputSSLError(const TQString &szMsg); + void outputProxyMessage(const TQString &szMsg); + void outputProxyError(const TQString &szMsg); + void outputSocketMessage(const TQString &szMsg); + void outputSocketWarning(const TQString &szMsg); + void outputSocketError(const TQString &szMsg); }; #endif //_KVI_IRCSOCKET_H_ diff --git a/src/kvirc/kernel/kvi_ircurl.cpp b/src/kvirc/kernel/kvi_ircurl.cpp index 5b44310..2a35d78 100644 --- a/src/kvirc/kernel/kvi_ircurl.cpp +++ b/src/kvirc/kernel/kvi_ircurl.cpp @@ -141,7 +141,7 @@ bool KviIrcUrl::parse(const char * url,KviStr &cmdBuffer,int contextSpec) return true; } -void KviIrcUrl::split(QString url, KviIrcUrlParts& result) +void KviIrcUrl::split(TQString url, KviIrcUrlParts& result) { // irc[s][6]://<server>[:<port>][/<channel>[?<pass>]][[,<channel>[?<pass>]] @@ -151,24 +151,24 @@ void KviIrcUrl::split(QString url, KviIrcUrlParts& result) result.iPort = 6667; result.iError=0; - int iProtoLen = url.find("://"); + int iProtoLen = url.tqfind("://"); if(iProtoLen!=-1) { - if(KviQString::equalCIN(url,"irc",3)) { + if(KviTQString::equalCIN(url,"irc",3)) { // OK, seems to be a valid proto; url = url.right(url.length()-3); - if(KviQString::equalCIN(url,"s",1)) { + if(KviTQString::equalCIN(url,"s",1)) { result.bSsl=true; url = url.right(url.length()-1); } - if(KviQString::equalCIN(url,"6",1)) { + if(KviTQString::equalCIN(url,"6",1)) { result.bIpV6=true; url = url.right(url.length()-1); } - if(!KviQString::equalCIN(url,"://",3)) { + if(!KviTQString::equalCIN(url,"://",3)) { //irc(???):// proto?? result.iError |= InvalidProtocol; } - iProtoLen = url.find("://"); + iProtoLen = url.tqfind("://"); url = url.right(url.length()-iProtoLen-3); } else { result.iError |= InvalidProtocol; @@ -176,13 +176,13 @@ void KviIrcUrl::split(QString url, KviIrcUrlParts& result) } //Ok, we understand a protocol.. Now we shuld find a server name:) int iTmp; - iTmp = url.find(':'); + iTmp = url.tqfind(':'); if(iTmp!=-1) { result.szHost = url.left(iTmp); url = url.right(url.length()-iTmp-1); // Accepted, now the time for the port:) bool bOk; - if( (iTmp = url.find('/')) != -1) { // any channels pending? + if( (iTmp = url.tqfind('/')) != -1) { // any channels pending? result.iPort = url.left(iTmp).toUInt(&bOk); if(!bOk) { result.iPort = 6667; @@ -197,7 +197,7 @@ void KviIrcUrl::split(QString url, KviIrcUrlParts& result) } url = ""; } - } else if( (iTmp = url.find('/')) != -1) { // have channels?? + } else if( (iTmp = url.tqfind('/')) != -1) { // have channels?? result.szHost = url.left(iTmp); url = url.right(url.length()-iTmp-1); } else { @@ -207,11 +207,11 @@ void KviIrcUrl::split(QString url, KviIrcUrlParts& result) //and, finally, channels:D - result.chanList = QStringList::split(',',url); + result.chanList = TQStringList::split(',',url); } -void KviIrcUrl::join(QString &uri, KviIrcServer* server) +void KviIrcUrl::join(TQString &uri, KviIrcServer* server) { if(server) { @@ -222,18 +222,18 @@ void KviIrcUrl::join(QString &uri, KviIrcServer* server) uri.append("://"); uri.append(server->hostName()); - if(server->port()!=6667) uri.append(QString(":%1").arg(server->port())); + if(server->port()!=6667) uri.append(TQString(":%1").tqarg(server->port())); uri.append("/"); } } -void KviIrcUrl::makeJoinCmd(const QStringList& chans, QString& szJoinCommand) +void KviIrcUrl::makeJoinCmd(const TQStringList& chans, TQString& szJoinCommand) { - QString szChannels,szProtectedChannels,szPasswords,szCurPass,szCurChan; + TQString szChannels,szProtectedChannels,szPasswords,szCurPass,szCurChan; if(chans.count()!=0) { - for ( QStringList::ConstIterator it = chans.begin(); it != chans.end(); ++it ) { + for ( TQStringList::ConstIterator it = chans.begin(); it != chans.end(); ++it ) { szCurPass=(*it).section('?',1); if(szCurPass.isEmpty()) @@ -266,11 +266,11 @@ void KviIrcUrl::makeJoinCmd(const QStringList& chans, QString& szJoinCommand) } } -int KviIrcUrl::run(const QString& text,int contextSpec,KviConsole* pConsole) +int KviIrcUrl::run(const TQString& text,int contextSpec,KviConsole* pConsole) { KviIrcUrlParts parts; KviIrcUrl::split(text,parts); - QString cmdBuffer; + TQString cmdBuffer; if( (contextSpec & CurrentContext) && !pConsole) { contextSpec = FirstFreeContext; @@ -300,9 +300,9 @@ int KviIrcUrl::run(const QString& text,int contextSpec,KviConsole* pConsole) if(!(parts.iError & KviIrcUrl::InvalidProtocol)) { g_pApp->addRecentUrl(text); - QString szJoinCommand; + TQString szJoinCommand; makeJoinCmd(parts.chanList,szJoinCommand); - QString szCommand("server "); + TQString szCommand("server "); if(parts.bSsl) szCommand.append("-s "); if(parts.bIpV6) szCommand.append("-i "); if(!szJoinCommand.isEmpty()){ @@ -310,7 +310,7 @@ int KviIrcUrl::run(const QString& text,int contextSpec,KviConsole* pConsole) szCommand.append(szJoinCommand); szCommand.append("\" "); } - szCommand.append(QString("%1 %2 ").arg(parts.szHost).arg(parts.iPort)); + szCommand.append(TQString("%1 %2 ").tqarg(parts.szHost).tqarg(parts.iPort)); if(pConsole->connection()) { KviIrcServer* server = pConsole->connection()->target()->server(); @@ -324,8 +324,8 @@ int KviIrcUrl::run(const QString& text,int contextSpec,KviConsole* pConsole) return parts.iError; } else { // the same server, but probably new chanlist - QString tmp; - QString toPart; + TQString tmp; + TQString toPart; for(KviChannel * c = pConsole->connection()->channelList()->first();c;c = pConsole->connection()->channelList()->next()) { tmp=c->name(); diff --git a/src/kvirc/kernel/kvi_ircurl.h b/src/kvirc/kernel/kvi_ircurl.h index f3a8f10..39a2db2 100644 --- a/src/kvirc/kernel/kvi_ircurl.h +++ b/src/kvirc/kernel/kvi_ircurl.h @@ -30,7 +30,7 @@ class KviIrcServer; class KviConsole; -#include <qstringlist.h> +#include <tqstringlist.h> // Create /server -u <server> commands (first free context) #define KVI_IRCURL_CONTEXT_FIRSTFREE 0 @@ -40,11 +40,11 @@ class KviConsole; #define KVI_IRCURL_CONTEXT_THIS 2 typedef struct _KviIrcUrlParts { - QString szHost; + TQString szHost; kvi_u32_t iPort; bool bIpV6; bool bSsl; - QStringList chanList; + TQStringList chanList; int iError; } KviIrcUrlParts; @@ -68,11 +68,11 @@ namespace KviIrcUrl extern KVIRC_API bool parse(const char * url,KviStr &cmdBuffer,int contextSpec = KVI_IRCURL_CONTEXT_FIRSTFREE); - extern KVIRC_API int run(const QString& url,int contextSpec = FirstFreeContext,KviConsole* pConsole = 0); + extern KVIRC_API int run(const TQString& url,int contextSpec = FirstFreeContext,KviConsole* pConsole = 0); - extern KVIRC_API void split(QString url, KviIrcUrlParts& parts); - extern KVIRC_API void join(QString &url, KviIrcServer* server); - extern KVIRC_API void makeJoinCmd(const QStringList& chans, QString& szJoinCommand); + extern KVIRC_API void split(TQString url, KviIrcUrlParts& parts); + extern KVIRC_API void join(TQString &url, KviIrcServer* server); + extern KVIRC_API void makeJoinCmd(const TQStringList& chans, TQString& szJoinCommand); } #endif // _KVI_IRCURL_H_ diff --git a/src/kvirc/kernel/kvi_lagmeter.cpp b/src/kvirc/kernel/kvi_lagmeter.cpp index 5e7a4ab..43b3fa1 100644 --- a/src/kvirc/kernel/kvi_lagmeter.cpp +++ b/src/kvirc/kernel/kvi_lagmeter.cpp @@ -39,7 +39,7 @@ #include "kvi_locale.h" KviLagMeter::KviLagMeter(KviIrcConnection * c) -: QObject() +: TQObject() { m_pConnection = c; m_pCheckList = new KviPointerList<KviLagCheck>; @@ -79,7 +79,7 @@ unsigned int KviLagMeter::secondsSinceLastCompleted() return tv.tv_sec - m_tLastCompleted; } -void KviLagMeter::timerEvent(QTimerEvent *) +void KviLagMeter::timerEvent(TQTimerEvent *) { if(m_pConnection->state() != KviIrcConnection::Connected)return; // do nothing atm @@ -97,19 +97,19 @@ void KviLagMeter::timerEvent(QTimerEvent *) if((!m_bOnAlarm) && (m_uLag > KVI_OPTION_UINT(KviOption_uintLagAlarmTime))) { KVS_TRIGGER_EVENT_2_HALTED(KviEvent_OnLagAlarmTimeUp, - m_pConnection->console(),m_pConnection->serverInfo()->name(),QString(szLag.ptr())); + m_pConnection->console(),m_pConnection->serverInfo()->name(),TQString(szLag.ptr())); if(bDeletionSignal)return; // killed , probably by a quit -f -u m_bOnAlarm = true; } else if(m_bOnAlarm) { KVS_TRIGGER_EVENT_2_HALTED(KviEvent_OnLagAlarmTimeDown, - m_pConnection->console(),m_pConnection->serverInfo()->name(),QString(szLag.ptr())); + m_pConnection->console(),m_pConnection->serverInfo()->name(),TQString(szLag.ptr())); if(bDeletionSignal)return; // killed , probably by a quit -f -u m_bOnAlarm = false; } KVS_TRIGGER_EVENT_2_HALTED(KviEvent_OnLagCheck, - m_pConnection->console(),m_pConnection->serverInfo()->name(),QString(szLag.ptr())); + m_pConnection->console(),m_pConnection->serverInfo()->name(),TQString(szLag.ptr())); if(bDeletionSignal)return; // killed , probably by a quit -f -u m_pDeletionSignal = 0; diff --git a/src/kvirc/kernel/kvi_lagmeter.h b/src/kvirc/kernel/kvi_lagmeter.h index 6fb68ae..da8b076 100644 --- a/src/kvirc/kernel/kvi_lagmeter.h +++ b/src/kvirc/kernel/kvi_lagmeter.h @@ -28,7 +28,7 @@ #include "kvi_string.h" #include "kvi_pointerlist.h" -#include <qobject.h> +#include <tqobject.h> class KviIrcConnection; @@ -41,9 +41,10 @@ public: unsigned int uReliability; // [0-100] }; -class KVIRC_API KviLagMeter : public QObject +class KVIRC_API KviLagMeter : public TQObject { Q_OBJECT + TQ_OBJECT friend class KviIrcConnection; protected: KviLagMeter(KviIrcConnection * c); @@ -68,7 +69,7 @@ public: unsigned int lag(){ return m_uLag; }; unsigned int secondsSinceLastCompleted(); protected: - virtual void timerEvent(QTimerEvent * e); + virtual void timerEvent(TQTimerEvent * e); }; #endif // _KVI_LAGMETER_H_ diff --git a/src/kvirc/kernel/kvi_main.cpp b/src/kvirc/kernel/kvi_main.cpp index 90518b6..959978b 100644 --- a/src/kvirc/kernel/kvi_main.cpp +++ b/src/kvirc/kernel/kvi_main.cpp @@ -36,9 +36,9 @@ extern bool kvi_sendIpcMessage(const char * message); // kvi_ipc.cpp #endif -#include <qglobal.h> //for debug() +#include <tqglobal.h> //for debug() -#include <qmessagebox.h> +#include <tqmessagebox.h> #define KVI_ARGS_RETCODE_OK 0 #define KVI_ARGS_RETCODE_ERROR 1 @@ -68,17 +68,17 @@ int parseArgs(ParseArgs * a) for(idx = 1;idx < a->argc;idx++) { - QString szMessage; + TQString szMessage; char * p = a->argv[idx]; if((kvi_strLen(p) > 3) && (*p == '-') && (*(p+1) == '-'))p++; if(kvi_strEqualCI("-v",p) || kvi_strEqualCI("-version",p)) { - KviQString::appendFormatted(szMessage,"KVIrc %s '%s'\n",KVI_VERSION,KVI_RELEASE_NAME); - KviQString::appendFormatted(szMessage,"Sources date: %s\n",KVI_SOURCES_DATE); - KviQString::appendFormatted(szMessage,"Build date: %s\n",KVI_BUILD_DATE); - KviQString::appendFormatted(szMessage,"Home page: http://www.kvirc.net/\n"); + KviTQString::appendFormatted(szMessage,"KVIrc %s '%s'\n",KVI_VERSION,KVI_RELEASE_NAME); + KviTQString::appendFormatted(szMessage,"Sources date: %s\n",KVI_SOURCES_DATE); + KviTQString::appendFormatted(szMessage,"Build date: %s\n",KVI_BUILD_DATE); + KviTQString::appendFormatted(szMessage,"Home page: http://www.kvirc.net/\n"); #ifdef COMPILE_ON_WINDOWS MessageBox(0,szMessage.local8Bit().data(),"KVIrc",0); @@ -91,42 +91,42 @@ int parseArgs(ParseArgs * a) if(kvi_strEqualCI("-h",p) || kvi_strEqualCI("-help",p)) { - KviQString::appendFormatted(szMessage,"Usage:\n"); - KviQString::appendFormatted(szMessage," %s [options] [server [port]] [ircurl [ircurl [...]]]\n",a->argv[0]); - KviQString::appendFormatted(szMessage," \n"); - KviQString::appendFormatted(szMessage,"Available options:\n"); - KviQString::appendFormatted(szMessage," -h, --help : Print this help and exit\n"); - KviQString::appendFormatted(szMessage," -v, --version: Print version information and exit\n"); - KviQString::appendFormatted(szMessage," -c <file> : Use <file> as config file instead of ~/%s\n",KVI_HOME_CONFIG_FILE_NAME); - KviQString::appendFormatted(szMessage," (defaults to $HOME/%s if <file> does not exist)\n",KVI_HOME_CONFIG_FILE_NAME); - KviQString::appendFormatted(szMessage," -n <file> : Use <file> as config file instead of $HOME/%s\n",KVI_HOME_CONFIG_FILE_NAME); - KviQString::appendFormatted(szMessage," (create <file> if it does not exist)\n"); + KviTQString::appendFormatted(szMessage,"Usage:\n"); + KviTQString::appendFormatted(szMessage," %s [options] [server [port]] [ircurl [ircurl [...]]]\n",a->argv[0]); + KviTQString::appendFormatted(szMessage," \n"); + KviTQString::appendFormatted(szMessage,"Available options:\n"); + KviTQString::appendFormatted(szMessage," -h, --help : Print this help and exit\n"); + KviTQString::appendFormatted(szMessage," -v, --version: Print version information and exit\n"); + KviTQString::appendFormatted(szMessage," -c <file> : Use <file> as config file instead of ~/%s\n",KVI_HOME_CONFIG_FILE_NAME); + KviTQString::appendFormatted(szMessage," (defaults to $HOME/%s if <file> does not exist)\n",KVI_HOME_CONFIG_FILE_NAME); + KviTQString::appendFormatted(szMessage," -n <file> : Use <file> as config file instead of $HOME/%s\n",KVI_HOME_CONFIG_FILE_NAME); + KviTQString::appendFormatted(szMessage," (create <file> if it does not exist)\n"); #ifdef COMPILE_NO_IPC - KviQString::appendFormatted(szMessage," -f : Accepted but ignored (for compatibility)\n"); + KviTQString::appendFormatted(szMessage," -f : Accepted but ignored (for compatibility)\n"); #else - KviQString::appendFormatted(szMessage," -f : Force a new KVIrc session, even if there is already\n"); - KviQString::appendFormatted(szMessage," a running one.\n"); + KviTQString::appendFormatted(szMessage," -f : Force a new KVIrc session, even if there is already\n"); + KviTQString::appendFormatted(szMessage," a running one.\n"); #endif - KviQString::appendFormatted(szMessage," -e <commands>: If a KVIrc session is already running, execute\n"); - KviQString::appendFormatted(szMessage," the <commands> in that session, otherwise start up\n"); - KviQString::appendFormatted(szMessage," normally and execute <commands>\n"); - KviQString::appendFormatted(szMessage," <commands> must be a single shell token.\n"); - KviQString::appendFormatted(szMessage," You can eventually use this switch more than once\n"); - KviQString::appendFormatted(szMessage," -x <commands>: If a KVIrc session is already running, execute\n"); - KviQString::appendFormatted(szMessage," the <commands> in that session, otherwise exit from application without doing anything/\n"); - KviQString::appendFormatted(szMessage," <commands> must be a single shell token.\n"); - KviQString::appendFormatted(szMessage," You can eventually use this switch more than once\n"); - KviQString::appendFormatted(szMessage," -r <commands>: If a KVIrc session is already running, execute the <commands>\n"); - KviQString::appendFormatted(szMessage," in that session, otherwise start up normally (do not execute).\n"); - KviQString::appendFormatted(szMessage," <commands> must be a single shell token.\n"); - KviQString::appendFormatted(szMessage," You can eventually use this switch more than once\n"); - KviQString::appendFormatted(szMessage," -m : If a KVIrc session is already running, show an informational\n"); - KviQString::appendFormatted(szMessage," popup dialog instead of writing to the console"); - KviQString::appendFormatted(szMessage," --nosplash : Do not show the splash screen at startup\n"); - KviQString::appendFormatted(szMessage," [server] : Connect to this server after startup\n"); - KviQString::appendFormatted(szMessage," [port] : Use this port for connection\n"); - KviQString::appendFormatted(szMessage," [ircurl] : URL in the following form:\n"); - KviQString::appendFormatted(szMessage," irc[6]://<server>[:<port>][/<channel>[?<pass>]]\n"); + KviTQString::appendFormatted(szMessage," -e <commands>: If a KVIrc session is already running, execute\n"); + KviTQString::appendFormatted(szMessage," the <commands> in that session, otherwise start up\n"); + KviTQString::appendFormatted(szMessage," normally and execute <commands>\n"); + KviTQString::appendFormatted(szMessage," <commands> must be a single shell token.\n"); + KviTQString::appendFormatted(szMessage," You can eventually use this switch more than once\n"); + KviTQString::appendFormatted(szMessage," -x <commands>: If a KVIrc session is already running, execute\n"); + KviTQString::appendFormatted(szMessage," the <commands> in that session, otherwise exit from application without doing anything/\n"); + KviTQString::appendFormatted(szMessage," <commands> must be a single shell token.\n"); + KviTQString::appendFormatted(szMessage," You can eventually use this switch more than once\n"); + KviTQString::appendFormatted(szMessage," -r <commands>: If a KVIrc session is already running, execute the <commands>\n"); + KviTQString::appendFormatted(szMessage," in that session, otherwise start up normally (do not execute).\n"); + KviTQString::appendFormatted(szMessage," <commands> must be a single shell token.\n"); + KviTQString::appendFormatted(szMessage," You can eventually use this switch more than once\n"); + KviTQString::appendFormatted(szMessage," -m : If a KVIrc session is already running, show an informational\n"); + KviTQString::appendFormatted(szMessage," popup dialog instead of writing to the console"); + KviTQString::appendFormatted(szMessage," --nosplash : Do not show the splash screen at startup\n"); + KviTQString::appendFormatted(szMessage," [server] : Connect to this server after startup\n"); + KviTQString::appendFormatted(szMessage," [port] : Use this port for connection\n"); + KviTQString::appendFormatted(szMessage," [ircurl] : URL in the following form:\n"); + KviTQString::appendFormatted(szMessage," irc[6]://<server>[:<port>][/<channel>[?<pass>]]\n"); #ifdef COMPILE_ON_WINDOWS MessageBox(0,szMessage.local8Bit().data(),"KVIrc",0); @@ -228,7 +228,7 @@ int parseArgs(ParseArgs * a) if(kvi_strEqualCI("-session",p)||kvi_strEqualCI("-display",p)) { - // Qt apps are supposed to handle the params to these switches, but we'll skip arg for now + // TQt apps are supposed to handle the params to these switches, but we'll skip arg for now idx++; continue; } @@ -238,33 +238,33 @@ int parseArgs(ParseArgs * a) // no dash if(kvi_strEqualCIN(p,"irc://",6) || kvi_strEqualCIN(p,"irc6://",7) || kvi_strEqualCIN(p,"ircs://",7) || kvi_strEqualCIN(p,"ircs6://",8)) { - KviStr tmp = QString::fromLocal8Bit(p); + KviStr tmp = TQString(TQString::fromLocal8Bit(p)); if(a->szExecCommand.hasData())a->szExecCommand.append('\n'); a->szExecCommand.append("openurl "); tmp.replaceAll("$",""); // the urls can't contain $ signs tmp.replaceAll(";",""); // the urls can't contain ; signs a->szExecCommand.append(tmp); } else { - QString tmp = QString::fromLocal8Bit(p); + TQString tmp = TQString::fromLocal8Bit(p); bool bOk; tmp.toUInt(&bOk); if(bOk)szPort = tmp; else { - QString ri = tmp.right(4); - if(KviQString::equalCI(ri,".kvs")) + TQString ri = tmp.right(4); + if(KviTQString::equalCI(ri,".kvs")) { if(a->szExecCommand.hasData())a->szExecCommand.append('\n'); a->szExecCommand.append("parse \""); - tmp.replace('$',"\\$"); - tmp.replace('\\',"\\\\"); + tmp.tqreplace('$',"\\$"); + tmp.tqreplace('\\',"\\\\"); a->szExecCommand.append(tmp); a->szExecCommand.append('"'); - } else if(KviQString::equalCI(ri,".kvt")) + } else if(KviTQString::equalCI(ri,".kvt")) { if(a->szExecCommand.hasData())a->szExecCommand.append('\n'); a->szExecCommand.append("theme.install \""); - tmp.replace('$',"\\$"); - tmp.replace('\\',"\\\\"); + tmp.tqreplace('$',"\\$"); + tmp.tqreplace('\\',"\\\\"); a->szExecCommand.append(tmp); a->szExecCommand.append('"'); } else @@ -293,27 +293,27 @@ int parseArgs(ParseArgs * a) // Repair broken colour definitions due to "lazy" static object initialization void repair_colors(void) { - if(Qt::white.red() == 0) + if(TQt::white.red() == 0) { - Qt::color0 = (qRgb(255,255,255 ),0); - Qt::color1 = (qRgb(0,0,0),1); - Qt::black.setRgb(0,0,0); - Qt::white.setRgb(255,255,255); - Qt::darkGray.setRgb(128,128,128); - Qt::gray.setRgb(160,160,164); - Qt::lightGray.setRgb(192,192,192); - Qt::red.setRgb(255,0,0); - Qt::green.setRgb(0,255,0); - Qt::blue.setRgb(0,0,255); - Qt::cyan.setRgb(0,255,255); - Qt::magenta.setRgb(255,0,255); - Qt::yellow.setRgb(255,255,0); - Qt::darkRed.setRgb(128,0,0); - Qt::darkGreen.setRgb(0,128,0); - Qt::darkBlue.setRgb(0,0,128); - Qt::darkCyan.setRgb(0,128,128); - Qt::darkMagenta.setRgb(128,0,128); - Qt::darkYellow.setRgb(128,128,0); + TQt::color0 = (tqRgb(255,255,255 ),0); + TQt::color1 = (tqRgb(0,0,0),1); + TQt::black.setRgb(0,0,0); + TQt::white.setRgb(255,255,255); + TQt::darkGray.setRgb(128,128,128); + TQt::gray.setRgb(160,160,164); + TQt::lightGray.setRgb(192,192,192); + TQt::red.setRgb(255,0,0); + TQt::green.setRgb(0,255,0); + TQt::blue.setRgb(0,0,255); + TQt::cyan.setRgb(0,255,255); + TQt::magenta.setRgb(255,0,255); + TQt::yellow.setRgb(255,255,0); + TQt::darkRed.setRgb(128,0,0); + TQt::darkGreen.setRgb(0,128,0); + TQt::darkBlue.setRgb(0,0,128); + TQt::darkCyan.setRgb(0,128,128); + TQt::darkMagenta.setRgb(128,0,128); + TQt::darkYellow.setRgb(128,128,0); } } #endif //Q_OS_MACX @@ -358,16 +358,16 @@ int main(int argc,char ** argv) A weak file locking mechanism should be used too... #ifdef COMPILE_ON_WINDOWS - QString szLock = convertSeparators(cleanDirPath(QDir::homeDirPath() + "/.kvirc.lock")); + TQString szLock = convertSeparators(cleanDirPath(TQDir::homeDirPath() + "/.kvirc.lock")); #else - QString szLock = convertSeparators(cleanDirPath(QDir::homeDirPath() + "/.kvirc.lock")); + TQString szLock = convertSeparators(cleanDirPath(TQDir::homeDirPath() + "/.kvirc.lock")); #endif - QFileInfo inf(szLock); + TQFileInfo inf(szLock); bool bLocked = false; if(inf.exists()) { - iLocked = inf.lastModified().secsTo(QDateTime::currentDateTime()); + iLocked = inf.lastModified().secsTo(TQDateTime::tqcurrentDateTime()); } */ @@ -383,7 +383,7 @@ int main(int argc,char ** argv) { KviStr tmp(KviStr::Format,"Another KVIrc session is already running on this display and with this user id.\nUse %s -f if you want to force a new session.",argv[0]); if(a.bShowPopup) - QMessageBox::information(0,"Session - KVIrc",tmp.ptr(),QMessageBox::Ok); + TQMessageBox::information(0,"Session - KVIrc",tmp.ptr(),TQMessageBox::Ok); else debug(tmp.ptr()); } diff --git a/src/kvirc/kernel/kvi_notifylist.cpp b/src/kvirc/kernel/kvi_notifylist.cpp index bee7fd4..312c184 100644 --- a/src/kvirc/kernel/kvi_notifylist.cpp +++ b/src/kvirc/kernel/kvi_notifylist.cpp @@ -47,7 +47,7 @@ #include "kvi_kvs_eventtriggers.h" #include "kvi_qcstring.h" -#include <qstringlist.h> +#include <tqstringlist.h> // FIXME: #warning "Finish this doc!" @@ -70,7 +70,7 @@ So for example, assume to register a frend of yours like Szymon:[br] [example] [cmd:reguser.add]reguser.add[/cmd] Szymon - [cmd:reguser.addmask]reguser.addmask[/cmd] Szymon Pragma!*@*.it + [cmd:reguser.addtqmask]reguser.addtqmask[/cmd] Szymon Pragma!*@*.it [/example] And then want it in the notify list; nothing easier, just set hist "notify" property to the nickname that you want him to be "looked for":[br] @@ -82,7 +82,7 @@ "Pragma [someuser@somehost.it] is on IRC".[br] If Szymon uses often "[Pragma]" as his secondary nickname , you can do the following:[br] [example] - [cmd:reguser.addmask]reguser.addmask[/cmd] Szymon [Pragma]*@*.it + [cmd:reguser.addtqmask]reguser.addtqmask[/cmd] Szymon [Pragma]*@*.it [cmd:reguser.setproperty]reguser.setproperty[/cmd] Szymon notify "Pragma [Pragma]" [/example] KVIrc will then look for both nicknames getting online.[br] @@ -94,7 +94,7 @@ This might be a false assumption (since somehod.com does not even match *.it), but it is the best result that the "stupid ISON method" can achieve.[br] The "intelligent ISON method" will also check the Pragma's username and hostname - and match it in the registered masks; so in the example above, you will be notified if + and match it in the registered tqmasks; so in the example above, you will be notified if any user that matches Pragma!*@*.it gets online; (but you will NOT be notified if (for example) Pragma!someuser@somehost.com gets online).[br] So what's the point in including a stupid method? :) Well...the intelligent @@ -117,7 +117,7 @@ // Basic NotifyListManager: this does completely nothing KviNotifyListManager::KviNotifyListManager(KviIrcConnection * pConnection) -: QObject(0,"notify_list_manager") +: TQObject(0,"notify_list_manager") { m_pConnection = pConnection; m_pConsole = pConnection->console(); @@ -150,7 +150,7 @@ bool KviNotifyListManager::handleWatchReply(KviIrcMessage *) return false; } -void KviNotifyListManager::notifyOnLine(const QString &nick,const QString &user,const QString &host,const QString &szReason,bool bJoin) +void KviNotifyListManager::notifyOnLine(const TQString &nick,const TQString &user,const TQString &host,const TQString &szReason,bool bJoin) { if(bJoin) m_pConsole->notifyListView()->join(nick,user,host); @@ -158,35 +158,35 @@ void KviNotifyListManager::notifyOnLine(const QString &nick,const QString &user, KviWindow * out = KVI_OPTION_BOOL(KviOption_boolNotifyListChangesToActiveWindow) ? m_pConsole->activeWindow() : m_pConsole; if(KVS_TRIGGER_EVENT_1_HALTED(KviEvent_OnNotifyOnLine,out,nick))return; - QString szWho; - QString szMsg; + TQString szWho; + TQString szMsg; if(!(user.isEmpty() || host.isEmpty())) - KviQString::sprintf(szWho,"\r!n\r%Q\r [%Q@\r!h\r%Q\r]",&nick,&user,&host); + KviTQString::sprintf(szWho,"\r!n\r%Q\r [%Q@\r!h\r%Q\r]",&nick,&user,&host); else - KviQString::sprintf(szWho,"\r!n\r%Q\r",&nick); + KviTQString::sprintf(szWho,"\r!n\r%Q\r",&nick); - KviPointerHashTable<QString,KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict(); - KviPointerHashTableIterator<QString,KviRegisteredUser> it(*d); - QString szNotify; + KviPointerHashTable<TQString,KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict(); + KviPointerHashTableIterator<TQString,KviRegisteredUser> it(*d); + TQString szNotify; while(KviRegisteredUser * u = it.current()) { - if(QStringList::split(",",u->getProperty("notify")).findIndex(nick)!=-1) + if(TQStringList::split(",",u->getProperty("notify")).tqfindIndex(nick)!=-1) { - QString szComment=u->getProperty("comment"); + TQString szComment=u->getProperty("comment"); if(!szComment.isEmpty()) - KviQString::sprintf(szMsg,"%Q (%Q), Group \"%Q\" is on IRC as (%Q)",&(u->name()),&szComment,&(u->group()),&szWho); + KviTQString::sprintf(szMsg,"%Q (%Q), Group \"%Q\" is on IRC as (%Q)",&(u->name()),&szComment,&(u->group()),&szWho); else - KviQString::sprintf(szMsg,"%Q, Group \"%Q\" is on IRC as (%Q)",&(u->name()),&(u->group()),&szWho); + KviTQString::sprintf(szMsg,"%Q, Group \"%Q\" is on IRC as (%Q)",&(u->name()),&(u->group()),&szWho); break; } ++it; } - QString szFmt = __tr2qs("%Q is on IRC"); + TQString szFmt = __tr2qs("%Q is on IRC"); if(szMsg.isEmpty()) - KviQString::sprintf(szMsg,szFmt,&szWho); + KviTQString::sprintf(szMsg,szFmt,&szWho); if((!szReason.isEmpty()) && (_OUTPUT_VERBOSE)) { @@ -206,46 +206,46 @@ void KviNotifyListManager::notifyOnLine(const QString &nick,const QString &user, szWho = "<b>"; szWho += nick; szWho += "</b>"; - KviQString::sprintf(szMsg,szFmt,&szWho); + KviTQString::sprintf(szMsg,szFmt,&szWho); g_pApp->notifierMessage(0,KVI_OPTION_MSGTYPE(KVI_OUT_NOTIFYONLINE).pixId(),szMsg,15); } } } -void KviNotifyListManager::notifyOffLine(const QString &nick,const QString &user,const QString &host,const QString &szReason) +void KviNotifyListManager::notifyOffLine(const TQString &nick,const TQString &user,const TQString &host,const TQString &szReason) { KviWindow * out = KVI_OPTION_BOOL(KviOption_boolNotifyListChangesToActiveWindow) ? m_pConsole->activeWindow() : m_pConsole; if(!KVS_TRIGGER_EVENT_1_HALTED(KviEvent_OnNotifyOffLine,out,nick)) { - QString szWho; + TQString szWho; if(!(user.isEmpty() || host.isEmpty())) - KviQString::sprintf(szWho,"\r!n\r%Q\r [%Q@\r!h\r%Q\r]",&nick,&user,&host); + KviTQString::sprintf(szWho,"\r!n\r%Q\r [%Q@\r!h\r%Q\r]",&nick,&user,&host); else - KviQString::sprintf(szWho,"\r!n\r%Q\r",&nick); + KviTQString::sprintf(szWho,"\r!n\r%Q\r",&nick); - QString szMsg; + TQString szMsg; - KviPointerHashTable<QString,KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict(); - KviPointerHashTableIterator<QString,KviRegisteredUser> it(*d); - QString szNotify; + KviPointerHashTable<TQString,KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict(); + KviPointerHashTableIterator<TQString,KviRegisteredUser> it(*d); + TQString szNotify; while(KviRegisteredUser * u = it.current()) { - if(QStringList::split(",",u->getProperty("notify")).findIndex(nick)!=-1) + if(TQStringList::split(",",u->getProperty("notify")).tqfindIndex(nick)!=-1) { - QString szComment=u->getProperty("comment"); + TQString szComment=u->getProperty("comment"); if(!szComment.isEmpty()) - KviQString::sprintf(szMsg,"%Q (%Q), Group \"%Q\" has left IRC as (%Q)",&(u->name()),&szComment,&(u->group()),&szWho); + KviTQString::sprintf(szMsg,"%Q (%Q), Group \"%Q\" has left IRC as (%Q)",&(u->name()),&szComment,&(u->group()),&szWho); else - KviQString::sprintf(szMsg,"%Q, Group \"%Q\" has left IRC as (%Q)",&(u->name()),&(u->group()),&szWho); + KviTQString::sprintf(szMsg,"%Q, Group \"%Q\" has left IRC as (%Q)",&(u->name()),&(u->group()),&szWho); break; } ++it; } if(szMsg.isEmpty()) - KviQString::sprintf(szMsg,__tr2qs("%Q has left IRC"),&szWho); + KviTQString::sprintf(szMsg,__tr2qs("%Q has left IRC"),&szWho); if((!szReason.isEmpty()) && (_OUTPUT_VERBOSE)) { @@ -319,22 +319,22 @@ void KviNotifyListManager::notifyOffLine(const QString &nick,const QString &user KviIsOnNotifyListManager::KviIsOnNotifyListManager(KviIrcConnection * pConnection) : KviNotifyListManager(pConnection) { - m_pRegUserDict = new KviPointerHashTable<QString,QString>(17,false); // case insensitive , copy keys + m_pRegUserDict = new KviPointerHashTable<TQString,TQString>(17,false); // case insensitive , copy keys m_pRegUserDict->setAutoDelete(true); - m_pNotifyList = new KviPointerList<QString>; + m_pNotifyList = new KviPointerList<TQString>; m_pNotifyList->setAutoDelete(true); - m_pIsOnList = new KviPointerList<QString>; + m_pIsOnList = new KviPointerList<TQString>; m_pIsOnList->setAutoDelete(true); - m_pOnlineList = new KviPointerList<QString>; + m_pOnlineList = new KviPointerList<TQString>; m_pOnlineList->setAutoDelete(true); - m_pUserhostList = new KviPointerList<QString>; + m_pUserhostList = new KviPointerList<TQString>; m_pUserhostList->setAutoDelete(true); - m_pDelayedNotifyTimer = new QTimer(); - connect(m_pDelayedNotifyTimer,SIGNAL(timeout()),this,SLOT(newNotifySession())); - m_pDelayedIsOnTimer = new QTimer(); - connect(m_pDelayedIsOnTimer,SIGNAL(timeout()),this,SLOT(newIsOnSession())); - m_pDelayedUserhostTimer = new QTimer(); - connect(m_pDelayedUserhostTimer,SIGNAL(timeout()),this,SLOT(newUserhostSession())); + m_pDelayedNotifyTimer = new TQTimer(); + connect(m_pDelayedNotifyTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(newNotifySession())); + m_pDelayedIsOnTimer = new TQTimer(); + connect(m_pDelayedIsOnTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(newIsOnSession())); + m_pDelayedUserhostTimer = new TQTimer(); + connect(m_pDelayedUserhostTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(newUserhostSession())); m_bRunning = false; } @@ -376,24 +376,24 @@ void KviIsOnNotifyListManager::buildRegUserDict() { m_pRegUserDict->clear(); - const KviPointerHashTable<QString,KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict(); - KviPointerHashTableIterator<QString,KviRegisteredUser> it(*d); + const KviPointerHashTable<TQString,KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict(); + KviPointerHashTableIterator<TQString,KviRegisteredUser> it(*d); while(KviRegisteredUser * u = it.current()) { - QString notify; + TQString notify; if(u->getProperty("notify",notify)) { notify.stripWhiteSpace(); while(!notify.isEmpty()) { - int idx = notify.find(' '); + int idx = notify.tqfind(' '); if(idx > 0) { - QString single = notify.left(idx); - m_pRegUserDict->replace(single,new QString(u->name())); + TQString single = notify.left(idx); + m_pRegUserDict->tqreplace(single,new TQString(u->name())); notify.remove(0,idx+1); } else { - m_pRegUserDict->replace(notify,new QString(u->name())); + m_pRegUserDict->tqreplace(notify,new TQString(u->name())); notify = ""; } } @@ -435,10 +435,10 @@ void KviIsOnNotifyListManager::newNotifySession() void KviIsOnNotifyListManager::buildNotifyList() { m_pNotifyList->clear(); - KviPointerHashTableIterator<QString,QString> it(*m_pRegUserDict); + KviPointerHashTableIterator<TQString,TQString> it(*m_pRegUserDict); while(it.current()) { - m_pNotifyList->append(new QString(it.currentKey())); + m_pNotifyList->append(new TQString(it.currentKey())); ++it; } } @@ -472,7 +472,7 @@ void KviIsOnNotifyListManager::buildIsOnList() m_pIsOnList->clear(); m_szIsOnString = ""; m_pNotifyList->setAutoDelete(false); - while(QString * s = m_pNotifyList->first()) + while(TQString * s = m_pNotifyList->first()) { if(((m_szIsOnString.length() + s->length()) + 1) < 504) { @@ -489,7 +489,7 @@ void KviIsOnNotifyListManager::sendIsOn() { if(_OUTPUT_PARANOIC) m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: Checking for: %Q"),&m_szIsOnString); - KviQCString szDec = m_pConnection->encodeText(m_szIsOnString); + KviTQCString szDec = m_pConnection->encodeText(m_szIsOnString); m_pConnection->sendFmtData("ISON %s",szDec.data()); if(m_pConnection->lagMeter()) m_pConnection->lagMeter()->lagCheckRegister("@notify_ison",40); // not that reliable @@ -506,7 +506,7 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg) // Check if it is our ISON // all the nicks must be on the IsOnList - KviPointerList<QString> tmplist; + KviPointerList<TQString> tmplist; tmplist.setAutoDelete(false); KviStr nk; @@ -519,10 +519,10 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg) if(nk.hasData()) { bool bGotIt = false; - QString dnk = m_pConnection->decodeText(nk.ptr()); - for(QString * s = m_pIsOnList->first();s && (!bGotIt);s = m_pIsOnList->next()) + TQString dnk = m_pConnection->decodeText(nk.ptr()); + for(TQString * s = m_pIsOnList->first();s && (!bGotIt);s = m_pIsOnList->next()) { - if(KviQString::equalCI(*s,dnk)) + if(KviTQString::equalCI(*s,dnk)) { tmplist.append(s); bGotIt = true; @@ -552,7 +552,7 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg) // The nicks in the IsOnList that are also in the reply are online , and go to the OnlineList // the remaining in the IsOnList are offline - QString * s; + TQString * s; for(s = tmplist.first();s;s = tmplist.next()) { @@ -579,12 +579,12 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg) // ok... complex step now: the remaining users in the userhost list are online // if they have been online before, just remove them from the list - // otherwise they must be matched for masks + // otherwise they must be matched for tqmasks // and eventually inserted in the notify view later KviIrcUserDataBase * db = console()->connection()->userDataBase(); - KviPointerList<QString> l; + KviPointerList<TQString> l; l.setAutoDelete(false); for(s = m_pOnlineList->first();s;s = m_pOnlineList->next()) @@ -592,7 +592,7 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg) if(KviUserListEntry * ent = m_pConsole->notifyListView()->findEntry(*s)) { // the user was online from a previous notify session - // might the mask have been changed ? (heh...this is tricky, maybe too much even) + // might the tqmask have been changed ? (heh...this is tricky, maybe too much even) if(KVI_OPTION_BOOL(KviOption_boolNotifyListSendUserhostForOnlineUsers)) { // user wants to be sure about online users.... @@ -621,15 +621,15 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg) //l.append(s); // we will remove him from the list } else { // the user was not online! - // check if we have a cached mask + // check if we have a cached tqmask if(db) { - if(KviIrcUserEntry * ue = db->find(*s)) + if(KviIrcUserEntry * ue = db->tqfind(*s)) { - // already in the db... do we have a mask ? + // already in the db... do we have a tqmask ? if(ue->hasUser() && ue->hasHost()) { - // yup! we have a complete mask to match on + // yup! we have a complete tqmask to match on KviIrcMask mk(*s,ue->user(),ue->host()); // lookup the user's name in the m_pRegUserDict if(!doMatchUser(*s,mk))return true; // critical problems = have to restart!!! @@ -656,34 +656,34 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg) // FIXME: #warning "Nickname escapes (links) in the notifylist messages!" -bool KviIsOnNotifyListManager::doMatchUser(const QString ¬ifyString,const KviIrcMask & mask) +bool KviIsOnNotifyListManager::doMatchUser(const TQString ¬ifyString,const KviIrcMask & tqmask) { - QString * nam = m_pRegUserDict->find(notifyString); + TQString * nam = m_pRegUserDict->tqfind(notifyString); if(nam) { // ok...find the user if(KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserByName(*nam)) { // ok ... match the user - if(u->matchesFixed(mask)) + if(u->matchesFixed(tqmask)) { // new user online - if(!(m_pConsole->notifyListView()->findEntry(mask.nick()))) + if(!(m_pConsole->notifyListView()->findEntry(tqmask.nick()))) { - notifyOnLine(mask.nick(),mask.user(),mask.host()); + notifyOnLine(tqmask.nick(),tqmask.user(),tqmask.host()); } // else already online , and matching...all ok } else { // not matched.... has he been online before ? - if(m_pConsole->notifyListView()->findEntry(mask.nick())) + if(m_pConsole->notifyListView()->findEntry(tqmask.nick())) { - // has been online just a sec ago , but now the mask does not match + // has been online just a sec ago , but now the tqmask does not match // either reguserdb has changed , or the user went offline and another one got his nick // in the meantime... (ugly situation anyway) - notifyOffLine(mask.nick(),mask.user(),mask.host(),__tr2qs("registration mask changed, or nickname is being used by someone else")); + notifyOffLine(tqmask.nick(),tqmask.user(),tqmask.host(),__tr2qs("registration tqmask changed, or nickname is being used by someone else")); } else { // has never been online if(_OUTPUT_VERBOSE) - m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] does not match (registration mask does not match, or nickname is being used by someone else)"),&(mask.nick()),&(mask.user()),&(mask.host())); + m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: \r!n\r%Q\r appears to be online, but the tqmask [%Q@\r!h\r%Q\r] does not match (registration tqmask does not match, or nickname is being used by someone else)"),&(tqmask.nick()),&(tqmask.user()),&(tqmask.host())); } } } else { @@ -743,7 +743,7 @@ void KviIsOnNotifyListManager::buildUserhostList() m_pOnlineList->setAutoDelete(false); int i = 0; - QString * s; + TQString * s; while((s = m_pOnlineList->first()) && (i < MAX_USERHOST_ENTRIES)) { if(!m_szUserhostString.isEmpty())m_szUserhostString.append(' '); @@ -759,7 +759,7 @@ void KviIsOnNotifyListManager::sendUserhost() { if(_OUTPUT_PARANOIC) m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: Checking userhost for: %Q"),&m_szUserhostString); - KviQCString ccc = m_pConnection->encodeText(m_szUserhostString); + KviTQCString ccc = m_pConnection->encodeText(m_szUserhostString); m_pConnection->sendFmtData("USERHOST %s",ccc.data()); if(m_pConnection->lagMeter()) m_pConnection->lagMeter()->lagCheckRegister("@notify_userhost",50); @@ -784,7 +784,7 @@ bool KviIsOnNotifyListManager::handleUserhost(KviIrcMessage *msg) aux = kvi_extractToken(nk,aux,' '); if(nk.hasData()) { - // split it in a mask + // split it in a tqmask KviStr nick; KviStr user; KviStr host; @@ -809,13 +809,13 @@ bool KviIsOnNotifyListManager::handleUserhost(KviIrcMessage *msg) } bool bGotIt = false; - QString szNick = m_pConnection->decodeText(nick.ptr()); - QString szUser = m_pConnection->decodeText(user.ptr()); - QString szHost = m_pConnection->decodeText(host.ptr()); + TQString szNick = m_pConnection->decodeText(nick.ptr()); + TQString szUser = m_pConnection->decodeText(user.ptr()); + TQString szHost = m_pConnection->decodeText(host.ptr()); - for(QString * s = m_pUserhostList->first();s && (!bGotIt);s = m_pUserhostList->next()) + for(TQString * s = m_pUserhostList->first();s && (!bGotIt);s = m_pUserhostList->next()) { - if(KviQString::equalCI(*s,szNick)) + if(KviTQString::equalCI(*s,szNick)) { KviIrcMask * mk = new KviIrcMask(szNick,szUser,szHost); tmplist.append(mk); @@ -854,7 +854,7 @@ bool KviIsOnNotifyListManager::handleUserhost(KviIrcMessage *msg) if(!(m_pUserhostList->isEmpty())) { // ops...someone is no longer online ? - while(QString * s = m_pUserhostList->first()) + while(TQString * s = m_pUserhostList->first()) { if(_OUTPUT_VERBOSE) m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: \r!n\r%Q\r appears to have gone offline before USERHOST reply was received, will recheck in the next loop"),s); @@ -905,7 +905,7 @@ void KviIsOnNotifyListManager::stop() KviStupidNotifyListManager::KviStupidNotifyListManager(KviIrcConnection * pConnection) : KviNotifyListManager(pConnection) { - m_pNickList = new KviPointerList<QString>; + m_pNickList = new KviPointerList<TQString>; m_pNickList->setAutoDelete(true); m_iRestartTimer = 0; } @@ -944,19 +944,19 @@ void KviStupidNotifyListManager::start() void KviStupidNotifyListManager::sendIsOn() { m_szLastIsOnMsg = ""; - QString * nick = m_pNickList->at(m_iNextNickToCheck); + TQString * nick = m_pNickList->at(m_iNextNickToCheck); __range_valid(nick); int i = 0; while(nick && ((nick->length() + 5 + m_szLastIsOnMsg.length()) < 510)) { - KviQString::appendFormatted(m_szLastIsOnMsg," %Q",nick); + KviTQString::appendFormatted(m_szLastIsOnMsg," %Q",nick); nick = m_pNickList->next(); i++; } if(_OUTPUT_PARANOIC) m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: Checking for:%Q"),&m_szLastIsOnMsg); - KviQCString dat = m_pConnection->encodeText(m_szLastIsOnMsg); + KviTQCString dat = m_pConnection->encodeText(m_szLastIsOnMsg); m_pConnection->sendFmtData("ISON%s",dat.data()); if(m_pConnection->lagMeter()) @@ -978,9 +978,9 @@ bool KviStupidNotifyListManager::handleIsOn(KviIrcMessage * msg) aux = kvi_extractToken(nk,aux,' '); if(nk.hasData()) { - QString nkd = m_pConnection->decodeText(nk.ptr()); - QString nksp = " " + nkd; - m_szLastIsOnMsg.replace(nksp,"",false); + TQString nkd = m_pConnection->decodeText(nk.ptr()); + TQString nksp = " " + nkd; + m_szLastIsOnMsg.tqreplace(nksp,"",false); if(!(m_pConsole->notifyListView()->findEntry(nkd))) { // not yet notified @@ -989,9 +989,9 @@ bool KviStupidNotifyListManager::handleIsOn(KviIrcMessage * msg) } } // ok...check the users that have left irc now... - QStringList sl = QStringList::split(' ',m_szLastIsOnMsg); + TQStringList sl = TQStringList::split(' ',m_szLastIsOnMsg); - for(QStringList::Iterator it = sl.begin();it != sl.end();++it) + for(TQStringList::Iterator it = sl.begin();it != sl.end();++it) { if(m_pConsole->notifyListView()->findEntry(*it)) { @@ -1020,7 +1020,7 @@ bool KviStupidNotifyListManager::handleIsOn(KviIrcMessage * msg) return true; } -void KviStupidNotifyListManager::timerEvent(QTimerEvent *e) +void KviStupidNotifyListManager::timerEvent(TQTimerEvent *e) { if(e->timerId() == m_iRestartTimer) { @@ -1030,7 +1030,7 @@ void KviStupidNotifyListManager::timerEvent(QTimerEvent *e) sendIsOn(); return; } - QObject::timerEvent(e); + TQObject::timerEvent(e); } void KviStupidNotifyListManager::stop() @@ -1050,15 +1050,15 @@ void KviStupidNotifyListManager::stop() void KviStupidNotifyListManager::buildNickList() { - const KviPointerHashTable<QString,KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict(); - KviPointerHashTableIterator<QString,KviRegisteredUser> it(*d); + const KviPointerHashTable<TQString,KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict(); + KviPointerHashTableIterator<TQString,KviRegisteredUser> it(*d); m_pNickList->clear(); while(it.current()) { - QString notify; + TQString notify; if(it.current()->getProperty("notify",notify)) { - m_pNickList->append(new QString(notify)); + m_pNickList->append(new TQString(notify)); } ++it; } @@ -1073,7 +1073,7 @@ void KviStupidNotifyListManager::buildNickList() KviWatchNotifyListManager::KviWatchNotifyListManager(KviIrcConnection * pConnection) : KviNotifyListManager(pConnection) { - m_pRegUserDict = new KviPointerHashTable<QString,QString>(17,false); + m_pRegUserDict = new KviPointerHashTable<TQString,TQString>(17,false); m_pRegUserDict->setAutoDelete(true); } @@ -1086,18 +1086,18 @@ void KviWatchNotifyListManager::buildRegUserDict() { m_pRegUserDict->clear(); - const KviPointerHashTable<QString,KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict(); - KviPointerHashTableIterator<QString,KviRegisteredUser> it(*d); + const KviPointerHashTable<TQString,KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict(); + KviPointerHashTableIterator<TQString,KviRegisteredUser> it(*d); while(KviRegisteredUser * u = it.current()) { - QString notify; + TQString notify; if(u->getProperty("notify",notify)) { notify.stripWhiteSpace(); - QStringList sl = QStringList::split(' ',notify); - for(QStringList::Iterator it = sl.begin();it != sl.end();++it) + TQStringList sl = TQStringList::split(' ',notify); + for(TQStringList::Iterator it = sl.begin();it != sl.end();++it) { - m_pRegUserDict->replace(*it,new QString(u->name())); + m_pRegUserDict->tqreplace(*it,new TQString(u->name())); } } ++it; @@ -1110,30 +1110,30 @@ void KviWatchNotifyListManager::start() buildRegUserDict(); - QString watchStr; + TQString watchStr; - KviPointerHashTableIterator<QString,QString> it(*m_pRegUserDict); + KviPointerHashTableIterator<TQString,TQString> it(*m_pRegUserDict); while(it.current()) { - QString nk = it.currentKey(); - if(nk.find('*') == -1) + TQString nk = it.currentKey(); + if(nk.tqfind('*') == -1) { if((watchStr.length() + nk.length() + 2) > 501) { - KviQCString dat = m_pConnection->encodeText(watchStr); + KviTQCString dat = m_pConnection->encodeText(watchStr); m_pConnection->sendFmtData("WATCH%s",dat.data()); if(_OUTPUT_VERBOSE) m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: Adding watch entries for%Q"),&watchStr); watchStr = ""; } - KviQString::appendFormatted(watchStr," +%Q",&nk); + KviTQString::appendFormatted(watchStr," +%Q",&nk); } ++it; } if(!watchStr.isEmpty()) { - KviQCString dat = m_pConnection->encodeText(watchStr); + KviTQCString dat = m_pConnection->encodeText(watchStr); m_pConnection->sendFmtData("WATCH%s",dat.data()); if(_OUTPUT_VERBOSE) m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: Adding watch entries for%Q"),&watchStr); @@ -1146,9 +1146,9 @@ void KviWatchNotifyListManager::stop() m_pRegUserDict->clear(); } -bool KviWatchNotifyListManager::doMatchUser(KviIrcMessage * msg,const QString ¬ifyString,const KviIrcMask & mask) +bool KviWatchNotifyListManager::doMatchUser(KviIrcMessage * msg,const TQString ¬ifyString,const KviIrcMask & tqmask) { - QString * nam = m_pRegUserDict->find(notifyString); + TQString * nam = m_pRegUserDict->tqfind(notifyString); if(nam) { @@ -1156,39 +1156,39 @@ bool KviWatchNotifyListManager::doMatchUser(KviIrcMessage * msg,const QString &n if(KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserByName(*nam)) { // ok ... match the user - if(u->matchesFixed(mask)) + if(u->matchesFixed(tqmask)) { // new user online - if(!(m_pConsole->notifyListView()->findEntry(mask.nick()))) + if(!(m_pConsole->notifyListView()->findEntry(tqmask.nick()))) { - notifyOnLine(mask.nick(),mask.user(),mask.host(),"watch"); + notifyOnLine(tqmask.nick(),tqmask.user(),tqmask.host(),"watch"); } else { // else already online , and matching...all ok if(msg->numeric() == RPL_NOWON) { // This is a reply to a /watch +something (should not happen, unless the user is messing) or to /watch l (user requested) - notifyOnLine(mask.nick(),mask.user(),mask.host(), + notifyOnLine(tqmask.nick(),tqmask.user(),tqmask.host(), __tr2qs("watch entry listing requested by user"),false); } else { // This is a RPL_LOGON....we're desynched ? - notifyOnLine(mask.nick(),mask.user(),mask.host(), + notifyOnLine(tqmask.nick(),tqmask.user(),tqmask.host(), __tr2qs("possible watch list desync"),false); } } } else { // not matched.... has he been online before ? - if(m_pConsole->notifyListView()->findEntry(mask.nick())) + if(m_pConsole->notifyListView()->findEntry(tqmask.nick())) { - // has been online just a sec ago , but now the mask does not match + // has been online just a sec ago , but now the tqmask does not match // prolly the reguserdb has been changed - notifyOffLine(mask.nick(),mask.user(),mask.host(), - __tr2qs("registration mask changed or desync with the watch service")); + notifyOffLine(tqmask.nick(),tqmask.user(),tqmask.host(), + __tr2qs("registration tqmask changed or desync with the watch service")); } else { // has never been online if(_OUTPUT_VERBOSE) m_pConsole->output(KVI_OUT_SYSTEMMESSAGE, - __tr("Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] does not match (watch: registration mask does not match, or nickname is being used by someone else)"), - &(mask.nick()),&(mask.user()),&(mask.host())); + __tr("Notify list: \r!n\r%Q\r appears to be online, but the tqmask [%Q@\r!h\r%Q\r] does not match (watch: registration tqmask does not match, or nickname is being used by someone else)"), + &(tqmask.nick()),&(tqmask.user()),&(tqmask.host())); } } } else { @@ -1202,9 +1202,9 @@ bool KviWatchNotifyListManager::doMatchUser(KviIrcMessage * msg,const QString &n } else { // not in our dictionary // prolly someone used /WATCH behind our back... bad boy! - if(!(m_pConsole->notifyListView()->findEntry(mask.nick()))) + if(!(m_pConsole->notifyListView()->findEntry(tqmask.nick()))) { - notifyOnLine(mask.nick(),mask.user(),mask.host(),__tr2qs("watch entry added by user")); + notifyOnLine(tqmask.nick(),tqmask.user(),tqmask.host(),__tr2qs("watch entry added by user")); } } return true; @@ -1228,9 +1228,9 @@ bool KviWatchNotifyListManager::handleWatchReply(KviIrcMessage *msg) const char * nk = msg->safeParam(1); const char * us = msg->safeParam(2); const char * ho = msg->safeParam(3); - QString dnk = m_pConnection->decodeText(nk); - QString dus = m_pConnection->decodeText(us); - QString dho = m_pConnection->decodeText(ho); + TQString dnk = m_pConnection->decodeText(nk); + TQString dus = m_pConnection->decodeText(us); + TQString dho = m_pConnection->decodeText(ho); if((msg->numeric() == RPL_LOGON) || (msg->numeric() == RPL_NOWON)) { @@ -1247,7 +1247,7 @@ bool KviWatchNotifyListManager::handleWatchReply(KviIrcMessage *msg) if(_OUTPUT_VERBOSE) m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: Stopped watching for \r!n\r%Q\r"),&dnk); } - if(m_pRegUserDict->find(dnk))m_pRegUserDict->remove(dnk); // kill that + if(m_pRegUserDict->tqfind(dnk))m_pRegUserDict->remove(dnk); // kill that return true; @@ -1263,7 +1263,7 @@ bool KviWatchNotifyListManager::handleWatchReply(KviIrcMessage *msg) if(_OUTPUT_VERBOSE) m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: \r!n\r%Q\r is offline (watch)"),&dnk); } else { - // This is a RPL_LOGOFF for an user that has not matched the reg-mask + // This is a RPL_LOGOFF for an user that has not matched the reg-tqmask notifyOffLine(dnk,dus,dho,__tr2qs("unmatched watch list entry")); } } diff --git a/src/kvirc/kernel/kvi_notifylist.h b/src/kvirc/kernel/kvi_notifylist.h index 8484f3f..ebf6151 100644 --- a/src/kvirc/kernel/kvi_notifylist.h +++ b/src/kvirc/kernel/kvi_notifylist.h @@ -28,10 +28,10 @@ #include "kvi_settings.h" -#include <qobject.h> +#include <tqobject.h> #include "kvi_pointerlist.h" #include "kvi_pointerhashtable.h" -#include <qtimer.h> +#include <tqtimer.h> #include "kvi_qstring.h" @@ -40,13 +40,14 @@ class KviIrcMessage; class KviIrcMask; class KviIrcConnection; -class KVIRC_API KviNotifyListManager : public QObject +class KVIRC_API KviNotifyListManager : public TQObject { friend class KviConsole; friend class KviConnectionInfo; friend class KviServerParser; friend class KviIrcConnection; Q_OBJECT + TQ_OBJECT protected: KviNotifyListManager(KviIrcConnection * pConnection); ~KviNotifyListManager(); @@ -59,8 +60,8 @@ protected: virtual bool handleUserhost(KviIrcMessage * msg); virtual bool handleIsOn(KviIrcMessage * msg); virtual bool handleWatchReply(KviIrcMessage *msg); - void notifyOnLine(const QString &nick,const QString &user = QString::null,const QString &host = QString::null,const QString &szReason = QString::null,bool bJoin=true); - void notifyOffLine(const QString &nick,const QString &user = QString::null,const QString &host = QString::null,const QString &szReason = QString::null); + void notifyOnLine(const TQString &nick,const TQString &user = TQString(),const TQString &host = TQString(),const TQString &szReason = TQString(),bool bJoin=true); + void notifyOffLine(const TQString &nick,const TQString &user = TQString(),const TQString &host = TQString(),const TQString &szReason = TQString()); public: KviConsole * console(){ return m_pConsole; }; }; @@ -71,22 +72,23 @@ class KVIRC_API KviIsOnNotifyListManager : public KviNotifyListManager friend class KviServerParser; friend class KviIrcConnection; Q_OBJECT + TQ_OBJECT protected: KviIsOnNotifyListManager(KviIrcConnection * pConnection); ~KviIsOnNotifyListManager(); private: - KviPointerHashTable<QString,QString> * m_pRegUserDict; // dict notifystring->reguser name - KviPointerList<QString> * m_pNotifyList; // list of notifystring (total) - KviPointerList<QString> * m_pIsOnList; // list of notifystring (one session) - QString m_szIsOnString; // m_pIsOnList in form of a string - KviPointerList<QString> * m_pOnlineList; // - KviPointerList<QString> * m_pUserhostList; - QString m_szUserhostString; + KviPointerHashTable<TQString,TQString> * m_pRegUserDict; // dict notifystring->reguser name + KviPointerList<TQString> * m_pNotifyList; // list of notifystring (total) + KviPointerList<TQString> * m_pIsOnList; // list of notifystring (one session) + TQString m_szIsOnString; // m_pIsOnList in form of a string + KviPointerList<TQString> * m_pOnlineList; // + KviPointerList<TQString> * m_pUserhostList; + TQString m_szUserhostString; bool m_bExpectingIsOn; bool m_bExpectingUserhost; - QTimer * m_pDelayedIsOnTimer; - QTimer * m_pDelayedNotifyTimer; - QTimer * m_pDelayedUserhostTimer; + TQTimer * m_pDelayedIsOnTimer; + TQTimer * m_pDelayedNotifyTimer; + TQTimer * m_pDelayedUserhostTimer; bool m_bRunning; protected: virtual void start(); @@ -108,7 +110,7 @@ private slots: void buildNotifyList(); void sendIsOn(); void sendUserhost(); - bool doMatchUser(const QString ¬ifyString,const KviIrcMask & mask); + bool doMatchUser(const TQString ¬ifyString,const KviIrcMask & tqmask); }; @@ -119,12 +121,13 @@ class KVIRC_API KviStupidNotifyListManager : public KviNotifyListManager friend class KviServerParser; friend class KviIrcConnection; Q_OBJECT + TQ_OBJECT protected: KviStupidNotifyListManager(KviIrcConnection * pConnection); ~KviStupidNotifyListManager(); protected: - KviPointerList<QString> * m_pNickList; - QString m_szLastIsOnMsg; + KviPointerList<TQString> * m_pNickList; + TQString m_szLastIsOnMsg; int m_iNextNickToCheck; int m_iRestartTimer; protected: @@ -132,7 +135,7 @@ protected: virtual void stop(); virtual bool handleIsOn(KviIrcMessage *msg); protected: - virtual void timerEvent(QTimerEvent *e); + virtual void timerEvent(TQTimerEvent *e); private: void buildNickList(); void sendIsOn(); @@ -144,17 +147,18 @@ class KVIRC_API KviWatchNotifyListManager : public KviNotifyListManager friend class KviServerParser; friend class KviIrcConnection; Q_OBJECT + TQ_OBJECT public: KviWatchNotifyListManager(KviIrcConnection * pConnection); ~KviWatchNotifyListManager(); protected: - KviPointerHashTable<QString,QString> * m_pRegUserDict; // dict notifystring->reguser name + KviPointerHashTable<TQString,TQString> * m_pRegUserDict; // dict notifystring->reguser name protected: void buildRegUserDict(); virtual void start(); virtual void stop(); virtual bool handleWatchReply(KviIrcMessage *msg); - bool doMatchUser(KviIrcMessage *msg,const QString ¬ifyString,const KviIrcMask & mask); + bool doMatchUser(KviIrcMessage *msg,const TQString ¬ifyString,const KviIrcMask & tqmask); }; diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp index 84bf450..602e778 100644 --- a/src/kvirc/kernel/kvi_options.cpp +++ b/src/kvirc/kernel/kvi_options.cpp @@ -42,21 +42,21 @@ #include "kvi_frame.h" #include "kvi_internalcmd.h" #include "kvi_theme.h" -#include <qmessagebox.h> -#include <qregexp.h> +#include <tqmessagebox.h> +#include <tqregexp.h> //#include "kvi_textencoding.h" //xml parser -#include <qdom.h> +#include <tqdom.h> //!xml parser #include <zlib.h> -#include <qtextcodec.h> +#include <tqtextcodec.h> #include "kvi_fileutils.h" -#include <qdir.h> -#include <qstringlist.h> +#include <tqdir.h> +#include <tqstringlist.h> // kvi_app.cpp extern KVIRC_API int g_iIdentDaemonRunningUsers; @@ -66,9 +66,9 @@ extern KVIRC_API int g_iIdentDaemonRunningUsers; KviRectOption g_rectOptionsTable[KVI_NUM_RECT_OPTIONS]= { - RECT_OPTION("FrameGeometry",QRect(0,0,10,10),KviOption_sectFlagGeometry), - RECT_OPTION("GeneralOptionsDialogGeometry",QRect(50,50,600,450),KviOption_sectFlagGeometry), - RECT_OPTION("RegisteredUsersDialogGeometry",QRect(50,50,600,450),KviOption_sectFlagGeometry) + RECT_OPTION("FrameGeometry",TQRect(0,0,10,10),KviOption_sectFlagGeometry), + RECT_OPTION("GeneralOptionsDialogGeometry",TQRect(50,50,600,450),KviOption_sectFlagGeometry), + RECT_OPTION("RegisteredUsersDialogGeometry",TQRect(50,50,600,450),KviOption_sectFlagGeometry) }; #define BOOL_OPTION(_txt,_val,_flags) KviBoolOption(KVI_BOOL_OPTIONS_PREFIX _txt,_val,_flags) @@ -338,7 +338,7 @@ KviStringOption g_stringOptionsTable[KVI_NUM_STRING_OPTIONS]= STRING_OPTION("Realname",KVI_DEFAULT_REALNAME,KviOption_sectFlagUser), STRING_OPTION("LocalHostIp","127.0.0.1",KviOption_sectFlagIrcSocket), STRING_OPTION("PartMessage",KVI_DEFAULT_PART_MESSAGE,KviOption_sectFlagConnection), - STRING_OPTION("QuitMessage",KVI_DEFAULT_QUIT_MESSAGE,KviOption_sectFlagConnection), + STRING_OPTION("QuitMessage",KVI_DEFAULT_TQUIT_MESSAGE,KviOption_sectFlagConnection), STRING_OPTION("UrlHttpCommand",RUN_THE_BROWSER,KviOption_sectFlagUrl), STRING_OPTION("ExtendedPrivmsgPrefix","[",KviOption_sectFlagIrcView | KviOption_groupTheme), STRING_OPTION("ExtendedPrivmsgPostfix","] ",KviOption_sectFlagIrcView | KviOption_groupTheme), @@ -389,10 +389,10 @@ KviStringOption g_stringOptionsTable[KVI_NUM_STRING_OPTIONS]= }; #define STRINGLIST_OPTION(_txt,_flags) \ - KviStringListOption(KVI_STRINGLIST_OPTIONS_PREFIX _txt,QStringList(),_flags) + KviStringListOption(KVI_STRINGLIST_OPTIONS_PREFIX _txt,TQStringList(),_flags) #define STRINGLIST_OPTION_WITHDEFAULT(_txt,_flags,_def) \ - KviStringListOption(KVI_STRINGLIST_OPTIONS_PREFIX _txt,QStringList(_def),_flags) + KviStringListOption(KVI_STRINGLIST_OPTIONS_PREFIX _txt,TQStringList(_def),_flags) KviStringListOption g_stringlistOptionsTable[KVI_NUM_STRINGLIST_OPTIONS]= @@ -408,7 +408,7 @@ KviStringListOption g_stringlistOptionsTable[KVI_NUM_STRINGLIST_OPTIONS]= }; #define MIRC_COLOR_OPTION(_num,_red,_green,_blue) \ - KviColorOption(KVI_MIRCCOLOR_OPTIONS_PREFIX _num,QColor(_red,_green,_blue), \ + KviColorOption(KVI_MIRCCOLOR_OPTIONS_PREFIX _num,TQColor(_red,_green,_blue), \ KviOption_sectFlagMircColor | KviOption_resetUpdateGui | KviOption_groupTheme) KviColorOption g_mirccolorOptionsTable[KVI_NUM_MIRCCOLOR_OPTIONS]= @@ -433,7 +433,7 @@ KviColorOption g_mirccolorOptionsTable[KVI_NUM_MIRCCOLOR_OPTIONS]= #define COLOR_OPTION(_name,_red,_green,_blue,_flags) \ KviColorOption(KVI_COLOR_OPTIONS_PREFIX _name, \ - QColor(_red,_green,_blue), \ + TQColor(_red,_green,_blue), \ _flags | KviOption_resetUpdateGui | KviOption_groupTheme) KviColorOption g_colorOptionsTable[KVI_NUM_COLOR_OPTIONS]= @@ -500,7 +500,7 @@ KviColorOption g_colorOptionsTable[KVI_NUM_COLOR_OPTIONS]= #define IC_COLOR_OPTION(_num,_red,_green,_blue) \ KviColorOption( \ KVI_ICCOLOR_OPTIONS_PREFIX _num, \ - QColor(_red,_green,_blue), \ + TQColor(_red,_green,_blue), \ KviOption_sectFlagTaskBar | KviOption_resetUpdateGui | KviOption_groupTheme) KviColorOption g_iccolorOptionsTable[KVI_NUM_ICCOLOR_OPTIONS]= @@ -627,7 +627,7 @@ KviUIntOption g_uintOptionsTable[KVI_NUM_UINT_OPTIONS]= #define FONT_OPTION(_name,_face,_size,_flags) \ KviFontOption( \ KVI_FONT_OPTIONS_PREFIX _name , \ - QFont(_face,_size) , \ + TQFont(_face,_size) , \ _flags | KviOption_groupTheme \ ) @@ -642,23 +642,13 @@ KviFontOption g_fontOptionsTable[KVI_NUM_FONT_OPTIONS]= FONT_OPTION("IrcToolBarApplet","Arial",9,KviOption_sectFlagIrcToolBar | KviOption_resetUpdateGui), FONT_OPTION("Taskbar","Arial",9,KviOption_sectFlagTaskBar | KviOption_resetUpdateTaskBar) #else - #if QT_VERSION >= 300 - FONT_OPTION("IrcView","Monospace",10,KviOption_sectFlagIrcView | KviOption_resetUpdateGui), - FONT_OPTION("Input","Sans Serif",12,KviOption_sectFlagInput | KviOption_resetUpdateGui), - FONT_OPTION("UserListView","Sans Serif",10,KviOption_sectFlagUserListView | KviOption_resetUpdateGui), - FONT_OPTION("Label","Sans Serif",10,KviOption_sectFlagLabel | KviOption_resetUpdateGui), - FONT_OPTION("Application","Sans Serif",10,KviOption_sectFlagGui | KviOption_resetUpdateAppFont), - FONT_OPTION("IrcToolBarApplet","Sans Serif",10,KviOption_sectFlagIrcToolBar | KviOption_resetUpdateGui), - FONT_OPTION("Taskbar","Sans Serif",10,KviOption_sectFlagTaskBar | KviOption_resetUpdateTaskBar) - #else - FONT_OPTION("IrcView","Monospace",12,KviOption_sectFlagIrcView | KviOption_resetUpdateGui), - FONT_OPTION("Input","Sans Serif",16,KviOption_sectFlagInput | KviOption_resetUpdateGui), - FONT_OPTION("UserListView","Sans Serif",12,KviOption_sectFlagUserListView | KviOption_resetUpdateGui), - FONT_OPTION("Label","Sans Serif",12,KviOption_sectFlagLabel | KviOption_resetUpdateGui), - FONT_OPTION("Application","Sans Serif",12,KviOption_sectFlagGui | KviOption_resetUpdateAppFont), - FONT_OPTION("IrcToolBarApplet","Sans Serif",10,KviOption_sectFlagIrcToolBar | KviOption_resetUpdateGui), - FONT_OPTION("Taskbar","Sans Serif",10,KviOption_sectFlagTaskBar | KviOption_resetUpdateTaskBar) - #endif + FONT_OPTION("IrcView","Monospace",10,KviOption_sectFlagIrcView | KviOption_resetUpdateGui), + FONT_OPTION("Input","Sans Serif",12,KviOption_sectFlagInput | KviOption_resetUpdateGui), + FONT_OPTION("UserListView","Sans Serif",10,KviOption_sectFlagUserListView | KviOption_resetUpdateGui), + FONT_OPTION("Label","Sans Serif",10,KviOption_sectFlagLabel | KviOption_resetUpdateGui), + FONT_OPTION("Application","Sans Serif",10,KviOption_sectFlagGui | KviOption_resetUpdateAppFont), + FONT_OPTION("IrcToolBarApplet","Sans Serif",10,KviOption_sectFlagIrcToolBar | KviOption_resetUpdateGui), + FONT_OPTION("Taskbar","Sans Serif",10,KviOption_sectFlagTaskBar | KviOption_resetUpdateTaskBar) #endif }; @@ -708,7 +698,7 @@ KviMsgTypeOption g_msgtypeOptionsTable[KVI_NUM_MSGTYPE_OPTIONS]= MSGTYPE_OPTION("Topic",__tr_no_lookup("Topic message"),KVI_SMALLICON_TOPIC,KVI_MSGTYPE_LEVEL_3), MSGTYPE_OPTION("OwnPrivateMessage",__tr_no_lookup("Own private message"),KVI_SMALLICON_OWNPRIVMSG,KVI_MSGTYPE_LEVEL_1), MSGTYPE_OPTION("ChannelPrivateMessage",__tr_no_lookup("Channel private message"),KVI_SMALLICON_CHANPRIVMSG,KVI_MSGTYPE_LEVEL_4), - MSGTYPE_OPTION("QueryPrivateMessage",__tr_no_lookup("Query private message"),KVI_SMALLICON_QUERYPRIVMSG,KVI_MSGTYPE_LEVEL_4), + MSGTYPE_OPTION("QueryPrivateMessage",__tr_no_lookup("Query private message"),KVI_SMALLICON_TQUERYPRIVMSG,KVI_MSGTYPE_LEVEL_4), MSGTYPE_OPTION("CtcpReply",__tr_no_lookup("CTCP reply"),KVI_SMALLICON_CTCPREPLY,KVI_MSGTYPE_LEVEL_3), MSGTYPE_OPTION("CtcpRequestReplied",__tr_no_lookup("CTCP request replied"),KVI_SMALLICON_CTCPREQUESTREPLIED,KVI_MSGTYPE_LEVEL_3), MSGTYPE_OPTION("CtcpRequestIgnored",__tr_no_lookup("CTCP request ignored"),KVI_SMALLICON_CTCPREQUESTIGNORED,KVI_MSGTYPE_LEVEL_3), @@ -716,9 +706,9 @@ KviMsgTypeOption g_msgtypeOptionsTable[KVI_NUM_MSGTYPE_OPTIONS]= MSGTYPE_OPTION("CtcpRequestUnknown",__tr_no_lookup("CTCP request unknown"),KVI_SMALLICON_CTCPREQUESTUNKNOWN,KVI_MSGTYPE_LEVEL_3), MSGTYPE_OPTION("Action",__tr_no_lookup("User action"),KVI_SMALLICON_ACTION,KVI_MSGTYPE_LEVEL_3), MSGTYPE_OPTION("AvatarChange",__tr_no_lookup("Avatar change"),KVI_SMALLICON_AVATAR,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("Quit",__tr_no_lookup("Quit message"),KVI_SMALLICON_QUIT,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("Quit",__tr_no_lookup("Quit message"),KVI_SMALLICON_TQUIT,KVI_MSGTYPE_LEVEL_1), MSGTYPE_OPTION("Split",__tr_no_lookup("Split message"),KVI_SMALLICON_SPLIT,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("QuitSplit",__tr_no_lookup("Quit on netsplit message"),KVI_SMALLICON_QUITSPLIT,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("QuitSplit",__tr_no_lookup("Quit on netsplit message"),KVI_SMALLICON_TQUITSPLIT,KVI_MSGTYPE_LEVEL_2), MSGTYPE_OPTION("Nick",__tr_no_lookup("Nick changes"),KVI_SMALLICON_NICK,KVI_MSGTYPE_LEVEL_2), MSGTYPE_OPTION("Op",__tr_no_lookup("+o mode change"),KVI_SMALLICON_OP,KVI_MSGTYPE_LEVEL_2), MSGTYPE_OPTION("Deop",__tr_no_lookup("-o mode change"),KVI_SMALLICON_DEOP,KVI_MSGTYPE_LEVEL_2), @@ -749,7 +739,7 @@ KviMsgTypeOption g_msgtypeOptionsTable[KVI_NUM_MSGTYPE_OPTIONS]= MSGTYPE_OPTION("NotifyOffLine",__tr_no_lookup("Notify list leaves"),KVI_SMALLICON_NOTIFYOFFLINE,KVI_MSGTYPE_LEVEL_3), MSGTYPE_OPTION("OwnPrivmsgCrypted",__tr_no_lookup("Own encrypted private message"),KVI_SMALLICON_OWNPRIVMSGCRYPTED,KVI_MSGTYPE_LEVEL_1), MSGTYPE_OPTION("ChanPrivmsgCrypted",__tr_no_lookup("Channel encrypted private message"),KVI_SMALLICON_CHANPRIVMSGCRYPTED,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("QueryPrivmsgCrypted",__tr_no_lookup("Query encrypted private message"),KVI_SMALLICON_QUERYPRIVMSGCRYPTED,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("QueryPrivmsgCrypted",__tr_no_lookup("Query encrypted private message"),KVI_SMALLICON_TQUERYPRIVMSGCRYPTED,KVI_MSGTYPE_LEVEL_3), MSGTYPE_OPTION("DccChatMsg",__tr_no_lookup("DCC chat message"),KVI_SMALLICON_DCCCHATMSG,KVI_MSGTYPE_LEVEL_3), MSGTYPE_OPTION("DccChatMsgCrypted",__tr_no_lookup("Encrypted DCC chat message"),KVI_SMALLICON_DCCCHATMSGCRYPTED,KVI_MSGTYPE_LEVEL_3), MSGTYPE_OPTION("Irc",__tr_no_lookup("Login operations completed"),KVI_SMALLICON_IRC,KVI_MSGTYPE_LEVEL_1), @@ -761,8 +751,8 @@ KviMsgTypeOption g_msgtypeOptionsTable[KVI_NUM_MSGTYPE_OPTIONS]= MSGTYPE_OPTION("IcqMessageSent",__tr_no_lookup("Outgoing ICQ user-message"),KVI_SMALLICON_MESSAGESENT,KVI_MSGTYPE_LEVEL_1), MSGTYPE_OPTION("ChannelNotice",__tr_no_lookup("Channel notice"),KVI_SMALLICON_CHANNELNOTICE,KVI_MSGTYPE_LEVEL_3), MSGTYPE_OPTION("ChannelNoticeCrypted",__tr_no_lookup("Encrypted channel notice"),KVI_SMALLICON_CHANNELNOTICECRYPTED,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("QueryNotice",__tr_no_lookup("Query notice"),KVI_SMALLICON_QUERYNOTICE,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("QueryNoticeCrypted",__tr_no_lookup("Encrypted query notice"),KVI_SMALLICON_QUERYNOTICECRYPTED,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("QueryNotice",__tr_no_lookup("Query notice"),KVI_SMALLICON_TQUERYNOTICE,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("QueryNoticeCrypted",__tr_no_lookup("Encrypted query notice"),KVI_SMALLICON_TQUERYNOTICECRYPTED,KVI_MSGTYPE_LEVEL_3), MSGTYPE_OPTION("ServerNotice",__tr_no_lookup("Server notice"),KVI_SMALLICON_SERVERNOTICE,KVI_MSGTYPE_LEVEL_3), MSGTYPE_OPTION("HalfOp",__tr_no_lookup("Halfop mode change"),KVI_SMALLICON_HALFOP,KVI_MSGTYPE_LEVEL_2), MSGTYPE_OPTION("CtcpReplyUnknown",__tr_no_lookup("Unknown CTCP reply"),KVI_SMALLICON_CTCPREPLYUNKNOWN,KVI_MSGTYPE_LEVEL_3), @@ -774,7 +764,7 @@ KviMsgTypeOption g_msgtypeOptionsTable[KVI_NUM_MSGTYPE_OPTIONS]= MSGTYPE_OPTION("HalfDeOp",__tr_no_lookup("Half-deop mode change"),KVI_SMALLICON_HALFDEOP,KVI_MSGTYPE_LEVEL_2), MSGTYPE_OPTION("Invite",__tr_no_lookup("Invite message"),KVI_SMALLICON_INVITE,KVI_MSGTYPE_LEVEL_3), MSGTYPE_OPTION("Multimedia",__tr_no_lookup("Multimedia message"),KVI_SMALLICON_MULTIMEDIA,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("QueryTrace",__tr_no_lookup("Query trace message"),KVI_SMALLICON_QUERYTRACE,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("QueryTrace",__tr_no_lookup("Query trace message"),KVI_SMALLICON_TQUERYTRACE,KVI_MSGTYPE_LEVEL_1), MSGTYPE_OPTION("Wallops",__tr_no_lookup("Wallops message"),KVI_SMALLICON_WALLOPS,KVI_MSGTYPE_LEVEL_3), MSGTYPE_OPTION("JoinError",__tr_no_lookup("Join error message"),KVI_SMALLICON_NOCHANNEL,KVI_MSGTYPE_LEVEL_3), MSGTYPE_OPTION("BroadcastPrivmsg",__tr_no_lookup("Broadcast private message"),KVI_SMALLICON_BROADCASTPRIVMSG,KVI_MSGTYPE_LEVEL_3), @@ -786,18 +776,18 @@ KviMsgTypeOption g_msgtypeOptionsTable[KVI_NUM_MSGTYPE_OPTIONS]= MSGTYPE_OPTION("MeDeVoice",__tr_no_lookup("Am devoiced"),KVI_SMALLICON_MEDEVOICE,KVI_MSGTYPE_LEVEL_5), MSGTYPE_OPTION("MeHalfOp",__tr_no_lookup("Am halfop'd"),KVI_SMALLICON_MEHALFOP,KVI_MSGTYPE_LEVEL_5), MSGTYPE_OPTION("MeDeHalfOp",__tr_no_lookup("Am de-halfop'd"),KVI_SMALLICON_MEDEHALFOP,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeBan",__tr_no_lookup("Ban matching my mask"),KVI_SMALLICON_MEBAN,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeUnban",__tr_no_lookup("Unban matching my mask"),KVI_SMALLICON_MEUNBAN,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeBanExcept",__tr_no_lookup("Ban exception matching my mask"),KVI_SMALLICON_MEBANEXCEPT,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeBanUnExcept",__tr_no_lookup("Ban unexception matching my mask"),KVI_SMALLICON_MEBANUNEXCEPT,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeInviteExcept",__tr_no_lookup("Invite exception matching my mask"),KVI_SMALLICON_MEINVITEEXCEPT,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeInviteUnexcept",__tr_no_lookup("Invite unexception matching my mask"),KVI_SMALLICON_MEINVITEUNEXCEPT,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeBan",__tr_no_lookup("Ban matching my tqmask"),KVI_SMALLICON_MEBAN,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeUnban",__tr_no_lookup("Unban matching my tqmask"),KVI_SMALLICON_MEUNBAN,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeBanExcept",__tr_no_lookup("Ban exception matching my tqmask"),KVI_SMALLICON_MEBANEXCEPT,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeBanUnExcept",__tr_no_lookup("Ban unexception matching my tqmask"),KVI_SMALLICON_MEBANUNEXCEPT,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeInviteExcept",__tr_no_lookup("Invite exception matching my tqmask"),KVI_SMALLICON_MEINVITEEXCEPT,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeInviteUnexcept",__tr_no_lookup("Invite unexception matching my tqmask"),KVI_SMALLICON_MEINVITEUNEXCEPT,KVI_MSGTYPE_LEVEL_5), MSGTYPE_OPTION("Ignore",__tr_no_lookup("Ignored user message"),KVI_SMALLICON_IGNORE,KVI_MSGTYPE_LEVEL_3), MSGTYPE_OPTION("Stats",__tr_no_lookup("Server statistics"),KVI_SMALLICON_STATS,KVI_MSGTYPE_LEVEL_1), MSGTYPE_OPTION("SSL",__tr_no_lookup("SSL message"),KVI_SMALLICON_SSL,KVI_MSGTYPE_LEVEL_1), MSGTYPE_OPTION("Search",__tr_no_lookup("Search"),KVI_SMALLICON_SEARCH,KVI_MSGTYPE_LEVEL_1), MSGTYPE_OPTION("GenericSuccess",__tr_no_lookup("Generic success"),KVI_SMALLICON_CYANSQUARE,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("GenericStatus",__tr_no_lookup("Generic status"),KVI_SMALLICON_GREENSQUARE,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("GenerictqStatus",__tr_no_lookup("Generic status"),KVI_SMALLICON_GREENSQUARE,KVI_MSGTYPE_LEVEL_2), MSGTYPE_OPTION("GenericVerbose",__tr_no_lookup("Generic verbose message"),KVI_SMALLICON_DKGREENSQUARE,KVI_MSGTYPE_LEVEL_1), MSGTYPE_OPTION("GenericWarning",__tr_no_lookup("Generic warning"),KVI_SMALLICON_YELLOWSQUARE,KVI_MSGTYPE_LEVEL_3), MSGTYPE_OPTION_SPEC("GenericError",__tr_no_lookup("Generic error"),KVI_SMALLICON_REDSQUARE,KVI_RED,KVI_TRANSPARENT,KVI_MSGTYPE_LEVEL_5), @@ -868,7 +858,7 @@ void KviApp::loadOptions() READ_OPTIONS(KVI_NUM_RECT_OPTIONS,g_rectOptionsTable,readRectEntry) READ_OPTIONS(KVI_NUM_BOOL_OPTIONS,g_boolOptionsTable,readBoolEntry) - READ_OPTIONS(KVI_NUM_STRING_OPTIONS,g_stringOptionsTable,readQStringEntry) + READ_OPTIONS(KVI_NUM_STRING_OPTIONS,g_stringOptionsTable,readTQStringEntry) READ_OPTIONS(KVI_NUM_COLOR_OPTIONS,g_colorOptionsTable,readColorEntry) READ_OPTIONS(KVI_NUM_PIXMAP_OPTIONS,g_pixmapOptionsTable,readPixmapEntry) READ_OPTIONS(KVI_NUM_UINT_OPTIONS,g_uintOptionsTable,readUIntEntry) @@ -896,7 +886,7 @@ void KviApp::loadOptions() void KviApp::saveOptions() { - QString buffer; + TQString buffer; saveRecentChannels(); @@ -963,7 +953,7 @@ namespace KviTheme // that are implemented here for convenience (in saving the options) bool save(KviThemeInfo &options) { - QString szD = options.absoluteDirectory(); + TQString szD = options.absoluteDirectory(); if(szD.isEmpty()) { @@ -1018,9 +1008,9 @@ namespace KviTheme { if(g_pixmapOptionsTable[i].option.pixmap()) { - QString szPixPath = options.absoluteDirectory(); + TQString szPixPath = options.absoluteDirectory(); szPixPath.append(KVI_PATH_SEPARATOR_CHAR); - QString szPixName = g_pixmapOptionsTable[i].name; + TQString szPixName = g_pixmapOptionsTable[i].name; szPixName += ".png"; szPixPath += szPixName; @@ -1041,18 +1031,18 @@ namespace KviTheme cfg.writeEntry("stringIconThemeSubdir",options.subdirectory()); // find all the "kvi_bigicon" images that we can find in the main pics directory - QString szPicsPath; + TQString szPicsPath; g_pApp->getGlobalKvircDirectory(szPicsPath,KviApp::Pics); - QDir d(szPicsPath); - QStringList sl = d.entryList("kvi_bigicon_*.png",QDir::Files); + TQDir d(szPicsPath); + TQStringList sl = d.entryList("kvi_bigicon_*.png",TQDir::Files); - for(QStringList::Iterator it=sl.begin();it != sl.end();it++) + for(TQStringList::Iterator it=sl.begin();it != sl.end();it++) { KviCachedPixmap * p = g_pIconManager->getPixmapWithCache(*it); if(p) { - QString szPixPath = options.absoluteDirectory(); + TQString szPixPath = options.absoluteDirectory(); szPixPath.append(KVI_PATH_SEPARATOR_CHAR); szPixPath += *it; @@ -1081,9 +1071,9 @@ namespace KviTheme for(int j=0;j<KVI_NUM_SMALL_ICONS;j++) { - QPixmap * pix = g_pIconManager->getSmallIcon(j); + TQPixmap * pix = g_pIconManager->getSmallIcon(j); - QString szPixPath = options.absoluteDirectory(); + TQString szPixPath = options.absoluteDirectory(); szPixPath.append(KVI_PATH_SEPARATOR_CHAR); szPixPath.append(KVI_SMALLICONS_SUBDIRECTORY); szPixPath.append(KVI_PATH_SEPARATOR_CHAR); @@ -1101,7 +1091,7 @@ namespace KviTheme return true; } - bool load(const QString &themeDir,KviThemeInfo &buffer) + bool load(const TQString &themeDir,KviThemeInfo &buffer) { if(!buffer.loadFromDirectory(themeDir)) return false; // makes sure that themedata exists too @@ -1110,12 +1100,12 @@ namespace KviTheme KVI_OPTION_STRING(KviOption_stringIconThemeSubdir) = ""; // reset the splash screen pointer - QString szPointerFile; + TQString szPointerFile; g_pApp->getLocalKvircDirectory(szPointerFile,KviApp::Themes,"current-splash"); KviFileUtils::removeFile(szPointerFile); - QString szD = themeDir; - KviQString::ensureLastCharIs(szD,KVI_PATH_SEPARATOR_CHAR); + TQString szD = themeDir; + KviTQString::ensureLastCharIs(szD,KVI_PATH_SEPARATOR_CHAR); szD.append(KVI_THEMEDATA_FILE_NAME); KviConfig cfg(szD,KviConfig::Read); @@ -1152,7 +1142,7 @@ namespace KviTheme READ_OPTIONS(KVI_NUM_RECT_OPTIONS,g_rectOptionsTable,readRectEntry) READ_OPTIONS(KVI_NUM_BOOL_OPTIONS,g_boolOptionsTable,readBoolEntry) - READ_OPTIONS(KVI_NUM_STRING_OPTIONS,g_stringOptionsTable,readQStringEntry) + READ_OPTIONS(KVI_NUM_STRING_OPTIONS,g_stringOptionsTable,readTQStringEntry) READ_OPTIONS(KVI_NUM_COLOR_OPTIONS,g_colorOptionsTable,readColorEntry) READ_OPTIONS(KVI_NUM_UINT_OPTIONS,g_uintOptionsTable,readUIntEntry) READ_OPTIONS(KVI_NUM_FONT_OPTIONS,g_fontOptionsTable,readFontEntry) @@ -1173,9 +1163,9 @@ namespace KviTheme { if(cfg.hasKey(g_pixmapOptionsTable[i].name)) { - QString szVal = cfg.readQStringEntry(g_pixmapOptionsTable[i].name,""); + TQString szVal = cfg.readTQStringEntry(g_pixmapOptionsTable[i].name,""); szVal.stripWhiteSpace(); - QString szBuffer; + TQString szBuffer; if(!szVal.isEmpty()) { g_pApp->findImage(szBuffer,szVal); @@ -1227,7 +1217,7 @@ void KviApp::listAvailableOptions(KviWindow *wnd) //using namespace KviStringConversion; -bool KviApp::getOptionString(const char * optName,QString &buffer) +bool KviApp::getOptionString(const char * optName,TQString &buffer) { #define GET_OPTION_STRING(__numOpt,__table,__prefix,__prefixLen) \ @@ -1317,7 +1307,7 @@ void KviApp::optionResetUpdate(int flags) } } -bool KviApp::setOptionValue(const char * optName,const QString &value) +bool KviApp::setOptionValue(const char * optName,const TQString &value) { #define SET_OPTION_VALUE(__numOpt,__table,__prefix,__prefixLen) \ @@ -1353,9 +1343,9 @@ bool KviApp::setOptionValue(const char * optName,const QString &value) if(kvi_strEqualCIN(optName,KVI_PIXMAP_OPTIONS_PREFIX,KVI_PIXMAP_OPTIONS_PREFIX_LEN)) { // We lookup the image path (so we allow also relative paths for this option type) - QString szVal = value; + TQString szVal = value; szVal.stripWhiteSpace(); - QString szBuffer; + TQString szBuffer; if(!szVal.isEmpty()) { findImage(szBuffer,szVal); diff --git a/src/kvirc/kernel/kvi_options.h b/src/kvirc/kernel/kvi_options.h index 1bd264e..1395aba 100644 --- a/src/kvirc/kernel/kvi_options.h +++ b/src/kvirc/kernel/kvi_options.h @@ -30,11 +30,11 @@ #include "kvi_pixmap.h" #include "kvi_msgtype.h" -#include <qrect.h> -#include <qpixmap.h> -#include <qcolor.h> -#include <qfont.h> -#include <qstringlist.h> +#include <tqrect.h> +#include <tqpixmap.h> +#include <tqcolor.h> +#include <tqfont.h> +#include <tqstringlist.h> // option structures @@ -53,15 +53,15 @@ }; DECLARE_OPTION_STRUCT(KviBoolOption,bool) -DECLARE_OPTION_STRUCT(KviRectOption,QRect) -DECLARE_OPTION_STRUCT(KviStringOption,QString) -DECLARE_OPTION_STRUCT(KviColorOption,QColor) -DECLARE_OPTION_STRUCT(KviFontOption,QFont) +DECLARE_OPTION_STRUCT(KviRectOption,TQRect) +DECLARE_OPTION_STRUCT(KviStringOption,TQString) +DECLARE_OPTION_STRUCT(KviColorOption,TQColor) +DECLARE_OPTION_STRUCT(KviFontOption,TQFont) DECLARE_OPTION_STRUCT(KviPixmapOption,KviPixmap) //DECLARE_OPTION_STRUCT(KviIntOption,int) DECLARE_OPTION_STRUCT(KviUIntOption,unsigned int) DECLARE_OPTION_STRUCT(KviMsgTypeOption,KviMsgType) -DECLARE_OPTION_STRUCT(KviStringListOption,QStringList) +DECLARE_OPTION_STRUCT(KviStringListOption,TQStringList) #define KVI_COLOR_EXT_USER_OP 50 #define KVI_COLOR_EXT_USER_HALFOP 51 @@ -641,14 +641,14 @@ extern KVIRC_API KviStringListOption g_stringlistOptionsTable[KVI_NUM_STRINGLIST // Verbosity constants #define KVI_VERBOSITY_LEVEL_MUTE 0 -#define KVI_VERBOSITY_LEVEL_QUIET 1 +#define KVI_VERBOSITY_LEVEL_TQUIET 1 #define KVI_VERBOSITY_LEVEL_NORMAL 2 #define KVI_VERBOSITY_LEVEL_VERBOSE 3 #define KVI_VERBOSITY_LEVEL_PARANOIC 4 #define _OUTPUT_PARANOIC (KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) >= KVI_VERBOSITY_LEVEL_PARANOIC) #define _OUTPUT_VERBOSE (KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) >= KVI_VERBOSITY_LEVEL_VERBOSE) -#define _OUTPUT_QUIET (KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) <= KVI_VERBOSITY_LEVEL_QUIET) +#define _OUTPUT_TQUIET (KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) <= KVI_VERBOSITY_LEVEL_TQUIET) #define _OUTPUT_MUTE (KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) <= KVI_VERBOSITY_LEVEL_MUTE) #ifdef COMPILE_USE_QT4 @@ -658,8 +658,8 @@ extern KVIRC_API KviStringListOption g_stringlistOptionsTable[KVI_NUM_STRINGLIST #define START_TABLE_NORMAL_ROW "<tr><td>" #define SET_ANTI_ALIASING(p) \ - (p).setRenderHint(QPainter::Antialiasing, KVI_OPTION_BOOL(KviOption_boolUseAntiAliasing)); \ - (p).setRenderHint(QPainter::TextAntialiasing, KVI_OPTION_BOOL(KviOption_boolUseAntiAliasing)); + (p).setRenderHint(TQPainter::Antialiasing, KVI_OPTION_BOOL(KviOption_boolUseAntiAliasing)); \ + (p).setRenderHint(TQPainter::TextAntialiasing, KVI_OPTION_BOOL(KviOption_boolUseAntiAliasing)); #else #define START_TABLE_BOLD_ROW "<tr><td bgcolor=\"#303030\">" \ "<font color=\"#FFFFFF\"><nobr><b>" diff --git a/src/kvirc/kernel/kvi_out.h b/src/kvirc/kernel/kvi_out.h index f73a4f6..9a5bdc0 100644 --- a/src/kvirc/kernel/kvi_out.h +++ b/src/kvirc/kernel/kvi_out.h @@ -50,7 +50,7 @@ #define KVI_OUT_TOPIC 23 #define KVI_OUT_OWNPRIVMSG 24 #define KVI_OUT_CHANPRIVMSG 25 -#define KVI_OUT_QUERYPRIVMSG 26 +#define KVI_OUT_TQUERYPRIVMSG 26 #define KVI_OUT_CTCPREPLY 27 #define KVI_OUT_CTCPREQUESTREPLIED 28 #define KVI_OUT_CTCPREQUESTIGNORED 29 @@ -58,9 +58,9 @@ #define KVI_OUT_CTCPREQUESTUNKNOWN 31 #define KVI_OUT_ACTION 32 #define KVI_OUT_AVATAR 33 -#define KVI_OUT_QUIT 34 +#define KVI_OUT_TQUIT 34 #define KVI_OUT_SPLIT 35 -#define KVI_OUT_QUITSPLIT 36 +#define KVI_OUT_TQUITSPLIT 36 #define KVI_OUT_NICK 37 #define KVI_OUT_OP 38 #define KVI_OUT_DEOP 39 @@ -91,7 +91,7 @@ #define KVI_OUT_NOTIFYOFFLINE 64 #define KVI_OUT_OWNPRIVMSGCRYPTED 65 #define KVI_OUT_CHANPRIVMSGCRYPTED 66 -#define KVI_OUT_QUERYPRIVMSGCRYPTED 67 +#define KVI_OUT_TQUERYPRIVMSGCRYPTED 67 #define KVI_OUT_DCCCHATMSG 68 #define KVI_OUT_DCCCHATMSGCRYPTED 69 #define KVI_OUT_IRC 70 @@ -99,12 +99,12 @@ #define KVI_OUT_LINKS 72 #define KVI_OUT_SPAM 73 #define KVI_OUT_ICQ 74 -#define KVI_OUT_ICQMESSAGE 75 -#define KVI_OUT_ICQMESSAGESENT 76 +#define KVI_OUT_ICTQMESSAGE 75 +#define KVI_OUT_ICTQMESSAGESENT 76 #define KVI_OUT_CHANNELNOTICE 77 #define KVI_OUT_CHANNELNOTICECRYPTED 78 -#define KVI_OUT_QUERYNOTICE 79 -#define KVI_OUT_QUERYNOTICECRYPTED 80 +#define KVI_OUT_TQUERYNOTICE 79 +#define KVI_OUT_TQUERYNOTICECRYPTED 80 #define KVI_OUT_SERVERNOTICE 81 #define KVI_OUT_HALFOP 82 #define KVI_OUT_CTCPREPLYUNKNOWN 83 @@ -116,7 +116,7 @@ #define KVI_OUT_HALFDEOP 89 #define KVI_OUT_INVITE 90 #define KVI_OUT_MULTIMEDIA 91 -#define KVI_OUT_QUERYTRACE 92 +#define KVI_OUT_TQUERYTRACE 92 #define KVI_OUT_WALLOPS 93 #define KVI_OUT_JOINERROR 94 #define KVI_OUT_BROADCASTPRIVMSG 95 diff --git a/src/kvirc/kernel/kvi_sslmaster.cpp b/src/kvirc/kernel/kvi_sslmaster.cpp index 2063048..d4b2219 100644 --- a/src/kvirc/kernel/kvi_sslmaster.cpp +++ b/src/kvirc/kernel/kvi_sslmaster.cpp @@ -79,14 +79,14 @@ KVIRC_API void printSSLConnectionInfo(KviWindow * wnd,KviSSL * s) KviSSLCertificate * sc = s->getPeerCertificate(); if(sc) { - QString tmp(__tr2qs("Peer X509 certificate")); + TQString tmp(__tr2qs("Peer X509 certificate")); KviSSLMaster::printSSLCertificate(wnd,tmp,sc); delete sc; } else wnd->outputNoFmt(KVI_OUT_SSL,__tr2qs("[SSL]: The peer didn't provide a certificate")); KviSSLCipherInfo * ci = s->getCurrentCipherInfo(); if(ci) { - QString tmp(__tr2qs("Current transmission cipher")); + TQString tmp(__tr2qs("Current transmission cipher")); KviSSLMaster::printSSLCipherInfo(wnd,tmp,ci); delete ci; } else wnd->outputNoFmt(KVI_OUT_SSL,__tr2qs("[SSL]: Can't find out the current cipher info")); diff --git a/src/kvirc/kernel/kvi_texticonmanager.cpp b/src/kvirc/kernel/kvi_texticonmanager.cpp index e15496b..3296222 100644 --- a/src/kvirc/kernel/kvi_texticonmanager.cpp +++ b/src/kvirc/kernel/kvi_texticonmanager.cpp @@ -35,8 +35,8 @@ #include "kvi_app.h" #include "kvi_confignames.h" -#include <qpixmap.h> -#include <qfile.h> +#include <tqpixmap.h> +#include <tqfile.h> KVIRC_API KviTextIconManager * g_pTextIconManager = 0; @@ -49,16 +49,16 @@ KviTextIcon::KviTextIcon(KviTextIcon* icon) void KviTextIcon::setId(int id) { m_iId=id; - m_szFilename=QString::null; + m_szFilename=TQString(); } -void KviTextIcon::setFilename(QString filename) +void KviTextIcon::setFilename(TQString filename) { m_iId=-1; m_szFilename=filename; } -QPixmap * KviTextIcon::pixmap() +TQPixmap * KviTextIcon::pixmap() { if(m_iId>=0) { @@ -73,9 +73,9 @@ QPixmap * KviTextIcon::pixmap() } KviTextIconManager::KviTextIconManager() -: QObject() +: TQObject() { - m_pTextIconDict = new KviPointerHashTable<QString,KviTextIcon>(47,false); + m_pTextIconDict = new KviPointerHashTable<TQString,KviTextIcon>(47,false); m_pTextIconDict->setAutoDelete(true); } @@ -89,15 +89,15 @@ void KviTextIconManager::clear() m_pTextIconDict->clear(); } -void KviTextIconManager::insert(const QString &name,int id) +void KviTextIconManager::insert(const TQString &name,int id) { - m_pTextIconDict->replace(name,new KviTextIcon(id)); + m_pTextIconDict->tqreplace(name,new KviTextIcon(id)); emit changed(); } -void KviTextIconManager::insert(const QString &name,KviTextIcon& icon) +void KviTextIconManager::insert(const TQString &name,KviTextIcon& icon) { - m_pTextIconDict->replace(name,new KviTextIcon(&icon)); + m_pTextIconDict->tqreplace(name,new KviTextIcon(&icon)); emit changed(); } @@ -129,8 +129,8 @@ void KviTextIconManager::checkDefaultAssociations() { for(int i=0;default_associations[i].name;i++) { - if(!m_pTextIconDict->find(default_associations[i].name)) - insert(QString::fromUtf8(default_associations[i].name),default_associations[i].iVal); + if(!m_pTextIconDict->tqfind(default_associations[i].name)) + insert(TQString::fromUtf8(default_associations[i].name),default_associations[i].iVal); } emit changed(); } @@ -151,20 +151,20 @@ void KviTextIconManager::load() if(upd == TEXTICONMANAGER_CURRENT_CONFIG_UPDATE)return; // do a merge of the texticons if we have a new config version - QString tmp; + TQString tmp; g_pApp->getGlobalKvircDirectory(tmp,KviApp::Config,KVI_CONFIGFILE_TEXTICONS); - if(QFile::exists(tmp))load(tmp,true); + if(TQFile::exists(tmp))load(tmp,true); } void KviTextIconManager::save() { - QString tmp; + TQString tmp; g_pApp->getLocalKvircDirectory(tmp,KviApp::Config,KVI_CONFIGFILE_TEXTICONS); save(tmp); } // returns the config update -int KviTextIconManager::load(const QString &filename,bool bMerge) +int KviTextIconManager::load(const TQString &filename,bool bMerge) { if(!bMerge)m_pTextIconDict->clear(); KviConfig cfg(filename,KviConfig::Read); @@ -172,27 +172,27 @@ int KviTextIconManager::load(const QString &filename,bool bMerge) cfg.setGroup("Manager"); int upd = cfg.readIntEntry("ConfigUpdate",0); - KviConfigGroup * dict = cfg.dict()->find("TextIcons"); + KviConfigGroup * dict = cfg.dict()->tqfind("TextIcons"); if(dict) { KviConfigGroupIterator it(*dict); - KviPointerList<QString> names; + KviPointerList<TQString> names; names.setAutoDelete(true); while(it.current()) { - names.append(new QString(it.currentKey())); + names.append(new TQString(it.currentKey())); ++it; } cfg.setGroup("TextIcons"); - for(QString * s = names.first();s;s = names.next()) + for(TQString * s = names.first();s;s = names.next()) { int id = cfg.readIntEntry(*s,-1); - QString szTmp; - QPixmap * pix=0; + TQString szTmp; + TQPixmap * pix=0; // debug("%s %s %i %i",__FILE__,__FUNCTION__,__LINE__,id); if(id!=-1) pix = g_pIconManager->getSmallIcon(id); @@ -209,16 +209,16 @@ int KviTextIconManager::load(const QString &filename,bool bMerge) { if(bMerge) { - if(!m_pTextIconDict->find(*s)) + if(!m_pTextIconDict->tqfind(*s)) if(id!=-1) - m_pTextIconDict->replace(*s,new KviTextIcon(id)); + m_pTextIconDict->tqreplace(*s,new KviTextIcon(id)); else - m_pTextIconDict->replace(*s,new KviTextIcon(szTmp)); + m_pTextIconDict->tqreplace(*s,new KviTextIcon(szTmp)); } else { if(id!=-1) - m_pTextIconDict->replace(*s,new KviTextIcon(id)); + m_pTextIconDict->tqreplace(*s,new KviTextIcon(id)); else - m_pTextIconDict->replace(*s,new KviTextIcon(szTmp)); + m_pTextIconDict->tqreplace(*s,new KviTextIcon(szTmp)); } } } @@ -230,7 +230,7 @@ int KviTextIconManager::load(const QString &filename,bool bMerge) return upd; } -void KviTextIconManager::save(const QString &filename) +void KviTextIconManager::save(const TQString &filename) { KviConfig cfg(filename,KviConfig::Write); @@ -240,7 +240,7 @@ void KviTextIconManager::save(const QString &filename) cfg.setGroup("TextIcons"); - KviPointerHashTableIterator<QString,KviTextIcon> it(*m_pTextIconDict); + KviPointerHashTableIterator<TQString,KviTextIcon> it(*m_pTextIconDict); while(KviTextIcon * i = it.current()) { if(i->id()!=-1) diff --git a/src/kvirc/kernel/kvi_texticonmanager.h b/src/kvirc/kernel/kvi_texticonmanager.h index 5f76697..8358014 100644 --- a/src/kvirc/kernel/kvi_texticonmanager.h +++ b/src/kvirc/kernel/kvi_texticonmanager.h @@ -27,7 +27,7 @@ #include "kvi_settings.h" -#include <qpixmap.h> +#include <tqpixmap.h> #include "kvi_pointerhashtable.h" @@ -35,46 +35,47 @@ class KVIRC_API KviTextIcon { protected: int m_iId; - QString m_szFilename; + TQString m_szFilename; public: KviTextIcon(int id) : m_iId(id) {}; - KviTextIcon(QString szFile) + KviTextIcon(TQString szFile) : m_iId(-1),m_szFilename(szFile) {}; KviTextIcon(KviTextIcon* icon); ~KviTextIcon(){}; public: int id(){ return m_iId; }; void setId(int id); - void setFilename(QString filename); - QString filename(){ return m_szFilename; }; - QPixmap * pixmap(); + void setFilename(TQString filename); + TQString filename(){ return m_szFilename; }; + TQPixmap * pixmap(); }; -class KVIRC_API KviTextIconManager : public QObject +class KVIRC_API KviTextIconManager : public TQObject { friend class KviTextIconWindow; friend class KviTextIconsOptionsWidget; Q_OBJECT + TQ_OBJECT public: KviTextIconManager(); ~KviTextIconManager(); private: - KviPointerHashTable<QString,KviTextIcon> * m_pTextIconDict; + KviPointerHashTable<TQString,KviTextIcon> * m_pTextIconDict; signals: void changed(); public: - KviPointerHashTable<QString,KviTextIcon> * textIconDict(){ return m_pTextIconDict; }; + KviPointerHashTable<TQString,KviTextIcon> * textIconDict(){ return m_pTextIconDict; }; void checkDefaultAssociations(); void clear(); - void insert(const QString &name,int id); - void insert(const QString &name,KviTextIcon& icon); - KviTextIcon * lookupTextIcon(const QString &name){ return m_pTextIconDict->find(name); }; + void insert(const TQString &name,int id); + void insert(const TQString &name,KviTextIcon& icon); + KviTextIcon * lookupTextIcon(const TQString &name){ return m_pTextIconDict->tqfind(name); }; void load(); void save(); protected: - void save(const QString &filename); - int load(const QString &filename,bool bMerge = false); + void save(const TQString &filename); + int load(const TQString &filename,bool bMerge = false); }; #ifndef _KVI_TEXTICONMANAGER_CPP_ diff --git a/src/kvirc/kernel/kvi_theme.cpp b/src/kvirc/kernel/kvi_theme.cpp index e9ac22e..4d1d06f 100644 --- a/src/kvirc/kernel/kvi_theme.cpp +++ b/src/kvirc/kernel/kvi_theme.cpp @@ -30,16 +30,16 @@ #include "kvi_miscutils.h" #include "kvi_sourcesdate.h" -#include <qimage.h> +#include <tqimage.h> #define KVI_THEME_SMALL_SCREENSHOT_NAME "screenshot_small.png" #define KVI_THEME_MEDIUM_SCREENSHOT_NAME "screenshot_medium.png" #define KVI_THEME_LARGE_SCREENSHOT_NAME "screenshot.png" #ifdef COMPILE_USE_QT4 - #define QIMAGE_SCALE_MIN Qt::KeepAspectRatio + #define TQIMAGE_SCALE_MIN TQt::KeepAspectRatio #else - #define QIMAGE_SCALE_MIN QImage::ScaleMin + #define TQIMAGE_SCALE_MIN TQ_ScaleMin #endif KviThemeInfo::KviThemeInfo() @@ -53,7 +53,7 @@ KviThemeInfo::~KviThemeInfo() -bool KviThemeInfo::load(const QString &szThemeFileName) +bool KviThemeInfo::load(const TQString &szThemeFileName) { if(!KviFileUtils::fileExists(szThemeFileName)) { @@ -65,15 +65,15 @@ bool KviThemeInfo::load(const QString &szThemeFileName) cfg.setGroup(KVI_THEMEINFO_CONFIG_GROUP); - m_szThemeEngineVersion = cfg.readQStringEntry("ThemeEngineVersion","1.0.0"); + m_szThemeEngineVersion = cfg.readTQStringEntry("ThemeEngineVersion","1.0.0"); if(KviMiscUtils::compareVersions(m_szThemeEngineVersion,KVI_CURRENT_THEME_ENGINE_VERSION) < 0) { - KviQString::sprintf(m_szLastError,__tr2qs("This KVIrc executable is too old for this theme (minimum theme engine version required is %Q while this theme engine has version %s)"),&m_szThemeEngineVersion,KVI_CURRENT_THEME_ENGINE_VERSION); + KviTQString::sprintf(m_szLastError,__tr2qs("This KVIrc executable is too old for this theme (minimum theme engine version required is %Q while this theme engine has version %s)"),&m_szThemeEngineVersion,KVI_CURRENT_THEME_ENGINE_VERSION); return false; // incompatible theme engine (will not work) } // mandatory fields - m_szName = cfg.readQStringEntry("Name",""); + m_szName = cfg.readTQStringEntry("Name",""); if(m_szName.isEmpty()) { @@ -82,25 +82,25 @@ bool KviThemeInfo::load(const QString &szThemeFileName) } // optional fields - m_szVersion = cfg.readQStringEntry("Version",""); + m_szVersion = cfg.readTQStringEntry("Version",""); if(m_szVersion.isEmpty()) m_szVersion = "?.?.?"; - m_szAuthor = cfg.readQStringEntry("Author",""); - QString szUnknown = __tr2qs("Unknown"); + m_szAuthor = cfg.readTQStringEntry("Author",""); + TQString szUnknown = __tr2qs("Unknown"); if(m_szAuthor.isEmpty()) m_szAuthor = szUnknown; - m_szDescription = cfg.readQStringEntry("Description",""); - m_szDate = cfg.readQStringEntry("Date",""); + m_szDescription = cfg.readTQStringEntry("Description",""); + m_szDate = cfg.readTQStringEntry("Date",""); if(m_szDate.isEmpty()) m_szDate = szUnknown; - m_szApplication = cfg.readQStringEntry("Application",""); + m_szApplication = cfg.readTQStringEntry("Application",""); if(m_szApplication.isEmpty()) m_szApplication = szUnknown; return true; } -bool KviThemeInfo::save(const QString &szThemeFileName) +bool KviThemeInfo::save(const TQString &szThemeFileName) { KviConfig inf(szThemeFileName,KviConfig::Write); @@ -119,9 +119,9 @@ bool KviThemeInfo::save(const QString &szThemeFileName) return true; } -bool KviThemeInfo::loadFromDirectory(const QString &szThemeDirectory,bool bIgnoreThemeData) +bool KviThemeInfo::loadFromDirectory(const TQString &szThemeDirectory,bool bIgnoreThemeData) { - QString szD = szThemeDirectory; + TQString szD = szThemeDirectory; szD.append(KVI_PATH_SEPARATOR_CHAR); szD.append(KVI_THEMEINFO_FILE_NAME); @@ -141,28 +141,28 @@ bool KviThemeInfo::loadFromDirectory(const QString &szThemeDirectory,bool bIgnor return KviFileUtils::fileExists(szD); } -QString KviThemeInfo::smallScreenshotPath() +TQString KviThemeInfo::smallScreenshotPath() { - QString ret; + TQString ret; if(!m_szAbsoluteDirectory.isEmpty()) { ret = m_szAbsoluteDirectory; - KviQString::ensureLastCharIs(ret,KVI_PATH_SEPARATOR_CHAR); + KviTQString::ensureLastCharIs(ret,KVI_PATH_SEPARATOR_CHAR); ret.append(KVI_THEME_SMALL_SCREENSHOT_NAME); } return ret; } -const QPixmap & KviThemeInfo::smallScreenshot() +const TQPixmap & KviThemeInfo::smallScreenshot() { if(!m_pixScreenshotSmall.isNull())return m_pixScreenshotSmall; if(!m_szAbsoluteDirectory.isEmpty()) { - QString szFileName = m_szAbsoluteDirectory; - KviQString::ensureLastCharIs(szFileName,KVI_PATH_SEPARATOR_CHAR); + TQString szFileName = m_szAbsoluteDirectory; + KviTQString::ensureLastCharIs(szFileName,KVI_PATH_SEPARATOR_CHAR); szFileName.append(KVI_THEME_SMALL_SCREENSHOT_NAME); - QPixmap pix(szFileName); + TQPixmap pix(szFileName); if(!pix.isNull()) { m_pixScreenshotSmall = pix; @@ -174,8 +174,8 @@ const QPixmap & KviThemeInfo::smallScreenshot() if(pix.width() > 300 || pix.height() > 225) { - QImage sbri = pix.convertToImage(); - pix.convertFromImage(sbri.smoothScale(300,225,QIMAGE_SCALE_MIN)); + TQImage sbri = pix.convertToImage(); + pix.convertFromImage(sbri.smoothScale(300,225,TQIMAGE_SCALE_MIN)); } pix.save(szFileName,"PNG"); @@ -187,16 +187,16 @@ const QPixmap & KviThemeInfo::smallScreenshot() return m_pixScreenshotSmall; } -const QPixmap & KviThemeInfo::mediumScreenshot() +const TQPixmap & KviThemeInfo::mediumScreenshot() { if(!m_pixScreenshotMedium.isNull())return m_pixScreenshotMedium; if(!m_szAbsoluteDirectory.isEmpty()) { - QString szFileName = m_szAbsoluteDirectory; - KviQString::ensureLastCharIs(szFileName,KVI_PATH_SEPARATOR_CHAR); + TQString szFileName = m_szAbsoluteDirectory; + KviTQString::ensureLastCharIs(szFileName,KVI_PATH_SEPARATOR_CHAR); szFileName.append(KVI_THEME_MEDIUM_SCREENSHOT_NAME); - QPixmap pix(szFileName); + TQPixmap pix(szFileName); if(!pix.isNull()) { m_pixScreenshotMedium = pix; @@ -208,8 +208,8 @@ const QPixmap & KviThemeInfo::mediumScreenshot() if(pix.width() > 600 || pix.height() > 450) { - QImage sbri = pix.convertToImage(); - pix.convertFromImage(sbri.smoothScale(600,450,QIMAGE_SCALE_MIN)); + TQImage sbri = pix.convertToImage(); + pix.convertFromImage(sbri.smoothScale(600,450,TQIMAGE_SCALE_MIN)); } pix.save(szFileName,"PNG"); @@ -221,16 +221,16 @@ const QPixmap & KviThemeInfo::mediumScreenshot() return m_pixScreenshotMedium; } -const QPixmap & KviThemeInfo::largeScreenshot() +const TQPixmap & KviThemeInfo::largeScreenshot() { if(!m_pixScreenshotLarge.isNull())return m_pixScreenshotLarge; if(!m_szAbsoluteDirectory.isEmpty()) { - QString szFileName = m_szAbsoluteDirectory; - KviQString::ensureLastCharIs(szFileName,KVI_PATH_SEPARATOR_CHAR); + TQString szFileName = m_szAbsoluteDirectory; + KviTQString::ensureLastCharIs(szFileName,KVI_PATH_SEPARATOR_CHAR); szFileName.append(KVI_THEME_LARGE_SCREENSHOT_NAME); - QPixmap pix(szFileName); + TQPixmap pix(szFileName); if(pix.isNull())return m_pixScreenshotLarge; m_pixScreenshotLarge = pix; } @@ -240,25 +240,25 @@ const QPixmap & KviThemeInfo::largeScreenshot() namespace KviTheme { - bool saveScreenshots(KviThemeInfo &options,const QString &szOriginalScreenshotPath) + bool saveScreenshots(KviThemeInfo &options,const TQString &szOriginalScreenshotPath) { - QImage pix(szOriginalScreenshotPath); + TQImage pix(szOriginalScreenshotPath); if(pix.isNull()) { options.setLastError(__tr2qs("Failed to load the specified screenshot image")); return false; } - QPixmap out; + TQPixmap out; - QString szScreenshotFileName = options.absoluteDirectory(); + TQString szScreenshotFileName = options.absoluteDirectory(); if(szScreenshotFileName.isEmpty()) { options.setLastError(__tr2qs("Invalid option")); return false; } - KviQString::ensureLastCharIs(szScreenshotFileName,KVI_PATH_SEPARATOR_CHAR); + KviTQString::ensureLastCharIs(szScreenshotFileName,KVI_PATH_SEPARATOR_CHAR); szScreenshotFileName.append(KVI_THEME_LARGE_SCREENSHOT_NAME); if(!pix.save(szScreenshotFileName,"PNG")) { @@ -267,12 +267,12 @@ namespace KviTheme } if(pix.width() > 600 || pix.height() > 450) - out.convertFromImage(pix.smoothScale(600,450,QIMAGE_SCALE_MIN)); + out.convertFromImage(pix.smoothScale(600,450,TQIMAGE_SCALE_MIN)); else out.convertFromImage(pix); szScreenshotFileName = options.absoluteDirectory(); - KviQString::ensureLastCharIs(szScreenshotFileName,KVI_PATH_SEPARATOR_CHAR); + KviTQString::ensureLastCharIs(szScreenshotFileName,KVI_PATH_SEPARATOR_CHAR); szScreenshotFileName.append(KVI_THEME_MEDIUM_SCREENSHOT_NAME); if(!out.save(szScreenshotFileName,"PNG")) { @@ -281,12 +281,12 @@ namespace KviTheme } if(pix.width() > 300 || pix.height() > 225) - out.convertFromImage(pix.smoothScale(300,225,QIMAGE_SCALE_MIN)); + out.convertFromImage(pix.smoothScale(300,225,TQIMAGE_SCALE_MIN)); else out.convertFromImage(pix); szScreenshotFileName = options.absoluteDirectory(); - KviQString::ensureLastCharIs(szScreenshotFileName,KVI_PATH_SEPARATOR_CHAR); + KviTQString::ensureLastCharIs(szScreenshotFileName,KVI_PATH_SEPARATOR_CHAR); szScreenshotFileName.append(KVI_THEME_SMALL_SCREENSHOT_NAME); if(!out.save(szScreenshotFileName,"PNG")) { diff --git a/src/kvirc/kernel/kvi_theme.h b/src/kvirc/kernel/kvi_theme.h index 2545e51..38c8bf2 100644 --- a/src/kvirc/kernel/kvi_theme.h +++ b/src/kvirc/kernel/kvi_theme.h @@ -31,7 +31,7 @@ #include "kvi_fileextensions.h" -#include <qpixmap.h> +#include <tqpixmap.h> #define KVI_THEMEINFO_FILE_NAME "themeinfo." KVI_FILEEXTENSION_CONFIG #define KVI_THEMEDATA_FILE_NAME "themedata." KVI_FILEEXTENSION_CONFIG @@ -60,83 +60,83 @@ public: KviThemeInfo(); ~KviThemeInfo(); protected: - QString m_szName; //< name of the theme - QString m_szVersion; //< version of the theme - QString m_szSubdirectory; //< subdirectory of $LOCALKVIRCDIR/themes where the theme is saved to (not always used) - QString m_szAbsoluteDirectory; //< absolute directory where the theme should be saved to (or is loaded from) - QString m_szAuthor; //< author of the theme - QString m_szDescription; //< description of the theme - QString m_szDate; //< theme creation date - QString m_szApplication; //< theme creation (KVIrc) version - QString m_szThemeEngineVersion; //< the theme engine version that saved this theme + TQString m_szName; //< name of the theme + TQString m_szVersion; //< version of the theme + TQString m_szSubdirectory; //< subdirectory of $LOCALKVIRCDIR/themes where the theme is saved to (not always used) + TQString m_szAbsoluteDirectory; //< absolute directory where the theme should be saved to (or is loaded from) + TQString m_szAuthor; //< author of the theme + TQString m_szDescription; //< description of the theme + TQString m_szDate; //< theme creation date + TQString m_szApplication; //< theme creation (KVIrc) version + TQString m_szThemeEngineVersion; //< the theme engine version that saved this theme - QString m_szLastError; //< reported when some function fails + TQString m_szLastError; //< reported when some function fails - QPixmap m_pixScreenshotLarge; //< the large screenshot pixmap - QPixmap m_pixScreenshotMedium; //< the medium screenshot pixmap - QPixmap m_pixScreenshotSmall; //< the small screenshot pixmap + TQPixmap m_pixScreenshotLarge; //< the large screenshot pixmap + TQPixmap m_pixScreenshotMedium; //< the medium screenshot pixmap + TQPixmap m_pixScreenshotSmall; //< the small screenshot pixmap public: /// /// load data from a specified theme config file /// - bool load(const QString &szThemeFileName); + bool load(const TQString &szThemeFileName); /// /// save the currently defined theme configuration in the specified file /// - bool save(const QString &szThemeFileName); + bool save(const TQString &szThemeFileName); - const QString & lastError(){ return m_szLastError; }; - void setLastError(const QString &szLastError){ m_szLastError = szLastError; }; - const QString & name(){ return m_szName; }; - void setName(const QString &szName){ m_szName = szName; }; - const QString & version(){ return m_szVersion; }; - void setVersion(const QString &szVersion){ m_szVersion = szVersion; }; - const QString & subdirectory(){ return m_szSubdirectory; }; - void setSubdirectory(const QString &szSubdirectory){ m_szSubdirectory = szSubdirectory; }; - const QString & absoluteDirectory(){ return m_szAbsoluteDirectory; }; - void setAbsoluteDirectory(const QString &szAbsoluteDirectory){ m_szAbsoluteDirectory = szAbsoluteDirectory; } - const QString & author(){ return m_szAuthor; }; - void setAuthor(const QString &szAuthor){ m_szAuthor = szAuthor; }; - const QString & description(){ return m_szDescription; }; - void setDescription(const QString &szDescription){ m_szDescription = szDescription; }; - const QString & date(){ return m_szDate; }; - void setDate(const QString &szDate){ m_szDate = szDate; }; - const QString & application(){ return m_szApplication; }; - void setApplication(const QString &szApplication){ m_szApplication = szApplication; }; - const QString & themeEngineVersion(){ return m_szThemeEngineVersion; }; - void setThemeEngineVersion(const QString &szThemeEngineVersion){ m_szThemeEngineVersion = szThemeEngineVersion; }; + const TQString & lastError(){ return m_szLastError; }; + void setLastError(const TQString &szLastError){ m_szLastError = szLastError; }; + const TQString & name(){ return m_szName; }; + void setName(const TQString &szName){ m_szName = szName; }; + const TQString & version(){ return m_szVersion; }; + void setVersion(const TQString &szVersion){ m_szVersion = szVersion; }; + const TQString & subdirectory(){ return m_szSubdirectory; }; + void setSubdirectory(const TQString &szSubdirectory){ m_szSubdirectory = szSubdirectory; }; + const TQString & absoluteDirectory(){ return m_szAbsoluteDirectory; }; + void setAbsoluteDirectory(const TQString &szAbsoluteDirectory){ m_szAbsoluteDirectory = szAbsoluteDirectory; } + const TQString & author(){ return m_szAuthor; }; + void setAuthor(const TQString &szAuthor){ m_szAuthor = szAuthor; }; + const TQString & description(){ return m_szDescription; }; + void setDescription(const TQString &szDescription){ m_szDescription = szDescription; }; + const TQString & date(){ return m_szDate; }; + void setDate(const TQString &szDate){ m_szDate = szDate; }; + const TQString & application(){ return m_szApplication; }; + void setApplication(const TQString &szApplication){ m_szApplication = szApplication; }; + const TQString & themeEngineVersion(){ return m_szThemeEngineVersion; }; + void setThemeEngineVersion(const TQString &szThemeEngineVersion){ m_szThemeEngineVersion = szThemeEngineVersion; }; /// /// Attempt to load a themeinfo.kvc file present in the specified directory. /// This function will fail if the directory contains a valid themeinfo.kvc /// file but no themedata.kvc file unless bIgnoreThemeData is set to true /// - bool loadFromDirectory(const QString &szThemeDirectory,bool bIgnoreThemeData = false); + bool loadFromDirectory(const TQString &szThemeDirectory,bool bIgnoreThemeData = false); /// /// Attempt to load the theme screenshot from THEMEDIR/screenshot_*.png /// This function will work only if the absoluteDirectory() of the theme /// has been set, otherwise the returned pixmap will be null. /// - const QPixmap & smallScreenshot(); + const TQPixmap & smallScreenshot(); /// /// Attempt to load the theme screenshot from THEMEDIR/screenshot_*.png /// This function will work only if the absoluteDirectory() of the theme /// has been set, otherwise the returned pixmap will be null. /// - const QPixmap & mediumScreenshot(); + const TQPixmap & mediumScreenshot(); /// /// Attempt to load the theme screenshot from THEMEDIR/screenshot_*.png /// This function will work only if the absoluteDirectory() of the theme /// has been set, otherwise the returned pixmap will be null. /// - const QPixmap & largeScreenshot(); + const TQPixmap & largeScreenshot(); /// /// Attempt to load the theme screenshot from THEMEDIR/screenshot_*.png /// This function will work only if the absoluteDirectory() of the theme /// has been set, otherwise the returned pixmap will be null. /// - QString smallScreenshotPath(); + TQString smallScreenshotPath(); }; namespace KviTheme @@ -148,7 +148,7 @@ namespace KviTheme /// On failure this function will also set buffer.lastError() to a meaningful value /// Note that for convenience this function is implemented in kvi_options.cpp /// - bool KVIRC_API load(const QString &szThemeDir,KviThemeInfo &buffer); + bool KVIRC_API load(const TQString &szThemeDir,KviThemeInfo &buffer); /// /// Save a theme given the specified options. /// Will return true on success and false on failure. @@ -164,7 +164,7 @@ namespace KviTheme /// Save the theme screenshots in the given EXISTING directory and given /// an existing screenshot on disk (usually in the tmp directory). /// - bool KVIRC_API saveScreenshots(KviThemeInfo &options,const QString &szOriginalScreenshotPath); + bool KVIRC_API saveScreenshots(KviThemeInfo &options,const TQString &szOriginalScreenshotPath); }; diff --git a/src/kvirc/kernel/kvi_userinput.cpp b/src/kvirc/kernel/kvi_userinput.cpp index 134d425..07849cf 100644 --- a/src/kvirc/kernel/kvi_userinput.cpp +++ b/src/kvirc/kernel/kvi_userinput.cpp @@ -37,24 +37,24 @@ namespace KviUserInput { - bool parse(QString &szData,KviWindow * pWindow,const QString &szContext,bool bUserFriendlyCommandline) + bool parse(TQString &szData,KviWindow * pWindow,const TQString &szContext,bool bUserFriendlyCommandline) { - const QChar * b = KviQString::nullTerminatedArray(szData); - const QChar * c = b; + const TQChar * b = KviTQString::nullTerminatedArray(szData); + const TQChar * c = b; if(!c)return true; // empty while(c->isSpace())c++; - if(!c->unicode())return true; // empty + if(!c->tqunicode())return true; // empty - if(c->unicode() == '\\') + if(c->tqunicode() == '\\') { c++; - if(c->unicode() != '/')c--; + if(c->tqunicode() != '/')c--; } else { - if(c->unicode() == '/') + if(c->tqunicode() == '/') { c++; - if(c->unicode() != '/') + if(c->tqunicode() != '/') { szData.remove(0,c-b); return parseCommand(szData,pWindow,szContext,bUserFriendlyCommandline); @@ -73,41 +73,41 @@ namespace KviUserInput return true; } - bool parseCommand(const QString &szData,KviWindow * pWindow,const QString &szContext,bool bUserFriendlyCommandline) + bool parseCommand(const TQString &szData,KviWindow * pWindow,const TQString &szContext,bool bUserFriendlyCommandline) { if(bUserFriendlyCommandline) { - static QString szUserFriendlyCommandlineContext(__tr2qs("commandline::userfriendly")); - QString szCmd=szData; + static TQString szUserFriendlyCommandlineContext(__tr2qs("commandline::userfriendly")); + TQString szCmd=szData; // escape any -$;\%( - szCmd.replace("\\","\\\\"); - szCmd.replace("\"","\\\""); - szCmd.replace("$","\\$"); - szCmd.replace("%","\\%"); - szCmd.replace("(","\\("); - szCmd.replace(";","\\;"); - szCmd.replace("-","\\-"); - szCmd.replace("+","\\+"); + szCmd.tqreplace("\\","\\\\"); + szCmd.tqreplace("\"","\\\""); + szCmd.tqreplace("$","\\$"); + szCmd.tqreplace("%","\\%"); + szCmd.tqreplace("(","\\("); + szCmd.tqreplace(";","\\;"); + szCmd.tqreplace("-","\\-"); + szCmd.tqreplace("+","\\+"); KviKvsScript kvs(szContext.isEmpty() ? szUserFriendlyCommandlineContext : szContext,szCmd); return (kvs.run(pWindow,0,0) != KviKvsScript::Error); } else { - static QString szCommandlineContext(__tr2qs("commandline::kvs")); + static TQString szCommandlineContext(__tr2qs("commandline::kvs")); KviKvsScript kvs(szContext.isEmpty() ? szCommandlineContext : szContext,szData); return (kvs.run(pWindow,0,0/*,KviKvsScript::AssumeLocals*/) != KviKvsScript::Error); } } - void parseNonCommand(QString &szData,KviWindow * pWindow) + void parseNonCommand(TQString &szData,KviWindow * pWindow) { - const QChar * aux = KviQString::nullTerminatedArray(szData); - const QChar * beg = aux; + const TQChar * aux = KviTQString::nullTerminatedArray(szData); + const TQChar * beg = aux; if(!beg)return; // empty - while(aux->unicode()) + while(aux->tqunicode()) { - while(aux->unicode() && (aux->unicode() != '\n'))aux++; - QString buf(beg,aux-beg); - if(aux->unicode() == '\n')aux++; + while(aux->tqunicode() && (aux->tqunicode() != '\n'))aux++; + TQString buf(beg,aux-beg); + if(aux->tqunicode() == '\n')aux++; beg = aux; if(buf.isEmpty())buf = " "; // avoid "No text to send" (d3vah) @@ -117,7 +117,7 @@ namespace KviUserInput case KVI_WINDOW_TYPE_CONSOLE: if(pWindow->connection()) { - KviQCString data = pWindow->connection()->encodeText(buf); + KviTQCString data = pWindow->connection()->encodeText(buf); if(((KviConsole *)pWindow)->connection()->sendData(data.data())) { pWindow->output(KVI_OUT_RAW,"[RAW]: %Q",&buf); @@ -127,7 +127,7 @@ namespace KviUserInput pWindow->output(KVI_OUT_PARSERERROR,__tr2qs("You are not connected to a server")); break; case KVI_WINDOW_TYPE_CHANNEL: - case KVI_WINDOW_TYPE_QUERY: + case KVI_WINDOW_TYPE_TQUERY: if(pWindow->connection()) { if(KVI_OPTION_BOOL(KviOption_boolExitAwayOnInput)) diff --git a/src/kvirc/kernel/kvi_userinput.h b/src/kvirc/kernel/kvi_userinput.h index 08dac61..91a947f 100644 --- a/src/kvirc/kernel/kvi_userinput.h +++ b/src/kvirc/kernel/kvi_userinput.h @@ -32,11 +32,11 @@ namespace KviUserInput { // WARNING: May destroy szData // returns false if szData is a command and it fails to run - KVIRC_API bool parse(QString &szData,KviWindow * pWindow,const QString &szContext = KviQString::empty,bool bUserFriendlyCommandline = false); + KVIRC_API bool parse(TQString &szData,KviWindow * pWindow,const TQString &szContext = KviTQString::empty,bool bUserFriendlyCommandline = false); - KVIRC_API bool parseCommand(const QString &szData,KviWindow * pWindow,const QString &szContext = KviQString::empty,bool bUserFriendlyCommandline = false); - //bool parseCommandWithSingleArgument(const QString &szData,KviWindow * pWindow,const QString &szContext = KviQString::empty); - KVIRC_API void parseNonCommand(QString &szData,KviWindow * pWindow); + KVIRC_API bool parseCommand(const TQString &szData,KviWindow * pWindow,const TQString &szContext = KviTQString::empty,bool bUserFriendlyCommandline = false); + //bool parseCommandWithSingleArgument(const TQString &szData,KviWindow * pWindow,const TQString &szContext = KviTQString::empty); + KVIRC_API void parseNonCommand(TQString &szData,KviWindow * pWindow); }; diff --git a/src/kvirc/kernel/moc_kvi_action.cpp b/src/kvirc/kernel/moc_kvi_action.cpp index 673a52d..4719f8d 100644 --- a/src/kvirc/kernel/moc_kvi_action.cpp +++ b/src/kvirc/kernel/moc_kvi_action.cpp @@ -2,21 +2,21 @@ ** KviAction meta object code from reading C++ file 'kvi_action.h' ** ** Created: Mon Feb 25 00:11:38 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_action.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviAction::className() const @@ -24,84 +24,84 @@ const char *KviAction::className() const return "KviAction"; } -QMetaObject *KviAction::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviAction( "KviAction", &KviAction::staticMetaObject ); +TQMetaObject *KviAction::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviAction( "KviAction", &KviAction::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviAction::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviAction::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviAction", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviAction", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviAction::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviAction::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviAction", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviAction", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviAction::staticMetaObject() +TQMetaObject* KviAction::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QObject::staticMetaObject(); - static const QUMethod slot_0 = {"widgetDestroyed", 0, 0 }; - static const QUMethod slot_1 = {"reloadImages", 0, 0 }; - static const QUMethod slot_2 = {"activeContextChanged", 0, 0 }; - static const QUMethod slot_3 = {"activeContextStateChanged", 0, 0 }; - static const QUMethod slot_4 = {"activeWindowChanged", 0, 0 }; - static const QUParameter param_slot_5[] = { - { "bSelectedNow", &static_QUType_bool, 0, QUParameter::In } + TQMetaObject* tqparentObject = TQObject::staticMetaObject(); + static const TQUMethod slot_0 = {"widgetDestroyed", 0, 0 }; + static const TQUMethod slot_1 = {"reloadImages", 0, 0 }; + static const TQUMethod slot_2 = {"activeContextChanged", 0, 0 }; + static const TQUMethod slot_3 = {"activeContextStateChanged", 0, 0 }; + static const TQUMethod slot_4 = {"activeWindowChanged", 0, 0 }; + static const TQUParameter param_slot_5[] = { + { "bSelectedNow", &static_TQUType_bool, 0, TQUParameter::In } }; - static const QUMethod slot_5 = {"activeWindowSelectionStateChanged", 1, param_slot_5 }; - static const QUMethod slot_6 = {"activate", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "widgetDestroyed()", &slot_0, QMetaData::Protected }, - { "reloadImages()", &slot_1, QMetaData::Protected }, - { "activeContextChanged()", &slot_2, QMetaData::Protected }, - { "activeContextStateChanged()", &slot_3, QMetaData::Protected }, - { "activeWindowChanged()", &slot_4, QMetaData::Protected }, - { "activeWindowSelectionStateChanged(bool)", &slot_5, QMetaData::Protected }, - { "activate()", &slot_6, QMetaData::Public } + static const TQUMethod slot_5 = {"activeWindowSelectionStateChanged", 1, param_slot_5 }; + static const TQUMethod slot_6 = {"activate", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "widgetDestroyed()", &slot_0, TQMetaData::Protected }, + { "reloadImages()", &slot_1, TQMetaData::Protected }, + { "activeContextChanged()", &slot_2, TQMetaData::Protected }, + { "activeContextStateChanged()", &slot_3, TQMetaData::Protected }, + { "activeWindowChanged()", &slot_4, TQMetaData::Protected }, + { "activeWindowSelectionStateChanged(bool)", &slot_5, TQMetaData::Protected }, + { "activate()", &slot_6, TQMetaData::Public } }; - static const QUMethod signal_0 = {"activated", 0, 0 }; - static const QMetaData signal_tbl[] = { - { "activated()", &signal_0, QMetaData::Public } + static const TQUMethod signal_0 = {"activated", 0, 0 }; + static const TQMetaData signal_tbl[] = { + { "activated()", &signal_0, TQMetaData::Public } }; - metaObj = QMetaObject::new_metaobject( - "KviAction", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviAction", tqparentObject, slot_tbl, 7, signal_tbl, 1, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviAction.setMetaObject( metaObj ); return metaObj; } -void* KviAction::qt_cast( const char* clname ) +void* KviAction::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviAction" ) ) return this; - return QObject::qt_cast( clname ); + return TQObject::tqqt_cast( clname ); } -// SIGNAL activated +// TQT_SIGNAL activated void KviAction::activated() { activate_signal( staticMetaObject()->signalOffset() + 0 ); } -bool KviAction::qt_invoke( int _id, QUObject* _o ) +bool KviAction::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: widgetDestroyed(); break; @@ -109,29 +109,29 @@ bool KviAction::qt_invoke( int _id, QUObject* _o ) case 2: activeContextChanged(); break; case 3: activeContextStateChanged(); break; case 4: activeWindowChanged(); break; - case 5: activeWindowSelectionStateChanged((bool)static_QUType_bool.get(_o+1)); break; + case 5: activeWindowSelectionStateChanged((bool)static_TQUType_bool.get(_o+1)); break; case 6: activate(); break; default: - return QObject::qt_invoke( _id, _o ); + return TQObject::qt_invoke( _id, _o ); } return TRUE; } -bool KviAction::qt_emit( int _id, QUObject* _o ) +bool KviAction::qt_emit( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->signalOffset() ) { case 0: activated(); break; default: - return QObject::qt_emit(_id,_o); + return TQObject::qt_emit(_id,_o); } return TRUE; } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviAction::qt_property( int id, int f, QVariant* v) +bool KviAction::qt_property( int id, int f, TQVariant* v) { - return QObject::qt_property( id, f, v); + return TQObject::qt_property( id, f, v); } -bool KviAction::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviAction::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/kernel/moc_kvi_actionmanager.cpp b/src/kvirc/kernel/moc_kvi_actionmanager.cpp index 9a8f581..575696f 100644 --- a/src/kvirc/kernel/moc_kvi_actionmanager.cpp +++ b/src/kvirc/kernel/moc_kvi_actionmanager.cpp @@ -2,21 +2,21 @@ ** KviActionManager meta object code from reading C++ file 'kvi_actionmanager.h' ** ** Created: Mon Feb 25 00:11:40 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_actionmanager.h" -#include <qmetaobject.h> -#include <qapplication.h> - -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <tqmetaobject.h> +#include <tqapplication.h> + +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviActionManager::className() const @@ -24,103 +24,103 @@ const char *KviActionManager::className() const return "KviActionManager"; } -QMetaObject *KviActionManager::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviActionManager( "KviActionManager", &KviActionManager::staticMetaObject ); +TQMetaObject *KviActionManager::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviActionManager( "KviActionManager", &KviActionManager::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviActionManager::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviActionManager::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviActionManager", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviActionManager", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviActionManager::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviActionManager::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviActionManager", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviActionManager", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviActionManager::staticMetaObject() +TQMetaObject* KviActionManager::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QObject::staticMetaObject(); - static const QUMethod slot_0 = {"actionDestroyed", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "actionDestroyed()", &slot_0, QMetaData::Protected } + TQMetaObject* tqparentObject = TQObject::staticMetaObject(); + static const TQUMethod slot_0 = {"actionDestroyed", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "actionDestroyed()", &slot_0, TQMetaData::Protected } }; - static const QUMethod signal_0 = {"beginCustomizeToolBars", 0, 0 }; - static const QUMethod signal_1 = {"endCustomizeToolBars", 0, 0 }; - static const QUMethod signal_2 = {"currentToolBarChanged", 0, 0 }; - static const QUMethod signal_3 = {"removeActionsHintRequest", 0, 0 }; - static const QMetaData signal_tbl[] = { - { "beginCustomizeToolBars()", &signal_0, QMetaData::Protected }, - { "endCustomizeToolBars()", &signal_1, QMetaData::Protected }, - { "currentToolBarChanged()", &signal_2, QMetaData::Protected }, - { "removeActionsHintRequest()", &signal_3, QMetaData::Protected } + static const TQUMethod signal_0 = {"beginCustomizeToolBars", 0, 0 }; + static const TQUMethod signal_1 = {"endCustomizeToolBars", 0, 0 }; + static const TQUMethod signal_2 = {"currentToolBarChanged", 0, 0 }; + static const TQUMethod signal_3 = {"removeActionsHintRequest", 0, 0 }; + static const TQMetaData signal_tbl[] = { + { "beginCustomizeToolBars()", &signal_0, TQMetaData::Protected }, + { "endCustomizeToolBars()", &signal_1, TQMetaData::Protected }, + { "currentToolBarChanged()", &signal_2, TQMetaData::Protected }, + { "removeActionsHintRequest()", &signal_3, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviActionManager", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviActionManager", tqparentObject, slot_tbl, 1, signal_tbl, 4, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviActionManager.setMetaObject( metaObj ); return metaObj; } -void* KviActionManager::qt_cast( const char* clname ) +void* KviActionManager::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviActionManager" ) ) return this; - return QObject::qt_cast( clname ); + return TQObject::tqqt_cast( clname ); } -// SIGNAL beginCustomizeToolBars +// TQT_SIGNAL beginCustomizeToolBars void KviActionManager::beginCustomizeToolBars() { activate_signal( staticMetaObject()->signalOffset() + 0 ); } -// SIGNAL endCustomizeToolBars +// TQT_SIGNAL endCustomizeToolBars void KviActionManager::endCustomizeToolBars() { activate_signal( staticMetaObject()->signalOffset() + 1 ); } -// SIGNAL currentToolBarChanged +// TQT_SIGNAL currentToolBarChanged void KviActionManager::currentToolBarChanged() { activate_signal( staticMetaObject()->signalOffset() + 2 ); } -// SIGNAL removeActionsHintRequest +// TQT_SIGNAL removeActionsHintRequest void KviActionManager::removeActionsHintRequest() { activate_signal( staticMetaObject()->signalOffset() + 3 ); } -bool KviActionManager::qt_invoke( int _id, QUObject* _o ) +bool KviActionManager::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: actionDestroyed(); break; default: - return QObject::qt_invoke( _id, _o ); + return TQObject::qt_invoke( _id, _o ); } return TRUE; } -bool KviActionManager::qt_emit( int _id, QUObject* _o ) +bool KviActionManager::qt_emit( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->signalOffset() ) { case 0: beginCustomizeToolBars(); break; @@ -128,16 +128,16 @@ bool KviActionManager::qt_emit( int _id, QUObject* _o ) case 2: currentToolBarChanged(); break; case 3: removeActionsHintRequest(); break; default: - return QObject::qt_emit(_id,_o); + return TQObject::qt_emit(_id,_o); } return TRUE; } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviActionManager::qt_property( int id, int f, QVariant* v) +bool KviActionManager::qt_property( int id, int f, TQVariant* v) { - return QObject::qt_property( id, f, v); + return TQObject::qt_property( id, f, v); } -bool KviActionManager::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviActionManager::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/kernel/moc_kvi_coreactions.cpp b/src/kvirc/kernel/moc_kvi_coreactions.cpp index 73f1428..2bacfad 100644 --- a/src/kvirc/kernel/moc_kvi_coreactions.cpp +++ b/src/kvirc/kernel/moc_kvi_coreactions.cpp @@ -2,21 +2,21 @@ ** KviConnectAction meta object code from reading C++ file 'kvi_coreactions.h' ** ** Created: Mon Feb 25 00:11:42 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_coreactions.h" -#include <qmetaobject.h> -#include <qapplication.h> - -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <tqmetaobject.h> +#include <tqapplication.h> + +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviConnectAction::className() const @@ -24,72 +24,72 @@ const char *KviConnectAction::className() const return "KviConnectAction"; } -QMetaObject *KviConnectAction::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviConnectAction( "KviConnectAction", &KviConnectAction::staticMetaObject ); +TQMetaObject *KviConnectAction::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviConnectAction( "KviConnectAction", &KviConnectAction::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviConnectAction::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviConnectAction::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviConnectAction", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviConnectAction", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviConnectAction::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviConnectAction::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviConnectAction", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviConnectAction", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviConnectAction::staticMetaObject() +TQMetaObject* KviConnectAction::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviAction::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviConnectAction", parentObject, + TQMetaObject* tqparentObject = KviAction::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviConnectAction", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviConnectAction.setMetaObject( metaObj ); return metaObj; } -void* KviConnectAction::qt_cast( const char* clname ) +void* KviConnectAction::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviConnectAction" ) ) return this; - return KviAction::qt_cast( clname ); + return KviAction::tqqt_cast( clname ); } -bool KviConnectAction::qt_invoke( int _id, QUObject* _o ) +bool KviConnectAction::qt_invoke( int _id, TQUObject* _o ) { return KviAction::qt_invoke(_id,_o); } -bool KviConnectAction::qt_emit( int _id, QUObject* _o ) +bool KviConnectAction::qt_emit( int _id, TQUObject* _o ) { return KviAction::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviConnectAction::qt_property( int id, int f, QVariant* v) +bool KviConnectAction::qt_property( int id, int f, TQVariant* v) { return KviAction::qt_property( id, f, v); } -bool KviConnectAction::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviConnectAction::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviSeparatorAction::className() const @@ -97,72 +97,72 @@ const char *KviSeparatorAction::className() const return "KviSeparatorAction"; } -QMetaObject *KviSeparatorAction::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviSeparatorAction( "KviSeparatorAction", &KviSeparatorAction::staticMetaObject ); +TQMetaObject *KviSeparatorAction::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviSeparatorAction( "KviSeparatorAction", &KviSeparatorAction::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviSeparatorAction::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviSeparatorAction::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviSeparatorAction", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviSeparatorAction", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviSeparatorAction::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviSeparatorAction::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviSeparatorAction", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviSeparatorAction", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviSeparatorAction::staticMetaObject() +TQMetaObject* KviSeparatorAction::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviAction::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviSeparatorAction", parentObject, + TQMetaObject* tqparentObject = KviAction::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviSeparatorAction", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviSeparatorAction.setMetaObject( metaObj ); return metaObj; } -void* KviSeparatorAction::qt_cast( const char* clname ) +void* KviSeparatorAction::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviSeparatorAction" ) ) return this; - return KviAction::qt_cast( clname ); + return KviAction::tqqt_cast( clname ); } -bool KviSeparatorAction::qt_invoke( int _id, QUObject* _o ) +bool KviSeparatorAction::qt_invoke( int _id, TQUObject* _o ) { return KviAction::qt_invoke(_id,_o); } -bool KviSeparatorAction::qt_emit( int _id, QUObject* _o ) +bool KviSeparatorAction::qt_emit( int _id, TQUObject* _o ) { return KviAction::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviSeparatorAction::qt_property( int id, int f, QVariant* v) +bool KviSeparatorAction::qt_property( int id, int f, TQVariant* v) { return KviAction::qt_property( id, f, v); } -bool KviSeparatorAction::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviSeparatorAction::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviSubmenuAction::className() const @@ -170,87 +170,87 @@ const char *KviSubmenuAction::className() const return "KviSubmenuAction"; } -QMetaObject *KviSubmenuAction::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviSubmenuAction( "KviSubmenuAction", &KviSubmenuAction::staticMetaObject ); +TQMetaObject *KviSubmenuAction::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviSubmenuAction( "KviSubmenuAction", &KviSubmenuAction::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviSubmenuAction::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviSubmenuAction::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviSubmenuAction", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviSubmenuAction", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviSubmenuAction::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviSubmenuAction::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviSubmenuAction", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviSubmenuAction", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviSubmenuAction::staticMetaObject() +TQMetaObject* KviSubmenuAction::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviKvsAction::staticMetaObject(); - static const QUMethod slot_0 = {"popupAboutToShow", 0, 0 }; - static const QUParameter param_slot_1[] = { - { "id", &static_QUType_int, 0, QUParameter::In } + TQMetaObject* tqparentObject = KviKvsAction::staticMetaObject(); + static const TQUMethod slot_0 = {"popupAboutToShow", 0, 0 }; + static const TQUParameter param_slot_1[] = { + { "id", &static_TQUType_int, 0, TQUParameter::In } }; - static const QUMethod slot_1 = {"popupActivated", 1, param_slot_1 }; - static const QMetaData slot_tbl[] = { - { "popupAboutToShow()", &slot_0, QMetaData::Protected }, - { "popupActivated(int)", &slot_1, QMetaData::Protected } + static const TQUMethod slot_1 = {"popupActivated", 1, param_slot_1 }; + static const TQMetaData slot_tbl[] = { + { "popupAboutToShow()", &slot_0, TQMetaData::Protected }, + { "popupActivated(int)", &slot_1, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviSubmenuAction", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviSubmenuAction", tqparentObject, slot_tbl, 2, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviSubmenuAction.setMetaObject( metaObj ); return metaObj; } -void* KviSubmenuAction::qt_cast( const char* clname ) +void* KviSubmenuAction::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviSubmenuAction" ) ) return this; - return KviKvsAction::qt_cast( clname ); + return KviKvsAction::tqqt_cast( clname ); } -bool KviSubmenuAction::qt_invoke( int _id, QUObject* _o ) +bool KviSubmenuAction::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: popupAboutToShow(); break; - case 1: popupActivated((int)static_QUType_int.get(_o+1)); break; + case 1: popupActivated((int)static_TQUType_int.get(_o+1)); break; default: return KviKvsAction::qt_invoke( _id, _o ); } return TRUE; } -bool KviSubmenuAction::qt_emit( int _id, QUObject* _o ) +bool KviSubmenuAction::qt_emit( int _id, TQUObject* _o ) { return KviKvsAction::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviSubmenuAction::qt_property( int id, int f, QVariant* v) +bool KviSubmenuAction::qt_property( int id, int f, TQVariant* v) { return KviKvsAction::qt_property( id, f, v); } -bool KviSubmenuAction::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviSubmenuAction::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviJoinChannelAction::className() const @@ -258,87 +258,87 @@ const char *KviJoinChannelAction::className() const return "KviJoinChannelAction"; } -QMetaObject *KviJoinChannelAction::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviJoinChannelAction( "KviJoinChannelAction", &KviJoinChannelAction::staticMetaObject ); +TQMetaObject *KviJoinChannelAction::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviJoinChannelAction( "KviJoinChannelAction", &KviJoinChannelAction::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviJoinChannelAction::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviJoinChannelAction::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviJoinChannelAction", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviJoinChannelAction", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviJoinChannelAction::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviJoinChannelAction::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviJoinChannelAction", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviJoinChannelAction", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviJoinChannelAction::staticMetaObject() +TQMetaObject* KviJoinChannelAction::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviSubmenuAction::staticMetaObject(); - static const QUMethod slot_0 = {"popupAboutToShow", 0, 0 }; - static const QUParameter param_slot_1[] = { - { 0, &static_QUType_int, 0, QUParameter::In } + TQMetaObject* tqparentObject = KviSubmenuAction::staticMetaObject(); + static const TQUMethod slot_0 = {"popupAboutToShow", 0, 0 }; + static const TQUParameter param_slot_1[] = { + { 0, &static_TQUType_int, 0, TQUParameter::In } }; - static const QUMethod slot_1 = {"popupActivated", 1, param_slot_1 }; - static const QMetaData slot_tbl[] = { - { "popupAboutToShow()", &slot_0, QMetaData::Protected }, - { "popupActivated(int)", &slot_1, QMetaData::Protected } + static const TQUMethod slot_1 = {"popupActivated", 1, param_slot_1 }; + static const TQMetaData slot_tbl[] = { + { "popupAboutToShow()", &slot_0, TQMetaData::Protected }, + { "popupActivated(int)", &slot_1, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviJoinChannelAction", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviJoinChannelAction", tqparentObject, slot_tbl, 2, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviJoinChannelAction.setMetaObject( metaObj ); return metaObj; } -void* KviJoinChannelAction::qt_cast( const char* clname ) +void* KviJoinChannelAction::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviJoinChannelAction" ) ) return this; - return KviSubmenuAction::qt_cast( clname ); + return KviSubmenuAction::tqqt_cast( clname ); } -bool KviJoinChannelAction::qt_invoke( int _id, QUObject* _o ) +bool KviJoinChannelAction::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: popupAboutToShow(); break; - case 1: popupActivated((int)static_QUType_int.get(_o+1)); break; + case 1: popupActivated((int)static_TQUType_int.get(_o+1)); break; default: return KviSubmenuAction::qt_invoke( _id, _o ); } return TRUE; } -bool KviJoinChannelAction::qt_emit( int _id, QUObject* _o ) +bool KviJoinChannelAction::qt_emit( int _id, TQUObject* _o ) { return KviSubmenuAction::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviJoinChannelAction::qt_property( int id, int f, QVariant* v) +bool KviJoinChannelAction::qt_property( int id, int f, TQVariant* v) { return KviSubmenuAction::qt_property( id, f, v); } -bool KviJoinChannelAction::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviJoinChannelAction::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviChangeNickAction::className() const @@ -346,87 +346,87 @@ const char *KviChangeNickAction::className() const return "KviChangeNickAction"; } -QMetaObject *KviChangeNickAction::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviChangeNickAction( "KviChangeNickAction", &KviChangeNickAction::staticMetaObject ); +TQMetaObject *KviChangeNickAction::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviChangeNickAction( "KviChangeNickAction", &KviChangeNickAction::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviChangeNickAction::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviChangeNickAction::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviChangeNickAction", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviChangeNickAction", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviChangeNickAction::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviChangeNickAction::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviChangeNickAction", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviChangeNickAction", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviChangeNickAction::staticMetaObject() +TQMetaObject* KviChangeNickAction::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviSubmenuAction::staticMetaObject(); - static const QUMethod slot_0 = {"popupAboutToShow", 0, 0 }; - static const QUParameter param_slot_1[] = { - { 0, &static_QUType_int, 0, QUParameter::In } + TQMetaObject* tqparentObject = KviSubmenuAction::staticMetaObject(); + static const TQUMethod slot_0 = {"popupAboutToShow", 0, 0 }; + static const TQUParameter param_slot_1[] = { + { 0, &static_TQUType_int, 0, TQUParameter::In } }; - static const QUMethod slot_1 = {"popupActivated", 1, param_slot_1 }; - static const QMetaData slot_tbl[] = { - { "popupAboutToShow()", &slot_0, QMetaData::Protected }, - { "popupActivated(int)", &slot_1, QMetaData::Protected } + static const TQUMethod slot_1 = {"popupActivated", 1, param_slot_1 }; + static const TQMetaData slot_tbl[] = { + { "popupAboutToShow()", &slot_0, TQMetaData::Protected }, + { "popupActivated(int)", &slot_1, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviChangeNickAction", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviChangeNickAction", tqparentObject, slot_tbl, 2, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviChangeNickAction.setMetaObject( metaObj ); return metaObj; } -void* KviChangeNickAction::qt_cast( const char* clname ) +void* KviChangeNickAction::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviChangeNickAction" ) ) return this; - return KviSubmenuAction::qt_cast( clname ); + return KviSubmenuAction::tqqt_cast( clname ); } -bool KviChangeNickAction::qt_invoke( int _id, QUObject* _o ) +bool KviChangeNickAction::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: popupAboutToShow(); break; - case 1: popupActivated((int)static_QUType_int.get(_o+1)); break; + case 1: popupActivated((int)static_TQUType_int.get(_o+1)); break; default: return KviSubmenuAction::qt_invoke( _id, _o ); } return TRUE; } -bool KviChangeNickAction::qt_emit( int _id, QUObject* _o ) +bool KviChangeNickAction::qt_emit( int _id, TQUObject* _o ) { return KviSubmenuAction::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviChangeNickAction::qt_property( int id, int f, QVariant* v) +bool KviChangeNickAction::qt_property( int id, int f, TQVariant* v) { return KviSubmenuAction::qt_property( id, f, v); } -bool KviChangeNickAction::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviChangeNickAction::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviConnectToServerAction::className() const @@ -434,87 +434,87 @@ const char *KviConnectToServerAction::className() const return "KviConnectToServerAction"; } -QMetaObject *KviConnectToServerAction::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviConnectToServerAction( "KviConnectToServerAction", &KviConnectToServerAction::staticMetaObject ); +TQMetaObject *KviConnectToServerAction::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviConnectToServerAction( "KviConnectToServerAction", &KviConnectToServerAction::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviConnectToServerAction::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviConnectToServerAction::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviConnectToServerAction", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviConnectToServerAction", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviConnectToServerAction::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviConnectToServerAction::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviConnectToServerAction", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviConnectToServerAction", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviConnectToServerAction::staticMetaObject() +TQMetaObject* KviConnectToServerAction::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviSubmenuAction::staticMetaObject(); - static const QUMethod slot_0 = {"popupAboutToShow", 0, 0 }; - static const QUParameter param_slot_1[] = { - { 0, &static_QUType_int, 0, QUParameter::In } + TQMetaObject* tqparentObject = KviSubmenuAction::staticMetaObject(); + static const TQUMethod slot_0 = {"popupAboutToShow", 0, 0 }; + static const TQUParameter param_slot_1[] = { + { 0, &static_TQUType_int, 0, TQUParameter::In } }; - static const QUMethod slot_1 = {"popupActivated", 1, param_slot_1 }; - static const QMetaData slot_tbl[] = { - { "popupAboutToShow()", &slot_0, QMetaData::Protected }, - { "popupActivated(int)", &slot_1, QMetaData::Protected } + static const TQUMethod slot_1 = {"popupActivated", 1, param_slot_1 }; + static const TQMetaData slot_tbl[] = { + { "popupAboutToShow()", &slot_0, TQMetaData::Protected }, + { "popupActivated(int)", &slot_1, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviConnectToServerAction", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviConnectToServerAction", tqparentObject, slot_tbl, 2, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviConnectToServerAction.setMetaObject( metaObj ); return metaObj; } -void* KviConnectToServerAction::qt_cast( const char* clname ) +void* KviConnectToServerAction::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviConnectToServerAction" ) ) return this; - return KviSubmenuAction::qt_cast( clname ); + return KviSubmenuAction::tqqt_cast( clname ); } -bool KviConnectToServerAction::qt_invoke( int _id, QUObject* _o ) +bool KviConnectToServerAction::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: popupAboutToShow(); break; - case 1: popupActivated((int)static_QUType_int.get(_o+1)); break; + case 1: popupActivated((int)static_TQUType_int.get(_o+1)); break; default: return KviSubmenuAction::qt_invoke( _id, _o ); } return TRUE; } -bool KviConnectToServerAction::qt_emit( int _id, QUObject* _o ) +bool KviConnectToServerAction::qt_emit( int _id, TQUObject* _o ) { return KviSubmenuAction::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviConnectToServerAction::qt_property( int id, int f, QVariant* v) +bool KviConnectToServerAction::qt_property( int id, int f, TQVariant* v) { return KviSubmenuAction::qt_property( id, f, v); } -bool KviConnectToServerAction::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviConnectToServerAction::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviChangeUserModeAction::className() const @@ -522,87 +522,87 @@ const char *KviChangeUserModeAction::className() const return "KviChangeUserModeAction"; } -QMetaObject *KviChangeUserModeAction::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviChangeUserModeAction( "KviChangeUserModeAction", &KviChangeUserModeAction::staticMetaObject ); +TQMetaObject *KviChangeUserModeAction::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviChangeUserModeAction( "KviChangeUserModeAction", &KviChangeUserModeAction::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviChangeUserModeAction::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviChangeUserModeAction::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviChangeUserModeAction", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviChangeUserModeAction", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviChangeUserModeAction::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviChangeUserModeAction::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviChangeUserModeAction", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviChangeUserModeAction", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviChangeUserModeAction::staticMetaObject() +TQMetaObject* KviChangeUserModeAction::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviSubmenuAction::staticMetaObject(); - static const QUMethod slot_0 = {"popupAboutToShow", 0, 0 }; - static const QUParameter param_slot_1[] = { - { 0, &static_QUType_int, 0, QUParameter::In } + TQMetaObject* tqparentObject = KviSubmenuAction::staticMetaObject(); + static const TQUMethod slot_0 = {"popupAboutToShow", 0, 0 }; + static const TQUParameter param_slot_1[] = { + { 0, &static_TQUType_int, 0, TQUParameter::In } }; - static const QUMethod slot_1 = {"popupActivated", 1, param_slot_1 }; - static const QMetaData slot_tbl[] = { - { "popupAboutToShow()", &slot_0, QMetaData::Protected }, - { "popupActivated(int)", &slot_1, QMetaData::Protected } + static const TQUMethod slot_1 = {"popupActivated", 1, param_slot_1 }; + static const TQMetaData slot_tbl[] = { + { "popupAboutToShow()", &slot_0, TQMetaData::Protected }, + { "popupActivated(int)", &slot_1, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviChangeUserModeAction", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviChangeUserModeAction", tqparentObject, slot_tbl, 2, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviChangeUserModeAction.setMetaObject( metaObj ); return metaObj; } -void* KviChangeUserModeAction::qt_cast( const char* clname ) +void* KviChangeUserModeAction::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviChangeUserModeAction" ) ) return this; - return KviSubmenuAction::qt_cast( clname ); + return KviSubmenuAction::tqqt_cast( clname ); } -bool KviChangeUserModeAction::qt_invoke( int _id, QUObject* _o ) +bool KviChangeUserModeAction::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: popupAboutToShow(); break; - case 1: popupActivated((int)static_QUType_int.get(_o+1)); break; + case 1: popupActivated((int)static_TQUType_int.get(_o+1)); break; default: return KviSubmenuAction::qt_invoke( _id, _o ); } return TRUE; } -bool KviChangeUserModeAction::qt_emit( int _id, QUObject* _o ) +bool KviChangeUserModeAction::qt_emit( int _id, TQUObject* _o ) { return KviSubmenuAction::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviChangeUserModeAction::qt_property( int id, int f, QVariant* v) +bool KviChangeUserModeAction::qt_property( int id, int f, TQVariant* v) { return KviSubmenuAction::qt_property( id, f, v); } -bool KviChangeUserModeAction::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviChangeUserModeAction::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviIrcToolsAction::className() const @@ -610,87 +610,87 @@ const char *KviIrcToolsAction::className() const return "KviIrcToolsAction"; } -QMetaObject *KviIrcToolsAction::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviIrcToolsAction( "KviIrcToolsAction", &KviIrcToolsAction::staticMetaObject ); +TQMetaObject *KviIrcToolsAction::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviIrcToolsAction( "KviIrcToolsAction", &KviIrcToolsAction::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviIrcToolsAction::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviIrcToolsAction::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviIrcToolsAction", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviIrcToolsAction", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviIrcToolsAction::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviIrcToolsAction::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviIrcToolsAction", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviIrcToolsAction", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviIrcToolsAction::staticMetaObject() +TQMetaObject* KviIrcToolsAction::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviSubmenuAction::staticMetaObject(); - static const QUMethod slot_0 = {"popupAboutToShow", 0, 0 }; - static const QUParameter param_slot_1[] = { - { 0, &static_QUType_int, 0, QUParameter::In } + TQMetaObject* tqparentObject = KviSubmenuAction::staticMetaObject(); + static const TQUMethod slot_0 = {"popupAboutToShow", 0, 0 }; + static const TQUParameter param_slot_1[] = { + { 0, &static_TQUType_int, 0, TQUParameter::In } }; - static const QUMethod slot_1 = {"popupActivated", 1, param_slot_1 }; - static const QMetaData slot_tbl[] = { - { "popupAboutToShow()", &slot_0, QMetaData::Protected }, - { "popupActivated(int)", &slot_1, QMetaData::Protected } + static const TQUMethod slot_1 = {"popupActivated", 1, param_slot_1 }; + static const TQMetaData slot_tbl[] = { + { "popupAboutToShow()", &slot_0, TQMetaData::Protected }, + { "popupActivated(int)", &slot_1, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviIrcToolsAction", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviIrcToolsAction", tqparentObject, slot_tbl, 2, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviIrcToolsAction.setMetaObject( metaObj ); return metaObj; } -void* KviIrcToolsAction::qt_cast( const char* clname ) +void* KviIrcToolsAction::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviIrcToolsAction" ) ) return this; - return KviSubmenuAction::qt_cast( clname ); + return KviSubmenuAction::tqqt_cast( clname ); } -bool KviIrcToolsAction::qt_invoke( int _id, QUObject* _o ) +bool KviIrcToolsAction::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: popupAboutToShow(); break; - case 1: popupActivated((int)static_QUType_int.get(_o+1)); break; + case 1: popupActivated((int)static_TQUType_int.get(_o+1)); break; default: return KviSubmenuAction::qt_invoke( _id, _o ); } return TRUE; } -bool KviIrcToolsAction::qt_emit( int _id, QUObject* _o ) +bool KviIrcToolsAction::qt_emit( int _id, TQUObject* _o ) { return KviSubmenuAction::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviIrcToolsAction::qt_property( int id, int f, QVariant* v) +bool KviIrcToolsAction::qt_property( int id, int f, TQVariant* v) { return KviSubmenuAction::qt_property( id, f, v); } -bool KviIrcToolsAction::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviIrcToolsAction::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviIrcOperationsAction::className() const @@ -698,87 +698,87 @@ const char *KviIrcOperationsAction::className() const return "KviIrcOperationsAction"; } -QMetaObject *KviIrcOperationsAction::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviIrcOperationsAction( "KviIrcOperationsAction", &KviIrcOperationsAction::staticMetaObject ); +TQMetaObject *KviIrcOperationsAction::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviIrcOperationsAction( "KviIrcOperationsAction", &KviIrcOperationsAction::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviIrcOperationsAction::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviIrcOperationsAction::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviIrcOperationsAction", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviIrcOperationsAction", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviIrcOperationsAction::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviIrcOperationsAction::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviIrcOperationsAction", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviIrcOperationsAction", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviIrcOperationsAction::staticMetaObject() +TQMetaObject* KviIrcOperationsAction::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviSubmenuAction::staticMetaObject(); - static const QUMethod slot_0 = {"popupAboutToShow", 0, 0 }; - static const QUParameter param_slot_1[] = { - { 0, &static_QUType_int, 0, QUParameter::In } + TQMetaObject* tqparentObject = KviSubmenuAction::staticMetaObject(); + static const TQUMethod slot_0 = {"popupAboutToShow", 0, 0 }; + static const TQUParameter param_slot_1[] = { + { 0, &static_TQUType_int, 0, TQUParameter::In } }; - static const QUMethod slot_1 = {"popupActivated", 1, param_slot_1 }; - static const QMetaData slot_tbl[] = { - { "popupAboutToShow()", &slot_0, QMetaData::Protected }, - { "popupActivated(int)", &slot_1, QMetaData::Protected } + static const TQUMethod slot_1 = {"popupActivated", 1, param_slot_1 }; + static const TQMetaData slot_tbl[] = { + { "popupAboutToShow()", &slot_0, TQMetaData::Protected }, + { "popupActivated(int)", &slot_1, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviIrcOperationsAction", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviIrcOperationsAction", tqparentObject, slot_tbl, 2, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviIrcOperationsAction.setMetaObject( metaObj ); return metaObj; } -void* KviIrcOperationsAction::qt_cast( const char* clname ) +void* KviIrcOperationsAction::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviIrcOperationsAction" ) ) return this; - return KviSubmenuAction::qt_cast( clname ); + return KviSubmenuAction::tqqt_cast( clname ); } -bool KviIrcOperationsAction::qt_invoke( int _id, QUObject* _o ) +bool KviIrcOperationsAction::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: popupAboutToShow(); break; - case 1: popupActivated((int)static_QUType_int.get(_o+1)); break; + case 1: popupActivated((int)static_TQUType_int.get(_o+1)); break; default: return KviSubmenuAction::qt_invoke( _id, _o ); } return TRUE; } -bool KviIrcOperationsAction::qt_emit( int _id, QUObject* _o ) +bool KviIrcOperationsAction::qt_emit( int _id, TQUObject* _o ) { return KviSubmenuAction::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviIrcOperationsAction::qt_property( int id, int f, QVariant* v) +bool KviIrcOperationsAction::qt_property( int id, int f, TQVariant* v) { return KviSubmenuAction::qt_property( id, f, v); } -bool KviIrcOperationsAction::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviIrcOperationsAction::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviIrcContextDisplayAction::className() const @@ -786,72 +786,72 @@ const char *KviIrcContextDisplayAction::className() const return "KviIrcContextDisplayAction"; } -QMetaObject *KviIrcContextDisplayAction::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviIrcContextDisplayAction( "KviIrcContextDisplayAction", &KviIrcContextDisplayAction::staticMetaObject ); +TQMetaObject *KviIrcContextDisplayAction::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviIrcContextDisplayAction( "KviIrcContextDisplayAction", &KviIrcContextDisplayAction::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviIrcContextDisplayAction::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviIrcContextDisplayAction::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviIrcContextDisplayAction", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviIrcContextDisplayAction", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviIrcContextDisplayAction::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviIrcContextDisplayAction::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviIrcContextDisplayAction", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviIrcContextDisplayAction", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviIrcContextDisplayAction::staticMetaObject() +TQMetaObject* KviIrcContextDisplayAction::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviAction::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviIrcContextDisplayAction", parentObject, + TQMetaObject* tqparentObject = KviAction::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviIrcContextDisplayAction", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviIrcContextDisplayAction.setMetaObject( metaObj ); return metaObj; } -void* KviIrcContextDisplayAction::qt_cast( const char* clname ) +void* KviIrcContextDisplayAction::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviIrcContextDisplayAction" ) ) return this; - return KviAction::qt_cast( clname ); + return KviAction::tqqt_cast( clname ); } -bool KviIrcContextDisplayAction::qt_invoke( int _id, QUObject* _o ) +bool KviIrcContextDisplayAction::qt_invoke( int _id, TQUObject* _o ) { return KviAction::qt_invoke(_id,_o); } -bool KviIrcContextDisplayAction::qt_emit( int _id, QUObject* _o ) +bool KviIrcContextDisplayAction::qt_emit( int _id, TQUObject* _o ) { return KviAction::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviIrcContextDisplayAction::qt_property( int id, int f, QVariant* v) +bool KviIrcContextDisplayAction::qt_property( int id, int f, TQVariant* v) { return KviAction::qt_property( id, f, v); } -bool KviIrcContextDisplayAction::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviIrcContextDisplayAction::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviGoAwayAction::className() const @@ -859,69 +859,69 @@ const char *KviGoAwayAction::className() const return "KviGoAwayAction"; } -QMetaObject *KviGoAwayAction::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviGoAwayAction( "KviGoAwayAction", &KviGoAwayAction::staticMetaObject ); +TQMetaObject *KviGoAwayAction::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviGoAwayAction( "KviGoAwayAction", &KviGoAwayAction::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviGoAwayAction::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviGoAwayAction::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviGoAwayAction", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviGoAwayAction", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviGoAwayAction::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviGoAwayAction::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviGoAwayAction", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviGoAwayAction", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviGoAwayAction::staticMetaObject() +TQMetaObject* KviGoAwayAction::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviKvsAction::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviGoAwayAction", parentObject, + TQMetaObject* tqparentObject = KviKvsAction::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviGoAwayAction", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviGoAwayAction.setMetaObject( metaObj ); return metaObj; } -void* KviGoAwayAction::qt_cast( const char* clname ) +void* KviGoAwayAction::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviGoAwayAction" ) ) return this; - return KviKvsAction::qt_cast( clname ); + return KviKvsAction::tqqt_cast( clname ); } -bool KviGoAwayAction::qt_invoke( int _id, QUObject* _o ) +bool KviGoAwayAction::qt_invoke( int _id, TQUObject* _o ) { return KviKvsAction::qt_invoke(_id,_o); } -bool KviGoAwayAction::qt_emit( int _id, QUObject* _o ) +bool KviGoAwayAction::qt_emit( int _id, TQUObject* _o ) { return KviKvsAction::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviGoAwayAction::qt_property( int id, int f, QVariant* v) +bool KviGoAwayAction::qt_property( int id, int f, TQVariant* v) { return KviKvsAction::qt_property( id, f, v); } -bool KviGoAwayAction::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviGoAwayAction::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/kernel/moc_kvi_filetransfer.cpp b/src/kvirc/kernel/moc_kvi_filetransfer.cpp index b395379..346beea 100644 --- a/src/kvirc/kernel/moc_kvi_filetransfer.cpp +++ b/src/kvirc/kernel/moc_kvi_filetransfer.cpp @@ -2,21 +2,21 @@ ** KviFileTransferManager meta object code from reading C++ file 'kvi_filetransfer.h' ** ** Created: Mon Feb 25 00:11:45 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_filetransfer.h" -#include <qmetaobject.h> -#include <qapplication.h> - -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <tqmetaobject.h> +#include <tqapplication.h> + +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviFileTransferManager::className() const @@ -24,119 +24,119 @@ const char *KviFileTransferManager::className() const return "KviFileTransferManager"; } -QMetaObject *KviFileTransferManager::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviFileTransferManager( "KviFileTransferManager", &KviFileTransferManager::staticMetaObject ); +TQMetaObject *KviFileTransferManager::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviFileTransferManager( "KviFileTransferManager", &KviFileTransferManager::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviFileTransferManager::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviFileTransferManager::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviFileTransferManager", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviFileTransferManager", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviFileTransferManager::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviFileTransferManager::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviFileTransferManager", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviFileTransferManager", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviFileTransferManager::staticMetaObject() +TQMetaObject* KviFileTransferManager::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QObject::staticMetaObject(); - static const QUParameter param_signal_0[] = { - { "t", &static_QUType_ptr, "KviFileTransfer", QUParameter::In } + TQMetaObject* tqparentObject = TQObject::staticMetaObject(); + static const TQUParameter param_signal_0[] = { + { "t", &static_TQUType_ptr, "KviFileTransfer", TQUParameter::In } }; - static const QUMethod signal_0 = {"transferRegistered", 1, param_signal_0 }; - static const QUParameter param_signal_1[] = { - { "t", &static_QUType_ptr, "KviFileTransfer", QUParameter::In } + static const TQUMethod signal_0 = {"transferRegistered", 1, param_signal_0 }; + static const TQUParameter param_signal_1[] = { + { "t", &static_TQUType_ptr, "KviFileTransfer", TQUParameter::In } }; - static const QUMethod signal_1 = {"transferUnregistering", 1, param_signal_1 }; - static const QMetaData signal_tbl[] = { - { "transferRegistered(KviFileTransfer*)", &signal_0, QMetaData::Public }, - { "transferUnregistering(KviFileTransfer*)", &signal_1, QMetaData::Public } + static const TQUMethod signal_1 = {"transferUnregistering", 1, param_signal_1 }; + static const TQMetaData signal_tbl[] = { + { "transferRegistered(KviFileTransfer*)", &signal_0, TQMetaData::Public }, + { "transferUnregistering(KviFileTransfer*)", &signal_1, TQMetaData::Public } }; - metaObj = QMetaObject::new_metaobject( - "KviFileTransferManager", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviFileTransferManager", tqparentObject, 0, 0, signal_tbl, 2, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviFileTransferManager.setMetaObject( metaObj ); return metaObj; } -void* KviFileTransferManager::qt_cast( const char* clname ) +void* KviFileTransferManager::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviFileTransferManager" ) ) return this; - return QObject::qt_cast( clname ); + return TQObject::tqqt_cast( clname ); } -#include <qobjectdefs.h> -#include <qsignalslotimp.h> +#include <tqobjectdefs.h> +#include <tqtqsignalslotimp.h> -// SIGNAL transferRegistered +// TQT_SIGNAL transferRegistered void KviFileTransferManager::transferRegistered( KviFileTransfer* t0 ) { if ( signalsBlocked() ) return; - QConnectionList *clist = receivers( staticMetaObject()->signalOffset() + 0 ); + TQConnectionList *clist = tqreceivers( staticMetaObject()->signalOffset() + 0 ); if ( !clist ) return; - QUObject o[2]; - static_QUType_ptr.set(o+1,t0); + TQUObject o[2]; + static_TQUType_ptr.set(o+1,t0); activate_signal( clist, o ); } -// SIGNAL transferUnregistering +// TQT_SIGNAL transferUnregistering void KviFileTransferManager::transferUnregistering( KviFileTransfer* t0 ) { if ( signalsBlocked() ) return; - QConnectionList *clist = receivers( staticMetaObject()->signalOffset() + 1 ); + TQConnectionList *clist = tqreceivers( staticMetaObject()->signalOffset() + 1 ); if ( !clist ) return; - QUObject o[2]; - static_QUType_ptr.set(o+1,t0); + TQUObject o[2]; + static_TQUType_ptr.set(o+1,t0); activate_signal( clist, o ); } -bool KviFileTransferManager::qt_invoke( int _id, QUObject* _o ) +bool KviFileTransferManager::qt_invoke( int _id, TQUObject* _o ) { - return QObject::qt_invoke(_id,_o); + return TQObject::qt_invoke(_id,_o); } -bool KviFileTransferManager::qt_emit( int _id, QUObject* _o ) +bool KviFileTransferManager::qt_emit( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->signalOffset() ) { - case 0: transferRegistered((KviFileTransfer*)static_QUType_ptr.get(_o+1)); break; - case 1: transferUnregistering((KviFileTransfer*)static_QUType_ptr.get(_o+1)); break; + case 0: transferRegistered((KviFileTransfer*)static_TQUType_ptr.get(_o+1)); break; + case 1: transferUnregistering((KviFileTransfer*)static_TQUType_ptr.get(_o+1)); break; default: - return QObject::qt_emit(_id,_o); + return TQObject::qt_emit(_id,_o); } return TRUE; } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviFileTransferManager::qt_property( int id, int f, QVariant* v) +bool KviFileTransferManager::qt_property( int id, int f, TQVariant* v) { - return QObject::qt_property( id, f, v); + return TQObject::qt_property( id, f, v); } -bool KviFileTransferManager::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviFileTransferManager::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviFileTransfer::className() const @@ -144,69 +144,69 @@ const char *KviFileTransfer::className() const return "KviFileTransfer"; } -QMetaObject *KviFileTransfer::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviFileTransfer( "KviFileTransfer", &KviFileTransfer::staticMetaObject ); +TQMetaObject *KviFileTransfer::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviFileTransfer( "KviFileTransfer", &KviFileTransfer::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviFileTransfer::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviFileTransfer::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviFileTransfer", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviFileTransfer", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviFileTransfer::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviFileTransfer::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviFileTransfer", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviFileTransfer", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviFileTransfer::staticMetaObject() +TQMetaObject* KviFileTransfer::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QObject::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviFileTransfer", parentObject, + TQMetaObject* tqparentObject = TQObject::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviFileTransfer", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviFileTransfer.setMetaObject( metaObj ); return metaObj; } -void* KviFileTransfer::qt_cast( const char* clname ) +void* KviFileTransfer::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviFileTransfer" ) ) return this; - return QObject::qt_cast( clname ); + return TQObject::tqqt_cast( clname ); } -bool KviFileTransfer::qt_invoke( int _id, QUObject* _o ) +bool KviFileTransfer::qt_invoke( int _id, TQUObject* _o ) { - return QObject::qt_invoke(_id,_o); + return TQObject::qt_invoke(_id,_o); } -bool KviFileTransfer::qt_emit( int _id, QUObject* _o ) +bool KviFileTransfer::qt_emit( int _id, TQUObject* _o ) { - return QObject::qt_emit(_id,_o); + return TQObject::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviFileTransfer::qt_property( int id, int f, QVariant* v) +bool KviFileTransfer::qt_property( int id, int f, TQVariant* v) { - return QObject::qt_property( id, f, v); + return TQObject::qt_property( id, f, v); } -bool KviFileTransfer::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviFileTransfer::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/kernel/moc_kvi_ircconnection.cpp b/src/kvirc/kernel/moc_kvi_ircconnection.cpp index dbe025a..4e64665 100644 --- a/src/kvirc/kernel/moc_kvi_ircconnection.cpp +++ b/src/kvirc/kernel/moc_kvi_ircconnection.cpp @@ -2,21 +2,21 @@ ** KviIrcConnection meta object code from reading C++ file 'kvi_ircconnection.h' ** ** Created: Mon Feb 25 00:11:48 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_ircconnection.h" -#include <qmetaobject.h> -#include <qapplication.h> - -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <tqmetaobject.h> +#include <tqapplication.h> + +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviIrcConnection::className() const @@ -24,145 +24,145 @@ const char *KviIrcConnection::className() const return "KviIrcConnection"; } -QMetaObject *KviIrcConnection::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviIrcConnection( "KviIrcConnection", &KviIrcConnection::staticMetaObject ); +TQMetaObject *KviIrcConnection::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviIrcConnection( "KviIrcConnection", &KviIrcConnection::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviIrcConnection::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviIrcConnection::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviIrcConnection", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviIrcConnection", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviIrcConnection::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviIrcConnection::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviIrcConnection", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviIrcConnection", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviIrcConnection::staticMetaObject() +TQMetaObject* KviIrcConnection::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QObject::staticMetaObject(); - static const QUMethod slot_0 = {"partAllChannels", 0, 0 }; - static const QUMethod slot_1 = {"unhighlightAllChannels", 0, 0 }; - static const QUMethod slot_2 = {"unhighlightAllQueries", 0, 0 }; - static const QUMethod slot_3 = {"restartNotifyList", 0, 0 }; - static const QUMethod slot_4 = {"closeAllQueries", 0, 0 }; - static const QUParameter param_slot_5[] = { - { "pDns", &static_QUType_ptr, "KviDns", QUParameter::In } + TQMetaObject* tqparentObject = TQObject::staticMetaObject(); + static const TQUMethod slot_0 = {"partAllChannels", 0, 0 }; + static const TQUMethod slot_1 = {"unhighlightAllChannels", 0, 0 }; + static const TQUMethod slot_2 = {"unhighlightAllQueries", 0, 0 }; + static const TQUMethod slot_3 = {"restartNotifyList", 0, 0 }; + static const TQUMethod slot_4 = {"closeAllQueries", 0, 0 }; + static const TQUParameter param_slot_5[] = { + { "pDns", &static_TQUType_ptr, "KviDns", TQUParameter::In } }; - static const QUMethod slot_5 = {"hostNameLookupTerminated", 1, param_slot_5 }; - static const QMetaData slot_tbl[] = { - { "partAllChannels()", &slot_0, QMetaData::Public }, - { "unhighlightAllChannels()", &slot_1, QMetaData::Public }, - { "unhighlightAllQueries()", &slot_2, QMetaData::Public }, - { "restartNotifyList()", &slot_3, QMetaData::Public }, - { "closeAllQueries()", &slot_4, QMetaData::Public }, - { "hostNameLookupTerminated(KviDns*)", &slot_5, QMetaData::Private } + static const TQUMethod slot_5 = {"hostNameLookupTerminated", 1, param_slot_5 }; + static const TQMetaData slot_tbl[] = { + { "partAllChannels()", &slot_0, TQMetaData::Public }, + { "unhighlightAllChannels()", &slot_1, TQMetaData::Public }, + { "unhighlightAllQueries()", &slot_2, TQMetaData::Public }, + { "restartNotifyList()", &slot_3, TQMetaData::Public }, + { "closeAllQueries()", &slot_4, TQMetaData::Public }, + { "hostNameLookupTerminated(KviDns*)", &slot_5, TQMetaData::Private } }; - static const QUMethod signal_0 = {"awayStateChanged", 0, 0 }; - static const QUMethod signal_1 = {"userModeChanged", 0, 0 }; - static const QUMethod signal_2 = {"nickNameChanged", 0, 0 }; - static const QUParameter param_signal_3[] = { - { 0, &static_QUType_ptr, "KviChannel", QUParameter::In } + static const TQUMethod signal_0 = {"awayStateChanged", 0, 0 }; + static const TQUMethod signal_1 = {"userModeChanged", 0, 0 }; + static const TQUMethod signal_2 = {"nickNameChanged", 0, 0 }; + static const TQUParameter param_signal_3[] = { + { 0, &static_TQUType_ptr, "KviChannel", TQUParameter::In } }; - static const QUMethod signal_3 = {"channelRegistered", 1, param_signal_3 }; - static const QUParameter param_signal_4[] = { - { 0, &static_QUType_ptr, "KviChannel", QUParameter::In } + static const TQUMethod signal_3 = {"channelRegistered", 1, param_signal_3 }; + static const TQUParameter param_signal_4[] = { + { 0, &static_TQUType_ptr, "KviChannel", TQUParameter::In } }; - static const QUMethod signal_4 = {"channelUnregistered", 1, param_signal_4 }; - static const QUMethod signal_5 = {"chanListChanged", 0, 0 }; - static const QMetaData signal_tbl[] = { - { "awayStateChanged()", &signal_0, QMetaData::Public }, - { "userModeChanged()", &signal_1, QMetaData::Public }, - { "nickNameChanged()", &signal_2, QMetaData::Public }, - { "channelRegistered(KviChannel*)", &signal_3, QMetaData::Public }, - { "channelUnregistered(KviChannel*)", &signal_4, QMetaData::Public }, - { "chanListChanged()", &signal_5, QMetaData::Public } + static const TQUMethod signal_4 = {"channelUnregistered", 1, param_signal_4 }; + static const TQUMethod signal_5 = {"chanListChanged", 0, 0 }; + static const TQMetaData signal_tbl[] = { + { "awayStateChanged()", &signal_0, TQMetaData::Public }, + { "userModeChanged()", &signal_1, TQMetaData::Public }, + { "nickNameChanged()", &signal_2, TQMetaData::Public }, + { "channelRegistered(KviChannel*)", &signal_3, TQMetaData::Public }, + { "channelUnregistered(KviChannel*)", &signal_4, TQMetaData::Public }, + { "chanListChanged()", &signal_5, TQMetaData::Public } }; - metaObj = QMetaObject::new_metaobject( - "KviIrcConnection", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviIrcConnection", tqparentObject, slot_tbl, 6, signal_tbl, 6, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviIrcConnection.setMetaObject( metaObj ); return metaObj; } -void* KviIrcConnection::qt_cast( const char* clname ) +void* KviIrcConnection::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviIrcConnection" ) ) return this; - return QObject::qt_cast( clname ); + return TQObject::tqqt_cast( clname ); } -// SIGNAL awayStateChanged +// TQT_SIGNAL awayStateChanged void KviIrcConnection::awayStateChanged() { activate_signal( staticMetaObject()->signalOffset() + 0 ); } -// SIGNAL userModeChanged +// TQT_SIGNAL userModeChanged void KviIrcConnection::userModeChanged() { activate_signal( staticMetaObject()->signalOffset() + 1 ); } -// SIGNAL nickNameChanged +// TQT_SIGNAL nickNameChanged void KviIrcConnection::nickNameChanged() { activate_signal( staticMetaObject()->signalOffset() + 2 ); } -#include <qobjectdefs.h> -#include <qsignalslotimp.h> +#include <tqobjectdefs.h> +#include <tqtqsignalslotimp.h> -// SIGNAL channelRegistered +// TQT_SIGNAL channelRegistered void KviIrcConnection::channelRegistered( KviChannel* t0 ) { if ( signalsBlocked() ) return; - QConnectionList *clist = receivers( staticMetaObject()->signalOffset() + 3 ); + TQConnectionList *clist = tqreceivers( staticMetaObject()->signalOffset() + 3 ); if ( !clist ) return; - QUObject o[2]; - static_QUType_ptr.set(o+1,t0); + TQUObject o[2]; + static_TQUType_ptr.set(o+1,t0); activate_signal( clist, o ); } -// SIGNAL channelUnregistered +// TQT_SIGNAL channelUnregistered void KviIrcConnection::channelUnregistered( KviChannel* t0 ) { if ( signalsBlocked() ) return; - QConnectionList *clist = receivers( staticMetaObject()->signalOffset() + 4 ); + TQConnectionList *clist = tqreceivers( staticMetaObject()->signalOffset() + 4 ); if ( !clist ) return; - QUObject o[2]; - static_QUType_ptr.set(o+1,t0); + TQUObject o[2]; + static_TQUType_ptr.set(o+1,t0); activate_signal( clist, o ); } -// SIGNAL chanListChanged +// TQT_SIGNAL chanListChanged void KviIrcConnection::chanListChanged() { activate_signal( staticMetaObject()->signalOffset() + 5 ); } -bool KviIrcConnection::qt_invoke( int _id, QUObject* _o ) +bool KviIrcConnection::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: partAllChannels(); break; @@ -170,33 +170,33 @@ bool KviIrcConnection::qt_invoke( int _id, QUObject* _o ) case 2: unhighlightAllQueries(); break; case 3: restartNotifyList(); break; case 4: closeAllQueries(); break; - case 5: hostNameLookupTerminated((KviDns*)static_QUType_ptr.get(_o+1)); break; + case 5: hostNameLookupTerminated((KviDns*)static_TQUType_ptr.get(_o+1)); break; default: - return QObject::qt_invoke( _id, _o ); + return TQObject::qt_invoke( _id, _o ); } return TRUE; } -bool KviIrcConnection::qt_emit( int _id, QUObject* _o ) +bool KviIrcConnection::qt_emit( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->signalOffset() ) { case 0: awayStateChanged(); break; case 1: userModeChanged(); break; case 2: nickNameChanged(); break; - case 3: channelRegistered((KviChannel*)static_QUType_ptr.get(_o+1)); break; - case 4: channelUnregistered((KviChannel*)static_QUType_ptr.get(_o+1)); break; + case 3: channelRegistered((KviChannel*)static_TQUType_ptr.get(_o+1)); break; + case 4: channelUnregistered((KviChannel*)static_TQUType_ptr.get(_o+1)); break; case 5: chanListChanged(); break; default: - return QObject::qt_emit(_id,_o); + return TQObject::qt_emit(_id,_o); } return TRUE; } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviIrcConnection::qt_property( int id, int f, QVariant* v) +bool KviIrcConnection::qt_property( int id, int f, TQVariant* v) { - return QObject::qt_property( id, f, v); + return TQObject::qt_property( id, f, v); } -bool KviIrcConnection::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviIrcConnection::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/kernel/moc_kvi_ircconnectiontargetresolver.cpp b/src/kvirc/kernel/moc_kvi_ircconnectiontargetresolver.cpp index 89aa1bc..8577471 100644 --- a/src/kvirc/kernel/moc_kvi_ircconnectiontargetresolver.cpp +++ b/src/kvirc/kernel/moc_kvi_ircconnectiontargetresolver.cpp @@ -2,21 +2,21 @@ ** KviIrcConnectionTargetResolver meta object code from reading C++ file 'kvi_ircconnectiontargetresolver.h' ** ** Created: Mon Feb 25 00:11:55 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_ircconnectiontargetresolver.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviIrcConnectionTargetResolver::className() const @@ -24,105 +24,105 @@ const char *KviIrcConnectionTargetResolver::className() const return "KviIrcConnectionTargetResolver"; } -QMetaObject *KviIrcConnectionTargetResolver::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviIrcConnectionTargetResolver( "KviIrcConnectionTargetResolver", &KviIrcConnectionTargetResolver::staticMetaObject ); +TQMetaObject *KviIrcConnectionTargetResolver::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviIrcConnectionTargetResolver( "KviIrcConnectionTargetResolver", &KviIrcConnectionTargetResolver::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviIrcConnectionTargetResolver::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviIrcConnectionTargetResolver::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviIrcConnectionTargetResolver", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviIrcConnectionTargetResolver", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviIrcConnectionTargetResolver::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviIrcConnectionTargetResolver::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviIrcConnectionTargetResolver", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviIrcConnectionTargetResolver", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviIrcConnectionTargetResolver::staticMetaObject() +TQMetaObject* KviIrcConnectionTargetResolver::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QObject::staticMetaObject(); - static const QUMethod slot_0 = {"asyncStartResolve", 0, 0 }; - static const QUParameter param_slot_1[] = { - { 0, &static_QUType_ptr, "KviDns", QUParameter::In } + TQMetaObject* tqparentObject = TQObject::staticMetaObject(); + static const TQUMethod slot_0 = {"asyncStartResolve", 0, 0 }; + static const TQUParameter param_slot_1[] = { + { 0, &static_TQUType_ptr, "KviDns", TQUParameter::In } }; - static const QUMethod slot_1 = {"serverLookupTerminated", 1, param_slot_1 }; - static const QUParameter param_slot_2[] = { - { 0, &static_QUType_ptr, "KviDns", QUParameter::In } + static const TQUMethod slot_1 = {"serverLookupTerminated", 1, param_slot_1 }; + static const TQUParameter param_slot_2[] = { + { 0, &static_TQUType_ptr, "KviDns", TQUParameter::In } }; - static const QUMethod slot_2 = {"proxyLookupTerminated", 1, param_slot_2 }; - static const QMetaData slot_tbl[] = { - { "asyncStartResolve()", &slot_0, QMetaData::Protected }, - { "serverLookupTerminated(KviDns*)", &slot_1, QMetaData::Protected }, - { "proxyLookupTerminated(KviDns*)", &slot_2, QMetaData::Protected } + static const TQUMethod slot_2 = {"proxyLookupTerminated", 1, param_slot_2 }; + static const TQMetaData slot_tbl[] = { + { "asyncStartResolve()", &slot_0, TQMetaData::Protected }, + { "serverLookupTerminated(KviDns*)", &slot_1, TQMetaData::Protected }, + { "proxyLookupTerminated(KviDns*)", &slot_2, TQMetaData::Protected } }; - static const QUMethod signal_0 = {"terminated", 0, 0 }; - static const QMetaData signal_tbl[] = { - { "terminated()", &signal_0, QMetaData::Private } + static const TQUMethod signal_0 = {"terminated", 0, 0 }; + static const TQMetaData signal_tbl[] = { + { "terminated()", &signal_0, TQMetaData::Private } }; - metaObj = QMetaObject::new_metaobject( - "KviIrcConnectionTargetResolver", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviIrcConnectionTargetResolver", tqparentObject, slot_tbl, 3, signal_tbl, 1, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviIrcConnectionTargetResolver.setMetaObject( metaObj ); return metaObj; } -void* KviIrcConnectionTargetResolver::qt_cast( const char* clname ) +void* KviIrcConnectionTargetResolver::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviIrcConnectionTargetResolver" ) ) return this; - return QObject::qt_cast( clname ); + return TQObject::tqqt_cast( clname ); } -// SIGNAL terminated +// TQT_SIGNAL terminated void KviIrcConnectionTargetResolver::terminated() { activate_signal( staticMetaObject()->signalOffset() + 0 ); } -bool KviIrcConnectionTargetResolver::qt_invoke( int _id, QUObject* _o ) +bool KviIrcConnectionTargetResolver::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: asyncStartResolve(); break; - case 1: serverLookupTerminated((KviDns*)static_QUType_ptr.get(_o+1)); break; - case 2: proxyLookupTerminated((KviDns*)static_QUType_ptr.get(_o+1)); break; + case 1: serverLookupTerminated((KviDns*)static_TQUType_ptr.get(_o+1)); break; + case 2: proxyLookupTerminated((KviDns*)static_TQUType_ptr.get(_o+1)); break; default: - return QObject::qt_invoke( _id, _o ); + return TQObject::qt_invoke( _id, _o ); } return TRUE; } -bool KviIrcConnectionTargetResolver::qt_emit( int _id, QUObject* _o ) +bool KviIrcConnectionTargetResolver::qt_emit( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->signalOffset() ) { case 0: terminated(); break; default: - return QObject::qt_emit(_id,_o); + return TQObject::qt_emit(_id,_o); } return TRUE; } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviIrcConnectionTargetResolver::qt_property( int id, int f, QVariant* v) +bool KviIrcConnectionTargetResolver::qt_property( int id, int f, TQVariant* v) { - return QObject::qt_property( id, f, v); + return TQObject::qt_property( id, f, v); } -bool KviIrcConnectionTargetResolver::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviIrcConnectionTargetResolver::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/kernel/moc_kvi_irccontext.cpp b/src/kvirc/kernel/moc_kvi_irccontext.cpp index 2319d11..d739306 100644 --- a/src/kvirc/kernel/moc_kvi_irccontext.cpp +++ b/src/kvirc/kernel/moc_kvi_irccontext.cpp @@ -2,21 +2,21 @@ ** KviIrcContext meta object code from reading C++ file 'kvi_irccontext.h' ** ** Created: Mon Feb 25 00:11:50 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_irccontext.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviIrcContext::className() const @@ -24,96 +24,96 @@ const char *KviIrcContext::className() const return "KviIrcContext"; } -QMetaObject *KviIrcContext::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviIrcContext( "KviIrcContext", &KviIrcContext::staticMetaObject ); +TQMetaObject *KviIrcContext::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviIrcContext( "KviIrcContext", &KviIrcContext::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviIrcContext::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviIrcContext::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviIrcContext", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviIrcContext", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviIrcContext::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviIrcContext::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviIrcContext", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviIrcContext", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviIrcContext::staticMetaObject() +TQMetaObject* KviIrcContext::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QObject::staticMetaObject(); - static const QUMethod slot_0 = {"asynchronousConnect", 0, 0 }; - static const QUMethod slot_1 = {"unhighlightAllWindows", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "asynchronousConnect()", &slot_0, QMetaData::Protected }, - { "unhighlightAllWindows()", &slot_1, QMetaData::Protected } + TQMetaObject* tqparentObject = TQObject::staticMetaObject(); + static const TQUMethod slot_0 = {"asynchronousConnect", 0, 0 }; + static const TQUMethod slot_1 = {"unhighlightAllWindows", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "asynchronousConnect()", &slot_0, TQMetaData::Protected }, + { "unhighlightAllWindows()", &slot_1, TQMetaData::Protected } }; - static const QUMethod signal_0 = {"stateChanged", 0, 0 }; - static const QMetaData signal_tbl[] = { - { "stateChanged()", &signal_0, QMetaData::Protected } + static const TQUMethod signal_0 = {"stateChanged", 0, 0 }; + static const TQMetaData signal_tbl[] = { + { "stateChanged()", &signal_0, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviIrcContext", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviIrcContext", tqparentObject, slot_tbl, 2, signal_tbl, 1, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviIrcContext.setMetaObject( metaObj ); return metaObj; } -void* KviIrcContext::qt_cast( const char* clname ) +void* KviIrcContext::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviIrcContext" ) ) return this; - return QObject::qt_cast( clname ); + return TQObject::tqqt_cast( clname ); } -// SIGNAL stateChanged +// TQT_SIGNAL stateChanged void KviIrcContext::stateChanged() { activate_signal( staticMetaObject()->signalOffset() + 0 ); } -bool KviIrcContext::qt_invoke( int _id, QUObject* _o ) +bool KviIrcContext::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: asynchronousConnect(); break; case 1: unhighlightAllWindows(); break; default: - return QObject::qt_invoke( _id, _o ); + return TQObject::qt_invoke( _id, _o ); } return TRUE; } -bool KviIrcContext::qt_emit( int _id, QUObject* _o ) +bool KviIrcContext::qt_emit( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->signalOffset() ) { case 0: stateChanged(); break; default: - return QObject::qt_emit(_id,_o); + return TQObject::qt_emit(_id,_o); } return TRUE; } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviIrcContext::qt_property( int id, int f, QVariant* v) +bool KviIrcContext::qt_property( int id, int f, TQVariant* v) { - return QObject::qt_property( id, f, v); + return TQObject::qt_property( id, f, v); } -bool KviIrcContext::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviIrcContext::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/kernel/moc_kvi_irclink.cpp b/src/kvirc/kernel/moc_kvi_irclink.cpp index 1bf804e..c686359 100644 --- a/src/kvirc/kernel/moc_kvi_irclink.cpp +++ b/src/kvirc/kernel/moc_kvi_irclink.cpp @@ -2,21 +2,21 @@ ** KviIrcLink meta object code from reading C++ file 'kvi_irclink.h' ** ** Created: Mon Feb 25 00:11:51 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_irclink.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviIrcLink::className() const @@ -24,96 +24,96 @@ const char *KviIrcLink::className() const return "KviIrcLink"; } -QMetaObject *KviIrcLink::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviIrcLink( "KviIrcLink", &KviIrcLink::staticMetaObject ); +TQMetaObject *KviIrcLink::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviIrcLink( "KviIrcLink", &KviIrcLink::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviIrcLink::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviIrcLink::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviIrcLink", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviIrcLink", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviIrcLink::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviIrcLink::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviIrcLink", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviIrcLink", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviIrcLink::staticMetaObject() +TQMetaObject* KviIrcLink::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QObject::staticMetaObject(); - static const QUMethod slot_0 = {"linkFilterDestroyed", 0, 0 }; - static const QUMethod slot_1 = {"resolverTerminated", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "linkFilterDestroyed()", &slot_0, QMetaData::Protected }, - { "resolverTerminated()", &slot_1, QMetaData::Private } + TQMetaObject* tqparentObject = TQObject::staticMetaObject(); + static const TQUMethod slot_0 = {"linkFilterDestroyed", 0, 0 }; + static const TQUMethod slot_1 = {"resolverTerminated", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "linkFilterDestroyed()", &slot_0, TQMetaData::Protected }, + { "resolverTerminated()", &slot_1, TQMetaData::Private } }; - static const QUMethod signal_0 = {"connectionFailed", 0, 0 }; - static const QMetaData signal_tbl[] = { - { "connectionFailed()", &signal_0, QMetaData::Private } + static const TQUMethod signal_0 = {"connectionFailed", 0, 0 }; + static const TQMetaData signal_tbl[] = { + { "connectionFailed()", &signal_0, TQMetaData::Private } }; - metaObj = QMetaObject::new_metaobject( - "KviIrcLink", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviIrcLink", tqparentObject, slot_tbl, 2, signal_tbl, 1, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviIrcLink.setMetaObject( metaObj ); return metaObj; } -void* KviIrcLink::qt_cast( const char* clname ) +void* KviIrcLink::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviIrcLink" ) ) return this; - return QObject::qt_cast( clname ); + return TQObject::tqqt_cast( clname ); } -// SIGNAL connectionFailed +// TQT_SIGNAL connectionFailed void KviIrcLink::connectionFailed() { activate_signal( staticMetaObject()->signalOffset() + 0 ); } -bool KviIrcLink::qt_invoke( int _id, QUObject* _o ) +bool KviIrcLink::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: linkFilterDestroyed(); break; case 1: resolverTerminated(); break; default: - return QObject::qt_invoke( _id, _o ); + return TQObject::qt_invoke( _id, _o ); } return TRUE; } -bool KviIrcLink::qt_emit( int _id, QUObject* _o ) +bool KviIrcLink::qt_emit( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->signalOffset() ) { case 0: connectionFailed(); break; default: - return QObject::qt_emit(_id,_o); + return TQObject::qt_emit(_id,_o); } return TRUE; } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviIrcLink::qt_property( int id, int f, QVariant* v) +bool KviIrcLink::qt_property( int id, int f, TQVariant* v) { - return QObject::qt_property( id, f, v); + return TQObject::qt_property( id, f, v); } -bool KviIrcLink::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviIrcLink::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/kernel/moc_kvi_ircsocket.cpp b/src/kvirc/kernel/moc_kvi_ircsocket.cpp index b4863f8..1b5c173 100644 --- a/src/kvirc/kernel/moc_kvi_ircsocket.cpp +++ b/src/kvirc/kernel/moc_kvi_ircsocket.cpp @@ -2,21 +2,21 @@ ** KviIrcSocket meta object code from reading C++ file 'kvi_ircsocket.h' ** ** Created: Mon Feb 25 00:11:53 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_ircsocket.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviIrcSocket::className() const @@ -24,111 +24,111 @@ const char *KviIrcSocket::className() const return "KviIrcSocket"; } -QMetaObject *KviIrcSocket::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviIrcSocket( "KviIrcSocket", &KviIrcSocket::staticMetaObject ); +TQMetaObject *KviIrcSocket::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviIrcSocket( "KviIrcSocket", &KviIrcSocket::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviIrcSocket::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviIrcSocket::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviIrcSocket", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviIrcSocket", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviIrcSocket::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviIrcSocket::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviIrcSocket", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviIrcSocket", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviIrcSocket::staticMetaObject() +TQMetaObject* KviIrcSocket::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QObject::staticMetaObject(); - static const QUMethod slot_0 = {"connectionTimedOut", 0, 0 }; - static const QUParameter param_slot_1[] = { - { 0, &static_QUType_int, 0, QUParameter::In } + TQMetaObject* tqparentObject = TQObject::staticMetaObject(); + static const TQUMethod slot_0 = {"connectionTimedOut", 0, 0 }; + static const TQUParameter param_slot_1[] = { + { 0, &static_TQUType_int, 0, TQUParameter::In } }; - static const QUMethod slot_1 = {"writeNotifierFired", 1, param_slot_1 }; - static const QUParameter param_slot_2[] = { - { 0, &static_QUType_int, 0, QUParameter::In } + static const TQUMethod slot_1 = {"writeNotifierFired", 1, param_slot_1 }; + static const TQUParameter param_slot_2[] = { + { 0, &static_TQUType_int, 0, TQUParameter::In } }; - static const QUMethod slot_2 = {"readData", 1, param_slot_2 }; - static const QUParameter param_slot_3[] = { - { 0, &static_QUType_int, 0, QUParameter::In } + static const TQUMethod slot_2 = {"readData", 1, param_slot_2 }; + static const TQUParameter param_slot_3[] = { + { 0, &static_TQUType_int, 0, TQUParameter::In } }; - static const QUMethod slot_3 = {"readProxyData", 1, param_slot_3 }; - static const QUParameter param_slot_4[] = { - { 0, &static_QUType_int, 0, QUParameter::In } + static const TQUMethod slot_3 = {"readProxyData", 1, param_slot_3 }; + static const TQUParameter param_slot_4[] = { + { 0, &static_TQUType_int, 0, TQUParameter::In } }; - static const QUMethod slot_4 = {"readHttpProxyErrorData", 1, param_slot_4 }; - static const QUMethod slot_5 = {"flushSendQueue", 0, 0 }; - static const QUParameter param_slot_6[] = { - { 0, &static_QUType_int, 0, QUParameter::In } + static const TQUMethod slot_4 = {"readHttpProxyErrorData", 1, param_slot_4 }; + static const TQUMethod slot_5 = {"flushSendQueue", 0, 0 }; + static const TQUParameter param_slot_6[] = { + { 0, &static_TQUType_int, 0, TQUParameter::In } }; - static const QUMethod slot_6 = {"doSSLHandshake", 1, param_slot_6 }; - static const QMetaData slot_tbl[] = { - { "connectionTimedOut()", &slot_0, QMetaData::Protected }, - { "writeNotifierFired(int)", &slot_1, QMetaData::Protected }, - { "readData(int)", &slot_2, QMetaData::Protected }, - { "readProxyData(int)", &slot_3, QMetaData::Protected }, - { "readHttpProxyErrorData(int)", &slot_4, QMetaData::Protected }, - { "flushSendQueue()", &slot_5, QMetaData::Protected }, - { "doSSLHandshake(int)", &slot_6, QMetaData::Protected } + static const TQUMethod slot_6 = {"doSSLHandshake", 1, param_slot_6 }; + static const TQMetaData slot_tbl[] = { + { "connectionTimedOut()", &slot_0, TQMetaData::Protected }, + { "writeNotifierFired(int)", &slot_1, TQMetaData::Protected }, + { "readData(int)", &slot_2, TQMetaData::Protected }, + { "readProxyData(int)", &slot_3, TQMetaData::Protected }, + { "readHttpProxyErrorData(int)", &slot_4, TQMetaData::Protected }, + { "flushSendQueue()", &slot_5, TQMetaData::Protected }, + { "doSSLHandshake(int)", &slot_6, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviIrcSocket", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviIrcSocket", tqparentObject, slot_tbl, 7, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviIrcSocket.setMetaObject( metaObj ); return metaObj; } -void* KviIrcSocket::qt_cast( const char* clname ) +void* KviIrcSocket::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviIrcSocket" ) ) return this; - return QObject::qt_cast( clname ); + return TQObject::tqqt_cast( clname ); } -bool KviIrcSocket::qt_invoke( int _id, QUObject* _o ) +bool KviIrcSocket::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: connectionTimedOut(); break; - case 1: writeNotifierFired((int)static_QUType_int.get(_o+1)); break; - case 2: readData((int)static_QUType_int.get(_o+1)); break; - case 3: readProxyData((int)static_QUType_int.get(_o+1)); break; - case 4: readHttpProxyErrorData((int)static_QUType_int.get(_o+1)); break; + case 1: writeNotifierFired((int)static_TQUType_int.get(_o+1)); break; + case 2: readData((int)static_TQUType_int.get(_o+1)); break; + case 3: readProxyData((int)static_TQUType_int.get(_o+1)); break; + case 4: readHttpProxyErrorData((int)static_TQUType_int.get(_o+1)); break; case 5: flushSendQueue(); break; - case 6: doSSLHandshake((int)static_QUType_int.get(_o+1)); break; + case 6: doSSLHandshake((int)static_TQUType_int.get(_o+1)); break; default: - return QObject::qt_invoke( _id, _o ); + return TQObject::qt_invoke( _id, _o ); } return TRUE; } -bool KviIrcSocket::qt_emit( int _id, QUObject* _o ) +bool KviIrcSocket::qt_emit( int _id, TQUObject* _o ) { - return QObject::qt_emit(_id,_o); + return TQObject::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviIrcSocket::qt_property( int id, int f, QVariant* v) +bool KviIrcSocket::qt_property( int id, int f, TQVariant* v) { - return QObject::qt_property( id, f, v); + return TQObject::qt_property( id, f, v); } -bool KviIrcSocket::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviIrcSocket::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/kvs/kvi_kvs.cpp b/src/kvirc/kvs/kvi_kvs.cpp index 9c36a34..96d74f9 100644 --- a/src/kvirc/kvs/kvi_kvs.cpp +++ b/src/kvirc/kvs/kvi_kvs.cpp @@ -61,12 +61,12 @@ namespace KviKvs KviKvsKernel::done(); } - void loadPopups(const QString &szFileName) + void loadPopups(const TQString &szFileName) { KviKvsPopupManager::instance()->load(szFileName); } - void savePopups(const QString &szFileName) + void savePopups(const TQString &szFileName) { KviKvsPopupManager::instance()->save(szFileName); } @@ -76,12 +76,12 @@ namespace KviKvs KviKvsPopupManager::instance()->clear(); } - void loadAliases(const QString &szFileName) + void loadAliases(const TQString &szFileName) { KviKvsAliasManager::instance()->load(szFileName); } - void saveAliases(const QString &szFileName) + void saveAliases(const TQString &szFileName) { KviKvsAliasManager::instance()->save(szFileName); } @@ -91,12 +91,12 @@ namespace KviKvs KviKvsAliasManager::instance()->clear(); } - void loadAppEvents(const QString &szFileName) + void loadAppEvents(const TQString &szFileName) { KviKvsEventManager::instance()->loadAppEvents(szFileName); } - void saveAppEvents(const QString &szFileName) + void saveAppEvents(const TQString &szFileName) { KviKvsEventManager::instance()->saveAppEvents(szFileName); } @@ -106,12 +106,12 @@ namespace KviKvs KviKvsEventManager::instance()->removeAllScriptAppHandlers(); } - void loadRawEvents(const QString &szFileName) + void loadRawEvents(const TQString &szFileName) { KviKvsEventManager::instance()->loadRawEvents(szFileName); } - void saveRawEvents(const QString &szFileName) + void saveRawEvents(const TQString &szFileName) { KviKvsEventManager::instance()->saveRawEvents(szFileName); } @@ -121,12 +121,12 @@ namespace KviKvs KviKvsEventManager::instance()->removeAllScriptRawHandlers(); } - void loadScriptAddons(const QString &szFileName) + void loadScriptAddons(const TQString &szFileName) { KviKvsScriptAddonManager::instance()->load(szFileName); } - void saveScriptAddons(const QString &szFileName) + void saveScriptAddons(const TQString &szFileName) { KviKvsScriptAddonManager::instance()->save(szFileName); } diff --git a/src/kvirc/kvs/kvi_kvs.h b/src/kvirc/kvs/kvi_kvs.h index bb92a30..3a083ab 100644 --- a/src/kvirc/kvs/kvi_kvs.h +++ b/src/kvirc/kvs/kvi_kvs.h @@ -32,24 +32,24 @@ namespace KviKvs void init(); // this never fails void done(); // this never fails - void loadAliases(const QString &szFileName); - void saveAliases(const QString &szFileName); + void loadAliases(const TQString &szFileName); + void saveAliases(const TQString &szFileName); void clearAliases(); - void loadPopups(const QString &szFileName); - void savePopups(const QString &szFileName); + void loadPopups(const TQString &szFileName); + void savePopups(const TQString &szFileName); void clearPopups(); - void loadAppEvents(const QString &szFileName); - void saveAppEvents(const QString &szFileName); + void loadAppEvents(const TQString &szFileName); + void saveAppEvents(const TQString &szFileName); void clearAppEvents(); - void loadRawEvents(const QString &szFileName); - void saveRawEvents(const QString &szFileName); + void loadRawEvents(const TQString &szFileName); + void saveRawEvents(const TQString &szFileName); void clearRawEvents(); - void loadScriptAddons(const QString &szFileName); - void saveScriptAddons(const QString &szFileName); + void loadScriptAddons(const TQString &szFileName); + void saveScriptAddons(const TQString &szFileName); void clearScriptAddons(); void flushUserClasses(); diff --git a/src/kvirc/kvs/kvi_kvs_action.cpp b/src/kvirc/kvs/kvi_kvs_action.cpp index 0829114..82972d3 100644 --- a/src/kvirc/kvs/kvi_kvs_action.cpp +++ b/src/kvirc/kvs/kvi_kvs_action.cpp @@ -28,19 +28,19 @@ #include "kvi_kvs_script.h" #include "kvi_window.h" -KviKvsAction::KviKvsAction(QObject * pParent, - const QString &szName, - const QString &szScriptCode, - const QString &szVisibleName, - const QString &szDescription, +KviKvsAction::KviKvsAction(TQObject * pParent, + const TQString &szName, + const TQString &szScriptCode, + const TQString &szVisibleName, + const TQString &szDescription, KviActionCategory * pCategory, - const QString &szBigIcon, + const TQString &szBigIcon, int iSmallIconId, unsigned int uFlags, - const QString &szKeySequence) + const TQString &szKeySequence) : KviAction(pParent,szName,szVisibleName,szDescription,pCategory,szBigIcon,iSmallIconId,uFlags,szKeySequence) { - QString tmp = KVI_KVS_ACTION_SCRIPT_NAME_PREFIX; + TQString tmp = KVI_KVS_ACTION_SCRIPT_NAME_PREFIX; tmp += szName; m_pScript = new KviKvsScript(tmp,szScriptCode); } @@ -52,7 +52,7 @@ KviKvsAction::~KviKvsAction() delete m_pScript; } -const QString & KviKvsAction::scriptCode() +const TQString & KviKvsAction::scriptCode() { return m_pScript->code(); } diff --git a/src/kvirc/kvs/kvi_kvs_action.h b/src/kvirc/kvs/kvi_kvs_action.h index 0a33569..25edfd7 100644 --- a/src/kvirc/kvs/kvi_kvs_action.h +++ b/src/kvirc/kvs/kvi_kvs_action.h @@ -34,22 +34,23 @@ class KviKvsScript; class KVIRC_API KviKvsAction : public KviAction { Q_OBJECT + TQ_OBJECT protected: KviKvsScript * m_pScript; public: - KviKvsAction(QObject * pParent, - const QString &szName, - const QString &szScriptCode, - const QString &szVisibleName, - const QString &szDescription, + KviKvsAction(TQObject * pParent, + const TQString &szName, + const TQString &szScriptCode, + const TQString &szVisibleName, + const TQString &szDescription, KviActionCategory * pCategory = 0, - const QString &szBigIcon = QString::null, + const TQString &szBigIcon = TQString(), int iSmallIconId = 0, unsigned int uFlags = 0, - const QString &szKeySequence = QString::null); + const TQString &szKeySequence = TQString()); ~KviKvsAction(); public: - const QString & scriptCode(); + const TQString & scriptCode(); virtual void activate(); }; diff --git a/src/kvirc/kvs/kvi_kvs_aliasmanager.cpp b/src/kvirc/kvs/kvi_kvs_aliasmanager.cpp index 257b6cf..2192dc5 100644 --- a/src/kvirc/kvs/kvi_kvs_aliasmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_aliasmanager.cpp @@ -32,7 +32,7 @@ KviKvsAliasManager * KviKvsAliasManager::m_pAliasManager = 0; KviKvsAliasManager::KviKvsAliasManager() { m_pAliasManager = this; - m_pAliasDict = new KviPointerHashTable<QString,KviKvsScript>(51,false); + m_pAliasDict = new KviPointerHashTable<TQString,KviKvsScript>(51,false); m_pAliasDict->setAutoDelete(true); } @@ -61,25 +61,25 @@ void KviKvsAliasManager::done() delete KviKvsAliasManager::instance(); } -void KviKvsAliasManager::completeCommand(const QString &word,KviPointerList<QString> * matches) +void KviKvsAliasManager::completeCommand(const TQString &word,KviPointerList<TQString> * matches) { - KviPointerHashTableIterator<QString,KviKvsScript> it(*m_pAliasDict); + KviPointerHashTableIterator<TQString,KviKvsScript> it(*m_pAliasDict); while(it.current()) { - if(KviQString::equalCIN(word,it.current()->name(),word.length())) - matches->append(new QString(it.current()->name())); + if(KviTQString::equalCIN(word,it.current()->name(),word.length())) + matches->append(new TQString(it.current()->name())); ++it; } } // FIXME: #warning "A binary config would work better and faster here!" -void KviKvsAliasManager::save(const QString & filename) +void KviKvsAliasManager::save(const TQString & filename) { KviConfig cfg(filename,KviConfig::Write); cfg.clear(); - KviPointerHashTableIterator<QString,KviKvsScript> it(*m_pAliasDict); + KviPointerHashTableIterator<TQString,KviKvsScript> it(*m_pAliasDict); while(it.current()) { @@ -89,26 +89,26 @@ void KviKvsAliasManager::save(const QString & filename) } } -void KviKvsAliasManager::load(const QString & filename) +void KviKvsAliasManager::load(const TQString & filename) { m_pAliasDict->clear(); KviConfig cfg(filename,KviConfig::Read); KviConfigIterator it(*(cfg.dict())); - KviPointerList<QString> l; + KviPointerList<TQString> l; l.setAutoDelete(true); while(it.current()) { - l.append(new QString(it.currentKey())); + l.append(new TQString(it.currentKey())); ++it; } - for(QString * s = l.first();s;s = l.next()) + for(TQString * s = l.first();s;s = l.next()) { cfg.setGroup(*s); - QString szCode = cfg.readQStringEntry("_Buffer",""); + TQString szCode = cfg.readTQStringEntry("_Buffer",""); if(!szCode.isEmpty()) { KviKvsScript * m = new KviKvsScript(*s,szCode); diff --git a/src/kvirc/kvs/kvi_kvs_aliasmanager.h b/src/kvirc/kvs/kvi_kvs_aliasmanager.h index 6f25ecc..49fda27 100644 --- a/src/kvirc/kvs/kvi_kvs_aliasmanager.h +++ b/src/kvirc/kvs/kvi_kvs_aliasmanager.h @@ -38,7 +38,7 @@ protected: // it only can be created and destroyed by KviKvsAliasManager::init() KviKvsAliasManager(); ~KviKvsAliasManager(); protected: - KviPointerHashTable<QString,KviKvsScript> * m_pAliasDict; + KviPointerHashTable<TQString,KviKvsScript> * m_pAliasDict; static KviKvsAliasManager * m_pAliasManager; public: static KviKvsAliasManager * instance() @@ -46,20 +46,20 @@ public: static void init(); // called by KviKvs::init() static void done(); // called by KviKvs::done() - KviPointerHashTable<QString,KviKvsScript> * aliasDict(){ return m_pAliasDict; }; - const KviKvsScript * lookup(const QString & szName) - { return m_pAliasDict->find(szName); }; - void add(const QString &szName,KviKvsScript * pAlias) - { m_pAliasDict->replace(szName,pAlias); }; - bool remove(const QString & szName) + KviPointerHashTable<TQString,KviKvsScript> * aliasDict(){ return m_pAliasDict; }; + const KviKvsScript * lookup(const TQString & szName) + { return m_pAliasDict->tqfind(szName); }; + void add(const TQString &szName,KviKvsScript * pAlias) + { m_pAliasDict->tqreplace(szName,pAlias); }; + bool remove(const TQString & szName) { return m_pAliasDict->remove(szName); }; void clear() { m_pAliasDict->clear(); }; - void save(const QString & filename); - void load(const QString & filename); + void save(const TQString & filename); + void load(const TQString & filename); - void completeCommand(const QString &word,KviPointerList<QString> * matches); + void completeCommand(const TQString &word,KviPointerList<TQString> * matches); }; // namespaces are handled completly in the editing! diff --git a/src/kvirc/kvs/kvi_kvs_array.cpp b/src/kvirc/kvs/kvi_kvs_array.cpp index 545d828..9d19aae 100644 --- a/src/kvirc/kvs/kvi_kvs_array.cpp +++ b/src/kvirc/kvs/kvi_kvs_array.cpp @@ -191,9 +191,9 @@ KviKvsVariant * KviKvsArray::getAt(kvs_uint_t uIdx) return m_pData[uIdx]; } -void KviKvsArray::serialize(QString& result) +void KviKvsArray::serialize(TQString& result) { - QString tmpBuffer; + TQString tmpBuffer; result="["; kvs_uint_t u = 0; bool bNeedComma = false; @@ -212,7 +212,7 @@ void KviKvsArray::serialize(QString& result) result.append(']'); } -void KviKvsArray::appendAsString(QString &szBuffer) +void KviKvsArray::appendAsString(TQString &szBuffer) { kvs_uint_t u = 0; bool bNeedComma = false; diff --git a/src/kvirc/kvs/kvi_kvs_array.h b/src/kvirc/kvs/kvi_kvs_array.h index 6c6ca46..73ec29d 100644 --- a/src/kvirc/kvs/kvi_kvs_array.h +++ b/src/kvirc/kvs/kvi_kvs_array.h @@ -51,8 +51,8 @@ public: KviKvsVariant * getAt(kvs_uint_t uIdx); bool isEmpty(){ return m_uSize == 0; }; kvs_uint_t size(){ return m_uSize; }; - void appendAsString(QString &szBuffer); - void serialize(QString& result); + void appendAsString(TQString &szBuffer); + void serialize(TQString& result); void sort(); void rsort(); protected: diff --git a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp index e7e2b62..b9f85d0 100644 --- a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp +++ b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp @@ -34,10 +34,10 @@ #include "kvi_error.h" #include "kvi_kvs_variantlist.h" -#include <qtimer.h> +#include <tqtimer.h> -KviKvsAsyncDnsOperation::KviKvsAsyncDnsOperation(KviWindow * pWnd,QString &szQuery,KviDns::QueryType eType,KviKvsScript * pCallback,KviKvsVariant * pMagic) +KviKvsAsyncDnsOperation::KviKvsAsyncDnsOperation(KviWindow * pWnd,TQString &szQuery,KviDns::QueryType eType,KviKvsScript * pCallback,KviKvsVariant * pMagic) : KviKvsAsyncOperation(pWnd) { m_pDns = new KviDns(); @@ -45,9 +45,9 @@ KviKvsAsyncDnsOperation::KviKvsAsyncDnsOperation(KviWindow * pWnd,QString &szQue m_eType = eType; m_pCallback = pCallback; m_pMagic = pMagic; - connect(m_pDns,SIGNAL(lookupDone(KviDns *)),this,SLOT(lookupTerminated(KviDns *))); + connect(m_pDns,TQT_SIGNAL(lookupDone(KviDns *)),this,TQT_SLOT(lookupTerminated(KviDns *))); if(!m_pDns->lookup(szQuery,eType)) - QTimer::singleShot(10,this,SLOT(dnsStartFailed())); + TQTimer::singleShot(10,this,TQT_SLOT(dnsStartFailed())); } KviKvsAsyncDnsOperation::~KviKvsAsyncDnsOperation() @@ -79,13 +79,13 @@ void KviKvsAsyncDnsOperation::lookupTerminated(KviDns *) params.append(new KviKvsVariant()); params.append(new KviKvsVariant(*m_pMagic)); } else { - QString * fh = m_pDns->hostnameList()->first(); - QString * fi = m_pDns->ipAddressList()->first(); + TQString * fh = m_pDns->hostnameList()->first(); + TQString * fi = m_pDns->ipAddressList()->first(); params.append(new KviKvsVariant(m_szQuery)); params.append(new KviKvsVariant((kvs_int_t)1)); - params.append(new KviKvsVariant(fi ? *fi : QString("?.?.?.?"))); - params.append(new KviKvsVariant(fh ? *fh : QString("?.?"))); + params.append(new KviKvsVariant(fi ? *fi : TQString("?.?.?.?"))); + params.append(new KviKvsVariant(fh ? *fh : TQString("?.?"))); params.append(new KviKvsVariant(*m_pMagic)); } @@ -96,22 +96,22 @@ void KviKvsAsyncDnsOperation::lookupTerminated(KviDns *) } // we have no callback : output the results - QString szQuery = m_pDns->query(); + TQString szQuery = m_pDns->query(); pWnd->output(KVI_OUT_HOSTLOOKUP,__tr2qs("DNS Lookup result for query \"%Q\""),&szQuery); if(m_pDns->state() == KviDns::Failure) { - QString strDescription(KviError::getDescription(m_pDns->error())); + TQString strDescription(KviError::getDescription(m_pDns->error())); pWnd->output(KVI_OUT_HOSTLOOKUP,__tr2qs("Error: %Q"),&strDescription); } else { int idx = 1; - for(QString * h = m_pDns->hostnameList()->first();h;h = m_pDns->hostnameList()->next()) + for(TQString * h = m_pDns->hostnameList()->first();h;h = m_pDns->hostnameList()->next()) { pWnd->output(KVI_OUT_HOSTLOOKUP,__tr2qs("Hostname %d: %Q"),idx,h); idx++; } idx = 1; - for(QString * a = m_pDns->ipAddressList()->first();a;a = m_pDns->ipAddressList()->next()) + for(TQString * a = m_pDns->ipAddressList()->first();a;a = m_pDns->ipAddressList()->next()) { pWnd->output(KVI_OUT_HOSTLOOKUP,__tr2qs("IP address %d: %Q"),idx,a); idx++; diff --git a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.h b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.h index 4e2046c..78909a5 100644 --- a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.h +++ b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.h @@ -36,15 +36,16 @@ class KviKvsVariant; class KVIRC_API KviKvsAsyncDnsOperation : public KviKvsAsyncOperation { Q_OBJECT + TQ_OBJECT public: - KviKvsAsyncDnsOperation(KviWindow * pWnd,QString &szQuery,KviDns::QueryType eType,KviKvsScript * pCallback = 0,KviKvsVariant * pMagic = 0); + KviKvsAsyncDnsOperation(KviWindow * pWnd,TQString &szQuery,KviDns::QueryType eType,KviKvsScript * pCallback = 0,KviKvsVariant * pMagic = 0); virtual ~KviKvsAsyncDnsOperation(); protected: KviDns * m_pDns; KviDns::QueryType m_eType; KviKvsVariant * m_pMagic; KviKvsScript * m_pCallback; - QString m_szQuery; + TQString m_szQuery; protected slots: void lookupTerminated(KviDns *); void dnsStartFailed(); diff --git a/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp b/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp index 549627e..19e4656 100644 --- a/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp +++ b/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp @@ -29,7 +29,7 @@ #include "kvi_window.h" KviKvsAsyncOperation::KviKvsAsyncOperation(KviWindow * pWnd) -: QObject() +: TQObject() { m_pWnd = pWnd; KviKvsKernel::instance()->asyncOperationManager()->registerOperation(this); diff --git a/src/kvirc/kvs/kvi_kvs_asyncoperation.h b/src/kvirc/kvs/kvi_kvs_asyncoperation.h index 2b5641b..83aaa36 100644 --- a/src/kvirc/kvs/kvi_kvs_asyncoperation.h +++ b/src/kvirc/kvs/kvi_kvs_asyncoperation.h @@ -26,13 +26,14 @@ #include "kvi_settings.h" #include "kvi_pointerlist.h" -#include <qobject.h> +#include <tqobject.h> class KviWindow; -class KVIRC_API KviKvsAsyncOperation : public QObject +class KVIRC_API KviKvsAsyncOperation : public TQObject { Q_OBJECT + TQ_OBJECT public: KviKvsAsyncOperation(KviWindow * pWnd); virtual ~KviKvsAsyncOperation(); diff --git a/src/kvirc/kvs/kvi_kvs_callbackobject.cpp b/src/kvirc/kvs/kvi_kvs_callbackobject.cpp index 7f30424..7222f05 100644 --- a/src/kvirc/kvs/kvi_kvs_callbackobject.cpp +++ b/src/kvirc/kvs/kvi_kvs_callbackobject.cpp @@ -29,7 +29,7 @@ #include "kvi_app.h" -KviKvsCallbackObject::KviKvsCallbackObject(const QString &szCallbackName,KviWindow * pTargetWindow,const QString &szCallbackCode,KviKvsVariantList * pMagicParams,unsigned int uFlags) +KviKvsCallbackObject::KviKvsCallbackObject(const TQString &szCallbackName,KviWindow * pTargetWindow,const TQString &szCallbackCode,KviKvsVariantList * pMagicParams,unsigned int uFlags) : KviHeapObject() { m_uFlags = uFlags; @@ -42,7 +42,7 @@ KviKvsCallbackObject::KviKvsCallbackObject(const QString &szCallbackName,KviWind if(pMagicParams) for(KviKvsVariant * v = pMagicParams->first();v;v = pMagicParams->next()) m_pMagicParams->append(new KviKvsVariant(*v)); - QString szName; + TQString szName; szName = szCallbackName; szName += "::"; szName += "callback"; @@ -55,7 +55,7 @@ KviKvsCallbackObject::~KviKvsCallbackObject() delete m_pMagicParams; } -KviKvsCallbackObject::CallbackStatus KviKvsCallbackObject::execute(KviKvsVariantList * pParams,KviKvsVariant * pRetVal) +KviKvsCallbackObject::CallbacktqStatus KviKvsCallbackObject::execute(KviKvsVariantList * pParams,KviKvsVariant * pRetVal) { // first of all check the window if(!m_pTargetWindow) diff --git a/src/kvirc/kvs/kvi_kvs_callbackobject.h b/src/kvirc/kvs/kvi_kvs_callbackobject.h index fb6e709..c45ec1b 100644 --- a/src/kvirc/kvs/kvi_kvs_callbackobject.h +++ b/src/kvirc/kvs/kvi_kvs_callbackobject.h @@ -49,7 +49,7 @@ public: // the callback is executed in another window (the associated console, if possible, otherwise the first available console) OnlyIfWindowExists = 1 }; - enum CallbackStatus { + enum CallbacktqStatus { // succesfull execution Success, // error in command @@ -61,9 +61,9 @@ public: }; public: KviKvsCallbackObject( - const QString &szCallbackSource, // the name of this callback (should identify its source, like "dialog.message"): displayed in error messages + const TQString &szCallbackSource, // the name of this callback (should identify its source, like "dialog.message"): displayed in error messages KviWindow * pTargetWindow, // the window that this callback should be triggered in (can be zero: to execute in the first available console) - const QString &szCallbackCode, // the callback code (may be empty!) + const TQString &szCallbackCode, // the callback code (may be empty!) KviKvsVariantList * pMagicParams, // magic parameters that should be passed to the callback (this class makes a copy of them) unsigned int uFlags = 0 // a combination of CallbackFlags ); @@ -76,7 +76,7 @@ protected: unsigned int m_uFlags; protected: // the parameter list is always shallow! - CallbackStatus execute(KviKvsVariantList * pParams = 0,KviKvsVariant * pRetVal = 0); + CallbacktqStatus execute(KviKvsVariantList * pParams = 0,KviKvsVariant * pRetVal = 0); }; diff --git a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp index 308ac8d..e925492 100644 --- a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp +++ b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp @@ -42,7 +42,7 @@ #include "kvi_iconmanager.h" #include "kvi_locale.h" -#include <qregexp.h> +#include <tqregexp.h> #include "kvi_tal_tooltip.h" namespace KviKvsCoreCallbackCommands @@ -135,7 +135,7 @@ namespace KviKvsCoreCallbackCommands KVSCCC(ahost) { - QString szQuery; + TQString szQuery; KviKvsVariant * pMagicPtr; KVSCCC_PARAMETERS_BEGIN KVSCCC_PARAMETER("dnsquery",KVS_PT_NONEMPTYSTRING,0,szQuery) @@ -143,8 +143,8 @@ namespace KviKvsCoreCallbackCommands KVSCCC_PARAMETERS_END KviDns::QueryType queryType = KviDns::IpV4; - if(KVSCCC_pSwitches->find('i',"ipv6"))queryType = KviDns::IpV6; - if(KVSCCC_pSwitches->find('a',"any"))queryType = KviDns::Any; + if(KVSCCC_pSwitches->tqfind('i',"ipv6"))queryType = KviDns::IpV6; + if(KVSCCC_pSwitches->tqfind('a',"any"))queryType = KviDns::Any; KviKvsVariant * pMagic = pMagicPtr ? new KviKvsVariant(*pMagicPtr) : new KviKvsVariant(); @@ -243,11 +243,11 @@ namespace KviKvsCoreCallbackCommands return false; } - QString szName; + TQString szName; vName->asString(szName); // we allow only [\w:]+ - QRegExp re("[\\w:]+"); + TQRegExp re("[\\w:]+"); if(!re.exactMatch(szName)) { KVSCCC_pContext->error(__tr2qs("Alias names can contain only letters, digits, underscores and '::' namespace separators")); @@ -255,15 +255,15 @@ namespace KviKvsCoreCallbackCommands } // make sure that we have only doubled "::" and not ":" or ":::..." - QString tmp = szName; - tmp.replace("::","@"); // @ is not allowed by the rule above - if(tmp.find(":") != -1) + TQString tmp = szName; + tmp.tqreplace("::","@"); // @ is not allowed by the rule above + if(tmp.tqfind(":") != -1) { KVSCCC_pContext->error(__tr2qs("Stray ':' character in alias name: did you mean ...<namespace>::<name> ?")); return false; } - if(tmp.find("@@") != -1) + if(tmp.tqfind("@@") != -1) { KVSCCC_pContext->error(__tr2qs("Found an empty namespace in alias name")); return false; @@ -273,7 +273,7 @@ namespace KviKvsCoreCallbackCommands { if(!KviKvsAliasManager::instance()->remove(szName)) { - if(!KVSCCC_pSwitches->find('q',"quiet")) + if(!KVSCCC_pSwitches->tqfind('q',"quiet")) KVSCCC_pContext->warning(__tr2qs("The alias %Q is not existing"),&szName); } } else { @@ -340,16 +340,16 @@ namespace KviKvsCoreCallbackCommands KVSCCC(awhois) { - QString szNick; + TQString szNick; KviKvsVariant * pMagic; KVSCCC_PARAMETERS_BEGIN KVSCCC_PARAMETER("nickname",KVS_PT_NONEMPTYSTRING,0,szNick) KVSCCC_PARAMETER("magic",KVS_PT_VARIANT,KVS_PF_OPTIONAL,pMagic) KVSCCC_PARAMETERS_END - KVSCCC_REQUIRE_CONNECTION + KVSCCC_RETQUIRE_CONNECTION - KviQCString szN = KVSCCC_pConnection->encodeText(szNick); + KviTQCString szN = KVSCCC_pConnection->encodeText(szNick); KviAsyncWhoisInfo * info = new KviAsyncWhoisInfo(); info->pCallback = new KviKvsScript(*KVSCCC_pCallback); @@ -359,7 +359,7 @@ namespace KviKvsCoreCallbackCommands KVSCCC_pConnection->asyncWhoisData()->add(info); - if(KVSCCC_pSwitches->find('i',"idle-time"))KVSCCC_pConnection->sendFmtData("WHOIS %s %s",szN.data(),szN.data()); + if(KVSCCC_pSwitches->tqfind('i',"idle-time"))KVSCCC_pConnection->sendFmtData("WHOIS %s %s",szN.data(),szN.data()); else KVSCCC_pConnection->sendFmtData("WHOIS %s",szN.data()); return true; @@ -420,7 +420,7 @@ namespace KviKvsCoreCallbackCommands KVSCCC(button) { KviKvsVariant * pUnused; - QString szName,szIcon,szLabel; + TQString szName,szIcon,szLabel; KVSCCC_PARAMETERS_BEGIN KVSCCC_PARAMETER("type_unused",KVS_PT_VARIANT,0,pUnused) KVSCCC_PARAMETER("name",KVS_PT_NONEMPTYSTRING,0,szName) @@ -432,7 +432,7 @@ namespace KviKvsCoreCallbackCommands if(!KVSCCC_pWindow->buttonContainer()) { - if(!KVSCCC_pSwitches->find('q',"quiet")) + if(!KVSCCC_pSwitches->tqfind('q',"quiet")) KVSCCC_pContext->warning(__tr2qs("The specified window has no button containers")); return true; } @@ -443,7 +443,7 @@ namespace KviKvsCoreCallbackCommands { if(pButton)delete pButton; else { - if(!KVSCCC_pSwitches->find('q',"quiet")) + if(!KVSCCC_pSwitches->tqfind('q',"quiet")) KVSCCC_pContext->warning(__tr2qs("Window button '%Q' not found"),&szName); } return true; @@ -466,17 +466,17 @@ namespace KviKvsCoreCallbackCommands if(!szIcon.isEmpty()) { - QPixmap * pix = g_pIconManager->getImage(szIcon); + TQPixmap * pix = g_pIconManager->getImage(szIcon); if(pix) { pButton->setButtonPixmap(*pix); } else { - if(!KVSCCC_pSwitches->find('q',"quiet")) + if(!KVSCCC_pSwitches->tqfind('q',"quiet")) KVSCCC_pContext->warning(__tr2qs("Can't find the icon '%Q'"),&szIcon); } } - pButton->setEnabled(!(KVSCCC_pSwitches->find('d',"disabled"))); + pButton->setEnabled(!(KVSCCC_pSwitches->tqfind('d',"disabled"))); return true; } @@ -514,7 +514,7 @@ namespace KviKvsCoreCallbackCommands KVSCCC(event) { - QString szEventName,szHandlerName; + TQString szEventName,szHandlerName; KVSCCC_PARAMETERS_BEGIN KVSCCC_PARAMETER("event_name",KVS_PT_NONEMPTYSTRING,0,szEventName) KVSCCC_PARAMETER("handler_name",KVS_PT_NONEMPTYSTRING,0,szHandlerName) @@ -528,7 +528,7 @@ namespace KviKvsCoreCallbackCommands { if(!KviKvsEventManager::instance()->isValidRawEvent(iNumber)) { - if(!KVSCCC_pSwitches->find('q',"quiet")) + if(!KVSCCC_pSwitches->tqfind('q',"quiet")) KVSCCC_pContext->warning(__tr2qs("No such event (%Q)"),&szEventName); return true; } @@ -536,7 +536,7 @@ namespace KviKvsCoreCallbackCommands iNumber = KviKvsEventManager::instance()->findAppEventIndexByName(szEventName); if(!KviKvsEventManager::instance()->isValidAppEvent(iNumber)) { - if(!KVSCCC_pSwitches->find('q',"quiet")) + if(!KVSCCC_pSwitches->tqfind('q',"quiet")) KVSCCC_pContext->warning(__tr2qs("No such event (%Q)"),&szEventName); return true; } @@ -548,13 +548,13 @@ namespace KviKvsCoreCallbackCommands { if(!KviKvsEventManager::instance()->removeScriptRawHandler(iNumber,szHandlerName)) { - if(!KVSCCC_pSwitches->find('q',"quiet")) + if(!KVSCCC_pSwitches->tqfind('q',"quiet")) KVSCCC_pContext->warning(__tr2qs("No handler '%Q' for raw numeric event '%d'"),&szHandlerName,iNumber); } } else { if(!KviKvsEventManager::instance()->removeScriptAppHandler(iNumber,szHandlerName)) { - if(!KVSCCC_pSwitches->find('q',"quiet")) + if(!KVSCCC_pSwitches->tqfind('q',"quiet")) KVSCCC_pContext->warning(__tr2qs("No handler '%Q' for event '%Q'"),&szHandlerName,&szEventName); } } @@ -563,15 +563,15 @@ namespace KviKvsCoreCallbackCommands { // remove the old handler KviKvsEventManager::instance()->removeScriptRawHandler(iNumber,szHandlerName); - QString contextName; - KviQString::sprintf(contextName,"RawEvent%d::%Q",iNumber,&szHandlerName); + TQString contextName; + KviTQString::sprintf(contextName,"RawEvent%d::%Q",iNumber,&szHandlerName); KviKvsScriptEventHandler * pHandler = new KviKvsScriptEventHandler(szHandlerName,contextName,KVSCCC_pCallback->code()); KviKvsEventManager::instance()->addRawHandler(iNumber,pHandler); } else { // remove the old handler KviKvsEventManager::instance()->removeScriptAppHandler(iNumber,szHandlerName); - QString contextName; - KviQString::sprintf(contextName,"%Q::%Q",&szEventName,&szHandlerName); + TQString contextName; + KviTQString::sprintf(contextName,"%Q::%Q",&szEventName,&szHandlerName); KviKvsScriptEventHandler * pHandler = new KviKvsScriptEventHandler(szHandlerName,contextName,KVSCCC_pCallback->code()); KviKvsEventManager::instance()->addAppHandler(iNumber,pHandler); } @@ -618,7 +618,7 @@ namespace KviKvsCoreCallbackCommands Trigger <callback command> with "ping" events every <timeout> milliseconds. !sw: -w | --bind-to-window Kill the process if the current window is closed. In this case the - termination event is NOT triggered (since the parent window has been lost). + termination event is NOT triggered (since the tqparent window has been lost). If this switch is not used then the process is rebound to the active console window and continues running. !sw: -s=<interpreter command> | --shell=<interpreter command> @@ -679,7 +679,7 @@ namespace KviKvsCoreCallbackCommands The stderr data event is similar to the stdout one but there are three differences. The first one is that the stderr event is NOT triggered by default: you must use the -e switch to enable it. The second difference is that $0 - contains "stderr" instead of "stdout". The last difference is that $1 contains data + tqcontains "stderr" instead of "stdout". The last difference is that $1 contains data coming from the slave process stderr stream.[br] [br] [b]Termination event[/b][br] @@ -883,8 +883,8 @@ namespace KviKvsCoreCallbackCommands { [comment]# We don't wait anymore :)[/comment] %:state++ - echo "Sending QUIT..." - return "QUIT$cr$lf" + echo "Sending TQUIT..." + return "TQUIT$cr$lf" } break; default: @@ -905,7 +905,7 @@ namespace KviKvsCoreCallbackCommands KVSCCC(exec) { - QString szCommandline; + TQString szCommandline; KviKvsVariant * pMagic; KVSCCC_PARAMETERS_BEGIN KVSCCC_PARAMETER("commandline",KVS_PT_NONEMPTYSTRING,0,szCommandline) @@ -914,21 +914,21 @@ namespace KviKvsCoreCallbackCommands int f = 0; - if(KVSCCC_pSwitches->find('t',"trigger-termination") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERTERMINATED; - if(KVSCCC_pSwitches->find('n',"no-stdout") == 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDOUT; - if(KVSCCC_pSwitches->find('e',"trigger-stderr") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDERR; - if(KVSCCC_pSwitches->find('x',"trigger-startup") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTARTED; - if(KVSCCC_pSwitches->find('b',"output-block") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_OUTPUTBYBLOCKS; - if(KVSCCC_pSwitches->find('w',"bind-to-window") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_KILLIFNOWINDOW; - if(KVSCCC_pSwitches->find('d',"direct") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_NOSHELL; - - QString szShell; + if(KVSCCC_pSwitches->tqfind('t',"trigger-termination") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERTERMINATED; + if(KVSCCC_pSwitches->tqfind('n',"no-stdout") == 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDOUT; + if(KVSCCC_pSwitches->tqfind('e',"trigger-stderr") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDERR; + if(KVSCCC_pSwitches->tqfind('x',"trigger-startup") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTARTED; + if(KVSCCC_pSwitches->tqfind('b',"output-block") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_OUTPUTBYBLOCKS; + if(KVSCCC_pSwitches->tqfind('w',"bind-to-window") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_KILLIFNOWINDOW; + if(KVSCCC_pSwitches->tqfind('d',"direct") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_NOSHELL; + + TQString szShell; KVSCCC_pSwitches->getAsStringIfExisting('s',"shell",szShell); kvs_int_t iPingTime = 0; kvs_int_t iMaxRunTime = 0; - KviKvsVariant * pPing = KVSCCC_pSwitches->find('p',"trigger-ping"); + KviKvsVariant * pPing = KVSCCC_pSwitches->tqfind('p',"trigger-ping"); if(pPing) { if(!(pPing->asInteger(iPingTime) && iPingTime > 0)) @@ -938,7 +938,7 @@ namespace KviKvsCoreCallbackCommands } } - KviKvsVariant * pKill = KVSCCC_pSwitches->find('k',"kill-after"); + KviKvsVariant * pKill = KVSCCC_pSwitches->tqfind('k',"kill-after"); if(pKill) { if(!(pKill->asInteger(iMaxRunTime) && iMaxRunTime > 0)) @@ -962,7 +962,7 @@ namespace KviKvsCoreCallbackCommands KviKvsProcessAsyncOperation * op = new KviKvsProcessAsyncOperation(d); if(!op->start()) { - if(KVSCCC_pSwitches->find('q',"quiet") == 0)KVSCCC_pContext->warning(__tr2qs("Failed to start the process")); + if(KVSCCC_pSwitches->tqfind('q',"quiet") == 0)KVSCCC_pContext->warning(__tr2qs("Failed to start the process")); delete op; } @@ -998,7 +998,7 @@ namespace KviKvsCoreCallbackCommands KVSCCC(privateimpl) { kvs_hobject_t hObject; - QString szFunctionName; + TQString szFunctionName; KVSCCC_PARAMETERS_BEGIN KVSCCC_PARAMETER("object_handle",KVS_PT_HOBJECT,0,hObject) KVSCCC_PARAMETER("function_name",KVS_PT_NONEMPTYSTRING,0,szFunctionName) @@ -1114,7 +1114,7 @@ namespace KviKvsCoreCallbackCommands return false; } - QString szName; + TQString szName; vName->asString(szName); if(!vDelay) @@ -1132,8 +1132,8 @@ namespace KviKvsCoreCallbackCommands KviKvsTimer::Lifetime lt; - if(KVSCCC_pSwitches->find('s',"single-shot"))lt = KviKvsTimer::SingleShot; - else if(KVSCCC_pSwitches->find('p',"persistent"))lt = KviKvsTimer::Persistent; + if(KVSCCC_pSwitches->tqfind('s',"single-shot"))lt = KviKvsTimer::SingleShot; + else if(KVSCCC_pSwitches->tqfind('p',"persistent"))lt = KviKvsTimer::Persistent; else lt = KviKvsTimer::WindowLifetime; // prepare the callback parameters @@ -1165,7 +1165,7 @@ namespace KviKvsCoreCallbackCommands { \ KviKvsCoreCallbackCommandExecRoutine * r = new KviKvsCoreCallbackCommandExecRoutine; \ r->proc = KVI_PTR2MEMBER(KviKvsCoreCallbackCommands::__routine); \ - pKern->registerCoreCallbackCommandExecRoutine(QString(__cmdName),r); \ + pKern->registerCoreCallbackCommandExecRoutine(TQString(__cmdName),r); \ } #ifdef COMPILE_NEW_KVS diff --git a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.h b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.h index ce77ec6..478358d 100644 --- a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.h +++ b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.h @@ -48,7 +48,7 @@ KVS_PARAMETERS_END \ if(!KviKvsParameterProcessor::process(KVSCCC_pParams,KVSCCC_pContext,parameter_format_list))return false; -#define KVSCCC_REQUIRE_CONNECTION \ +#define KVSCCC_RETQUIRE_CONNECTION \ if(!KVSCCC_pContext->window()->context())return KVSCCC_pContext->errorNoIrcContext(); \ if(!KVSCCC_pContext->window()->connection())return KVSCCC_pContext->warningNoIrcConnection(); diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions.cpp index 74aa456..6af8b98 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions.cpp @@ -41,13 +41,13 @@ namespace KviKvsCoreFunctions { \ KviKvsCoreFunctionExecRoutine * r = new KviKvsCoreFunctionExecRoutine; \ r->proc = KVI_PTR2MEMBER(KviKvsCoreFunctions::__routine); \ - pKern->registerCoreFunctionExecRoutine(QString(__fncName),r); \ + pKern->registerCoreFunctionExecRoutine(TQString(__fncName),r); \ } // a_f _REGFNC("active",active) _REGFNC("array",array) - _REGFNC("ascii",unicode) + _REGFNC("ascii",tqunicode) _REGFNC("asciiToHex",asciiToHex) _REGFNC("asciiToBase64",asciiToBase64) _REGFNC("away",away) @@ -93,7 +93,7 @@ namespace KviKvsCoreFunctions _REGFNC("length",length) _REGFNC("lf",lf) // m_r - _REGFNC("mask",mask) + _REGFNC("tqmask",tqmask) _REGFNC("me",me) _REGFNC("msgtype",msgtype) _REGFNC("new",newCKEYWORDWORKAROUND) @@ -121,7 +121,7 @@ namespace KviKvsCoreFunctions _REGFNC("true",trueCKEYWORDWORKAROUND) _REGFNC("typeof",typeofCKEYWORDWORKAROUND) _REGFNC("u",u) - _REGFNC("unicode",unicode) + _REGFNC("tqunicode",tqunicode) _REGFNC("unixtime",unixtime) _REGFNC("unserialize",unserialize) _REGFNC("username",username) @@ -133,7 +133,7 @@ namespace KviKvsCoreFunctions #undef _REGCMD } - static QString g_szStaticStrayConstantAt("@"); + static TQString g_szStaticStrayConstantAt("@"); KVSCF(strayAt) { diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions.h b/src/kvirc/kvs/kvi_kvs_corefunctions.h index 9fd25ea..16d281a 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions.h +++ b/src/kvirc/kvs/kvi_kvs_corefunctions.h @@ -101,7 +101,7 @@ namespace KviKvsCoreFunctions KVSCF(length); KVSCF(lf); // m_r - KVSCF(mask); + KVSCF(tqmask); KVSCF(me); KVSCF(msgtype); KVSCF(newCKEYWORDWORKAROUND); @@ -131,7 +131,7 @@ namespace KviKvsCoreFunctions KVSCF(trueCKEYWORDWORKAROUND); KVSCF(typeofCKEYWORDWORKAROUND); KVSCF(u); - KVSCF(unicode); + KVSCF(tqunicode); KVSCF(unixtime); KVSCF(unserialize); KVSCF(username); @@ -140,7 +140,7 @@ namespace KviKvsCoreFunctions // specials KVSCF(strayAt); KVSCF(mightBeStrayAtOrThis); - //bool redirectToModule(const QString &szFrom,const QString &szModName,const QString &szFuncName + //bool redirectToModule(const TQString &szFrom,const TQString &szModName,const TQString &szFuncName void init(); }; diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp index 0fba8d7..508ec52 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp @@ -108,7 +108,7 @@ namespace KviKvsCoreFunctions @syntax: <variant> $ascii(<char:string>) @description: - This function has been renamed to $unicode and is present + This function has been renamed to $tqunicode and is present only for backward compatibility. @seealso: [fnc]$cr[/fnc], [fnc]$lf[/fnc], [fnc]$char[/fnc] @@ -139,7 +139,7 @@ namespace KviKvsCoreFunctions KVSCF(asciiToBase64) { - QString szAscii; + TQString szAscii; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("ascii_string",KVS_PT_STRING,0,szAscii) KVSCF_PARAMETERS_END @@ -149,9 +149,9 @@ namespace KviKvsCoreFunctions { KviStr tmp2; tmp2.bufferToBase64(tmp1.ptr(),tmp1.len()); - KVSCF_pRetBuffer->setString(QString(tmp2.ptr())); + KVSCF_pRetBuffer->setString(TQString(tmp2.ptr())); } else { - KVSCF_pRetBuffer->setString(QString::null); + KVSCF_pRetBuffer->setString(TQString()); } return true; } @@ -181,7 +181,7 @@ namespace KviKvsCoreFunctions KVSCF(asciiToHex) { - QString szAscii; + TQString szAscii; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("ascii_string",KVS_PT_STRING,0,szAscii) KVSCF_PARAMETERS_END @@ -191,9 +191,9 @@ namespace KviKvsCoreFunctions { KviStr tmp2; tmp2.bufferToHex(tmp1.ptr(),tmp1.len()); - KVSCF_pRetBuffer->setString(QString(tmp2.ptr())); + KVSCF_pRetBuffer->setString(TQString(tmp2.ptr())); } else { - KVSCF_pRetBuffer->setString(QString::null); + KVSCF_pRetBuffer->setString(TQString()); } return true; } @@ -320,7 +320,7 @@ namespace KviKvsCoreFunctions KVSCF(b) { - KVSCF_pRetBuffer->setString(QString(QChar(KVI_TEXT_BOLD))); + KVSCF_pRetBuffer->setString(TQString(TQChar(KVI_TEXT_BOLD))); return true; } @@ -344,7 +344,7 @@ namespace KviKvsCoreFunctions KVSCF(base64ToAscii) { - QString szBase64; + TQString szBase64; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("base64_encoded_string",KVS_PT_STRING,0,szBase64) KVSCF_PARAMETERS_END @@ -352,7 +352,7 @@ namespace KviKvsCoreFunctions KviStr tmp1(szBase64); char * buf; int len = tmp1.base64ToBuffer(&buf,true); - KVSCF_pRetBuffer->setString(QString(buf)); + KVSCF_pRetBuffer->setString(TQString(buf)); KviStr::freeBuffer(buf); return true; } @@ -444,7 +444,7 @@ namespace KviKvsCoreFunctions KVSCF(channel) { - QString szName; + TQString szName; kvs_uint_t uContextId; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("channel_name",KVS_PT_NONEMPTYSTRING,KVS_PF_OPTIONAL,szName) @@ -489,30 +489,30 @@ namespace KviKvsCoreFunctions @title: $char @short: - Returns a character specified by unicode + Returns a character specified by tqunicode @syntax: - <string> $char(<unicode_value:integer>) + <string> $char(<tqunicode_value:integer>) @description: - Returns a character corresponding to the UNICODE code <unicode_value>.[br] + Returns a character corresponding to the UNICODE code <tqunicode_value>.[br] This function can not return NUL character (UNICODE 0). Basically you should never need it: if you do, drop me a mail.[br] - If the <unicode_code> is not a valid UNICODE code (or is 0), this function returns + If the <tqunicode_code> is not a valid UNICODE code (or is 0), this function returns an empty string.[br] @seealso: - [fnc]$cr[/fnc], [fnc]$lf[/fnc], [fnc]$unicode[/fnc] + [fnc]$cr[/fnc], [fnc]$lf[/fnc], [fnc]$tqunicode[/fnc] */ KVSCF(charCKEYWORDWORKAROUND) { kvs_uint_t ac; KVSCF_PARAMETERS_BEGIN - KVSCF_PARAMETER("unicode_value",KVS_PT_UINT,0,ac) + KVSCF_PARAMETER("tqunicode_value",KVS_PT_UINT,0,ac) KVSCF_PARAMETERS_END if(ac != 0 && ac < 65536) - KVSCF_pRetBuffer->setString(QString(QChar((unsigned short)ac))); + KVSCF_pRetBuffer->setString(TQString(TQChar((unsigned short)ac))); else - KVSCF_pRetBuffer->setString(QString::null); + KVSCF_pRetBuffer->setString(TQString()); return true; } @@ -535,7 +535,7 @@ namespace KviKvsCoreFunctions KVSCF(classDefined) { // prologue: parameter handling - QString szClassName; + TQString szClassName; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("className",KVS_PT_NONEMPTYSTRING,0,szClassName) @@ -627,7 +627,7 @@ namespace KviKvsCoreFunctions KVSCF(context) { - QString szServer,szNick; + TQString szServer,szNick; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("server",KVS_PT_STRING,KVS_PF_OPTIONAL,szServer) KVSCF_PARAMETER("nick",KVS_PT_STRING,KVS_PF_OPTIONAL,szNick) @@ -665,7 +665,7 @@ namespace KviKvsCoreFunctions KVSCF(cr) { - KVSCF_pRetBuffer->setString(QString(QChar('\r'))); + KVSCF_pRetBuffer->setString(TQString(TQChar('\r'))); return true; } @@ -761,7 +761,7 @@ namespace KviKvsCoreFunctions KVSCF(date) { - QString szFormat; + TQString szFormat; kvs_int_t iTime; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("format",KVS_PT_NONEMPTYSTRING,0,szFormat) @@ -771,24 +771,24 @@ namespace KviKvsCoreFunctions KviStr tmpFormat(""); #ifdef COMPILE_ON_WINDOWS - QString szAllowedCharacters; + TQString szAllowedCharacters; //windows version of strftime() //kvirc crashes if other then these characters get an % character in front of them szAllowedCharacters = "AaBbcdHIjMmpSUWwXxYyZz"; #endif - const QChar * c = KviQString::nullTerminatedArray(szFormat); + const TQChar * c = KviTQString::nullTerminatedArray(szFormat); if(c) { - while(c->unicode()) + while(c->tqunicode()) { //Check for right Characters #ifdef COMPILE_ON_WINDOWS - if (szAllowedCharacters.find((char)(c->unicode()),0,true) >= 0) tmpFormat += '%'; + if (szAllowedCharacters.tqfind((char)(c->tqunicode()),0,true) >= 0) tmpFormat += '%'; #else if (c->isLetter()) tmpFormat += '%'; #endif - tmpFormat += (char)(c->unicode()); + tmpFormat += (char)(c->tqunicode()); c++; } } @@ -804,7 +804,7 @@ namespace KviKvsCoreFunctions { KviStr tmp = buf; if(tmp.lastCharIs('\n'))tmp.cutRight(1); - KVSCF_pRetBuffer->setString(QString(buf)); + KVSCF_pRetBuffer->setString(TQString(buf)); } else { KVSCF_pContext->warning(__tr2qs("The specified format string wasn't accepted by the underlying system time formatting function")); } @@ -900,7 +900,7 @@ namespace KviKvsCoreFunctions KVSCF(features) { - QString szFeature; + TQString szFeature; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("test_feature",KVS_PT_STRING,KVS_PF_OPTIONAL,szFeature) KVSCF_PARAMETERS_END @@ -948,9 +948,9 @@ namespace KviKvsCoreFunctions "ScriptToolBar", #endif // COMPILE_SCRIPTTOOLBAR #ifdef COMPILE_USE_QT4 - "Qt4", + "TQt4", #else - "Qt3", + "TQt3", #endif #ifdef COMPILE_NEW_KVS "KVS", @@ -962,7 +962,7 @@ namespace KviKvsCoreFunctions { for(int i=0;feature_array[i];i++) { - if(KviQString::equalCI(feature_array[i],szFeature)) + if(KviTQString::equalCI(feature_array[i],szFeature)) { KVSCF_pRetBuffer->setBoolean(true); return true; @@ -972,7 +972,7 @@ namespace KviKvsCoreFunctions } else { KviKvsArray * a = new KviKvsArray(); int id = 0; - for(int i=0;feature_array[i];i++)a->set(i,new KviKvsVariant(QString(feature_array[i]))); + for(int i=0;feature_array[i];i++)a->set(i,new KviKvsVariant(TQString(feature_array[i]))); KVSCF_pRetBuffer->setArray(a); } @@ -1111,18 +1111,18 @@ namespace KviKvsCoreFunctions KVSCF(fmtlink) { - QString szLinkText,szCmd,szToolTip; + TQString szLinkText,szCmd,szToolTip; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("link_text",KVS_PT_NONEMPTYSTRING,0,szLinkText) KVSCF_PARAMETER("double_click_command",KVS_PT_STRING,0,szCmd) KVSCF_PARAMETER("tooltip_text",KVS_PT_STRING,KVS_PF_OPTIONAL,szToolTip) KVSCF_PARAMETERS_END - QString szPart; - KviQString::sprintf(szPart,"[!dbl]%Q",&szCmd); - if(!szToolTip.isEmpty())KviQString::appendFormatted(szPart,"[!txt]%Q",&szToolTip); - QString szLink; - KviQString::sprintf(szLink,"\r!%Q\r%Q\r",&szPart,&szLinkText); + TQString szPart; + KviTQString::sprintf(szPart,"[!dbl]%Q",&szCmd); + if(!szToolTip.isEmpty())KviTQString::appendFormatted(szPart,"[!txt]%Q",&szToolTip); + TQString szLink; + KviTQString::sprintf(szLink,"\r!%Q\r%Q\r",&szPart,&szLinkText); KVSCF_pRetBuffer->setString(szLink); return true; } diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp index ce8728d..4e9f3c7 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp @@ -41,7 +41,7 @@ #include "kvi_time.h" #include "kvi_kvs_eventmanager.h" #include "kvi_kvs_eventhandler.h" -#include <qregexp.h> +#include <tqregexp.h> #include "kvi_lagmeter.h" namespace KviKvsCoreFunctions @@ -88,7 +88,7 @@ namespace KviKvsCoreFunctions { KviKvsVariant * val = KVSCF_pParams->next(); if(!val)break; - QString sz; + TQString sz; key->asString(sz); a->set(sz,new KviKvsVariant(*val)); } @@ -122,7 +122,7 @@ namespace KviKvsCoreFunctions KVSCF(hexToAscii) { - QString szHex; + TQString szHex; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("hex_encoded_string",KVS_PT_STRING,0,szHex) KVSCF_PARAMETERS_END @@ -130,7 +130,7 @@ namespace KviKvsCoreFunctions KviStr tmp1(szHex); char * buf; int len = tmp1.hexToBuffer(&buf,true); - KVSCF_pRetBuffer->setString(QString(KviQCString(buf,len+1))); + KVSCF_pRetBuffer->setString(TQString(KviTQCString(buf,len+1))); KviStr::freeBuffer(buf); return true; } @@ -172,7 +172,7 @@ namespace KviKvsCoreFunctions KVSCF(hostname) { - QString szNick; + TQString szNick; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("nick",KVS_PT_NONEMPTYSTRING,0,szNick) @@ -182,7 +182,7 @@ namespace KviKvsCoreFunctions { if(KVSCF_pContext->window()->console()->isConnected()) { - KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->find(szNick); + KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->tqfind(szNick); if(e) { KVSCF_pRetBuffer->setString(e->host()); @@ -289,7 +289,7 @@ namespace KviKvsCoreFunctions KVSCF(icon) { - QString szName; + TQString szName; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("iconName",KVS_PT_NONEMPTYSTRING,0,szName) KVSCF_PARAMETERS_END @@ -511,7 +511,7 @@ namespace KviKvsCoreFunctions KVSCF(isEventEnabled) { - QString szEventName,szHandlerName; + TQString szEventName,szHandlerName; KviKvsScriptEventHandler *h=0; KVSCF_PARAMETERS_BEGIN @@ -635,7 +635,7 @@ namespace KviKvsCoreFunctions KVSCF(isTimer) { - QString szName; + TQString szName; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("timerName",KVS_PT_NONEMPTYSTRING,0,szName) @@ -668,7 +668,7 @@ namespace KviKvsCoreFunctions KVSCF(isWellKnown) { - QString szNick; + TQString szNick; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("nick",KVS_PT_NONEMPTYSTRING,0,szNick) @@ -678,7 +678,7 @@ namespace KviKvsCoreFunctions { if(KVSCF_pContext->window()->console()->isConnected()) { - KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->find(szNick); + KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->tqfind(szNick); if(e) { KVSCF_pRetBuffer->setBoolean(e->hasHost() && e->hasUser()); @@ -705,7 +705,7 @@ namespace KviKvsCoreFunctions <string> $k(<foreground:integer>[,<background:integer>]) <string> $k @description: - Returns the COLOR mIRC control character (Qt::CTRL+K).[br] + Returns the COLOR mIRC control character (TQt::CTRL+K).[br] If <foreground> and <background> are passed, a standard mIRC color escape is returned.[br] @seealso: @@ -720,12 +720,12 @@ namespace KviKvsCoreFunctions KVSCF_PARAMETER("background",KVS_PT_UINT,KVS_PF_OPTIONAL,iBack) KVSCF_PARAMETERS_END - QString szRet = QChar(KVI_TEXT_COLOR); + TQString szRet = TQChar(KVI_TEXT_COLOR); if(KVSCF_pParams->count() > 0) { - KviQString::appendFormatted(szRet,"%u",iFore); + KviTQString::appendFormatted(szRet,"%u",iFore); if(KVSCF_pParams->count() > 1) - KviQString::appendFormatted(szRet,",%u",iBack); + KviTQString::appendFormatted(szRet,",%u",iBack); } KVSCF_pRetBuffer->setString(szRet); return true; @@ -794,13 +794,13 @@ namespace KviKvsCoreFunctions KVSCF(lang) { - QString szType; + TQString szType; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("type",KVS_PT_NONEMPTYSTRING,KVS_PF_OPTIONAL,szType) KVSCF_PARAMETERS_END - QString szLocale(KviLocale::localeName().ptr()); + TQString szLocale(KviLocale::localeName().ptr()); if(szType=="lang") KVSCF_pRetBuffer->setString(szLocale.left(5)); else if(szType=="short") KVSCF_pRetBuffer->setString(szLocale.left(2)); else KVSCF_pRetBuffer->setString(szLocale); @@ -851,7 +851,7 @@ namespace KviKvsCoreFunctions break; default: { - QString tmp; + TQString tmp; pVar->asString(tmp); KVSCF_pRetBuffer->setInteger(tmp.length()); } @@ -880,7 +880,7 @@ namespace KviKvsCoreFunctions KVSCF(lf) { - KVSCF_pRetBuffer->setString(QString(QChar('\n'))); + KVSCF_pRetBuffer->setString(TQString(TQChar('\n'))); return true; } diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp index 6316f1d..d3d68ec 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp @@ -48,22 +48,22 @@ namespace KviKvsCoreFunctions /////////////////////////////////////////////////////////////////////////////////////////////// /* - @doc: mask + @doc: tqmask @type: function @title: - $mask + $tqmask @short: - Retrieves the host mask of a user + Retrieves the host tqmask of a user @syntax: - $mask[(<nickname>[,<mask_type>])] + $tqmask[(<nickname>[,<tqmask_type>])] @description: - Returns the specified type of mask for the user with <nickname>.[br] - If the host or username are not known, the mask may contain less information + Returns the specified type of tqmask for the user with <nickname>.[br] + If the host or username are not known, the tqmask may contain less information than requested.[br] If the <nickname> is not given it is assumed to be the current nickname.[br] - If <mask_type> is not given or is invalid, it is assumed to be 0.[br] - Available mask types:[br] + If <tqmask_type> is not given or is invalid, it is assumed to be 0.[br] + Available tqmask types:[br] 0 : nick!user@machine.host.top (nick!user@XXX.XXX.XXX.XXX) (default)[br] 1 : nick!user@*.abc.host.top (nick!user@XXX.XXX.XXX.*)[br] 2 : nick!user@*[br] @@ -92,33 +92,33 @@ namespace KviKvsCoreFunctions 25: nick!*user@*.host.top (nick!*user@XXX.XXX.*)[br] 26: *!*user@*.host.top (*!user@*XXX.XXX.*)[br] If some data is missing, these types may change:[br] - For example, if the hostname is missing, the mask type 3 or 4 may be reduced to type 5.[br] + For example, if the hostname is missing, the tqmask type 3 or 4 may be reduced to type 5.[br] If the user with <nickname> is not found in the current IRC context user database, an empty string is returned.[br] - The masks 22-26 are the smart versions of the masks 17-21 that try take care of masked ip addresses - in the form xxx.xxx.INVALID-TOP-MASK. If a masked ip address is found then - the XXX.XXX.* or XXX.* host mask is returned instead of the (wrong) *.INVALID-TOP-MASK + The tqmasks 22-26 are the smart versions of the tqmasks 17-21 that try take care of tqmasked ip addresses + in the form xxx.xxx.INVALID-TOP-MASK. If a tqmasked ip address is found then + the XXX.XXX.* or XXX.* host tqmask is returned instead of the (wrong) *.INVALID-TOP-MASK @examples: @seealso: */ - KVSCF(mask) + KVSCF(tqmask) { - QString szNick; - kvs_uint_t maskType; + TQString szNick; + kvs_uint_t tqmaskType; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("nickname",KVS_PT_STRING,KVS_PF_OPTIONAL,szNick) - KVSCF_PARAMETER("maskType",KVS_PT_UINT,KVS_PF_OPTIONAL,maskType) + KVSCF_PARAMETER("tqmaskType",KVS_PT_UINT,KVS_PF_OPTIONAL,tqmaskType) KVSCF_PARAMETERS_END - if(maskType > 26) maskType = 0; + if(tqmaskType > 26) tqmaskType = 0; if(KVSCF_pContext->window()->console()) { if(KVSCF_pContext->window()->console()->isConnected()) { - KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->find(szNick.isEmpty() ? KVSCF_pContext->window()->connection()->currentNickName() : szNick); + KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->tqfind(szNick.isEmpty() ? KVSCF_pContext->window()->connection()->currentNickName() : szNick); if(e) { KviIrcMask u; @@ -126,8 +126,8 @@ namespace KviKvsCoreFunctions u.setUsername(e->user()); u.setHost(e->host()); - QString tmp; - u.mask(tmp,(KviIrcMask::MaskType)maskType); + TQString tmp; + u.tqmask(tmp,(KviIrcMask::MaskType)tqmaskType); KVSCF_pRetBuffer->setString(tmp); return true; } @@ -228,7 +228,7 @@ namespace KviKvsCoreFunctions KVSCF(msgtype) { - QString szName; + TQString szName; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("msg_type_color_set_name",KVS_PT_NONEMPTYSTRING,0,szName) KVSCF_PARAMETERS_END @@ -257,12 +257,12 @@ namespace KviKvsCoreFunctions @short: Creates a new object @syntax: - $new(<className>,[<parentHandle> [,<name>[,<param>[,<param>[...]]]]) + $new(<className>,[<tqparentHandle> [,<name>[,<param>[,<param>[...]]]]) @description: Creates a new instance of the object <class> with - the parent object <parent_id> and the specified <name>.[br] - <name> and <parent_id> are optional: if not specified, <name> - is assumed to be an empty string and <parent_id> default to 0 (parentless object).[br] + the tqparent object <tqparent_id> and the specified <name>.[br] + <name> and <tqparent_id> are optional: if not specified, <name> + is assumed to be an empty string and <tqparent_id> default to 0 (tqparentless object).[br] Please see the [doc:objects]objects documentation[/doc] for more information.[br] @examples: [example] @@ -275,14 +275,14 @@ namespace KviKvsCoreFunctions KVSCF(newCKEYWORDWORKAROUND) { // prologue: parameter handling - QString szClassName; - QString szName; + TQString szClassName; + TQString szName; kvs_hobject_t hParent; KviKvsVariantList vList; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("className",KVS_PT_NONEMPTYSTRING,0,szClassName) - KVSCF_PARAMETER("parentHandle",KVS_PT_HOBJECT,KVS_PF_OPTIONAL,hParent) + KVSCF_PARAMETER("tqparentHandle",KVS_PT_HOBJECT,KVS_PF_OPTIONAL,hParent) KVSCF_PARAMETER("name",KVS_PT_STRING,KVS_PF_OPTIONAL,szName) KVSCF_PARAMETER("parameterList",KVS_PT_VARIANTLIST,KVS_PF_OPTIONAL,vList) KVSCF_PARAMETERS_END @@ -300,7 +300,7 @@ namespace KviKvsCoreFunctions pParent = KviKvsKernel::instance()->objectController()->lookupObject(hParent); if(!pParent) { - KVSCF_pContext->error(__tr2qs("The specified parent object does not exist")); + KVSCF_pContext->error(__tr2qs("The specified tqparent object does not exist")); return false; } } else { @@ -390,7 +390,7 @@ namespace KviKvsCoreFunctions KVSCF(o) { - KVSCF_pRetBuffer->setString(QString(QChar(KVI_TEXT_RESET))); + KVSCF_pRetBuffer->setString(TQString(TQChar(KVI_TEXT_RESET))); return true; } @@ -419,12 +419,12 @@ namespace KviKvsCoreFunctions KVSCF(option) { - QString szOpt; + TQString szOpt; // FIXME: This should return a variant in general KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("optionName",KVS_PT_NONEMPTYSTRING,0,szOpt) KVSCF_PARAMETERS_END - QString tmp; + TQString tmp; if(g_pApp->getOptionString(szOpt,tmp))KVSCF_pRetBuffer->setString(tmp); else { KVSCF_pContext->warning(__tr2qs("There is no option named '%Q'"),&szOpt); @@ -467,7 +467,7 @@ namespace KviKvsCoreFunctions KVSCF(query) { - QString szName; + TQString szName; kvs_uint_t uContextId; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("query_name",KVS_PT_NONEMPTYSTRING,KVS_PF_OPTIONAL,szName) @@ -496,7 +496,7 @@ namespace KviKvsCoreFunctions } } } else { - if(KVSCF_pContext->window()->type() == KVI_WINDOW_TYPE_QUERY)wnd = KVSCF_pContext->window(); + if(KVSCF_pContext->window()->type() == KVI_WINDOW_TYPE_TQUERY)wnd = KVSCF_pContext->window(); } KVSCF_pRetBuffer->setInteger((kvs_int_t)(wnd ? wnd->numericId() : 0)); @@ -523,7 +523,7 @@ namespace KviKvsCoreFunctions KVSCF(r) { - KVSCF_pRetBuffer->setString(QString(QChar(KVI_TEXT_REVERSE))); + KVSCF_pRetBuffer->setString(TQString(TQChar(KVI_TEXT_REVERSE))); return true; } diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp index 64b16c0..8b4ef73 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp @@ -73,7 +73,7 @@ namespace KviKvsCoreFunctions { ///////////////////////////////////////////////////////////////////////////////////////// - // FIXME: #warning "THIS HAS TO WORK FOR QUERIES TOO!" + // FIXME: #warning "THIS HAS TO WORK FOR TQUERIES TOO!" /* @doc: selected @type: @@ -106,7 +106,7 @@ namespace KviKvsCoreFunctions KVSCF(selected) { - QString winId; + TQString winId; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("winId",KVS_PT_NONEMPTYSTRING,KVS_PF_OPTIONAL,winId) KVSCF_PARAMETERS_END @@ -135,7 +135,7 @@ namespace KviKvsCoreFunctions KviKvsArray * a = new KviKvsArray(); kvs_int_t i = 0; - for(QString * s = ((KviChannel *)wnd)->firstSelectedNickname();s;s = ((KviChannel *)wnd)->nextSelectedNickname()) + for(TQString * s = ((KviChannel *)wnd)->firstSelectedNickname();s;s = ((KviChannel *)wnd)->nextSelectedNickname()) { a->set(i,new KviKvsVariant(*s)); i++; @@ -187,7 +187,7 @@ namespace KviKvsCoreFunctions KVSCF(serialize) { KviKvsVariant *pVar = 0; - QString szBuffer; + TQString szBuffer; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("data",KVS_PT_VARIANT,0,pVar) @@ -332,7 +332,7 @@ namespace KviKvsCoreFunctions KVSCF_PARAMETER("data",KVS_PT_VARIANT,0,v) KVSCF_PARAMETERS_END - QString szVal; + TQString szVal; v->asString(szVal); KVSCF_pRetBuffer->setString(szVal); return true; @@ -378,8 +378,8 @@ namespace KviKvsCoreFunctions KVSCF(sw) { - QString szSwitch; - QString szLongSwitch; + TQString szSwitch; + TQString szLongSwitch; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("switch_name",KVS_PT_STRING,0,szSwitch) @@ -399,14 +399,14 @@ namespace KviKvsCoreFunctions if(szSwitch.length() > 1) { if(szLongSwitch.isEmpty()) - v = sl->find(szSwitch); + v = sl->tqfind(szSwitch); else - v = sl->find(szSwitch[0].unicode(),szLongSwitch); + v = sl->tqfind(szSwitch[0].tqunicode(),szLongSwitch); }else { if(szLongSwitch.isEmpty()) - v = sl->find(szSwitch[0]); + v = sl->tqfind(szSwitch[0]); else - v = sl->find(szSwitch[0].unicode(),szLongSwitch); + v = sl->tqfind(szSwitch[0].tqunicode(),szLongSwitch); } if(v)KVSCF_pRetBuffer->copyFrom(*v); @@ -450,7 +450,7 @@ namespace KviKvsCoreFunctions KVSCF(target) { - QString winId; + TQString winId; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("winId",KVS_PT_NONEMPTYSTRING,KVS_PF_OPTIONAL,winId) KVSCF_PARAMETERS_END @@ -470,7 +470,7 @@ namespace KviKvsCoreFunctions } //debug("CALLING $target on window %s",wnd->name()); - QString szTa = wnd->target(); + TQString szTa = wnd->target(); KVSCF_pRetBuffer->setString(wnd->target()); @@ -689,8 +689,8 @@ namespace KviKvsCoreFunctions KVSCF(tr) { // prologue: parameter handling - QString szString; - QString szCatalogue; + TQString szString; + TQString szCatalogue; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("default_language_string",KVS_PT_STRING,0,szString) @@ -698,17 +698,17 @@ namespace KviKvsCoreFunctions KVSCF_PARAMETERS_END if(szString.isEmpty()) return true; // body: the real job - QString translation; + TQString translation; if(!szCatalogue.isEmpty()) { KviMessageCatalogue * pCat = KviLocale::getLoadedCatalogue(szCatalogue); if(pCat) { - translation = pCat->translateToQString(szString); + translation = pCat->translateToTQString(szString); } else { // attempt to load it automatically - QString szDir; + TQString szDir; g_pApp->getLocalKvircDirectory(szDir,KviApp::Locale); if(!KviLocale::loadCatalogue(szCatalogue,szDir)) { @@ -808,7 +808,7 @@ namespace KviKvsCoreFunctions KVSCF_PARAMETER("data",KVS_PT_VARIANT,0,v) KVSCF_PARAMETERS_END - QString szType; + TQString szType; v->getTypeName(szType); KVSCF_pRetBuffer->setString(szType); #endif @@ -835,22 +835,22 @@ namespace KviKvsCoreFunctions KVSCF(u) { - KVSCF_pRetBuffer->setString(QString(QChar(KVI_TEXT_UNDERLINE))); + KVSCF_pRetBuffer->setString(TQString(TQChar(KVI_TEXT_UNDERLINE))); return true; } ///////////////////////////////////////////////////////////////////////////////////////// /* - @doc: unicode + @doc: tqunicode @type: function @title: - $unicode + $tqunicode @short: Returns the UNICODE code of a sets of characters @syntax: - <variant> $unicode(<char:string>) + <variant> $tqunicode(<char:string>) @description: If <char> is composed only of a single character then returns its UNICODE code point as an integer. @@ -860,9 +860,9 @@ namespace KviKvsCoreFunctions [fnc]$cr[/fnc], [fnc]$lf[/fnc], [fnc]$char[/fnc] */ - KVSCF(unicode) + KVSCF(tqunicode) { - QString sz; + TQString sz; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("char",KVS_PT_NONEMPTYSTRING,0,sz) KVSCF_PARAMETERS_END @@ -871,10 +871,10 @@ namespace KviKvsCoreFunctions { KviKvsArray * a = new KviKvsArray(); for(kvs_int_t i=0;i<sz.length();i++) - a->set(i,new KviKvsVariant((kvs_int_t)(sz[(int)i].unicode()))); + a->set(i,new KviKvsVariant((kvs_int_t)(sz[(int)i].tqunicode()))); KVSCF_pRetBuffer->setArray(a); } else { - KVSCF_pRetBuffer->setInteger((kvs_int_t)(sz[0].unicode())); + KVSCF_pRetBuffer->setInteger((kvs_int_t)(sz[0].tqunicode())); } return true; } @@ -922,7 +922,7 @@ namespace KviKvsCoreFunctions KVSCF(unserialize) { - QString szData; + TQString szData; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("data",KVS_PT_NONEMPTYSTRING,0,szData) @@ -971,7 +971,7 @@ namespace KviKvsCoreFunctions KVSCF(username) { - QString szNick; + TQString szNick; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("nick",KVS_PT_NONEMPTYSTRING,0,szNick) @@ -981,7 +981,7 @@ namespace KviKvsCoreFunctions { if(KVSCF_pContext->window()->console()->isConnected()) { - KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->find(szNick); + KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->tqfind(szNick); if(e) { KVSCF_pRetBuffer->setString(e->user()); @@ -1027,7 +1027,7 @@ namespace KviKvsCoreFunctions KVSCF(version) { - QString szType; + TQString szType; KVSCF_PARAMETERS_BEGIN KVSCF_PARAMETER("type",KVS_PT_STRING,KVS_PF_OPTIONAL,szType) KVSCF_PARAMETERS_END @@ -1035,9 +1035,9 @@ namespace KviKvsCoreFunctions if(szType.isEmpty()) KVSCF_pRetBuffer->setString(KVI_VERSION); else { - if(szType.find('r') != -1)KVSCF_pRetBuffer->setString(KVI_RELEASE_NAME); - else if(szType.find('s') != -1)KVSCF_pRetBuffer->setString(KVI_SOURCES_DATE); - else if(szType.find('b') != -1)KVSCF_pRetBuffer->setString(KVI_BUILD_DATE); + if(szType.tqfind('r') != -1)KVSCF_pRetBuffer->setString(KVI_RELEASE_NAME); + else if(szType.tqfind('s') != -1)KVSCF_pRetBuffer->setString(KVI_SOURCES_DATE); + else if(szType.tqfind('b') != -1)KVSCF_pRetBuffer->setString(KVI_BUILD_DATE); else KVSCF_pRetBuffer->setString(KVI_VERSION); } return true; @@ -1078,7 +1078,7 @@ namespace KviKvsCoreFunctions KVSCF(window) { //#warning "FIXME: the window identifiers could be numbers!" - QString szCaption; + TQString szCaption; kvs_int_t iContextId; // kvs_int_t is 64bit while int is 32 (and thus KVSCF_PARAMETER() crashes) KVSCF_PARAMETERS_BEGIN diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp index a597963..97a669f 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp @@ -34,8 +34,8 @@ #include "kvi_locale.h" #include "kvi_kvs_treenode_command.h" -#include <qregexp.h> -#include <qstringlist.h> +#include <tqregexp.h> +#include <tqstringlist.h> namespace KviKvsCoreSimpleCommands { @@ -47,7 +47,7 @@ namespace KviKvsCoreSimpleCommands { \ KviKvsCoreSimpleCommandExecRoutine * r = new KviKvsCoreSimpleCommandExecRoutine; \ r->proc = KVI_PTR2MEMBER(KviKvsCoreSimpleCommands::__routine); \ - pKern->registerCoreSimpleCommandExecRoutine(QString(__cmdName),r); \ + pKern->registerCoreSimpleCommandExecRoutine(TQString(__cmdName),r); \ } // a_f _REGCMD("admin",rfc2812wrapper) @@ -141,12 +141,12 @@ namespace KviKvsCoreSimpleCommands bool multipleModeCommand(KviKvsRunTimeContext * __pContext,KviKvsVariantList * __pParams,KviKvsSwitchList * __pSwitches,char plusminus,char flag) { - QString szTokens; + TQString szTokens; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("tokens",KVS_PT_STRING,KVS_PF_APPENDREMAINING,szTokens) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION if(KVSCSC_pWindow->type() != KVI_WINDOW_TYPE_CHANNEL) { @@ -154,16 +154,16 @@ namespace KviKvsCoreSimpleCommands return true; } - QStringList sl = QStringList::split(QRegExp("[, ]+"),szTokens,false); + TQStringList sl = TQStringList::split(TQRegExp("[, ]+"),szTokens,false); - KviQCString szFlags; - KviQCString szTarget = KVSCSC_pConnection->encodeText(KVSCSC_pWindow->windowName()); - KviQCString szMessage; + KviTQCString szFlags; + KviTQCString szTarget = KVSCSC_pConnection->encodeText(KVSCSC_pWindow->windowName()); + KviTQCString szMessage; int i = 0; - for(QStringList::Iterator it = sl.begin();it != sl.end();++it) + for(TQStringList::Iterator it = sl.begin();it != sl.end();++it) { - KviQCString szTxt = KVSCSC_pConnection->encodeText(*it); + KviTQCString szTxt = KVSCSC_pConnection->encodeText(*it); if(!szTxt.isEmpty()) { szFlags += flag; @@ -217,15 +217,15 @@ namespace KviKvsCoreSimpleCommands KVSCSC(rfc2812wrapper) { - QString szText; + TQString szText; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("text",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szText) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION - KviQCString txt = KVSCSC_pConnection->encodeText(szText); - KviQCString cmd = KVSCSC_pConnection->encodeText(((KviKvsTreeNodeCommand *)(KVSCSC_pContext->defaultReportLocation()))->commandName()); + KviTQCString txt = KVSCSC_pConnection->encodeText(szText); + KviTQCString cmd = KVSCSC_pConnection->encodeText(((KviKvsTreeNodeCommand *)(KVSCSC_pContext->defaultReportLocation()))->commandName()); if(!KVSCSC_pConnection->sendFmtData("%s %s",cmd.data(),txt.data() ? txt.data() : "")) return KVSCSC_pContext->warningNoIrcConnection(); diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands.h b/src/kvirc/kvs/kvi_kvs_coresimplecommands.h index 94acbdc..9c773a9 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands.h +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands.h @@ -46,7 +46,7 @@ KVS_PARAMETERS_END \ if(!KviKvsParameterProcessor::process(KVSCSC_pParams,KVSCSC_pContext,parameter_format_list))return false; -#define KVSCSC_REQUIRE_CONNECTION \ +#define KVSCSC_RETQUIRE_CONNECTION \ if(!KVSCSC_pContext->window()->context())return KVSCSC_pContext->errorNoIrcContext(); \ if(!KVSCSC_pContext->window()->connection())return KVSCSC_pContext->warningNoIrcConnection(); diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp index c3911a3..cf86ed6 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp @@ -48,7 +48,7 @@ #include <unistd.h> // for usleep(); #ifdef COMPILE_USE_QT4 - #include <qx11info_x11.h> + #include <tqx11info_x11.h> #define get_xdisplay QX11Info::display #else #define get_xdisplay qt_xdisplay @@ -113,16 +113,16 @@ namespace KviKvsCoreSimpleCommands KVSCSC(away) { - QString szReason; + TQString szReason; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("reason",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szReason) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION if(szReason.isEmpty())szReason = KVI_OPTION_STRING(KviOption_stringAwayMessage); - if(KVSCSC_pSwitches->find('a',"all-networks")) + if(KVSCSC_pSwitches->tqfind('a',"all-networks")) { KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) @@ -138,7 +138,7 @@ namespace KviKvsCoreSimpleCommands ++it; } } else { - KviQCString szR = KVSCSC_pConnection->encodeText(szReason); + KviTQCString szR = KVSCSC_pConnection->encodeText(szReason); if(!(KVSCSC_pConnection->sendFmtData("AWAY :%s",szR.data()))) return KVSCSC_pContext->warningNoIrcConnection(); } @@ -176,7 +176,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(back) { - if(KVSCSC_pSwitches->find('a',"all-networks")) + if(KVSCSC_pSwitches->tqfind('a',"all-networks")) { KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) @@ -190,7 +190,7 @@ namespace KviKvsCoreSimpleCommands ++it; } } else { - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION if(!(KVSCSC_pConnection->sendFmtData("AWAY"))) return KVSCSC_pContext->warningNoIrcConnection(); @@ -208,11 +208,11 @@ namespace KviKvsCoreSimpleCommands @title: ban @syntax: - ban <mask_list> + ban <tqmask_list> @short: - Sets ban masks for the channel + Sets ban tqmasks for the channel @description: - Sets the ban masks specified in the <mask_list>, + Sets the ban tqmasks specified in the <tqmask_list>, which is a comma separated list of nicknames. This command works only if executed in a channel window. The command is translated to a set of MODE messages containing @@ -291,10 +291,10 @@ namespace KviKvsCoreSimpleCommands kvs_int_t pitch = -1; kvs_int_t duration = -1; - bool bSync = (KVSCSC_pSwitches->find('s',"sync") != 0); + bool bSync = (KVSCSC_pSwitches->tqfind('s',"sync") != 0); bool bOk = false; - KviKvsVariant * pPitch = KVSCSC_pSwitches->find('p',"pitch"); + KviKvsVariant * pPitch = KVSCSC_pSwitches->tqfind('p',"pitch"); if(pPitch) { if(!pPitch->asInteger(pitch)) @@ -304,7 +304,7 @@ namespace KviKvsCoreSimpleCommands } } - KviKvsVariant * pDuration = KVSCSC_pSwitches->find('d',"duration"); + KviKvsVariant * pDuration = KVSCSC_pSwitches->tqfind('d',"duration"); if(pDuration) { if(!pDuration->asInteger(duration)) @@ -328,19 +328,19 @@ namespace KviKvsCoreSimpleCommands XGetKeyboardControl(get_xdisplay(),&st); - unsigned long mask = KBBellPercent; + unsigned long tqmask = KBBellPercent; ctl.bell_percent = uVolume; if(pitch >= 0) { ctl.bell_pitch = pitch; - mask |= KBBellPitch; + tqmask |= KBBellPitch; } if(duration >= 0) { ctl.bell_duration = duration; - mask |= KBBellDuration; + tqmask |= KBBellDuration; } - XChangeKeyboardControl(get_xdisplay(),mask,&ctl); + XChangeKeyboardControl(get_xdisplay(),tqmask,&ctl); XBell(get_xdisplay(),100); @@ -354,7 +354,7 @@ namespace KviKvsCoreSimpleCommands ctl.bell_duration = st.bell_duration; ctl.bell_percent = st.bell_percent; - XChangeKeyboardControl(get_xdisplay(),mask,&ctl); + XChangeKeyboardControl(get_xdisplay(),tqmask,&ctl); #endif //COMPILE_NO_X_BELL #endif @@ -398,7 +398,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(buttonctl) { - QString tbTypeUnused,tbName,tbOp,tbPar; + TQString tbTypeUnused,tbName,tbOp,tbPar; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("type",KVS_PT_STRING,0,tbTypeUnused) KVSCSC_PARAMETER("name",KVS_PT_STRING,0,tbName) @@ -410,7 +410,7 @@ namespace KviKvsCoreSimpleCommands if(!KVSCSC_pWindow->buttonContainer()) { - if(!KVSCSC_pSwitches->find('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("The specified window has no button containers")); + if(!KVSCSC_pSwitches->tqfind('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("The specified window has no button containers")); return true; } @@ -418,16 +418,16 @@ namespace KviKvsCoreSimpleCommands if(!pButton) { - if(!KVSCSC_pSwitches->find('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("No button with type %Q named %Q"),&tbTypeUnused,&tbName); + if(!KVSCSC_pSwitches->tqfind('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("No button with type %Q named %Q"),&tbTypeUnused,&tbName); return true; } - QChar o; + TQChar o; if (tbOp.length() > 0) o=tbOp[0]; - else o=QChar('x'); + else o=TQChar('x'); - // QChar o = tbOp.length() > 0 ? tbOp[0] : QChar('x'); + // TQChar o = tbOp.length() > 0 ? tbOp[0] : TQChar('x'); - switch(o.unicode()) + switch(o.tqunicode()) { case 't': KviTalToolTip::remove(pButton); @@ -437,12 +437,12 @@ namespace KviKvsCoreSimpleCommands case 'i': if(!tbPar.isEmpty()) { - QPixmap * pix = g_pIconManager->getImage(tbPar); + TQPixmap * pix = g_pIconManager->getImage(tbPar); if(pix) { pButton->setButtonPixmap(*pix); } else { - if(!KVSCSC_pSwitches->find('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("Can't find the icon '%Q'"),&tbPar); + if(!KVSCSC_pSwitches->tqfind('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("Can't find the icon '%Q'"),&tbPar); } } break; @@ -508,26 +508,26 @@ namespace KviKvsCoreSimpleCommands KVSCSC(ctcp) { - QString szTarget,szCtcpData; + TQString szTarget,szCtcpData; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("target",KVS_PT_NONEMPTYSTRING,0,szTarget) KVSCSC_PARAMETER("ctcp_data",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szCtcpData) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION - if(KviQString::equalCI(szCtcpData,"PING")) + if(KviTQString::equalCI(szCtcpData,"PING")) { struct timeval tv; kvi_gettimeofday(&tv,0); - KviQString::appendFormatted(szCtcpData," %d.%d",tv.tv_sec,tv.tv_usec); + KviTQString::appendFormatted(szCtcpData," %d.%d",tv.tv_sec,tv.tv_usec); } - KviQCString szT = KVSCSC_pConnection->encodeText(szTarget); - KviQCString szD = KVSCSC_pConnection->encodeText(szCtcpData); + KviTQCString szT = KVSCSC_pConnection->encodeText(szTarget); + KviTQCString szD = KVSCSC_pConnection->encodeText(szCtcpData); if(!(KVSCSC_pConnection->sendFmtData("%s %s :%c%s%c", - KVSCSC_pSwitches->find('n',"notice") ? "NOTICE" : "PRIVMSG",szT.data(),0x01,szD.data(),0x01))) + KVSCSC_pSwitches->tqfind('n',"notice") ? "NOTICE" : "PRIVMSG",szT.data(),0x01,szD.data(),0x01))) return KVSCSC_pContext->warningNoIrcConnection(); return true; @@ -553,7 +553,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(debug) { - QString szAll; + TQString szAll; KVSCSC_pParams->allAsString(szAll); KviWindow * pWnd = KviDebugWindow::getInstance(); pWnd->outputNoFmt(KVI_OUT_NONE,szAll); @@ -628,16 +628,16 @@ namespace KviKvsCoreSimpleCommands KVSCSC_PARAMETERS_END if(hObject == (kvs_hobject_t)0) { - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("Can't delete a null object reference")); } else { KviKvsObject * o = KviKvsKernel::instance()->objectController()->lookupObject(hObject); if(!o) { - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("Can't delete an inexisting object")); } else { - if(KVSCSC_pSwitches->find('i',"immediate")) + if(KVSCSC_pSwitches->tqfind('i',"immediate")) o->dieNow(); else o->die(); @@ -679,7 +679,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(delpopupitem) { - QString szPopupName,szItemId; + TQString szPopupName,szItemId; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("popupname",KVS_PT_NONEMPTYSTRING,0,szPopupName) KVSCSC_PARAMETER("item_id",KVS_PT_NONEMPTYSTRING,0,szItemId) @@ -688,7 +688,7 @@ namespace KviKvsCoreSimpleCommands KviKvsPopupMenu * p = KviKvsPopupManager::instance()->lookup(szPopupName); if(!p) { - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("Inexisting popup \"%Q\""),&szPopupName); return true; } @@ -699,9 +699,9 @@ namespace KviKvsCoreSimpleCommands return false; } - if(!p->removeItemByName(szItemId,KVSCSC_pSwitches->find('d',"deep"))) + if(!p->removeItemByName(szItemId,KVSCSC_pSwitches->tqfind('d',"deep"))) { - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("The menu item with id \"%Q\" does not exist in popup \"%Q\""),&szItemId,&szPopupName); } @@ -840,7 +840,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(echo) { - QString szAll; + TQString szAll; KVSCSC_pParams->allAsString(szAll); kvs_int_t iMsgType = KVI_OUT_NONE; @@ -849,11 +849,11 @@ namespace KviKvsCoreSimpleCommands if(!KVSCSC_pSwitches->isEmpty()) { KviKvsVariant * v; - if((v = KVSCSC_pSwitches->find('w',"window"))) + if((v = KVSCSC_pSwitches->tqfind('w',"window"))) { - QString szWnd; + TQString szWnd; v->asString(szWnd); - //#warning "FIXME: the window database is not unicode! (we even could keep integer window id's at this point!)" + //#warning "FIXME: the window database is not tqunicode! (we even could keep integer window id's at this point!)" pWnd = g_pApp->findWindow(szWnd.utf8().data()); if(!pWnd) { @@ -862,7 +862,7 @@ namespace KviKvsCoreSimpleCommands } } - if((v = KVSCSC_pSwitches->find('i',"icon"))) + if((v = KVSCSC_pSwitches->tqfind('i',"icon"))) { if(!v->asInteger(iMsgType)) { @@ -873,13 +873,13 @@ namespace KviKvsCoreSimpleCommands } } - if(KVSCSC_pSwitches->find('d',"debug")) + if(KVSCSC_pSwitches->tqfind('d',"debug")) { pWnd = KviDebugWindow::getInstance(); } } - int iFlags = KVSCSC_pSwitches->find('n',"no-timestamp") ? KviIrcView::NoTimestamp : 0; + int iFlags = KVSCSC_pSwitches->tqfind('n',"no-timestamp") ? KviIrcView::NoTimestamp : 0; pWnd->outputNoFmt(iMsgType,szAll,iFlags); return true; } @@ -956,7 +956,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(echoprivmsg) { - QString szNick,szUser,szHost,szText; + TQString szNick,szUser,szHost,szText; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("nick",KVS_PT_NONEMPTYSTRING,0,szNick) KVSCSC_PARAMETER("user",KVS_PT_STRING,0,szUser) @@ -971,7 +971,7 @@ namespace KviKvsCoreSimpleCommands KviKvsVariant * v; - if(v = KVSCSC_pSwitches->find('i',"color-set")) + if(v = KVSCSC_pSwitches->tqfind('i',"color-set")) { kvs_int_t msgType; if(v->asInteger(msgType)) @@ -981,9 +981,9 @@ namespace KviKvsCoreSimpleCommands } else KVSCSC_pContext->warning(__tr2qs("Invalid color-set specification, using default")); } - if(v = KVSCSC_pSwitches->find('w',"window")) + if(v = KVSCSC_pSwitches->tqfind('w',"window")) { - QString szWin; + TQString szWin; v->asString(szWin); KviStr window = szWin; pWnd = g_pApp->findWindow(window.ptr()); @@ -994,30 +994,30 @@ namespace KviKvsCoreSimpleCommands } } - QString szPrefix,szSuffix; + TQString szPrefix,szSuffix; bool bPrefix = false; bool bSuffix = false; - if(v = KVSCSC_pSwitches->find('p',"prefix")) + if(v = KVSCSC_pSwitches->tqfind('p',"prefix")) { v->asString(szPrefix); bPrefix = true; } - if(v = KVSCSC_pSwitches->find('s',"suffix")) + if(v = KVSCSC_pSwitches->tqfind('s',"suffix")) { v->asString(szSuffix); bSuffix = true; } int iFlags = 0; - if(KVSCSC_pSwitches->find('n',"no-highlighting"))iFlags |= KviConsole::NoHighlighting; - if(KVSCSC_pSwitches->find('f',"no-flashing"))iFlags |= KviConsole::NoWindowFlashing; - if(KVSCSC_pSwitches->find('x',"no-notifier"))iFlags |= KviConsole::NoNotifier; + if(KVSCSC_pSwitches->tqfind('n',"no-highlighting"))iFlags |= KviConsole::NoHighlighting; + if(KVSCSC_pSwitches->tqfind('f',"no-flashing"))iFlags |= KviConsole::NoWindowFlashing; + if(KVSCSC_pSwitches->tqfind('x',"no-notifier"))iFlags |= KviConsole::NoNotifier; pConsole->outputPrivmsg(pWnd,type, szNick,szUser,szHost,szText, iFlags, - bPrefix ? szPrefix : QString::null,bSuffix ? szSuffix : QString::null); + bPrefix ? szPrefix : TQString(),bSuffix ? szSuffix : TQString()); return true; } @@ -1044,7 +1044,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(error) { #ifdef COMPILE_NEW_KVS - QString szAll; + TQString szAll; KVSCSC_pParams->allAsString(szAll); KVSCSC_pContext->error("%Q",&szAll); #endif @@ -1114,19 +1114,19 @@ namespace KviKvsCoreSimpleCommands KVSCSC(eval) { - QString szCommands; + TQString szCommands; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("commands",KVS_PT_STRING,KVS_PF_APPENDREMAINING,szCommands) KVSCSC_PARAMETERS_END KviKvsScript s("eval::inner",szCommands); int iRunFlags = 0; - if(KVSCSC_pContext->reportingDisabled() || KVSCSC_pSwitches->find('q',"quiet")) + if(KVSCSC_pContext->reportingDisabled() || KVSCSC_pSwitches->tqfind('q',"quiet")) iRunFlags |= KviKvsScript::Quiet; bool bRet = s.run(KVSCSC_pContext,iRunFlags) ? true : false; if(!bRet) { - if(!KVSCSC_pSwitches->find('f',"force")) + if(!KVSCSC_pSwitches->tqfind('f',"force")) return false; KVSCSC_pContext->clearError(); } @@ -1169,7 +1169,7 @@ namespace KviKvsCoreSimpleCommands */ KVSCSC(eventctl) { - QString szEventName,szHandlerName; + TQString szEventName,szHandlerName; KviKvsVariantList vList; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("event_name",KVS_PT_NONEMPTYSTRING,0,szEventName) @@ -1185,7 +1185,7 @@ namespace KviKvsCoreSimpleCommands { if(!KviKvsEventManager::instance()->isValidRawEvent(iNumber)) { - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("No such event (%Q)"),&szEventName); return true; } @@ -1193,42 +1193,42 @@ namespace KviKvsCoreSimpleCommands iNumber = KviKvsEventManager::instance()->findAppEventIndexByName(szEventName); if(!KviKvsEventManager::instance()->isValidAppEvent(iNumber)) { - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("No such event (%Q)"),&szEventName); return true; } } - if(KVSCSC_pSwitches->find('u',"unregister")) + if(KVSCSC_pSwitches->tqfind('u',"unregister")) { // unregister it if(bIsRaw) { if(!KviKvsEventManager::instance()->removeScriptRawHandler(iNumber,szHandlerName)) - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("No handler '%Q' for raw numeric event '%d'"),&szHandlerName,iNumber); } else { if(!KviKvsEventManager::instance()->removeScriptAppHandler(iNumber,szHandlerName)) - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("No handler '%Q' for event '%Q'"),&szHandlerName,&szEventName); } - } else if(KVSCSC_pSwitches->find('e',"enable") || KVSCSC_pSwitches->find('d',"disable")) + } else if(KVSCSC_pSwitches->tqfind('e',"enable") || KVSCSC_pSwitches->tqfind('d',"disable")) { // enable it if(bIsRaw) { - if(!KviKvsEventManager::instance()->enableScriptRawHandler(iNumber,szHandlerName,KVSCSC_pSwitches->find('e',"enable"))) - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KviKvsEventManager::instance()->enableScriptRawHandler(iNumber,szHandlerName,KVSCSC_pSwitches->tqfind('e',"enable"))) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("No handler '%Q' for raw numeric event '%d'"),&szHandlerName,iNumber); } else { - if(!KviKvsEventManager::instance()->enableScriptAppHandler(iNumber,szHandlerName,KVSCSC_pSwitches->find('e',"enable"))) - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KviKvsEventManager::instance()->enableScriptAppHandler(iNumber,szHandlerName,KVSCSC_pSwitches->tqfind('e',"enable"))) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("No handler '%Q' for event '%Q'"),&szHandlerName,&szEventName); } } else { // trigger it KviKvsScriptEventHandler * h; - QString code; + TQString code; if(bIsRaw) { @@ -1244,7 +1244,7 @@ namespace KviKvsCoreSimpleCommands KviKvsVariant retVal; copy.run(KVSCSC_pWindow,&vList,0,KviKvsScript::PreserveParams); } else { - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("No handler '%Q' for event '%Q'"),&szHandlerName,&szEventName); } } diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp index a43a33c..43222d4 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp @@ -38,7 +38,7 @@ #include "kvi_out.h" #ifdef COMPILE_USE_QT4 - #include <q3mimefactory.h> + #include <tq3mimefactory.h> #endif namespace KviKvsCoreSimpleCommands @@ -94,16 +94,16 @@ namespace KviKvsCoreSimpleCommands help run help help help index - help $mask + help $tqmask help /home/pragma/myfile.html [/example] */ - static bool file_in_path(QStringList &pathlist,QString &file) + static bool file_in_path(TQStringList &pathlist,TQString &file) { - for(QStringList::Iterator it = pathlist.begin();it != pathlist.end();++it) + for(TQStringList::Iterator it = pathlist.begin();it != pathlist.end();++it) { - QString tmp = *it; + TQString tmp = *it; tmp.append('/'); tmp.append(file); KviFileUtils::adjustFilePath(tmp); @@ -114,7 +114,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(help) { - QString szTopic; + TQString szTopic; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("topic",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szTopic) KVSCSC_PARAMETERS_END @@ -126,23 +126,23 @@ namespace KviKvsCoreSimpleCommands szTopic.stripWhiteSpace(); } - QString szCommand; + TQString szCommand; if(szTopic.isEmpty())szCommand = "help.open index.html"; else { bool bWasFunc = false; - if(szTopic[0] == QChar('$')) + if(szTopic[0] == TQChar('$')) { bWasFunc = true; szTopic.remove(0,1); } - QString szOriginal = szTopic; + TQString szOriginal = szTopic; - QString topik = szTopic; + TQString topik = szTopic; #ifdef COMPILE_USE_QT4 - QStringList pl = Q3MimeSourceFactory::defaultFactory()->filePath(); + TQStringList pl = Q3MimeSourceFactory::defaultFactory()->filePath(); #else - QStringList pl = QMimeSourceFactory::defaultFactory()->filePath(); + TQStringList pl = TQMimeSourceFactory::defaultFactory()->filePath(); #endif bool bLowCaseTried = false; @@ -285,14 +285,14 @@ try_again: KVSCSC(host) { - QString szQuery; + TQString szQuery; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("dnsquery",KVS_PT_NONEMPTYSTRING,0,szQuery) KVSCSC_PARAMETERS_END KviDns::QueryType queryType = KviDns::IpV4; - if(KVSCSC_pSwitches->find('i',"ipv6"))queryType = KviDns::IpV6; - if(KVSCSC_pSwitches->find('a',"any"))queryType = KviDns::Any; + if(KVSCSC_pSwitches->tqfind('i',"ipv6"))queryType = KviDns::IpV6; + if(KVSCSC_pSwitches->tqfind('a',"any"))queryType = KviDns::Any; KviKvsAsyncDnsOperation * op = new KviKvsAsyncDnsOperation( KVSCSC_pContext->window(), @@ -383,24 +383,24 @@ try_again: KVSCSC(join) { - QString szChans,szKeys; + TQString szChans,szKeys; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("chans",KVS_PT_NONEMPTYSTRING,0,szChans) KVSCSC_PARAMETER("keys",KVS_PT_STRING,KVS_PF_OPTIONAL,szKeys) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION - QStringList slChans = QStringList::split(",",szChans); + TQStringList slChans = TQStringList::split(",",szChans); - QString szChanTypes = KVSCSC_pConnection->serverInfo()->supportedChannelTypes(); - for(QStringList::Iterator it=slChans.begin();it != slChans.end();++it) + TQString szChanTypes = KVSCSC_pConnection->serverInfo()->supportedChannelTypes(); + for(TQStringList::Iterator it=slChans.begin();it != slChans.end();++it) { if(!(*it).isEmpty()) { bool bFound = false; int id = 0; - QChar f = (*it)[0]; + TQChar f = (*it)[0]; while((id < szChanTypes.length()) && !bFound) { if(f == szChanTypes[id])bFound = true; @@ -412,14 +412,14 @@ try_again: } szChans = slChans.join(","); - KviQCString szEncodedChans = KVSCSC_pConnection->encodeText(szChans); + KviTQCString szEncodedChans = KVSCSC_pConnection->encodeText(szChans); if(szKeys.isEmpty()) { if(!(KVSCSC_pConnection->sendFmtData("JOIN %s",szEncodedChans.data()))) return KVSCSC_pContext->warningNoIrcConnection(); } else { - KviQCString szEncodedKeys = KVSCSC_pConnection->encodeText(szKeys); + KviTQCString szEncodedKeys = KVSCSC_pConnection->encodeText(szKeys); if(!(KVSCSC_pConnection->sendFmtData("JOIN %s %s",szEncodedChans.data(),szEncodedKeys.data()))) return KVSCSC_pContext->warningNoIrcConnection(); } @@ -451,14 +451,14 @@ try_again: KVSCSC(kick) { - QString szUser; - QString szReason; + TQString szUser; + TQString szReason; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("user",KVS_PT_NONEMPTYSTRING,0,szUser) KVSCSC_PARAMETER("reason",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szReason) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION if(KVSCSC_pWindow->type() != KVI_WINDOW_TYPE_CHANNEL) { @@ -466,9 +466,9 @@ try_again: return false; } - KviQCString szC = KVSCSC_pConnection->encodeText(KVSCSC_pWindow->target()); - KviQCString szU = KVSCSC_pConnection->encodeText(szUser); - KviQCString szR = KVSCSC_pConnection->encodeText(szReason); + KviTQCString szC = KVSCSC_pConnection->encodeText(KVSCSC_pWindow->target()); + KviTQCString szU = KVSCSC_pConnection->encodeText(szUser); + KviTQCString szR = KVSCSC_pConnection->encodeText(szReason); if(szR.isEmpty()) { @@ -513,12 +513,12 @@ try_again: KVSCSC(killtimer) { - QString szName; + TQString szName; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("name",KVS_PT_STRING,KVS_PF_OPTIONAL,szName) KVSCSC_PARAMETERS_END - if(KVSCSC_pSwitches->find('a',"active")) + if(KVSCSC_pSwitches->tqfind('a',"active")) { KviKvsTimerManager::instance()->deleteAllTimers(); return true; @@ -528,13 +528,13 @@ try_again: { if(!KviKvsTimerManager::instance()->deleteCurrentTimer()) { - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("Timer name omitted but there is not current timer (this is not a timer callback)")); } } else { if(!KviKvsTimerManager::instance()->deleteTimer(szName)) { - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("Can't kill the timer '%Q' since it is not running"),&szName); } } @@ -616,12 +616,12 @@ try_again: KVSCSC(listtimers) { - KviPointerHashTable<QString,KviKvsTimer> * pTimerDict = KviKvsTimerManager::instance()->timerDict(); + KviPointerHashTable<TQString,KviKvsTimer> * pTimerDict = KviKvsTimerManager::instance()->timerDict(); if(!pTimerDict) return true; - KviPointerHashTableIterator<QString,KviKvsTimer> it(*pTimerDict); + KviPointerHashTableIterator<TQString,KviKvsTimer> it(*pTimerDict); KVSCSC_pContext->window()->outputNoFmt(KVI_OUT_VERBOSE,__tr2qs("List of active timers")); @@ -629,8 +629,8 @@ try_again: while(KviKvsTimer * pTimer = it.current()) { - QString szName = pTimer->name(); - QString szLifetime; + TQString szName = pTimer->name(); + TQString szLifetime; switch(pTimer->lifetime()) { case KviKvsTimer::Persistent: @@ -646,9 +646,9 @@ try_again: szLifetime = __tr2qs("Unknown"); break; } - QString szDelay; + TQString szDelay; szDelay.setNum(pTimer->delay()); - QString szWindow; + TQString szWindow; szWindow = pTimer->window() ? pTimer->window()->id() : __tr2qs("None"); KVSCSC_pContext->window()->output(KVI_OUT_VERBOSE, @@ -674,15 +674,15 @@ try_again: @title: lusers @syntax: - lusers [ <mask> [ <target> ] ] + lusers [ <tqmask> [ <target> ] ] @short: Requests statistics about users on IRC @description: The LUSERS command is used to get statistics about the size of the IRC network.[br]If no parameter is given, the reply will be about the - whole net.[br]If a <mask> is specified, then the reply will only + whole net.[br]If a <tqmask> is specified, then the reply will only concern the part of the network formed by the servers matching the - mask.[br]Finally, if the <target> parameter is specified, the request + tqmask.[br]Finally, if the <target> parameter is specified, the request is forwarded to that server which will generate the reply.[br] This command is a [doc:rfc2821wrappers]RFC2821 command wrapper[/doc]; see that document for more information.[br] */ diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp index e0ac917..9744b6f 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp @@ -47,9 +47,9 @@ #include "kvi_kvs_script.h" #include "kvi_kvs_popupmanager.h" -#include <qcursor.h> -#include <qprocess.h> -#include <qtimer.h> +#include <tqcursor.h> +#include <tqprocess.h> +#include <tqtimer.h> namespace KviKvsCoreSimpleCommands { @@ -78,17 +78,17 @@ namespace KviKvsCoreSimpleCommands KVSCSC(me) { - QString szText; + TQString szText; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("text",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szText) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION switch(KVSCSC_pWindow->type()) { case KVI_WINDOW_TYPE_CHANNEL: - case KVI_WINDOW_TYPE_QUERY: + case KVI_WINDOW_TYPE_TQUERY: case KVI_WINDOW_TYPE_DCCCHAT: KVSCSC_pWindow->ownAction(szText); break; @@ -125,14 +125,14 @@ namespace KviKvsCoreSimpleCommands KVSCSC(mode) { - QString szText; + TQString szText; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("text",KVS_PT_STRING,KVS_PF_APPENDREMAINING,szText) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION - KviQCString szTxt = KVSCSC_pConnection->encodeText(szText); + KviTQCString szTxt = KVSCSC_pConnection->encodeText(szText); if(!szTxt.isEmpty()) { @@ -212,14 +212,14 @@ namespace KviKvsCoreSimpleCommands KVSCSC(nick) { - QString szNick; + TQString szNick; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("nickname",KVS_PT_NONEMPTYSTRING,0,szNick) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION - KviQCString szData = KVSCSC_pConnection->encodeText(szNick); + KviTQCString szData = KVSCSC_pConnection->encodeText(szNick); if(!szData.data())szData = ""; if(!KVSCSC_pConnection->sendFmtData("NICK %s",szData.data())) @@ -259,26 +259,26 @@ namespace KviKvsCoreSimpleCommands KVSCSC(notice) { - QString szTarget,szText; + TQString szTarget,szText; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("target",KVS_PT_NONEMPTYSTRING,0,szTarget) KVSCSC_PARAMETER("text",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szText) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION KviWindow * w = KVSCSC_pConnection->findChannel(szTarget); if(!w)w = KVSCSC_pConnection->findQuery(szTarget); - KviQCString szT = KVSCSC_pConnection->encodeText(szTarget); - KviQCString szD = w ? w->encodeText(szText) : KVSCSC_pConnection->encodeText(szText); + KviTQCString szT = KVSCSC_pConnection->encodeText(szTarget); + KviTQCString szD = w ? w->encodeText(szText) : KVSCSC_pConnection->encodeText(szText); if(!szT.data())szT = ""; // encoding problems ? if(!szD.data())szD = ""; // encoding problems ? if(!(KVSCSC_pConnection->sendFmtData("NOTICE %s :%s",szT.data(),szD.data()))) return KVSCSC_pContext->warningNoIrcConnection(); - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pWindow->output(KVI_OUT_OWNPRIVMSG,"[NOTICE >>> %Q]: %Q",&szTarget,&szText); return true; @@ -355,37 +355,37 @@ namespace KviKvsCoreSimpleCommands KVSCSC(openurl) { - QString szUrl; + TQString szUrl; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("url",KVS_PT_NONEMPTYSTRING,KVS_PF_APPENDREMAINING,szUrl) KVSCSC_PARAMETERS_END - QString szCommand; - if(KviQString::equalCIN(szUrl,"www.",4)) + TQString szCommand; + if(KviTQString::equalCIN(szUrl,"www.",4)) { szCommand = KVI_OPTION_STRING(KviOption_stringUrlHttpCommand); szUrl.prepend("http://"); - } else if(KviQString::equalCIN(szUrl,"http:",5)) + } else if(KviTQString::equalCIN(szUrl,"http:",5)) { szCommand = KVI_OPTION_STRING(KviOption_stringUrlHttpCommand); - } else if(KviQString::equalCIN(szUrl,"https:",6)) + } else if(KviTQString::equalCIN(szUrl,"https:",6)) { szCommand = KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand); - } else if(KviQString::equalCIN(szUrl,"ftp",3)) + } else if(KviTQString::equalCIN(szUrl,"ftp",3)) { szCommand = KVI_OPTION_STRING(KviOption_stringUrlFtpCommand); - if(KviQString::equalCIN(szUrl,"ftp.",4))szUrl.prepend("ftp://"); - } else if(KviQString::equalCIN(szUrl,"file",4)) + if(KviTQString::equalCIN(szUrl,"ftp.",4))szUrl.prepend("ftp://"); + } else if(KviTQString::equalCIN(szUrl,"file",4)) { szCommand = KVI_OPTION_STRING(KviOption_stringUrlFileCommand); - } else if(KviQString::equalCIN(szUrl,"irc",3)) + } else if(KviTQString::equalCIN(szUrl,"irc",3)) { if(KviIrcUrl::run(szUrl,KviIrcUrl::FirstFreeContext,KVSCSC_pContext->console()) & KviIrcUrl::InvalidProtocol) { KVSCSC_pContext->warning(__tr2qs("Invalid IRC url (%Q)"),&szUrl); } return true; - } else if(KviQString::equalCIN(szUrl,"mailto",6)) + } else if(KviTQString::equalCIN(szUrl,"mailto",6)) { szCommand = KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand); } @@ -403,7 +403,7 @@ namespace KviKvsCoreSimpleCommands KviKvsVariantList vList; vList.append(new KviKvsVariant(szUrl)); - QString szName = "openurl::handler"; + TQString szName = "openurl::handler"; KviKvsScript script(szName,szCommand); if(!script.run(KVSCSC_pWindow,&vList,0,KviKvsScript::PreserveParams)) @@ -497,8 +497,8 @@ namespace KviKvsCoreSimpleCommands KVSCSC(option) { - QString szName; - QString szValue; + TQString szName; + TQString szValue; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("optName",KVS_PT_STRING,KVS_PF_OPTIONAL,szName) KVSCSC_PARAMETER("optValue",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szValue) @@ -589,7 +589,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(parse) { - QString szFileName; + TQString szFileName; KviKvsVariantList vList; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("filename",KVS_PT_NONEMPTYSTRING,0,szFileName) @@ -600,7 +600,7 @@ namespace KviKvsCoreSimpleCommands if(KviFileUtils::directoryExists(szFileName)) { - QString szTmp; + TQString szTmp; KVSCSC_pContext->enterBlockingSection(); bool bResult = KviFileDialog::askForOpenFileName(szTmp,__tr2qs("Choose a file to parse"),szFileName.utf8().data(),"*.kvs"); @@ -613,14 +613,14 @@ namespace KviKvsCoreSimpleCommands if(szFileName.isEmpty())return true; // done KviFileUtils::adjustFilePath(szFileName); } else { - QFileInfo inf(szFileName); + TQFileInfo inf(szFileName); if(inf.isRelative()) { - if(QString * pszPath = KVSCSC_pContext->scriptFilePath()) + if(TQString * pszPath = KVSCSC_pContext->scriptFilePath()) { - QFileInfo inf2(*pszPath); - QString szCheckFileName = inf2.dirPath(); - KviQString::ensureLastCharIs(szCheckFileName,KVI_PATH_SEPARATOR_CHAR); + TQFileInfo inf2(*pszPath); + TQString szCheckFileName = inf2.dirPath(); + KviTQString::ensureLastCharIs(szCheckFileName,KVI_PATH_SEPARATOR_CHAR); szCheckFileName += szFileName; if(KviFileUtils::fileExists(szCheckFileName)) szFileName = szCheckFileName; @@ -628,18 +628,18 @@ namespace KviKvsCoreSimpleCommands } } - QFileInfo infz(szFileName); + TQFileInfo infz(szFileName); szFileName = infz.absFilePath(); - QString szBuffer; + TQString szBuffer; if(!KviFileUtils::loadFile(szFileName,szBuffer,true)) // <-- scripts SHOULD be shipped in utf8 format { - if(KVSCSC_pSwitches->find('e',"fail-on-load")) + if(KVSCSC_pSwitches->tqfind('e',"fail-on-load")) { KVSCSC_pContext->error(__tr2qs("Failed to load the file '%Q' for parsing"),&szFileName); return false; } else { - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("Failed to load the file '%Q' for parsing"),&szFileName); return true; } @@ -647,7 +647,7 @@ namespace KviKvsCoreSimpleCommands KviKvsScript s(szFileName,szBuffer); - KviKvsVariant * pRetVal = KVSCSC_pSwitches->find('r',"propagate-return") ? KVSCSC_pContext->returnValue() : 0; + KviKvsVariant * pRetVal = KVSCSC_pSwitches->tqfind('r',"propagate-return") ? KVSCSC_pContext->returnValue() : 0; KviKvsVariant vFileName(szFileName); vList.prepend(&vFileName); @@ -655,7 +655,7 @@ namespace KviKvsCoreSimpleCommands if(!s.run(KVSCSC_pContext->window(),&vList,pRetVal,KviKvsScript::PreserveParams,&rtd)) { - if(KVSCSC_pSwitches->find('f',"fail-on-error"))return false; + if(KVSCSC_pSwitches->tqfind('f',"fail-on-error"))return false; } return true; } @@ -699,31 +699,31 @@ namespace KviKvsCoreSimpleCommands KVSCSC(part) { - QString szChans,szMsg; + TQString szChans,szMsg; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("chans",KVS_PT_STRING,KVS_PF_OPTIONAL,szChans) KVSCSC_PARAMETER("part_message",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szMsg) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION if(szChans.isEmpty()) { if(KVSCSC_pWindow->type() == KVI_WINDOW_TYPE_CHANNEL) szChans = KVSCSC_pWindow->target(); else { - if(!KVSCSC_pSwitches->find('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("Missing channel list")); + if(!KVSCSC_pSwitches->tqfind('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("Missing channel list")); return true; } } - KviQCString szEncodedChans = KVSCSC_pConnection->encodeText(szChans); + KviTQCString szEncodedChans = KVSCSC_pConnection->encodeText(szChans); - QStringList sl = QStringList::split(",",szChans); + TQStringList sl = TQStringList::split(",",szChans); if(!szMsg.isEmpty()) { - KviQCString szText; + KviTQCString szText; if(sl.count() == 1) { // single chan , use channel encoding if possible @@ -743,14 +743,14 @@ namespace KviKvsCoreSimpleCommands return KVSCSC_pContext->warningNoIrcConnection(); } - for(QStringList::Iterator it=sl.begin();it != sl.end();it++) + for(TQStringList::Iterator it=sl.begin();it != sl.end();it++) { KviChannel * ch = KVSCSC_pConnection->findChannel(*it); if(ch) { - ch->partMessageSent(!KVSCSC_pSwitches->find('k',"keep"),!KVSCSC_pSwitches->find('s',"silent")); + ch->partMessageSent(!KVSCSC_pSwitches->tqfind('k',"keep"),!KVSCSC_pSwitches->tqfind('s',"silent")); } else { - if(!KVSCSC_pSwitches->find('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("You don't appear to be on channel %s"),(*it).utf8().data()); + if(!KVSCSC_pSwitches->tqfind('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("You don't appear to be on channel %s"),(*it).utf8().data()); } } @@ -845,7 +845,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(popup) { - QString szPopupName; + TQString szPopupName; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("popup_name",KVS_PT_NONEMPTYSTRING,0,szPopupName) KVSCSC_PARAMETERS_END @@ -873,24 +873,24 @@ namespace KviKvsCoreSimpleCommands return false; } - QPoint pnt = QCursor::pos(); + TQPoint pnt = TQCursor::pos(); - KviKvsVariant * pCoords = KVSCSC_pSwitches->find('p',"point"); + KviKvsVariant * pCoords = KVSCSC_pSwitches->tqfind('p',"point"); if(pCoords) { - QString szCoords; + TQString szCoords; pCoords->asString(szCoords); - int idx = szCoords.find(','); + int idx = szCoords.tqfind(','); bool bCoordsOk = true; if(idx == -1)bCoordsOk = false; else { - QString szX = szCoords.left(idx); + TQString szX = szCoords.left(idx); szCoords.remove(0,idx + 1); bool bOk1,bOk2; int iX = szX.toInt(&bOk1); int iY = szCoords.toInt(&bOk2); - if(bOk1 && bOk2)pnt = QPoint(iX,iY); + if(bOk1 && bOk2)pnt = TQPoint(iX,iY); else bCoordsOk = false; } @@ -934,13 +934,13 @@ namespace KviKvsCoreSimpleCommands KVSCSC(privmsg) { - QString szTarget,szText; + TQString szTarget,szText; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("target",KVS_PT_NONEMPTYSTRING,0,szTarget) KVSCSC_PARAMETER("text",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szText) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION KviWindow * w = KVSCSC_pConnection->findChannel(szTarget); if(!w)w = KVSCSC_pConnection->findQuery(szTarget); @@ -948,15 +948,15 @@ namespace KviKvsCoreSimpleCommands if(w)w->ownMessage(szText); else { - KviQCString szT = KVSCSC_pConnection->encodeText(szTarget); - KviQCString szD = w ? w->encodeText(szText) : KVSCSC_pConnection->encodeText(szText); + KviTQCString szT = KVSCSC_pConnection->encodeText(szTarget); + KviTQCString szD = w ? w->encodeText(szText) : KVSCSC_pConnection->encodeText(szText); if(!szT.data())szT = ""; // encoding problems ? if(!szD.data())szD = ""; // encoding problems ? if(!(KVSCSC_pConnection->sendFmtData("PRIVMSG %s :%s",szT.data(),szD.data()))) return KVSCSC_pContext->warningNoIrcConnection(); - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pWindow->output(KVI_OUT_OWNPRIVMSG,"[PRIVMSG >>> %Q]: %Q",&szTarget,&szText); } @@ -994,31 +994,31 @@ namespace KviKvsCoreSimpleCommands KVSCSC(query) { - QString szTargets,szText; + TQString szTargets,szText; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("targets",KVS_PT_NONEMPTYSTRING,0,szTargets) KVSCSC_PARAMETER("text",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szText) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION KviQuery * query; - QStringList sl = QStringList::split(",",szTargets); - for(QStringList::Iterator it = sl.begin();it != sl.end();it++) + TQStringList sl = TQStringList::split(",",szTargets); + for(TQStringList::Iterator it = sl.begin();it != sl.end();it++) { - QString szNick = *it; + TQString szNick = *it; if(szNick.isEmpty())KVSCSC_pContext->warning(__tr2qs("Empty target specified")); else { query = KVSCSC_pWindow->console()->connection()->findQuery(szNick); if(!query) { query = KVSCSC_pWindow->console()->connection()->createQuery(szNick); - QString user; - QString host; + TQString user; + TQString host; KviIrcUserDataBase * db = KVSCSC_pWindow->connection()->userDataBase(); if(db) { - KviIrcUserEntry * e = db->find(szNick); + KviIrcUserEntry * e = db->tqfind(szNick); if(e) { user = e->user(); @@ -1053,21 +1053,21 @@ namespace KviKvsCoreSimpleCommands !sw: -q | --quit Terminates this KVIrc application instance !sw: -f | --force - Forces the immediate termination of the current IRC session (The QUIT message may be not sent) + Forces the immediate termination of the current IRC session (The TQUIT message may be not sent) !sw: -u | --unexpected Simulates an "unexpected disconnection" @description: Terminates the current IRC session.[br] - By default this command sends a QUIT message + By default this command sends a TQUIT message and waits for the server to close the connection.[br] If you want to force KVIrc to close the connection - immediately after sending the QUIT message you must use the -f switch.[br] + immediately after sending the TQUIT message you must use the -f switch.[br] Forcing the connection may cause your quit message to not be displayed to the other IRC users: most likely it will be replaced by a 'Connection reset by peer' or a 'EOF from client'.[br] If the -u switch is specified then an "unexpected disconnection" will be simulated and all the related options will be applied (e.g. automatic reconnection, - channels and queries kept open etc..). The QUIT message will be still sent unless + channels and queries kept open etc..). The TQUIT message will be still sent unless the -f switch is used. You can control all the "unexpected disconnection" options in the options dialog. If the -q switch is specified , this command terminates KVIrc immediately.[br] @@ -1079,17 +1079,17 @@ namespace KviKvsCoreSimpleCommands KVSCSC(quit) { - QString szReason; + TQString szReason; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("reason",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szReason) KVSCSC_PARAMETERS_END - if(KVSCSC_pSwitches->find('q',"quit")) + if(KVSCSC_pSwitches->tqfind('q',"quit")) { - QTimer::singleShot(0,g_pApp,SLOT(quit())); + TQTimer::singleShot(0,g_pApp,TQT_SLOT(quit())); } else { - KVSCSC_REQUIRE_CONNECTION - KVSCSC_pWindow->context()->terminateConnectionRequest(KVSCSC_pSwitches->find('f',"force"),szReason,KVSCSC_pSwitches->find('u',"unexpected")); + KVSCSC_RETQUIRE_CONNECTION + KVSCSC_pWindow->context()->terminateConnectionRequest(KVSCSC_pSwitches->tqfind('f',"force"),szReason,KVSCSC_pSwitches->tqfind('u',"unexpected")); } return true; } @@ -1170,20 +1170,20 @@ namespace KviKvsCoreSimpleCommands KVSCSC(raw) { - QString szRawCommand; + TQString szRawCommand; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("raw_command",KVS_PT_STRING,KVS_PF_APPENDREMAINING,szRawCommand) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION - KviQCString szData = KVSCSC_pConnection->encodeText(szRawCommand); + KviTQCString szData = KVSCSC_pConnection->encodeText(szRawCommand); if(!szData.data())szData = ""; if(!KVSCSC_pConnection->sendData(szData.data())) return KVSCSC_pContext->warningNoIrcConnection(); - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pWindow->output(KVI_OUT_RAW,__tr2qs("[RAW]: %Q"),&szRawCommand); return true; @@ -1225,7 +1225,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(rebind) { - QString szWinId; + TQString szWinId; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("window_id",KVS_PT_NONEMPTYSTRING,0,szWinId) KVSCSC_PARAMETERS_END @@ -1233,7 +1233,7 @@ namespace KviKvsCoreSimpleCommands KviWindow * pAux = g_pApp->findWindow(szWinId.utf8().data()); if(pAux)KVSCSC_pContext->setWindow(pAux); else { - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("Window with id %Q not found: no rebinding performed"),&szWinId); } return true; @@ -1277,7 +1277,7 @@ namespace KviKvsCoreSimpleCommands return false; } - QString all; + TQString all; KVSCSC_pParams->allAsString(all); KVSCSC_pContext->returnValue()->setString(all); return false; @@ -1313,20 +1313,20 @@ namespace KviKvsCoreSimpleCommands KVSCSC(run) { - QString szCommand; - QStringList l; + TQString szCommand; + TQStringList l; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("command",KVS_PT_STRING,0,szCommand) KVSCSC_PARAMETER("parameters",KVS_PT_STRINGLIST,KVS_PF_OPTIONAL,l) KVSCSC_PARAMETERS_END #ifdef COMPILE_USE_QT4 - QProcess proc; + TQProcess proc; proc.start(szCommand,l); // FIXME: KVSCSC_pContext->warning(__tr2qs("Failed to execute command '%Q'"),&szCommand); #else - QProcess proc(szCommand); - for ( QStringList::Iterator it = l.begin(); it != l.end(); ++it ) proc.addArgument(*it); + TQProcess proc(szCommand); + for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) proc.addArgument(*it); if(!proc.start())KVSCSC_pContext->warning(__tr2qs("Failed to execute command '%Q'"),&szCommand); #endif return true; diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp index 1dfc454..96548ad 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp @@ -81,17 +81,17 @@ namespace KviKvsCoreSimpleCommands KVSCSC(say) { - QString szText; + TQString szText; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("text",KVS_PT_STRING,KVS_PF_APPENDREMAINING,szText) KVSCSC_PARAMETERS_END - if(KVSCSC_pSwitches->find('x',"allow-exec")) + if(KVSCSC_pSwitches->tqfind('x',"allow-exec")) { // allow execution of commands if(!KviUserInput::parse(szText,KVSCSC_pWindow,__tr2qs("say: injected commandline"))) { - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("Say parse error: Broken command")); } } else { @@ -205,7 +205,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(server) { - QString szServer; + TQString szServer; kvs_uint_t uPort; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("server",KVS_PT_STRING,KVS_PF_OPTIONAL,szServer) @@ -213,9 +213,9 @@ namespace KviKvsCoreSimpleCommands KVSCSC_PARAMETERS_END KviConsole * console = 0; - if(KVSCSC_pSwitches->find('n',"new-context"))console = KVSCSC_pWindow->frame()->createNewConsole(); + if(KVSCSC_pSwitches->tqfind('n',"new-context"))console = KVSCSC_pWindow->frame()->createNewConsole(); else { - if(KVSCSC_pSwitches->find('u',"unused-context")) + if(KVSCSC_pSwitches->tqfind('u',"unused-context")) { // first try the current console console = KVSCSC_pWindow->console(); @@ -239,7 +239,7 @@ namespace KviKvsCoreSimpleCommands } else console = KVSCSC_pWindow->console(); } - QString szCmd,szBindAddress,szSocketFilter,szPassword,szNick; + TQString szCmd,szBindAddress,szSocketFilter,szPassword,szNick; KVSCSC_pSwitches->getAsStringIfExisting('c',"command",szCmd); KVSCSC_pSwitches->getAsStringIfExisting('b',"bind-address",szBindAddress); KVSCSC_pSwitches->getAsStringIfExisting('f',"filter",szSocketFilter); @@ -261,7 +261,7 @@ namespace KviKvsCoreSimpleCommands return false; } else { KviAsynchronousConnectionData * d = new KviAsynchronousConnectionData(); - d->bUseLastServerInContext = KVSCSC_pSwitches->find('l',"last") != 0; + d->bUseLastServerInContext = KVSCSC_pSwitches->tqfind('l',"last") != 0; d->szCommandToExecAfterConnect = szCmd; d->szBindAddress = szBindAddress; d->szPass = szPassword; @@ -273,13 +273,13 @@ namespace KviKvsCoreSimpleCommands } else { // server is not empty. KviAsynchronousConnectionData * d = new KviAsynchronousConnectionData(); - d->bUseSSL = (KVSCSC_pSwitches->find('s',"ssl") != 0); + d->bUseSSL = (KVSCSC_pSwitches->tqfind('s',"ssl") != 0); d->szServer = szServer; d->uPort = (kvi_u32_t)uPort; d->szLinkFilter = szSocketFilter; d->bPortIsOk = (uPort > 0); #ifdef COMPILE_IPV6_SUPPORT - d->bUseIpV6 = (KVSCSC_pSwitches->find('i',"ipv6") != 0) || KviNetUtils::isValidStringIp_V6(szServer); + d->bUseIpV6 = (KVSCSC_pSwitches->tqfind('i',"ipv6") != 0) || KviNetUtils::isValidStringIp_V6(szServer); #else d->bUseIpV6 = false; #endif @@ -357,7 +357,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(setmenu) { - QString szVisibleText,szPopupName; + TQString szVisibleText,szPopupName; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("visible_text",KVS_PT_NONEMPTYSTRING,0,szVisibleText) KVSCSC_PARAMETER("popup_name",KVS_PT_STRING,KVS_PF_OPTIONAL,szPopupName) @@ -367,20 +367,20 @@ namespace KviKvsCoreSimpleCommands { if(!(KVSCSC_pWindow->frame()->mainMenuBar()->removeMenu(szVisibleText))) { - if(!KVSCSC_pSwitches->find('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("No menu bar item with text '%Q'"),&szPopupName); + if(!KVSCSC_pSwitches->tqfind('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("No menu bar item with text '%Q'"),&szPopupName); } return true; } KviKvsPopupMenu * p = KviKvsPopupManager::instance()->lookup(szPopupName); int idx = -1; - if(KviKvsVariant * pIdx = KVSCSC_pSwitches->find('i',"index")) + if(KviKvsVariant * pIdx = KVSCSC_pSwitches->tqfind('i',"index")) { kvs_int_t iIdx; if(pIdx->asInteger(iIdx)) idx = iIdx; else { - if(!KVSCSC_pSwitches->find('q',"quiet")) + if(!KVSCSC_pSwitches->tqfind('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("Invalid index specified: ignored")); } } @@ -390,7 +390,7 @@ namespace KviKvsCoreSimpleCommands if(p)KVSCSC_pWindow->frame()->mainMenuBar()->addMenu(szVisibleText,p,idx); else { - if(!KVSCSC_pSwitches->find('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("The popup '%Q' is not defined"),&szPopupName); + if(!KVSCSC_pSwitches->tqfind('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("The popup '%Q' is not defined"),&szPopupName); } return true; @@ -430,7 +430,7 @@ namespace KviKvsCoreSimpleCommands return false; } - QString all; + TQString all; KVSCSC_pParams->allAsString(all); KVSCSC_pContext->returnValue()->setString(all); return true; @@ -445,12 +445,12 @@ namespace KviKvsCoreSimpleCommands @title: sockets @syntax: - sockets [[remote server] server mask] + sockets [[remote server] server tqmask] @short: Requests the sockets info from a server @description: Requests the sockets information from the specified server or the current server if no [remote server] is specified.[br] - The reply can be filtered by <server mask>.[br] + The reply can be filtered by <server tqmask>.[br] This command is a [doc:rfc2821wrappers]RFC2821 command wrapper[/doc]; see that document for more information.[br] */ // RFC2821 wrapper @@ -588,14 +588,14 @@ namespace KviKvsCoreSimpleCommands KVSCSC(topic) { - QString szChannel; - QString szTopic; + TQString szChannel; + TQString szTopic; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("channel",KVS_PT_NONEMPTYSTRING,KVS_PF_OPTIONAL,szChannel) KVSCSC_PARAMETER("topic",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szTopic) KVSCSC_PARAMETERS_END - KVSCSC_REQUIRE_CONNECTION + KVSCSC_RETQUIRE_CONNECTION if(szChannel.isEmpty()) { @@ -607,8 +607,8 @@ namespace KviKvsCoreSimpleCommands } } - KviQCString szC = KVSCSC_pConnection->encodeText(szChannel); - KviQCString szT = KVSCSC_pConnection->encodeText(szTopic); + KviTQCString szC = KVSCSC_pConnection->encodeText(szChannel); + KviTQCString szT = KVSCSC_pConnection->encodeText(szTopic); if(szTopic.isEmpty()) { if(!KVSCSC_pConnection->sendFmtData("TOPIC %s",szC.data())) @@ -673,14 +673,14 @@ namespace KviKvsCoreSimpleCommands to load catalogues that reside in different directories.[br] [b]NOTE[/b][br] This feature is currently work in progress: the scripting engine - is not yet fully unicode and thus some more exotic translations may still suffer... + is not yet fully tqunicode and thus some more exotic translations may still suffer... @seealso: [fnc]$tr[/fnc], [cmd]trunload[/cmd] */ KVSCSC(trload) { - QString szCatalogue,szDir; + TQString szCatalogue,szDir; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("catalogue",KVS_PT_NONEMPTYSTRING,0,szCatalogue) KVSCSC_PARAMETER("catalogueDir",KVS_PT_STRING,KVS_PF_OPTIONAL,szDir) @@ -702,7 +702,7 @@ namespace KviKvsCoreSimpleCommands if(KviLocale::loadCatalogue(szCatalogue,szDir)) return true; - if(KVSCSC_pSwitches->find('v',"verbose")) + if(KVSCSC_pSwitches->tqfind('v',"verbose")) KVSCSC_pContext->warning(__tr2qs("No catalogue %Q for the current language found"),&szCatalogue); return true; @@ -734,14 +734,14 @@ namespace KviKvsCoreSimpleCommands KVSCSC(trunload) { - QString szCatalogue; + TQString szCatalogue; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("catalogue",KVS_PT_NONEMPTYSTRING,0,szCatalogue) KVSCSC_PARAMETERS_END if(!KviLocale::unloadCatalogue(szCatalogue)) { - if(KVSCSC_pSwitches->find('v',"verbose")) + if(KVSCSC_pSwitches->tqfind('v',"verbose")) KVSCSC_pContext->warning(__tr2qs("The catalogue %Q was not loaded"),&szCatalogue); } return true; @@ -756,11 +756,11 @@ namespace KviKvsCoreSimpleCommands @title: unban @syntax: - unban <mask_list> + unban <tqmask_list> @short: - Unsets ban masks for the channel + Unsets ban tqmasks for the channel @description: - Removes the ban masks specified in the <mask_list>, + Removes the ban tqmasks specified in the <tqmask_list>, which is a comma separated list of nicknames. This command works only if executed in a channel window. The command is translated to a set of MODE messages containing @@ -859,7 +859,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(warning) { - QString szAll; + TQString szAll; KVSCSC_pParams->allAsString(szAll); KVSCSC_pContext->warning("%Q",&szAll); @@ -875,7 +875,7 @@ namespace KviKvsCoreSimpleCommands @title: who @syntax: - who {[mask] | [channel]} + who {[tqmask] | [channel]} @short: Requests WHO information @description: @@ -919,12 +919,12 @@ namespace KviKvsCoreSimpleCommands KVSCSC(whois) { - QString szNick; + TQString szNick; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("nickname",KVS_PT_NONEMPTYSTRING,KVS_PF_APPENDREMAINING,szNick) KVSCSC_PARAMETERS_END - KviQCString szData = KVSCSC_pContext->window()->encodeText(szNick); + KviTQCString szData = KVSCSC_pContext->window()->encodeText(szNick); if(!KVSCSC_pContext->connection())return KVSCSC_pContext->warningNoIrcConnection(); if(!KVSCSC_pContext->connection()->sendFmtData("WHOIS %s",szData.data()))return KVSCSC_pContext->warningNoIrcConnection(); @@ -959,12 +959,12 @@ namespace KviKvsCoreSimpleCommands KVSCSC(whowas) { - QString szNick; + TQString szNick; KVSCSC_PARAMETERS_BEGIN KVSCSC_PARAMETER("nickname",KVS_PT_NONEMPTYSTRING,KVS_PF_APPENDREMAINING,szNick) KVSCSC_PARAMETERS_END - KviQCString szData = KVSCSC_pContext->window()->encodeText(szNick); + KviTQCString szData = KVSCSC_pContext->window()->encodeText(szNick); if(!KVSCSC_pContext->connection())return KVSCSC_pContext->warningNoIrcConnection(); if(!KVSCSC_pContext->connection()->sendFmtData("WHOWAS %s",szData.data()))return KVSCSC_pContext->warningNoIrcConnection(); diff --git a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp index ec1efde..2170362 100644 --- a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp @@ -39,7 +39,7 @@ KviKvsDnsManager * KviKvsDnsManager::m_pInstance = 0; -KviKvsDnsObject::KviKvsDnsObject(KviDns * pDns,KviWindow * pWnd,const QString &szQuery,bool bRebindOnWindowClose,KviKvsScript * pCallback,KviKvsVariantList * pParameterList) +KviKvsDnsObject::KviKvsDnsObject(KviDns * pDns,KviWindow * pWnd,const TQString &szQuery,bool bRebindOnWindowClose,KviKvsScript * pCallback,KviKvsVariantList * pParameterList) { m_pDns = pDns; m_pWindow = pWnd; @@ -51,7 +51,7 @@ KviKvsDnsObject::KviKvsDnsObject(KviDns * pDns,KviWindow * pWnd,const QString &s KviKvsDnsObject::~KviKvsDnsObject() { - QObject::disconnect(m_pDns,0,0,0); + TQObject::disconnect(m_pDns,0,0,0); if(m_pDns->isRunning()) { g_pApp->collectGarbage(m_pDns); @@ -64,7 +64,7 @@ KviKvsDnsObject::~KviKvsDnsObject() KviKvsDnsManager::KviKvsDnsManager() -: QObject() +: TQObject() { m_pDnsObjects = 0; } @@ -102,13 +102,13 @@ void KviKvsDnsManager::addDns(KviKvsDnsObject * pObject) m_pDnsObjects = new KviPointerHashTable<void *,KviKvsDnsObject>; m_pDnsObjects->setAutoDelete(true); } - m_pDnsObjects->replace(pObject->dns(),pObject); - connect(pObject->dns(),SIGNAL(lookupDone(KviDns *)),this,SLOT(dnsLookupTerminated(KviDns *))); + m_pDnsObjects->tqreplace(pObject->dns(),pObject); + connect(pObject->dns(),TQT_SIGNAL(lookupDone(KviDns *)),this,TQT_SLOT(dnsLookupTerminated(KviDns *))); } void KviKvsDnsManager::dnsLookupTerminated(KviDns * pDns) { - KviKvsDnsObject * o = m_pDnsObjects->find(pDns); + KviKvsDnsObject * o = m_pDnsObjects->tqfind(pDns); if(!o) { debug("KviKvsDnsManager::dnsLookupTerminated(): can't find the KviKvsDnsObject structure"); @@ -140,12 +140,12 @@ void KviKvsDnsManager::dnsLookupTerminated(KviDns * pDns) o->parameterList()->prepend(new KviKvsVariant(KviError::getDescription(o->dns()->error()))); // $2 o->parameterList()->prepend(new KviKvsVariant((kvs_int_t)0)); // $1 } else { - QString * fh = o->dns()->hostnameList()->first(); - QString * fi = o->dns()->ipAddressList()->first(); + TQString * fh = o->dns()->hostnameList()->first(); + TQString * fi = o->dns()->ipAddressList()->first(); // $4... is the magic data - o->parameterList()->prepend(new KviKvsVariant(fh ? *fh : QString("?.?"))); // $3 - o->parameterList()->prepend(new KviKvsVariant(fi ? *fi : QString("?.?.?.?"))); // $2 + o->parameterList()->prepend(new KviKvsVariant(fh ? *fh : TQString("?.?"))); // $3 + o->parameterList()->prepend(new KviKvsVariant(fi ? *fi : TQString("?.?.?.?"))); // $2 o->parameterList()->prepend(new KviKvsVariant((kvs_int_t)1)); // $1 } o->parameterList()->prepend(new KviKvsVariant(o->query())); // $0 @@ -153,22 +153,22 @@ void KviKvsDnsManager::dnsLookupTerminated(KviDns * pDns) copy.run(o->window(),o->parameterList(),0,KviKvsScript::PreserveParams); } else { - QString szQuery = o->dns()->query(); + TQString szQuery = o->dns()->query(); o->window()->output(KVI_OUT_HOSTLOOKUP,__tr2qs("DNS Lookup result for query \"%Q\""),&szQuery); if(o->dns()->state() == KviDns::Failure) { - QString szErr = KviError::getDescription(o->dns()->error()); + TQString szErr = KviError::getDescription(o->dns()->error()); o->window()->output(KVI_OUT_HOSTLOOKUP,__tr2qs("Error: %Q"),&szErr); } else { int idx = 1; - for(QString * h = o->dns()->hostnameList()->first();h;h = o->dns()->hostnameList()->next()) + for(TQString * h = o->dns()->hostnameList()->first();h;h = o->dns()->hostnameList()->next()) { o->window()->output(KVI_OUT_HOSTLOOKUP,__tr2qs("Hostname %d: %Q"),idx,h); idx++; } idx = 1; - for(QString * a = o->dns()->ipAddressList()->first();a;a = o->dns()->ipAddressList()->next()) + for(TQString * a = o->dns()->ipAddressList()->first();a;a = o->dns()->ipAddressList()->next()) { o->window()->output(KVI_OUT_HOSTLOOKUP,__tr2qs("IP address %d: %Q"),idx,a); idx++; diff --git a/src/kvirc/kvs/kvi_kvs_dnsmanager.h b/src/kvirc/kvs/kvi_kvs_dnsmanager.h index 69d152c..f01f93f 100644 --- a/src/kvirc/kvs/kvi_kvs_dnsmanager.h +++ b/src/kvirc/kvs/kvi_kvs_dnsmanager.h @@ -25,9 +25,9 @@ //============================================================================= #include "kvi_settings.h" -#include <qobject.h> +#include <tqobject.h> #include "kvi_pointerhashtable.h" -#include <qstring.h> +#include <tqstring.h> class KviDns; class KviWindow; @@ -39,7 +39,7 @@ class KviKvsDnsObject public: KviKvsDnsObject(KviDns * pDns, KviWindow * pWnd, - const QString &szQuery, + const TQString &szQuery, bool bRebindOnWindowClose = true, KviKvsScript * pCallback = 0, KviKvsVariantList * pParameterList = 0); @@ -47,7 +47,7 @@ public: protected: KviDns * m_pDns; KviWindow * m_pWindow; - QString m_szQuery; + TQString m_szQuery; KviKvsScript * m_pCallback; // callback to be executed when the dns terminates KviKvsVariantList * m_pParameterList; // parameter list (magic) bool m_bRebindOnWindowClose; // should we trigger the callback even if m_pWindow no longer exists ? @@ -56,15 +56,16 @@ public: KviWindow * window(){ return m_pWindow; }; KviKvsScript * callback(){ return m_pCallback; }; KviKvsVariantList * parameterList(){ return m_pParameterList; }; - const QString & query(){ return m_szQuery; }; + const TQString & query(){ return m_szQuery; }; bool rebindOnWindowClose(){ return m_bRebindOnWindowClose; }; void setWindow(KviWindow * pWnd){ m_pWindow = pWnd; }; void setParameterList(KviKvsVariantList * pList){ m_pParameterList = pList; }; }; -class KviKvsDnsManager : public QObject +class KviKvsDnsManager : public TQObject { Q_OBJECT + TQ_OBJECT public: KviKvsDnsManager(); ~KviKvsDnsManager(); diff --git a/src/kvirc/kvs/kvi_kvs_event.h b/src/kvirc/kvs/kvi_kvs_event.h index 663777b..49ef57f 100644 --- a/src/kvirc/kvs/kvi_kvs_event.h +++ b/src/kvirc/kvs/kvi_kvs_event.h @@ -33,8 +33,8 @@ class KVIRC_API KviKvsEvent { protected: - QString m_szName; - QString m_szParameterDescription; + TQString m_szName; + TQString m_szParameterDescription; KviPointerList<KviKvsEventHandler> * m_pHandlers; public: // the event name and the parameter description are NOT translated @@ -47,8 +47,8 @@ public: KviPointerList<KviKvsEventHandler> * handlers(){ return m_pHandlers; }; void addHandler(KviKvsEventHandler * h); void removeHandler(KviKvsEventHandler * h); - const QString & name(){ return m_szName; }; - const QString & parameterDescription(){ return m_szParameterDescription; }; + const TQString & name(){ return m_szName; }; + const TQString & parameterDescription(){ return m_szParameterDescription; }; }; #endif //!_KVI_KVS_EVENT_H_ diff --git a/src/kvirc/kvs/kvi_kvs_eventhandler.cpp b/src/kvirc/kvs/kvi_kvs_eventhandler.cpp index f6e311f..14fa725 100644 --- a/src/kvirc/kvs/kvi_kvs_eventhandler.cpp +++ b/src/kvirc/kvs/kvi_kvs_eventhandler.cpp @@ -37,7 +37,7 @@ KviKvsEventHandler::~KviKvsEventHandler() -KviKvsScriptEventHandler::KviKvsScriptEventHandler(const QString &szHandlerName,const QString &szContextName,const QString &szCode,bool bEnabled) +KviKvsScriptEventHandler::KviKvsScriptEventHandler(const TQString &szHandlerName,const TQString &szContextName,const TQString &szCode,bool bEnabled) : KviKvsEventHandler(KviKvsEventHandler::Script), m_szName(szHandlerName), m_bEnabled(bEnabled) { m_pScript = new KviKvsScript(szContextName,szCode); @@ -48,7 +48,7 @@ KviKvsScriptEventHandler::~KviKvsScriptEventHandler() delete m_pScript; } -KviKvsScriptEventHandler * KviKvsScriptEventHandler::createInstance(const QString &szHandlerName,const QString &szContextName,const QString &szCode,bool bEnabled) +KviKvsScriptEventHandler * KviKvsScriptEventHandler::createInstance(const TQString &szHandlerName,const TQString &szContextName,const TQString &szCode,bool bEnabled) { return new KviKvsScriptEventHandler(szHandlerName,szContextName,szCode,bEnabled); } diff --git a/src/kvirc/kvs/kvi_kvs_eventhandler.h b/src/kvirc/kvs/kvi_kvs_eventhandler.h index f8124b6..cba6a18 100644 --- a/src/kvirc/kvs/kvi_kvs_eventhandler.h +++ b/src/kvirc/kvs/kvi_kvs_eventhandler.h @@ -48,16 +48,16 @@ class KVIRC_API KviKvsScriptEventHandler : public KviKvsEventHandler { public: // the event handler becomes the owned of pszCode! - KviKvsScriptEventHandler(const QString &szHandlerName,const QString &szContextName,const QString &szCode,bool bEnabled = true); + KviKvsScriptEventHandler(const TQString &szHandlerName,const TQString &szContextName,const TQString &szCode,bool bEnabled = true); virtual ~KviKvsScriptEventHandler(); protected: - QString m_szName; + TQString m_szName; KviKvsScript * m_pScript; bool m_bEnabled; public: KviKvsScript * script(){ return m_pScript; }; - const QString & name(){ return m_szName; }; - const QString & code(){ return m_pScript->code(); }; + const TQString & name(){ return m_szName; }; + const TQString & code(){ return m_pScript->code(); }; bool isEnabled(){ return m_bEnabled; }; void setEnabled(bool bEnabled){ m_bEnabled = bEnabled; }; @@ -66,7 +66,7 @@ public: // This MUST be used by the modules to allocate event structures // instead of the new operator. // See kvi_heapobject.cpp for an explaination. - static KviKvsScriptEventHandler * createInstance(const QString &szHandlerName,const QString &szContextName,const QString &szCode,bool bEnabled = true); + static KviKvsScriptEventHandler * createInstance(const TQString &szHandlerName,const TQString &szContextName,const TQString &szCode,bool bEnabled = true); }; diff --git a/src/kvirc/kvs/kvi_kvs_eventmanager.cpp b/src/kvirc/kvs/kvi_kvs_eventmanager.cpp index 1a2131c..f84aee9 100644 --- a/src/kvirc/kvs/kvi_kvs_eventmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_eventmanager.cpp @@ -123,25 +123,25 @@ void KviKvsEventManager::done() delete KviKvsEventManager::instance(); } -unsigned int KviKvsEventManager::findAppEventIndexByName(const QString &szName) +unsigned int KviKvsEventManager::findAppEventIndexByName(const TQString &szName) { for(unsigned int u = 0;u < KVI_KVS_NUM_APP_EVENTS;u++) { - if(KviQString::equalCI(szName,m_appEventTable[u].name()))return u; + if(KviTQString::equalCI(szName,m_appEventTable[u].name()))return u; //Backwards compatibility >_< - if((u == 4) && KviQString::equalCI(szName,"OnIrcConnectionEstabilished")) + if((u == 4) && KviTQString::equalCI(szName,"OnIrcConnectionEstabilished")) return u; } return KVI_KVS_NUM_APP_EVENTS; // <-- invalid event number } -KviKvsEvent * KviKvsEventManager::findAppEventByName(const QString &szName) +KviKvsEvent * KviKvsEventManager::findAppEventByName(const TQString &szName) { for(unsigned int u = 0;u < KVI_KVS_NUM_APP_EVENTS;u++) { - if(KviQString::equalCI(szName,m_appEventTable[u].name()))return &(m_appEventTable[u]); + if(KviTQString::equalCI(szName,m_appEventTable[u].name()))return &(m_appEventTable[u]); //Backwards compatibility >_< - if((u == 4) && KviQString::equalCI(szName,"OnIrcConnectionEstabilished")) + if((u == 4) && KviTQString::equalCI(szName,"OnIrcConnectionEstabilished")) return &(m_appEventTable[u]); } return 0; @@ -166,7 +166,7 @@ bool KviKvsEventManager::addRawHandler(unsigned int uRawIdx,KviKvsEventHandler * return true; } -bool KviKvsEventManager::removeScriptAppHandler(unsigned int uEvIdx,const QString &szName) +bool KviKvsEventManager::removeScriptAppHandler(unsigned int uEvIdx,const TQString &szName) { if(uEvIdx >= KVI_KVS_NUM_APP_EVENTS)return false; KviKvsEventHandler * h; @@ -175,7 +175,7 @@ bool KviKvsEventManager::removeScriptAppHandler(unsigned int uEvIdx,const QStrin { if(h->type() == KviKvsEventHandler::Script) { - if(KviQString::equalCI(((KviKvsScriptEventHandler *)h)->name(),szName)) + if(KviTQString::equalCI(((KviKvsScriptEventHandler *)h)->name(),szName)) { m_appEventTable[uEvIdx].removeHandler(h); return true; @@ -185,7 +185,7 @@ bool KviKvsEventManager::removeScriptAppHandler(unsigned int uEvIdx,const QStrin return false; } -KviKvsScriptEventHandler * KviKvsEventManager::findScriptRawHandler(unsigned int uEvIdx,const QString &szName) +KviKvsScriptEventHandler * KviKvsEventManager::findScriptRawHandler(unsigned int uEvIdx,const TQString &szName) { if(uEvIdx >= KVI_KVS_NUM_RAW_EVENTS)return 0; if(!m_rawEventTable[uEvIdx])return 0; @@ -194,7 +194,7 @@ KviKvsScriptEventHandler * KviKvsEventManager::findScriptRawHandler(unsigned int { if(h->type() == KviKvsEventHandler::Script) { - if(KviQString::equalCI(((KviKvsScriptEventHandler *)h)->name(),szName)) + if(KviTQString::equalCI(((KviKvsScriptEventHandler *)h)->name(),szName)) { return (KviKvsScriptEventHandler *)h; } @@ -203,7 +203,7 @@ KviKvsScriptEventHandler * KviKvsEventManager::findScriptRawHandler(unsigned int return 0; } -KviKvsScriptEventHandler * KviKvsEventManager::findScriptAppHandler(unsigned int uEvIdx,const QString &szName) +KviKvsScriptEventHandler * KviKvsEventManager::findScriptAppHandler(unsigned int uEvIdx,const TQString &szName) { if(uEvIdx >= KVI_KVS_NUM_APP_EVENTS)return 0; KviKvsEventHandler * h; @@ -212,7 +212,7 @@ KviKvsScriptEventHandler * KviKvsEventManager::findScriptAppHandler(unsigned int { if(h->type() == KviKvsEventHandler::Script) { - if(KviQString::equalCI(((KviKvsScriptEventHandler *)h)->name(),szName)) + if(KviTQString::equalCI(((KviKvsScriptEventHandler *)h)->name(),szName)) { return (KviKvsScriptEventHandler *)h; } @@ -221,7 +221,7 @@ KviKvsScriptEventHandler * KviKvsEventManager::findScriptAppHandler(unsigned int return 0; } -bool KviKvsEventManager::enableScriptAppHandler(unsigned int uEvIdx,const QString &szName,bool bEnable) +bool KviKvsEventManager::enableScriptAppHandler(unsigned int uEvIdx,const TQString &szName,bool bEnable) { KviKvsScriptEventHandler * h = findScriptAppHandler(uEvIdx,szName); if(!h)return false; @@ -336,7 +336,7 @@ void KviKvsEventManager::removeAllModuleRawHandlers(KviKvsModuleInterface *pIfac } } -bool KviKvsEventManager::removeScriptRawHandler(unsigned int uEvIdx,const QString &szName) +bool KviKvsEventManager::removeScriptRawHandler(unsigned int uEvIdx,const TQString &szName) { if(uEvIdx >= KVI_KVS_NUM_RAW_EVENTS)return false; if(!m_rawEventTable[uEvIdx])return false; @@ -345,7 +345,7 @@ bool KviKvsEventManager::removeScriptRawHandler(unsigned int uEvIdx,const QStrin { if(h->type() == KviKvsEventHandler::Script) { - if(KviQString::equalCI(((KviKvsScriptEventHandler *)h)->name(),szName)) + if(KviTQString::equalCI(((KviKvsScriptEventHandler *)h)->name(),szName)) { m_rawEventTable[uEvIdx]->removeRef(h); if(m_rawEventTable[uEvIdx]->isEmpty()) @@ -361,7 +361,7 @@ bool KviKvsEventManager::removeScriptRawHandler(unsigned int uEvIdx,const QStrin } -bool KviKvsEventManager::enableScriptRawHandler(unsigned int uEvIdx,const QString &szName,bool bEnable) +bool KviKvsEventManager::enableScriptRawHandler(unsigned int uEvIdx,const TQString &szName,bool bEnable) { KviKvsScriptEventHandler * h = findScriptRawHandler(uEvIdx,szName); if(!h)return false; @@ -523,7 +523,7 @@ bool KviKvsEventManager::triggerHandlers(KviPointerList<KviKvsEventHandler> * pH } -void KviKvsEventManager::loadRawEvents(const QString &szFileName) +void KviKvsEventManager::loadRawEvents(const TQString &szFileName) { KviConfig cfg(szFileName,KviConfig::Read); removeAllScriptRawHandlers(); @@ -531,8 +531,8 @@ void KviKvsEventManager::loadRawEvents(const QString &szFileName) for(i=0;i<KVI_KVS_NUM_RAW_EVENTS;i++) { - QString tmp; - KviQString::sprintf(tmp,"RAW%d",i); + TQString tmp; + KviTQString::sprintf(tmp,"RAW%d",i); if(cfg.hasGroup(tmp)) { cfg.setGroup(tmp); @@ -543,13 +543,13 @@ void KviKvsEventManager::loadRawEvents(const QString &szFileName) m_rawEventTable[i]->setAutoDelete(true); for(unsigned int index = 0;index < nHandlers;index++) { - KviQString::sprintf(tmp,"Name%u",index); - QString szName = cfg.readQStringEntry(tmp,"unnamed"); - KviQString::sprintf(tmp,"Buffer%u",index); - QString szCode = cfg.readQStringEntry(tmp,""); - KviQString::sprintf(tmp,"RawEvent%u::%Q",index,&szName); + KviTQString::sprintf(tmp,"Name%u",index); + TQString szName = cfg.readTQStringEntry(tmp,"unnamed"); + KviTQString::sprintf(tmp,"Buffer%u",index); + TQString szCode = cfg.readTQStringEntry(tmp,""); + KviTQString::sprintf(tmp,"RawEvent%u::%Q",index,&szName); KviKvsScriptEventHandler * s = new KviKvsScriptEventHandler(szName,tmp,szCode); - KviQString::sprintf(tmp,"Enabled%u",index); + KviTQString::sprintf(tmp,"Enabled%u",index); s->setEnabled(cfg.readBoolEntry(tmp,false)); m_rawEventTable[i]->append(s); } @@ -558,7 +558,7 @@ void KviKvsEventManager::loadRawEvents(const QString &szFileName) } } -void KviKvsEventManager::saveRawEvents(const QString &szFileName) +void KviKvsEventManager::saveRawEvents(const TQString &szFileName) { KviConfig cfg(szFileName,KviConfig::Write); cfg.clear(); @@ -568,8 +568,8 @@ void KviKvsEventManager::saveRawEvents(const QString &szFileName) { if(m_rawEventTable[i]) { - QString tmp; - KviQString::sprintf(tmp,"RAW%d",i); + TQString tmp; + KviTQString::sprintf(tmp,"RAW%d",i); cfg.setGroup(tmp); int index = 0; @@ -577,11 +577,11 @@ void KviKvsEventManager::saveRawEvents(const QString &szFileName) { if(s->type() == KviKvsEventHandler::Script) { - KviQString::sprintf(tmp,"Name%d",index); + KviTQString::sprintf(tmp,"Name%d",index); cfg.writeEntry(tmp,((KviKvsScriptEventHandler *)s)->name()); - KviQString::sprintf(tmp,"Buffer%d",index); + KviTQString::sprintf(tmp,"Buffer%d",index); cfg.writeEntry(tmp,((KviKvsScriptEventHandler *)s)->code()); - KviQString::sprintf(tmp,"Enabled%d",index); + KviTQString::sprintf(tmp,"Enabled%d",index); cfg.writeEntry(tmp,((KviKvsScriptEventHandler *)s)->isEnabled()); index++; } @@ -592,7 +592,7 @@ void KviKvsEventManager::saveRawEvents(const QString &szFileName) } -void KviKvsEventManager::loadAppEvents(const QString &szFileName) +void KviKvsEventManager::loadAppEvents(const TQString &szFileName) { KviConfig cfg(szFileName,KviConfig::Read); removeAllScriptAppHandlers(); @@ -600,7 +600,7 @@ void KviKvsEventManager::loadAppEvents(const QString &szFileName) int i; for(i=0;i<KVI_KVS_NUM_APP_EVENTS;i++) { - QString szEventName(m_appEventTable[i].name()); + TQString szEventName(m_appEventTable[i].name()); // Backwards compatibility >_< if((i == 4) && !cfg.hasGroup(szEventName)) szEventName = "OnIrcConnectionEstabilished"; @@ -612,15 +612,15 @@ void KviKvsEventManager::loadAppEvents(const QString &szFileName) { for(unsigned int index = 0;index < nHandlers;index++) { - QString tmp; - KviQString::sprintf(tmp,"Name%u",index); - QString szName = cfg.readQStringEntry(tmp,"unnamed"); - KviQString::sprintf(tmp,"Buffer%u",index); - QString szCode = cfg.readQStringEntry(tmp,""); - KviQString::sprintf(tmp,"Enabled%u",index); + TQString tmp; + KviTQString::sprintf(tmp,"Name%u",index); + TQString szName = cfg.readTQStringEntry(tmp,"unnamed"); + KviTQString::sprintf(tmp,"Buffer%u",index); + TQString szCode = cfg.readTQStringEntry(tmp,""); + KviTQString::sprintf(tmp,"Enabled%u",index); bool bEnabled = cfg.readBoolEntry(tmp,false); - QString szCntx; - KviQString::sprintf(szCntx,"%Q::%Q",&(m_appEventTable[i].name()),&szName); + TQString szCntx; + KviTQString::sprintf(szCntx,"%Q::%Q",&(m_appEventTable[i].name()),&szName); KviKvsScriptEventHandler *s = new KviKvsScriptEventHandler(szName,szCntx,szCode,bEnabled); m_appEventTable[i].addHandler(s); } @@ -630,7 +630,7 @@ void KviKvsEventManager::loadAppEvents(const QString &szFileName) } -void KviKvsEventManager::saveAppEvents(const QString &szFileName) +void KviKvsEventManager::saveAppEvents(const TQString &szFileName) { KviConfig cfg(szFileName,KviConfig::Write); cfg.clear(); @@ -641,7 +641,7 @@ void KviKvsEventManager::saveAppEvents(const QString &szFileName) { if(m_appEventTable[i].hasHandlers()) { - QString szEventName(m_appEventTable[i].name()); + TQString szEventName(m_appEventTable[i].name()); // Backwards compatibility >_< if((i == 4) && cfg.hasGroup(szEventName)) { @@ -654,12 +654,12 @@ void KviKvsEventManager::saveAppEvents(const QString &szFileName) { if(s->type() == KviKvsEventHandler::Script) { - QString tmp; - KviQString::sprintf(tmp,"Name%d",index); + TQString tmp; + KviTQString::sprintf(tmp,"Name%d",index); cfg.writeEntry(tmp,((KviKvsScriptEventHandler *)s)->name()); - KviQString::sprintf(tmp,"Buffer%d",index); + KviTQString::sprintf(tmp,"Buffer%d",index); cfg.writeEntry(tmp,((KviKvsScriptEventHandler *)s)->code()); - KviQString::sprintf(tmp,"Enabled%d",index); + KviTQString::sprintf(tmp,"Enabled%d",index); cfg.writeEntry(tmp,((KviKvsScriptEventHandler *)s)->isEnabled()); index++; } diff --git a/src/kvirc/kvs/kvi_kvs_eventmanager.h b/src/kvirc/kvs/kvi_kvs_eventmanager.h index d31d219..93691d3 100644 --- a/src/kvirc/kvs/kvi_kvs_eventmanager.h +++ b/src/kvirc/kvs/kvi_kvs_eventmanager.h @@ -60,8 +60,8 @@ public: bool hasRawHandlers(unsigned int uEvIdx){ return m_rawEventTable[uEvIdx]; }; KviPointerList<KviKvsEventHandler> * rawHandlers(unsigned int uEvIdx){ return m_rawEventTable[uEvIdx]; }; - KviKvsEvent * findAppEventByName(const QString &szName); - unsigned int findAppEventIndexByName(const QString &szName); + KviKvsEvent * findAppEventByName(const TQString &szName); + unsigned int findAppEventIndexByName(const TQString &szName); bool isValidAppEvent(unsigned int uEvIdx){ return (uEvIdx < KVI_KVS_NUM_APP_EVENTS); }; bool isValidRawEvent(unsigned int uEvIdx){ return (uEvIdx < KVI_KVS_NUM_RAW_EVENTS); }; @@ -69,11 +69,11 @@ public: bool addAppHandler(unsigned int uEvIdx,KviKvsEventHandler * h); bool addRawHandler(unsigned int uRawIdx,KviKvsEventHandler * h); - bool removeScriptAppHandler(unsigned int uEvIdx,const QString &szName); - bool removeScriptRawHandler(unsigned int uEvIdx,const QString &szName); + bool removeScriptAppHandler(unsigned int uEvIdx,const TQString &szName); + bool removeScriptRawHandler(unsigned int uEvIdx,const TQString &szName); - bool enableScriptAppHandler(unsigned int uEvIdx,const QString &szName,bool bEnable); - bool enableScriptRawHandler(unsigned int uEvIdx,const QString &szName,bool bEnable); + bool enableScriptAppHandler(unsigned int uEvIdx,const TQString &szName,bool bEnable); + bool enableScriptRawHandler(unsigned int uEvIdx,const TQString &szName,bool bEnable); bool removeModuleAppHandler(unsigned int uEvIdx,KviKvsModuleInterface *i); bool removeModuleRawHandler(unsigned int uRawIdx,KviKvsModuleInterface *i); @@ -83,8 +83,8 @@ public: void removeAllModuleHandlers(KviKvsModuleInterface * i); - KviKvsScriptEventHandler * findScriptRawHandler(unsigned int uEvIdx,const QString &szName); - KviKvsScriptEventHandler * findScriptAppHandler(unsigned int uEvIdx,const QString &szName); + KviKvsScriptEventHandler * findScriptRawHandler(unsigned int uEvIdx,const TQString &szName); + KviKvsScriptEventHandler * findScriptAppHandler(unsigned int uEvIdx,const TQString &szName); // returns true if further processing should be stopped // none of these functions takes params ownership, so be sure to delete them ! @@ -109,10 +109,10 @@ public: void clearRawEvents(); void clear(); - void loadAppEvents(const QString &szFileName); - void saveAppEvents(const QString &szFileName); - void loadRawEvents(const QString &szFileName); - void saveRawEvents(const QString &szFileName); + void loadAppEvents(const TQString &szFileName); + void saveAppEvents(const TQString &szFileName); + void loadRawEvents(const TQString &szFileName); + void saveRawEvents(const TQString &szFileName); }; diff --git a/src/kvirc/kvs/kvi_kvs_eventtable.cpp b/src/kvirc/kvs/kvi_kvs_eventtable.cpp index 4b8c8c9..e2bab77 100644 --- a/src/kvirc/kvs/kvi_kvs_eventtable.cpp +++ b/src/kvirc/kvs/kvi_kvs_eventtable.cpp @@ -254,7 +254,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]= @description: This event is triggered in the first console of a new frame window. A frame window is the toplevel window that contains the consoles - and the other MDI children windows. + and the other MDI tqchildren windows. @seealso: [event:onframewindowdestroyed]OnFrameWindowDestroyed[/event] */ @@ -842,7 +842,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]= Console @description: Triggered when an user is quitting IRC.[br] - The QUIT message has already been processed by the server , so + The TQUIT message has already been processed by the server , so the user is effectively no longer on IRC. On the other side, it might be useful to access the user-related data from this event, thus the handler is called effectively just BEFORE the @@ -1035,7 +1035,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]= $0 = source nick $1 = source username $2 = source hostname - $3 = ban mask + $3 = ban tqmask @window: Channel window @description: @@ -1043,7 +1043,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]= @seealso: [event:onunban]OnUnban[/event] */ - EVENT("OnBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban mask"), + EVENT("OnBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban tqmask"), /* @doc: onunban @type: @@ -1056,7 +1056,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]= $0 = source nick $1 = source username $2 = source hostname - $3 = unban mask + $3 = unban tqmask @window: Channel window @description: @@ -1064,7 +1064,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]= @seealso: [event:onban]OnBan[/event] */ - EVENT("OnUnBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban mask"), + EVENT("OnUnBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban tqmask"), /* @doc: onmeban @type: @@ -1077,15 +1077,15 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]= $0 = source nickname $1 = source username $2 = source hostname - $3 = ban mask + $3 = ban tqmask @window: Channel @description: - Triggered when someone has set a +b flag that matches your mask (bans you) in the channel.[br] + Triggered when someone has set a +b flag that matches your tqmask (bans you) in the channel.[br] @seealso: [event:onmeunban]OnMeUnban[/event] */ - EVENT("OnMeBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban mask"), + EVENT("OnMeBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban tqmask"), /* @doc: onmeunban @type: @@ -1098,15 +1098,15 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]= $0 = source nickname $1 = source username $2 = source hostname - $3 = ban mask + $3 = ban tqmask @window: Channel @description: - Triggered when someone has set a -b flag that matches your mask (debans you) in the channel.[br] + Triggered when someone has set a -b flag that matches your tqmask (debans you) in the channel.[br] @seealso: [event:onmeban]OnMeBan[/event] */ -EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban mask"), +EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban tqmask"), /* @doc: onbanexception @type: @@ -1119,7 +1119,7 @@ EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\ $0 = source nick $1 = source username $2 = source hostname - $3 = banexception mask + $3 = banexception tqmask @window: Channel window @description: @@ -1128,7 +1128,7 @@ EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\ [event:onbanexceptionremove]OnBanExceptionRemove[/event] */ - EVENT("OnBanException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban exception mask"), + EVENT("OnBanException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban exception tqmask"), /* @doc: onbanexceptionremove @type: @@ -1141,7 +1141,7 @@ EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\ $0 = source nick $1 = source username $2 = source hostname - $3 = unban mask + $3 = unban tqmask @window: Channel window @description: @@ -1149,7 +1149,7 @@ EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\ @seealso: [event:onbanexception]OnBanException[/event] */ - EVENT("OnBanExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban exception mask"), + EVENT("OnBanExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban exception tqmask"), /* @doc: onmebanexception @type: @@ -1162,7 +1162,7 @@ EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\ $0 = source nick $1 = source username $2 = source hostname - $3 = mask + $3 = tqmask @window: Channel window @description: @@ -1171,7 +1171,7 @@ channel @seealso: [event:onmebanexceptionremove]OnMeBanExceptionRemove[/event] */ - EVENT("OnMeBanException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = mask"), + EVENT("OnMeBanException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = tqmask"), /* @doc: onmebanexceptionremove @type: @@ -1184,7 +1184,7 @@ channel $0 = source nick $1 = source username $2 = source hostname - $3 = mask + $3 = tqmask @window: Channel window @description: @@ -1192,7 +1192,7 @@ channel @seealso: [event:onmebanexception]OnMeBanException[/event] */ - EVENT("OnMeBanExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = mask"), + EVENT("OnMeBanExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = tqmask"), /* @doc: onop @type: @@ -1622,7 +1622,7 @@ channel @short: An unhandled literal server message has been received @parameters: - $0 = source mask + $0 = source tqmask $1 = message (literal) $2- = parameters @window: @@ -1636,7 +1636,7 @@ channel raw numeric events to handle them.[br] @seealso: */ - EVENT("OnUnhandledLiteral","$0 = source mask\n$1 = message\n$2- parameters"), + EVENT("OnUnhandledLiteral","$0 = source tqmask\n$1 = message\n$2- parameters"), /* @doc: onmehalfop @type: @@ -1731,7 +1731,7 @@ channel $0 = source nick $1 = source username $2 = source host - $3 = target mask + $3 = target tqmask @window: Channels window @description: @@ -1739,7 +1739,7 @@ channel @seealso: [event:oninviteexceptionremove]OnInviteExceptionRemove[/event] */ - EVENT("OnInviteException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = target mask"), + EVENT("OnInviteException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = target tqmask"), /* @doc: oninviteexceptionremove @type: @@ -1752,7 +1752,7 @@ channel $0 = source nick $1 = source username $2 = source host - $3 = target mask + $3 = target tqmask @window: Channels window @description: @@ -1760,7 +1760,7 @@ channel @seealso: [event:oninviteexceptionremove]OnInviteExceptionRemove[/event] */ - EVENT("OnInviteExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = target mask"), + EVENT("OnInviteExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = target tqmask"), /* @doc: onmeinviteexception @type: @@ -1773,16 +1773,16 @@ channel $0 = source nick $1 = source username $2 = source host - $3 = mask + $3 = tqmask @window: Channels window @description: - Someone has set mode +I on a channel with a target mask that matches - the local user mask + Someone has set mode +I on a channel with a target tqmask that matches + the local user tqmask @seealso: [event:onmeinviteexceptionremove]OnMeInviteExceptionRemove[/event] */ - EVENT("OnMeInviteException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = mask"), + EVENT("OnMeInviteException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = tqmask"), /* @doc: onmeinviteexceptionremove @type: @@ -1795,16 +1795,16 @@ channel $0 = source nick $1 = source username $2 = source host - $3 = mask + $3 = tqmask @window: Channels window @description: - Someone has set mode -I on a channel with a target mask that matches - the local user mask + Someone has set mode -I on a channel with a target tqmask that matches + the local user tqmask @seealso: [event:onmeinviteexceptionremove]OnMeInviteExceptionRemove[/event] */ - EVENT("OnMeInviteExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = mask"), + EVENT("OnMeInviteExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = tqmask"), /* @doc: onaction @type: @@ -2107,7 +2107,7 @@ channel $5 contains the original color/icon set of the message that depends on the type of the message itself.[br] Since the CTCP ACTION messages generally have different format of output - then for your convenience $6 contains 1 if the message was caused by a + then for your convenience $6 tqcontains 1 if the message was caused by a CTCP ACTION and 0 otherwise.[br] If you call [cmd]halt[/cmd] in this event the message output will be completely disabled (thus, KVIrc assumes that YOU have provided the necessary output and feedback to the user).[br] @@ -2797,11 +2797,11 @@ channel Triggered when the user requests a disconnection from a server by pressing the "disconnect", by closing the console or closing KVIrc. It is your last chance - to send some meaningful data to the server before the QUIT message + to send some meaningful data to the server before the TQUIT message is sent. You can't prevent the user from disconnecting: [cmd]halt [/cmd]does nothing here.[br] This event is useful to either give a salute to all the users you were talking with or maybe to send some commands to the - bouncer you're connected to. Note that you can override the QUIT + bouncer you're connected to. Note that you can override the TQUIT message sent by KVIrc by sending it by youself first.[br] @seealso: */ @@ -2967,7 +2967,7 @@ channel channel @description: Triggered when a channel mode has been changed, AFTER all the mode specific events - were triggered. $3 contains the unparsed mode flags (-o+b...) and $4 contains + were triggered. $3 contains the unparsed mode flags (-o+b...) and $4 tqcontains the unparsed mode parameter string (you need to split it!). */ EVENT("OnChannelModeChange","$0 = sourcenick\n$1 = sourceusername\n$2 = sourcehost\n$3 = modeflags\n$4 = mode params"), diff --git a/src/kvirc/kvs/kvi_kvs_hash.cpp b/src/kvirc/kvs/kvi_kvs_hash.cpp index 3c391fc..0d4c93f 100644 --- a/src/kvirc/kvs/kvi_kvs_hash.cpp +++ b/src/kvirc/kvs/kvi_kvs_hash.cpp @@ -28,18 +28,18 @@ KviKvsHash::KviKvsHash() { - m_pDict = new KviPointerHashTable<QString,KviKvsVariant>(17,false); + m_pDict = new KviPointerHashTable<TQString,KviKvsVariant>(17,false); m_pDict->setAutoDelete(true); } KviKvsHash::KviKvsHash(const KviKvsHash &h) { - m_pDict = new KviPointerHashTable<QString,KviKvsVariant>(); + m_pDict = new KviPointerHashTable<TQString,KviKvsVariant>(); m_pDict->setAutoDelete(true); - KviPointerHashTableIterator<QString,KviKvsVariant> it(*(h.m_pDict)); + KviPointerHashTableIterator<TQString,KviKvsVariant> it(*(h.m_pDict)); while(it.current()) { - m_pDict->replace(it.currentKey(),new KviKvsVariant(*(it.current()))); + m_pDict->tqreplace(it.currentKey(),new KviKvsVariant(*(it.current()))); ++it; } } @@ -49,9 +49,9 @@ KviKvsHash::~KviKvsHash() delete m_pDict; } -void KviKvsHash::appendAsString(QString &szBuffer) const +void KviKvsHash::appendAsString(TQString &szBuffer) const { - KviPointerHashTableIterator<QString,KviKvsVariant> it(*m_pDict); + KviPointerHashTableIterator<TQString,KviKvsVariant> it(*m_pDict); bool bNeedComma = false; while(KviKvsVariant * s = it.current()) { @@ -62,11 +62,11 @@ void KviKvsHash::appendAsString(QString &szBuffer) const } } -void KviKvsHash::serialize(QString& result) +void KviKvsHash::serialize(TQString& result) { - QString tmpBuffer; + TQString tmpBuffer; result="{"; - KviPointerHashTableIterator<QString,KviKvsVariant> it(*m_pDict); + KviPointerHashTableIterator<TQString,KviKvsVariant> it(*m_pDict); bool bNeedComma = false; while(KviKvsVariant * s = it.current()) { @@ -86,11 +86,11 @@ void KviKvsHash::serialize(QString& result) result.append('}'); } -KviKvsVariant * KviKvsHash::get(const QString &szKey) +KviKvsVariant * KviKvsHash::get(const TQString &szKey) { - KviKvsVariant * v = m_pDict->find(szKey); + KviKvsVariant * v = m_pDict->tqfind(szKey); if(v)return v; v = new KviKvsVariant(); - m_pDict->replace(szKey,v); + m_pDict->tqreplace(szKey,v); return v; } diff --git a/src/kvirc/kvs/kvi_kvs_hash.h b/src/kvirc/kvs/kvi_kvs_hash.h index e0b2d86..69ce692 100644 --- a/src/kvirc/kvs/kvi_kvs_hash.h +++ b/src/kvirc/kvs/kvi_kvs_hash.h @@ -32,7 +32,7 @@ #include "kvi_kvs_variant.h" #include "kvi_heapobject.h" -typedef KVIRC_API KviPointerHashTableIterator<QString,KviKvsVariant> KviKvsHashIterator; +typedef KVIRC_API KviPointerHashTableIterator<TQString,KviKvsVariant> KviKvsHashIterator; // This class must not have virtual funcitons nor destructor // Otherwise it will happily crash on windows when it is @@ -44,21 +44,21 @@ public: KviKvsHash(const KviKvsHash &h); ~KviKvsHash(); protected: - KviPointerHashTable<QString,KviKvsVariant> * m_pDict; + KviPointerHashTable<TQString,KviKvsVariant> * m_pDict; public: - void unset(const QString &szKey){ m_pDict->remove(szKey); }; - void set(const QString &szKey,KviKvsVariant * pVal){ m_pDict->replace(szKey,pVal); }; - KviKvsVariant * find(const QString &szKey) const { return m_pDict->find(szKey); }; - KviKvsVariant * get(const QString &szKey); + void unset(const TQString &szKey){ m_pDict->remove(szKey); }; + void set(const TQString &szKey,KviKvsVariant * pVal){ m_pDict->tqreplace(szKey,pVal); }; + KviKvsVariant * tqfind(const TQString &szKey) const { return m_pDict->tqfind(szKey); }; + KviKvsVariant * get(const TQString &szKey); bool isEmpty() const { return m_pDict->isEmpty(); }; kvs_uint_t size() const { return m_pDict->count(); }; - void appendAsString(QString &szBuffer) const; + void appendAsString(TQString &szBuffer) const; - const KviPointerHashTable<QString,KviKvsVariant> * dict(){ return m_pDict; }; + const KviPointerHashTable<TQString,KviKvsVariant> * dict(){ return m_pDict; }; - void serialize(QString& result); + void serialize(TQString& result); }; #endif //!_KVI_KVS_HASH_H_ diff --git a/src/kvirc/kvs/kvi_kvs_kernel.cpp b/src/kvirc/kvs/kvi_kvs_kernel.cpp index 9c709fe..e16bed3 100644 --- a/src/kvirc/kvs/kvi_kvs_kernel.cpp +++ b/src/kvirc/kvs/kvi_kvs_kernel.cpp @@ -47,13 +47,13 @@ KviKvsKernel::KviKvsKernel() { m_pKvsKernel = this; - m_pSpecialCommandParsingRoutineDict = new KviPointerHashTable<QString,KviKvsSpecialCommandParsingRoutine>(17,false); + m_pSpecialCommandParsingRoutineDict = new KviPointerHashTable<TQString,KviKvsSpecialCommandParsingRoutine>(17,false); m_pSpecialCommandParsingRoutineDict->setAutoDelete(true); - m_pCoreSimpleCommandExecRoutineDict = new KviPointerHashTable<QString,KviKvsCoreSimpleCommandExecRoutine>(51,false); + m_pCoreSimpleCommandExecRoutineDict = new KviPointerHashTable<TQString,KviKvsCoreSimpleCommandExecRoutine>(51,false); m_pCoreSimpleCommandExecRoutineDict->setAutoDelete(true); - m_pCoreFunctionExecRoutineDict = new KviPointerHashTable<QString,KviKvsCoreFunctionExecRoutine>(51,false); + m_pCoreFunctionExecRoutineDict = new KviPointerHashTable<TQString,KviKvsCoreFunctionExecRoutine>(51,false); m_pCoreFunctionExecRoutineDict->setAutoDelete(true); - m_pCoreCallbackCommandExecRoutineDict = new KviPointerHashTable<QString,KviKvsCoreCallbackCommandExecRoutine>(17,false); + m_pCoreCallbackCommandExecRoutineDict = new KviPointerHashTable<TQString,KviKvsCoreCallbackCommandExecRoutine>(17,false); m_pCoreCallbackCommandExecRoutineDict->setAutoDelete(true); m_pGlobalVariables = new KviKvsHash(); @@ -101,20 +101,20 @@ void KviKvsKernel::done() #define COMPLETE_COMMAND_BY_DICT(__type,__dict) \ { \ - KviPointerHashTableIterator<QString,__type> it(*__dict); \ + KviPointerHashTableIterator<TQString,__type> it(*__dict); \ int l = szCommandBegin.length(); \ while(it.current()) \ { \ - if(KviQString::equalCIN(szCommandBegin,it.currentKey(),l)) \ - pMatches->append(new QString(it.currentKey())); \ + if(KviTQString::equalCIN(szCommandBegin,it.currentKey(),l)) \ + pMatches->append(new TQString(it.currentKey())); \ ++it; \ } \ } -void KviKvsKernel::completeCommand(const QString &szCommandBegin,KviPointerList<QString> * pMatches) +void KviKvsKernel::completeCommand(const TQString &szCommandBegin,KviPointerList<TQString> * pMatches) { - int idx = szCommandBegin.find(QChar('.')); + int idx = szCommandBegin.tqfind(TQChar('.')); if(idx == -1) { // no module name inside @@ -122,97 +122,97 @@ void KviKvsKernel::completeCommand(const QString &szCommandBegin,KviPointerList< COMPLETE_COMMAND_BY_DICT(KviKvsSpecialCommandParsingRoutine,m_pSpecialCommandParsingRoutineDict) COMPLETE_COMMAND_BY_DICT(KviKvsCoreCallbackCommandExecRoutine,m_pCoreCallbackCommandExecRoutineDict) - KviPointerList<QString> lModules; + KviPointerList<TQString> lModules; lModules.setAutoDelete(true); g_pModuleManager->completeModuleNames(szCommandBegin,&lModules); - QString szEmpty = ""; - for(QString * pszModuleName = lModules.first();pszModuleName;pszModuleName = lModules.next()) + TQString szEmpty = ""; + for(TQString * pszModuleName = lModules.first();pszModuleName;pszModuleName = lModules.next()) completeModuleCommand(*pszModuleName,szEmpty,pMatches); KviKvsAliasManager::instance()->completeCommand(szCommandBegin,pMatches); } else { // contains a module name - QString szModuleName = szCommandBegin.left(idx); - QString szRight = szCommandBegin.right(szCommandBegin.length() - (idx+1)); + TQString szModuleName = szCommandBegin.left(idx); + TQString szRight = szCommandBegin.right(szCommandBegin.length() - (idx+1)); completeModuleCommand(szModuleName,szRight,pMatches); } } -void KviKvsKernel::completeModuleCommand(const QString &szModuleName,const QString &szCommandBegin,KviPointerList<QString> * pMatches) +void KviKvsKernel::completeModuleCommand(const TQString &szModuleName,const TQString &szCommandBegin,KviPointerList<TQString> * pMatches) { KviModule * pModule = g_pModuleManager->getModule(szModuleName.latin1()); if(!pModule)return; - KviPointerList<QString> lModuleMatches; + KviPointerList<TQString> lModuleMatches; lModuleMatches.setAutoDelete(true); pModule->completeCommand(szCommandBegin,&lModuleMatches); - for(QString * pszModuleMatch = lModuleMatches.first();pszModuleMatch;pszModuleMatch = lModuleMatches.next()) + for(TQString * pszModuleMatch = lModuleMatches.first();pszModuleMatch;pszModuleMatch = lModuleMatches.next()) { - QString * pszMatch = new QString(*pszModuleMatch); + TQString * pszMatch = new TQString(*pszModuleMatch); pszMatch->prepend("."); pszMatch->prepend(szModuleName); pMatches->append(pszMatch); } } -void KviKvsKernel::completeFunction(const QString &szFunctionBegin,KviPointerList<QString> * pMatches) +void KviKvsKernel::completeFunction(const TQString &szFunctionBegin,KviPointerList<TQString> * pMatches) { - int idx = szFunctionBegin.find(QChar('.')); + int idx = szFunctionBegin.tqfind(TQChar('.')); if(idx == -1) { // no module name inside - KviPointerHashTableIterator<QString,KviKvsCoreFunctionExecRoutine> it(*m_pCoreFunctionExecRoutineDict); + KviPointerHashTableIterator<TQString,KviKvsCoreFunctionExecRoutine> it(*m_pCoreFunctionExecRoutineDict); int l = szFunctionBegin.length(); while(it.current()) { - if(KviQString::equalCIN(szFunctionBegin,it.currentKey(),l)) + if(KviTQString::equalCIN(szFunctionBegin,it.currentKey(),l)) { - QString * pMatch = new QString(it.currentKey()); + TQString * pMatch = new TQString(it.currentKey()); //pMatch->prepend("$"); pMatches->append(pMatch); } ++it; } - KviPointerList<QString> lModules; + KviPointerList<TQString> lModules; lModules.setAutoDelete(true); g_pModuleManager->completeModuleNames(szFunctionBegin,&lModules); - QString szEmpty = ""; - for(QString * pszModuleName = lModules.first();pszModuleName;pszModuleName = lModules.next()) + TQString szEmpty = ""; + for(TQString * pszModuleName = lModules.first();pszModuleName;pszModuleName = lModules.next()) completeModuleFunction(*pszModuleName,szEmpty,pMatches); - KviPointerList<QString> lAliases; + KviPointerList<TQString> lAliases; lAliases.setAutoDelete(true); KviKvsAliasManager::instance()->completeCommand(szFunctionBegin,&lAliases); - for(QString * pszAlias = lAliases.first();pszAlias;pszAlias = lAliases.next()) + for(TQString * pszAlias = lAliases.first();pszAlias;pszAlias = lAliases.next()) { - QString * pszAliasMatch = new QString(*pszAlias); + TQString * pszAliasMatch = new TQString(*pszAlias); //pszAliasMatch->prepend("$"); pMatches->append(pszAliasMatch); } } else { // contains a module name - QString szModuleName = szFunctionBegin.left(idx); - QString szRight = szFunctionBegin.right(szFunctionBegin.length() - (idx+1)); + TQString szModuleName = szFunctionBegin.left(idx); + TQString szRight = szFunctionBegin.right(szFunctionBegin.length() - (idx+1)); completeModuleFunction(szModuleName,szRight,pMatches); } } -void KviKvsKernel::completeModuleFunction(const QString &szModuleName,const QString &szCommandBegin,KviPointerList<QString> * pMatches) +void KviKvsKernel::completeModuleFunction(const TQString &szModuleName,const TQString &szCommandBegin,KviPointerList<TQString> * pMatches) { KviModule * pModule = g_pModuleManager->getModule(szModuleName.latin1()); if(!pModule)return; - KviPointerList<QString> lModuleMatches; + KviPointerList<TQString> lModuleMatches; lModuleMatches.setAutoDelete(true); pModule->completeFunction(szCommandBegin,&lModuleMatches); - for(QString * pszModuleMatch = lModuleMatches.first();pszModuleMatch;pszModuleMatch = lModuleMatches.next()) + for(TQString * pszModuleMatch = lModuleMatches.first();pszModuleMatch;pszModuleMatch = lModuleMatches.next()) { - QString * pszMatch = new QString(*pszModuleMatch); + TQString * pszMatch = new TQString(*pszModuleMatch); pszMatch->prepend("."); pszMatch->prepend(szModuleName); //pszMatch->prepend("$"); diff --git a/src/kvirc/kvs/kvi_kvs_kernel.h b/src/kvirc/kvs/kvi_kvs_kernel.h index a6f8eb2..7c15655 100644 --- a/src/kvirc/kvs/kvi_kvs_kernel.h +++ b/src/kvirc/kvs/kvi_kvs_kernel.h @@ -76,11 +76,11 @@ public: private: static KviKvsKernel * m_pKvsKernel; // global kernel object - KviPointerHashTable<QString,KviKvsSpecialCommandParsingRoutine> * m_pSpecialCommandParsingRoutineDict; + KviPointerHashTable<TQString,KviKvsSpecialCommandParsingRoutine> * m_pSpecialCommandParsingRoutineDict; - KviPointerHashTable<QString,KviKvsCoreSimpleCommandExecRoutine> * m_pCoreSimpleCommandExecRoutineDict; - KviPointerHashTable<QString,KviKvsCoreCallbackCommandExecRoutine> * m_pCoreCallbackCommandExecRoutineDict; - KviPointerHashTable<QString,KviKvsCoreFunctionExecRoutine> * m_pCoreFunctionExecRoutineDict; + KviPointerHashTable<TQString,KviKvsCoreSimpleCommandExecRoutine> * m_pCoreSimpleCommandExecRoutineDict; + KviPointerHashTable<TQString,KviKvsCoreCallbackCommandExecRoutine> * m_pCoreCallbackCommandExecRoutineDict; + KviPointerHashTable<TQString,KviKvsCoreFunctionExecRoutine> * m_pCoreFunctionExecRoutineDict; KviKvsHash * m_pGlobalVariables; KviKvsVariantList * m_pEmptyParameterList; @@ -100,34 +100,34 @@ public: KviKvsAsyncOperationManager * asyncOperationManager(){ return m_pAsyncOperationManager; }; - void registerSpecialCommandParsingRoutine(const QString &szCmdName,KviKvsSpecialCommandParsingRoutine * r) - { m_pSpecialCommandParsingRoutineDict->replace(szCmdName,r); }; - KviKvsSpecialCommandParsingRoutine * findSpecialCommandParsingRoutine(const QString &szCmdName) - { return m_pSpecialCommandParsingRoutineDict->find(szCmdName); }; - - void registerCoreSimpleCommandExecRoutine(const QString &szCmdName,KviKvsCoreSimpleCommandExecRoutine * r) - { m_pCoreSimpleCommandExecRoutineDict->replace(szCmdName,r); }; - KviKvsCoreSimpleCommandExecRoutine * findCoreSimpleCommandExecRoutine(const QString &szCmdName) - { return m_pCoreSimpleCommandExecRoutineDict->find(szCmdName); }; - - void registerCoreFunctionExecRoutine(const QString &szFncName,KviKvsCoreFunctionExecRoutine * r) - { m_pCoreFunctionExecRoutineDict->replace(szFncName,r); }; - KviKvsCoreFunctionExecRoutine * findCoreFunctionExecRoutine(const QString &szFncName) - { return m_pCoreFunctionExecRoutineDict->find(szFncName); }; - - void registerCoreCallbackCommandExecRoutine(const QString &szCmdName,KviKvsCoreCallbackCommandExecRoutine * r) - { m_pCoreCallbackCommandExecRoutineDict->replace(szCmdName,r); }; - KviKvsCoreCallbackCommandExecRoutine * findCoreCallbackCommandExecRoutine(const QString &szCmdName) - { return m_pCoreCallbackCommandExecRoutineDict->find(szCmdName); }; - - void completeCommand(const QString &szCommandBegin,KviPointerList<QString> * pMatches); - void completeFunction(const QString &szFunctionBegin,KviPointerList<QString> * pMatches); - void completeModuleCommand(const QString &szModuleName,const QString &szCommandBegin,KviPointerList<QString> * matches); - void completeModuleFunction(const QString &szModuleName,const QString &szFunctionBegin,KviPointerList<QString> * matches); + void registerSpecialCommandParsingRoutine(const TQString &szCmdName,KviKvsSpecialCommandParsingRoutine * r) + { m_pSpecialCommandParsingRoutineDict->tqreplace(szCmdName,r); }; + KviKvsSpecialCommandParsingRoutine * findSpecialCommandParsingRoutine(const TQString &szCmdName) + { return m_pSpecialCommandParsingRoutineDict->tqfind(szCmdName); }; + + void registerCoreSimpleCommandExecRoutine(const TQString &szCmdName,KviKvsCoreSimpleCommandExecRoutine * r) + { m_pCoreSimpleCommandExecRoutineDict->tqreplace(szCmdName,r); }; + KviKvsCoreSimpleCommandExecRoutine * findCoreSimpleCommandExecRoutine(const TQString &szCmdName) + { return m_pCoreSimpleCommandExecRoutineDict->tqfind(szCmdName); }; + + void registerCoreFunctionExecRoutine(const TQString &szFncName,KviKvsCoreFunctionExecRoutine * r) + { m_pCoreFunctionExecRoutineDict->tqreplace(szFncName,r); }; + KviKvsCoreFunctionExecRoutine * findCoreFunctionExecRoutine(const TQString &szFncName) + { return m_pCoreFunctionExecRoutineDict->tqfind(szFncName); }; + + void registerCoreCallbackCommandExecRoutine(const TQString &szCmdName,KviKvsCoreCallbackCommandExecRoutine * r) + { m_pCoreCallbackCommandExecRoutineDict->tqreplace(szCmdName,r); }; + KviKvsCoreCallbackCommandExecRoutine * findCoreCallbackCommandExecRoutine(const TQString &szCmdName) + { return m_pCoreCallbackCommandExecRoutineDict->tqfind(szCmdName); }; + + void completeCommand(const TQString &szCommandBegin,KviPointerList<TQString> * pMatches); + void completeFunction(const TQString &szFunctionBegin,KviPointerList<TQString> * pMatches); + void completeModuleCommand(const TQString &szModuleName,const TQString &szCommandBegin,KviPointerList<TQString> * matches); + void completeModuleFunction(const TQString &szModuleName,const TQString &szFunctionBegin,KviPointerList<TQString> * matches); /* - KviPointerList<QString> * completeCommandAllocateResult(const QString &szCommandBegin); - KviPointerList<QString> * completeFunctionAllocateResult(const QString &szFunctionBegin); - void freeCompletionResult(KviPointerList<QString> * l); + KviPointerList<TQString> * completeCommandAllocateResult(const TQString &szCommandBegin); + KviPointerList<TQString> * completeFunctionAllocateResult(const TQString &szFunctionBegin); + void freeCompletionResult(KviPointerList<TQString> * l); */ }; diff --git a/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp b/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp index 911eb8c..c678cef 100644 --- a/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp +++ b/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp @@ -32,13 +32,13 @@ #include "kvi_kvs_treenode_data.h" #include "kvi_kvs_treenode_datalist.h" -bool KviKvsModuleCallbackCommandCall::getParameterCode(unsigned int uParamIdx,QString &szParamBuffer) +bool KviKvsModuleCallbackCommandCall::getParameterCode(unsigned int uParamIdx,TQString &szParamBuffer) { if(!m_pParameterDataList)return false; KviKvsTreeNodeData * d = m_pParameterDataList->item(uParamIdx); if(!d)return false; - const QChar * pBegin = d->location(); - const QChar * pEnd = d->endingLocation(); + const TQChar * pBegin = d->location(); + const TQChar * pEnd = d->endingLocation(); if(!(pBegin && pEnd))return false; szParamBuffer.setUnicode(pBegin,pEnd - pBegin); szParamBuffer.stripWhiteSpace(); @@ -48,11 +48,11 @@ bool KviKvsModuleCallbackCommandCall::getParameterCode(unsigned int uParamIdx,QS KviKvsModuleInterface::KviKvsModuleInterface() { - m_pModuleSimpleCommandExecRoutineDict = new KviPointerHashTable<QString,KviKvsModuleSimpleCommandExecRoutine>(17,false); + m_pModuleSimpleCommandExecRoutineDict = new KviPointerHashTable<TQString,KviKvsModuleSimpleCommandExecRoutine>(17,false); m_pModuleSimpleCommandExecRoutineDict->setAutoDelete(true); - m_pModuleFunctionExecRoutineDict = new KviPointerHashTable<QString,KviKvsModuleFunctionExecRoutine>(17,false); + m_pModuleFunctionExecRoutineDict = new KviPointerHashTable<TQString,KviKvsModuleFunctionExecRoutine>(17,false); m_pModuleFunctionExecRoutineDict->setAutoDelete(true); - m_pModuleCallbackCommandExecRoutineDict = new KviPointerHashTable<QString,KviKvsModuleCallbackCommandExecRoutine>(17,false); + m_pModuleCallbackCommandExecRoutineDict = new KviPointerHashTable<TQString,KviKvsModuleCallbackCommandExecRoutine>(17,false); m_pModuleCallbackCommandExecRoutineDict->setAutoDelete(true); } @@ -66,41 +66,41 @@ KviKvsModuleInterface::~KviKvsModuleInterface() #define COMPLETE_WORD_BY_DICT(__word,__list,__type,__dict) \ { \ - KviPointerHashTableIterator<QString,__type> it(*__dict); \ + KviPointerHashTableIterator<TQString,__type> it(*__dict); \ int l = __word.length(); \ while(it.current()) \ { \ - if(KviQString::equalCIN(__word,it.currentKey(),l)) \ - __list->append(new QString(it.currentKey())); \ + if(KviTQString::equalCIN(__word,it.currentKey(),l)) \ + __list->append(new TQString(it.currentKey())); \ ++it; \ } \ } -void KviKvsModuleInterface::completeCommand(const QString &szCommandBegin,KviPointerList<QString> * pMatches) +void KviKvsModuleInterface::completeCommand(const TQString &szCommandBegin,KviPointerList<TQString> * pMatches) { COMPLETE_WORD_BY_DICT(szCommandBegin,pMatches,KviKvsModuleSimpleCommandExecRoutine,m_pModuleSimpleCommandExecRoutineDict) COMPLETE_WORD_BY_DICT(szCommandBegin,pMatches,KviKvsModuleCallbackCommandExecRoutine,m_pModuleCallbackCommandExecRoutineDict) } -void KviKvsModuleInterface::completeFunction(const QString &szFunctionBegin,KviPointerList<QString> * pMatches) +void KviKvsModuleInterface::completeFunction(const TQString &szFunctionBegin,KviPointerList<TQString> * pMatches) { COMPLETE_WORD_BY_DICT(szFunctionBegin,pMatches,KviKvsModuleFunctionExecRoutine,m_pModuleFunctionExecRoutineDict) } -void KviKvsModuleInterface::kvsRegisterSimpleCommand(const QString &szCommand,KviKvsModuleSimpleCommandExecRoutine r) +void KviKvsModuleInterface::kvsRegisterSimpleCommand(const TQString &szCommand,KviKvsModuleSimpleCommandExecRoutine r) { - m_pModuleSimpleCommandExecRoutineDict->replace(szCommand,new KviKvsModuleSimpleCommandExecRoutine(r)); + m_pModuleSimpleCommandExecRoutineDict->tqreplace(szCommand,new KviKvsModuleSimpleCommandExecRoutine(r)); } -void KviKvsModuleInterface::kvsRegisterCallbackCommand(const QString &szCommand,KviKvsModuleCallbackCommandExecRoutine r) +void KviKvsModuleInterface::kvsRegisterCallbackCommand(const TQString &szCommand,KviKvsModuleCallbackCommandExecRoutine r) { - m_pModuleCallbackCommandExecRoutineDict->replace(szCommand,new KviKvsModuleCallbackCommandExecRoutine(r)); + m_pModuleCallbackCommandExecRoutineDict->tqreplace(szCommand,new KviKvsModuleCallbackCommandExecRoutine(r)); } -void KviKvsModuleInterface::kvsRegisterFunction(const QString &szFunction,KviKvsModuleFunctionExecRoutine r) +void KviKvsModuleInterface::kvsRegisterFunction(const TQString &szFunction,KviKvsModuleFunctionExecRoutine r) { - m_pModuleFunctionExecRoutineDict->replace(szFunction,new KviKvsModuleFunctionExecRoutine(r)); + m_pModuleFunctionExecRoutineDict->tqreplace(szFunction,new KviKvsModuleFunctionExecRoutine(r)); } @@ -161,7 +161,7 @@ static bool default_module_kvs_cmd_unload(KviKvsModuleCommandCall *c) { if(c->module()->isLocked()) { - if(!c->switches()->find('f',"force")) + if(!c->switches()->tqfind('f',"force")) { c->warning(__tr2qs("Can't unload the module: it has locked itself in memory")); return true; diff --git a/src/kvirc/kvs/kvi_kvs_moduleinterface.h b/src/kvirc/kvs/kvi_kvs_moduleinterface.h index ccfbaca..698c393 100644 --- a/src/kvirc/kvs/kvi_kvs_moduleinterface.h +++ b/src/kvirc/kvs/kvi_kvs_moduleinterface.h @@ -79,8 +79,8 @@ public: KviKvsSwitchList * switchList(){ return m_pSwitchList; }; // forwarders for the switch list - bool hasSwitch(unsigned short u,const QString &szSwitch){ return (m_pSwitchList->find(u,szSwitch) != 0); }; - KviKvsVariant * getSwitch(unsigned short u,const QString &szSwitch){ return m_pSwitchList->find(u,szSwitch); }; + bool hasSwitch(unsigned short u,const TQString &szSwitch){ return (m_pSwitchList->tqfind(u,szSwitch) != 0); }; + KviKvsVariant * getSwitch(unsigned short u,const TQString &szSwitch){ return m_pSwitchList->tqfind(u,szSwitch); }; }; class KVIRC_API KviKvsModuleCallbackCommandCall : public KviKvsModuleCommandCall @@ -100,7 +100,7 @@ public: public: // Never NULL, but may have empty code const KviKvsScript * callback(){ return m_pCallback; }; - virtual bool getParameterCode(unsigned int uParamIdx,QString &szParamBuffer); + virtual bool getParameterCode(unsigned int uParamIdx,TQString &szParamBuffer); }; @@ -137,21 +137,21 @@ public: KviKvsModuleInterface(); ~KviKvsModuleInterface(); protected: - KviPointerHashTable<QString,KviKvsModuleSimpleCommandExecRoutine> * m_pModuleSimpleCommandExecRoutineDict; - KviPointerHashTable<QString,KviKvsModuleFunctionExecRoutine> * m_pModuleFunctionExecRoutineDict; - KviPointerHashTable<QString,KviKvsModuleCallbackCommandExecRoutine> * m_pModuleCallbackCommandExecRoutineDict; + KviPointerHashTable<TQString,KviKvsModuleSimpleCommandExecRoutine> * m_pModuleSimpleCommandExecRoutineDict; + KviPointerHashTable<TQString,KviKvsModuleFunctionExecRoutine> * m_pModuleFunctionExecRoutineDict; + KviPointerHashTable<TQString,KviKvsModuleCallbackCommandExecRoutine> * m_pModuleCallbackCommandExecRoutineDict; public: - void kvsRegisterSimpleCommand(const QString &szCommand,KviKvsModuleSimpleCommandExecRoutine r); - void kvsRegisterCallbackCommand(const QString &szCommand,KviKvsModuleCallbackCommandExecRoutine r); - void kvsRegisterFunction(const QString &szFunction,KviKvsModuleFunctionExecRoutine r); + void kvsRegisterSimpleCommand(const TQString &szCommand,KviKvsModuleSimpleCommandExecRoutine r); + void kvsRegisterCallbackCommand(const TQString &szCommand,KviKvsModuleCallbackCommandExecRoutine r); + void kvsRegisterFunction(const TQString &szFunction,KviKvsModuleFunctionExecRoutine r); bool kvsRegisterAppEventHandler(unsigned int iEventIdx,KviKvsModuleEventHandlerRoutine r); bool kvsRegisterRawEventHandler(unsigned int iRawIdx,KviKvsModuleEventHandlerRoutine r); - void kvsUnregisterSimpleCommand(const QString &szCommand) + void kvsUnregisterSimpleCommand(const TQString &szCommand) { m_pModuleSimpleCommandExecRoutineDict->remove(szCommand); }; - void kvsUnregisterCallbackCommand(const QString &szCommand) + void kvsUnregisterCallbackCommand(const TQString &szCommand) { m_pModuleCallbackCommandExecRoutineDict->remove(szCommand); }; - void kvsUnregisterFunction(const QString &szFunction) + void kvsUnregisterFunction(const TQString &szFunction) { m_pModuleFunctionExecRoutineDict->remove(szFunction); }; void kvsUnregisterAppEventHandler(unsigned int iEventIdx); void kvsUnregisterRawEventHandler(unsigned int iRawIdx); @@ -166,15 +166,15 @@ public: void kvsUnregisterAllRawEventHandlers(); void kvsUnregisterAllEventHandlers(); - KviKvsModuleSimpleCommandExecRoutine * kvsFindSimpleCommand(const QString &szCommand) - { return m_pModuleSimpleCommandExecRoutineDict->find(szCommand); }; - KviKvsModuleCallbackCommandExecRoutine * kvsFindCallbackCommand(const QString &szCommand) - { return m_pModuleCallbackCommandExecRoutineDict->find(szCommand); }; - KviKvsModuleFunctionExecRoutine * kvsFindFunction(const QString &szFunction) - { return m_pModuleFunctionExecRoutineDict->find(szFunction); }; + KviKvsModuleSimpleCommandExecRoutine * kvsFindSimpleCommand(const TQString &szCommand) + { return m_pModuleSimpleCommandExecRoutineDict->tqfind(szCommand); }; + KviKvsModuleCallbackCommandExecRoutine * kvsFindCallbackCommand(const TQString &szCommand) + { return m_pModuleCallbackCommandExecRoutineDict->tqfind(szCommand); }; + KviKvsModuleFunctionExecRoutine * kvsFindFunction(const TQString &szFunction) + { return m_pModuleFunctionExecRoutineDict->tqfind(szFunction); }; - void completeCommand(const QString &cmd,KviPointerList<QString> * matches); - void completeFunction(const QString &cmd,KviPointerList<QString> * matches); + void completeCommand(const TQString &cmd,KviPointerList<TQString> * matches); + void completeFunction(const TQString &cmd,KviPointerList<TQString> * matches); protected: void registerDefaultCommands(); }; @@ -219,7 +219,7 @@ protected: KVS_PARAMETERS_END \ if(!KviKvsParameterProcessor::process(pCall->params(),pCall->context(),parameter_format_list))return false; -#define KVSM_REQUIRE_CONNECTION(pCall) \ +#define KVSM_RETQUIRE_CONNECTION(pCall) \ if(!pCall->window()->context())return c->context()->errorNoIrcContext(); \ if(!pCall->window()->connection())return c->context()->warningNoIrcConnection(); diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp index 0447cfd..6d51de2 100644 --- a/src/kvirc/kvs/kvi_kvs_object.cpp +++ b/src/kvirc/kvs/kvi_kvs_object.cpp @@ -43,10 +43,10 @@ #include "kvi_kvs_object_functioncall.h" #include "kvi_kvs_object_functionhandlerimpl.h" -#include <qmetaobject.h> -#include <qtimer.h> +#include <tqmetaobject.h> +#include <tqtimer.h> #include <time.h> -#include <qiconset.h> +#include <tqiconset.h> @@ -69,11 +69,11 @@ [big]Basic concepts[/big] Objects are arranged in tree structures. - Each object that you create is either toplevel object or a children - of another object. A toplevel object is a parentless one. - Obviously all objects can have children objects.[br][br] + Each object that you create is either toplevel object or a tqchildren + of another object. A toplevel object is a tqparentless one. + Obviously all objects can have tqchildren objects.[br][br] - When an object is destroyed , all its children are also destroyed. + When an object is destroyed , all its tqchildren are also destroyed. The toplevel objects are automatically destroyed when KVIrc quits. The objects are global to the entire application (this is different from previous KVIrc releases where the objects were local @@ -85,7 +85,7 @@ by the programmer; the name is just a mnemonic expedient, and you may also not need it.[br][br] - Each object is identified by an [b]OPAQUE UNIQUE ID[/b]. + Each object is identified by an [b]OPAQUE UNITQUE ID[/b]. The ID is assigned by KVIrc and can be held in any variable. You can think the object id as a "handle for the object" or the object's pointer. Any action performed on the object will require its ID.[br][br] @@ -95,7 +95,7 @@ To create an object you must use the [fnc]$new[/fnc]() function. [fnc]$new[/fnc]() requires three parameters:[br] - The object class (more about object classes later in this document)[br] - - The ID of the parent object , (that can be 0 for toplevel objects).[br] + - The ID of the tqparent object , (that can be 0 for toplevel objects).[br] - The object name (eventually empty)[br] [example] %myobject = [fnc]$new[/fnc]([class]object[/class],0,theName) @@ -113,7 +113,7 @@ [example] [cmd]if[/cmd](%myobject == %anotherobject)[cmd]echo[/cmd] "This is the same object!"; [/example] - The parent object id is optional, if not specified it is assumed to be 0. + The tqparent object id is optional, if not specified it is assumed to be 0. The object name is optional , but it may help you later in finding the object.[br][br] To destroy an object use the [cmd]delete[/cmd] command. (In previous versions @@ -121,7 +121,7 @@ [example] [cmd]delete[/cmd] %myobject [/example] - If the destroyed object has children objects , these are destroyed too.[br][br] + If the destroyed object has tqchildren objects , these are destroyed too.[br][br] [big]Fields : objects as pseudo-structures[/big] @@ -196,15 +196,15 @@ [cmd]delete[/cmd] %tmp [/example] Another cool function exported by the [class:object]object[/class] class is the - [classfnc:object]$children[/classfnc]() function. - It returns a comma separated list of children identifiers.[br] + [classfnc:object]$tqchildren[/classfnc]() function. + It returns a comma separated list of tqchildren identifiers.[br] [example] %tmp = [fnc]$new[/fnc]([class]object[/class],0,myobject) %tmpchild = [fnc]$new[/fnc]([class]object[/class],%tmp,child1) %tmpchild = [fnc]$new[/fnc]([class]object[/class],%tmp,child2) %tmpchild = [fnc]$new[/fnc]([class]object[/class],%tmp,child3) - [cmd]echo[/cmd] The object's children list is : %tmp->[classfnc:object]$children[/classfnc]() - # Destroy the object and the children + [cmd]echo[/cmd] The object's tqchildren list is : %tmp->[classfnc:object]$tqchildren[/classfnc]() + # Destroy the object and the tqchildren [cmd]delete[/cmd] %tmp [/example] There are two special functions for each objects: the "constructor" and the "destructor". @@ -230,25 +230,25 @@ [cmd]privateimpl[/cmd](%tmp,destructor) { %count = 0; - [cmd]foreach[/cmd](%t,[fnc]$this[/fnc]->[classfnc:object]$children[/classfnc]()) + [cmd]foreach[/cmd](%t,[fnc]$this[/fnc]->[classfnc:object]$tqchildren[/classfnc]()) { [cmd]echo[/cmd] Children : %t->[classfnc:object]$name[/classfnc]() with class %t->[classfnc:object]$class[/classfnc]() %count++ } - [cmd]echo[/cmd] Just before destroying my %count children. + [cmd]echo[/cmd] Just before destroying my %count tqchildren. } - # Destroy the object and the children + # Destroy the object and the tqchildren [cmd]delete[/cmd] %tmp [/example] In the example above four objects have been created. - A "parent" object named "myobject" , and three children objects. + A "tqparent" object named "myobject" , and three tqchildren objects. The destructor has been reimplemented for each child object, to make it "say" its name (Please note the usage of [fnc]$this[/fnc]). - In the parent destructor the children have been counted and listed.[br] - Then the parent object is destroyed causing to:[br] - - trigger the parent destructor.[br] - - destroy all the children (and conseguently trigger all the "individual" destructors).[br][br] + In the tqparent destructor the tqchildren have been counted and listed.[br] + Then the tqparent object is destroyed causing to:[br] + - trigger the tqparent destructor.[br] + - destroy all the tqchildren (and conseguently trigger all the "individual" destructors).[br][br] Not all the object functions must return a value: If a function does not return a meaningful value , or you just want to ignore it , you can call it in the following way:[br] @@ -339,7 +339,7 @@ The above class is named "helloworld". It inherits the [class]object[/class] class. This means that it acquires all the [class]object[/class] fuunctions: [classfnc:object]$name[/classfnc]() , - [classfnc:object]$class[/class]() , [classfnc:object]$children[/classfnc]()... + [classfnc:object]$class[/class]() , [classfnc:object]$tqchildren[/classfnc]()... Additionally , it has the $sayhello() function, that "echoes Hello world" to the console. Now you can create an instance of this class: [example] @@ -486,7 +486,7 @@ @description: This is the base class for all the builtin KVirc object classes. It exports the functions to retrieve the object name, to iterate - through children objects and to lookup a child object by name or class. + through tqchildren objects and to lookup a child object by name or class. Additionally , this class provides the builtin timer functionality. The [classfnc]$constructor[/classfnc] and [classfnc]$destructor[/classfnc] functions are empty implementations that all the other classes inherit. @@ -499,8 +499,8 @@ The default implementation emits the signal "[classsignal]destroyed[/classsignal]". !fn: $name() Returns the name of this object. - !fn: $parent() - Returns the parent object of this object or 0 if this object has no parent. + !fn: $tqparent() + Returns the tqparent object of this object or 0 if this object has no tqparent. !fn: $timerEvent(<timerId>) Handler for the timer events. The default implementation does nothing. @@ -521,15 +521,15 @@ Returns the first child that matches <class> and <name>. If <class> is an empty string, any class matches, if <name> is an empty string, any name matches. - This function traverses the entire tree of children + This function traverses the entire tree of tqchildren but is NOT recursive. !fn: $childCount() - Returns the number of children objects + Returns the number of tqchildren objects !fn: $emit(<signal_name>[,parameters]) Emits the signal <signal_name> passing the optional [parameters]. See the [doc:objects]objects documentation[/doc] for an overview of signals and slots. - !fn: $children() - Returns an array of children object identifiers. + !fn: $tqchildren() + Returns an array of tqchildren object identifiers. !fn: $signalSender() Returns the current signal sender when in a slot connected to a signal. In other contexts this function returns an empty string. @@ -540,11 +540,11 @@ one of this object's slots. This means that in a slot handler it returns the name of the signal that has triggered it. - !fn: $property(<Qt property name>[,bNowarning:boolean]) + !fn: $property(<TQt property name>[,bNowarning:boolean]) This is for really advanced scripting.[br] - All KVIrc widgets are based on the Qt library ones.[br] - The Qt library allow to set and read special properties.[br] - You will have to take a look at the Qt documentation for each widget type + All KVIrc widgets are based on the TQt library ones.[br] + The TQt library allow to set and read special properties.[br] + You will have to take a look at the TQt documentation for each widget type to see the available property names.[br] The supported property types are: Rect, Size, Point, Color, String, CString, Int, UInt, Bool and enumeration types.[br] @@ -553,9 +553,9 @@ There are many properties that are available ony through the [classfnc]$property()[classfnc]" call:[br] For example, you can find out if the widget accepts drops by calling [classfnc]$property(acceptDrops)[classfnc].[br] This function will be mainly useful in the [class]wrapper[/class] class. - !fn: $setProperty(<Qt property>,<property value>) + !fn: $setProperty(<TQt property>,<property value>) Sets a qt property for this widget.[br] - This is for advanced scripting, and can control really many features of the Qt widgets.[br] + This is for advanced scripting, and can control really many features of the TQt widgets.[br] For example, the [class]multilineedit[/class] widgets can be set to the "password" echo mode only by using this function call:[br] [example] @@ -586,8 +586,8 @@ static char * g_hNextObjectHandle = (char *)0; -KviKvsObject::KviKvsObject(KviKvsObjectClass * pClass,KviKvsObject * pParent,const QString &szName) -: QObject(pParent) +KviKvsObject::KviKvsObject(KviKvsObjectClass * pClass,KviKvsObject * pParent,const TQString &szName) +: TQObject(pParent) { if(g_hNextObjectHandle == 0)g_hNextObjectHandle++; // make sure it's never 0 m_hObject = (kvs_hobject_t)g_hNextObjectHandle; @@ -639,7 +639,7 @@ KviKvsObject::~KviKvsObject() // Disconnect all the signals if(m_pSignalDict) { - KviPointerHashTableIterator<QString,KviKvsObjectConnectionList> it(*m_pSignalDict); + KviPointerHashTableIterator<TQString,KviKvsObjectConnectionList> it(*m_pSignalDict); while(it.current()) { @@ -660,7 +660,7 @@ KviKvsObject::~KviKvsObject() KviKvsObjectConnectionListIterator cit(*m_pConnectionList); while(cit.current()) { - QString szSig = cit.current()->szSignal; + TQString szSig = cit.current()->szSignal; cit.current()->pSourceObject->disconnectSignal(szSig,cit.current()); //++cit;// NO!... we point to the next now! } @@ -670,7 +670,7 @@ KviKvsObject::~KviKvsObject() for(;;) { if(!m_pSignalDict)break; - KviPointerHashTableEntry<QString,KviKvsObjectConnectionList> * pSignalList = m_pSignalDict->firstEntry(); + KviPointerHashTableEntry<TQString,KviKvsObjectConnectionList> * pSignalList = m_pSignalDict->firstEntry(); if(!pSignalList)break; KviKvsObjectConnection * pConnection = pSignalList->data()->first(); if(!pConnection)break; @@ -683,18 +683,18 @@ KviKvsObject::~KviKvsObject() if(!m_pConnectionList)break; KviKvsObjectConnection * pConnection = m_pConnectionList->first(); if(!pConnection)break; - QString szSignalCopy = pConnection->szSignal; // we need this since pConnection is deleted inside disconnectSignal() and pConnection->szSignal dies too (but is referenced after the connection delete) + TQString szSignalCopy = pConnection->szSignal; // we need this since pConnection is deleted inside disconnectSignal() and pConnection->szSignal dies too (but is referenced after the connection delete) pConnection->pSourceObject->disconnectSignal(szSignalCopy,pConnection); } #endif KviKvsKernel::instance()->objectController()->unregisterObject(this); - if(parentObject())parentObject()->unregisterChild(this); + if(tqparentObject())tqparentObject()->unregisterChild(this); if(m_pObject) { - disconnect(m_pObject,SIGNAL(destroyed()),this,SLOT(objectDestroyed())); + disconnect(m_pObject,TQT_SIGNAL(destroyed()),this,TQT_SLOT(objectDestroyed())); if(m_bObjectOwner)delete m_pObject; } @@ -707,14 +707,14 @@ bool KviKvsObject::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pPara return true; } -QWidget * KviKvsObject::parentScriptWidget() +TQWidget * KviKvsObject::tqparentScriptWidget() { - if(parentObject()) + if(tqparentObject()) { - if(parentObject()->object()) + if(tqparentObject()->object()) { - if(parentObject()->object()->isWidgetType()) - return (QWidget *)(parentObject()->object()); + if(tqparentObject()->object()->isWidgetType()) + return (TQWidget *)(tqparentObject()->object()); } } return 0; @@ -730,19 +730,19 @@ void KviKvsObject::registerChild(KviKvsObject *pChild) m_pChildList->append(pChild); } -// SIGNAL/SLOT stuff +// SIGNAL/TQT_SLOT stuff -bool KviKvsObject::connectSignal(const QString &sigName,KviKvsObject * pTarget,const QString &slotName) +bool KviKvsObject::connectSignal(const TQString &sigName,KviKvsObject * pTarget,const TQString &slotName) { if(!pTarget->lookupFunctionHandler(slotName))return false; // no such slot if(!m_pSignalDict) { - m_pSignalDict = new KviPointerHashTable<QString,KviKvsObjectConnectionList>(7,false); + m_pSignalDict = new KviPointerHashTable<TQString,KviKvsObjectConnectionList>(7,false); m_pSignalDict->setAutoDelete(true); } - KviKvsObjectConnectionList * l = m_pSignalDict->find(sigName); + KviKvsObjectConnectionList * l = m_pSignalDict->tqfind(sigName); if(!l) { l = new KviKvsObjectConnectionList; @@ -772,11 +772,11 @@ void KviKvsObject::registerConnection(KviKvsObjectConnection *pConnection) m_pConnectionList->append(pConnection); } -bool KviKvsObject::disconnectSignal(const QString &sigName,KviKvsObject * pTarget,const QString &slotName) +bool KviKvsObject::disconnectSignal(const TQString &sigName,KviKvsObject * pTarget,const TQString &slotName) { if(!m_pSignalDict)return false; //no such signal to disconnect - KviKvsObjectConnectionList * l = m_pSignalDict->find(sigName); + KviKvsObjectConnectionList * l = m_pSignalDict->tqfind(sigName); if(!l)return false; KviKvsObjectConnectionListIterator it(*l); @@ -785,7 +785,7 @@ bool KviKvsObject::disconnectSignal(const QString &sigName,KviKvsObject * pTarge { if(sl->pTargetObject == pTarget) { - if(KviQString::equalCI(sl->szSlot,slotName)) + if(KviTQString::equalCI(sl->szSlot,slotName)) { pTarget->unregisterConnection(sl); l->removeRef(sl); @@ -803,14 +803,14 @@ bool KviKvsObject::disconnectSignal(const QString &sigName,KviKvsObject * pTarge return false; } -bool KviKvsObject::disconnectSignal(const QString &sigName,KviKvsObjectConnection * pConnection) +bool KviKvsObject::disconnectSignal(const TQString &sigName,KviKvsObjectConnection * pConnection) { if(!m_pSignalDict)return false; - KviKvsObjectConnectionList * l = m_pSignalDict->find(sigName); + KviKvsObjectConnectionList * l = m_pSignalDict->tqfind(sigName); //__range_valid(l); if(!l)return false; pConnection->pTargetObject->unregisterConnection(pConnection); - //__range_valid(l->findRef(pConnection) > -1); + //__range_valid(l->tqfindRef(pConnection) > -1); l->removeRef(pConnection); if(l->isEmpty())m_pSignalDict->remove(sigName); if(m_pSignalDict->isEmpty()) @@ -834,11 +834,11 @@ bool KviKvsObject::unregisterConnection(KviKvsObjectConnection * pConnection) return true; } -int KviKvsObject::emitSignal(const QString &sigName,KviKvsObjectFunctionCall * pOuterCall,KviKvsVariantList * pParams) +int KviKvsObject::emitSignal(const TQString &sigName,KviKvsObjectFunctionCall * pOuterCall,KviKvsVariantList * pParams) { if(!m_pSignalDict)return 0; - KviKvsObjectConnectionList * l = m_pSignalDict->find(sigName); + KviKvsObjectConnectionList * l = m_pSignalDict->tqfind(sigName); if(!l)return 0; // no slots registered KviKvsVariant retVal; @@ -863,7 +863,7 @@ int KviKvsObject::emitSignal(const QString &sigName,KviKvsObjectFunctionCall * p pTarget->setSignalSender(m_hObject); pTarget->setSignalName(sigName); - if(!pTarget->callFunction(this,s->szSlot,QString::null,pOuterCall->context(),&retVal,pParams)) + if(!pTarget->callFunction(this,s->szSlot,TQString(),pOuterCall->context(),&retVal,pParams)) { if(KviKvsKernel::instance()->objectController()->lookupObject(hTarget) && it.current()) { @@ -920,7 +920,7 @@ bool KviKvsObject::function_name(KviKvsObjectFunctionCall * c) bool KviKvsObject::function_parent(KviKvsObjectFunctionCall * c) { - KviKvsObject * o = parentObject(); + KviKvsObject * o = tqparentObject(); c->returnValue()->setHObject(o ? o->handle() : (kvs_hobject_t)0); return true; } @@ -955,7 +955,7 @@ bool KviKvsObject::function_destructor(KviKvsObjectFunctionCall * c) return true; } -bool KviKvsObject::function_children(KviKvsObjectFunctionCall * c) +bool KviKvsObject::function_tqchildren(KviKvsObjectFunctionCall * c) { KviKvsArray * a = new KviKvsArray(); int id=0; @@ -969,7 +969,7 @@ bool KviKvsObject::function_children(KviKvsObjectFunctionCall * c) } bool KviKvsObject::function_findChild(KviKvsObjectFunctionCall * c) { - QString szClass,szName; + TQString szClass,szName; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("className",KVS_PT_STRING,KVS_PF_OPTIONAL,szClass) KVSO_PARAMETER("objectName",KVS_PT_STRING,KVS_PF_OPTIONAL,szName) @@ -983,7 +983,7 @@ bool KviKvsObject::function_findChild(KviKvsObjectFunctionCall * c) bool KviKvsObject::function_emit(KviKvsObjectFunctionCall * c) { - QString szSignal; + TQString szSignal; KviKvsVariantList vList; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("signal",KVS_PT_NONEMPTYSTRING,0,szSignal) @@ -1017,7 +1017,7 @@ bool KviKvsObject::function_killTimer(KviKvsObjectFunctionCall * c) bool KviKvsObject::function_killTimers(KviKvsObjectFunctionCall * c) { - // FIXME: QT4 does not seem to have QObject::killTimers() + // FIXME: QT4 does not seem to have TQObject::killTimers() #ifndef COMPILE_USE_QT4 killTimers(); #endif @@ -1038,38 +1038,38 @@ bool KviKvsObject::function_listProperties(KviKvsObjectFunctionCall * c) KviWindow * w = c->context()->window(); if(!bArray) - w->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Listing Qt properties for object named \"%Q\" of KVS class %Q"),&m_szName,&(m_pClass->name())); + w->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Listing TQt properties for object named \"%Q\" of KVS class %Q"),&m_szName,&(m_pClass->name())); kvs_int_t cnt = 0; if(m_pObject) { - const QMetaObject *o = m_pObject->metaObject(); + const TQMetaObject *o = m_pObject->tqmetaObject(); if(!bArray) - w->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Properties for Qt class %s"),o->className()); + w->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Properties for TQt class %s"),o->className()); #ifndef COMPILE_USE_QT4 while(o) { #endif kvs_int_t idx = 0; #ifdef COMPILE_USE_QT4 - QMetaProperty prop = o->property(idx); - const QMetaProperty *p = ∝ + TQMetaProperty prop = o->property(idx); + const TQMetaProperty *p = ∝ #else - const QMetaProperty *p = o->property(idx); + const TQMetaProperty *p = o->property(idx); #endif while(p) { - QString szOut; - QString szName = p->name(); + TQString szOut; + TQString szName = p->name(); #ifdef COMPILE_USE_QT4 - QString szType = p->typeName(); + TQString szType = p->typeName(); #else - QString szType = p->type(); + TQString szType = p->type(); #endif if(bArray) - KviQString::sprintf(szOut,"%Q, %Q",&szName,&szType); + KviTQString::sprintf(szOut,"%Q, %Q",&szName,&szType); else { - KviQString::sprintf(szOut,__tr2qs("Property: %c%Q%c, type %Q"),KVI_TEXT_BOLD,&szName,KVI_TEXT_BOLD,&szType); + KviTQString::sprintf(szOut,__tr2qs("Property: %c%Q%c, type %Q"),KVI_TEXT_BOLD,&szName,KVI_TEXT_BOLD,&szType); szOut.prepend(" "); } @@ -1077,8 +1077,8 @@ bool KviKvsObject::function_listProperties(KviKvsObjectFunctionCall * c) { szOut += ", enum("; #ifndef COMPILE_USE_QT4 - // FIXME: Qt 4.x needs QMetaEnum for this loop - QStrList le = p->enumKeys(); + // FIXME: TQt 4.x needs TQMetaEnum for this loop + TQStrList le = p->enumKeys(); int i = 0; for(char *c2 = le.first(); c2; c2 = le.next()) { @@ -1120,7 +1120,7 @@ bool KviKvsObject::function_listProperties(KviKvsObjectFunctionCall * c) cnt++; } #ifndef COMPILE_USE_QT4 - o = o->superClass(); + o = o->tqsuperClass(); } #endif @@ -1137,7 +1137,7 @@ bool KviKvsObject::function_listProperties(KviKvsObjectFunctionCall * c) // rewritten using the new KVS features :) bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) { - QString szName; + TQString szName; KviKvsVariant * v; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("propertyName",KVS_PT_NONEMPTYSTRING,0,szName) @@ -1148,26 +1148,26 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(!m_pObject) { - // there are no Qt properties at all - c->warning(__tr2qs("The object named \"%Q\" of class %Q has no Qt properties"),&m_szName,&(m_pClass->name())); + // there are no TQt properties at all + c->warning(__tr2qs("The object named \"%Q\" of class %Q has no TQt properties"),&m_szName,&(m_pClass->name())); return true; } #ifdef COMPILE_USE_QT4 - int idx = m_pObject->metaObject()->indexOfProperty(szName); + int idx = m_pObject->tqmetaObject()->indexOfProperty(szName); #else - int idx = m_pObject->metaObject()->findProperty(szName,true); + int idx = m_pObject->tqmetaObject()->tqfindProperty(szName,true); #endif if(idx < 0) { - c->warning(__tr2qs("No Qt property named \"%Q\" for object named \"%Q\" of class %Q"),&szName,&m_szName,&(m_pClass->name())); + c->warning(__tr2qs("No TQt property named \"%Q\" for object named \"%Q\" of class %Q"),&szName,&m_szName,&(m_pClass->name())); return true; } #ifdef COMPILE_USE_QT4 - QMetaProperty prop = m_pObject->metaObject()->property(idx); - const QMetaProperty * p = ∝ + TQMetaProperty prop = m_pObject->tqmetaObject()->property(idx); + const TQMetaProperty * p = ∝ #else - const QMetaProperty * p = m_pObject->metaObject()->property(idx,true); + const TQMetaProperty * p = m_pObject->tqmetaObject()->property(idx,true); #endif if(!p) { @@ -1175,7 +1175,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) return true; } - QVariant vv = m_pObject->property(szName); + TQVariant vv = m_pObject->property(szName); if(!vv.isValid()) { c->warning(__tr2qs("Can't find property named \"%Q\" for object named \"%Q\" of class %Q: the property is indexed and defined but the returned variant is not valid"),&szName,&m_szName,&(m_pClass->name())); @@ -1184,14 +1184,14 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(p->isEnumType()) { - QString szKey; + TQString szKey; v->asString(szKey); #ifdef COMPILE_USE_QT4 int val = p->enumerator().keyToValue(szKey); #else int val = p->keyToValue(szKey); #endif - QVariant var(val); + TQVariant var(val); m_pObject->setProperty(szName,var); return true; } @@ -1204,39 +1204,39 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) switch(vv.type()) { - case QVariant::Int: + case TQVariant::Int: { kvs_int_t i; if(!v->asInteger(i))WRONG_TYPE("integer") - m_pObject->setProperty(szName,QVariant((int)i)); + m_pObject->setProperty(szName,TQVariant((int)i)); } break; - case QVariant::UInt: + case TQVariant::UInt: { kvs_int_t i; if(!v->asInteger(i))WRONG_TYPE("unsigned integer") if(i < 0)WRONG_TYPE("unsigned integer") - m_pObject->setProperty(szName,QVariant((unsigned int)i)); + m_pObject->setProperty(szName,TQVariant((unsigned int)i)); } break; - case QVariant::Bool: - m_pObject->setProperty(szName,QVariant(v->asBoolean())); + case TQVariant::Bool: + m_pObject->setProperty(szName,TQVariant(v->asBoolean())); break; - case QVariant::String: + case TQVariant::String: { - QString s; + TQString s; v->asString(s); - m_pObject->setProperty(szName,QVariant(s)); + m_pObject->setProperty(szName,TQVariant(s)); } break; - case QVariant::CString: + case TQVariant::CString: { - QString s; + TQString s; v->asString(s); - m_pObject->setProperty(szName,QVariant(s.utf8())); + m_pObject->setProperty(szName,TQVariant(s.utf8())); } break; - case QVariant::Point: + case TQVariant::Point: { if(!v->isArray())WRONG_TYPE("array(integer,integer)") KviKvsArray * a = v->array(); @@ -1245,10 +1245,10 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(!x || !y)WRONG_TYPE("array(integer,integer)") kvs_int_t iX,iY; if(!x->asInteger(iX) || !y->asInteger(iY))WRONG_TYPE("array(integer,integer)") - m_pObject->setProperty(szName,QVariant(QPoint(iX,iY))); + m_pObject->setProperty(szName,TQVariant(TQPoint(iX,iY))); } break; - case QVariant::Size: + case TQVariant::Size: { if(!v->isArray())WRONG_TYPE("array(integer,integer)") KviKvsArray * a = v->array(); @@ -1257,10 +1257,10 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(!w || !h)WRONG_TYPE("array(integer,integer)") kvs_int_t iW,iH; if(!w->asInteger(iW) || !h->asInteger(iH))WRONG_TYPE("array(integer,integer)") - m_pObject->setProperty(szName,QVariant(QSize(iW,iH))); + m_pObject->setProperty(szName,TQVariant(TQSize(iW,iH))); } break; - case QVariant::Rect: + case TQVariant::Rect: { if(!v->isArray())WRONG_TYPE("array(integer,integer,integer,integer)") KviKvsArray * a = v->array(); @@ -1271,12 +1271,12 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(!x || !y || !w || !h)WRONG_TYPE("array(integer,integer,integer,integer)") kvs_int_t iX,iY,iW,iH; if(!x->asInteger(iX) || !y->asInteger(iY) || !w->asInteger(iW) || !h->asInteger(iH))WRONG_TYPE("array(integer,integer,integer,integer)") - m_pObject->setProperty(szName,QVariant(QRect(iX,iY,iW,iH))); + m_pObject->setProperty(szName,TQVariant(TQRect(iX,iY,iW,iH))); } break; #ifndef COMPILE_USE_QT4 // FIXME: QT4 ???? - case QVariant::Color: + case TQVariant::Color: { if(!v->isArray())WRONG_TYPE("array(integer,integer,integer)") KviKvsArray * a = v->array(); @@ -1286,10 +1286,10 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(!r || !g || !b)WRONG_TYPE("array(integer,integer,integer)") kvs_int_t iR,iG,iB; if(!r->asInteger(iR) || !g->asInteger(iG) || !b->asInteger(iB))WRONG_TYPE("array(integer,integer,integer)") - m_pObject->setProperty(szName,QVariant(QColor(iR,iG,iB))); + m_pObject->setProperty(szName,TQVariant(TQColor(iR,iG,iB))); } break; - case QVariant::Font: + case TQVariant::Font: { if(!v->isArray())WRONG_TYPE("array(string,integer,string)") KviKvsArray * a = v->array(); @@ -1299,55 +1299,55 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(!ff || !ps)WRONG_TYPE("array(string,integer,string)") kvs_int_t iPs; if(!ps->asInteger(iPs))WRONG_TYPE("array(string,integer,string)") - QString szFf,szFl; + TQString szFf,szFl; ff->asString(szFf); if(fl)fl->asString(szFl); - QFont fnt; + TQFont fnt; fnt.setFamily(szFf); fnt.setPointSize(iPs); - if(szFl.find('b') != -1)fnt.setBold(true); - if(szFl.find('i') != -1)fnt.setItalic(true); - if(szFl.find('u') != -1)fnt.setUnderline(true); - if(szFl.find('o') != -1)fnt.setOverline(true); - if(szFl.find('f') != -1)fnt.setFixedPitch(true); - if(szFl.find('s') != -1)fnt.setStrikeOut(true); - m_pObject->setProperty(szName,QVariant(fnt)); + if(szFl.tqfind('b') != -1)fnt.setBold(true); + if(szFl.tqfind('i') != -1)fnt.setItalic(true); + if(szFl.tqfind('u') != -1)fnt.setUnderline(true); + if(szFl.tqfind('o') != -1)fnt.setOverline(true); + if(szFl.tqfind('f') != -1)fnt.setFixedPitch(true); + if(szFl.tqfind('s') != -1)fnt.setStrikeOut(true); + m_pObject->setProperty(szName,TQVariant(fnt)); } break; - case QVariant::Pixmap: - case QVariant::IconSet: + case TQVariant::Pixmap: + case TQVariant::IconSet: { if(v->isHObject()) { if(v->hobject() == (kvs_hobject_t)0) { // null pixmap - if(vv.type() == QVariant::Pixmap) - m_pObject->setProperty(szName,QVariant(QPixmap())); + if(vv.type() == TQVariant::Pixmap) + m_pObject->setProperty(szName,TQVariant(TQPixmap())); else - m_pObject->setProperty(szName,QVariant(QIconSet())); + m_pObject->setProperty(szName,TQVariant(TQIconSet())); } else { KviKvsObject * pix = KviKvsKernel::instance()->objectController()->lookupObject(v->hobject()); if(!pix->inherits("KviScriptPixmapObject")) c->warning(__tr2qs("A pixmap object, an image_id or an image file path is required for this property")); else { - QVariant pixv = pix->property("pixmap"); - if(vv.type() == QVariant::Pixmap) + TQVariant pixv = pix->property("pixmap"); + if(vv.type() == TQVariant::Pixmap) m_pObject->setProperty(szName,pixv); else - m_pObject->setProperty(szName,QVariant(QIconSet(pixv.toPixmap()))); + m_pObject->setProperty(szName,TQVariant(TQIconSet(pixv.toPixmap()))); } } } else { - QString szStr; + TQString szStr; v->asString(szStr); - QPixmap * pPix = g_pIconManager->getImage(szStr); + TQPixmap * pPix = g_pIconManager->getImage(szStr); if(pPix) { - if(vv.type() == QVariant::Pixmap) - m_pObject->setProperty(szName,QVariant(*pPix)); + if(vv.type() == TQVariant::Pixmap) + m_pObject->setProperty(szName,TQVariant(*pPix)); else - m_pObject->setProperty(szName,QVariant(QIconSet(*pPix))); + m_pObject->setProperty(szName,TQVariant(TQIconSet(*pPix))); } else c->warning(__tr2qs("Can't find the requested image")); @@ -1365,7 +1365,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c) { - QString szName; + TQString szName; bool bNoerror; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("propertyName",KVS_PT_NONEMPTYSTRING,0,szName) @@ -1374,36 +1374,36 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c) if(!m_pObject) { - // there are no Qt properties at all - if (bNoerror) c->returnValue()->setString("No Qt properties"); + // there are no TQt properties at all + if (bNoerror) c->returnValue()->setString("No TQt properties"); else { - c->warning(__tr2qs("The object named \"%Q\" of class %Q has no Qt properties"),&m_szName,&(m_pClass->name())); + c->warning(__tr2qs("The object named \"%Q\" of class %Q has no TQt properties"),&m_szName,&(m_pClass->name())); c->returnValue()->setNothing(); } return true; } #ifdef COMPILE_USE_QT4 - int idx = m_pObject->metaObject()->indexOfProperty(szName); + int idx = m_pObject->tqmetaObject()->indexOfProperty(szName); #else - int idx = m_pObject->metaObject()->findProperty(szName,true); + int idx = m_pObject->tqmetaObject()->tqfindProperty(szName,true); #endif if(idx < 0) { - if (bNoerror) c->returnValue()->setString("No Qt properties"); + if (bNoerror) c->returnValue()->setString("No TQt properties"); else { - c->warning(__tr2qs("No Qt property named \"%Q\" for object named \"%Q\" of class %Q"),&szName,&m_szName,&(m_pClass->name())); + c->warning(__tr2qs("No TQt property named \"%Q\" for object named \"%Q\" of class %Q"),&szName,&m_szName,&(m_pClass->name())); c->returnValue()->setNothing(); } return true; } #ifdef COMPILE_USE_QT4 - QMetaProperty prop = m_pObject->metaObject()->property(idx); - const QMetaProperty * p = ∝ + TQMetaProperty prop = m_pObject->tqmetaObject()->property(idx); + const TQMetaProperty * p = ∝ #else - const QMetaProperty * p = m_pObject->metaObject()->property(idx,true); + const TQMetaProperty * p = m_pObject->tqmetaObject()->property(idx,true); #endif if(!p) { @@ -1412,7 +1412,7 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c) return true; } - QVariant v = m_pObject->property(szName); + TQVariant v = m_pObject->property(szName); if(!v.isValid()) { c->warning(__tr2qs("Can't find property named \"%Q\" for object named \"%Q\" of class %Q: the property is indexed and defined but the returned variant is not valid"),&szName,&m_szName,&(m_pClass->name())); @@ -1432,42 +1432,42 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c) switch(v.type()) { - case QVariant::Int: + case TQVariant::Int: c->returnValue()->setInteger((kvs_int_t)v.toInt()); break; - case QVariant::UInt: + case TQVariant::UInt: c->returnValue()->setInteger((kvs_int_t)v.toUInt()); break; - case QVariant::Bool: + case TQVariant::Bool: c->returnValue()->setBoolean(v.toBool()); break; - case QVariant::String: + case TQVariant::String: c->returnValue()->setString(v.toString()); break; - case QVariant::CString: - c->returnValue()->setString(QString::fromUtf8(v.toCString().data())); + case TQVariant::CString: + c->returnValue()->setString(TQString::fromUtf8(v.toCString().data())); break; - case QVariant::Point: + case TQVariant::Point: { - QPoint p = v.toPoint(); + TQPoint p = v.toPoint(); KviKvsArray * a = new KviKvsArray(); a->set(0,new KviKvsVariant((kvs_int_t)p.x())); a->set(1,new KviKvsVariant((kvs_int_t)p.y())); c->returnValue()->setArray(a); } break; - case QVariant::Size: + case TQVariant::Size: { - QSize p = v.toSize(); + TQSize p = v.toSize(); KviKvsArray * a = new KviKvsArray(); a->set(0,new KviKvsVariant((kvs_int_t)p.width())); a->set(1,new KviKvsVariant((kvs_int_t)p.height())); c->returnValue()->setArray(a); } break; - case QVariant::Rect: + case TQVariant::Rect: { - QRect p = v.toRect(); + TQRect p = v.toRect(); KviKvsArray * a = new KviKvsArray(); a->set(0,new KviKvsVariant((kvs_int_t)p.x())); a->set(1,new KviKvsVariant((kvs_int_t)p.y())); @@ -1478,9 +1478,9 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c) break; #ifndef COMPILE_USE_QT4 // FIXME: QT4 ? - case QVariant::Color: + case TQVariant::Color: { - QColor clr = v.toColor(); + TQColor clr = v.toColor(); KviKvsArray * a = new KviKvsArray(); a->set(0,new KviKvsVariant((kvs_int_t)clr.red())); a->set(1,new KviKvsVariant((kvs_int_t)clr.green())); @@ -1488,13 +1488,13 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c) c->returnValue()->setArray(a); } break; - case QVariant::Font: + case TQVariant::Font: { - QFont f = v.toFont(); + TQFont f = v.toFont(); KviKvsArray * a = new KviKvsArray(); a->set(0,new KviKvsVariant(f.family())); a->set(1,new KviKvsVariant((kvs_int_t)f.pointSize())); - QString szFlags; + TQString szFlags; if(f.bold())szFlags += "b"; if(f.underline())szFlags += "u"; if(f.overline())szFlags += "o"; @@ -1543,7 +1543,7 @@ bool KviKvsObject::inheritsClass(KviKvsObjectClass * pClass) return false; } -KviKvsObjectClass * KviKvsObject::getClass(const QString & classOverride) +KviKvsObjectClass * KviKvsObject::getClass(const TQString & classOverride) { if(classOverride.isEmpty())return m_pClass; KviKvsObjectClass * cl = m_pClass; // class override can be also THIS class @@ -1551,20 +1551,20 @@ KviKvsObjectClass * KviKvsObject::getClass(const QString & classOverride) // is the class member function (not the local override) while(cl) { - if(KviQString::equalCI(cl->name(),classOverride))break; + if(KviTQString::equalCI(cl->name(),classOverride))break; else cl = cl->m_pParentClass; } return cl; } -KviKvsObjectFunctionHandler * KviKvsObject::lookupFunctionHandler(const QString & funcName,const QString & classOverride) +KviKvsObjectFunctionHandler * KviKvsObject::lookupFunctionHandler(const TQString & funcName,const TQString & classOverride) { KviKvsObjectFunctionHandler * h = 0; if(classOverride.isEmpty() && m_pFunctionHandlers) { // lookup the local overrides - h = m_pFunctionHandlers->find(funcName); + h = m_pFunctionHandlers->tqfind(funcName); } if(!h) @@ -1582,7 +1582,7 @@ bool KviKvsObject::die() { if(m_bInDelayedDeath)return false; m_bInDelayedDeath = true; - QTimer::singleShot(0,this,SLOT(delayedDie())); + TQTimer::singleShot(0,this,TQT_SLOT(delayedDie())); return true; } @@ -1599,13 +1599,13 @@ void KviKvsObject::delayedDie() delete this; // byez! } -void KviKvsObject::setObject(QObject * o,bool bIsOwned) +void KviKvsObject::setObject(TQObject * o,bool bIsOwned) { //__range_invalid(m_pObject); m_bObjectOwner = bIsOwned; m_pObject = o; o->installEventFilter(this); - connect(m_pObject,SIGNAL(destroyed()),this,SLOT(objectDestroyed())); + connect(m_pObject,TQT_SIGNAL(destroyed()),this,TQT_SLOT(objectDestroyed())); } void KviKvsObject::objectDestroyed() @@ -1614,12 +1614,12 @@ void KviKvsObject::objectDestroyed() die(); } -bool KviKvsObject::eventFilter(QObject *o,QEvent *e) +bool KviKvsObject::eventFilter(TQObject *o,TQEvent *e) { return false; // do not stop } -void KviKvsObject::timerEvent(QTimerEvent *e) +void KviKvsObject::timerEvent(TQTimerEvent *e) { KviKvsVariant * v = new KviKvsVariant(); v->setInteger(e->timerId()); @@ -1628,17 +1628,17 @@ void KviKvsObject::timerEvent(QTimerEvent *e) callFunction(this,"timerEvent",&parms); } -bool KviKvsObject::callFunction(KviKvsObject * pCaller,const QString &fncName,KviKvsVariant * pRetVal,KviKvsVariantList * pParams) +bool KviKvsObject::callFunction(KviKvsObject * pCaller,const TQString &fncName,KviKvsVariant * pRetVal,KviKvsVariantList * pParams) { KviKvsVariant rv; if(!pRetVal)pRetVal = &rv; KviKvsRunTimeContext ctx(0,g_pApp->activeConsole(),KviKvsKernel::instance()->emptyParameterList(),pRetVal,0); if(!pParams)pParams = KviKvsKernel::instance()->emptyParameterList(); - return callFunction(pCaller,fncName,QString::null,&ctx,pRetVal,pParams); + return callFunction(pCaller,fncName,TQString(),&ctx,pRetVal,pParams); } -bool KviKvsObject::callFunction(KviKvsObject * pCaller,const QString &fncName,KviKvsVariantList * pParams) +bool KviKvsObject::callFunction(KviKvsObject * pCaller,const TQString &fncName,KviKvsVariantList * pParams) { KviKvsVariant fakeRetVal; return callFunction(pCaller,fncName,&fakeRetVal,pParams); @@ -1646,8 +1646,8 @@ bool KviKvsObject::callFunction(KviKvsObject * pCaller,const QString &fncName,Kv bool KviKvsObject::callFunction( KviKvsObject * pCaller, - const QString & fncName, - const QString & classOverride, + const TQString & fncName, + const TQString & classOverride, KviKvsRunTimeContext * pContext, KviKvsVariant * pRetVal, KviKvsVariantList * pParams) @@ -1687,7 +1687,7 @@ bool KviKvsObject::callFunction( -void KviKvsObject::registerPrivateImplementation(const QString &szFunctionName,const QString &szCode) +void KviKvsObject::registerPrivateImplementation(const TQString &szFunctionName,const TQString &szCode) { if(szCode.isEmpty()) { @@ -1703,20 +1703,20 @@ void KviKvsObject::registerPrivateImplementation(const QString &szFunctionName,c } else { if(!m_pFunctionHandlers) { - m_pFunctionHandlers = new KviPointerHashTable<QString,KviKvsObjectFunctionHandler>(7,false); + m_pFunctionHandlers = new KviPointerHashTable<TQString,KviKvsObjectFunctionHandler>(7,false); m_pFunctionHandlers->setAutoDelete(true); } - QString szContext = m_pClass->name(); + TQString szContext = m_pClass->name(); szContext += "[privateimpl]::"; szContext += szFunctionName; - m_pFunctionHandlers->replace(szFunctionName,new KviKvsObjectScriptFunctionHandler(szContext,szCode)); + m_pFunctionHandlers->tqreplace(szFunctionName,new KviKvsObjectScriptFunctionHandler(szContext,szCode)); } } -KviKvsObject * KviKvsObject::findChild(const QString &szClass,const QString &szName) +KviKvsObject * KviKvsObject::findChild(const TQString &szClass,const TQString &szName) { for(KviKvsObject * o = m_pChildList->first();o;o= m_pChildList->next()) { @@ -1725,13 +1725,13 @@ KviKvsObject * KviKvsObject::findChild(const QString &szClass,const QString &szN // any class matches if(szName.isEmpty())return o; // any name matches // name must match - if(KviQString::equalCI(szName,o->name()))return o; + if(KviTQString::equalCI(szName,o->name()))return o; } else { - if(KviQString::equalCI(szClass,o->getClass()->name())) + if(KviTQString::equalCI(szClass,o->getClass()->name())) { if(szName.isEmpty())return o; // any name matches // name must match - if(KviQString::equalCI(szName,o->name()))return o; + if(KviTQString::equalCI(szName,o->name()))return o; } } KviKvsObject * c = o->findChild(szClass,szName); diff --git a/src/kvirc/kvs/kvi_kvs_object.h b/src/kvirc/kvs/kvi_kvs_object.h index 7cd6468..10f2564 100644 --- a/src/kvirc/kvs/kvi_kvs_object.h +++ b/src/kvirc/kvs/kvi_kvs_object.h @@ -32,7 +32,7 @@ #include "kvi_kvs_object_functionhandler.h" #include "kvi_kvs_types.h" -#include <qobject.h> +#include <tqobject.h> class KviKvsObjectFunctionCall; @@ -41,24 +41,25 @@ typedef struct _KviKvsObjectConnection { KviKvsObject * pSourceObject; // source object (owner of the struct) KviKvsObject * pTargetObject; // target object - QString szSignal; // source signal name - QString szSlot; // target slot function + TQString szSignal; // source signal name + TQString szSlot; // target slot function } KviKvsObjectConnection; typedef KviPointerList<KviKvsObjectConnection> KviKvsObjectConnectionList; typedef KviPointerListIterator<KviKvsObjectConnection> KviKvsObjectConnectionListIterator; -class KVIRC_API KviKvsObject : public QObject +class KVIRC_API KviKvsObject : public TQObject { friend class KviKvsObjectController; friend class KviKvsObjectClass; Q_OBJECT + TQ_OBJECT public: - KviKvsObject(KviKvsObjectClass * pClass,KviKvsObject * pParent,const QString &szName); + KviKvsObject(KviKvsObjectClass * pClass,KviKvsObject * pParent,const TQString &szName); virtual ~KviKvsObject(); protected: // main data - QString m_szName; // object name + TQString m_szName; // object name kvs_hobject_t m_hObject; // global object handle KviKvsObjectClass * m_pClass; // the class definition @@ -66,18 +67,18 @@ protected: KviPointerList<KviKvsObject> * m_pChildList; - KviPointerHashTable<QString,KviKvsObjectFunctionHandler> * m_pFunctionHandlers; // our function handlers + KviPointerHashTable<TQString,KviKvsObjectFunctionHandler> * m_pFunctionHandlers; // our function handlers - KviPointerHashTable<QString,KviKvsObjectConnectionList> * m_pSignalDict; // our signals connected to other object functions + KviPointerHashTable<TQString,KviKvsObjectConnectionList> * m_pSignalDict; // our signals connected to other object functions KviKvsObjectConnectionList * m_pConnectionList; // signals connected to this object functions // this is valid when processing one of our slots kvs_hobject_t m_hSignalSender; - QString m_szSignalName; + TQString m_szSignalName; // if this object wraps a qt one, it is here - QObject * m_pObject; + TQObject * m_pObject; bool m_bObjectOwner; // do we have to destroy it ? // internal stuff for die() @@ -85,18 +86,18 @@ protected: public: kvs_hobject_t handle(){ return m_hObject; }; - // the wrapped Qt object (may be 0!) - QObject * object() const { return m_pObject; }; - void setObject(QObject * o,bool bIsOwned = true); + // the wrapped TQt object (may be 0!) + TQObject * object() const { return m_pObject; }; + void setObject(TQObject * o,bool bIsOwned = true); - const QString & getName(){ return m_szName; }; + const TQString & getName(){ return m_szName; }; - KviKvsObject * parentObject(){ return (KviKvsObject *)parent(); }; - QWidget * parentScriptWidget(); + KviKvsObject * tqparentObject(){ return (KviKvsObject *)tqparent(); }; + TQWidget * tqparentScriptWidget(); - bool connectSignal(const QString &sigName,KviKvsObject * target,const QString &slotName); - bool disconnectSignal(const QString &sigName,KviKvsObjectConnection * con); - bool disconnectSignal(const QString &sigName,KviKvsObject * target,const QString & slotName); + bool connectSignal(const TQString &sigName,KviKvsObject * target,const TQString &slotName); + bool disconnectSignal(const TQString &sigName,KviKvsObjectConnection * con); + bool disconnectSignal(const TQString &sigName,KviKvsObject * target,const TQString & slotName); // Emits a signal by calling all the attacched slots in an unspecified order. // Returns the number of slots called (may be 0, if no slot is connected) @@ -104,13 +105,13 @@ public: // this is intended to be called from other function calls (the parameters are copied from pOuterCall) // since we should NEVER emit totally spontaneous signals: all of them // should be generated inside object functions (either from scripting or by core calls) - int emitSignal(const QString &sigName,KviKvsObjectFunctionCall * pOuterCall,KviKvsVariantList * pParams = 0); + int emitSignal(const TQString &sigName,KviKvsObjectFunctionCall * pOuterCall,KviKvsVariantList * pParams = 0); void setSignalSender(kvs_hobject_t hObject){ m_hSignalSender = hObject; }; kvs_hobject_t signalSender(){ return m_hSignalSender; }; - void setSignalName(const QString &szSigName){ m_szSignalName = szSigName; }; + void setSignalName(const TQString &szSigName){ m_szSignalName = szSigName; }; - KviPointerHashTable<QString,KviKvsObjectFunctionHandler> * functionHandlers(){ return m_pFunctionHandlers; }; + KviPointerHashTable<TQString,KviKvsObjectFunctionHandler> * functionHandlers(){ return m_pFunctionHandlers; }; KviKvsHash * dataContainer(){ return m_pDataContainer; }; @@ -118,30 +119,30 @@ public: bool dieNow(); KviKvsObjectClass * getExactClass(){ return m_pClass; }; - KviKvsObjectClass * getClass(const QString & classOverride = QString::null); + KviKvsObjectClass * getClass(const TQString & classOverride = TQString()); bool inheritsClass(KviKvsObjectClass * pClass); - KviKvsObjectFunctionHandler * lookupFunctionHandler(const QString & funcName,const QString & classOverride = QString::null); + KviKvsObjectFunctionHandler * lookupFunctionHandler(const TQString & funcName,const TQString & classOverride = TQString()); // Registers a private implementation of a function // The function may or may not be already registered in the class // If szCode is empty the the private implementation is removed instead - void registerPrivateImplementation(const QString &szFunctionName,const QString &szCode); + void registerPrivateImplementation(const TQString &szFunctionName,const TQString &szCode); // ONLY pCaller can be zero here! // please use one of the wrappers, if possible bool callFunction( KviKvsObject * pCaller, // calling object, can be zero (used for the "internal" access list verification) - const QString & fncName, // name of the function to call - const QString & classOverride, // eventual class override for the functon call, may be QString::null + const TQString & fncName, // name of the function to call + const TQString & classOverride, // eventual class override for the functon call, may be TQString() KviKvsRunTimeContext * pContext, // calling runtime context (you'll have problems with instantiating this... :P ) KviKvsVariant * pRetVal, // the return value KviKvsVariantList * pParams); // the parameters for the call // a nice and simple wrapper: it accepts a parameter list only (eventually 0) - bool callFunction(KviKvsObject * pCaller,const QString &fncName,KviKvsVariantList * pParams = 0); + bool callFunction(KviKvsObject * pCaller,const TQString &fncName,KviKvsVariantList * pParams = 0); // this one gets a non null ret val too - bool callFunction(KviKvsObject * pCaller,const QString &fncName,KviKvsVariant * pRetVal,KviKvsVariantList * pParams = 0); + bool callFunction(KviKvsObject * pCaller,const TQString &fncName,KviKvsVariant * pRetVal,KviKvsVariantList * pParams = 0); - KviKvsObject * findChild(const QString &szClass,const QString &szName); + KviKvsObject * findChild(const TQString &szClass,const TQString &szName); void killAllChildrenWithClass(KviKvsObjectClass *cl); protected: void registerConnection(KviKvsObjectConnection * con); @@ -152,8 +153,8 @@ protected: void registerChild(KviKvsObject * c); void unregisterChild(KviKvsObject *c); - virtual bool eventFilter(QObject *o,QEvent *e); //necessary ? - virtual void timerEvent(QTimerEvent *e); + virtual bool eventFilter(TQObject *o,TQEvent *e); //necessary ? + virtual void timerEvent(TQTimerEvent *e); protected: bool function_name(KviKvsObjectFunctionCall *c); bool function_startTimer(KviKvsObjectFunctionCall *c); @@ -163,7 +164,7 @@ protected: bool function_findChild(KviKvsObjectFunctionCall *c); bool function_childCount(KviKvsObjectFunctionCall *c); bool function_emit(KviKvsObjectFunctionCall *c); - bool function_children(KviKvsObjectFunctionCall *c); + bool function_tqchildren(KviKvsObjectFunctionCall *c); bool function_signalSender(KviKvsObjectFunctionCall *c); bool function_signalName(KviKvsObjectFunctionCall *c); bool function_destructor(KviKvsObjectFunctionCall *c); diff --git a/src/kvirc/kvs/kvi_kvs_object_class.cpp b/src/kvirc/kvs/kvi_kvs_object_class.cpp index 312fcb4..7a01532 100644 --- a/src/kvirc/kvs/kvi_kvs_object_class.cpp +++ b/src/kvirc/kvs/kvi_kvs_object_class.cpp @@ -39,7 +39,7 @@ KviKvsObjectClass::KviKvsObjectClass( KviKvsObjectClass * pParent, - const QString &szName, + const TQString &szName, KviKvsObjectAllocateInstanceProc pProc, bool bBuiltin) { @@ -49,7 +49,7 @@ KviKvsObjectClass::KviKvsObjectClass( m_szName = szName; m_bBuiltin = bBuiltin; m_bDirty = !bBuiltin; - m_pFunctionHandlers = new KviPointerHashTable<QString,KviKvsObjectFunctionHandler>(17,false); + m_pFunctionHandlers = new KviPointerHashTable<TQString,KviKvsObjectFunctionHandler>(17,false); m_pFunctionHandlers->setAutoDelete(true); m_pChildClasses = new KviPointerList<KviKvsObjectClass>; m_pChildClasses->setAutoDelete(false); @@ -58,7 +58,7 @@ KviKvsObjectClass::KviKvsObjectClass( // inherit everything from the class above if(pParent) { - KviPointerHashTableIterator<QString,KviKvsObjectFunctionHandler> it(*(pParent->functionHandlers())); + KviPointerHashTableIterator<TQString,KviKvsObjectFunctionHandler> it(*(pParent->functionHandlers())); while(KviKvsObjectFunctionHandler * fh = it.current()) { m_pFunctionHandlers->insert(it.currentKey(),fh->clone()); @@ -79,7 +79,7 @@ KviKvsObjectClass::~KviKvsObjectClass() // then kill all objects that belong to our class KviKvsKernel::instance()->objectController()->killAllObjectsWithClass(this); // now we're quite clean: should have no object depending on us alive - // unregister from the parent, if any + // unregister from the tqparent, if any if(m_pParentClass)m_pParentClass->unregisterChildClass(this); // unregister from the object controller KviKvsKernel::instance()->objectController()->unregisterClass(this); @@ -89,36 +89,36 @@ KviKvsObjectClass::~KviKvsObjectClass() delete m_pChildClasses; } -void KviKvsObjectClass::registerFunctionHandler(const QString & szFunctionName,KviKvsObjectFunctionHandlerProc pProc,unsigned int uFlags) +void KviKvsObjectClass::registerFunctionHandler(const TQString & szFunctionName,KviKvsObjectFunctionHandlerProc pProc,unsigned int uFlags) { - m_pFunctionHandlers->replace(szFunctionName,new KviKvsObjectCoreCallFunctionHandler(pProc,uFlags)); + m_pFunctionHandlers->tqreplace(szFunctionName,new KviKvsObjectCoreCallFunctionHandler(pProc,uFlags)); } -void KviKvsObjectClass::registerFunctionHandler(const QString & szFunctionName,const QString &szBuffer,unsigned int uFlags) +void KviKvsObjectClass::registerFunctionHandler(const TQString & szFunctionName,const TQString &szBuffer,unsigned int uFlags) { - QString szContext = m_szName; + TQString szContext = m_szName; szContext += "::"; szContext += szFunctionName; - m_pFunctionHandlers->replace(szFunctionName,new KviKvsObjectScriptFunctionHandler(szContext,szBuffer,uFlags)); + m_pFunctionHandlers->tqreplace(szFunctionName,new KviKvsObjectScriptFunctionHandler(szContext,szBuffer,uFlags)); } -void KviKvsObjectClass::registerStandardNothingReturnFunctionHandler(const QString &szFunctionName) +void KviKvsObjectClass::registerStandardNothingReturnFunctionHandler(const TQString &szFunctionName) { - m_pFunctionHandlers->replace(szFunctionName,new KviKvsObjectStandardNothingReturnFunctionHandler()); + m_pFunctionHandlers->tqreplace(szFunctionName,new KviKvsObjectStandardNothingReturnFunctionHandler()); } -void KviKvsObjectClass::registerStandardTrueReturnFunctionHandler(const QString &szFunctionName) +void KviKvsObjectClass::registerStandardTrueReturnFunctionHandler(const TQString &szFunctionName) { - m_pFunctionHandlers->replace(szFunctionName,new KviKvsObjectStandardTrueReturnFunctionHandler()); + m_pFunctionHandlers->tqreplace(szFunctionName,new KviKvsObjectStandardTrueReturnFunctionHandler()); } -void KviKvsObjectClass::registerStandardFalseReturnFunctionHandler(const QString &szFunctionName) +void KviKvsObjectClass::registerStandardFalseReturnFunctionHandler(const TQString &szFunctionName) { - m_pFunctionHandlers->replace(szFunctionName,new KviKvsObjectStandardFalseReturnFunctionHandler()); + m_pFunctionHandlers->tqreplace(szFunctionName,new KviKvsObjectStandardFalseReturnFunctionHandler()); } -KviKvsObject * KviKvsObjectClass::allocateInstance(KviKvsObject * pParent,const QString &szName,KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams) +KviKvsObject * KviKvsObjectClass::allocateInstance(KviKvsObject * pParent,const TQString &szName,KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams) { if(!m_allocProc)return 0; KviKvsObject * pObject = m_allocProc(this,pParent,szName); @@ -141,7 +141,7 @@ KviKvsObject * KviKvsObjectClass::allocateInstance(KviKvsObject * pParent,const v = pParams->next(); } - if(!pObject->callFunction(pObject,"constructor",QString::null,pContext,&ret,©)) + if(!pObject->callFunction(pObject,"constructor",TQString(),pContext,&ret,©)) { // ops...constructor failed (script error!) delete pObject; @@ -179,22 +179,22 @@ void KviKvsObjectClass::unregisterChildClass(KviKvsObjectClass *pClass) m_pChildClasses->removeRef(pClass); } -bool KviKvsObjectClass::save(const QString &szFileName) +bool KviKvsObjectClass::save(const TQString &szFileName) { if(!m_pParentClass)return false; if(isBuiltin())return false; - QString szBuffer; - QString szParentName = m_pParentClass->name(); + TQString szBuffer; + TQString szParentName = m_pParentClass->name(); - KviQString::sprintf(szBuffer, + KviTQString::sprintf(szBuffer, "# Automatically generated KVS class dump\n\n" \ "class(\"%Q\",\"%Q\")\n" \ "{\n", &m_szName,&szParentName); - KviPointerHashTableIterator<QString,KviKvsObjectFunctionHandler> it(*m_pFunctionHandlers); + KviPointerHashTableIterator<TQString,KviKvsObjectFunctionHandler> it(*m_pFunctionHandlers); while(KviKvsObjectFunctionHandler * h = it.current()) { @@ -206,7 +206,7 @@ bool KviKvsObjectClass::save(const QString &szFileName) szBuffer += "function "; szBuffer += it.currentKey(); szBuffer += "()\n"; - QString szCode = h->scriptHandlerCode(); + TQString szCode = h->scriptHandlerCode(); KviCommandFormatter::blockFromBuffer(szCode); KviCommandFormatter::indent(szCode); szBuffer += szCode; @@ -219,16 +219,16 @@ bool KviKvsObjectClass::save(const QString &szFileName) return KviFileUtils::writeFile(szFileName,szBuffer); } -void KviKvsObjectClass::getFunctionCode(QString &szCode,KviKvsObjectFunctionHandler &h) +void KviKvsObjectClass::getFunctionCode(TQString &szCode,KviKvsObjectFunctionHandler &h) { szCode=h.scriptHandlerCode(); } -bool KviKvsObjectClass::load(const QString &szFileName) +bool KviKvsObjectClass::load(const TQString &szFileName) { - QString szBuffer; + TQString szBuffer; if(!KviFileUtils::readFile(szFileName,szBuffer,0xffffff))return false; return KviKvsScript::run(szBuffer,g_pActiveWindow); } diff --git a/src/kvirc/kvs/kvi_kvs_object_class.h b/src/kvirc/kvs/kvi_kvs_object_class.h index 44b093a..6b334dd 100644 --- a/src/kvirc/kvs/kvi_kvs_object_class.h +++ b/src/kvirc/kvs/kvi_kvs_object_class.h @@ -38,8 +38,8 @@ class KviKvsRunTimeContext; class KviKvsVariantList; // Object allocation function -// parameters are: the class, the parent object (eventually 0), the object name (eventually empty) -typedef KviKvsObject * (*KviKvsObjectAllocateInstanceProc)(KviKvsObjectClass *,KviKvsObject *,const QString &); +// parameters are: the class, the tqparent object (eventually 0), the object name (eventually empty) +typedef KviKvsObject * (*KviKvsObjectAllocateInstanceProc)(KviKvsObjectClass *,KviKvsObject *,const TQString &); // An object function callback typedef bool (KviKvsObject::*KviKvsObjectFunctionHandlerProc)(KviKvsObjectFunctionCall * pCall); @@ -53,48 +53,48 @@ class KVIRC_API KviKvsObjectClass friend class KviKvsObjectController; public: KviKvsObjectClass( - KviKvsObjectClass * pParent, // parent class - const QString & szName, // class name + KviKvsObjectClass * pParent, // tqparent class + const TQString & szName, // class name KviKvsObjectAllocateInstanceProc proc, // intance allocation proc bool bBuiltin = true // this is a builtin or script based class ? ); ~KviKvsObjectClass(); protected: - KviKvsObjectClass * m_pParentClass; // the parent (base) class - QString m_szName; // the class name + KviKvsObjectClass * m_pParentClass; // the tqparent (base) class + TQString m_szName; // the class name bool m_bBuiltin; // is this a builtin or script based class ? - KviPointerHashTable<QString,KviKvsObjectFunctionHandler> * m_pFunctionHandlers; // all our function handlers + KviPointerHashTable<TQString,KviKvsObjectFunctionHandler> * m_pFunctionHandlers; // all our function handlers KviPointerList<KviKvsObjectClass> * m_pChildClasses; // KviKvsObjectAllocateInstanceProc m_allocProc; bool m_bDirty; // not yet flushed to disk (only for not builtin classes) protected: void registerChildClass(KviKvsObjectClass *pClass); void unregisterChildClass(KviKvsObjectClass *pClass); - KviPointerHashTable<QString,KviKvsObjectFunctionHandler> * functionHandlers(){ return m_pFunctionHandlers; }; + KviPointerHashTable<TQString,KviKvsObjectFunctionHandler> * functionHandlers(){ return m_pFunctionHandlers; }; public: void clearDirtyFlag(){ m_bDirty = false; }; bool isDirty(){ return m_bDirty; }; bool isBuiltin(){ return m_bBuiltin; }; - const QString & name(){ return m_szName; }; - KviKvsObjectClass * parentClass(){ return m_pParentClass; }; + const TQString & name(){ return m_szName; }; + KviKvsObjectClass * tqparentClass(){ return m_pParentClass; }; // pProc CAN'T be zero here! - void registerFunctionHandler(const QString & szFunctionName,KviKvsObjectFunctionHandlerProc pProc,unsigned int uFlags = 0); - void registerFunctionHandler(const QString & szFunctionName,const QString &szBuffer,unsigned int uFlags = 0); + void registerFunctionHandler(const TQString & szFunctionName,KviKvsObjectFunctionHandlerProc pProc,unsigned int uFlags = 0); + void registerFunctionHandler(const TQString & szFunctionName,const TQString &szBuffer,unsigned int uFlags = 0); // registers an empty handler that returns "nothing" - void registerStandardNothingReturnFunctionHandler(const QString & szFunc); + void registerStandardNothingReturnFunctionHandler(const TQString & szFunc); // retisters an empty handler that returns $true - void registerStandardTrueReturnFunctionHandler(const QString & szFunc); + void registerStandardTrueReturnFunctionHandler(const TQString & szFunc); // retisters an empty handler that returns $false - void registerStandardFalseReturnFunctionHandler(const QString & szFunc); + void registerStandardFalseReturnFunctionHandler(const TQString & szFunc); - KviKvsObjectFunctionHandler * lookupFunctionHandler(const QString & szFunc){ return m_pFunctionHandlers->find(szFunc); }; - KviKvsObject * allocateInstance(KviKvsObject * pParent,const QString &szName,KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams); + KviKvsObjectFunctionHandler * lookupFunctionHandler(const TQString & szFunc){ return m_pFunctionHandlers->tqfind(szFunc); }; + KviKvsObject * allocateInstance(KviKvsObject * pParent,const TQString &szName,KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams); - bool save(const QString &szFileName); - static bool load(const QString &szFileName); - void getFunctionCode(QString &szCode,KviKvsObjectFunctionHandler &h); - KviPointerHashTable<QString,KviKvsObjectFunctionHandler> * getHandlers(){return m_pFunctionHandlers;}; + bool save(const TQString &szFileName); + static bool load(const TQString &szFileName); + void getFunctionCode(TQString &szCode,KviKvsObjectFunctionHandler &h); + KviPointerHashTable<TQString,KviKvsObjectFunctionHandler> * getHandlers(){return m_pFunctionHandlers;}; }; diff --git a/src/kvirc/kvs/kvi_kvs_object_controller.cpp b/src/kvirc/kvs/kvi_kvs_object_controller.cpp index c13b068..583641e 100644 --- a/src/kvirc/kvs/kvi_kvs_object_controller.cpp +++ b/src/kvirc/kvs/kvi_kvs_object_controller.cpp @@ -31,7 +31,7 @@ //////////////////////////////////////////////////////////////////////////////////////// -static KviKvsObject * objectClassCreateInstance(KviKvsObjectClass *pClass,KviKvsObject *pParent,const QString &szName) +static KviKvsObject * objectClassCreateInstance(KviKvsObjectClass *pClass,KviKvsObject *pParent,const TQString &szName) { return new KviKvsObject(pClass,pParent,szName); } @@ -44,7 +44,7 @@ KviKvsObjectController::KviKvsObjectController() m_pTopLevelObjectList->setAutoDelete(false); m_pObjectDict = new KviPointerHashTable<void *,KviKvsObject>(101); m_pObjectDict->setAutoDelete(false); - m_pClassDict = new KviPointerHashTable<QString,KviKvsObjectClass>(31,false); + m_pClassDict = new KviPointerHashTable<TQString,KviKvsObjectClass>(31,false); m_pClassDict->setAutoDelete(false); } @@ -73,11 +73,11 @@ void KviKvsObjectController::init() m_pObjectClass->registerFunctionHandler("findChild",KVI_PTR2MEMBER(KviKvsObject::function_findChild)); m_pObjectClass->registerFunctionHandler("childCount",KVI_PTR2MEMBER(KviKvsObject::function_childCount)); m_pObjectClass->registerFunctionHandler("emit",KVI_PTR2MEMBER(KviKvsObject::function_emit)); - m_pObjectClass->registerFunctionHandler("children",KVI_PTR2MEMBER(KviKvsObject::function_children)); + m_pObjectClass->registerFunctionHandler("tqchildren",KVI_PTR2MEMBER(KviKvsObject::function_tqchildren)); m_pObjectClass->registerFunctionHandler("signalSender",KVI_PTR2MEMBER(KviKvsObject::function_signalSender)); m_pObjectClass->registerFunctionHandler("signalName",KVI_PTR2MEMBER(KviKvsObject::function_signalName)); m_pObjectClass->registerFunctionHandler("destructor",KVI_PTR2MEMBER(KviKvsObject::function_destructor)); - m_pObjectClass->registerFunctionHandler("parent",KVI_PTR2MEMBER(KviKvsObject::function_parent)); + m_pObjectClass->registerFunctionHandler("tqparent",KVI_PTR2MEMBER(KviKvsObject::function_parent)); m_pObjectClass->registerFunctionHandler("property",KVI_PTR2MEMBER(KviKvsObject::function_property)); m_pObjectClass->registerFunctionHandler("setProperty",KVI_PTR2MEMBER(KviKvsObject::function_setProperty)); m_pObjectClass->registerFunctionHandler("listProperties",KVI_PTR2MEMBER(KviKvsObject::function_listProperties)); @@ -104,7 +104,7 @@ void KviKvsObjectController::killAllObjectsWithClass(KviKvsObjectClass * pClass) void KviKvsObjectController::clearUserClasses() { flushUserClasses(); - KviPointerHashTableIterator<QString,KviKvsObjectClass> it(*m_pClassDict); + KviPointerHashTableIterator<TQString,KviKvsObjectClass> it(*m_pClassDict); KviPointerList<KviKvsObjectClass> l; l.setAutoDelete(true); while(it.current()) @@ -145,28 +145,28 @@ void KviKvsObjectController::unregisterClass(KviKvsObjectClass *pClass) void KviKvsObjectController::registerObject(KviKvsObject *pObject) { m_pObjectDict->insert(pObject->handle(),pObject); - if(pObject->parent() == 0)m_pTopLevelObjectList->append(pObject); + if(pObject->tqparent() == 0)m_pTopLevelObjectList->append(pObject); } void KviKvsObjectController::unregisterObject(KviKvsObject *pObject) { m_pObjectDict->remove(pObject->handle()); - if(pObject->parent() == 0)m_pTopLevelObjectList->removeRef(pObject); + if(pObject->tqparent() == 0)m_pTopLevelObjectList->removeRef(pObject); } void KviKvsObjectController::flushUserClasses() { - KviPointerHashTableIterator<QString,KviKvsObjectClass> it(*m_pClassDict); + KviPointerHashTableIterator<TQString,KviKvsObjectClass> it(*m_pClassDict); while(KviKvsObjectClass * c = it.current()) { if(!c->isBuiltin()) { if(c->isDirty()) { - QString szPath; - QString szFileName = c->name().lower(); + TQString szPath; + TQString szFileName = c->name().lower(); szFileName += ".kvs"; - szFileName.replace("::","--"); + szFileName.tqreplace("::","--"); g_pApp->getLocalKvircDirectory(szPath,KviApp::Classes,szFileName); if(c->save(szPath)) c->clearDirtyFlag(); @@ -178,9 +178,9 @@ void KviKvsObjectController::flushUserClasses() } } -KviKvsObjectClass * KviKvsObjectController::lookupClass(const QString &szClass,bool bBuiltinOnly) +KviKvsObjectClass * KviKvsObjectController::lookupClass(const TQString &szClass,bool bBuiltinOnly) { - KviKvsObjectClass * pC = m_pClassDict->find(szClass); + KviKvsObjectClass * pC = m_pClassDict->tqfind(szClass); if(!pC) { // maybe we need to load the object library ? @@ -189,21 +189,21 @@ KviKvsObjectClass * KviKvsObjectController::lookupClass(const QString &szClass,b { debug("ops...something wrong with the libkviobjects module!"); return 0; - } else pC = m_pClassDict->find(szClass); + } else pC = m_pClassDict->tqfind(szClass); if(!pC) { if(bBuiltinOnly)return 0; // maybe we need to load it from permanent storage... - QString szPath; - QString szFileName = szClass.lower(); + TQString szPath; + TQString szFileName = szClass.lower(); szFileName += ".kvs"; - szFileName.replace("::","--"); + szFileName.tqreplace("::","--"); g_pApp->getLocalKvircDirectory(szPath,KviApp::Classes,szFileName); if(!KviFileUtils::fileExists(szPath)) g_pApp->getGlobalKvircDirectory(szPath,KviApp::Classes,szFileName); if(!KviFileUtils::fileExists(szPath))return 0; if(!KviKvsObjectClass::load(szPath))return 0; - pC = m_pClassDict->find(szClass); + pC = m_pClassDict->tqfind(szClass); if(pC)pC->clearDirtyFlag(); // just loaded from disk: no need to sync it } } else { @@ -218,10 +218,10 @@ KviKvsObjectClass * KviKvsObjectController::lookupClass(const QString &szClass,b void KviKvsObjectController::deleteClass(KviKvsObjectClass * pClass) { - QString szPath; - QString szFileName = pClass->name().lower(); + TQString szPath; + TQString szFileName = pClass->name().lower(); szFileName += ".kvs"; - szFileName.replace("::","--"); + szFileName.tqreplace("::","--"); g_pApp->getLocalKvircDirectory(szPath,KviApp::Classes,szFileName); KviFileUtils::removeFile(szPath); delete pClass; diff --git a/src/kvirc/kvs/kvi_kvs_object_controller.h b/src/kvirc/kvs/kvi_kvs_object_controller.h index 3df0daa..28b9ae5 100644 --- a/src/kvirc/kvs/kvi_kvs_object_controller.h +++ b/src/kvirc/kvs/kvi_kvs_object_controller.h @@ -46,7 +46,7 @@ public: protected: KviPointerList<KviKvsObject> * m_pTopLevelObjectList; KviPointerHashTable<void *,KviKvsObject> * m_pObjectDict; - KviPointerHashTable<QString,KviKvsObjectClass> * m_pClassDict; + KviPointerHashTable<TQString,KviKvsObjectClass> * m_pClassDict; KviKvsObjectClass * m_pObjectClass; //base class protected: // the classes and the objects register themselves with the controller @@ -61,10 +61,10 @@ public: void clearUserClasses(); void flushUserClasses(); void killAllObjectsWithClass(KviKvsObjectClass * pClass); - KviKvsObjectClass * lookupClass(const QString &szClass,bool bBuiltinOnly = false); - KviKvsObject * lookupObject(kvs_hobject_t hObject){ return m_pObjectDict->find(hObject); }; + KviKvsObjectClass * lookupClass(const TQString &szClass,bool bBuiltinOnly = false); + KviKvsObject * lookupObject(kvs_hobject_t hObject){ return m_pObjectDict->tqfind(hObject); }; KviPointerHashTable<void *,KviKvsObject> * objectDict(){ return m_pObjectDict; }; - KviPointerHashTable<QString,KviKvsObjectClass> * classDict(){ return m_pClassDict; }; + KviPointerHashTable<TQString,KviKvsObjectClass> * classDict(){ return m_pClassDict; }; }; #endif //!_KVI_KVS_OBJECT_CONTROLLER_H_ diff --git a/src/kvirc/kvs/kvi_kvs_object_functionhandler.cpp b/src/kvirc/kvs/kvi_kvs_object_functionhandler.cpp index 9dbf541..2856389 100644 --- a/src/kvirc/kvs/kvi_kvs_object_functionhandler.cpp +++ b/src/kvirc/kvs/kvi_kvs_object_functionhandler.cpp @@ -40,9 +40,9 @@ bool KviKvsObjectFunctionHandler::isScriptHandler() return false; } -QString KviKvsObjectFunctionHandler::scriptHandlerCode() +TQString KviKvsObjectFunctionHandler::scriptHandlerCode() { - return QString::null; + return TQString(); } diff --git a/src/kvirc/kvs/kvi_kvs_object_functionhandler.h b/src/kvirc/kvs/kvi_kvs_object_functionhandler.h index 6b241e2..53f8d58 100644 --- a/src/kvirc/kvs/kvi_kvs_object_functionhandler.h +++ b/src/kvirc/kvs/kvi_kvs_object_functionhandler.h @@ -48,7 +48,7 @@ public: unsigned int flags(){ return m_uFlags; }; protected: virtual bool isScriptHandler(); - virtual QString scriptHandlerCode(); + virtual TQString scriptHandlerCode(); virtual KviKvsObjectFunctionHandler * clone() = 0; virtual bool call(KviKvsObject * pObject,KviKvsObjectFunctionCall * pCall) = 0; }; diff --git a/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.cpp b/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.cpp index 77c4101..c22bccc 100644 --- a/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.cpp +++ b/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.cpp @@ -104,7 +104,7 @@ bool KviKvsObjectCoreCallFunctionHandler::call(KviKvsObject * pObject,KviKvsObje /////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -KviKvsObjectScriptFunctionHandler::KviKvsObjectScriptFunctionHandler(const QString &szScriptContext,const QString &szCode,unsigned int uFlags) +KviKvsObjectScriptFunctionHandler::KviKvsObjectScriptFunctionHandler(const TQString &szScriptContext,const TQString &szCode,unsigned int uFlags) : KviKvsObjectFunctionHandler(uFlags) { m_pHandler = new KviKvsScript(szScriptContext,szCode,KviKvsScript::InstructionList); @@ -127,7 +127,7 @@ bool KviKvsObjectScriptFunctionHandler::isScriptHandler() return true; } -QString KviKvsObjectScriptFunctionHandler::scriptHandlerCode() +TQString KviKvsObjectScriptFunctionHandler::scriptHandlerCode() { return m_pHandler->code(); } diff --git a/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.h b/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.h index 37f506a..e01a59f 100644 --- a/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.h +++ b/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.h @@ -57,7 +57,7 @@ class KVIRC_API KviKvsObjectScriptFunctionHandler : public KviKvsObjectFunctionH friend class KviKvsObject; friend class KviKvsObjectClass; protected: - KviKvsObjectScriptFunctionHandler(const QString &szScriptContext,const QString &szCode,unsigned int uFlags = 0); + KviKvsObjectScriptFunctionHandler(const TQString &szScriptContext,const TQString &szCode,unsigned int uFlags = 0); KviKvsObjectScriptFunctionHandler(const KviKvsObjectScriptFunctionHandler &h); public: virtual ~KviKvsObjectScriptFunctionHandler(); @@ -65,7 +65,7 @@ protected: KviKvsScript * m_pHandler; protected: virtual bool isScriptHandler(); - virtual QString scriptHandlerCode(); + virtual TQString scriptHandlerCode(); virtual KviKvsObjectFunctionHandler * clone(); virtual bool call(KviKvsObject * pObject,KviKvsObjectFunctionCall * pCall); }; diff --git a/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp b/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp index fdd0639..fd62592 100644 --- a/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp +++ b/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp @@ -38,7 +38,7 @@ #include "kvi_pointerlist.h" -#include <qstringlist.h> +#include <tqstringlist.h> namespace KviKvsParameterProcessor { @@ -49,7 +49,7 @@ namespace KviKvsParameterProcessor { case KVS_PT_STRING: case KVS_PT_NONEMPTYSTRING: - *((QString *)(pFmtArray->pContainer)) = QString::null; + *((TQString *)(pFmtArray->pContainer)) = TQString(); break; case KVS_PT_INT: *((kvs_int_t *)(pFmtArray->pContainer)) = 0; @@ -77,10 +77,10 @@ namespace KviKvsParameterProcessor break; case KVS_PT_CSTRING: case KVS_PT_NONEMPTYCSTRING: - *((KviQCString *)(pFmtArray->pContainer)) = 0; + *((KviTQCString *)(pFmtArray->pContainer)) = 0; break; case KVS_PT_STRINGLIST: - ((QStringList *)(pFmtArray->pContainer))->clear(); + ((TQStringList *)(pFmtArray->pContainer))->clear(); break; case KVS_PT_VARIANTLIST: ((KviKvsVariantList *)(pFmtArray->pContainer))->clear(); @@ -110,28 +110,28 @@ namespace KviKvsParameterProcessor } } - QString szError; - KviQString::sprintf(szError,__tr2qs("Invalid data type for parameter \"%s\""),pFmtArray->szName); + TQString szError; + KviTQString::sprintf(szError,__tr2qs("Invalid data type for parameter \"%s\""),pFmtArray->szName); szError += ": "; if(v->isString()) { - QString tmp = v->string(); + TQString tmp = v->string(); if(tmp.isEmpty()) { - KviQString::appendFormatted(szError,__tr2qs("found empty string where type '%s' was expected"),&tmp,szExpectedType); + KviTQString::appendFormatted(szError,__tr2qs("found empty string where type '%s' was expected"),&tmp,szExpectedType); } else { if(tmp.length() > 15) { tmp.truncate(15); tmp.append("..."); } - KviQString::appendFormatted(szError,__tr2qs("found string value \"%Q\" where type '%s' was expected"),&tmp,szExpectedType); + KviTQString::appendFormatted(szError,__tr2qs("found string value \"%Q\" where type '%s' was expected"),&tmp,szExpectedType); } } else { - QString tmp; + TQString tmp; v->getTypeName(tmp); - KviQString::appendFormatted(szError,__tr2qs("found type %Q where type '%s' was expected"),&tmp,szExpectedType); + KviTQString::appendFormatted(szError,__tr2qs("found type %Q where type '%s' was expected"),&tmp,szExpectedType); } pContext->error(szError); return false; @@ -150,8 +150,8 @@ namespace KviKvsParameterProcessor if(!(pFmtArray->uFlags & KVS_PF_OPTIONAL)) { // bad luck - QString szError; - KviQString::sprintf(szError,__tr2qs("Missing non-optional parameter \"%s\""),pFmtArray->szName); + TQString szError; + KviTQString::sprintf(szError,__tr2qs("Missing non-optional parameter \"%s\""),pFmtArray->szName); pContext->error(szError); return false; } @@ -167,14 +167,14 @@ namespace KviKvsParameterProcessor switch(pFmtArray->uType) { case KVS_PT_STRING: - v->asString(*((QString *)(pFmtArray->pContainer))); + v->asString(*((TQString *)(pFmtArray->pContainer))); if(pFmtArray->uFlags & KVS_PF_APPENDREMAINING) { v = pVariantList->next(); while(v) { - *((QString *)(pFmtArray->pContainer)) += QChar(' '); - v->appendAsString(*((QString *)(pFmtArray->pContainer))); + *((TQString *)(pFmtArray->pContainer)) += TQChar(' '); + v->appendAsString(*((TQString *)(pFmtArray->pContainer))); v = pVariantList->next(); } return true; @@ -182,15 +182,15 @@ namespace KviKvsParameterProcessor break; case KVS_PT_STRINGLIST: { - ((QStringList *)(pFmtArray->pContainer))->clear(); - QString pSz; + ((TQStringList *)(pFmtArray->pContainer))->clear(); + TQString pSz; v->asString(pSz); - ((QStringList *)(pFmtArray->pContainer))->append(pSz); + ((TQStringList *)(pFmtArray->pContainer))->append(pSz); v = pVariantList->next(); while(v) { v->asString(pSz); - ((QStringList *)(pFmtArray->pContainer))->append(pSz); + ((TQStringList *)(pFmtArray->pContainer))->append(pSz); v = pVariantList->next(); } return true; @@ -212,25 +212,25 @@ namespace KviKvsParameterProcessor break; case KVS_PT_NONEMPTYSTRING: { - v->asString(*((QString *)(pFmtArray->pContainer))); + v->asString(*((TQString *)(pFmtArray->pContainer))); bool bDoReturn = false; if(pFmtArray->uFlags & KVS_PF_APPENDREMAINING) { v = pVariantList->next(); while(v) { - *((QString *)(pFmtArray->pContainer)) += QChar(' '); - v->appendAsString(*((QString *)(pFmtArray->pContainer))); + *((TQString *)(pFmtArray->pContainer)) += TQChar(' '); + v->appendAsString(*((TQString *)(pFmtArray->pContainer))); v = pVariantList->next(); } bDoReturn = true; } - if(((QString *)(pFmtArray->pContainer))->isEmpty()) + if(((TQString *)(pFmtArray->pContainer))->isEmpty()) { - QString szError; - KviQString::sprintf(szError,__tr2qs("Invalid data type for parameter \"%s\""),pFmtArray->szName); + TQString szError; + KviTQString::sprintf(szError,__tr2qs("Invalid data type for parameter \"%s\""),pFmtArray->szName); szError += ": "; - KviQString::sprintf(szError,__tr2qs("found empty string while a non empty one was expected")); + KviTQString::sprintf(szError,__tr2qs("found empty string while a non empty one was expected")); pContext->error(szError); return false; } @@ -239,26 +239,26 @@ namespace KviKvsParameterProcessor break; case KVS_PT_CSTRING: { - QString tmp; + TQString tmp; v->asString(tmp); if(pFmtArray->uFlags & KVS_PF_APPENDREMAINING) { v = pVariantList->next(); while(v) { - *((KviQCString *)(pFmtArray->pContainer)) += ' '; + *((KviTQCString *)(pFmtArray->pContainer)) += ' '; v->appendAsString(tmp); v = pVariantList->next(); } - *((KviQCString *)(pFmtArray->pContainer)) = tmp.utf8(); + *((KviTQCString *)(pFmtArray->pContainer)) = tmp.utf8(); return true; } - *((KviQCString *)(pFmtArray->pContainer)) = tmp.utf8(); + *((KviTQCString *)(pFmtArray->pContainer)) = tmp.utf8(); } break; case KVS_PT_NONEMPTYCSTRING: { - QString tmp; + TQString tmp; v->asString(tmp); bool bDoReturn = false; if(pFmtArray->uFlags & KVS_PF_APPENDREMAINING) @@ -266,20 +266,20 @@ namespace KviKvsParameterProcessor v = pVariantList->next(); while(v) { - *((KviQCString *)(pFmtArray->pContainer)) += ' '; + *((KviTQCString *)(pFmtArray->pContainer)) += ' '; v->appendAsString(tmp); v = pVariantList->next(); } - *((KviQCString *)(pFmtArray->pContainer)) = tmp.utf8(); + *((KviTQCString *)(pFmtArray->pContainer)) = tmp.utf8(); bDoReturn = true; } - *((KviQCString *)(pFmtArray->pContainer)) = tmp.utf8(); - if(((KviQCString *)(pFmtArray->pContainer))->isEmpty()) + *((KviTQCString *)(pFmtArray->pContainer)) = tmp.utf8(); + if(((KviTQCString *)(pFmtArray->pContainer))->isEmpty()) { - QString szError; - KviQString::sprintf(szError,__tr2qs("Invalid data type for parameter \"%s\""),pFmtArray->szName); + TQString szError; + KviTQString::sprintf(szError,__tr2qs("Invalid data type for parameter \"%s\""),pFmtArray->szName); szError += ": "; - KviQString::sprintf(szError,__tr2qs("found empty string while a non empty one was expected")); + KviTQString::sprintf(szError,__tr2qs("found empty string while a non empty one was expected")); pContext->error(szError); return false; } @@ -303,10 +303,10 @@ namespace KviKvsParameterProcessor } if(iTmp < 0) { - QString szError; - KviQString::sprintf(szError,__tr2qs("Invalid data type for parameter \"%s\""),pFmtArray->szName); + TQString szError; + KviTQString::sprintf(szError,__tr2qs("Invalid data type for parameter \"%s\""),pFmtArray->szName); szError += ": "; - KviQString::sprintf(szError,__tr2qs("found signed integer \"%d\" where type 'unsigned integer' was expected"),iTmp); + KviTQString::sprintf(szError,__tr2qs("found signed integer \"%d\" where type 'unsigned integer' was expected"),iTmp); pContext->error(szError); return false; } diff --git a/src/kvirc/kvs/kvi_kvs_parameterprocessor.h b/src/kvirc/kvs/kvi_kvs_parameterprocessor.h index 3d8483f..15b06e5 100644 --- a/src/kvirc/kvs/kvi_kvs_parameterprocessor.h +++ b/src/kvirc/kvs/kvi_kvs_parameterprocessor.h @@ -27,12 +27,12 @@ #include "kvi_settings.h" -// Data type: QString -// Default: QString::null +// Data type: TQString +// Default: TQString() #define KVS_PT_STRING 0 -// Data type: QString -// Default: QString::null +// Data type: TQString +// Default: TQString() #define KVS_PT_NONEMPTYSTRING 1 // Data type: kvs_int_t @@ -67,15 +67,15 @@ // default: 0 #define KVS_PT_VARIANT 8 -// Data type: QCString +// Data type: TQCString // default null string (0) #define KVS_PT_CSTRING 9 -// Data type: QCString +// Data type: TQCString // default null string (0) #define KVS_PT_NONEMPTYCSTRING 10 -// Data type: QStringList +// Data type: TQStringList // default: list cleared // This eats all the remaining params in the list! #define KVS_PT_STRINGLIST 11 diff --git a/src/kvirc/kvs/kvi_kvs_parser.cpp b/src/kvirc/kvs/kvi_kvs_parser.cpp index 37e462c..3d439fd 100644 --- a/src/kvirc/kvs/kvi_kvs_parser.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser.cpp @@ -68,7 +68,7 @@ void KviKvsParser::init() { \ KviKvsSpecialCommandParsingRoutine * r = new KviKvsSpecialCommandParsingRoutine; \ r->proc = KVI_PTR2MEMBER(KviKvsParser::__parsingRoutine); \ - pKern->registerSpecialCommandParsingRoutine(QString(__cntrlCmdName),r); \ + pKern->registerSpecialCommandParsingRoutine(TQString(__cntrlCmdName),r); \ } _REG_CNTRL_CMD("if",parseSpecialCommandIf); @@ -87,24 +87,24 @@ void KviKvsParser::init() #undef _REG_CNTRL_CMD } -void KviKvsParser::report(bool bError,const QChar * pLocation,const QString &szMsgFmt,kvi_va_list va) +void KviKvsParser::report(bool bError,const TQChar * pLocation,const TQString &szMsgFmt,kvi_va_list va) { - QString szMsg; - KviQString::vsprintf(szMsg,szMsgFmt,va); + TQString szMsg; + KviTQString::vsprintf(szMsg,szMsgFmt,va); - KviPointerList<QString> * pCodeListing = 0; - QString szLocation; + KviPointerList<TQString> * pCodeListing = 0; + TQString szLocation; if(pLocation) { - pCodeListing = new KviPointerList<QString>; + pCodeListing = new KviPointerList<TQString>; pCodeListing->setAutoDelete(true); int iLine,iCol; KviKvsReport::findLineColAndListing(m_pBuffer,pLocation,iLine,iCol,pCodeListing); - KviQString::sprintf(szLocation,__tr2qs("line %d, near character %d"),iLine,iCol); + KviTQString::sprintf(szLocation,__tr2qs("line %d, near character %d"),iLine,iCol); } else { szLocation = __tr2qs("beginning of input"); } @@ -115,17 +115,17 @@ void KviKvsParser::report(bool bError,const QChar * pLocation,const QString &szM KviKvsReport::report(&rep,m_pWindow); } -void KviKvsParser::errorBadChar(const QChar * pLocation,char cExpected,const char * szCommandName) +void KviKvsParser::errorBadChar(const TQChar * pLocation,char cExpected,const char * szCommandName) { - if(pLocation->unicode()) - error(pLocation,__tr2qs("Found character '%q' (unicode 0x%x) where '%c' was expected: see \"/help %s\" for the command syntax"), - pLocation,pLocation->unicode(),cExpected,szCommandName); + if(pLocation->tqunicode()) + error(pLocation,__tr2qs("Found character '%q' (tqunicode 0x%x) where '%c' was expected: see \"/help %s\" for the command syntax"), + pLocation,pLocation->tqunicode(),cExpected,szCommandName); else error(pLocation,__tr2qs("Found end of input where character '%c' was expected: see \"/help %s\" for the command syntax"), cExpected,szCommandName); } -void KviKvsParser::error(const QChar * pLocation,const QString &szMsgFmt,...) +void KviKvsParser::error(const TQChar * pLocation,const TQString &szMsgFmt,...) { m_bError = true; @@ -135,7 +135,7 @@ void KviKvsParser::error(const QChar * pLocation,const QString &szMsgFmt,...) kvi_va_end(va); } -void KviKvsParser::warning(const QChar * pLocation,const QString &szMsgFmt,...) +void KviKvsParser::warning(const TQChar * pLocation,const TQString &szMsgFmt,...) { kvi_va_list va; kvi_va_start_by_reference(va,szMsgFmt); @@ -143,7 +143,7 @@ void KviKvsParser::warning(const QChar * pLocation,const QString &szMsgFmt,...) kvi_va_end(va); } -KviKvsTreeNodeInstruction * KviKvsParser::parse(const QChar * pBuffer,int iFlags) +KviKvsTreeNodeInstruction * KviKvsParser::parse(const TQChar * pBuffer,int iFlags) { m_iFlags = iFlags; @@ -161,7 +161,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parse(const QChar * pBuffer,int iFlags return parseInstructionList(); } -KviKvsTreeNodeInstruction * KviKvsParser::parseAsExpression(const QChar * pBuffer,int iFlags) +KviKvsTreeNodeInstruction * KviKvsParser::parseAsExpression(const TQChar * pBuffer,int iFlags) { m_iFlags = iFlags; @@ -182,7 +182,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsExpression(const QChar * pBuffe return new KviKvsTreeNodeExpressionReturn(pBuffer,expr); } -KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer,int iFlags) +KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const TQChar * pBuffer,int iFlags) { m_iFlags = iFlags; @@ -428,10 +428,10 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer [/example] The line above is an example of syntax specification. All the commands are described by such syntax lines. [cmd]join[/cmd] is the command and it stands exactly - for the literal string "join" typed in a script. <channel> is in angular parenthesis + for the literal string "join" typed in a script. <channel> is in angular tqparenthesis and rappresents a mandatory parameter: you must substitute a real channel name in its place otherwise the command will fail and KVIrc will probably complain too. - [password] is still a parameter but the square parentheses indicate that it is + [password] is still a parameter but the square tqparentheses indicate that it is optional: if you specify it, then it will be interpreted as the channel password, if you don't then no password will be used. [note] @@ -701,7 +701,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer The function [fnc]$str.len[/fnc] accepts a single parameter and returns the length in characters of the parameter string. The returned value is always a string: in this case it can be also interpreted as a number.[br] - When passing an empty list you can avoid the parenthesis. + When passing an empty list you can avoid the tqparenthesis. (And you have found the "simple" functions shown above). So the followind two calls are equal:[br] [example] @@ -719,7 +719,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer [/example] If you want to place a literal '(' or ')' in the function parameters you must escape it. - A special case for when you want to use 'matching' parentheses: + A special case for when you want to use 'matching' tqparentheses: an opened '(' corresponds to a closed ')'. In this case you can omit the 'escape' character.[br] [example] @@ -1349,7 +1349,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer so the callback code is empty, but if you continue reading we will soon fill it. [/p] - [big]A typical addon layout[/big] + [big]A typical addon tqlayout[/big] [p] As stated above, the addons are usually shipped in a compressed archive. Once uncompressed, the archive will expand into a small directory tree @@ -1400,7 +1400,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer [/p] [p] The entries in [b]bold[/b] are directories while the other are files. - Please note that this is a general layout for a huge and rather complex + Please note that this is a general tqlayout for a huge and rather complex addon: you might not need all of these directories. Remember: the minimal addon has only an install.kvs file. Anyway, a really cool addon will probably have all of them and maybe some more. @@ -1496,7 +1496,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer [p] It is a good idea to start on the KVIrc web site. There are surely several addons to look at. Pick one that seems simple and analyze its - layout and code (wow... the free software!). It will be easier to do than it was to explain it :D + tqlayout and code (wow... the free software!). It will be easier to do than it was to explain it :D [/p] [p] Have fun! :) @@ -2402,7 +2402,7 @@ KviKvsTreeNodeData * KviKvsParser::parseParameterPercentOrDollar() if(!KVSP_curCharIsLetter && (KVSP_curCharUnicode != ':')) { // be flexible : allow an "alone" '%' char - return new KviKvsTreeNodeConstantData(KVSP_curCharPointer - 1,new KviKvsVariant(QString("%"))); + return new KviKvsTreeNodeConstantData(KVSP_curCharPointer - 1,new KviKvsVariant(TQString("%"))); } // this is surely a variable or function KVSP_backChar; @@ -2412,7 +2412,7 @@ KviKvsTreeNodeData * KviKvsParser::parseParameterPercentOrDollar() if(!KVSP_curCharIsFunctionStart) { // be flexible : allow an "alone" '$' char - return new KviKvsTreeNodeConstantData(KVSP_curCharPointer - 1,new KviKvsVariant(QString("$"))); + return new KviKvsTreeNodeConstantData(KVSP_curCharPointer - 1,new KviKvsVariant(TQString("$"))); } // this is surely a variable or function KVSP_backChar; @@ -2428,7 +2428,7 @@ KviKvsTreeNodeData * KviKvsParser::parsePercentOrDollar(bool bInObjScope) KVSP_ASSERT((KVSP_curCharUnicode == '%') || (KVSP_curCharUnicode == '$') || (KVSP_curCharUnicode == '@')); KviKvsTreeNodeData * r; - const QChar * pBegin; + const TQChar * pBegin; if(KVSP_curCharUnicode == '%') { @@ -2440,8 +2440,8 @@ KviKvsTreeNodeData * KviKvsParser::parsePercentOrDollar(bool bInObjScope) if(!r)return 0; } else { // this is @ - static QString szStrayAtRoutineName("@"); - static QString szMightBeStrayAtOrThisRoutineName("@?"); + static TQString szStrayAtRoutineName("@"); + static TQString szMightBeStrayAtOrThisRoutineName("@?"); pBegin = KVSP_curCharPointer; @@ -2458,7 +2458,7 @@ KviKvsTreeNodeData * KviKvsParser::parsePercentOrDollar(bool bInObjScope) return r; } // we're not in object scope and cur char is either $ or % - // check for the common syntax $0!$1@$2 seen in hostmasks + // check for the common syntax $0!$1@$2 seen in hosttqmasks // @$<digit> is non valid anyway if(KVSP_curCharUnicode == '$') { @@ -2631,7 +2631,7 @@ KviKvsTreeNodeVariable * KviKvsParser::parsePercent(bool bInObjScope) { KVSP_ASSERT(KVSP_curCharUnicode == '%'); - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; KVSP_skipChar; @@ -2651,11 +2651,11 @@ KviKvsTreeNodeVariable * KviKvsParser::parsePercent(bool bInObjScope) return 0; } - const QChar * pIdBegin = KVSP_curCharPointer; + const TQChar * pIdBegin = KVSP_curCharPointer; while((KVSP_curCharIsLetterOrNumber) || (KVSP_curCharUnicode == '_') || (KVSP_curCharUnicode == '.'))KVSP_skipChar; - QString szIdentifier(pIdBegin,KVSP_curCharPointer - pIdBegin); + TQString szIdentifier(pIdBegin,KVSP_curCharPointer - pIdBegin); //#warning "ADD A KviKvsTreeNodeBuiltinCleanupVariablesCommand on this KviKvsParser object" //#warning "KviKvsParser will append it to the script" @@ -2675,13 +2675,13 @@ KviKvsTreeNodeVariable * KviKvsParser::parsePercent(bool bInObjScope) if(m_pGlobals) { - if(m_pGlobals->find(szIdentifier))return new KviKvsTreeNodeGlobalVariable(pBegin,szIdentifier); + if(m_pGlobals->tqfind(szIdentifier))return new KviKvsTreeNodeGlobalVariable(pBegin,szIdentifier); } if(m_iFlags & AssumeLocals) return new KviKvsTreeNodeLocalVariable(pBegin,szIdentifier); - if(pIdBegin->category() & QChar::Letter_Uppercase) + if(pIdBegin->category() & TQChar::Letter_Uppercase) { //if(m_iFlags & Pedantic) // warning(pIdBegin,__tr2qs("Declaring global variables with an uppercase letter is deprecated. Global variables should be declared with 'global'")); @@ -2724,7 +2724,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseInstruction() return parseCommand(); } else { // what the heck is this ? - error(KVSP_curCharPointer,__tr2qs("Found character '%q' (unicode %x) where an instruction was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character '%q' (tqunicode %x) where an instruction was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); return 0; } break; @@ -2741,7 +2741,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseInstructionBlock() KVSP_skipChar; - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; KviKvsTreeNodeInstructionBlock * b = new KviKvsTreeNodeInstructionBlock(pBegin - 1); @@ -2804,7 +2804,7 @@ KviKvsTreeNodeSwitchList * KviKvsParser::parseCommandSwitchList() while(KVSP_curCharUnicode == '-') { - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; KVSP_skipChar; bool bLong = false; @@ -2839,7 +2839,7 @@ KviKvsTreeNodeSwitchList * KviKvsParser::parseCommandSwitchList() if(KVSP_curCharUnicode == 0) { - error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (unicode %x) after a switch dash"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (tqunicode %x) after a switch dash"),KVSP_curCharPointer,KVSP_curCharUnicode); } else { error(KVSP_curCharPointer,__tr2qs("Unexpected end of script after a switch dash")); } @@ -2847,12 +2847,12 @@ KviKvsTreeNodeSwitchList * KviKvsParser::parseCommandSwitchList() } } - const QChar * pSw = KVSP_curCharPointer; + const TQChar * pSw = KVSP_curCharPointer; KVSP_skipChar; while((KVSP_curCharIsLetterOrNumber) || (KVSP_curCharUnicode == '-'))KVSP_skipChar; - const QChar * pSwEnd = KVSP_curCharPointer; + const TQChar * pSwEnd = KVSP_curCharPointer; skipSpaces(); @@ -2871,21 +2871,21 @@ KviKvsTreeNodeSwitchList * KviKvsParser::parseCommandSwitchList() return 0; } else { // assume empty string - p = new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(QString(""))); + p = new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(TQString(""))); } } skipSpaces(); if(bLong) - sw->addLong(QString(pSw,pSwEnd - pSw),p); + sw->addLong(TQString(pSw,pSwEnd - pSw),p); else - sw->addShort(pSw->lower().unicode(),p); + sw->addShort(pSw->lower().tqunicode(),p); } else { if(bLong) - sw->addLong(QString(pSw,pSwEnd - pSw),new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(true))); // empty param + sw->addLong(TQString(pSw,pSwEnd - pSw),new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(true))); // empty param else - sw->addShort(pSw->lower().unicode(),new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(true))); // empty param + sw->addShort(pSw->lower().tqunicode(),new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(true))); // empty param } } @@ -2932,9 +2932,9 @@ KviKvsTreeNodeDataList * KviKvsParser::parseCommandParameterList() } -KviPointerList<QString> * KviKvsParser::parseCommaSeparatedParameterListNoTree() +KviPointerList<TQString> * KviKvsParser::parseCommaSeparatedParameterListNoTree() { - KviPointerList<QString> * l = new KviPointerList<QString>; + KviPointerList<TQString> * l = new KviPointerList<TQString>; l->setAutoDelete(true); KVSP_skipChar; @@ -2967,7 +2967,7 @@ KviPointerList<QString> * KviKvsParser::parseCommaSeparatedParameterListNoTree() default: { // anything else is a parameter - const QChar *pBegin = KVSP_curCharPointer; + const TQChar *pBegin = KVSP_curCharPointer; KviKvsTreeNodeData * p = parseCommaSeparatedParameter(); if(!p) { @@ -2976,7 +2976,7 @@ KviPointerList<QString> * KviKvsParser::parseCommaSeparatedParameterListNoTree() return 0; } delete p; - QString * s = new QString(pBegin,KVSP_curCharPointer - pBegin); + TQString * s = new TQString(pBegin,KVSP_curCharPointer - pBegin); s->stripWhiteSpace(); l->append(s); @@ -3066,10 +3066,10 @@ KviKvsTreeNodeDataList * KviKvsParser::parseCommaSeparatedParameterList() #define LITERAL_PARAM_PARSING_FUNCTION_BEGIN(__funcname) \ KviKvsTreeNodeConstantData * KviKvsParser::__funcname() \ { \ - QString szValue; \ + TQString szValue; \ \ - const QChar * pStart = KVSP_curCharPointer; \ - const QChar * pBegin = KVSP_curCharPointer; \ + const TQChar * pStart = KVSP_curCharPointer; \ + const TQChar * pBegin = KVSP_curCharPointer; \ int iLen = 0; \ int iNestedTerminators = 0; \ \ @@ -3095,7 +3095,7 @@ KviKvsTreeNodeConstantData * KviKvsParser::__funcname() \ iNestedTerminators--; \ iLen++; \ } else { \ - if(iLen > 0)szValue.append(QString(pBegin,iLen)); \ + if(iLen > 0)szValue.append(TQString(pBegin,iLen)); \ { \ bool bOk; \ kvs_int_t iVal = szValue.toLong(&bOk); \ @@ -3108,11 +3108,11 @@ KviKvsTreeNodeConstantData * KviKvsParser::__funcname() \ break; #define LITERAL_PARAM_PARSING_FUNCTION_GENERIC_END \ - if(iLen > 0) szValue.append(QString(pBegin,iLen)); \ + if(iLen > 0) szValue.append(TQString(pBegin,iLen)); \ return new KviKvsTreeNodeConstantData(pBegin,new KviKvsVariant(szValue)); \ break; \ case '\\': \ - if(iLen > 0)szValue.append(QString(pBegin,iLen)); \ + if(iLen > 0)szValue.append(TQString(pBegin,iLen)); \ KVSP_skipChar; \ switch(KVSP_curCharUnicode) \ { \ @@ -3129,19 +3129,19 @@ KviKvsTreeNodeConstantData * KviKvsParser::__funcname() \ case 'r': \ KVSP_skipChar; \ pBegin = KVSP_curCharPointer; \ - szValue.append(QChar('\r')); \ + szValue.append(TQChar('\r')); \ iLen = 0; \ break; \ case 'n': \ KVSP_skipChar; \ pBegin = KVSP_curCharPointer; \ - szValue.append(QChar('\n')); \ + szValue.append(TQChar('\n')); \ iLen = 0; \ break; \ case 't': \ KVSP_skipChar; \ pBegin = KVSP_curCharPointer; \ - szValue.append(QChar('\t')); \ + szValue.append(TQChar('\t')); \ iLen = 0; \ break; \ default: \ @@ -3264,7 +3264,7 @@ KviKvsTreeNodeData * KviKvsParser::parseArrayIndex() KviPointerList<KviKvsTreeNodeData> * l = new KviPointerList<KviKvsTreeNodeData>(); l->setAutoDelete(true); - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; //KVSP_skipChar; @@ -3300,7 +3300,7 @@ KviKvsTreeNodeData * KviKvsParser::parseArrayIndex() error(KVSP_curCharPointer,__tr2qs("Unexpected end of line in array index (missing ']' character or unescaped newline)")); break; default: - error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (unicode %x) in array index: it should be already terminated"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (tqunicode %x) in array index: it should be already terminated"),KVSP_curCharPointer,KVSP_curCharUnicode); break; } return 0; @@ -3373,7 +3373,7 @@ KviKvsTreeNodeData * KviKvsParser::parseHashKey() KviPointerList<KviKvsTreeNodeData> * l = new KviPointerList<KviKvsTreeNodeData>(); l->setAutoDelete(true); - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; //KVSP_skipChar; @@ -3400,7 +3400,7 @@ KviKvsTreeNodeData * KviKvsParser::parseHashKey() if(KVSP_curCharUnicode != '}') { // separate by single spaces - l->append(new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(QString(" ")))); + l->append(new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(TQString(" ")))); } else { goto end_of_the_hash_key; } @@ -3481,7 +3481,7 @@ KviKvsTreeNodeData * KviKvsParser::parseCommaSeparatedParameter() KviPointerList<KviKvsTreeNodeData> * l = new KviPointerList<KviKvsTreeNodeData>; l->setAutoDelete(true); - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; for(;;) { @@ -3516,7 +3516,7 @@ KviKvsTreeNodeData * KviKvsParser::parseCommaSeparatedParameter() if((KVSP_curCharUnicode != ')') && (KVSP_curCharUnicode != ',')) { // separate by single spaces - l->append(new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(QString(" ")))); + l->append(new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(TQString(" ")))); } else { goto end_of_function_parameter; } @@ -3568,7 +3568,7 @@ KviKvsTreeNodeData * KviKvsParser::parseSingleParameterInParenthesis() KviPointerList<KviKvsTreeNodeData> * l = new KviPointerList<KviKvsTreeNodeData>; l->setAutoDelete(true); - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; for(;;) { @@ -3606,7 +3606,7 @@ KviKvsTreeNodeData * KviKvsParser::parseSingleParameterInParenthesis() if((KVSP_curCharUnicode != ')') && (KVSP_curCharUnicode != ',')) { // separate by single spaces - l->append(new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(QString(" ")))); + l->append(new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(TQString(" ")))); } else { goto end_of_function_parameter; } @@ -3659,7 +3659,7 @@ KviKvsTreeNodeData * KviKvsParser::parseStringParameter() KviPointerList<KviKvsTreeNodeData> * l = new KviPointerList<KviKvsTreeNodeData>(); l->setAutoDelete(true); - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; KVSP_skipChar; @@ -3728,7 +3728,7 @@ end_of_the_string: } else { // no parameters at all.. return straight empty string (no need to cast) delete l; - return new KviKvsTreeNodeConstantData(pBegin,new KviKvsVariant(new QString())); + return new KviKvsTreeNodeConstantData(pBegin,new KviKvsVariant(new TQString())); } } // never reached @@ -3742,7 +3742,7 @@ KviKvsTreeNodeData * KviKvsParser::parseCommandParameter(bool bPreferNumeric) bool bGotLiteral = false; - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; for(;;) { diff --git a/src/kvirc/kvs/kvi_kvs_parser.h b/src/kvirc/kvs/kvi_kvs_parser.h index be98e96..70e353a 100644 --- a/src/kvirc/kvs/kvi_kvs_parser.h +++ b/src/kvirc/kvs/kvi_kvs_parser.h @@ -61,14 +61,14 @@ public: KviKvsParser(KviKvsScript * pScript,KviWindow * pOutputWindow); ~KviKvsParser(); private: - const QChar * m_pBuffer; // the local pointer to the beginning of the buffer - const QChar * m_ptr; // the parsing pointer + const TQChar * m_pBuffer; // the local pointer to the beginning of the buffer + const TQChar * m_ptr; // the parsing pointer // parsing state - KviPointerHashTable<QString,QString> * m_pGlobals; // the dict of the vars declared with global in this script + KviPointerHashTable<TQString,TQString> * m_pGlobals; // the dict of the vars declared with global in this script int m_iFlags; // the current parsing flags bool m_bError; // error(..) was called ? // this stuff is used only for reporting errors and warnings - KviKvsScript * m_pScript; // parent script + KviKvsScript * m_pScript; // tqparent script KviWindow * m_pWindow; // output window public: // public interface enum Flags { AssumeLocals = 1, Pedantic = 2 }; @@ -77,9 +77,9 @@ public: // public interface // parses the buffer pointed by pBuffer and returns // a syntax tree or 0 in case of failure // if the parsing fails, the error code can be retrieved by calling error() - KviKvsTreeNodeInstruction * parse(const QChar * pBuffer,int iFlags = 0); - KviKvsTreeNodeInstruction * parseAsExpression(const QChar * pBuffer,int iFlags = 0); - KviKvsTreeNodeInstruction * parseAsParameter(const QChar * pBuffer,int iFlags = 0); + KviKvsTreeNodeInstruction * parse(const TQChar * pBuffer,int iFlags = 0); + KviKvsTreeNodeInstruction * parseAsExpression(const TQChar * pBuffer,int iFlags = 0); + KviKvsTreeNodeInstruction * parseAsParameter(const TQChar * pBuffer,int iFlags = 0); private: // parsing helpers // generic void skipSpaces(); // skips only spaces and tabs (eventually with \) @@ -90,9 +90,9 @@ private: // parsing helpers // dedicated to parseSpecialCommandFor() : in kvi_kvs_parser_specialcommands.cpp bool skipToEndOfForControlBlock(); // error handlers - void error(const QChar * pLocation,const QString &szMsgFmt,...); - void warning(const QChar * pLocation,const QString &szMsgFmt,...); - void errorBadChar(const QChar * pLocation,char cExpected,const char * szCommandName); + void error(const TQChar * pLocation,const TQString &szMsgFmt,...); + void warning(const TQChar * pLocation,const TQString &szMsgFmt,...); + void errorBadChar(const TQChar * pLocation,char cExpected,const char * szCommandName); protected: // this is called by KviKvsKernel to register the parsing routines @@ -121,7 +121,7 @@ private: // if started in the middle of the list returns only the remaining // parameters. KviKvsTreeNodeDataList * parseCommaSeparatedParameterList(); - KviPointerList<QString> * parseCommaSeparatedParameterListNoTree(); + KviPointerList<TQString> * parseCommaSeparatedParameterListNoTree(); // returns 0 in case of error or if it starts on a terminating character (null parameter) // check error() to see if there was an error condition (unless you already know that // there was a valid first character) @@ -294,7 +294,7 @@ private: KviKvsTreeNodeExpression * parseExpressionOperandCore(char terminator); bool parseExpressionMightPointToOperator(); - void report(bool bError,const QChar * pLocation,const QString &szMsgFmt,kvi_va_list va); + void report(bool bError,const TQChar * pLocation,const TQString &szMsgFmt,kvi_va_list va); }; #endif //!_KVI_KVS_PARSER_H_ diff --git a/src/kvirc/kvs/kvi_kvs_parser_command.cpp b/src/kvirc/kvs/kvi_kvs_parser_command.cpp index bd50d23..094fc30 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_command.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser_command.cpp @@ -46,13 +46,13 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand() KVSP_ASSERT(KVSP_curCharIsLetter || (KVSP_curCharUnicode == '_')); - const QChar * pIdentifier = KVSP_curCharPointer; + const TQChar * pIdentifier = KVSP_curCharPointer; while(KVSP_curCharIsLetterOrNumber || (KVSP_curCharUnicode == '_'))KVSP_skipChar; int iIdentifierLen = KVSP_curCharPointer - pIdentifier; - const QChar * pSecondPart = 0; + const TQChar * pSecondPart = 0; int iSecondPartLen = 0; bool bHasNamespaceSoMustBeAlias = false; @@ -107,7 +107,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand() iIdentifierLen = KVSP_curCharPointer - pIdentifier; } - QString szIdentifier(pIdentifier,iIdentifierLen); + TQString szIdentifier(pIdentifier,iIdentifierLen); skipSpaces(); @@ -139,14 +139,14 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand() // perl.begin has a *really* half special parsing routine if(iIdentifierLen == 4) { - if(pIdentifier->lower().unicode() == 'p') + if(pIdentifier->lower().tqunicode() == 'p') { - if(KviQString::equalCI(szIdentifier,"perl")) + if(KviTQString::equalCI(szIdentifier,"perl")) { if(pSecondPart) { - QString szSecondPart(pSecondPart,iSecondPartLen); - if(KviQString::equalCI(szSecondPart,"begin")) + TQString szSecondPart(pSecondPart,iSecondPartLen); + if(KviTQString::equalCI(szSecondPart,"begin")) { // yep, that's perl.begin cmd = parseSpecialCommandPerlBegin(); @@ -229,7 +229,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand() return 0; } - const QChar * pClbkBegin = KVSP_curCharPointer; + const TQChar * pClbkBegin = KVSP_curCharPointer; KviKvsTreeNodeInstruction * ins = parseInstruction(); if(!ins) @@ -260,17 +260,17 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand() // of the other context. } - QString szCallbackName = szIdentifier; + TQString szCallbackName = szIdentifier; szCallbackName += " callback"; - QString szBlock(pClbkBegin,KVSP_curCharPointer - pClbkBegin); + TQString szBlock(pClbkBegin,KVSP_curCharPointer - pClbkBegin); KviCommandFormatter::bufferFromBlock(szBlock); KviKvsScript * clbk = new KviKvsScript(szCallbackName,szBlock); if(pSecondPart) { - cmd = new KviKvsTreeNodeModuleCallbackCommand(pIdentifier,szIdentifier,QString(pSecondPart,iSecondPartLen),dl,clbk); + cmd = new KviKvsTreeNodeModuleCallbackCommand(pIdentifier,szIdentifier,TQString(pSecondPart,iSecondPartLen),dl,clbk); } else { KviKvsCoreCallbackCommandExecRoutine * r = KviKvsKernel::instance()->findCoreCallbackCommandExecRoutine(szIdentifier); if(r) @@ -313,7 +313,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand() } else { if(pSecondPart) { - cmd = new KviKvsTreeNodeModuleSimpleCommand(pIdentifier,szIdentifier,QString(pSecondPart,iSecondPartLen),pl); + cmd = new KviKvsTreeNodeModuleSimpleCommand(pIdentifier,szIdentifier,TQString(pSecondPart,iSecondPartLen),pl); } else { KviKvsCoreSimpleCommandExecRoutine * r = KviKvsKernel::instance()->findCoreSimpleCommandExecRoutine(szIdentifier); if(r) diff --git a/src/kvirc/kvs/kvi_kvs_parser_comment.cpp b/src/kvirc/kvs/kvi_kvs_parser_comment.cpp index e731e2b..18fbbbe 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_comment.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser_comment.cpp @@ -59,7 +59,7 @@ KviKvsTreeNode * KviKvsParser::parseComment() break; case '*': { - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; // c style , multiline KVSP_skipChar; for(;;) @@ -85,7 +85,7 @@ KviKvsTreeNode * KviKvsParser::parseComment() } break; default: - error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (unicode %x) after a slash (it is a typo or a malformed comment begin ?)"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (tqunicode %x) after a slash (it is a typo or a malformed comment begin ?)"),KVSP_curCharPointer,KVSP_curCharUnicode); return 0; break; } diff --git a/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp b/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp index 0f304bd..a1f4c56 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp @@ -42,15 +42,15 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope) { KVSP_ASSERT(KVSP_curCharUnicode == '$'); - const QChar * pDollarBegin = KVSP_curCharPointer; - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pDollarBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; KVSP_skipChar; if(!KVSP_curCharIsFunctionStart) { if(KVSP_curCharUnicode == 0)warning(KVSP_curCharPointer,__tr2qs("Unexpected end of script after '$' function call prefix")); - else warning(KVSP_curCharPointer,__tr2qs("Unexpected character %q (unicode %x) after '$' function call prefix"),KVSP_curCharPointer,KVSP_curCharUnicode); + else warning(KVSP_curCharPointer,__tr2qs("Unexpected character %q (tqunicode %x) after '$' function call prefix"),KVSP_curCharPointer,KVSP_curCharUnicode); error(KVSP_curCharPointer,__tr2qs("Syntax error after '$' function call prefix. If you want to use a plain '$' in the code you need to escape it")); return 0; } @@ -107,7 +107,7 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope) while(KVSP_curCharIsNumber) KVSP_skipChar; - QString szNum1(pBegin,KVSP_curCharPointer - pBegin); + TQString szNum1(pBegin,KVSP_curCharPointer - pBegin); bool bOk; int iNum1 = szNum1.toInt(&bOk); if(!bOk)debug("Ops... a non-number made by numbers ?"); @@ -138,7 +138,7 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope) while(KVSP_curCharIsNumber) KVSP_skipChar; - QString szNum2(pBegin,KVSP_curCharPointer - pBegin); + TQString szNum2(pBegin,KVSP_curCharPointer - pBegin); int iNum2 = szNum2.toInt(&bOk); if(!bOk)debug("Ops... a non-number made by numbers (2) ?"); @@ -201,9 +201,9 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope) } } - QString szIdentifier1(pBegin,KVSP_curCharPointer - pBegin); + TQString szIdentifier1(pBegin,KVSP_curCharPointer - pBegin); - const QChar * pId2 = 0; + const TQChar * pId2 = 0; int iId2Len = 0; bool bModuleFunctionCall = false; @@ -229,12 +229,12 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope) // object scope, check for "class name" namespace // the class name namespace has the format "<namespace>::<namespace>::..::<classname> // so the last :: is the delimiter of the function name - const QChar * pOriginalEndOfId1 = KVSP_curCharPointer; - const QChar * pEndOfId1 = pOriginalEndOfId1; + const TQChar * pOriginalEndOfId1 = KVSP_curCharPointer; + const TQChar * pEndOfId1 = pOriginalEndOfId1; while(KVSP_curCharUnicode == ':') { - const QChar * pEndOfId1 = KVSP_curCharPointer; + const TQChar * pEndOfId1 = KVSP_curCharPointer; // base class function call ? KVSP_skipChar; if(KVSP_curCharUnicode == ':') @@ -297,16 +297,16 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope) } else if(bModuleFunctionCall) { // module function call - return new KviKvsTreeNodeModuleFunctionCall(pDollarBegin,szIdentifier1,QString(pId2,iId2Len),l); + return new KviKvsTreeNodeModuleFunctionCall(pDollarBegin,szIdentifier1,TQString(pId2,iId2Len),l); } else { if(bInObjScope) { - // object function call (our parent will be a scope operator) + // object function call (our tqparent will be a scope operator) if(pId2) { // base class object function call - return new KviKvsTreeNodeBaseObjectFunctionCall(pDollarBegin,szIdentifier1,QString(pId2,iId2Len),l); + return new KviKvsTreeNodeBaseObjectFunctionCall(pDollarBegin,szIdentifier1,TQString(pId2,iId2Len),l); } else { // plain object function call return new KviKvsTreeNodeThisObjectFunctionCall(pDollarBegin,szIdentifier1,l); diff --git a/src/kvirc/kvs/kvi_kvs_parser_expression.cpp b/src/kvirc/kvs/kvi_kvs_parser_expression.cpp index 832a814..adeef3d 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_expression.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser_expression.cpp @@ -355,9 +355,9 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpressionOperandCore(char termina KviPointerList<KviKvsTreeNodeData> * pDataList = new KviPointerList<KviKvsTreeNodeData>; pDataList->setAutoDelete(true); - static QString szStaticSingleSpace(" "); + static TQString szStaticSingleSpace(" "); - const QChar * pOperandBegin = KVSP_curCharPointer; + const TQChar * pOperandBegin = KVSP_curCharPointer; bool bHaveVariable = false; @@ -410,9 +410,9 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpressionOperandCore(char termina // literal ? if(KVSP_curCharIsLetterOrNumber || (KVSP_curCharUnicode == '.') || (KVSP_curCharUnicode == '_')) { - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; while(KVSP_curCharIsLetterOrNumber || (KVSP_curCharUnicode == '.') || (KVSP_curCharUnicode == '_'))KVSP_skipChar; - QString tmp(pBegin,KVSP_curCharPointer - pBegin); + TQString tmp(pBegin,KVSP_curCharPointer - pBegin); bool bOk; kvs_int_t iVal = tmp.toLong(&bOk); if(bOk) @@ -420,14 +420,14 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpressionOperandCore(char termina pDataList->append(new KviKvsTreeNodeConstantData(pBegin,new KviKvsVariant(iVal))); } else { // bOk is false - if(pBegin->unicode() == '0') + if(pBegin->tqunicode() == '0') { if(tmp.length() > 2) { if((tmp[1] == 'x') || (tmp[1] == 'X')) { // hexadecimal constant ? - QString hex = tmp.right(tmp.length() - 2); + TQString hex = tmp.right(tmp.length() - 2); iVal = hex.toLong(&bOk,16); if(bOk) { @@ -448,7 +448,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpressionOperandCore(char termina } } } else { - error(KVSP_curCharPointer,__tr2qs("Unexpected character %q (unicode %h) in expression. If it meant to be a string use the quotes."),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Unexpected character %q (tqunicode %h) in expression. If it meant to be a string use the quotes."),KVSP_curCharPointer,KVSP_curCharUnicode); delete pDataList; return 0; } @@ -501,7 +501,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpression(char terminator) KviKvsTreeNodeExpression * left = parseExpressionOperand(terminator); if(!left)return 0; - QString sz; + TQString sz; left->contextDescription(sz); skipSpaces(); @@ -577,7 +577,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpression(char terminator) // incomplete has GREATER precedence than aux and thus aux should be done first incompleteOperator->setRight(operand); //right tree complete // go up until we find an operator with lower precedence than auxOperator (>=) - KviKvsTreeNodeExpression * tempOperator = incompleteOperator->parentWithPrecedenceLowerThan(auxOperator->precedence()); + KviKvsTreeNodeExpression * tempOperator = incompleteOperator->tqparentWithPrecedenceLowerThan(auxOperator->precedence()); if(tempOperator == 0) { auxOperator->setLeft(curTopOperator); diff --git a/src/kvirc/kvs/kvi_kvs_parser_lside.cpp b/src/kvirc/kvs/kvi_kvs_parser_lside.cpp index c986956..d6437c7 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_lside.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser_lside.cpp @@ -156,14 +156,14 @@ [b]<left_operand> =~ s/<search pattern>/<replacement pattern>/[flags][/b][br] where <search pattern> is an extended regular expression to be matched in the <left_operand> and <replacement string> is a special pattern that will replace any occurence found.[br] - <search pattern> may contain parentheses to capture parts of the matched text. + <search pattern> may contain tqparentheses to capture parts of the matched text. <replacement string> can contain the escape sequences \\N where N is a number between 1 and 9 to be replaced by the captured text.[br] (We use \\N because KVIrc will first unquote the string when parsing...)[br] \\0 is a special escape that will be replaced by the entire match (is always valid!).[br] WARNING: the "capture-text" feature is not available if KVIrc has been compiled with qt older than 3.0.0. You can find out if the feature is available by - looking for the string "Qt3" in the array returned by [fnc]$features[/fnc].[br] + looking for the string "TQt3" in the array returned by [fnc]$features[/fnc].[br] [flags] may be a combination of the letters 'g','i' and 'w'.[br] 'g' causes the search to be global and not stop after the first occurence of <search pattern>.[br] 'i' causes the search to be case insensitive.[br] @@ -229,12 +229,12 @@ [example] %var << Pragma [/example] - %var now contains "Ciao ciao Pragma"[br] + %var now tqcontains "Ciao ciao Pragma"[br] Append a '!' character [example] %var <+ ! [/example] - %var now contains "Ciao ciao Pragma!" + %var now tqcontains "Ciao ciao Pragma!" Now reset it. [example] %var = @@ -245,7 +245,7 @@ %var = Pragma,Diabl0,Arter|o %var <, MalboroLi [/example] - %var now contains "Pragma,Diabl0,Arter|o,MalboroLi"[br] + %var now tqcontains "Pragma,Diabl0,Arter|o,MalboroLi"[br] [br] Now a longer example. [example] @@ -274,7 +274,7 @@ KviKvsTreeNodeData * KviKvsParser::parseOperationRightSide(bool bPreferNumeric) KviPointerList<KviKvsTreeNodeData> * l = new KviPointerList<KviKvsTreeNodeData>(); l->setAutoDelete(true); - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; for(;;) { @@ -298,7 +298,7 @@ KviKvsTreeNodeData * KviKvsParser::parseOperationRightSide(bool bPreferNumeric) } else { // separate by single spaces bPreferNumeric = false; // this can't be a number - l->append(new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(QString(" ")))); + l->append(new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(TQString(" ")))); } break; default: @@ -331,7 +331,7 @@ end_of_the_param: } else { // empty (this should NEVER happen anyway) delete l; - return new KviKvsTreeNodeConstantData(pBegin,new KviKvsVariant(QString(""))); + return new KviKvsTreeNodeConstantData(pBegin,new KviKvsVariant(TQString(""))); } } // never reached @@ -662,7 +662,7 @@ end_of_the_param: [b]<left_operand> =~ s/<search pattern>/<replacement pattern>/[flags][/b][br] where <search pattern> is an extended regular expression to be matched in the <left_operand> and <replacement string> is a special pattern that will replace any occurence found.[br] - <search pattern> may contain parentheses to capture parts of the matched text. + <search pattern> may contain tqparentheses to capture parts of the matched text. <replacement string> can contain the escape sequences \\N where N is a number between 1 and 9 to be replaced by the captured text.[br] (We use \\N because KVIrc will first unquote the string when parsing...)[br] @@ -747,7 +747,7 @@ KviKvsTreeNodeData * KviKvsParser::parseBindingOperationParameter() KviPointerList<KviKvsTreeNodeData> * l = new KviPointerList<KviKvsTreeNodeData>; l->setAutoDelete(true); - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; for(;;) { @@ -805,7 +805,7 @@ end_of_function_parameter: l->setAutoDelete(false); KviKvsTreeNodeData * p = l->first(); delete l; - if(!p)p = new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(QString(""))); + if(!p)p = new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(TQString(""))); return p; } // never reached @@ -818,17 +818,17 @@ KviKvsTreeNodeOperation * KviKvsParser::parseBindingOperation() { // t or tr or y // s - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; while(KVSP_curCharIsLetter)KVSP_skipChar; - QString szOp = QString(pBegin,KVSP_curCharPointer - pBegin).lower(); + TQString szOp = TQString(pBegin,KVSP_curCharPointer - pBegin).lower(); skipSpaces(); if(KVSP_curCharUnicode != '/') { - error(KVSP_curCharPointer,__tr2qs("Found character '%q' (unicode %x) where a slash '/' was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character '%q' (tqunicode %x) where a slash '/' was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); return 0; } @@ -846,7 +846,7 @@ KviKvsTreeNodeOperation * KviKvsParser::parseBindingOperation() if(KVSP_curCharUnicode != '/') { - error(KVSP_curCharPointer,__tr2qs("Found character '%q' (unicode %x) where a slash '/' was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character '%q' (tqunicode %x) where a slash '/' was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); delete pFirst; return 0; } @@ -869,7 +869,7 @@ KviKvsTreeNodeOperation * KviKvsParser::parseBindingOperation() if(KVSP_curCharUnicode != '/') { - error(KVSP_curCharPointer,__tr2qs("Found character '%q' (unicode %x) where a slash '/' was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character '%q' (tqunicode %x) where a slash '/' was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); delete pFirst; return 0; } @@ -886,7 +886,7 @@ KviKvsTreeNodeOperation * KviKvsParser::parseBindingOperation() return 0; } - pThird = new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(QString(""))); + pThird = new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(TQString(""))); } while(!KVSP_curCharIsEndOfCommand)KVSP_skipChar; @@ -910,7 +910,7 @@ KviKvsTreeNodeOperation * KviKvsParser::parseBindingOperation() KviKvsTreeNodeOperation * KviKvsParser::parseOperation() { // find the operator - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; switch(KVSP_curCharUnicode) { @@ -1135,7 +1135,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseVoidFunctionCallOrOperation() { KVSP_ASSERT((KVSP_curCharUnicode == '$') || (KVSP_curCharUnicode == '%') || (KVSP_curCharUnicode == '@')); - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; KviKvsTreeNodeData * r = parsePercentOrDollar(); @@ -1173,10 +1173,10 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseVoidFunctionCallOrOperation() // must be followed by the end of a command if(r->isFunctionCall()) { - error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (unicode %x) after a void function call: end of instruction expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Unexpected character '%q' (tqunicode %x) after a void function call: end of instruction expected"),KVSP_curCharPointer,KVSP_curCharUnicode); } else { warning(pBegin,__tr2qs("Unexpected (and senseless) read-only data evaluation")); - warning(pBegin,__tr2qs("Unexpected character '%q' (unicode %x)"),KVSP_curCharPointer,KVSP_curCharUnicode); + warning(pBegin,__tr2qs("Unexpected character '%q' (tqunicode %x)"),KVSP_curCharPointer,KVSP_curCharUnicode); error(KVSP_curCharPointer,__tr2qs("Syntax error: confused by earlier errors: bailing out")); } delete r; diff --git a/src/kvirc/kvs/kvi_kvs_parser_macros.h b/src/kvirc/kvs/kvi_kvs_parser_macros.h index 8de1f47..e727e4a 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_macros.h +++ b/src/kvirc/kvs/kvi_kvs_parser_macros.h @@ -29,15 +29,15 @@ #define KVSP_backChar m_ptr-- #define KVSP_backNChars(n) m_ptr -= n -#define KVSP_curCharUnicode (m_ptr->unicode()) +#define KVSP_curCharUnicode (m_ptr->tqunicode()) #define KVSP_curCharPointer m_ptr #define KVSP_curCharIsLetter (m_ptr->isLetter()) #define KVSP_curCharIsNumber (m_ptr->isNumber()) #define KVSP_curCharIsLetterOrNumber (m_ptr->isLetterOrNumber()) -#define KVSP_curCharIsFunctionStart (m_ptr->isLetterOrNumber() || (m_ptr->unicode() == '(') || (m_ptr->unicode() == '{') || (m_ptr->unicode() == '$')) -#define KVSP_curCharIsEndOfCommand ((m_ptr->unicode() == ';') || (m_ptr->unicode() == 0) || (m_ptr->unicode() == '\n') || (m_ptr->unicode() == '\r')) -#define KVSP_curCharIsEndOfBuffer (m_ptr->unicode() == 0) +#define KVSP_curCharIsFunctionStart (m_ptr->isLetterOrNumber() || (m_ptr->tqunicode() == '(') || (m_ptr->tqunicode() == '{') || (m_ptr->tqunicode() == '$')) +#define KVSP_curCharIsEndOfCommand ((m_ptr->tqunicode() == ';') || (m_ptr->tqunicode() == 0) || (m_ptr->tqunicode() == '\n') || (m_ptr->tqunicode() == '\r')) +#define KVSP_curCharIsEndOfBuffer (m_ptr->tqunicode() == 0) #define KVSP_setCurCharPointer(_ptr) m_ptr = _ptr diff --git a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp index 0dbc781..0014743 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp @@ -52,7 +52,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandPerlBegin() // perl.begin(context) <perl code> perl.end // - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; skipSpaces(); KviKvsTreeNodeDataList * dl; @@ -84,11 +84,11 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandPerlBegin() } } - const QChar * pPerlBegin = KVSP_curCharPointer; + const TQChar * pPerlBegin = KVSP_curCharPointer; // now look for perl.end[terminator] - static QString szPerlEnd("perl.end"); - const QChar * pPerlEnd; + static TQString szPerlEnd("perl.end"); + const TQChar * pPerlEnd; for(;;) { while(KVSP_curCharUnicode && (KVSP_curCharUnicode != 'p') && (KVSP_curCharUnicode != 'P')) @@ -100,13 +100,13 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandPerlBegin() return 0; } pPerlEnd = KVSP_curCharPointer; - if(KviQString::equalCIN(szPerlEnd,KVSP_curCharPointer,8)) + if(KviTQString::equalCIN(szPerlEnd,KVSP_curCharPointer,8)) { KVSP_skipNChars(8); if(KVSP_curCharIsEndOfCommand || (KVSP_curCharUnicode == ' ') || (KVSP_curCharUnicode == '\t')) { // yeah! - QString szPerl(pPerlBegin,pPerlEnd - pPerlBegin); + TQString szPerl(pPerlBegin,pPerlEnd - pPerlBegin); dl->prependItem(new KviKvsTreeNodeConstantData(pPerlBegin,new KviKvsVariant(szPerl))); while(!KVSP_curCharIsEndOfCommand)KVSP_skipChar; if(!KVSP_curCharIsEndOfBuffer)KVSP_skipChar; @@ -140,7 +140,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandBreak() If called outside an iteration loop , will act just like [cmd]halt[/cmd] has been called but has no additional semantics for events.[br] */ - const QChar * pBegin = KVSP_curCharPointer; // FIXME: this is not accurate at all : it may be even the end of the cmd + const TQChar * pBegin = KVSP_curCharPointer; // FIXME: this is not accurate at all : it may be even the end of the cmd skipSpaces(); if(!KVSP_curCharIsEndOfCommand) { @@ -183,7 +183,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandUnset() [/example] */ - const QChar * pCmdBegin = KVSP_curCharPointer; + const TQChar * pCmdBegin = KVSP_curCharPointer; KviPointerList<KviKvsTreeNodeVariable> * pVarList = new KviPointerList<KviKvsTreeNodeVariable>; pVarList->setAutoDelete(true); @@ -207,7 +207,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandUnset() if(!KVSP_curCharIsEndOfCommand) { warning(KVSP_curCharPointer,__tr2qs("The 'unset' command needs a variable list")); - error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a variable was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a variable was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); return 0; } @@ -251,19 +251,19 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandGlobal() while(KVSP_curCharUnicode == '%') { KVSP_skipChar; - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; while((KVSP_curCharIsLetterOrNumber) || (KVSP_curCharUnicode == '_'))KVSP_skipChar; - QString szIdentifier(pBegin,KVSP_curCharPointer - pBegin); + TQString szIdentifier(pBegin,KVSP_curCharPointer - pBegin); if(!m_pGlobals) { - m_pGlobals = new KviPointerHashTable<QString,QString>(17,false); + m_pGlobals = new KviPointerHashTable<TQString,TQString>(17,false); m_pGlobals->setAutoDelete(true); } - m_pGlobals->replace(szIdentifier,new QString()); + m_pGlobals->tqreplace(szIdentifier,new TQString()); skipSpaces(); @@ -277,7 +277,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandGlobal() if(!KVSP_curCharIsEndOfCommand) { warning(KVSP_curCharPointer,__tr2qs("The 'global' command needs a variable list")); - error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a variable was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a variable was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); return 0; } @@ -329,10 +329,10 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass() that can be used to sign the parameters that the function expects; it acts as a programmer reminder or comment and it has no other meaning in KVIrc scripting. The <parameter reminder> respects the syntax - of an expression, so it is terminated by a closed parenthesis. + of an expression, so it is terminated by a closed tqparenthesis. It's rather dangerous to use this command inside an object function handler: if the class definition <class> was already - existing and it is a parent of the object's class, you might + existing and it is a tqparent of the object's class, you might end up executing "inexisting" code.[br] As a thumb rule, use this command only outside object function handlers.[br] [br][br] @@ -376,11 +376,11 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass() if(KVSP_curCharUnicode != '(') { - error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where an open parenthesis was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where an open tqparenthesis was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); return 0; } - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; KviKvsTreeNodeDataList * l = parseCommaSeparatedParameterList(); if(!l)return 0; @@ -426,7 +426,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass() continue; } - const QChar * pLabelBegin = KVSP_curCharPointer; + const TQChar * pLabelBegin = KVSP_curCharPointer; if(KVSP_curCharIsLetter) { @@ -443,12 +443,12 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass() if(KVSP_curCharPointer == pLabelBegin) { - error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); delete pClass; return 0; } - QString szLabel(pLabelBegin,KVSP_curCharPointer - pLabelBegin); + TQString szLabel(pLabelBegin,KVSP_curCharPointer - pLabelBegin); unsigned int uHandlerFlags = 0; @@ -471,11 +471,11 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass() if(KVSP_curCharPointer == pLabelBegin) { - error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); delete pClass; return 0; } - szLabel = QString(pLabelBegin,KVSP_curCharPointer - pLabelBegin); + szLabel = TQString(pLabelBegin,KVSP_curCharPointer - pLabelBegin); } } @@ -498,11 +498,11 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass() if(KVSP_curCharPointer == pLabelBegin) { - error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a function name was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); delete pClass; return 0; } - szLabel = QString(pLabelBegin,KVSP_curCharPointer - pLabelBegin); + szLabel = TQString(pLabelBegin,KVSP_curCharPointer - pLabelBegin); } } @@ -560,10 +560,10 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass() } delete pInstruction; int iLen = KVSP_curCharPointer - pBegin; - QString szInstruction; + TQString szInstruction; if(iLen > 0) { - szInstruction = QString(pBegin,KVSP_curCharPointer - pBegin); + szInstruction = TQString(pBegin,KVSP_curCharPointer - pBegin); KviCommandFormatter::bufferFromBlock(szInstruction); } @@ -627,12 +627,12 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandWhile() if(KVSP_curCharUnicode != '(') { - warning(KVSP_curCharPointer,__tr2qs("The while command needs an expression enclosed in parenthesis")); - error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where an open parenthesis was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + warning(KVSP_curCharPointer,__tr2qs("The while command needs an expression enclosed in tqparenthesis")); + error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where an open tqparenthesis was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); return 0; } - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; KVSP_skipChar; @@ -714,7 +714,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandDo() [cmd]while[/cmd] */ - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; KviKvsTreeNodeInstruction * i = parseInstruction(); if(!i) @@ -740,7 +740,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandDo() if(KVSP_curCharIsEndOfBuffer) error(KVSP_curCharPointer,__tr2qs("Unexpected end of command after the 'do' command block: expected 'while' keyword")); else - error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a 'while' keyword was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a 'while' keyword was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); if(i)delete i; return 0; } @@ -756,7 +756,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandDo() if(KVSP_curCharUnicode != '(') { - warning(KVSP_curCharPointer,__tr2qs("The 'while' block of the 'do' command needs an expression enclosed in parenthesis")); + warning(KVSP_curCharPointer,__tr2qs("The 'while' block of the 'do' command needs an expression enclosed in tqparenthesis")); errorBadChar(KVSP_curCharPointer,'(',"do"); if(i)delete i; return 0; @@ -822,12 +822,12 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandIf() if(KVSP_curCharUnicode != '(') { - warning(KVSP_curCharPointer,__tr2qs("The 'if' command needs an expression enclosed in parenthesis")); + warning(KVSP_curCharPointer,__tr2qs("The 'if' command needs an expression enclosed in tqparenthesis")); errorBadChar(KVSP_curCharPointer,'(',"if"); return 0; } - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; KVSP_skipChar; @@ -867,7 +867,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandIf() return 0; } - const QChar * pElse = KVSP_curCharPointer; + const TQChar * pElse = KVSP_curCharPointer; if((KVSP_curCharUnicode != 'e') && (KVSP_curCharUnicode != 'E')) return new KviKvsTreeNodeSpecialCommandIf(pBegin,e,i,0); @@ -967,7 +967,7 @@ bool KviKvsParser::skipToEndOfForControlBlock() return false; break; //case '\n': - // that's ok.. it may have a parenthesis on the next line + // that's ok.. it may have a tqparenthesis on the next line //KVSP_skipChar; //break; default: @@ -1012,12 +1012,12 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandFor() if(KVSP_curCharUnicode != '(') { - warning(KVSP_curCharPointer,__tr2qs("The 'for' command needs an expression enclosed in parenthesis")); + warning(KVSP_curCharPointer,__tr2qs("The 'for' command needs an expression enclosed in tqparenthesis")); errorBadChar(KVSP_curCharPointer,'(',"for"); return 0; } - const QChar * pForBegin = KVSP_curCharPointer; + const TQChar * pForBegin = KVSP_curCharPointer; KVSP_skipChar; @@ -1045,7 +1045,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandFor() // skip to the first non matching ')' that is not in a string - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; if(!skipToEndOfForControlBlock()) { @@ -1061,10 +1061,10 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandFor() // HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK // KVSP_curCharPointer is const! // we shouldn't be able to modify it - QChar cSave = *(KVSP_curCharPointer); + TQChar cSave = *(KVSP_curCharPointer); - QChar * pHack = (QChar *)KVSP_curCharPointer; - *pHack = QChar('\n'); + TQChar * pHack = (TQChar *)KVSP_curCharPointer; + *pHack = TQChar('\n'); KVSP_curCharPointer = pBegin; @@ -1089,7 +1089,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandFor() if(KVSP_curCharUnicode != ')') { - error(KVSP_curCharPointer,__tr2qs("Found char %q (unicode %x) while looking for the terminating ')' in 'for' command"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found char %q (tqunicode %x) while looking for the terminating ')' in 'for' command"),KVSP_curCharPointer,KVSP_curCharUnicode); if(i1)delete i1; if(e)delete e; if(i2)delete i2; @@ -1178,12 +1178,12 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandForeach() if(KVSP_curCharUnicode != '(') { - warning(KVSP_curCharPointer,__tr2qs("The 'foreach' command needs an expression enclosed in parenthesis")); + warning(KVSP_curCharPointer,__tr2qs("The 'foreach' command needs an expression enclosed in tqparenthesis")); errorBadChar(KVSP_curCharPointer,'(',"foreach"); return 0; } - const QChar * pForeachBegin = KVSP_curCharPointer; + const TQChar * pForeachBegin = KVSP_curCharPointer; KVSP_skipChar; @@ -1193,7 +1193,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandForeach() if((KVSP_curCharUnicode != '%') && (KVSP_curCharUnicode != '$') && (KVSP_curCharUnicode != '@')) { warning(KVSP_curCharPointer,__tr2qs("The 'foreach' command expects a writeable iteration variable as first parameter")); - error(KVSP_curCharPointer,__tr2qs("Found character '%q' (unicode %x) where '%' or '$' was expected: see /help foreach for the command syntax"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character '%q' (tqunicode %x) where '%' or '$' was expected: see /help foreach for the command syntax"),KVSP_curCharPointer,KVSP_curCharUnicode); return 0; } @@ -1235,7 +1235,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandForeach() return 0; } - const QChar * pLoopBegin = KVSP_curCharPointer; + const TQChar * pLoopBegin = KVSP_curCharPointer; KviKvsTreeNodeInstruction * loop = parseInstruction(); if(!loop) @@ -1362,12 +1362,12 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch() if(KVSP_curCharUnicode != '(') { - warning(KVSP_curCharPointer,__tr2qs("The 'switch' command needs an expression enclosed in parenthesis")); + warning(KVSP_curCharPointer,__tr2qs("The 'switch' command needs an expression enclosed in tqparenthesis")); errorBadChar(KVSP_curCharPointer,'(',"switch"); return 0; } - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; KVSP_skipChar; @@ -1407,7 +1407,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch() { // look for a 'case','match','default' or 'regexpr' label - const QChar * pLabelBegin = KVSP_curCharPointer; + const TQChar * pLabelBegin = KVSP_curCharPointer; while(KVSP_curCharIsLetter)KVSP_skipChar; if(KVSP_curCharIsEndOfBuffer) @@ -1419,13 +1419,13 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch() if(KVSP_curCharPointer == pLabelBegin) { - error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a 'case','match','regexp','default' or 'break' label was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a 'case','match','regexp','default' or 'break' label was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); delete pSwitch; return 0; } - QString szLabel(pLabelBegin,KVSP_curCharPointer - pLabelBegin); - QString szLabelLow = szLabel.lower(); + TQString szLabel(pLabelBegin,KVSP_curCharPointer - pLabelBegin); + TQString szLabelLow = szLabel.lower(); bool bNeedParam = true; @@ -1554,7 +1554,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma while(KVSP_curCharUnicode != '}') { // look for 'label', 'prologue', 'epilogue', 'popup', 'item', 'separator' or 'extpopup' label - const QChar * pLabelBegin = KVSP_curCharPointer; + const TQChar * pLabelBegin = KVSP_curCharPointer; while(KVSP_curCharIsLetter)KVSP_skipChar; if(KVSP_curCharIsEndOfBuffer) @@ -1566,17 +1566,17 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma if(KVSP_curCharPointer == pLabelBegin) { - error(KVSP_curCharPointer,__tr2qs("Found character %q (unicode %x) where a 'prologue','separator','label','popup','item','extpopup' or 'epilogue' label was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); + error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where a 'prologue','separator','label','popup','item','extpopup' or 'epilogue' label was expected"),KVSP_curCharPointer,KVSP_curCharUnicode); delete pPopup; return 0; } - QString szLabel(pLabelBegin,KVSP_curCharPointer - pLabelBegin); - QString szLabelLow = szLabel.lower(); + TQString szLabel(pLabelBegin,KVSP_curCharPointer - pLabelBegin); + TQString szLabelLow = szLabel.lower(); - KviPointerList<QString> * pParameters = 0; + KviPointerList<TQString> * pParameters = 0; - QString szCondition; + TQString szCondition; #define EXTRACT_POPUP_LABEL_PARAMETERS \ @@ -1603,7 +1603,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma } \ if(KVSP_curCharUnicode == '(') \ { \ - const QChar * pBegin = KVSP_curCharPointer; \ + const TQChar * pBegin = KVSP_curCharPointer; \ KVSP_skipChar; \ KviKvsTreeNodeExpression * pExpression = parseExpression(')'); \ if(!pExpression) \ @@ -1648,7 +1648,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma return 0; } } - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; KviKvsTreeNodeInstruction * pInstruction = parseInstruction(); if(pInstruction) { @@ -1672,10 +1672,10 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma int iLen = KVSP_curCharPointer - pBegin; if(iLen > 0) { - QString szInstruction(pBegin,KVSP_curCharPointer - pBegin); + TQString szInstruction(pBegin,KVSP_curCharPointer - pBegin); KviCommandFormatter::bufferFromBlock(szInstruction); - QString * pItemName = pParameters ? pParameters->first() : 0; - QString szItemName = pItemName ? *pItemName : QString::null; + TQString * pItemName = pParameters ? pParameters->first() : 0; + TQString szItemName = pItemName ? *pItemName : TQString(); if(bPrologue) pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue(pLabelBegin,szInstruction,szItemName)); else @@ -1688,7 +1688,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma ///////////////////////////////////////////////////////////////////////////////////////////////// EXTRACT_POPUP_LABEL_CONDITION if(KVSP_curCharUnicode == ';')KVSP_skipChar; - QString szItemName = "dummySeparator"; // <------- FIXME! + TQString szItemName = "dummySeparator"; // <------- FIXME! pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator(pLabelBegin,szCondition,szItemName)); } else if(szLabelLow == "label") @@ -1697,7 +1697,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma EXTRACT_POPUP_LABEL_PARAMETERS EXTRACT_POPUP_LABEL_CONDITION - QString * pText = pParameters->first(); + TQString * pText = pParameters->first(); if(!pText) { error(pLabelBegin,__tr2qs("Unexpected empty <text> field in label parameters. See /help defpopup for the syntax")); @@ -1705,10 +1705,10 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma delete pPopup; return 0; } - QString * pIcon = pParameters->next(); + TQString * pIcon = pParameters->next(); if(KVSP_curCharUnicode == ';')KVSP_skipChar; - QString * pItemName = pParameters->next(); - pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelLabel(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : QString::null,pItemName ? *pItemName : QString::null)); + TQString * pItemName = pParameters->next(); + pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelLabel(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : TQString(),pItemName ? *pItemName : TQString())); delete pParameters; } else if(szLabelLow == "popup") { @@ -1716,7 +1716,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma EXTRACT_POPUP_LABEL_PARAMETERS EXTRACT_POPUP_LABEL_CONDITION - QString * pText = pParameters->first(); + TQString * pText = pParameters->first(); if(!pText) { error(pLabelBegin,__tr2qs("Unexpected empty <text> field in extpopup parameters. See /help defpopup for the syntax")); @@ -1724,8 +1724,8 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma delete pPopup; return 0; } - QString * pIcon = pParameters->next(); - QString * pItemName = pParameters->next(); + TQString * pIcon = pParameters->next(); + TQString * pItemName = pParameters->next(); KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * pSubPopup = parseSpecialCommandDefpopupLabelPopup(); if(!pSubPopup) @@ -1737,7 +1737,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma pSubPopup->setCondition(szCondition); pSubPopup->setText(*pText); - pSubPopup->setItemName(pItemName ? *pItemName : QString::null); + pSubPopup->setItemName(pItemName ? *pItemName : TQString()); if(pIcon)pSubPopup->setIcon(*pIcon); pPopup->addLabel(pSubPopup); delete pParameters; @@ -1747,7 +1747,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma EXTRACT_POPUP_LABEL_PARAMETERS EXTRACT_POPUP_LABEL_CONDITION - QString * pText = pParameters->first(); + TQString * pText = pParameters->first(); if(!pText) { error(pLabelBegin,__tr2qs("Unexpected empty <text> field in extpopup parameters. See /help defpopup for the syntax")); @@ -1755,10 +1755,10 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma delete pPopup; return 0; } - QString * pIcon = pParameters->next(); - QString * pItemName = pParameters->next(); + TQString * pIcon = pParameters->next(); + TQString * pItemName = pParameters->next(); - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; KviKvsTreeNodeInstruction * pInstruction = parseInstruction(); if(pInstruction) { @@ -1779,14 +1779,14 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma int iLen = KVSP_curCharPointer - pBegin; if(iLen > 0) { - QString szInstruction(pBegin,KVSP_curCharPointer - pBegin); + TQString szInstruction(pBegin,KVSP_curCharPointer - pBegin); KviCommandFormatter::bufferFromBlock(szInstruction); - pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelItem(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : QString::null,szInstruction,pItemName ? *pItemName : QString::null)); + pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelItem(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : TQString(),szInstruction,pItemName ? *pItemName : TQString())); } else { // zero length instruction, but still add the item - QString szInstruction = ""; + TQString szInstruction = ""; KviCommandFormatter::bufferFromBlock(szInstruction); - pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelItem(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : QString::null,szInstruction,pItemName ? *pItemName : QString::null)); + pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelItem(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : TQString(),szInstruction,pItemName ? *pItemName : TQString())); } delete pParameters; } else if(szLabelLow == "extpopup") @@ -1795,7 +1795,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma EXTRACT_POPUP_LABEL_PARAMETERS EXTRACT_POPUP_LABEL_CONDITION - QString * pText = pParameters->first(); + TQString * pText = pParameters->first(); if(!pText) { error(pLabelBegin,__tr2qs("Unexpected empty <text> field in extpopup parameters. See /help defpopup for the syntax")); @@ -1803,7 +1803,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma delete pPopup; return 0; } - QString * pName = pParameters->next(); + TQString * pName = pParameters->next(); if(!pName) { error(pLabelBegin,__tr2qs("Unexpected empty <name> field in extpopup parameters. See /help defpopup for the syntax")); @@ -1811,10 +1811,10 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma delete pPopup; return 0; } - QString * pIcon = pParameters->next(); - QString * pItemName = pParameters->next(); + TQString * pIcon = pParameters->next(); + TQString * pItemName = pParameters->next(); if(KVSP_curCharUnicode == ';')KVSP_skipChar; - pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : QString::null,*pName,pItemName ? *pItemName : QString::null)); + pPopup->addLabel(new KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup(pLabelBegin,szCondition,*pText,pIcon ? *pIcon : TQString(),*pName,pItemName ? *pItemName : TQString())); delete pParameters; } else { ///////////////////////////////////////////////////////////////////////////////////////////////// @@ -1928,12 +1928,12 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandDefpopup() if(KVSP_curCharUnicode != '(') { - warning(KVSP_curCharPointer,__tr2qs("The 'defpopup' command needs an expression enclosed in parenthesis")); + warning(KVSP_curCharPointer,__tr2qs("The 'defpopup' command needs an expression enclosed in tqparenthesis")); errorBadChar(KVSP_curCharPointer,'(',"defpopup"); return 0; } - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; KVSP_skipChar; @@ -1968,15 +1968,15 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandHelp() skipSpaces(); - const QChar * pBegin = KVSP_curCharPointer; + const TQChar * pBegin = KVSP_curCharPointer; while(!KVSP_curCharIsEndOfCommand)KVSP_skipChar; if(!KVSP_curCharIsEndOfBuffer)KVSP_skipChar; - QString tmp(pBegin,KVSP_curCharPointer - pBegin); + TQString tmp(pBegin,KVSP_curCharPointer - pBegin); tmp.stripWhiteSpace(); - const QString szHelpName("help"); + const TQString szHelpName("help"); KviKvsCoreSimpleCommandExecRoutine * r = KviKvsKernel::instance()->findCoreSimpleCommandExecRoutine(szHelpName); if(!r)return 0; // <--- internal error! diff --git a/src/kvirc/kvs/kvi_kvs_popupmanager.cpp b/src/kvirc/kvs/kvi_kvs_popupmanager.cpp index f0d0674..d8c3dff 100644 --- a/src/kvirc/kvs/kvi_kvs_popupmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_popupmanager.cpp @@ -33,7 +33,7 @@ KviKvsPopupManager * KviKvsPopupManager::m_pInstance = 0; KviKvsPopupManager::KviKvsPopupManager() { m_pInstance = this; - m_pPopupDict = new KviPointerHashTable<QString,KviKvsPopupMenu>(17,false); + m_pPopupDict = new KviPointerHashTable<TQString,KviKvsPopupMenu>(17,false); m_pPopupDict->setAutoDelete(true); } @@ -62,7 +62,7 @@ void KviKvsPopupManager::done() delete KviKvsPopupManager::instance(); } -KviKvsPopupMenu * KviKvsPopupManager::get(const QString &szPopupName) +KviKvsPopupMenu * KviKvsPopupManager::get(const TQString &szPopupName) { KviKvsPopupMenu * m = lookup(szPopupName); if(!m) @@ -73,23 +73,23 @@ KviKvsPopupMenu * KviKvsPopupManager::get(const QString &szPopupName) return m; } -void KviKvsPopupManager::load(const QString &szFileName) +void KviKvsPopupManager::load(const TQString &szFileName) { m_pPopupDict->clear(); KviConfig cfg(szFileName,KviConfig::Read); KviConfigIterator it(*(cfg.dict())); - KviPointerList<QString> l; + KviPointerList<TQString> l; l.setAutoDelete(true); while(it.current()) { - l.append(new QString(it.currentKey())); + l.append(new TQString(it.currentKey())); ++it; } - for(QString * s = l.first();s;s = l.next()) + for(TQString * s = l.first();s;s = l.next()) { cfg.setGroup(*s); KviKvsPopupMenu * m = new KviKvsPopupMenu(*s); @@ -99,12 +99,12 @@ void KviKvsPopupManager::load(const QString &szFileName) } } -void KviKvsPopupManager::save(const QString &szFileName) +void KviKvsPopupManager::save(const TQString &szFileName) { KviConfig cfg(szFileName,KviConfig::Write); cfg.clear(); - KviPointerHashTableIterator<QString,KviKvsPopupMenu> it(*m_pPopupDict); + KviPointerHashTableIterator<TQString,KviKvsPopupMenu> it(*m_pPopupDict); while(it.current()) { cfg.setGroup(it.current()->popupName()); diff --git a/src/kvirc/kvs/kvi_kvs_popupmanager.h b/src/kvirc/kvs/kvi_kvs_popupmanager.h index c9135b2..2b7a52e 100644 --- a/src/kvirc/kvs/kvi_kvs_popupmanager.h +++ b/src/kvirc/kvs/kvi_kvs_popupmanager.h @@ -33,7 +33,7 @@ protected: // can only be created by init/done KviKvsPopupManager(); ~KviKvsPopupManager(); protected: - KviPointerHashTable<QString,KviKvsPopupMenu> * m_pPopupDict; + KviPointerHashTable<TQString,KviKvsPopupMenu> * m_pPopupDict; static KviKvsPopupManager * m_pInstance; public: static KviKvsPopupManager * instance(){ return m_pInstance; }; @@ -41,16 +41,16 @@ public: static void done(); int popupCount(){ return m_pPopupDict->count(); }; - KviPointerHashTable<QString,KviKvsPopupMenu> * popupDict(){ return m_pPopupDict; }; + KviPointerHashTable<TQString,KviKvsPopupMenu> * popupDict(){ return m_pPopupDict; }; - KviKvsPopupMenu * lookup(const QString &szPopupName){ return m_pPopupDict->find(szPopupName); }; - KviKvsPopupMenu * get(const QString &szPopupName); - void add(const QString &szPopupName,KviKvsPopupMenu * pPopup){ m_pPopupDict->replace(szPopupName,pPopup); }; - void remove(const QString &szPopupName){ m_pPopupDict->remove(szPopupName); }; + KviKvsPopupMenu * lookup(const TQString &szPopupName){ return m_pPopupDict->tqfind(szPopupName); }; + KviKvsPopupMenu * get(const TQString &szPopupName); + void add(const TQString &szPopupName,KviKvsPopupMenu * pPopup){ m_pPopupDict->tqreplace(szPopupName,pPopup); }; + void remove(const TQString &szPopupName){ m_pPopupDict->remove(szPopupName); }; void clear(){ m_pPopupDict->clear(); }; - void save(const QString & filename); - void load(const QString & filename); + void save(const TQString & filename); + void load(const TQString & filename); }; diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp index 10a2698..5b592ad 100644 --- a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp +++ b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp @@ -45,7 +45,7 @@ // rootname.labelX : child labels -KviKvsPopupMenuItem::KviKvsPopupMenuItem(Type t,const QString &szItemName,const QString &szCondition) +KviKvsPopupMenuItem::KviKvsPopupMenuItem(Type t,const TQString &szItemName,const TQString &szCondition) { m_szItemName = szItemName; m_eType = t; @@ -54,13 +54,13 @@ KviKvsPopupMenuItem::KviKvsPopupMenuItem(Type t,const QString &szItemName,const // true by default m_pKvsCondition = 0; } else { - QString szName = "condition callback for "; + TQString szName = "condition callback for "; szName += szItemName; m_pKvsCondition = new KviKvsScript(szName,szCondition,KviKvsScript::Expression); } } -KviKvsPopupMenuItem::KviKvsPopupMenuItem(Type t,const QString &szItemName,const KviKvsScript * pCondition) +KviKvsPopupMenuItem::KviKvsPopupMenuItem(Type t,const TQString &szItemName,const KviKvsScript * pCondition) { m_szItemName = szItemName; m_eType = t; @@ -119,12 +119,12 @@ bool KviKvsPopupMenuItem::evaluateCondition(KviKvsPopupMenuTopLevelData * pData) /////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -KviKvsPopupMenuItemSeparator::KviKvsPopupMenuItemSeparator(const QString &szItemName,const QString &szCondition) +KviKvsPopupMenuItemSeparator::KviKvsPopupMenuItemSeparator(const TQString &szItemName,const TQString &szCondition) : KviKvsPopupMenuItem(KviKvsPopupMenuItem::Separator,szItemName,szCondition) { } -KviKvsPopupMenuItemSeparator::KviKvsPopupMenuItemSeparator(const QString &szItemName,const KviKvsScript * pCondition) +KviKvsPopupMenuItemSeparator::KviKvsPopupMenuItemSeparator(const TQString &szItemName,const KviKvsScript * pCondition) : KviKvsPopupMenuItem(KviKvsPopupMenuItem::Separator,szItemName,pCondition) { } @@ -148,10 +148,10 @@ KviKvsPopupMenuItem * KviKvsPopupMenuItemSeparator::clone() const ///////////////////////////////////////////////////////////////////////////////////////////////////////// -KviKvsPopupMenuItemWithTextAndIcon::KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Type t,const QString &szItemName,const QString &szText,const QString &szIcon,const QString &szCondition) +KviKvsPopupMenuItemWithTextAndIcon::KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Type t,const TQString &szItemName,const TQString &szText,const TQString &szIcon,const TQString &szCondition) : KviKvsPopupMenuItem(t,szItemName,szCondition) { - QString szName = "text callback for "; + TQString szName = "text callback for "; szName += szItemName; m_pKvsText = new KviKvsScript(szName,szText,KviKvsScript::Parameter); @@ -165,7 +165,7 @@ KviKvsPopupMenuItemWithTextAndIcon::KviKvsPopupMenuItemWithTextAndIcon(KviKvsPop } } -KviKvsPopupMenuItemWithTextAndIcon::KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Type t,const QString &szItemName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition) +KviKvsPopupMenuItemWithTextAndIcon::KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Type t,const TQString &szItemName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition) : KviKvsPopupMenuItem(t,szItemName,pCondition) { if(pText) @@ -173,7 +173,7 @@ KviKvsPopupMenuItemWithTextAndIcon::KviKvsPopupMenuItemWithTextAndIcon(KviKvsPop m_pKvsText = new KviKvsScript(*pText); } else { // hum.. this should never happen anyway - QString szName = "text callback for "; + TQString szName = "text callback for "; szName += szItemName; m_pKvsText = new KviKvsScript(szName,"",KviKvsScript::Parameter); } @@ -204,7 +204,7 @@ KviKvsScript * KviKvsPopupMenuItemWithTextAndIcon::kvsText() return m_pKvsText; } -QPixmap * KviKvsPopupMenuItemWithTextAndIcon::evaluateIcon(KviKvsPopupMenuTopLevelData * pData) +TQPixmap * KviKvsPopupMenuItemWithTextAndIcon::evaluateIcon(KviKvsPopupMenuTopLevelData * pData) { if(KVI_OPTION_BOOL(KviOption_boolDisablePopupIcons))return 0; if(!m_pKvsIcon)return 0; @@ -221,17 +221,17 @@ QPixmap * KviKvsPopupMenuItemWithTextAndIcon::evaluateIcon(KviKvsPopupMenuTopLev return 0; } - QString szRet; + TQString szRet; vRet.asString(szRet); - QPixmap * p = g_pIconManager->getImage(szRet); + TQPixmap * p = g_pIconManager->getImage(szRet); if(!p)pData->window()->output(KVI_OUT_PARSERWARNING,__tr2qs("Can't find the icon \"%Q\": ignoring"),&szRet); return p; } -QString KviKvsPopupMenuItemWithTextAndIcon::evaluateText(KviKvsPopupMenuTopLevelData *pData) +TQString KviKvsPopupMenuItemWithTextAndIcon::evaluateText(KviKvsPopupMenuTopLevelData *pData) { - QString szRet; + TQString szRet; if(!m_pKvsText)return szRet; KviKvsVariant vRet; if(!m_pKvsText->run(pData->window(), @@ -252,7 +252,7 @@ QString KviKvsPopupMenuItemWithTextAndIcon::evaluateText(KviKvsPopupMenuTopLevel KviKvsPopupMenuItemLabelHelper::KviKvsPopupMenuItemLabelHelper(KviKvsPopupMenuItemLabel * pItem) -: QObject() +: TQObject() { m_pItem = pItem; } @@ -266,14 +266,14 @@ void KviKvsPopupMenuItemLabelHelper::labelDestroyed() m_pItem->labelDestroyed(); } -KviKvsPopupMenuItemLabel::KviKvsPopupMenuItemLabel(const QString &szItemName,const QString &szText,const QString &szIcon,const QString &szCondition) +KviKvsPopupMenuItemLabel::KviKvsPopupMenuItemLabel(const TQString &szItemName,const TQString &szText,const TQString &szIcon,const TQString &szCondition) : KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Label,szItemName,szText,szIcon,szCondition) { m_pLabel = 0; m_pSignalRelay = new KviKvsPopupMenuItemLabelHelper(this); } -KviKvsPopupMenuItemLabel::KviKvsPopupMenuItemLabel(const QString &szItemName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition) +KviKvsPopupMenuItemLabel::KviKvsPopupMenuItemLabel(const TQString &szItemName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition) : KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Label,szItemName,pText,pIcon,pCondition) { m_pLabel = 0; @@ -285,7 +285,7 @@ KviKvsPopupMenuItemLabel::~KviKvsPopupMenuItemLabel() { if(m_pLabel) { - QObject::disconnect(m_pLabel,SIGNAL(destroyed()),m_pSignalRelay,SLOT(labelDestroyed())); + TQObject::disconnect(m_pLabel,TQT_SIGNAL(destroyed()),m_pSignalRelay,TQT_SLOT(labelDestroyed())); delete m_pLabel; } delete m_pSignalRelay; @@ -306,7 +306,7 @@ void KviKvsPopupMenuItemLabel::clear() { if(m_pLabel) { - QObject::disconnect(m_pLabel,SIGNAL(destroyed()),m_pSignalRelay,SLOT(labelDestroyed())); + TQObject::disconnect(m_pLabel,TQT_SIGNAL(destroyed()),m_pSignalRelay,TQT_SLOT(labelDestroyed())); delete m_pLabel; m_pLabel = 0; } @@ -315,35 +315,35 @@ void KviKvsPopupMenuItemLabel::clear() void KviKvsPopupMenuItemLabel::fill(KviKvsPopupMenu * pMenu,KviKvsPopupMenuTopLevelData * pData,int iIdx) { if(!evaluateCondition(pData))return; - QString szText = evaluateText(pData); - QPixmap * pPix = evaluateIcon(pData); + TQString szText = evaluateText(pData); + TQPixmap * pPix = evaluateIcon(pData); if(m_pLabel) { - QObject::disconnect(m_pLabel,SIGNAL(destroyed()),m_pSignalRelay,SLOT(labelDestroyed())); + TQObject::disconnect(m_pLabel,TQT_SIGNAL(destroyed()),m_pSignalRelay,TQT_SLOT(labelDestroyed())); delete m_pLabel; } - m_pLabel = new QLabel(szText,pMenu); - QObject::connect(m_pLabel,SIGNAL(destroyed()),m_pSignalRelay,SLOT(labelDestroyed())); + m_pLabel = new TQLabel(szText,pMenu); + TQObject::connect(m_pLabel,TQT_SIGNAL(destroyed()),m_pSignalRelay,TQT_SLOT(labelDestroyed())); #ifndef COMPILE_USE_QT4 - // FIXME: QT4 Seems to not allow widgets as QMenu items + // FIXME: QT4 Seems to not allow widgets as TQMenu items pMenu->insertItem(m_pLabel); #endif - m_pLabel->setFrameStyle(QFrame::StyledPanel | QFrame::Raised); + m_pLabel->setFrameStyle(TQFrame::StyledPanel | TQFrame::Raised); if(pPix)m_pLabel->setPixmap(*pPix); } //////////////////////////////////////////////////////////////////////////////////////////////////////////// -KviKvsPopupMenuItemItem::KviKvsPopupMenuItemItem(const QString &szItemName,const QString &szCode,const QString &szText,const QString &szIcon,const QString &szCondition) +KviKvsPopupMenuItemItem::KviKvsPopupMenuItemItem(const TQString &szItemName,const TQString &szCode,const TQString &szText,const TQString &szIcon,const TQString &szCondition) : KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Item,szItemName,szText,szIcon,szCondition) { - QString szName = "click callback for "; + TQString szName = "click callback for "; szName += szItemName; m_pKvsCode = new KviKvsScript(szName,szCode); } -KviKvsPopupMenuItemItem::KviKvsPopupMenuItemItem(const QString &szItemName,const KviKvsScript * pCode,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition) +KviKvsPopupMenuItemItem::KviKvsPopupMenuItemItem(const TQString &szItemName,const KviKvsScript * pCode,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition) : KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Item,szItemName,pText,pIcon,pCondition) { m_pKvsCode = new KviKvsScript(*pCode); @@ -358,8 +358,8 @@ KviKvsPopupMenuItemItem::~KviKvsPopupMenuItemItem() void KviKvsPopupMenuItemItem::fill(KviKvsPopupMenu * pMenu,KviKvsPopupMenuTopLevelData * pData,int iIdx) { if(!evaluateCondition(pData))return; - QString szText = evaluateText(pData); - QPixmap * pPix = evaluateIcon(pData); + TQString szText = evaluateText(pData); + TQPixmap * pPix = evaluateIcon(pData); int id; if(pPix)id = pMenu->insertItem(*pPix,szText); else id = pMenu->insertItem(szText); @@ -379,13 +379,13 @@ KviKvsScript * KviKvsPopupMenuItemItem::kvsCode() ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -KviKvsPopupMenuItemMenu::KviKvsPopupMenuItemMenu(const QString &szItemName,KviKvsPopupMenu * pMenu,const QString &szText,const QString &szIcon,const QString &szCondition) +KviKvsPopupMenuItemMenu::KviKvsPopupMenuItemMenu(const TQString &szItemName,KviKvsPopupMenu * pMenu,const TQString &szText,const TQString &szIcon,const TQString &szCondition) : KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Menu,szItemName,szText,szIcon,szCondition) { m_pMenu = pMenu; } -KviKvsPopupMenuItemMenu::KviKvsPopupMenuItemMenu(const QString &szItemName,KviKvsPopupMenu * pMenu,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition) +KviKvsPopupMenuItemMenu::KviKvsPopupMenuItemMenu(const TQString &szItemName,KviKvsPopupMenu * pMenu,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition) : KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Menu,szItemName,pText,pIcon,pCondition) { m_pMenu = pMenu; @@ -408,8 +408,8 @@ KviKvsPopupMenuItem * KviKvsPopupMenuItemMenu::clone() const void KviKvsPopupMenuItemMenu::fill(KviKvsPopupMenu * pMenu,KviKvsPopupMenuTopLevelData * pData,int iIdx) { if(!evaluateCondition(pData))return; - QString szText = evaluateText(pData); - QPixmap * pPix = evaluateIcon(pData); + TQString szText = evaluateText(pData); + TQPixmap * pPix = evaluateIcon(pData); int id; m_pMenu->setParentPopup(pMenu); if(pPix)id = pMenu->insertItem(*pPix,szText,m_pMenu); @@ -427,7 +427,7 @@ void KviKvsPopupMenuItemMenu::clear() //////////////////////////////////////////////////////////////////////////////////////////////////////////// -KviKvsPopupMenuItemExtMenu::KviKvsPopupMenuItemExtMenu(const QString &szItemName,const QString &szMenuName,const QString &szText,const QString &szIcon,const QString &szCondition) +KviKvsPopupMenuItemExtMenu::KviKvsPopupMenuItemExtMenu(const TQString &szItemName,const TQString &szMenuName,const TQString &szText,const TQString &szIcon,const TQString &szCondition) : KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::ExtMenu,szItemName,szText,szIcon,szCondition) { m_szMenuName = szMenuName; @@ -439,7 +439,7 @@ KviKvsPopupMenuItemExtMenu::KviKvsPopupMenuItemExtMenu(const QString &szItemName m_pMenu = 0; } -KviKvsPopupMenuItemExtMenu::KviKvsPopupMenuItemExtMenu(const QString &szItemName,const QString &szMenuName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition) +KviKvsPopupMenuItemExtMenu::KviKvsPopupMenuItemExtMenu(const TQString &szItemName,const TQString &szMenuName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition) : KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::ExtMenu,szItemName,pText,pIcon,pCondition) { m_szMenuName = szMenuName; @@ -475,8 +475,8 @@ KviKvsPopupMenuItem * KviKvsPopupMenuItemExtMenu::clone() const void KviKvsPopupMenuItemExtMenu::fill(KviKvsPopupMenu * pMenu,KviKvsPopupMenuTopLevelData * pData,int iIdx) { if(!evaluateCondition(pData))return; - QString szText = evaluateText(pData); - QPixmap * pPix = evaluateIcon(pData); + TQString szText = evaluateText(pData); + TQPixmap * pPix = evaluateIcon(pData); KviKvsPopupMenu * source = KviKvsPopupManager::instance()->lookup(m_szMenuName); if(source) @@ -486,8 +486,8 @@ void KviKvsPopupMenuItemExtMenu::fill(KviKvsPopupMenu * pMenu,KviKvsPopupMenuTop pData->window()->output(KVI_OUT_PARSERWARNING,__tr2qs("Recursive definition detected for popup '%Q': ignoring"),&(pMenu->popupName())); return; } - QString tmp; - KviQString::sprintf(tmp,"%Q.%Q",&(pMenu->popupName()),&m_szMenuName); + TQString tmp; + KviTQString::sprintf(tmp,"%Q.%Q",&(pMenu->popupName()),&m_szMenuName); if(m_pMenu)delete m_pMenu; m_pMenu = new KviKvsPopupMenu(tmp); m_pMenu->copyFrom(source); @@ -527,7 +527,7 @@ KviKvsPopupMenuTopLevelData::~KviKvsPopupMenuTopLevelData() -KviKvsPopupMenu::KviKvsPopupMenu(const QString &szName) +KviKvsPopupMenu::KviKvsPopupMenu(const TQString &szName) :KviTalPopupMenu(0,szName) { m_szName = szName; @@ -541,8 +541,8 @@ KviKvsPopupMenu::KviKvsPopupMenu(const QString &szName) m_pTopLevelData = 0; m_pTempTopLevelData = 0; m_bSetupDone = false; - connect(this,SIGNAL(activated(int)),this,SLOT(itemClicked(int))); - connect(this,SIGNAL(aboutToShow()),this,SLOT(setupMenuContents())); + connect(this,TQT_SIGNAL(activated(int)),this,TQT_SLOT(itemClicked(int))); + connect(this,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(setupMenuContents())); } @@ -578,37 +578,37 @@ void KviKvsPopupMenu::copyFrom(const KviKvsPopupMenu * src) } } -void KviKvsPopupMenu::addPrologue(const QString &szItemName,const QString &szCode) +void KviKvsPopupMenu::addPrologue(const TQString &szItemName,const TQString &szCode) { // FIXME: translate this or not ? - QString szName = szItemName; + TQString szName = szItemName; if(szName.isEmpty()) - KviQString::sprintf(szName,"prologue_%u_for_%Q",m_pPrologues->count(),&m_szName); + KviTQString::sprintf(szName,"prologue_%u_for_%Q",m_pPrologues->count(),&m_szName); m_pPrologues->append(new KviKvsScript(szName,szCode)); } -void KviKvsPopupMenu::addEpilogue(const QString &szItemName,const QString &szCode) +void KviKvsPopupMenu::addEpilogue(const TQString &szItemName,const TQString &szCode) { // FIXME: translate this or not ? - QString szName = szItemName; + TQString szName = szItemName; if(szName.isEmpty()) - KviQString::sprintf(szName,"epilogue_%u_for_%Q",m_pPrologues->count(),&m_szName); + KviTQString::sprintf(szName,"epilogue_%u_for_%Q",m_pPrologues->count(),&m_szName); m_pEpilogues->append(new KviKvsScript(szName,szCode)); } KviKvsPopupMenuTopLevelData * KviKvsPopupMenu::topLevelData() { - if(parentPopup())return parentPopup()->topLevelData(); + if(tqparentPopup())return tqparentPopup()->topLevelData(); return m_pTopLevelData; } -bool KviKvsPopupMenu::removeItemByName(const QString &szItemName,bool bRecursive) +bool KviKvsPopupMenu::removeItemByName(const TQString &szItemName,bool bRecursive) { KviKvsScript * se; for(se = m_pEpilogues->first();se;se = m_pEpilogues->next()) { - if(KviQString::equalCI(szItemName,se->name())) + if(KviTQString::equalCI(szItemName,se->name())) { m_pEpilogues->removeRef(se); return true; @@ -617,7 +617,7 @@ bool KviKvsPopupMenu::removeItemByName(const QString &szItemName,bool bRecursive for(se = m_pPrologues->first();se;se = m_pPrologues->next()) { - if(KviQString::equalCI(szItemName,se->name())) + if(KviTQString::equalCI(szItemName,se->name())) { m_pPrologues->removeRef(se); return true; @@ -626,7 +626,7 @@ bool KviKvsPopupMenu::removeItemByName(const QString &szItemName,bool bRecursive for(KviKvsPopupMenuItem * it = m_pItemList->first();it;it = m_pItemList->next()) { - if(KviQString::equalCI(szItemName,it->name())) + if(KviTQString::equalCI(szItemName,it->name())) { m_pItemList->removeRef(it); // bye :) return true; @@ -661,52 +661,52 @@ bool KviKvsPopupMenu::isLocked() KviKvsPopupMenu * KviKvsPopupMenu::topLevelPopup() { - if(parentPopup())return parentPopup(); + if(tqparentPopup())return tqparentPopup(); return this; } -KviKvsPopupMenu * KviKvsPopupMenu::addPopup(const QString &szItemName,const QString &szText,const QString &szIcon,const QString &szCondition) +KviKvsPopupMenu * KviKvsPopupMenu::addPopup(const TQString &szItemName,const TQString &szText,const TQString &szIcon,const TQString &szCondition) { - QString szName = szItemName; + TQString szName = szItemName; if(szName.isEmpty()) - KviQString::sprintf(szName,"%Q.subpopup%d",&m_szName,m_pItemList->count()); + KviTQString::sprintf(szName,"%Q.subpopup%d",&m_szName,m_pItemList->count()); KviKvsPopupMenu * pNew = new KviKvsPopupMenu(szName); pNew->setParentPopup(this); addItemInternal(new KviKvsPopupMenuItemMenu(szName,pNew,szText,szIcon,szCondition)); return pNew; } -void KviKvsPopupMenu::addSeparator(const QString &szItemName,const QString &szCondition) +void KviKvsPopupMenu::addSeparator(const TQString &szItemName,const TQString &szCondition) { - QString szName = szItemName; + TQString szName = szItemName; if(szName.isEmpty()) - KviQString::sprintf(szName,"%Q.separator%d",&m_szName,m_pItemList->count()); + KviTQString::sprintf(szName,"%Q.separator%d",&m_szName,m_pItemList->count()); addItemInternal(new KviKvsPopupMenuItemSeparator(szName,szCondition)); } -void KviKvsPopupMenu::addLabel(const QString &szItemName,const QString &szText,const QString &szIcon,const QString &szCondition) +void KviKvsPopupMenu::addLabel(const TQString &szItemName,const TQString &szText,const TQString &szIcon,const TQString &szCondition) { - QString szName = szItemName; + TQString szName = szItemName; if(szName.isEmpty()) - KviQString::sprintf(szName,"%Q.label%d",&m_szName,m_pItemList->count()); + KviTQString::sprintf(szName,"%Q.label%d",&m_szName,m_pItemList->count()); addItemInternal(new KviKvsPopupMenuItemLabel(szName,szText,szIcon,szCondition)); } -void KviKvsPopupMenu::addItem(const QString &szItemName,const QString &szCode,const QString &szText,const QString &szIcon,const QString &szCondition) +void KviKvsPopupMenu::addItem(const TQString &szItemName,const TQString &szCode,const TQString &szText,const TQString &szIcon,const TQString &szCondition) { - QString szName = szItemName; + TQString szName = szItemName; if(szName.isEmpty()) - KviQString::sprintf(szName,"%Q.item%d",&m_szName,m_pItemList->count()); + KviTQString::sprintf(szName,"%Q.item%d",&m_szName,m_pItemList->count()); addItemInternal(new KviKvsPopupMenuItemItem(szName,szCode,szText,szIcon,szCondition)); } -void KviKvsPopupMenu::addExtPopup(const QString &szItemName,const QString &szPopupName,const QString szText,const QString &szIcon,const QString &szCondition) +void KviKvsPopupMenu::addExtPopup(const TQString &szItemName,const TQString &szPopupName,const TQString szText,const TQString &szIcon,const TQString &szCondition) { - QString szName = szItemName; + TQString szName = szItemName; if(szName.isEmpty()) - KviQString::sprintf(szName,"%Q.%Q",&m_szName,&szName); + KviTQString::sprintf(szName,"%Q.%Q",&m_szName,&szName); addItemInternal(new KviKvsPopupMenuItemExtMenu(szName,szPopupName,szText,szIcon,szCondition)); } @@ -717,7 +717,7 @@ void KviKvsPopupMenu::addItemInternal(KviKvsPopupMenuItem * it) m_pItemList->append(it); } -void KviKvsPopupMenu::doPopup(const QPoint & pnt,KviWindow * wnd,KviKvsVariantList * pParams,bool bTestMode) +void KviKvsPopupMenu::doPopup(const TQPoint & pnt,KviWindow * wnd,KviKvsVariantList * pParams,bool bTestMode) { // This might be a compat problem later :((((( // it is also an ugly trick @@ -782,7 +782,7 @@ void KviKvsPopupMenu::lock(bool bLock) void KviKvsPopupMenu::setupMenuContents() { // This might be a compat problem later :(((( - if(parentPopup() == 0) + if(tqparentPopup() == 0) { if(m_pTempTopLevelData == 0) { @@ -806,7 +806,7 @@ void KviKvsPopupMenu::setupMenuContents() m_bSetupDone = true; - // HACK...this is to remove the separator inserted by Qt when popup() is called and the popup is empty + // HACK...this is to remove the separator inserted by TQt when popup() is called and the popup is empty clear(); KviKvsPopupMenuTopLevelData * d = topLevelData(); @@ -901,21 +901,21 @@ void KviKvsPopupMenu::itemClicked(int itemId) } else debug("oops....clicked something that is not an item at position %d",param); // FIXME: #warning "Maybe tell that the window has changed" } else debug("oops....no menu item at position %d",param); - // UGLY Qt 3.0.0.... we can't clear menu contents here :( -//#if QT_VERSION < 300 + // UGLY TQt 3.0.0.... we can't clear menu contents here :( +//#if [[[TQT_VERSION IS DEPRECATED]]] < 300 // topLevelPopup()->clearMenuContents(); //#endif } -void KviKvsPopupMenu::load(const QString &prefix,KviConfig * cfg) +void KviKvsPopupMenu::load(const TQString &prefix,KviConfig * cfg) { doClear(); int cnt; int idx; - QString tmp = prefix; + TQString tmp = prefix; tmp.append("_PrologueCount"); cnt = cfg->readIntEntry(tmp,0); @@ -924,114 +924,114 @@ void KviKvsPopupMenu::load(const QString &prefix,KviConfig * cfg) { for(idx = 0;idx < cnt;idx++) { - KviQString::sprintf(tmp,"%Q_Prologue%d",&(prefix),idx); - QString pr = cfg->readQStringEntry(tmp,""); - KviQString::sprintf(tmp,"%Q_PrologueId%d",&(prefix),idx); - QString itemName = cfg->readQStringEntry(tmp,""); + KviTQString::sprintf(tmp,"%TQ_Prologue%d",&(prefix),idx); + TQString pr = cfg->readTQStringEntry(tmp,""); + KviTQString::sprintf(tmp,"%TQ_PrologueId%d",&(prefix),idx); + TQString itemName = cfg->readTQStringEntry(tmp,""); if(!pr.isEmpty())addPrologue(itemName,pr); } } else { // Might be old version! - KviQString::sprintf(tmp,"%Q_Prologue",&(prefix)); - QString pr = cfg->readQStringEntry(tmp,""); - if(!pr.isEmpty())addPrologue(QString::null,pr); + KviTQString::sprintf(tmp,"%TQ_Prologue",&(prefix)); + TQString pr = cfg->readTQStringEntry(tmp,""); + if(!pr.isEmpty())addPrologue(TQString(),pr); } - KviQString::sprintf(tmp,"%Q_EpilogueCount",&prefix); + KviTQString::sprintf(tmp,"%TQ_EpilogueCount",&prefix); cnt = cfg->readIntEntry(tmp,0); if(cnt > 0) { for(idx = 0;idx < cnt;idx++) { - KviQString::sprintf(tmp,"%Q_Epilogue%d",&prefix,idx); - QString ep = cfg->readQStringEntry(tmp,""); - KviQString::sprintf(tmp,"%Q_PrologueId%d",&(prefix),idx); - QString itemName = cfg->readQStringEntry(tmp,""); + KviTQString::sprintf(tmp,"%TQ_Epilogue%d",&prefix,idx); + TQString ep = cfg->readTQStringEntry(tmp,""); + KviTQString::sprintf(tmp,"%TQ_PrologueId%d",&(prefix),idx); + TQString itemName = cfg->readTQStringEntry(tmp,""); if(!ep.isEmpty())addEpilogue(itemName,ep); } } else { // Might be old version! - KviQString::sprintf(tmp,"%Q_Epilogue",&prefix); - QString ep = cfg->readQStringEntry(tmp,""); - if(!ep.isEmpty())addEpilogue(QString::null,ep); + KviTQString::sprintf(tmp,"%TQ_Epilogue",&prefix); + TQString ep = cfg->readTQStringEntry(tmp,""); + if(!ep.isEmpty())addEpilogue(TQString(),ep); } - KviQString::sprintf(tmp,"%Q_Count",&prefix); + KviTQString::sprintf(tmp,"%TQ_Count",&prefix); cnt = cfg->readIntEntry(tmp,0); for(idx = 0;idx < cnt;idx++) { - QString pre; - KviQString::sprintf(pre,"%Q_%d",&prefix,idx); + TQString pre; + KviTQString::sprintf(pre,"%TQ_%d",&prefix,idx); - KviQString::sprintf(tmp,"%Q_Id",&pre); - QString itemName = cfg->readQStringEntry(tmp,QString::null); - KviQString::sprintf(tmp,"%Q_Type",&pre); + KviTQString::sprintf(tmp,"%TQ_Id",&pre); + TQString itemName = cfg->readTQStringEntry(tmp,TQString()); + KviTQString::sprintf(tmp,"%TQ_Type",&pre); int type = cfg->readIntEntry(tmp,3); switch(type) { case 0: // separator { - QString expr; - KviQString::sprintf(tmp,"%Q_Expr",&pre); - expr = cfg->readQStringEntry(tmp,""); + TQString expr; + KviTQString::sprintf(tmp,"%TQ_Expr",&pre); + expr = cfg->readTQStringEntry(tmp,""); addSeparator(itemName,expr); } break; case 1: // item { - QString text,icon,code,expr; - KviQString::sprintf(tmp,"%Q_Text",&pre); - text = cfg->readQStringEntry(tmp,"Unnamed"); - KviQString::sprintf(tmp,"%Q_Icon",&pre); - icon = cfg->readQStringEntry(tmp,""); - KviQString::sprintf(tmp,"%Q_Code",&pre); - code = cfg->readQStringEntry(tmp,""); - KviQString::sprintf(tmp,"%Q_Expr",&pre); - expr = cfg->readQStringEntry(tmp,""); + TQString text,icon,code,expr; + KviTQString::sprintf(tmp,"%TQ_Text",&pre); + text = cfg->readTQStringEntry(tmp,"Unnamed"); + KviTQString::sprintf(tmp,"%TQ_Icon",&pre); + icon = cfg->readTQStringEntry(tmp,""); + KviTQString::sprintf(tmp,"%TQ_Code",&pre); + code = cfg->readTQStringEntry(tmp,""); + KviTQString::sprintf(tmp,"%TQ_Expr",&pre); + expr = cfg->readTQStringEntry(tmp,""); addItem(itemName,code,text,icon,expr); } break; case 2: // menu { - QString text,icon,expr; - KviQString::sprintf(tmp,"%Q_Text",&pre); - text = cfg->readQStringEntry(tmp,"Unnamed"); - KviQString::sprintf(tmp,"%Q_Icon",&pre); - icon = cfg->readQStringEntry(tmp,""); - KviQString::sprintf(tmp,"%Q_Expr",&pre); - expr = cfg->readQStringEntry(tmp,""); + TQString text,icon,expr; + KviTQString::sprintf(tmp,"%TQ_Text",&pre); + text = cfg->readTQStringEntry(tmp,"Unnamed"); + KviTQString::sprintf(tmp,"%TQ_Icon",&pre); + icon = cfg->readTQStringEntry(tmp,""); + KviTQString::sprintf(tmp,"%TQ_Expr",&pre); + expr = cfg->readTQStringEntry(tmp,""); KviKvsPopupMenu * pop = addPopup(itemName,text,icon,expr); pop->load(pre,cfg); } break; case 3: // label { - QString text,icon,expr; - KviQString::sprintf(tmp,"%Q_Text",&pre); - text = cfg->readQStringEntry(tmp,"Unnamed"); - KviQString::sprintf(tmp,"%Q_Icon",&pre); - icon = cfg->readQStringEntry(tmp,""); - KviQString::sprintf(tmp,"%Q_Expr",&pre); - expr = cfg->readQStringEntry(tmp,""); + TQString text,icon,expr; + KviTQString::sprintf(tmp,"%TQ_Text",&pre); + text = cfg->readTQStringEntry(tmp,"Unnamed"); + KviTQString::sprintf(tmp,"%TQ_Icon",&pre); + icon = cfg->readTQStringEntry(tmp,""); + KviTQString::sprintf(tmp,"%TQ_Expr",&pre); + expr = cfg->readTQStringEntry(tmp,""); addLabel(itemName,text,icon,expr); } break; case 4: // extmenu { - QString text,icon,code,expr; - KviQString::sprintf(tmp,"%Q_Text",&pre); - text = cfg->readQStringEntry(tmp,"Unnamed"); - KviQString::sprintf(tmp,"%Q_Icon",&pre); - icon = cfg->readQStringEntry(tmp,""); - KviQString::sprintf(tmp,"%Q_ExtName",&pre); - code = cfg->readQStringEntry(tmp,""); - KviQString::sprintf(tmp,"%Q_Expr",&pre); - expr = cfg->readQStringEntry(tmp,""); + TQString text,icon,code,expr; + KviTQString::sprintf(tmp,"%TQ_Text",&pre); + text = cfg->readTQStringEntry(tmp,"Unnamed"); + KviTQString::sprintf(tmp,"%TQ_Icon",&pre); + icon = cfg->readTQStringEntry(tmp,""); + KviTQString::sprintf(tmp,"%TQ_ExtName",&pre); + code = cfg->readTQStringEntry(tmp,""); + KviTQString::sprintf(tmp,"%TQ_Expr",&pre); + expr = cfg->readTQStringEntry(tmp,""); addExtPopup(itemName,code,text,icon,expr); } break; @@ -1044,49 +1044,49 @@ void KviKvsPopupMenu::load(const QString &prefix,KviConfig * cfg) // FIXME: #warning "NOBODY EDITS THE POPUPS IN THE CONFIG!...A binary config would be faster and work better for sure here" -void KviKvsPopupMenu::save(const QString & prefix,KviConfig * cfg) +void KviKvsPopupMenu::save(const TQString & prefix,KviConfig * cfg) { int idx; KviKvsScript * s; - QString tmp; + TQString tmp; - KviQString::sprintf(tmp,"%Q_PrologueCount",&prefix); + KviTQString::sprintf(tmp,"%TQ_PrologueCount",&prefix); cfg->writeEntry(tmp,m_pPrologues->count()); idx = 0; for(s = m_pPrologues->first();s;s = m_pPrologues->next()) { - KviQString::sprintf(tmp,"%Q_Prologue%d",&prefix,idx); + KviTQString::sprintf(tmp,"%TQ_Prologue%d",&prefix,idx); cfg->writeEntry(tmp,s->code()); - KviQString::sprintf(tmp,"%Q_PrologueId%d",&prefix,idx); + KviTQString::sprintf(tmp,"%TQ_PrologueId%d",&prefix,idx); cfg->writeEntry(tmp,s->name()); idx++; } - KviQString::sprintf(tmp,"%Q_EpilogueCount",&prefix); + KviTQString::sprintf(tmp,"%TQ_EpilogueCount",&prefix); cfg->writeEntry(tmp,m_pEpilogues->count()); idx = 0; for(s = m_pEpilogues->first();s;s = m_pEpilogues->next()) { - KviQString::sprintf(tmp,"%Q_Epilogue%d",&prefix,idx); + KviTQString::sprintf(tmp,"%TQ_Epilogue%d",&prefix,idx); cfg->writeEntry(tmp,s->code()); - KviQString::sprintf(tmp,"%Q_EpilogueId%d",&prefix,idx); + KviTQString::sprintf(tmp,"%TQ_EpilogueId%d",&prefix,idx); cfg->writeEntry(tmp,s->name()); idx++; } - KviQString::sprintf(tmp,"%Q_Count",&prefix); + KviTQString::sprintf(tmp,"%TQ_Count",&prefix); cfg->writeEntry(tmp,m_pItemList->count()); idx = 0; for(KviKvsPopupMenuItem * it = m_pItemList->first();it;it = m_pItemList->next()) { - QString pre; - KviQString::sprintf(pre,"%Q_%d",&prefix,idx); - KviQString::sprintf(tmp,"%Q_Type",&pre); + TQString pre; + KviTQString::sprintf(pre,"%TQ_%d",&prefix,idx); + KviTQString::sprintf(tmp,"%TQ_Type",&pre); int typeCode = 0; switch(it->type()) { @@ -1099,34 +1099,34 @@ void KviKvsPopupMenu::save(const QString & prefix,KviConfig * cfg) cfg->writeEntry(tmp,typeCode); - KviQString::sprintf(tmp,"%Q_Id",&pre); + KviTQString::sprintf(tmp,"%TQ_Id",&pre); cfg->writeEntry(tmp,it->name()); s = it->kvsCondition(); if(s) { - KviQString::sprintf(tmp,"%Q_Expr",&pre); + KviTQString::sprintf(tmp,"%TQ_Expr",&pre); cfg->writeEntry(tmp,s->code()); } s = it->kvsIcon(); if(s) { - KviQString::sprintf(tmp,"%Q_Icon",&pre); + KviTQString::sprintf(tmp,"%TQ_Icon",&pre); cfg->writeEntry(tmp,s->code()); } s = it->kvsText(); if(s) { - KviQString::sprintf(tmp,"%Q_Text",&pre); + KviTQString::sprintf(tmp,"%TQ_Text",&pre); cfg->writeEntry(tmp,s->code()); } s = it->kvsCode(); if(s) { - KviQString::sprintf(tmp,"%Q_Code",&pre); + KviTQString::sprintf(tmp,"%TQ_Code",&pre); cfg->writeEntry(tmp,s->code()); } @@ -1135,7 +1135,7 @@ void KviKvsPopupMenu::save(const QString & prefix,KviConfig * cfg) ((KviKvsPopupMenuItemMenu *)it)->menu()->save(pre,cfg); } else if(it->isExtMenu()) { - KviQString::sprintf(tmp,"%Q_ExtName",&pre); + KviTQString::sprintf(tmp,"%TQ_ExtName",&pre); cfg->writeEntry(tmp,((KviKvsPopupMenuItemExtMenu *)it)->extName()); } @@ -1143,10 +1143,10 @@ void KviKvsPopupMenu::save(const QString & prefix,KviConfig * cfg) } } -void KviKvsPopupMenu::generateDefPopupCore(QString &buffer) +void KviKvsPopupMenu::generateDefPopupCore(TQString &buffer) { - QString tmp; + TQString tmp; buffer = ""; @@ -1167,9 +1167,9 @@ void KviKvsPopupMenu::generateDefPopupCore(QString &buffer) switch(it->type()) { case KviKvsPopupMenuItem::Item: - if(it->kvsIcon())KviQString::appendFormatted(buffer,"item(%Q,%Q)",&(it->kvsText()->code()),&(it->kvsIcon()->code())); - else KviQString::appendFormatted(buffer,"item(%Q)",&(it->kvsText()->code())); - if(it->kvsCondition())KviQString::appendFormatted(buffer," (%Q)",&(it->kvsCondition()->code())); + if(it->kvsIcon())KviTQString::appendFormatted(buffer,"item(%Q,%Q)",&(it->kvsText()->code()),&(it->kvsIcon()->code())); + else KviTQString::appendFormatted(buffer,"item(%Q)",&(it->kvsText()->code())); + if(it->kvsCondition())KviTQString::appendFormatted(buffer," (%Q)",&(it->kvsCondition()->code())); buffer.append("\n"); tmp = it->kvsCode()->code(); KviCommandFormatter::blockFromBuffer(tmp); @@ -1177,9 +1177,9 @@ void KviKvsPopupMenu::generateDefPopupCore(QString &buffer) buffer.append("\n"); break; case KviKvsPopupMenuItem::Menu: - if(it->kvsIcon())KviQString::appendFormatted(buffer,"popup(%Q,%Q)",&(it->kvsText()->code()),&(it->kvsIcon()->code())); - else KviQString::appendFormatted(buffer,"popup(%Q)",&(it->kvsText()->code())); - if(it->kvsCondition())KviQString::appendFormatted(buffer," (%Q)",&(it->kvsCondition()->code())); + if(it->kvsIcon())KviTQString::appendFormatted(buffer,"popup(%Q,%Q)",&(it->kvsText()->code()),&(it->kvsIcon()->code())); + else KviTQString::appendFormatted(buffer,"popup(%Q)",&(it->kvsText()->code())); + if(it->kvsCondition())KviTQString::appendFormatted(buffer," (%Q)",&(it->kvsCondition()->code())); buffer.append("\n"); ((KviKvsPopupMenuItemMenu *)it)->menu()->generateDefPopupCore(tmp); KviCommandFormatter::blockFromBuffer(tmp); @@ -1187,19 +1187,19 @@ void KviKvsPopupMenu::generateDefPopupCore(QString &buffer) buffer.append("\n"); break; case KviKvsPopupMenuItem::Separator: - if(it->kvsCondition())KviQString::appendFormatted(buffer,"separator(%Q)\n\n",&(it->kvsCondition()->code())); + if(it->kvsCondition())KviTQString::appendFormatted(buffer,"separator(%Q)\n\n",&(it->kvsCondition()->code())); else buffer.append("separator\n\n"); break; case KviKvsPopupMenuItem::Label: - if(it->kvsIcon())KviQString::appendFormatted(buffer,"label(%Q,%Q)",&(it->kvsText()->code()),&(it->kvsIcon()->code())); - else KviQString::appendFormatted(buffer,"label(%Q)",&(it->kvsText()->code())); - if(it->kvsCondition())KviQString::appendFormatted(buffer," (%Q)",&(it->kvsCondition()->code())); + if(it->kvsIcon())KviTQString::appendFormatted(buffer,"label(%Q,%Q)",&(it->kvsText()->code()),&(it->kvsIcon()->code())); + else KviTQString::appendFormatted(buffer,"label(%Q)",&(it->kvsText()->code())); + if(it->kvsCondition())KviTQString::appendFormatted(buffer," (%Q)",&(it->kvsCondition()->code())); buffer.append("\n\n"); break; case KviKvsPopupMenuItem::ExtMenu: - if(it->kvsIcon())KviQString::appendFormatted(buffer,"extpopup(%Q,%Q,%Q)",&(it->kvsText()->code()),&(((KviKvsPopupMenuItemExtMenu *)it)->extName()),&(it->kvsIcon()->code())); - else KviQString::appendFormatted(buffer,"extpopup(%Q)",&(it->kvsText()->code())); - if(it->kvsCondition())KviQString::appendFormatted(buffer," (%Q)",&(it->kvsCondition()->code())); + if(it->kvsIcon())KviTQString::appendFormatted(buffer,"extpopup(%Q,%Q,%Q)",&(it->kvsText()->code()),&(((KviKvsPopupMenuItemExtMenu *)it)->extName()),&(it->kvsIcon()->code())); + else KviTQString::appendFormatted(buffer,"extpopup(%Q)",&(it->kvsText()->code())); + if(it->kvsCondition())KviTQString::appendFormatted(buffer," (%Q)",&(it->kvsCondition()->code())); buffer.append("\n\n"); break; } @@ -1217,10 +1217,10 @@ void KviKvsPopupMenu::generateDefPopupCore(QString &buffer) } -void KviKvsPopupMenu::generateDefPopup(QString &buffer) +void KviKvsPopupMenu::generateDefPopup(TQString &buffer) { - KviQString::sprintf(buffer,"defpopup(%s)\n",name()); - QString core; + KviTQString::sprintf(buffer,"defpopup(%s)\n",name()); + TQString core; generateDefPopupCore(core); KviCommandFormatter::blockFromBuffer(core); diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.h b/src/kvirc/kvs/kvi_kvs_popupmenu.h index e658495..11ca648 100644 --- a/src/kvirc/kvs/kvi_kvs_popupmenu.h +++ b/src/kvirc/kvs/kvi_kvs_popupmenu.h @@ -33,8 +33,8 @@ #include "kvi_kvs_runtimecontext.h" #include "kvi_tal_popupmenu.h" -#include <qlabel.h> -#include <qpixmap.h> +#include <tqlabel.h> +#include <tqpixmap.h> class KviKvsPopupMenu; @@ -69,12 +69,12 @@ class KVIRC_API KviKvsPopupMenuItem public: enum Type { Item , Menu , Label , Separator , ExtMenu }; protected: - KviKvsPopupMenuItem(Type t,const QString &szItemName,const QString &szCondition); - KviKvsPopupMenuItem(Type t,const QString &szItemName,const KviKvsScript * pCondition); + KviKvsPopupMenuItem(Type t,const TQString &szItemName,const TQString &szCondition); + KviKvsPopupMenuItem(Type t,const TQString &szItemName,const KviKvsScript * pCondition); public: virtual ~KviKvsPopupMenuItem(); protected: - QString m_szItemName; + TQString m_szItemName; Type m_eType; KviKvsScript * m_pKvsCondition; public: @@ -83,7 +83,7 @@ public: KviKvsPopupMenuItem::Type type(){ return m_eType; }; - const QString & name(){ return m_szItemName; }; + const TQString & name(){ return m_szItemName; }; bool isItem(){ return m_eType == Item; }; bool isSeparator(){ return m_eType == Separator; }; @@ -107,8 +107,8 @@ class KVIRC_API KviKvsPopupMenuItemSeparator : public KviKvsPopupMenuItem { friend class KviKvsPopupMenu; protected: - KviKvsPopupMenuItemSeparator(const QString &szItemName,const QString &szCondition); - KviKvsPopupMenuItemSeparator(const QString &szItemName,const KviKvsScript * pCondition); + KviKvsPopupMenuItemSeparator(const TQString &szItemName,const TQString &szCondition); + KviKvsPopupMenuItemSeparator(const TQString &szItemName,const KviKvsScript * pCondition); public: virtual ~KviKvsPopupMenuItemSeparator(); public: @@ -120,8 +120,8 @@ public: class KVIRC_API KviKvsPopupMenuItemWithTextAndIcon : public KviKvsPopupMenuItem { protected: - KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Type t,const QString &szItemName,const QString &szText,const QString &szIcon,const QString &szCondition); - KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Type t,const QString &szItemName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition); + KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Type t,const TQString &szItemName,const TQString &szText,const TQString &szIcon,const TQString &szCondition); + KviKvsPopupMenuItemWithTextAndIcon(KviKvsPopupMenuItem::Type t,const TQString &szItemName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition); public: virtual ~KviKvsPopupMenuItemWithTextAndIcon(); protected: @@ -131,17 +131,18 @@ public: virtual KviKvsScript * kvsIcon(); virtual KviKvsScript * kvsText(); // this just returns a string , eventually empty - QString evaluateText(KviKvsPopupMenuTopLevelData * pData); + TQString evaluateText(KviKvsPopupMenuTopLevelData * pData); // this just returns the icon , eventually - QPixmap * evaluateIcon(KviKvsPopupMenuTopLevelData * pData); + TQPixmap * evaluateIcon(KviKvsPopupMenuTopLevelData * pData); }; class KviKvsPopupMenuItemLabel; // this acts as signal relay -class KVIRC_API KviKvsPopupMenuItemLabelHelper : public QObject +class KVIRC_API KviKvsPopupMenuItemLabelHelper : public TQObject { Q_OBJECT + TQ_OBJECT friend class KviKvsPopupMenuItemLabel; protected: KviKvsPopupMenuItemLabelHelper(KviKvsPopupMenuItemLabel * pItem); @@ -157,12 +158,12 @@ class KVIRC_API KviKvsPopupMenuItemLabel : public KviKvsPopupMenuItemWithTextAnd friend class KviKvsPopupMenuItemLabelHelper; friend class KviKvsPopupMenu; protected: - KviKvsPopupMenuItemLabel(const QString &szItemName,const QString &szText,const QString &szIcon,const QString &szCondition); - KviKvsPopupMenuItemLabel(const QString &szItemName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition); + KviKvsPopupMenuItemLabel(const TQString &szItemName,const TQString &szText,const TQString &szIcon,const TQString &szCondition); + KviKvsPopupMenuItemLabel(const TQString &szItemName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition); public: virtual ~KviKvsPopupMenuItemLabel(); protected: - QLabel * m_pLabel; + TQLabel * m_pLabel; KviKvsPopupMenuItemLabelHelper * m_pSignalRelay; public: virtual void fill(KviKvsPopupMenu * pMenu,KviKvsPopupMenuTopLevelData * pData,int iIdx); @@ -177,8 +178,8 @@ class KVIRC_API KviKvsPopupMenuItemItem : public KviKvsPopupMenuItemWithTextAndI { friend class KviKvsPopupMenu; protected: - KviKvsPopupMenuItemItem(const QString &szItemName,const QString &szCode,const QString &szText,const QString &szIcon,const QString &szCondition); - KviKvsPopupMenuItemItem(const QString &szItemName,const KviKvsScript * pCode,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition); + KviKvsPopupMenuItemItem(const TQString &szItemName,const TQString &szCode,const TQString &szText,const TQString &szIcon,const TQString &szCondition); + KviKvsPopupMenuItemItem(const TQString &szItemName,const KviKvsScript * pCode,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition); public: virtual ~KviKvsPopupMenuItemItem(); protected: @@ -194,8 +195,8 @@ class KVIRC_API KviKvsPopupMenuItemMenu : public KviKvsPopupMenuItemWithTextAndI { friend class KviKvsPopupMenu; protected: - KviKvsPopupMenuItemMenu(const QString &szItemName,KviKvsPopupMenu * pMenu,const QString &szText,const QString &szIcon,const QString &szCondition); - KviKvsPopupMenuItemMenu(const QString &szItemName,KviKvsPopupMenu * pMenu,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition); + KviKvsPopupMenuItemMenu(const TQString &szItemName,KviKvsPopupMenu * pMenu,const TQString &szText,const TQString &szIcon,const TQString &szCondition); + KviKvsPopupMenuItemMenu(const TQString &szItemName,KviKvsPopupMenu * pMenu,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition); public: virtual ~KviKvsPopupMenuItemMenu(); protected: @@ -211,15 +212,15 @@ class KVIRC_API KviKvsPopupMenuItemExtMenu : public KviKvsPopupMenuItemWithTextA { friend class KviKvsPopupMenu; protected: - KviKvsPopupMenuItemExtMenu(const QString &szItemName,const QString &szMenuName,const QString &szText,const QString &szIcon,const QString &szCondition); - KviKvsPopupMenuItemExtMenu(const QString &szItemName,const QString &szMenuName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition); + KviKvsPopupMenuItemExtMenu(const TQString &szItemName,const TQString &szMenuName,const TQString &szText,const TQString &szIcon,const TQString &szCondition); + KviKvsPopupMenuItemExtMenu(const TQString &szItemName,const TQString &szMenuName,const KviKvsScript * pText,const KviKvsScript * pIcon,const KviKvsScript * pCondition); public: virtual ~KviKvsPopupMenuItemExtMenu(); protected: - QString m_szMenuName; + TQString m_szMenuName; KviKvsPopupMenu * m_pMenu; // owned! public: - const QString & extName(){ return m_szMenuName; }; + const TQString & extName(){ return m_szMenuName; }; virtual void fill(KviKvsPopupMenu * pMenu,KviKvsPopupMenuTopLevelData * pData,int iIdx); virtual void clear(); virtual KviKvsPopupMenuItem * clone() const; @@ -241,13 +242,14 @@ class KVIRC_API KviKvsPopupMenu : public KviTalPopupMenu friend class KviKvsPopupManager; friend class KviSinglePopupEditor; Q_OBJECT + TQ_OBJECT public: - KviKvsPopupMenu(const QString &szName); + KviKvsPopupMenu(const TQString &szName); ~KviKvsPopupMenu(); protected: KviPointerList<KviKvsPopupMenuItem> * m_pItemList; private: - QString m_szName; + TQString m_szName; KviKvsPopupMenu * m_pParentPopup; KviPointerList<KviKvsScript> * m_pPrologues; KviPointerList<KviKvsScript> * m_pEpilogues; @@ -256,36 +258,36 @@ private: KviKvsPopupMenuTopLevelData * m_pTempTopLevelData; bool m_bSetupDone; public: - const QString & popupName(){ return m_szName; }; - void setPopupName(const QString &szName){ m_szName = szName; }; + const TQString & popupName(){ return m_szName; }; + void setPopupName(const TQString &szName){ m_szName = szName; }; void copyFrom(const KviKvsPopupMenu * src); KviKvsPopupMenuTopLevelData * topLevelData(); KviKvsPopupMenu * topLevelPopup(); bool isLocked(); void lock(bool bLock); - KviKvsPopupMenu * addPopup(const QString &szItemName,const QString &szText,const QString &szIcon,const QString &szCondition); - void addSeparator(const QString &szItemName,const QString &szCondition); - void addLabel(const QString &szItemName,const QString &szText,const QString &szIcon,const QString &szCondition); - void addItem(const QString &szItemName,const QString &szCode,const QString &szText,const QString &szIcon,const QString &szCondition); - void addExtPopup(const QString &szItemName,const QString &szPopupName,const QString szText,const QString &szIcon,const QString &szCondition); - void doPopup(const QPoint & pnt,KviWindow * wnd,KviKvsVariantList * pParams,bool bTestMode = false); + KviKvsPopupMenu * addPopup(const TQString &szItemName,const TQString &szText,const TQString &szIcon,const TQString &szCondition); + void addSeparator(const TQString &szItemName,const TQString &szCondition); + void addLabel(const TQString &szItemName,const TQString &szText,const TQString &szIcon,const TQString &szCondition); + void addItem(const TQString &szItemName,const TQString &szCode,const TQString &szText,const TQString &szIcon,const TQString &szCondition); + void addExtPopup(const TQString &szItemName,const TQString &szPopupName,const TQString szText,const TQString &szIcon,const TQString &szCondition); + void doPopup(const TQPoint & pnt,KviWindow * wnd,KviKvsVariantList * pParams,bool bTestMode = false); bool isEmpty(){ return m_pItemList->isEmpty() && m_pPrologues->isEmpty() && m_pEpilogues->isEmpty(); }; void doClear(); - void addPrologue(const QString &szItemName,const QString &szCode); - void addEpilogue(const QString &szItemName,const QString &szCode); - bool removeItemByName(const QString &szItemName,bool bRecursive); + void addPrologue(const TQString &szItemName,const TQString &szCode); + void addEpilogue(const TQString &szItemName,const TQString &szCode); + bool removeItemByName(const TQString &szItemName,bool bRecursive); KviPointerList<KviKvsScript> * epilogues(){ return m_pEpilogues; }; KviPointerList<KviKvsScript> * prologues(){ return m_pPrologues; }; - KviKvsPopupMenu * parentPopup(){ return m_pParentPopup; }; - void generateDefPopup(QString &buffer); + KviKvsPopupMenu * tqparentPopup(){ return m_pParentPopup; }; + void generateDefPopup(TQString &buffer); void setParentPopup(KviKvsPopupMenu * par){ m_pParentPopup = par; }; - void generateDefPopupCore(QString &buffer); + void generateDefPopupCore(TQString &buffer); protected: void addItemInternal(KviKvsPopupMenuItem * it); void executePrologues(KviKvsPopupMenuTopLevelData * pData); void executeEpilogues(KviKvsPopupMenuTopLevelData * pData); - void load(const QString &prefix,KviConfig * cfg); - void save(const QString &prefix,KviConfig * cfg); + void load(const TQString &prefix,KviConfig * cfg); + void save(const TQString &prefix,KviConfig * cfg); private slots: void setupMenuContents(); protected: diff --git a/src/kvirc/kvs/kvi_kvs_processmanager.cpp b/src/kvirc/kvs/kvi_kvs_processmanager.cpp index 2c397c5..a7aeacb 100644 --- a/src/kvirc/kvs/kvi_kvs_processmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_processmanager.cpp @@ -32,7 +32,7 @@ #include "kvi_app.h" #include "kvi_console.h" #include "kvi_kvs_script.h" -//#include <QSysInfo> +//#include <TQSysInfo> KviKvsProcessAsyncOperation::KviKvsProcessAsyncOperation(KviKvsProcessDescriptorData * d) : KviKvsAsyncOperation(d->pWnd) @@ -51,7 +51,7 @@ KviKvsProcessAsyncOperation::~KviKvsProcessAsyncOperation() if(m_pRunTimeTimer)delete m_pRunTimeTimer; if(m_pProcess) { - QObject::disconnect(m_pProcess,0,this,0); + TQObject::disconnect(m_pProcess,0,this,0); m_pProcess->kill(); delete m_pProcess; } @@ -63,25 +63,25 @@ KviKvsProcessAsyncOperation::~KviKvsProcessAsyncOperation() bool KviKvsProcessAsyncOperation::start() { - QStringList args; + TQStringList args; if(m_pData->iFlags & KVI_KVS_PROCESSDESCRIPTOR_NOSHELL) { - args = QStringList::split(" ",m_pData->szCommandline); + args = TQStringList::split(" ",m_pData->szCommandline); } else { - QString szShell = m_pData->szShell; + TQString szShell = m_pData->szShell; if(szShell.isEmpty()) { #ifdef COMPILE_ON_WINDOWS - // [01:26:00] <PragmaOff> btw, what is qt_winunicode ? - // [01:26:12] <kode54> Qt export specific to win32 + // [01:26:00] <PragmaOff> btw, what is qt_wintqunicode ? + // [01:26:12] <kode54> TQt export specific to win32 // [01:26:27] <kode54> bool which indicates whether system is Unicode (NT) or not // [01:26:58] <kode54> not sure if that's documented, but it is a public export // - // [02:50:21] <kode54> if ( QApplication::winVersion() & Qt::WV_NT_based ) + // [02:50:21] <kode54> if ( TQApplication::winVersion() & TQt::WV_NT_based ) // [02:50:41] <kode54> I see another implementation using that, maybe it is the official way of detecting that :[ #ifdef COMPILE_USE_QT4 - szShell = !(QSysInfo::WindowsVersion & QSysInfo::WV_DOS_based) ? "cmd.exe /c" : "command.com /c"; + szShell = !(TQSysInfo::WindowsVersion & TQSysInfo::WV_DOS_based) ? "cmd.exe /c" : "command.com /c"; #else szShell = "command.com /c"; #endif @@ -91,7 +91,7 @@ bool KviKvsProcessAsyncOperation::start() szShell = "sh -c"; #endif } - args = QStringList::split(" ",szShell); + args = TQStringList::split(" ",szShell); args.append(m_pData->szCommandline); } @@ -100,19 +100,19 @@ bool KviKvsProcessAsyncOperation::start() if(m_pData->iFlags & KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDOUT) { - connect(m_pProcess,SIGNAL(readyReadStdout()),this,SLOT(readStdout())); + connect(m_pProcess,TQT_SIGNAL(readyReadStdout()),this,TQT_SLOT(readStdout())); c |= KviProcess::Stdout; } if(m_pData->iFlags & KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDERR) { - connect(m_pProcess,SIGNAL(readyReadStderr()),this,SLOT(readStderr())); + connect(m_pProcess,TQT_SIGNAL(readyReadStderr()),this,TQT_SLOT(readStderr())); c |= KviProcess::Stderr; } m_pProcess->setCommunication(c); - connect(m_pProcess,SIGNAL(processExited()),this,SLOT(processExited())); + connect(m_pProcess,TQT_SIGNAL(processExited()),this,TQT_SLOT(processExited())); if(!m_pProcess->start()) { @@ -121,7 +121,7 @@ bool KviKvsProcessAsyncOperation::start() if(m_pData->iFlags & KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTARTED) { - QString szPid; + TQString szPid; szPid.setNum((int)(m_pProcess->processIdentifier())); if(trigger(EventStarted,szPid)) { @@ -132,15 +132,15 @@ bool KviKvsProcessAsyncOperation::start() if(m_pData->iMaxRunTime > 0) { - m_pRunTimeTimer = new QTimer(this); - connect(m_pRunTimeTimer,SIGNAL(timeout()),this,SLOT(maxRunTimeExpired())); + m_pRunTimeTimer = new TQTimer(this); + connect(m_pRunTimeTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(maxRunTimeExpired())); m_pRunTimeTimer->start(m_pData->iMaxRunTime); } if(m_pData->iPingTimeout > 0) { - m_pPingTimer = new QTimer(this); - connect(m_pPingTimer,SIGNAL(timeout()),this,SLOT(ping())); + m_pPingTimer = new TQTimer(this); + connect(m_pPingTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(ping())); m_pPingTimer->start(m_pData->iPingTimeout); } @@ -149,7 +149,7 @@ bool KviKvsProcessAsyncOperation::start() void KviKvsProcessAsyncOperation::ping() { - if(trigger(EventPing,QString::null)) + if(trigger(EventPing,TQString())) { triggerSelfDelete(); } @@ -159,7 +159,7 @@ void KviKvsProcessAsyncOperation::triggerSelfDelete() { if(m_bDeletePending)return; m_bDeletePending = true; - QTimer::singleShot(m_pData->iMaxRunTime,this,SLOT(selfDelete())); + TQTimer::singleShot(m_pData->iMaxRunTime,this,TQT_SLOT(selfDelete())); } void KviKvsProcessAsyncOperation::selfDelete() @@ -173,7 +173,7 @@ void KviKvsProcessAsyncOperation::maxRunTimeExpired() triggerSelfDelete(); } -bool KviKvsProcessAsyncOperation::trigger(CallbackEvent e,const QString &szData) +bool KviKvsProcessAsyncOperation::trigger(CallbackEvent e,const TQString &szData) { if(m_bDeletePending)return false; @@ -194,19 +194,19 @@ bool KviKvsProcessAsyncOperation::trigger(CallbackEvent e,const QString &szData) switch(e) { case EventStdout: - params.append(new KviKvsVariant(QString("stdout"))); + params.append(new KviKvsVariant(TQString("stdout"))); break; case EventStderr: - params.append(new KviKvsVariant(QString("stderr"))); + params.append(new KviKvsVariant(TQString("stderr"))); break; case EventTerminated: - params.append(new KviKvsVariant(QString("terminated"))); + params.append(new KviKvsVariant(TQString("terminated"))); break; case EventStarted: - params.append(new KviKvsVariant(QString("started"))); + params.append(new KviKvsVariant(TQString("started"))); break; case EventPing: - params.append(new KviKvsVariant(QString("ping"))); + params.append(new KviKvsVariant(TQString("ping"))); break; default: debug("Ops... unknown trigger() CallbackEvent parameter in KviProcessDescriptor::trigger()"); @@ -228,7 +228,7 @@ bool KviKvsProcessAsyncOperation::trigger(CallbackEvent e,const QString &szData) if(!retVal.isNothing()) { - QString sz; + TQString sz; retVal.asString(sz); m_pProcess->writeToStdin(sz); } @@ -248,11 +248,11 @@ void KviKvsProcessAsyncOperation::readStdout() if(m_bDeletePending)return; if(m_pData->iFlags & KVI_KVS_PROCESSDESCRIPTOR_OUTPUTBYBLOCKS) { - QByteArray a = m_pProcess->readStdout(); + TQByteArray a = m_pProcess->readStdout(); if(a.size() > 0) - m_szStdoutBuffer += QString(a); + m_szStdoutBuffer += TQString(a); } else { - QString l = m_pProcess->readLineStdout(); + TQString l = m_pProcess->readLineStdout(); bool bBreak = false; while((!l.isNull()) && (!bBreak)) { @@ -275,11 +275,11 @@ void KviKvsProcessAsyncOperation::readStderr() if(m_bDeletePending)return; if(m_pData->iFlags & KVI_KVS_PROCESSDESCRIPTOR_OUTPUTBYBLOCKS) { - QByteArray a = m_pProcess->readStderr(); + TQByteArray a = m_pProcess->readStderr(); if(a.size() > 0) - m_szStderrBuffer += QString(a); + m_szStderrBuffer += TQString(a); } else { - QString l = m_pProcess->readLineStderr(); + TQString l = m_pProcess->readLineStderr(); bool bBreak = false; while((!l.isNull()) && (!bBreak)) { @@ -329,8 +329,8 @@ void KviKvsProcessAsyncOperation::processExited() if(m_pData->iFlags & KVI_KVS_PROCESSDESCRIPTOR_TRIGGERTERMINATED) { - QString szRetVal; - szRetVal.setNum(m_pProcess->exitStatus()); + TQString szRetVal; + szRetVal.setNum(m_pProcess->exitqStatus()); trigger(EventTerminated,szRetVal); } @@ -341,7 +341,7 @@ void KviKvsProcessAsyncOperation::processExited() /* KviKvsProcessManager::KviKvsProcessManager() -: QObject() +: TQObject() { } diff --git a/src/kvirc/kvs/kvi_kvs_processmanager.h b/src/kvirc/kvs/kvi_kvs_processmanager.h index 50e52ac..6fa343f 100644 --- a/src/kvirc/kvs/kvi_kvs_processmanager.h +++ b/src/kvirc/kvs/kvi_kvs_processmanager.h @@ -40,7 +40,7 @@ #include "kvi_process.h" -#include <qtimer.h> +#include <tqtimer.h> #define KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDOUT 1 #define KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDERR 2 @@ -57,8 +57,8 @@ class KviKvsVariant; typedef struct _KviKvsProcessDescriptorData { - QString szShell; - QString szCommandline; + TQString szShell; + TQString szCommandline; KviKvsScript * pCallback; KviKvsVariant * pMagic; KviWindow * pWnd; @@ -73,6 +73,7 @@ class KVIRC_API KviKvsProcessAsyncOperation : public KviKvsAsyncOperation { friend class KviKvsProcessManager; Q_OBJECT + TQ_OBJECT public: KviKvsProcessAsyncOperation(KviKvsProcessDescriptorData * d); ~KviKvsProcessAsyncOperation(); @@ -81,11 +82,11 @@ protected: private: KviProcess * m_pProcess; KviKvsExtendedRunTimeData * m_pExtendedRunTimeData; - QString m_szStdoutBuffer; - QString m_szStderrBuffer; + TQString m_szStdoutBuffer; + TQString m_szStderrBuffer; KviKvsProcessDescriptorData * m_pData; - QTimer * m_pPingTimer; - QTimer * m_pRunTimeTimer; + TQTimer * m_pPingTimer; + TQTimer * m_pRunTimeTimer; bool m_bDeletePending; public: bool start(); @@ -97,7 +98,7 @@ private slots: void processExited(); void selfDelete(); private: - bool trigger(CallbackEvent e,const QString &szData); + bool trigger(CallbackEvent e,const TQString &szData); void triggerSelfDelete(); }; diff --git a/src/kvirc/kvs/kvi_kvs_report.cpp b/src/kvirc/kvs/kvi_kvs_report.cpp index ea05ba3..9953591 100644 --- a/src/kvirc/kvs/kvi_kvs_report.cpp +++ b/src/kvirc/kvs/kvi_kvs_report.cpp @@ -33,7 +33,7 @@ #include "kvi_debugwindow.h" #include "kvi_options.h" -KviKvsReport::KviKvsReport(Type t,const QString &szContext,const QString &szMessage,const QString &szLocation,KviWindow * pWindow) +KviKvsReport::KviKvsReport(Type t,const TQString &szContext,const TQString &szMessage,const TQString &szLocation,KviWindow * pWindow) : m_eType(t), m_szContext(szContext), m_szMessage(szMessage), m_szLocation(szLocation), m_pWindow(pWindow) { #ifdef COMPILE_NEW_KVS @@ -50,17 +50,17 @@ KviKvsReport::~KviKvsReport() #endif } -void KviKvsReport::findLineAndCol(const QChar * pBegin,const QChar * pPoint,int &iLine,int &iCol) +void KviKvsReport::findLineAndCol(const TQChar * pBegin,const TQChar * pPoint,int &iLine,int &iCol) { #ifdef COMPILE_NEW_KVS iLine = 1; - const QChar * pBufferBegin = pBegin; + const TQChar * pBufferBegin = pBegin; - const QChar * pPrevLine = 0; - const QChar * pLineBegin = pBegin; + const TQChar * pPrevLine = 0; + const TQChar * pLineBegin = pBegin; - unsigned short us = pBegin->unicode(); + unsigned short us = pBegin->tqunicode(); while(us && (pBegin < pPoint)) { @@ -73,7 +73,7 @@ void KviKvsReport::findLineAndCol(const QChar * pBegin,const QChar * pPoint,int } else { pBegin++; } - us = pBegin->unicode(); + us = pBegin->tqunicode(); } iCol = (pBegin - pLineBegin) + 1; @@ -82,17 +82,17 @@ void KviKvsReport::findLineAndCol(const QChar * pBegin,const QChar * pPoint,int -void KviKvsReport::findLineColAndListing(const QChar * pBegin,const QChar * pPoint,int &iLine,int &iCol,KviPointerList<QString> * pListing) +void KviKvsReport::findLineColAndListing(const TQChar * pBegin,const TQChar * pPoint,int &iLine,int &iCol,KviPointerList<TQString> * pListing) { #ifdef COMPILE_NEW_KVS iLine = 1; - const QChar * pBufferBegin = pBegin; + const TQChar * pBufferBegin = pBegin; - const QChar * pPrevLine = 0; - const QChar * pLineBegin = pBegin; + const TQChar * pPrevLine = 0; + const TQChar * pLineBegin = pBegin; - unsigned short us = pBegin->unicode(); + unsigned short us = pBegin->tqunicode(); while(us && (pBegin < pPoint)) { @@ -105,7 +105,7 @@ void KviKvsReport::findLineColAndListing(const QChar * pBegin,const QChar * pPoi } else { pBegin++; } - us = pBegin->unicode(); + us = pBegin->tqunicode(); } iCol = (pBegin - pLineBegin) + 1; @@ -116,34 +116,34 @@ void KviKvsReport::findLineColAndListing(const QChar * pBegin,const QChar * pPoi // there would be yet another line before if(pPrevLine > pBufferBegin) { - QString * pListingStrZ = new QString(); - KviQString::sprintf(*pListingStrZ,"%d ...",iLine - 2); + TQString * pListingStrZ = new TQString(); + KviTQString::sprintf(*pListingStrZ,"%d ...",iLine - 2); pListing->append(pListingStrZ); } - QString * pListingStr = new QString(); - KviQString::sprintf(*pListingStr,"%d ",iLine - 1); - *pListingStr += QString(pPrevLine,pLineBegin - pPrevLine); - pListingStr->replace("\n",""); + TQString * pListingStr = new TQString(); + KviTQString::sprintf(*pListingStr,"%d ",iLine - 1); + *pListingStr += TQString(pPrevLine,pLineBegin - pPrevLine); + pListingStr->tqreplace("\n",""); pListing->append(pListingStr); } // current line pBegin = pLineBegin; - us = pBegin->unicode(); + us = pBegin->tqunicode(); while(us && (us != '\n')) { pBegin++; - us = pBegin->unicode(); + us = pBegin->tqunicode(); } if(us)pBegin++; { - QString * pListingStr = new QString(); - KviQString::sprintf(*pListingStr,"%c%d ",KVI_TEXT_BOLD,iLine); - *pListingStr += QString(pLineBegin,pBegin - pLineBegin); - pListingStr->replace("\n",""); + TQString * pListingStr = new TQString(); + KviTQString::sprintf(*pListingStr,"%c%d ",KVI_TEXT_BOLD,iLine); + *pListingStr += TQString(pLineBegin,pBegin - pLineBegin); + pListingStr->tqreplace("\n",""); pListing->append(pListingStr); } @@ -152,27 +152,27 @@ void KviKvsReport::findLineColAndListing(const QChar * pBegin,const QChar * pPoi // next line pLineBegin = pBegin; - us = pBegin->unicode(); + us = pBegin->tqunicode(); while(us && (us != '\n')) { pBegin++; - us = pBegin->unicode(); + us = pBegin->tqunicode(); } if(us)pBegin++; { - QString * pListingStr = new QString(); - KviQString::sprintf(*pListingStr,"%d ",iLine + 1); - *pListingStr += QString(pLineBegin,pBegin - pLineBegin); - pListingStr->replace("\n",""); + TQString * pListingStr = new TQString(); + KviTQString::sprintf(*pListingStr,"%d ",iLine + 1); + *pListingStr += TQString(pLineBegin,pBegin - pLineBegin); + pListingStr->tqreplace("\n",""); pListing->append(pListingStr); } // there would be yet another line if(us) { - QString * pListingStr = new QString(); - KviQString::sprintf(*pListingStr,"%d ...",iLine + 2); + TQString * pListingStr = new TQString(); + KviTQString::sprintf(*pListingStr,"%d ...",iLine + 2); pListing->append(pListingStr); } } @@ -227,11 +227,11 @@ void KviKvsReport::report(KviKvsReport * r,KviWindow * pOutput) if(pOutput == KviDebugWindow::instance()) { - KviPointerList<QString> * l; + KviPointerList<TQString> * l; if(l = r->codeListing()) { pOutput->outputNoFmt(out,__tr2qs("[KVS] Code listing:")); - for(QString * s = l->first();s;s = l->next()) + for(TQString * s = l->first();s;s = l->next()) pOutput->output(out,"[KVS] %Q",s); } @@ -244,7 +244,7 @@ void KviKvsReport::report(KviKvsReport * r,KviWindow * pOutput) if(l = r->callStack()) { pOutput->outputNoFmt(out,__tr2qs("[KVS] Call stack:")); - for(QString * s = l->first();s;s = l->next()) + for(TQString * s = l->first();s;s = l->next()) pOutput->output(out,"[KVS] %Q",s); } diff --git a/src/kvirc/kvs/kvi_kvs_report.h b/src/kvirc/kvs/kvi_kvs_report.h index 335733e..c0581cf 100644 --- a/src/kvirc/kvs/kvi_kvs_report.h +++ b/src/kvirc/kvs/kvi_kvs_report.h @@ -35,39 +35,39 @@ class KVIRC_API KviKvsReport public: enum Type { RunTimeError, RunTimeWarning, ParserError, ParserWarning }; public: - KviKvsReport(Type t,const QString &szContext,const QString &szMessage,const QString &szLocation,KviWindow * pWindow); + KviKvsReport(Type t,const TQString &szContext,const TQString &szMessage,const TQString &szLocation,KviWindow * pWindow); ~KviKvsReport(); protected: Type m_eType; // mandatory - QString m_szContext; // context name (script name, usually) - QString m_szMessage; // report message, always present - QString m_szLocation; // line and col description (may be some thing like "at end of input") + TQString m_szContext; // context name (script name, usually) + TQString m_szMessage; // report message, always present + TQString m_szLocation; // line and col description (may be some thing like "at end of input") KviWindow * m_pWindow; // the window that the script was attacched to // optional - KviPointerList<QString> * m_pCodeListing; // code listing, if present, it is owned - KviPointerList<QString> * m_pCallStack; // call stack, if present, it is owned + KviPointerList<TQString> * m_pCodeListing; // code listing, if present, it is owned + KviPointerList<TQString> * m_pCallStack; // call stack, if present, it is owned public: Type type() const { return m_eType; }; KviWindow * window(){ return m_pWindow; }; - const QString & context(){ return m_szContext; }; - const QString & message(){ return m_szMessage; }; - const QString & location(){ return m_szLocation; }; - KviPointerList<QString> * codeListing(){ return m_pCodeListing; }; - KviPointerList<QString> * callStack(){ return m_pCallStack; }; + const TQString & context(){ return m_szContext; }; + const TQString & message(){ return m_szMessage; }; + const TQString & location(){ return m_szLocation; }; + KviPointerList<TQString> * codeListing(){ return m_pCodeListing; }; + KviPointerList<TQString> * callStack(){ return m_pCallStack; }; - void setContext(const QString &szContext){ m_szContext = szContext; }; - void setMessage(const QString &szMessage){ m_szMessage = szMessage; }; - void setLocation(const QString &szLocation){ m_szLocation = szLocation; }; - void setCodeListing(KviPointerList<QString> * pListing){ m_pCodeListing = pListing; }; - void setCallStack(KviPointerList<QString> * pStack){ m_pCallStack = pStack; }; + void setContext(const TQString &szContext){ m_szContext = szContext; }; + void setMessage(const TQString &szMessage){ m_szMessage = szMessage; }; + void setLocation(const TQString &szLocation){ m_szLocation = szLocation; }; + void setCodeListing(KviPointerList<TQString> * pListing){ m_pCodeListing = pListing; }; + void setCallStack(KviPointerList<TQString> * pStack){ m_pCallStack = pStack; }; - static void findLineAndCol(const QChar * pBegin,const QChar * pPoint,int &iLine,int &iCol); - static void findLineColAndListing(const QChar * pBegin,const QChar * pPoint,int &iLine,int &iCol,KviPointerList<QString> * pListing); + static void findLineAndCol(const TQChar * pBegin,const TQChar * pPoint,int &iLine,int &iCol); + static void findLineColAndListing(const TQChar * pBegin,const TQChar * pPoint,int &iLine,int &iCol,KviPointerList<TQString> * pListing); static void report(KviKvsReport * r,KviWindow * pOutput); }; diff --git a/src/kvirc/kvs/kvi_kvs_runtimecall.cpp b/src/kvirc/kvs/kvi_kvs_runtimecall.cpp index faae03a..91cadc4 100644 --- a/src/kvirc/kvs/kvi_kvs_runtimecall.cpp +++ b/src/kvirc/kvs/kvi_kvs_runtimecall.cpp @@ -27,7 +27,7 @@ #include "kvi_kvs_runtimecall.h" -void KviKvsRunTimeCall::warning(const QString &szFmt,...) +void KviKvsRunTimeCall::warning(const TQString &szFmt,...) { kvi_va_list va; kvi_va_start_by_reference(va,szFmt); @@ -35,7 +35,7 @@ void KviKvsRunTimeCall::warning(const QString &szFmt,...) kvi_va_end(va); } -bool KviKvsRunTimeCall::error(const QString &szFmt,...) +bool KviKvsRunTimeCall::error(const TQString &szFmt,...) { kvi_va_list va; kvi_va_start_by_reference(va,szFmt); @@ -44,7 +44,7 @@ bool KviKvsRunTimeCall::error(const QString &szFmt,...) return false; } -bool KviKvsRunTimeCall::getParameterCode(unsigned int /*uParamIdx*/,QString & /*szParamBuffer*/) +bool KviKvsRunTimeCall::getParameterCode(unsigned int /*uParamIdx*/,TQString & /*szParamBuffer*/) { return false; } diff --git a/src/kvirc/kvs/kvi_kvs_runtimecall.h b/src/kvirc/kvs/kvi_kvs_runtimecall.h index 3ead6c3..674c4e3 100644 --- a/src/kvirc/kvs/kvi_kvs_runtimecall.h +++ b/src/kvirc/kvs/kvi_kvs_runtimecall.h @@ -61,7 +61,7 @@ public: // where a special parsing routine can not be implemented // but parameter code is needed for later evaluation. (see /addon.register for example) // Returns false if the parameter code cannot be extracted and true otherwise. - virtual bool getParameterCode(unsigned int uParamIdx,QString &szParamBuffer); + virtual bool getParameterCode(unsigned int uParamIdx,TQString &szParamBuffer); // forwarders from the context // this MUST be called before any blocking call that might return to the main event loop @@ -75,8 +75,8 @@ public: bool leaveBlockingSection(){ return m_pContext->leaveBlockingSection(); }; // forwarders for context: they ease the porting - void warning(const QString &szFmt,...); - bool error(const QString &szFmt,...); // this ALWAYS returns false + void warning(const TQString &szFmt,...); + bool error(const TQString &szFmt,...); // this ALWAYS returns false }; #endif //!_KVI_KVS_RUNTIMECALL_H_ diff --git a/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp b/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp index 47916f9..5442aa2 100644 --- a/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp +++ b/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp @@ -87,58 +87,58 @@ KviKvsVariant * KviKvsRunTimeContext::swapReturnValuePointer(KviKvsVariant * pNe return pAux; } -void KviKvsRunTimeContext::report(bool bError,KviKvsTreeNode * pNode,const QString &szMsgFmt,kvi_va_list va) +void KviKvsRunTimeContext::report(bool bError,KviKvsTreeNode * pNode,const TQString &szMsgFmt,kvi_va_list va) { - QString szMsg; - KviQString::vsprintf(szMsg,szMsgFmt,va); + TQString szMsg; + KviTQString::vsprintf(szMsg,szMsgFmt,va); - KviPointerList<QString> * pCodeListing = 0; - KviPointerList<QString> * pCallStack = 0; - QString szLocation; + KviPointerList<TQString> * pCodeListing = 0; + KviPointerList<TQString> * pCallStack = 0; + TQString szLocation; if(pNode) { if(pNode->location() && m_pScript) { - pCodeListing = new KviPointerList<QString>; + pCodeListing = new KviPointerList<TQString>; pCodeListing->setAutoDelete(true); int iLine,iCol; KviKvsReport::findLineColAndListing(m_pScript->buffer(),pNode->location(),iLine,iCol,pCodeListing); - KviQString::sprintf(szLocation,__tr2qs("line %d, near character %d"),iLine,iCol); + KviTQString::sprintf(szLocation,__tr2qs("line %d, near character %d"),iLine,iCol); } // create the call stack int iFrame = 0; - pCallStack = new KviPointerList<QString>; + pCallStack = new KviPointerList<TQString>; pCallStack->setAutoDelete(true); while(pNode && (iFrame < 12)) { - QString * pString = new QString(); - QString szTmp; + TQString * pString = new TQString(); + TQString szTmp; pNode->contextDescription(szTmp); - KviQString::sprintf(*pString,"#%d %Q",iFrame,&szTmp); + KviTQString::sprintf(*pString,"#%d %Q",iFrame,&szTmp); if(pNode->location()) { int iLine,iCol; KviKvsReport::findLineAndCol(m_pScript->buffer(),pNode->location(),iLine,iCol); - QString tmpi; - KviQString::sprintf(tmpi," [line %d, near character %d]",iLine,iCol); + TQString tmpi; + KviTQString::sprintf(tmpi," [line %d, near character %d]",iLine,iCol); *pString += tmpi; } pCallStack->append(pString); iFrame++; - pNode = pNode->parent(); + pNode = pNode->tqparent(); } if(pNode) - pCallStack->append(new QString("#12 ...")); + pCallStack->append(new TQString("#12 ...")); } - QString szContext = m_pScript ? m_pScript->name() : "kvirc core code"; + TQString szContext = m_pScript ? m_pScript->name() : "kvirc core code"; KviKvsReport rep(bError ? KviKvsReport::RunTimeError : KviKvsReport::RunTimeWarning,szContext,szMsg,szLocation,m_pWindow); if(pCodeListing)rep.setCodeListing(pCodeListing); if(pCallStack)rep.setCallStack(pCallStack); @@ -146,7 +146,7 @@ void KviKvsRunTimeContext::report(bool bError,KviKvsTreeNode * pNode,const QStri KviKvsReport::report(&rep,m_pWindow); } -void KviKvsRunTimeContext::error(KviKvsTreeNode * pNode,const QString &szMsgFmt,...) +void KviKvsRunTimeContext::error(KviKvsTreeNode * pNode,const TQString &szMsgFmt,...) { m_bError = true; @@ -156,7 +156,7 @@ void KviKvsRunTimeContext::error(KviKvsTreeNode * pNode,const QString &szMsgFmt, kvi_va_end(va); } -void KviKvsRunTimeContext::warning(KviKvsTreeNode * pNode,const QString &szMsgFmt,...) +void KviKvsRunTimeContext::warning(KviKvsTreeNode * pNode,const TQString &szMsgFmt,...) { kvi_va_list va; kvi_va_start_by_reference(va,szMsgFmt); @@ -164,7 +164,7 @@ void KviKvsRunTimeContext::warning(KviKvsTreeNode * pNode,const QString &szMsgFm kvi_va_end(va); } -void KviKvsRunTimeContext::error(const QString &szMsgFmt,...) +void KviKvsRunTimeContext::error(const TQString &szMsgFmt,...) { m_bError = true; @@ -174,7 +174,7 @@ void KviKvsRunTimeContext::error(const QString &szMsgFmt,...) kvi_va_end(va); } -void KviKvsRunTimeContext::warning(const QString &szMsgFmt,...) +void KviKvsRunTimeContext::warning(const TQString &szMsgFmt,...) { kvi_va_list va; kvi_va_start_by_reference(va,szMsgFmt); diff --git a/src/kvirc/kvs/kvi_kvs_runtimecontext.h b/src/kvirc/kvs/kvi_kvs_runtimecontext.h index 68fa8eb..50ee147 100644 --- a/src/kvirc/kvs/kvi_kvs_runtimecontext.h +++ b/src/kvirc/kvs/kvi_kvs_runtimecontext.h @@ -48,7 +48,7 @@ protected: KviKvsHash * m_pExtendedScopeVariables; // extended scope vars, shallow, may be 0 KviKvsSwitchList * m_pAliasSwitchList; // switches for the aliases, shallow, may be 0 KviKvsObject * m_pThisObject; // the current object for object function calls - QString * m_pScriptFilePath; // the current script file path, shallow, may be 0 + TQString * m_pScriptFilePath; // the current script file path, shallow, may be 0 bool m_bAutoDelete; public: // all shallow data, all may be 0 @@ -80,7 +80,7 @@ public: m_pScriptFilePath(0), m_bAutoDelete(autoDelete) {}; - KviKvsExtendedRunTimeData(QString * pScriptFilePath,bool autoDelete=FALSE) + KviKvsExtendedRunTimeData(TQString * pScriptFilePath,bool autoDelete=FALSE) : m_pExtendedScopeVariables(0), m_pAliasSwitchList(0), m_pThisObject(0), @@ -92,7 +92,7 @@ public: KviKvsHash * extendedScopeVariables(){ return m_pExtendedScopeVariables; }; KviKvsSwitchList * aliasSwitchList(){ return m_pAliasSwitchList; }; KviKvsObject * thisObject(){ return m_pThisObject; }; - QString * scriptFilePath(){ return m_pScriptFilePath; }; + TQString * scriptFilePath(){ return m_pScriptFilePath; }; }; @@ -153,7 +153,7 @@ public: KviKvsVariantList * parameterList() { return m_pParameterList; }; - // parent script, may be 0! + // tqparent script, may be 0! KviKvsScript * script() { return m_pScript; }; @@ -172,7 +172,7 @@ public: { return m_pExtendedData ? m_pExtendedData->aliasSwitchList() : 0; }; KviKvsObject * thisObject() { return m_pExtendedData ? m_pExtendedData->thisObject() : 0; }; - QString * scriptFilePath() + TQString * scriptFilePath() { return m_pExtendedData ? m_pExtendedData->scriptFilePath() : 0; }; // this MUST be called before any blocking call that might return to the main event loop @@ -190,10 +190,10 @@ public: // was error(...) ever called ? bool error() const { return m_bError; }; - void error(KviKvsTreeNode * pNode,const QString &szMsgFmt,...); - void warning(KviKvsTreeNode * pNode,const QString &szMsgFmt,...); - void error(const QString &szMsgFmt,...); - void warning(const QString &szMsgFmt,...); + void error(KviKvsTreeNode * pNode,const TQString &szMsgFmt,...); + void warning(KviKvsTreeNode * pNode,const TQString &szMsgFmt,...); + void error(const TQString &szMsgFmt,...); + void warning(const TQString &szMsgFmt,...); void setDefaultReportLocation(KviKvsTreeNode * pNode); bool errorNoIrcContext(); bool warningNoIrcConnection(); @@ -249,7 +249,7 @@ public: { m_bError = false; }; protected: - void report(bool bError,KviKvsTreeNode * pNode,const QString &szMsgFmt,kvi_va_list va); + void report(bool bError,KviKvsTreeNode * pNode,const TQString &szMsgFmt,kvi_va_list va); }; diff --git a/src/kvirc/kvs/kvi_kvs_rwevaluationresult.cpp b/src/kvirc/kvs/kvi_kvs_rwevaluationresult.cpp index d51588f..e40e461 100644 --- a/src/kvirc/kvs/kvi_kvs_rwevaluationresult.cpp +++ b/src/kvirc/kvs/kvi_kvs_rwevaluationresult.cpp @@ -51,7 +51,7 @@ KviKvsArrayElement::~KviKvsArrayElement() if(m_pParent)delete m_pParent; } -KviKvsHashElement::KviKvsHashElement(KviKvsRWEvaluationResult *pParent,KviKvsVariant *pVariant,KviKvsHash *pHash,const QString &szKey) +KviKvsHashElement::KviKvsHashElement(KviKvsRWEvaluationResult *pParent,KviKvsVariant *pVariant,KviKvsHash *pHash,const TQString &szKey) : KviKvsRWEvaluationResult(pParent,pVariant) { m_pHash = pHash; diff --git a/src/kvirc/kvs/kvi_kvs_rwevaluationresult.h b/src/kvirc/kvs/kvi_kvs_rwevaluationresult.h index 9d91a1b..8eabc15 100644 --- a/src/kvirc/kvs/kvi_kvs_rwevaluationresult.h +++ b/src/kvirc/kvs/kvi_kvs_rwevaluationresult.h @@ -30,7 +30,7 @@ class KVIRC_API KviKvsRWEvaluationResult { public: - // this result becomes the owner of the parent result!!!! + // this result becomes the owner of the tqparent result!!!! KviKvsRWEvaluationResult(KviKvsRWEvaluationResult *pParent,KviKvsVariant *pVariant); // the destructor must do (in order): // check if variant is empty and if it is then remove it from the container (destroy it) @@ -60,11 +60,11 @@ class KviKvsHash; class KVIRC_API KviKvsHashElement : public KviKvsRWEvaluationResult { public: - KviKvsHashElement(KviKvsRWEvaluationResult *pParent,KviKvsVariant *pVariant,KviKvsHash *pHash,const QString &szKey); + KviKvsHashElement(KviKvsRWEvaluationResult *pParent,KviKvsVariant *pVariant,KviKvsHash *pHash,const TQString &szKey); ~KviKvsHashElement(); protected: KviKvsHash * m_pHash; - QString m_szKey; + TQString m_szKey; }; #endif //!_KVI_KVS_RWEVALUATIONRESULT_H_ diff --git a/src/kvirc/kvs/kvi_kvs_script.cpp b/src/kvirc/kvs/kvi_kvs_script.cpp index e7a2bd6..c9c4f4f 100644 --- a/src/kvirc/kvs/kvi_kvs_script.cpp +++ b/src/kvirc/kvs/kvi_kvs_script.cpp @@ -44,9 +44,9 @@ class KVIRC_API KviKvsScriptData protected: unsigned int m_uRefs; // Reference count for this structure - QString m_szName; // script context name - QString m_szBuffer; // NEVER TOUCH THIS - const QChar * m_pBuffer; // this points to m_szBuffer: use it to extract string data + TQString m_szName; // script context name + TQString m_szBuffer; // NEVER TOUCH THIS + const TQChar * m_pBuffer; // this points to m_szBuffer: use it to extract string data KviKvsScript::ScriptType m_eType; // the type of the code in m_szBuffer @@ -56,7 +56,7 @@ protected: //#warning "THERE IS SOME MESS WITH m_szBuffer and m_pBuffer : with some script copying we may get errors with negative char indexes!" -KviKvsScript::KviKvsScript(const QString &szName,const QString &szBuffer,ScriptType eType) +KviKvsScript::KviKvsScript(const TQString &szName,const TQString &szBuffer,ScriptType eType) { m_pData = new KviKvsScriptData; m_pData->m_uRefs = 1; @@ -64,13 +64,13 @@ KviKvsScript::KviKvsScript(const QString &szName,const QString &szBuffer,ScriptT m_pData->m_eType = eType; m_pData->m_szBuffer = szBuffer; if(m_pData->m_szBuffer.isNull())m_pData->m_szBuffer = ""; - //KviQString::detach(*(m_pData->m_pszBuffer)); - m_pData->m_pBuffer = KviQString::nullTerminatedArray(m_pData->m_szBuffer); // never 0 + //KviTQString::detach(*(m_pData->m_pszBuffer)); + m_pData->m_pBuffer = KviTQString::nullTerminatedArray(m_pData->m_szBuffer); // never 0 m_pData->m_uLock = 0; m_pData->m_pTree = 0; } -KviKvsScript::KviKvsScript(const QString &szName,const QString &szBuffer,KviKvsTreeNodeInstruction * pPreparsedTree,ScriptType eType) +KviKvsScript::KviKvsScript(const TQString &szName,const TQString &szBuffer,KviKvsTreeNodeInstruction * pPreparsedTree,ScriptType eType) { m_pData = new KviKvsScriptData; m_pData->m_uRefs = 1; @@ -78,8 +78,8 @@ KviKvsScript::KviKvsScript(const QString &szName,const QString &szBuffer,KviKvsT m_pData->m_szBuffer = szBuffer; m_pData->m_eType = eType; if(m_pData->m_szBuffer.isNull())m_pData->m_szBuffer = ""; - //KviQString::detach(*(m_pData->m_pszBuffer)); - m_pData->m_pBuffer = KviQString::nullTerminatedArray(m_pData->m_szBuffer); // never 0 + //KviTQString::detach(*(m_pData->m_pszBuffer)); + m_pData->m_pBuffer = KviTQString::nullTerminatedArray(m_pData->m_szBuffer); // never 0 m_pData->m_uLock = 0; m_pData->m_pTree = pPreparsedTree; } @@ -102,18 +102,18 @@ KviKvsScript::~KviKvsScript() } } -void KviKvsScript::setName(const QString &szName) +void KviKvsScript::setName(const TQString &szName) { if(m_pData->m_uRefs > 1)detach(); m_pData->m_szName = szName; } -const QString & KviKvsScript::name() const +const TQString & KviKvsScript::name() const { return m_pData->m_szName; } -const QString & KviKvsScript::code() const +const TQString & KviKvsScript::code() const { return m_pData->m_szBuffer; } @@ -138,33 +138,33 @@ void KviKvsScript::detach() d->m_eType = m_pData->m_eType; d->m_szBuffer = m_pData->m_szBuffer; if(d->m_szBuffer.isNull())d->m_szBuffer = ""; - KviQString::detach(d->m_szBuffer); - d->m_pBuffer = KviQString::nullTerminatedArray(d->m_szBuffer); // never 0 + KviTQString::detach(d->m_szBuffer); + d->m_pBuffer = KviTQString::nullTerminatedArray(d->m_szBuffer); // never 0 d->m_uLock = 0; d->m_pTree = 0; m_pData = d; } -const QChar * KviKvsScript::buffer() const +const TQChar * KviKvsScript::buffer() const { return m_pData->m_pBuffer; } -int KviKvsScript::run(const QString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams,KviKvsVariant * pRetVal) +int KviKvsScript::run(const TQString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams,KviKvsVariant * pRetVal) { // static helper KviKvsScript s("kvirc::corecall(run)",szCode); return s.run(pWindow,pParams,pRetVal,PreserveParams); } -int KviKvsScript::evaluate(const QString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams,KviKvsVariant * pRetVal) +int KviKvsScript::evaluate(const TQString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams,KviKvsVariant * pRetVal) { // static helper KviKvsScript s("kvirc::corecall(evalutate)",szCode,Parameter); return s.run(pWindow,pParams,pRetVal,PreserveParams); } -int KviKvsScript::evaluateAsString(const QString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams,QString &szRetVal) +int KviKvsScript::evaluateAsString(const TQString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams,TQString &szRetVal) { // static helper KviKvsVariant ret; @@ -174,7 +174,7 @@ int KviKvsScript::evaluateAsString(const QString &szCode,KviWindow * pWindow,Kvi return iRet; } -int KviKvsScript::run(KviWindow * pWnd,KviKvsVariantList * pParams,QString &szRetVal,int iRunFlags,KviKvsExtendedRunTimeData * pExtData) +int KviKvsScript::run(KviWindow * pWnd,KviKvsVariantList * pParams,TQString &szRetVal,int iRunFlags,KviKvsExtendedRunTimeData * pExtData) { KviKvsVariant retVal; int iRet = run(pWnd,pParams,&retVal,iRunFlags,pExtData); @@ -293,22 +293,22 @@ int KviKvsScript::executeInternal(KviKvsRunTimeContext * pContext) // lock this script m_pData->m_uLock++; - int iRunStatus = Success; + int iRuntqStatus = Success; if(!m_pData->m_pTree->execute(pContext)) { - if(pContext->error())iRunStatus = Error; + if(pContext->error())iRuntqStatus = Error; else { // else just a halt, return or sth like that if(pContext->haltCalled()) - iRunStatus |= HaltEncountered; + iRuntqStatus |= HaltEncountered; } } // we can't block any longer: unlock m_pData->m_uLock--; - return iRunStatus; + return iRuntqStatus; } int KviKvsScript::execute(KviWindow * pWnd,KviKvsVariantList * pParams,KviKvsVariant * pRetVal,int iRunFlags,KviKvsExtendedRunTimeData * pExtData) @@ -343,13 +343,13 @@ int KviKvsScript::execute(KviWindow * pWnd,KviKvsVariantList * pParams,KviKvsVar if(iRunFlags & Quiet) ctx.disableReporting(); - int iRunStatus = executeInternal(&ctx); + int iRuntqStatus = executeInternal(&ctx); // don't forget to delete the params if(bDeleteParams)delete pParams; if(bDeleteRetVal)delete pRetVal; pParams = 0; pRetVal = 0; - return iRunStatus; + return iRuntqStatus; } diff --git a/src/kvirc/kvs/kvi_kvs_script.h b/src/kvirc/kvs/kvi_kvs_script.h index b924387..2bfd6b8 100644 --- a/src/kvirc/kvs/kvi_kvs_script.h +++ b/src/kvirc/kvs/kvi_kvs_script.h @@ -52,7 +52,7 @@ class KVIRC_API KviKvsScript : public KviHeapObject friend class KviKvsParser; friend class KviKvsRunTimeContext; public: - enum RunStatus { + enum RuntqStatus { // the script returned an error Error = 0, // the script ran succesfully @@ -70,21 +70,21 @@ public: }; protected: // the name parameter is the name of the script context! - KviKvsScript(const QString &szName,const QString &szBuffer,KviKvsTreeNodeInstruction * pPreparsedTree,ScriptType eType = InstructionList); + KviKvsScript(const TQString &szName,const TQString &szBuffer,KviKvsTreeNodeInstruction * pPreparsedTree,ScriptType eType = InstructionList); public: // shallow copy of the script data // useful when a script can be destroyed while running (like in timers) KviKvsScript(const KviKvsScript &src); - KviKvsScript(const QString &szName,const QString &szBuffer,ScriptType eType=InstructionList); + KviKvsScript(const TQString &szName,const TQString &szBuffer,ScriptType eType=InstructionList); ~KviKvsScript(); private: KviKvsScriptData * m_pData; public: - const QString & name() const; - const QString & code() const; + const TQString & name() const; + const TQString & code() const; bool locked() const; - void setName(const QString &szName); + void setName(const TQString &szName); enum RunFlags { // do not delete the eventual parameters passed (only execute() and run()) @@ -97,7 +97,7 @@ public: Quiet = 8 }; // returns 0 (KviKvsScript::RunFailure) on error - // returns a nonzero combination of RunStatus flags on success + // returns a nonzero combination of RuntqStatus flags on success int run(KviWindow * pWnd, // window that the command has to be bound to KviKvsVariantList * pParams = 0, // parameter list (0 if you don't pass params) ownership transferred if PreserverParams is not used KviKvsVariant * pRetVal = 0, // return value buffer (0 if you ignore it) @@ -105,29 +105,29 @@ public: KviKvsExtendedRunTimeData * pExtData = 0); // extended data (usually 0) (if you need to pass extended scope variables or alias switch lists...) // returns 0 (KviKvsScript::RunFailure) on error - // returns a nonzero combination of RunStatus flags on success + // returns a nonzero combination of RuntqStatus flags on success // this is probably used only in /eval int run(KviKvsRunTimeContext * pContext,int iRunFlags = 0); - // same as run above, but gets a QString parameter as return buffer + // same as run above, but gets a TQString parameter as return buffer // this is probably useful only for evaluating InstructionList scripts int run(KviWindow * pWnd, KviKvsVariantList * pParams, - QString &szRetVal, + TQString &szRetVal, int iRunFlags = 0, KviKvsExtendedRunTimeData * pExtData = 0); // static helpers for quick running - // returns a combination of RunStatus flags (nonzero on no error) + // returns a combination of RuntqStatus flags (nonzero on no error) // does NOT take params ownership - static int run(const QString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams = 0,KviKvsVariant * pRetVal = 0); + static int run(const TQString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams = 0,KviKvsVariant * pRetVal = 0); // static helper for quick evaluating parameters - // returns a combination of RunStatus flags (nonzero on no error) + // returns a combination of RuntqStatus flags (nonzero on no error) // does NOT take params ownership // pRetVal CAN'T be zero here since we're evaluating stuff here - static int evaluate(const QString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams,KviKvsVariant * pRetVal); - static int evaluateAsString(const QString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams,QString &szRetVal); + static int evaluate(const TQString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams,KviKvsVariant * pRetVal); + static int evaluateAsString(const TQString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams,TQString &szRetVal); public: void dump(const char * prefix); protected: @@ -137,16 +137,16 @@ protected: bool parse(KviWindow * pOutput = 0, int iRunFlags = 0); // returns 0 (KviKvsScript::RunFailure) on error - // returns a nonzero combination of RunStatus flags on success + // returns a nonzero combination of RuntqStatus flags on success int execute(KviWindow * pWnd, KviKvsVariantList * pParams = 0, KviKvsVariant * pRetVal = 0, int iRunFlags = 0, KviKvsExtendedRunTimeData * pExtData = 0); // returns 0 (KviKvsScript::RunFailure) on error - // returns a nonzero combination of RunStatus flags on success + // returns a nonzero combination of RuntqStatus flags on success int executeInternal(KviKvsRunTimeContext * pContext); - const QChar * buffer() const; + const TQChar * buffer() const; // detaches this script from any other shallow copies void detach(); }; diff --git a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp index aee138d..23f6ade 100644 --- a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp @@ -36,12 +36,12 @@ KviKvsScriptAddonManager * KviKvsScriptAddonManager::m_pInstance = 0; KviKvsScriptAddon::KviKvsScriptAddon( - const QString &szName, - const QString &szVersion, - const QString &szVisibleNameCode, - const QString &szDescriptionCode, - const QString &szUninstallCallbackCode, - const QString &szIconId + const TQString &szName, + const TQString &szVersion, + const TQString &szVisibleNameCode, + const TQString &szDescriptionCode, + const TQString &szUninstallCallbackCode, + const TQString &szIconId ) : KviHeapObject(), m_szName(szName), m_szVersion(szVersion), m_szIconId(szIconId) { allocateScripts(szVisibleNameCode,szDescriptionCode,szUninstallCallbackCode); @@ -55,11 +55,11 @@ KviKvsScriptAddon::KviKvsScriptAddon(const KviKvsScriptAddon &a) m_szName = a.m_szName; m_szVersion = a.m_szVersion; m_szIconId = a.m_szIconId; - allocateScripts(a.m_pVisibleNameScript->code(),a.m_pDescriptionScript->code(),a.m_pUninstallCallback ? a.m_pUninstallCallback->code() : QString::null); + allocateScripts(a.m_pVisibleNameScript->code(),a.m_pDescriptionScript->code(),a.m_pUninstallCallback ? a.m_pUninstallCallback->code() : TQString()); m_pConfigureCallback = 0; - setConfigureCallback(a.m_pConfigureCallback ? a.m_pConfigureCallback->code() : QString::null); + setConfigureCallback(a.m_pConfigureCallback ? a.m_pConfigureCallback->code() : TQString()); m_pHelpCallback = 0; - setHelpCallback(a.m_pHelpCallback ? a.m_pHelpCallback->code() : QString::null); + setHelpCallback(a.m_pHelpCallback ? a.m_pHelpCallback->code() : TQString()); } KviKvsScriptAddon::KviKvsScriptAddon() @@ -81,75 +81,75 @@ KviKvsScriptAddon::~KviKvsScriptAddon() if(m_pHelpCallback)delete m_pHelpCallback; } -QPixmap * KviKvsScriptAddon::icon() +TQPixmap * KviKvsScriptAddon::icon() { - return g_pIconManager->getBigIcon(m_szIconId.isEmpty() ? QString(KVI_BIGICON_KVS) : m_szIconId); + return g_pIconManager->getBigIcon(m_szIconId.isEmpty() ? TQString(KVI_BIGICON_KVS) : m_szIconId); } -const QString & KviKvsScriptAddon::visibleName() +const TQString & KviKvsScriptAddon::visibleName() { if(!m_pVisibleNameScript)return m_szVisibleName; if(!m_pVisibleNameScript->run(g_pActiveWindow,0,m_szVisibleName))m_szVisibleName = m_pVisibleNameScript->code(); return m_szVisibleName; } -const QString & KviKvsScriptAddon::description() +const TQString & KviKvsScriptAddon::description() { if(!m_pDescriptionScript)return m_szDescription; if(!m_pDescriptionScript->run(g_pActiveWindow,0,m_szDescription))m_szDescription = m_pDescriptionScript->code(); return m_szDescription; } -const QString & KviKvsScriptAddon::visibleNameCode() +const TQString & KviKvsScriptAddon::visibleNameCode() { return m_pVisibleNameScript->code(); } -const QString & KviKvsScriptAddon::descriptionCode() +const TQString & KviKvsScriptAddon::descriptionCode() { return m_pDescriptionScript->code(); } -const QString & KviKvsScriptAddon::uninstallCallbackCode() +const TQString & KviKvsScriptAddon::uninstallCallbackCode() { return m_pUninstallCallback->code(); } -const QString & KviKvsScriptAddon::configureCallbackCode() +const TQString & KviKvsScriptAddon::configureCallbackCode() { if(m_pConfigureCallback)return m_pConfigureCallback->code(); - return KviQString::empty; + return KviTQString::empty; } -const QString & KviKvsScriptAddon::helpCallbackCode() +const TQString & KviKvsScriptAddon::helpCallbackCode() { if(m_pHelpCallback)return m_pHelpCallback->code(); - return KviQString::empty; + return KviTQString::empty; } -bool KviKvsScriptAddon::load(KviConfig * cfg,const QString &szName) +bool KviKvsScriptAddon::load(KviConfig * cfg,const TQString &szName) { m_szName = szName; cfg->setGroup(m_szName); - m_szVersion = cfg->readQStringEntry("Version"); - m_szIconId = cfg->readQStringEntry("IconId"); + m_szVersion = cfg->readTQStringEntry("Version"); + m_szIconId = cfg->readTQStringEntry("IconId"); if(m_szVersion.isEmpty())return false; - QString tmp1,tmp2,tmp3; - tmp1 = cfg->readQStringEntry("VisibleNameCode"); - tmp2 = cfg->readQStringEntry("DescriptionCode"); - tmp3 = cfg->readQStringEntry("UninstallCallback"); + TQString tmp1,tmp2,tmp3; + tmp1 = cfg->readTQStringEntry("VisibleNameCode"); + tmp2 = cfg->readTQStringEntry("DescriptionCode"); + tmp3 = cfg->readTQStringEntry("UninstallCallback"); if(tmp1.isEmpty())return false; allocateScripts(tmp1,tmp2,tmp3); - tmp1 = cfg->readQStringEntry("ConfigureCallback"); + tmp1 = cfg->readTQStringEntry("ConfigureCallback"); if(!tmp1.isEmpty()) setConfigureCallback(tmp1); - tmp1 = cfg->readQStringEntry("HelpCallback"); + tmp1 = cfg->readTQStringEntry("HelpCallback"); if(!tmp1.isEmpty()) setHelpCallback(tmp1); return true; } -void KviKvsScriptAddon::setConfigureCallback(const QString &szConfigureCallbackCode) +void KviKvsScriptAddon::setConfigureCallback(const TQString &szConfigureCallbackCode) { if(m_pConfigureCallback)delete m_pConfigureCallback; if(szConfigureCallbackCode.isEmpty()) @@ -158,17 +158,17 @@ void KviKvsScriptAddon::setConfigureCallback(const QString &szConfigureCallbackC return; } - QString szKvsName = "addon::"; + TQString szKvsName = "addon::"; szKvsName += m_szName; - QString szTmp; + TQString szTmp; szTmp = szKvsName; szTmp += "::configure"; m_pConfigureCallback = new KviKvsScript(szTmp,szConfigureCallbackCode,KviKvsScript::InstructionList); } -void KviKvsScriptAddon::setHelpCallback(const QString &szHelpCallbackCode) +void KviKvsScriptAddon::setHelpCallback(const TQString &szHelpCallbackCode) { if(m_pHelpCallback)delete m_pHelpCallback; if(szHelpCallbackCode.isEmpty()) @@ -177,22 +177,22 @@ void KviKvsScriptAddon::setHelpCallback(const QString &szHelpCallbackCode) return; } - QString szKvsName = "addon::"; + TQString szKvsName = "addon::"; szKvsName += m_szName; - QString szTmp; + TQString szTmp; szTmp = szKvsName; szTmp += "::help"; m_pHelpCallback = new KviKvsScript(szTmp,szHelpCallbackCode,KviKvsScript::InstructionList); } -void KviKvsScriptAddon::allocateScripts(const QString &szVisibleNameCode,const QString &szDescriptionCode,const QString &szUninstallCallbackCode) +void KviKvsScriptAddon::allocateScripts(const TQString &szVisibleNameCode,const TQString &szDescriptionCode,const TQString &szUninstallCallbackCode) { - QString szKvsName = "addon::"; + TQString szKvsName = "addon::"; szKvsName += m_szName; - QString szTmp; + TQString szTmp; szTmp = szKvsName; szTmp += "::name"; @@ -243,7 +243,7 @@ KviKvsScriptAddonManager::KviKvsScriptAddonManager() { m_pInstance = this; m_bLoaded = false; - m_pAddonDict = new KviPointerHashTable<QString,KviKvsScriptAddon>(17,false); + m_pAddonDict = new KviPointerHashTable<TQString,KviKvsScriptAddon>(17,false); m_pAddonDict->setAutoDelete(true); } @@ -272,7 +272,7 @@ void KviKvsScriptAddonManager::done() delete KviKvsScriptAddonManager::instance(); } -void KviKvsScriptAddonManager::load(const QString &szFileName) +void KviKvsScriptAddonManager::load(const TQString &szFileName) { // in fact we implement delayed loading // so this function only stores the filename @@ -284,7 +284,7 @@ void KviKvsScriptAddonManager::load(const QString &szFileName) m_bLoaded = false; } -void KviKvsScriptAddonManager::save(const QString &szFileName) +void KviKvsScriptAddonManager::save(const TQString &szFileName) { if(!m_bLoaded)return; // nothing to store anyway // we're stored here from now on... @@ -294,7 +294,7 @@ void KviKvsScriptAddonManager::save(const QString &szFileName) cfg.clear(); - KviPointerHashTableIterator<QString,KviKvsScriptAddon> it(*m_pAddonDict); + KviPointerHashTableIterator<TQString,KviKvsScriptAddon> it(*m_pAddonDict); while(KviKvsScriptAddon * a = it.current()) { @@ -315,23 +315,23 @@ void KviKvsScriptAddonManager::delayedLoad() KviConfig cfg(m_szFileName,KviConfig::Read); - KviPointerHashTable<QString,KviConfigGroup> * d = cfg.dict(); + KviPointerHashTable<TQString,KviConfigGroup> * d = cfg.dict(); if(!d)return; - KviPointerHashTableIterator<QString,KviConfigGroup> it(*d); + KviPointerHashTableIterator<TQString,KviConfigGroup> it(*d); while(it.current()) { - QString szName = it.currentKey(); + TQString szName = it.currentKey(); KviKvsScriptAddon * a = new KviKvsScriptAddon(); if(a->load(&cfg,szName)) - m_pAddonDict->replace(szName,a); + m_pAddonDict->tqreplace(szName,a); else delete a; ++it; } } -KviPointerHashTable<QString,KviKvsScriptAddon> * KviKvsScriptAddonManager::addonDict() +KviPointerHashTable<TQString,KviKvsScriptAddon> * KviKvsScriptAddonManager::addonDict() { if(!m_bLoaded)delayedLoad(); return m_pAddonDict; @@ -351,17 +351,17 @@ bool KviKvsScriptAddonManager::registerAddon(KviKvsScriptAddonRegistrationData * d->szDescriptionScript, d->szUninstallCallbackScript, d->szIconId); - m_pAddonDict->replace(d->szName,a); + m_pAddonDict->tqreplace(d->szName,a); return true; } -KviKvsScriptAddon * KviKvsScriptAddonManager::findAddon(const QString &szName) +KviKvsScriptAddon * KviKvsScriptAddonManager::findAddon(const TQString &szName) { if(!m_bLoaded)delayedLoad(); - return m_pAddonDict->find(szName); + return m_pAddonDict->tqfind(szName); } -bool KviKvsScriptAddonManager::unregisterAddon(const QString &szName,KviWindow * pWnd,bool bExecuteUninstallCallback) +bool KviKvsScriptAddonManager::unregisterAddon(const TQString &szName,KviWindow * pWnd,bool bExecuteUninstallCallback) { KviKvsScriptAddon * a = findAddon(szName); if(!a)return false; diff --git a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.h b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.h index 428ba58..b05adde 100644 --- a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.h +++ b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.h @@ -33,7 +33,7 @@ class KviConfig; class KviKvsScript; class KviWindow; -class QPixmap; +class TQPixmap; class KVIRC_API KviKvsScriptAddon : public KviHeapObject { @@ -41,61 +41,61 @@ class KVIRC_API KviKvsScriptAddon : public KviHeapObject protected: KviKvsScriptAddon(); KviKvsScriptAddon( - const QString &szName, - const QString &szVersion, - const QString &szVisibleNameCode, - const QString &szDescriptionCode, - const QString &szUninstallCallbackCode, - const QString &szIconId + const TQString &szName, + const TQString &szVersion, + const TQString &szVisibleNameCode, + const TQString &szDescriptionCode, + const TQString &szUninstallCallbackCode, + const TQString &szIconId ); public: KviKvsScriptAddon(const KviKvsScriptAddon &a); public: // KviDict wants that... how to restrict the deletion to KviKvsScriptAddonManager only ? ~KviKvsScriptAddon(); protected: - QString m_szName; // the short name of the addon - QString m_szVersion; // x.y.z + TQString m_szName; // the short name of the addon + TQString m_szVersion; // x.y.z KviKvsScript * m_pVisibleNameScript; // the visible name, possibly translated KviKvsScript * m_pDescriptionScript; // the description, possibly translated KviKvsScript * m_pUninstallCallback; // uninstall callback KviKvsScript * m_pConfigureCallback; // configure callback KviKvsScript * m_pHelpCallback; // help callback - QString m_szDescription; // parsed description - QString m_szVisibleName; // parsed visible name - QString m_szIconId; + TQString m_szDescription; // parsed description + TQString m_szVisibleName; // parsed visible name + TQString m_szIconId; public: - const QString &name() const { return m_szName; }; - const QString &version() const { return m_szVersion; }; - const QString &visibleName(); - const QString &description(); - const QString &visibleNameCode(); - const QString &descriptionCode(); - const QString &uninstallCallbackCode(); - const QString &configureCallbackCode(); - const QString &helpCallbackCode(); - const QString &iconId(){ return m_szIconId; }; - QPixmap * icon(); - void setConfigureCallback(const QString &szConfigureCallbackCode); - void setHelpCallback(const QString &szHelpCallbackCode); + const TQString &name() const { return m_szName; }; + const TQString &version() const { return m_szVersion; }; + const TQString &visibleName(); + const TQString &description(); + const TQString &visibleNameCode(); + const TQString &descriptionCode(); + const TQString &uninstallCallbackCode(); + const TQString &configureCallbackCode(); + const TQString &helpCallbackCode(); + const TQString &iconId(){ return m_szIconId; }; + TQPixmap * icon(); + void setConfigureCallback(const TQString &szConfigureCallbackCode); + void setHelpCallback(const TQString &szHelpCallbackCode); void executeConfigureCallback(KviWindow * pWnd); void executeHelpCallback(KviWindow * pWnd); protected: - bool load(KviConfig * cfg,const QString &szName); + bool load(KviConfig * cfg,const TQString &szName); void save(KviConfig * cfg); void executeUninstallCallback(KviWindow * pWnd); // this assumes that the script pointers are clean (i.e. not needing to be freed!) - void allocateScripts(const QString &sVisibleNameCode,const QString &szDescriptionCode,const QString &szUninstallCallbackCode); + void allocateScripts(const TQString &sVisibleNameCode,const TQString &szDescriptionCode,const TQString &szUninstallCallbackCode); }; class KVIRC_API KviKvsScriptAddonRegistrationData { public: - QString szName; // the addon name - QString szVersion; // the addon version in form x.y.z - QString szVisibleNameScript; // the code that evaluates to the visible name, possibly translated - QString szDescriptionScript; // the code that evaluates to the description, possibly translated - QString szUninstallCallbackScript; // the uninstall callback code, will be executed at uninstallation - QString szIconId; // the icon identifier (scaled to 32x32 atm) + TQString szName; // the addon name + TQString szVersion; // the addon version in form x.y.z + TQString szVisibleNameScript; // the code that evaluates to the visible name, possibly translated + TQString szDescriptionScript; // the code that evaluates to the description, possibly translated + TQString szUninstallCallbackScript; // the uninstall callback code, will be executed at uninstallation + TQString szIconId; // the icon identifier (scaled to 32x32 atm) }; class KVIRC_API KviKvsScriptAddonManager @@ -106,22 +106,22 @@ public: protected: static KviKvsScriptAddonManager * m_pInstance; // this class implements delayed loading - QString m_szFileName; // the file name that we will load from + TQString m_szFileName; // the file name that we will load from bool m_bLoaded; // have we loaded stuff from disk yet ? - KviPointerHashTable<QString,KviKvsScriptAddon> * m_pAddonDict; // all the registered addons + KviPointerHashTable<TQString,KviKvsScriptAddon> * m_pAddonDict; // all the registered addons public: static KviKvsScriptAddonManager * instance(){ return m_pInstance; }; static void init(); // called by KviKvs::init() static void done(); // called by KviKvs::done() bool registerAddon(KviKvsScriptAddonRegistrationData * d); - KviKvsScriptAddon * findAddon(const QString &szName); - bool unregisterAddon(const QString &szName,KviWindow * pWnd,bool bExecuteUninstallCallback = true); - KviPointerHashTable<QString,KviKvsScriptAddon> * addonDict(); + KviKvsScriptAddon * findAddon(const TQString &szName); + bool unregisterAddon(const TQString &szName,KviWindow * pWnd,bool bExecuteUninstallCallback = true); + KviPointerHashTable<TQString,KviKvsScriptAddon> * addonDict(); void clear(); - void load(const QString &szFileName); // called in the KviKvs namespace - void save(const QString &szFileName); // called in the KViKvs namespace + void load(const TQString &szFileName); // called in the KviKvs namespace + void save(const TQString &szFileName); // called in the KViKvs namespace protected: void delayedLoad(); }; diff --git a/src/kvirc/kvs/kvi_kvs_switchlist.cpp b/src/kvirc/kvs/kvi_kvs_switchlist.cpp index aa4ebdb..7c56c85 100644 --- a/src/kvirc/kvs/kvi_kvs_switchlist.cpp +++ b/src/kvirc/kvs/kvi_kvs_switchlist.cpp @@ -60,16 +60,16 @@ void KviKvsSwitchList::addShort(unsigned short uShortKey,KviKvsVariant * pVarian m_pShortSwitchDict = new KviPointerHashTable<unsigned short,KviKvsVariant>(11); m_pShortSwitchDict->setAutoDelete(true); } - m_pShortSwitchDict->replace(uShortKey,pVariant); + m_pShortSwitchDict->tqreplace(uShortKey,pVariant); } -void KviKvsSwitchList::addLong(const QString &szLongKey,KviKvsVariant * pVariant) +void KviKvsSwitchList::addLong(const TQString &szLongKey,KviKvsVariant * pVariant) { if(!m_pLongSwitchDict) { - m_pLongSwitchDict = new KviPointerHashTable<QString,KviKvsVariant>(11); + m_pLongSwitchDict = new KviPointerHashTable<TQString,KviKvsVariant>(11); m_pLongSwitchDict->setAutoDelete(true); } - m_pLongSwitchDict->replace(szLongKey,pVariant); + m_pLongSwitchDict->tqreplace(szLongKey,pVariant); } diff --git a/src/kvirc/kvs/kvi_kvs_switchlist.h b/src/kvirc/kvs/kvi_kvs_switchlist.h index ea496b3..b660569 100644 --- a/src/kvirc/kvs/kvi_kvs_switchlist.h +++ b/src/kvirc/kvs/kvi_kvs_switchlist.h @@ -38,43 +38,43 @@ public: ~KviKvsSwitchList(); protected: KviPointerHashTable<unsigned short,KviKvsVariant> * m_pShortSwitchDict; - KviPointerHashTable<QString,KviKvsVariant> * m_pLongSwitchDict; + KviPointerHashTable<TQString,KviKvsVariant> * m_pLongSwitchDict; public: void clear(); void addShort(unsigned short uShortKey,KviKvsVariant * pVariant); - void addLong(const QString &szLongKey,KviKvsVariant * pVariant); + void addLong(const TQString &szLongKey,KviKvsVariant * pVariant); bool isEmpty(){ return ((m_pShortSwitchDict == 0) && (m_pLongSwitchDict == 0)); }; - KviKvsVariant * find(const QChar &c) + KviKvsVariant * tqfind(const TQChar &c) { - return m_pShortSwitchDict ? m_pShortSwitchDict->find(c.unicode()) : 0; + return m_pShortSwitchDict ? m_pShortSwitchDict->tqfind(c.tqunicode()) : 0; }; - KviKvsVariant * find(unsigned short uShortKey) + KviKvsVariant * tqfind(unsigned short uShortKey) { - return m_pShortSwitchDict ? m_pShortSwitchDict->find((int)uShortKey) : 0; + return m_pShortSwitchDict ? m_pShortSwitchDict->tqfind((int)uShortKey) : 0; }; - KviKvsVariant * find(const QString &szLongKey) + KviKvsVariant * tqfind(const TQString &szLongKey) { - return m_pLongSwitchDict ? m_pLongSwitchDict->find(szLongKey) : 0; + return m_pLongSwitchDict ? m_pLongSwitchDict->tqfind(szLongKey) : 0; }; - KviKvsVariant * find(unsigned short uShortKey,const QString &szLongKey) + KviKvsVariant * tqfind(unsigned short uShortKey,const TQString &szLongKey) { if(m_pLongSwitchDict) { KviKvsVariant * t; - t = m_pLongSwitchDict->find(szLongKey); + t = m_pLongSwitchDict->tqfind(szLongKey); if(t)return t; } - return m_pShortSwitchDict ? m_pShortSwitchDict->find((int)uShortKey) : 0; + return m_pShortSwitchDict ? m_pShortSwitchDict->tqfind((int)uShortKey) : 0; }; - bool getAsStringIfExisting(unsigned short uShortKey,const QString &szLongKey,QString &szBuffer) + bool getAsStringIfExisting(unsigned short uShortKey,const TQString &szLongKey,TQString &szBuffer) { - KviKvsVariant * v = find(uShortKey,szLongKey); + KviKvsVariant * v = tqfind(uShortKey,szLongKey); if(v) { v->asString(szBuffer); diff --git a/src/kvirc/kvs/kvi_kvs_timermanager.cpp b/src/kvirc/kvs/kvi_kvs_timermanager.cpp index 91af693..3bd4301 100644 --- a/src/kvirc/kvs/kvi_kvs_timermanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_timermanager.cpp @@ -38,7 +38,7 @@ #include "kvi_out.h" -KviKvsTimer::KviKvsTimer(const QString &szName,Lifetime l,KviWindow * pWnd,int iDelay,int iId,KviKvsScript * pCallback,KviKvsVariantList * pParams) +KviKvsTimer::KviKvsTimer(const TQString &szName,Lifetime l,KviWindow * pWnd,int iDelay,int iId,KviKvsScript * pCallback,KviKvsVariantList * pParams) { m_szName = szName; m_eLifetime = l; @@ -68,11 +68,11 @@ KviKvsTimerManager * KviKvsTimerManager::m_pInstance = 0; KviKvsTimerManager::KviKvsTimerManager() -: QObject() +: TQObject() { m_pTimerDictById = new KviPointerHashTable<int,KviKvsTimer>(17); m_pTimerDictById->setAutoDelete(false); - m_pTimerDictByName = new KviPointerHashTable<QString,KviKvsTimer>(17,false); + m_pTimerDictByName = new KviPointerHashTable<TQString,KviKvsTimer>(17,false); m_pTimerDictByName->setAutoDelete(false); m_pKilledTimerList = 0; m_iAssassinTimer = 0; @@ -108,7 +108,7 @@ void KviKvsTimerManager::done() KviKvsTimerManager::m_pInstance = 0; } -bool KviKvsTimerManager::addTimer(const QString &szName,KviKvsTimer::Lifetime l,KviWindow * pWnd,int iDelay,KviKvsScript * pCallback,KviKvsVariantList * pParams) +bool KviKvsTimerManager::addTimer(const TQString &szName,KviKvsTimer::Lifetime l,KviWindow * pWnd,int iDelay,KviKvsScript * pCallback,KviKvsVariantList * pParams) { int iId = startTimer(iDelay); @@ -122,16 +122,16 @@ bool KviKvsTimerManager::addTimer(const QString &szName,KviKvsTimer::Lifetime l, } KviKvsTimer * t = new KviKvsTimer(szName,l,pWnd,iDelay,iId,pCallback,pParams); - KviKvsTimer * old = m_pTimerDictByName->find(szName); + KviKvsTimer * old = m_pTimerDictByName->tqfind(szName); if(old)deleteTimer(old->id()); m_pTimerDictByName->insert(szName,t); m_pTimerDictById->insert(t->id(),t); return true; } -bool KviKvsTimerManager::deleteTimer(const QString &szName) +bool KviKvsTimerManager::deleteTimer(const TQString &szName) { - KviKvsTimer * t = m_pTimerDictByName->find(szName); + KviKvsTimer * t = m_pTimerDictByName->tqfind(szName); if(!t)return false; killTimer(t->id()); m_pTimerDictById->remove(t->id()); @@ -142,7 +142,7 @@ bool KviKvsTimerManager::deleteTimer(const QString &szName) bool KviKvsTimerManager::deleteTimer(int iId) { - KviKvsTimer * t = m_pTimerDictById->find(iId); + KviKvsTimer * t = m_pTimerDictById->tqfind(iId); if(!t)return false; killTimer(t->id()); m_pTimerDictById->remove(t->id()); @@ -189,7 +189,7 @@ void KviKvsTimerManager::scheduleKill(KviKvsTimer *t) } -void KviKvsTimerManager::timerEvent(QTimerEvent *e) +void KviKvsTimerManager::timerEvent(TQTimerEvent *e) { int iId = e->timerId(); @@ -206,7 +206,7 @@ void KviKvsTimerManager::timerEvent(QTimerEvent *e) return; } - KviKvsTimer * t = m_pTimerDictById->find(iId); + KviKvsTimer * t = m_pTimerDictById->tqfind(iId); if(!t) { debug("Internal error: got an nonexistant timer event"); diff --git a/src/kvirc/kvs/kvi_kvs_timermanager.h b/src/kvirc/kvs/kvi_kvs_timermanager.h index f8e20f1..e316118 100644 --- a/src/kvirc/kvs/kvi_kvs_timermanager.h +++ b/src/kvirc/kvs/kvi_kvs_timermanager.h @@ -28,7 +28,7 @@ #include "kvi_settings.h" #include "kvi_qstring.h" -#include <qobject.h> +#include <tqobject.h> #include "kvi_pointerhashtable.h" #include "kvi_pointerhashtable.h" #include "kvi_pointerlist.h" @@ -58,13 +58,13 @@ class KVIRC_API KviKvsTimer public: enum Lifetime { SingleShot, WindowLifetime, Persistent }; protected: - KviKvsTimer(const QString &szName,Lifetime l,KviWindow * pWnd,int iDelay,int iId,KviKvsScript * pCallback,KviKvsVariantList * pParams); + KviKvsTimer(const TQString &szName,Lifetime l,KviWindow * pWnd,int iDelay,int iId,KviKvsScript * pCallback,KviKvsVariantList * pParams); public: ~KviKvsTimer(); protected: Lifetime m_eLifetime; // the type of this timer KviWindow * m_pWnd; // the window that this timer is (currently) bound to - QString m_szName; // this timer name + TQString m_szName; // this timer name KviKvsScript * m_pCallback; // callback to be executed at timer shots int m_iDelay; // the timer delay in msecs int m_iId; // the system id of this timer @@ -72,7 +72,7 @@ protected: KviKvsVariantList * m_pParameterList; // parameter list public: KviWindow * window(){ return m_pWnd; }; - const QString & name(){ return m_szName; }; + const TQString & name(){ return m_szName; }; const KviKvsScript * callback(){ return m_pCallback; }; Lifetime lifetime(){ return m_eLifetime; }; int delay(){ return m_iDelay; }; @@ -85,15 +85,16 @@ protected: }; -class KVIRC_API KviKvsTimerManager : public QObject +class KVIRC_API KviKvsTimerManager : public TQObject { Q_OBJECT + TQ_OBJECT protected: // it only can be created and destroyed by KviKvsTimerManager::init()/done() KviKvsTimerManager(); ~KviKvsTimerManager(); private: KviPointerHashTable<int,KviKvsTimer> * m_pTimerDictById; // stored by id - KviPointerHashTable<QString,KviKvsTimer> * m_pTimerDictByName; // stored by name + KviPointerHashTable<TQString,KviKvsTimer> * m_pTimerDictByName; // stored by name static KviKvsTimerManager * m_pInstance; // the one and only timer manager instance KviPointerList<KviKvsTimer> * m_pKilledTimerList; // list of timers for that killing has been scheduled int m_iAssassinTimer; // assassin timer id @@ -103,20 +104,20 @@ public: static void init(); static void done(); // the pCallback and pParams are owned by the timer: they WILL be deleted - bool addTimer(const QString &szName,KviKvsTimer::Lifetime l,KviWindow * pWnd,int iDelay,KviKvsScript * pCallback,KviKvsVariantList * pParams); - bool deleteTimer(const QString &szName); + bool addTimer(const TQString &szName,KviKvsTimer::Lifetime l,KviWindow * pWnd,int iDelay,KviKvsScript * pCallback,KviKvsVariantList * pParams); + bool deleteTimer(const TQString &szName); bool deleteTimer(int iId); // the timer manager does not trigger timers concurrently // this means that if this is called from a timer handler // the current timer will be unique bool deleteCurrentTimer(); void deleteAllTimers(); - bool timerExists(const QString &szName){ return m_pTimerDictByName->find(szName); }; - KviPointerHashTable<QString,KviKvsTimer> * timerDict() + bool timerExists(const TQString &szName){ return m_pTimerDictByName->tqfind(szName); }; + KviPointerHashTable<TQString,KviKvsTimer> * timerDict() { return m_pTimerDictByName; }; protected: void scheduleKill(KviKvsTimer * t); - virtual void timerEvent(QTimerEvent *e); + virtual void timerEvent(TQTimerEvent *e); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp index f864cea..d8a9ca4 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp @@ -30,7 +30,7 @@ #include "kvi_locale.h" #include "kvi_qstring.h" -KviKvsTreeNodeAliasFunctionCall::KviKvsTreeNodeAliasFunctionCall(const QChar * pLocation,const QString &szAliasName,KviKvsTreeNodeDataList * pParams) +KviKvsTreeNodeAliasFunctionCall::KviKvsTreeNodeAliasFunctionCall(const TQChar * pLocation,const TQString &szAliasName,KviKvsTreeNodeDataList * pParams) : KviKvsTreeNodeFunctionCall(pLocation,szAliasName,pParams) { @@ -40,9 +40,9 @@ KviKvsTreeNodeAliasFunctionCall::~KviKvsTreeNodeAliasFunctionCall() { } -void KviKvsTreeNodeAliasFunctionCall::contextDescription(QString &szBuffer) +void KviKvsTreeNodeAliasFunctionCall::contextDescription(TQString &szBuffer) { - KviQString::sprintf(szBuffer,"Alias Function Call \"%Q\"",&m_szFunctionName); + KviTQString::sprintf(szBuffer,"Alias Function Call \"%Q\"",&m_szFunctionName); } @@ -51,7 +51,7 @@ void KviKvsTreeNodeAliasFunctionCall::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s AliasFunctionCall(%s)",prefix,m_szFunctionName.utf8().data()); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pParams->dump(tmp.utf8().data()); #endif diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.h index 04ca50a..af0770f 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.h @@ -34,11 +34,11 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeAliasFunctionCall : public KviKvsTreeNodeFunctionCall { public: - KviKvsTreeNodeAliasFunctionCall(const QChar * pLocation,const QString &szAliasName,KviKvsTreeNodeDataList * pParams); + KviKvsTreeNodeAliasFunctionCall(const TQChar * pLocation,const TQString &szAliasName,KviKvsTreeNodeDataList * pParams); ~KviKvsTreeNodeAliasFunctionCall(); public: virtual void dump(const char * prefix); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp index 974ae94..192d344 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp @@ -37,7 +37,7 @@ #include "kvi_out.h" -KviKvsTreeNodeAliasSimpleCommand::KviKvsTreeNodeAliasSimpleCommand(const QChar * pLocation,const QString &szCmdName,KviKvsTreeNodeDataList * params) +KviKvsTreeNodeAliasSimpleCommand::KviKvsTreeNodeAliasSimpleCommand(const TQChar * pLocation,const TQString &szCmdName,KviKvsTreeNodeDataList * params) : KviKvsTreeNodeSimpleCommand(pLocation,szCmdName,params) { } @@ -47,9 +47,9 @@ KviKvsTreeNodeAliasSimpleCommand::~KviKvsTreeNodeAliasSimpleCommand() { } -void KviKvsTreeNodeAliasSimpleCommand::contextDescription(QString &szBuffer) +void KviKvsTreeNodeAliasSimpleCommand::contextDescription(TQString &szBuffer) { - KviQString::sprintf(szBuffer,"Alias Simple Command \"%Q\"",&m_szCmdName); + KviTQString::sprintf(szBuffer,"Alias Simple Command \"%Q\"",&m_szCmdName); } void KviKvsTreeNodeAliasSimpleCommand::dump(const char * prefix) @@ -75,13 +75,13 @@ bool KviKvsTreeNodeAliasSimpleCommand::execute(KviKvsRunTimeContext * c) { if(KVI_OPTION_BOOL(KviOption_boolSendUnknownCommandsAsRaw)) { - QString szAll; + TQString szAll; l.allAsString(szAll); if(!szAll.isEmpty())szAll.prepend(" "); szAll.prepend(m_szCmdName); - KviQCString szData; + KviTQCString szData; if(!c->window()->context()) goto no_way_to_send_as_raw; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.h b/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.h index 0247e9b..34a1a24 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.h @@ -34,10 +34,10 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeAliasSimpleCommand : public KviKvsTreeNodeSimpleCommand { public: - KviKvsTreeNodeAliasSimpleCommand(const QChar * pLocation,const QString &szCmdName,KviKvsTreeNodeDataList * params); + KviKvsTreeNodeAliasSimpleCommand(const TQChar * pLocation,const TQString &szCmdName,KviKvsTreeNodeDataList * params); ~KviKvsTreeNodeAliasSimpleCommand(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arraycount.cpp b/src/kvirc/kvs/kvi_kvs_treenode_arraycount.cpp index 1479fef..7caab06 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arraycount.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_arraycount.cpp @@ -31,7 +31,7 @@ #include "kvi_kvs_object.h" -KviKvsTreeNodeArrayCount::KviKvsTreeNodeArrayCount(const QChar * pLocation,KviKvsTreeNodeData * pSource) +KviKvsTreeNodeArrayCount::KviKvsTreeNodeArrayCount(const TQChar * pLocation,KviKvsTreeNodeData * pSource) : KviKvsTreeNodeIndirectData(pLocation,pSource) { } @@ -40,7 +40,7 @@ KviKvsTreeNodeArrayCount::~KviKvsTreeNodeArrayCount() { } -void KviKvsTreeNodeArrayCount::contextDescription(QString &szBuffer) +void KviKvsTreeNodeArrayCount::contextDescription(TQString &szBuffer) { szBuffer = "Array Count Operator"; } @@ -67,7 +67,7 @@ bool KviKvsTreeNodeArrayCount::evaluateReadOnlyInObjectScope(KviKvsObject *o,Kvi { if(!val.isNothing()) { - QString szType; + TQString szType; val.getTypeName(szType); c->warning(this,__tr2qs("The argument of the array count '#' operator didn't evaluate to an array: automatic conversion from type '%Q' supplied"),&szType); } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arraycount.h b/src/kvirc/kvs/kvi_kvs_treenode_arraycount.h index deae258..87ce721 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arraycount.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_arraycount.h @@ -35,10 +35,10 @@ class KviKvsObject; class KVIRC_API KviKvsTreeNodeArrayCount : public KviKvsTreeNodeIndirectData { public: - KviKvsTreeNodeArrayCount(const QChar * pLocation,KviKvsTreeNodeData * pSource); + KviKvsTreeNodeArrayCount(const TQChar * pLocation,KviKvsTreeNodeData * pSource); ~KviKvsTreeNodeArrayCount(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject *o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp b/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp index ada9fd8..e3cd668 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp @@ -30,7 +30,7 @@ #include "kvi_kvs_array.h" #include "kvi_kvs_object.h" -KviKvsTreeNodeArrayElement::KviKvsTreeNodeArrayElement(const QChar * pLocation,KviKvsTreeNodeData * pSource,KviKvsTreeNodeExpression * pIndex) +KviKvsTreeNodeArrayElement::KviKvsTreeNodeArrayElement(const TQChar * pLocation,KviKvsTreeNodeData * pSource,KviKvsTreeNodeExpression * pIndex) : KviKvsTreeNodeArrayOrHashElement(pLocation,pSource) { #ifdef COMPILE_NEW_KVS @@ -47,7 +47,7 @@ KviKvsTreeNodeArrayElement::~KviKvsTreeNodeArrayElement() #endif } -void KviKvsTreeNodeArrayElement::contextDescription(QString &szBuffer) +void KviKvsTreeNodeArrayElement::contextDescription(TQString &szBuffer) { szBuffer = "Array Element Evaluation"; } @@ -56,7 +56,7 @@ void KviKvsTreeNodeArrayElement::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s ArrayElement",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pSource->dump(tmp.utf8().data()); m_pIndex->dump(tmp.utf8().data()); @@ -101,7 +101,7 @@ bool KviKvsTreeNodeArrayElement::evaluateReadOnlyInObjectScope(KviKvsObject * o, { if(!val.isNothing()) { - QString szType; + TQString szType; val.getTypeName(szType); c->warning(this,__tr2qs("The argument of the [] subscript didn't evaluate to an array: automatic conversion from %Q supplied"),&szType); } @@ -137,7 +137,7 @@ KviKvsRWEvaluationResult * KviKvsTreeNodeArrayElement::evaluateReadWriteInObject // convert to hash in some way if(!result->result()->isNothing()) { - QString szType; + TQString szType; result->result()->getTypeName(szType); c->warning(this,__tr2qs("The argument of the [] subscript didn't evaluate to an array: automatic conversion from type '%Q' supplied"),&szType); } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.h b/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.h index 9b23926..1d47203 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.h @@ -36,12 +36,12 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeArrayElement : public KviKvsTreeNodeArrayOrHashElement { public: - KviKvsTreeNodeArrayElement(const QChar * pLocation,KviKvsTreeNodeData * pSource,KviKvsTreeNodeExpression * pIndex); + KviKvsTreeNodeArrayElement(const TQChar * pLocation,KviKvsTreeNodeData * pSource,KviKvsTreeNodeExpression * pIndex); ~KviKvsTreeNodeArrayElement(); protected: KviKvsTreeNodeExpression * m_pIndex; // can't be null public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.cpp b/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.cpp index d15d197..5106ace 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.cpp @@ -26,7 +26,7 @@ #include "kvi_kvs_treenode_arrayorhashelement.h" -KviKvsTreeNodeArrayOrHashElement::KviKvsTreeNodeArrayOrHashElement(const QChar * pLocation,KviKvsTreeNodeData * pSource) +KviKvsTreeNodeArrayOrHashElement::KviKvsTreeNodeArrayOrHashElement(const TQChar * pLocation,KviKvsTreeNodeData * pSource) : KviKvsTreeNodeIndirectData(pLocation,pSource) { } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.h b/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.h index 4f5d679..a790a24 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.h @@ -32,7 +32,7 @@ class KVIRC_API KviKvsTreeNodeArrayOrHashElement : public KviKvsTreeNodeIndirectData { public: - KviKvsTreeNodeArrayOrHashElement(const QChar * pLocation,KviKvsTreeNodeData * pSource); + KviKvsTreeNodeArrayOrHashElement(const TQChar * pLocation,KviKvsTreeNodeData * pSource); ~KviKvsTreeNodeArrayOrHashElement(); public: virtual bool isReadOnly(); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp b/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp index 698b95c..0d52c07 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp @@ -31,7 +31,7 @@ #include "kvi_locale.h" #include "kvi_kvs_object.h" -KviKvsTreeNodeArrayReferenceAssert::KviKvsTreeNodeArrayReferenceAssert(const QChar * pLocation,KviKvsTreeNodeData * pSource) +KviKvsTreeNodeArrayReferenceAssert::KviKvsTreeNodeArrayReferenceAssert(const TQChar * pLocation,KviKvsTreeNodeData * pSource) : KviKvsTreeNodeIndirectData(pLocation,pSource) { } @@ -45,7 +45,7 @@ bool KviKvsTreeNodeArrayReferenceAssert::isReadOnly() return m_pSource->isReadOnly(); } -void KviKvsTreeNodeArrayReferenceAssert::contextDescription(QString &szBuffer) +void KviKvsTreeNodeArrayReferenceAssert::contextDescription(TQString &szBuffer) { szBuffer = "Array Reference Assert"; } @@ -72,7 +72,7 @@ bool KviKvsTreeNodeArrayReferenceAssert::evaluateReadOnlyInObjectScope(KviKvsObj { if(!pBuffer->isNothing()) { - QString szType; + TQString szType; pBuffer->getTypeName(szType); c->error(this,__tr2qs("Array reference assert failed: the variable evaluated to type '%Q'"),&szType); return false; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.h b/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.h index 8827cf2..663068a 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.h @@ -36,13 +36,13 @@ class KviKvsObject; class KVIRC_API KviKvsTreeNodeArrayReferenceAssert : public KviKvsTreeNodeIndirectData { public: - KviKvsTreeNodeArrayReferenceAssert(const QChar * pLocation,KviKvsTreeNodeData * pSource); + KviKvsTreeNodeArrayReferenceAssert(const TQChar * pLocation,KviKvsTreeNodeData * pSource); ~KviKvsTreeNodeArrayReferenceAssert(); protected: public: virtual bool isReadOnly(); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_base.cpp b/src/kvirc/kvs/kvi_kvs_treenode_base.cpp index ee19dd8..64b71c0 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_base.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_base.cpp @@ -26,7 +26,7 @@ #include "kvi_kvs_treenode_base.h" -KviKvsTreeNode::KviKvsTreeNode(const QChar * pLocation) +KviKvsTreeNode::KviKvsTreeNode(const TQChar * pLocation) { #ifdef COMPILE_NEW_KVS m_pParent = 0; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_base.h b/src/kvirc/kvs/kvi_kvs_treenode_base.h index 6f0178f..2057e38 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_base.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_base.h @@ -31,21 +31,21 @@ class KVIRC_API KviKvsTreeNode { friend class KviKvsParser; public: - KviKvsTreeNode(const QChar * pLocation); + KviKvsTreeNode(const TQChar * pLocation); virtual ~KviKvsTreeNode(){}; protected: KviKvsTreeNode * m_pParent; - const QChar * m_pLocation; + const TQChar * m_pLocation; public: void setParent(KviKvsTreeNode * p){ m_pParent = p; }; protected: // this is called only by KviKvsParser - void setLocation(const QChar * pLocation){ m_pLocation = pLocation; }; + void setLocation(const TQChar * pLocation){ m_pLocation = pLocation; }; public: - KviKvsTreeNode * parent(){ return m_pParent; }; - const QChar * location(){ return m_pLocation; }; + KviKvsTreeNode * tqparent(){ return m_pParent; }; + const TQChar * location(){ return m_pLocation; }; virtual void dump(const char * prefix) = 0; - virtual void contextDescription(QString &szBuffer) = 0; + virtual void contextDescription(TQString &szBuffer) = 0; }; #endif //!_KVI_KVS_TREENODE_BASE_H_ diff --git a/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp index 75feafc..f004549 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp @@ -29,7 +29,7 @@ #include "kvi_kvs_object.h" #include "kvi_kvs_variant.h" -KviKvsTreeNodeBaseObjectFunctionCall::KviKvsTreeNodeBaseObjectFunctionCall(const QChar * pLocation,const QString &szBaseClass,const QString &szFncName,KviKvsTreeNodeDataList * pParams) +KviKvsTreeNodeBaseObjectFunctionCall::KviKvsTreeNodeBaseObjectFunctionCall(const TQChar * pLocation,const TQString &szBaseClass,const TQString &szFncName,KviKvsTreeNodeDataList * pParams) : KviKvsTreeNodeObjectFunctionCall(pLocation,szFncName,pParams) { #ifdef COMPILE_NEW_KVS @@ -41,16 +41,16 @@ KviKvsTreeNodeBaseObjectFunctionCall::~KviKvsTreeNodeBaseObjectFunctionCall() { } -void KviKvsTreeNodeBaseObjectFunctionCall::contextDescription(QString &szBuffer) +void KviKvsTreeNodeBaseObjectFunctionCall::contextDescription(TQString &szBuffer) { - KviQString::sprintf(szBuffer,"Base Object Function Call \"%s::%s\"",&m_szBaseClass,&m_szFunctionName); + KviTQString::sprintf(szBuffer,"Base Object Function Call \"%s::%s\"",&m_szBaseClass,&m_szFunctionName); } void KviKvsTreeNodeBaseObjectFunctionCall::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s BaseObjectFunctionCall(%s::%s)",prefix,m_szBaseClass.utf8().data(),m_szFunctionName.utf8().data()); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pParams->dump(tmp.utf8().data()); #endif diff --git a/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.h index d679c40..1b8df69 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.h @@ -36,12 +36,12 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeBaseObjectFunctionCall : public KviKvsTreeNodeObjectFunctionCall { public: - KviKvsTreeNodeBaseObjectFunctionCall(const QChar * pLocation,const QString &szBaseClass,const QString &szFncName,KviKvsTreeNodeDataList * pParams); + KviKvsTreeNodeBaseObjectFunctionCall(const TQChar * pLocation,const TQString &szBaseClass,const TQString &szFncName,KviKvsTreeNodeDataList * pParams); ~KviKvsTreeNodeBaseObjectFunctionCall(); protected: - QString m_szBaseClass; + TQString m_szBaseClass; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject * o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.cpp index cf4c549..18f2906 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.cpp @@ -31,7 +31,7 @@ -KviKvsTreeNodeCallbackCommand::KviKvsTreeNodeCallbackCommand(const QChar * pLocation,const QString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsScript * pCallback) +KviKvsTreeNodeCallbackCommand::KviKvsTreeNodeCallbackCommand(const TQChar * pLocation,const TQString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsScript * pCallback) : KviKvsTreeNodeCommandWithParameters(pLocation,szCmdName,params) { #ifdef COMPILE_NEW_KVS @@ -47,9 +47,9 @@ KviKvsTreeNodeCallbackCommand::~KviKvsTreeNodeCallbackCommand() #endif } -void KviKvsTreeNodeCallbackCommand::contextDescription(QString &szBuffer) +void KviKvsTreeNodeCallbackCommand::contextDescription(TQString &szBuffer) { - KviQString::sprintf(szBuffer,"Callback Command \"%s\"",&m_szCmdName); + KviTQString::sprintf(szBuffer,"Callback Command \"%s\"",&m_szCmdName); } void KviKvsTreeNodeCallbackCommand::dump(const char * prefix) @@ -65,7 +65,7 @@ void KviKvsTreeNodeCallbackCommand::dump(const char * prefix) void KviKvsTreeNodeCallbackCommand::dumpCallback(const char * prefix) { #ifdef COMPILE_NEW_KVS - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pCallback->dump(tmp.utf8().data()); #endif diff --git a/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.h b/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.h index dc061f6..73b125b 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.h @@ -34,12 +34,12 @@ class KviKvsScript; class KVIRC_API KviKvsTreeNodeCallbackCommand : public KviKvsTreeNodeCommandWithParameters { public: - KviKvsTreeNodeCallbackCommand(const QChar * pLocation,const QString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsScript * pCallback); + KviKvsTreeNodeCallbackCommand(const TQChar * pLocation,const TQString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsScript * pCallback); ~KviKvsTreeNodeCallbackCommand(); protected: KviKvsScript * m_pCallback; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); void dumpCallback(const char * prefix); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_command.cpp b/src/kvirc/kvs/kvi_kvs_treenode_command.cpp index 4da19df..2a3c860 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_command.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_command.cpp @@ -27,7 +27,7 @@ #include "kvi_kvs_treenode_command.h" #include "kvi_kvs_treenode_switchlist.h" -KviKvsTreeNodeCommand::KviKvsTreeNodeCommand(const QChar * pLocation,const QString &szCmdName) +KviKvsTreeNodeCommand::KviKvsTreeNodeCommand(const TQChar * pLocation,const TQString &szCmdName) : KviKvsTreeNodeInstruction(pLocation) { #ifdef COMPILE_NEW_KVS @@ -45,10 +45,10 @@ KviKvsTreeNodeCommand::~KviKvsTreeNodeCommand() //#warning "All the dump() functions could be killed (or moved to print on the kvirc windows)" -void KviKvsTreeNodeCommand::contextDescription(QString &szBuffer) +void KviKvsTreeNodeCommand::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS - KviQString::sprintf(szBuffer,"Command \"%s\"",&m_szCmdName); + KviTQString::sprintf(szBuffer,"Command \"%s\"",&m_szCmdName); #endif } @@ -64,7 +64,7 @@ void KviKvsTreeNodeCommand::dumpSwitchList(const char * prefix) { #ifdef COMPILE_NEW_KVS if(!m_pSwitches)return; - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pSwitches->dump(tmp.utf8().data()); #endif diff --git a/src/kvirc/kvs/kvi_kvs_treenode_command.h b/src/kvirc/kvs/kvi_kvs_treenode_command.h index cf58774..aff3f55 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_command.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_command.h @@ -36,16 +36,16 @@ class KVIRC_API KviKvsTreeNodeCommand : public KviKvsTreeNodeInstruction // never instantiated friend class KviKvsParser; public: - KviKvsTreeNodeCommand(const QChar * pLocation,const QString &szCmdName); + KviKvsTreeNodeCommand(const TQChar * pLocation,const TQString &szCmdName); ~KviKvsTreeNodeCommand(); protected: - QString m_szCmdName; // command visible name + TQString m_szCmdName; // command visible name KviKvsTreeNodeSwitchList * m_pSwitches; // MAY BE 0! public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); void dumpSwitchList(const char * prefix); - const QString & commandName(){ return m_szCmdName; }; + const TQString & commandName(){ return m_szCmdName; }; protected: void setSwitchList(KviKvsTreeNodeSwitchList * sw); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.cpp b/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.cpp index 1fc5b80..e2e71ec 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.cpp @@ -29,7 +29,7 @@ #include "kvi_kvs_runtimecontext.h" #include "kvi_kvs_variant.h" -KviKvsTreeNodeCommandEvaluation::KviKvsTreeNodeCommandEvaluation(const QChar * pLocation,KviKvsTreeNodeInstruction * pInstruction) +KviKvsTreeNodeCommandEvaluation::KviKvsTreeNodeCommandEvaluation(const TQChar * pLocation,KviKvsTreeNodeInstruction * pInstruction) : KviKvsTreeNodeData(pLocation) { #ifdef COMPILE_NEW_KVS diff --git a/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.h b/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.h index 3ff7155..cb8efb3 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.h @@ -35,7 +35,7 @@ class KviKvsVariant; class KviKvsTreeNodeCommandEvaluation : public KviKvsTreeNodeData { public: - KviKvsTreeNodeCommandEvaluation(const QChar * pLocation,KviKvsTreeNodeInstruction * pInstruction); + KviKvsTreeNodeCommandEvaluation(const TQChar * pLocation,KviKvsTreeNodeInstruction * pInstruction); ~KviKvsTreeNodeCommandEvaluation(); protected: KviKvsTreeNodeInstruction * m_pInstruction; // owned, never 0 diff --git a/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.cpp b/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.cpp index dd0544f..3efef2a 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.cpp @@ -27,7 +27,7 @@ #include "kvi_kvs_treenode_commandwithparameters.h" #include "kvi_kvs_treenode_datalist.h" -KviKvsTreeNodeCommandWithParameters::KviKvsTreeNodeCommandWithParameters(const QChar * pLocation,const QString &szCmdName,KviKvsTreeNodeDataList * params) +KviKvsTreeNodeCommandWithParameters::KviKvsTreeNodeCommandWithParameters(const TQChar * pLocation,const TQString &szCmdName,KviKvsTreeNodeDataList * params) : KviKvsTreeNodeCommand(pLocation,szCmdName) { m_pParams = params; @@ -39,10 +39,10 @@ KviKvsTreeNodeCommandWithParameters::~KviKvsTreeNodeCommandWithParameters() delete m_pParams; } -void KviKvsTreeNodeCommandWithParameters::contextDescription(QString &szBuffer) +void KviKvsTreeNodeCommandWithParameters::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS - KviQString::sprintf(szBuffer,"Command With Parameters \"%s\"",&m_szCmdName); + KviTQString::sprintf(szBuffer,"Command With Parameters \"%s\"",&m_szCmdName); #endif } @@ -59,7 +59,7 @@ void KviKvsTreeNodeCommandWithParameters::dump(const char * prefix) void KviKvsTreeNodeCommandWithParameters::dumpParameterList(const char * prefix) { #ifdef COMPILE_NEW_KVS - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pParams->dump(tmp.utf8().data()); #endif diff --git a/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.h b/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.h index 769e72f..f8991fe 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.h @@ -35,13 +35,13 @@ class KVIRC_API KviKvsTreeNodeCommandWithParameters : public KviKvsTreeNodeComma // never instantiated public: // params can't be 0! - KviKvsTreeNodeCommandWithParameters(const QChar * pLocation,const QString &szCmdName,KviKvsTreeNodeDataList * params); + KviKvsTreeNodeCommandWithParameters(const TQChar * pLocation,const TQString &szCmdName,KviKvsTreeNodeDataList * params); ~KviKvsTreeNodeCommandWithParameters(); protected: KviKvsTreeNodeDataList * m_pParams; // never 0 public: KviKvsTreeNodeDataList * params(){ return m_pParams; }; - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); void dumpParameterList(const char * prefix); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp index aae8a9c..c303ceb 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp @@ -30,11 +30,11 @@ #define DEBUGME -KviKvsTreeNodeCompositeData::KviKvsTreeNodeCompositeData(const QChar * pLocation,KviPointerList<KviKvsTreeNodeData> * pSubData) +KviKvsTreeNodeCompositeData::KviKvsTreeNodeCompositeData(const TQChar * pLocation,KviPointerList<KviKvsTreeNodeData> * pSubData) : KviKvsTreeNodeData(pLocation) { #ifdef DEBUGME - if(pSubData->count() < 2)debug("KviKvsTreeNodeCompositeData constructor called with less than two children!"); + if(pSubData->count() < 2)debug("KviKvsTreeNodeCompositeData constructor called with less than two tqchildren!"); #endif m_pSubData = pSubData; m_pSubData->setAutoDelete(true); @@ -50,7 +50,7 @@ KviKvsTreeNodeCompositeData::~KviKvsTreeNodeCompositeData() bool KviKvsTreeNodeCompositeData::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) { - QString * pS = new QString(); + TQString * pS = new TQString(); pBuffer->setString(pS); @@ -68,7 +68,7 @@ bool KviKvsTreeNodeCompositeData::evaluateReadOnly(KviKvsRunTimeContext * c,KviK return true; } -void KviKvsTreeNodeCompositeData::contextDescription(QString &szBuffer) +void KviKvsTreeNodeCompositeData::contextDescription(TQString &szBuffer) { szBuffer = "Composite Data Evaluation (Implicit String Cast)"; } @@ -76,7 +76,7 @@ void KviKvsTreeNodeCompositeData::contextDescription(QString &szBuffer) void KviKvsTreeNodeCompositeData::dump(const char * prefix) { debug("%s CompositeData",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); for(KviKvsTreeNodeData * p = m_pSubData->first();p;p = m_pSubData->next()) { diff --git a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.h b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.h index b9b549b..065a4a7 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.h @@ -33,13 +33,13 @@ class KVIRC_API KviKvsTreeNodeCompositeData : public KviKvsTreeNodeData { public: - KviKvsTreeNodeCompositeData(const QChar * pLocation,KviPointerList<KviKvsTreeNodeData> * pSubData); + KviKvsTreeNodeCompositeData(const TQChar * pLocation,KviPointerList<KviKvsTreeNodeData> * pSubData); ~KviKvsTreeNodeCompositeData(); protected: KviPointerList<KviKvsTreeNodeData> * m_pSubData; public: virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_constantdata.cpp b/src/kvirc/kvs/kvi_kvs_treenode_constantdata.cpp index a52930e..703cb40 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_constantdata.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_constantdata.cpp @@ -27,7 +27,7 @@ #include "kvi_kvs_treenode_constantdata.h" -KviKvsTreeNodeConstantData::KviKvsTreeNodeConstantData(const QChar * pLocation,KviKvsVariant * v) +KviKvsTreeNodeConstantData::KviKvsTreeNodeConstantData(const TQChar * pLocation,KviKvsVariant * v) : KviKvsTreeNodeData(pLocation) { m_pValue = v; @@ -39,7 +39,7 @@ KviKvsTreeNodeConstantData::~KviKvsTreeNodeConstantData() delete m_pValue; } -void KviKvsTreeNodeConstantData::contextDescription(QString &szBuffer) +void KviKvsTreeNodeConstantData::contextDescription(TQString &szBuffer) { szBuffer = "Constant Data Evaluation"; } @@ -68,7 +68,7 @@ bool KviKvsTreeNodeConstantData::convertStringConstantToNumeric() void KviKvsTreeNodeConstantData::dump(const char * prefix) { debug("%s ConstantData",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.prepend(" "); m_pValue->dump(tmp.utf8().data()); } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_constantdata.h b/src/kvirc/kvs/kvi_kvs_treenode_constantdata.h index 4cb0f94..489caac 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_constantdata.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_constantdata.h @@ -33,13 +33,13 @@ class KVIRC_API KviKvsTreeNodeConstantData : public KviKvsTreeNodeData { public: - KviKvsTreeNodeConstantData(const QChar * pLocation,KviKvsVariant * v); + KviKvsTreeNodeConstantData(const TQChar * pLocation,KviKvsVariant * v); ~KviKvsTreeNodeConstantData(); protected: KviKvsVariant * m_pValue; // literal value of the parameter public: virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant *pBuffer); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.cpp index 191a0f6..d71f9eb 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.cpp @@ -31,7 +31,7 @@ #include "kvi_kvs_runtimecontext.h" -KviKvsTreeNodeCoreCallbackCommand::KviKvsTreeNodeCoreCallbackCommand(const QChar * pLocation,const QString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsCoreCallbackCommandExecRoutine * r,KviKvsScript * pCallback) +KviKvsTreeNodeCoreCallbackCommand::KviKvsTreeNodeCoreCallbackCommand(const TQChar * pLocation,const TQString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsCoreCallbackCommandExecRoutine * r,KviKvsScript * pCallback) : KviKvsTreeNodeCallbackCommand(pLocation,szCmdName,params,pCallback) { m_pExecRoutine = r; @@ -41,9 +41,9 @@ KviKvsTreeNodeCoreCallbackCommand::~KviKvsTreeNodeCoreCallbackCommand() { } -void KviKvsTreeNodeCoreCallbackCommand::contextDescription(QString &szBuffer) +void KviKvsTreeNodeCoreCallbackCommand::contextDescription(TQString &szBuffer) { - KviQString::sprintf(szBuffer,"Core Callback Command \"%Q\"",&m_szCmdName); + KviTQString::sprintf(szBuffer,"Core Callback Command \"%Q\"",&m_szCmdName); } void KviKvsTreeNodeCoreCallbackCommand::dump(const char * prefix) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.h b/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.h index fb51415..499db2b 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.h @@ -37,12 +37,12 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeCoreCallbackCommand : public KviKvsTreeNodeCallbackCommand { public: - KviKvsTreeNodeCoreCallbackCommand(const QChar * pLocation,const QString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsCoreCallbackCommandExecRoutine * r,KviKvsScript * pCallback); + KviKvsTreeNodeCoreCallbackCommand(const TQChar * pLocation,const TQString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsCoreCallbackCommandExecRoutine * r,KviKvsScript * pCallback); ~KviKvsTreeNodeCoreCallbackCommand(); protected: KviKvsCoreCallbackCommandExecRoutine * m_pExecRoutine; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.cpp index 713aa39..3c623f7 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.cpp @@ -27,7 +27,7 @@ #include "kvi_kvs_treenode_corefunctioncall.h" #include "kvi_kvs_runtimecontext.h" -KviKvsTreeNodeCoreFunctionCall::KviKvsTreeNodeCoreFunctionCall(const QChar * pLocation,const QString &szFncName,KviKvsCoreFunctionExecRoutine * r,KviKvsTreeNodeDataList * pParams) +KviKvsTreeNodeCoreFunctionCall::KviKvsTreeNodeCoreFunctionCall(const TQChar * pLocation,const TQString &szFncName,KviKvsCoreFunctionExecRoutine * r,KviKvsTreeNodeDataList * pParams) : KviKvsTreeNodeFunctionCall(pLocation,szFncName,pParams) { m_pExecRoutine = r; @@ -37,16 +37,16 @@ KviKvsTreeNodeCoreFunctionCall::~KviKvsTreeNodeCoreFunctionCall() { } -void KviKvsTreeNodeCoreFunctionCall::contextDescription(QString &szBuffer) +void KviKvsTreeNodeCoreFunctionCall::contextDescription(TQString &szBuffer) { - KviQString::sprintf(szBuffer,"Core Function Call \"%Q\"",&m_szFunctionName); + KviTQString::sprintf(szBuffer,"Core Function Call \"%Q\"",&m_szFunctionName); } void KviKvsTreeNodeCoreFunctionCall::dump(const char * prefix) { debug("%s CoreFunctionCall(%s)",prefix,m_szFunctionName.utf8().data()); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pParams->dump(tmp.utf8().data()); } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.h index 88d1f0d..9cbf18d 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.h @@ -35,12 +35,12 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeCoreFunctionCall : public KviKvsTreeNodeFunctionCall { public: - KviKvsTreeNodeCoreFunctionCall(const QChar * pLocation,const QString &szFncName,KviKvsCoreFunctionExecRoutine * r,KviKvsTreeNodeDataList * pParams); + KviKvsTreeNodeCoreFunctionCall(const TQChar * pLocation,const TQString &szFncName,KviKvsCoreFunctionExecRoutine * r,KviKvsTreeNodeDataList * pParams); ~KviKvsTreeNodeCoreFunctionCall(); protected: KviKvsCoreFunctionExecRoutine * m_pExecRoutine; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.cpp index 55fcfc3..1897322 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.cpp @@ -29,7 +29,7 @@ #include "kvi_kvs_treenode_switchlist.h" #include "kvi_kvs_runtimecontext.h" -KviKvsTreeNodeCoreSimpleCommand::KviKvsTreeNodeCoreSimpleCommand(const QChar * pLocation,const QString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsCoreSimpleCommandExecRoutine * r) +KviKvsTreeNodeCoreSimpleCommand::KviKvsTreeNodeCoreSimpleCommand(const TQChar * pLocation,const TQString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsCoreSimpleCommandExecRoutine * r) : KviKvsTreeNodeSimpleCommand(pLocation,szCmdName,params) { m_pExecRoutine = r; @@ -40,9 +40,9 @@ KviKvsTreeNodeCoreSimpleCommand::~KviKvsTreeNodeCoreSimpleCommand() { } -void KviKvsTreeNodeCoreSimpleCommand::contextDescription(QString &szBuffer) +void KviKvsTreeNodeCoreSimpleCommand::contextDescription(TQString &szBuffer) { - KviQString::sprintf(szBuffer,"Core Simple Command \"%Q\"",&m_szCmdName); + KviTQString::sprintf(szBuffer,"Core Simple Command \"%Q\"",&m_szCmdName); } void KviKvsTreeNodeCoreSimpleCommand::dump(const char * prefix) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.h b/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.h index 764914e..290b0cf 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.h @@ -35,12 +35,12 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeCoreSimpleCommand : public KviKvsTreeNodeSimpleCommand { public: - KviKvsTreeNodeCoreSimpleCommand(const QChar * pLocation,const QString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsCoreSimpleCommandExecRoutine * r); + KviKvsTreeNodeCoreSimpleCommand(const TQChar * pLocation,const TQString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsCoreSimpleCommandExecRoutine * r); ~KviKvsTreeNodeCoreSimpleCommand(); private: KviKvsCoreSimpleCommandExecRoutine * m_pExecRoutine; // shallow pointer! public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_data.cpp b/src/kvirc/kvs/kvi_kvs_treenode_data.cpp index 6d5ad63..e7b68c5 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_data.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_data.cpp @@ -28,7 +28,7 @@ #include "kvi_locale.h" -KviKvsTreeNodeData::KviKvsTreeNodeData(const QChar * pLocation) +KviKvsTreeNodeData::KviKvsTreeNodeData(const TQChar * pLocation) : KviKvsTreeNode(pLocation), m_pEndingLocation(0) { } @@ -38,7 +38,7 @@ KviKvsTreeNodeData::~KviKvsTreeNodeData() { } -void KviKvsTreeNodeData::contextDescription(QString &szBuffer) +void KviKvsTreeNodeData::contextDescription(TQString &szBuffer) { szBuffer = "Data Evaluation"; } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_data.h b/src/kvirc/kvs/kvi_kvs_treenode_data.h index dd1e3c6..18d8d7b 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_data.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_data.h @@ -34,13 +34,13 @@ class KviKvsObject; class KVIRC_API KviKvsTreeNodeData : public KviKvsTreeNode { public: - KviKvsTreeNodeData(const QChar * pLocation); + KviKvsTreeNodeData(const TQChar * pLocation); ~KviKvsTreeNodeData(); protected: - const QChar * m_pEndingLocation; // note that this MIGHT be not set (it's set for sure for anything parsed by parseCommaSeparatedParameter() + const TQChar * m_pEndingLocation; // note that this MIGHT be not set (it's set for sure for anything parsed by parseCommaSeparatedParameter() public: - void setEndingLocation(const QChar * pEndingLocation){ m_pEndingLocation = pEndingLocation; }; - const QChar * endingLocation(){ return m_pEndingLocation; }; + void setEndingLocation(const TQChar * pEndingLocation){ m_pEndingLocation = pEndingLocation; }; + const TQChar * endingLocation(){ return m_pEndingLocation; }; virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); // error by default @@ -48,7 +48,7 @@ public: virtual bool evaluateReadOnlyInObjectScope(KviKvsObject * o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); // error by default virtual KviKvsRWEvaluationResult * evaluateReadWriteInObjectScope(KviKvsObject * o,KviKvsRunTimeContext * c); // error by default - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool isReadOnly(); // true by default diff --git a/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp b/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp index 18da828..68a6770 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp @@ -29,7 +29,7 @@ #include "kvi_qstring.h" -KviKvsTreeNodeDataList::KviKvsTreeNodeDataList(const QChar * pLocation) +KviKvsTreeNodeDataList::KviKvsTreeNodeDataList(const TQChar * pLocation) : KviKvsTreeNode(pLocation) { m_pDataList = new KviPointerList<KviKvsTreeNodeData>(); @@ -60,7 +60,7 @@ KviKvsTreeNodeData * KviKvsTreeNodeDataList::item(unsigned int uIdx) } -void KviKvsTreeNodeDataList::contextDescription(QString &szBuffer) +void KviKvsTreeNodeDataList::contextDescription(TQString &szBuffer) { szBuffer = "Data List Evaluation"; } @@ -68,7 +68,7 @@ void KviKvsTreeNodeDataList::contextDescription(QString &szBuffer) void KviKvsTreeNodeDataList::dump(const char * prefix) { debug("%s DataList",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); for(KviKvsTreeNodeData * t = m_pDataList->first();t;t = m_pDataList->next()) { diff --git a/src/kvirc/kvs/kvi_kvs_treenode_datalist.h b/src/kvirc/kvs/kvi_kvs_treenode_datalist.h index 1a370a4..50c2f64 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_datalist.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_datalist.h @@ -38,7 +38,7 @@ class KVIRC_API KviKvsTreeNodeDataList : public KviKvsTreeNode { friend class KviKvsParser; public: - KviKvsTreeNodeDataList(const QChar * pLocation); + KviKvsTreeNodeDataList(const TQChar * pLocation); ~KviKvsTreeNodeDataList(); protected: KviPointerList<KviKvsTreeNodeData> * m_pDataList; @@ -49,7 +49,7 @@ public: KviKvsTreeNodeData * item(unsigned int uIdx); KviKvsTreeNodeData * releaseFirst(); bool evaluate(KviKvsRunTimeContext * c,KviKvsVariantList * pBuffer); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp b/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp index ae3ec45..837ef84 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp @@ -29,7 +29,7 @@ #include <math.h> -KviKvsTreeNodeExpression::KviKvsTreeNodeExpression(const QChar * pLocation) +KviKvsTreeNodeExpression::KviKvsTreeNodeExpression(const TQChar * pLocation) : KviKvsTreeNodeData(pLocation) { m_pParentExpression = 0; @@ -40,7 +40,7 @@ KviKvsTreeNodeExpression::~KviKvsTreeNodeExpression() } -void KviKvsTreeNodeExpression::contextDescription(QString &szBuffer) +void KviKvsTreeNodeExpression::contextDescription(TQString &szBuffer) { szBuffer = "Expression Evaluation"; } @@ -77,11 +77,11 @@ void KviKvsTreeNodeExpression::setRight(KviKvsTreeNodeExpression *) debug("KviKvsTreeNodeExpression::setRight() : should never end up here!"); } -KviKvsTreeNodeExpression * KviKvsTreeNodeExpression::parentWithPrecedenceLowerThan(int iPrec) +KviKvsTreeNodeExpression * KviKvsTreeNodeExpression::tqparentWithPrecedenceLowerThan(int iPrec) { if(precedence() > iPrec)return this; - if(!parentExpression())return 0; - return parentExpression()->parentWithPrecedenceLowerThan(iPrec); + if(!tqparentExpression())return 0; + return tqparentExpression()->tqparentWithPrecedenceLowerThan(iPrec); } int KviKvsTreeNodeExpression::firstBinaryOperator() @@ -93,7 +93,7 @@ int KviKvsTreeNodeExpression::firstBinaryOperator() /////////////////////////////////////////////////////////////////////////////// -KviKvsTreeNodeExpressionVariableOperand::KviKvsTreeNodeExpressionVariableOperand(const QChar * pLocation,KviKvsTreeNodeData * pData) +KviKvsTreeNodeExpressionVariableOperand::KviKvsTreeNodeExpressionVariableOperand(const TQChar * pLocation,KviKvsTreeNodeData * pData) : KviKvsTreeNodeExpression(pLocation) { m_pData = pData; @@ -105,7 +105,7 @@ KviKvsTreeNodeExpressionVariableOperand::~KviKvsTreeNodeExpressionVariableOperan delete m_pData; } -void KviKvsTreeNodeExpressionVariableOperand::contextDescription(QString &szBuffer) +void KviKvsTreeNodeExpressionVariableOperand::contextDescription(TQString &szBuffer) { szBuffer = "Expression Variable Operand Evaluation"; } @@ -113,7 +113,7 @@ void KviKvsTreeNodeExpressionVariableOperand::contextDescription(QString &szBuff void KviKvsTreeNodeExpressionVariableOperand::dump(const char * prefix) { debug("%s ExpressionVariableOperand",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pData->dump(tmp.utf8().data()); } @@ -126,7 +126,7 @@ bool KviKvsTreeNodeExpressionVariableOperand::evaluateReadOnly(KviKvsRunTimeCont /////////////////////////////////////////////////////////////////////////////// -KviKvsTreeNodeExpressionConstantOperand::KviKvsTreeNodeExpressionConstantOperand(const QChar * pLocation,KviKvsVariant * pConstant) +KviKvsTreeNodeExpressionConstantOperand::KviKvsTreeNodeExpressionConstantOperand(const TQChar * pLocation,KviKvsVariant * pConstant) : KviKvsTreeNodeExpression(pLocation) { #ifdef COMPILE_NEW_KVS @@ -141,7 +141,7 @@ KviKvsTreeNodeExpressionConstantOperand::~KviKvsTreeNodeExpressionConstantOperan #endif } -void KviKvsTreeNodeExpressionConstantOperand::contextDescription(QString &szBuffer) +void KviKvsTreeNodeExpressionConstantOperand::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Expression Constant Operand Evaluation"; @@ -153,7 +153,7 @@ void KviKvsTreeNodeExpressionConstantOperand::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s ExpressionConstantOperand",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pConstant->dump(tmp.utf8().data()); #endif @@ -170,7 +170,7 @@ bool KviKvsTreeNodeExpressionConstantOperand::evaluateReadOnly(KviKvsRunTimeCont /////////////////////////////////////////////////////////////////////////////// -KviKvsTreeNodeExpressionOperator::KviKvsTreeNodeExpressionOperator(const QChar * pLocation) +KviKvsTreeNodeExpressionOperator::KviKvsTreeNodeExpressionOperator(const TQChar * pLocation) : KviKvsTreeNodeExpression(pLocation) { } @@ -179,7 +179,7 @@ KviKvsTreeNodeExpressionOperator::~KviKvsTreeNodeExpressionOperator() { } -void KviKvsTreeNodeExpressionOperator::contextDescription(QString &szBuffer) +void KviKvsTreeNodeExpressionOperator::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Expression Operator Evaluation"; @@ -199,7 +199,7 @@ void KviKvsTreeNodeExpressionOperator::dump(const char * prefix) /////////////////////////////////////////////////////////////////////////////// -KviKvsTreeNodeExpressionUnaryOperator::KviKvsTreeNodeExpressionUnaryOperator(const QChar * pLocation,KviKvsTreeNodeExpression * pData) +KviKvsTreeNodeExpressionUnaryOperator::KviKvsTreeNodeExpressionUnaryOperator(const TQChar * pLocation,KviKvsTreeNodeExpression * pData) : KviKvsTreeNodeExpressionOperator(pLocation) { #ifdef COMPILE_NEW_KVS @@ -216,7 +216,7 @@ KviKvsTreeNodeExpressionUnaryOperator::~KviKvsTreeNodeExpressionUnaryOperator() #endif } -void KviKvsTreeNodeExpressionUnaryOperator::contextDescription(QString &szBuffer) +void KviKvsTreeNodeExpressionUnaryOperator::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Expression Unary Operator Evaluation"; @@ -230,7 +230,7 @@ void KviKvsTreeNodeExpressionUnaryOperator::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s ExpressionUnaryOperator",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pData->dump(tmp.utf8().data()); #endif @@ -254,7 +254,7 @@ bool KviKvsTreeNodeExpressionUnaryOperator::evaluateOperand(KviKvsRunTimeContext /////////////////////////////////////////////////////////////////////////////// -KviKvsTreeNodeExpressionUnaryOperatorNegate::KviKvsTreeNodeExpressionUnaryOperatorNegate(const QChar * pLocation,KviKvsTreeNodeExpression * pData) +KviKvsTreeNodeExpressionUnaryOperatorNegate::KviKvsTreeNodeExpressionUnaryOperatorNegate(const TQChar * pLocation,KviKvsTreeNodeExpression * pData) : KviKvsTreeNodeExpressionUnaryOperator(pLocation,pData) { } @@ -264,7 +264,7 @@ KviKvsTreeNodeExpressionUnaryOperatorNegate::~KviKvsTreeNodeExpressionUnaryOpera } -void KviKvsTreeNodeExpressionUnaryOperatorNegate::contextDescription(QString &szBuffer) +void KviKvsTreeNodeExpressionUnaryOperatorNegate::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Expression Unary Operator Negate"; @@ -276,7 +276,7 @@ void KviKvsTreeNodeExpressionUnaryOperatorNegate::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s ExpressionUnaryOperatorNegate",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pData->dump(tmp.utf8().data()); #endif @@ -301,7 +301,7 @@ bool KviKvsTreeNodeExpressionUnaryOperatorNegate::evaluateReadOnly(KviKvsRunTime /////////////////////////////////////////////////////////////////////////////// -KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot(const QChar * pLocation,KviKvsTreeNodeExpression * pData) +KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot(const TQChar * pLocation,KviKvsTreeNodeExpression * pData) : KviKvsTreeNodeExpressionUnaryOperator(pLocation,pData) { } @@ -310,7 +310,7 @@ KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::~KviKvsTreeNodeExpressionUnaryO { } -void KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::contextDescription(QString &szBuffer) +void KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Expression Unary Operator Bitwise Not"; @@ -321,7 +321,7 @@ void KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s ExpressionUnaryOperatorBitwiseNot",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pData->dump(tmp.utf8().data()); #endif @@ -346,7 +346,7 @@ bool KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::evaluateReadOnly(KviKvsRun /////////////////////////////////////////////////////////////////////////////// -KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::KviKvsTreeNodeExpressionUnaryOperatorLogicalNot(const QChar * pLocation,KviKvsTreeNodeExpression * pData) +KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::KviKvsTreeNodeExpressionUnaryOperatorLogicalNot(const TQChar * pLocation,KviKvsTreeNodeExpression * pData) : KviKvsTreeNodeExpressionUnaryOperator(pLocation,pData) { } @@ -355,7 +355,7 @@ KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::~KviKvsTreeNodeExpressionUnaryO { } -void KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::contextDescription(QString &szBuffer) +void KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Expression Unary Operator Logical Not"; @@ -366,7 +366,7 @@ void KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s ExpressionUnaryOperatorLogicalNot",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pData->dump(tmp.utf8().data()); #endif @@ -393,7 +393,7 @@ bool KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::evaluateReadOnly(KviKvsRun /////////////////////////////////////////////////////////////////////////////// -KviKvsTreeNodeExpressionBinaryOperator::KviKvsTreeNodeExpressionBinaryOperator(const QChar * pLocation) +KviKvsTreeNodeExpressionBinaryOperator::KviKvsTreeNodeExpressionBinaryOperator(const TQChar * pLocation) : KviKvsTreeNodeExpressionOperator(pLocation) { m_pLeft = 0; @@ -457,13 +457,13 @@ void KviKvsTreeNodeExpressionBinaryOperator::setRight(KviKvsTreeNodeExpression * void KviKvsTreeNodeExpressionBinaryOperator::dumpOperands(const char * prefix) { - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); if(m_pLeft)m_pLeft->dump(tmp.utf8().data()); if(m_pRight)m_pRight->dump(tmp.utf8().data()); } -void KviKvsTreeNodeExpressionBinaryOperator::contextDescription(QString &szBuffer) +void KviKvsTreeNodeExpressionBinaryOperator::contextDescription(TQString &szBuffer) { szBuffer = "Expression Binary Operator"; } @@ -478,11 +478,11 @@ void KviKvsTreeNodeExpressionBinaryOperator::dump(const char * prefix) #define PREIMPLEMENT_BINARY_OPERATOR(__name,__stringname,__contextdescription,__precedence) \ - __name::__name(const QChar * pLocation) \ + __name::__name(const TQChar * pLocation) \ : KviKvsTreeNodeExpressionBinaryOperator(pLocation){} \ __name::~__name(){} \ void __name::dump(const char * prefix){ debug("%s " __stringname,prefix); dumpOperands(prefix); } \ - void __name::contextDescription(QString &szBuffer){ szBuffer = __contextdescription; } \ + void __name::contextDescription(TQString &szBuffer){ szBuffer = __contextdescription; } \ int __name::precedence(){ return __precedence; }; PREIMPLEMENT_BINARY_OPERATOR(KviKvsTreeNodeExpressionBinaryOperatorSum,"ExpressionBinaryOperatorSum","Expression Binary Operator \"+\"",PREC_OP_SUM) @@ -726,7 +726,7 @@ bool KviKvsTreeNodeExpressionBinaryOperatorGreaterThan::evaluateReadOnly(KviKvsR return true; } -PREIMPLEMENT_BINARY_OPERATOR(KviKvsTreeNodeExpressionBinaryOperatorLowerOrEqualTo,"ExpressionBinaryOperatorLowerOrEqualTo","Expression Binary Operator \"<=\"",PREC_OP_LOWEROREQUALTO) +PREIMPLEMENT_BINARY_OPERATOR(KviKvsTreeNodeExpressionBinaryOperatorLowerOrEqualTo,"ExpressionBinaryOperatorLowerOrEqualTo","Expression Binary Operator \"<=\"",PREC_OP_LOWERORETQUALTO) bool KviKvsTreeNodeExpressionBinaryOperatorLowerOrEqualTo::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) { @@ -738,7 +738,7 @@ bool KviKvsTreeNodeExpressionBinaryOperatorLowerOrEqualTo::evaluateReadOnly(KviK return true; } -PREIMPLEMENT_BINARY_OPERATOR(KviKvsTreeNodeExpressionBinaryOperatorGreaterOrEqualTo,"ExpressionBinaryOperatorGreaterOrEqualTo","Expression Binary Operator \">=\"",PREC_OP_GREATEROREQUALTO) +PREIMPLEMENT_BINARY_OPERATOR(KviKvsTreeNodeExpressionBinaryOperatorGreaterOrEqualTo,"ExpressionBinaryOperatorGreaterOrEqualTo","Expression Binary Operator \">=\"",PREC_OP_GREATERORETQUALTO) bool KviKvsTreeNodeExpressionBinaryOperatorGreaterOrEqualTo::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) { @@ -763,7 +763,7 @@ bool KviKvsTreeNodeExpressionBinaryOperatorEqualTo::evaluateReadOnly(KviKvsRunTi } -PREIMPLEMENT_BINARY_OPERATOR(KviKvsTreeNodeExpressionBinaryOperatorNotEqualTo,"ExpressionBinaryOperatorNotEqualTo","Expression Binary Operator \"!=\"",PREC_OP_NOTEQUALTO) +PREIMPLEMENT_BINARY_OPERATOR(KviKvsTreeNodeExpressionBinaryOperatorNotEqualTo,"ExpressionBinaryOperatorNotEqualTo","Expression Binary Operator \"!=\"",PREC_OP_NOTETQUALTO) bool KviKvsTreeNodeExpressionBinaryOperatorNotEqualTo::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) { diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expression.h b/src/kvirc/kvs/kvi_kvs_treenode_expression.h index 948066d..3ab8fd5 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_expression.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_expression.h @@ -56,10 +56,10 @@ #define PREC_OP_EQUALTO 12 /* == */ /* Case sensitive comparison for strings or normal comp.fr numbers */ -#define PREC_OP_GREATEROREQUALTO 14 /* >= */ /* Case sensitive (normal for numbers) */ -#define PREC_OP_LOWEROREQUALTO 14 /* <= */ /* Case sensitive (normal for numbers) */ +#define PREC_OP_GREATERORETQUALTO 14 /* >= */ /* Case sensitive (normal for numbers) */ +#define PREC_OP_LOWERORETQUALTO 14 /* <= */ /* Case sensitive (normal for numbers) */ -#define PREC_OP_NOTEQUALTO 15 /* != */ /* Case sensitive (normal for numbers) */ +#define PREC_OP_NOTETQUALTO 15 /* != */ /* Case sensitive (normal for numbers) */ #define PREC_OP_AND 16 /* && */ #define PREC_OP_OR 17 /* || */ @@ -71,12 +71,12 @@ class KVIRC_API KviKvsTreeNodeExpression : public KviKvsTreeNodeData { // this class is never instantiated public: - KviKvsTreeNodeExpression(const QChar * pLocation); + KviKvsTreeNodeExpression(const TQChar * pLocation); ~KviKvsTreeNodeExpression(); protected: KviKvsTreeNodeExpression * m_pParentExpression; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual int precedence(); virtual KviKvsTreeNodeExpression * left(); @@ -84,21 +84,21 @@ public: virtual void setLeft(KviKvsTreeNodeExpression * pLeft); virtual void setRight(KviKvsTreeNodeExpression * pRight); virtual int firstBinaryOperator(); - KviKvsTreeNodeExpression * parentExpression(){ return m_pParentExpression; }; + KviKvsTreeNodeExpression * tqparentExpression(){ return m_pParentExpression; }; void setParentExpression(KviKvsTreeNodeExpression * pParent){ m_pParentExpression = pParent; }; - virtual KviKvsTreeNodeExpression * parentWithPrecedenceLowerThan(int iPrec); + virtual KviKvsTreeNodeExpression * tqparentWithPrecedenceLowerThan(int iPrec); }; class KVIRC_API KviKvsTreeNodeExpressionVariableOperand : public KviKvsTreeNodeExpression { public: - KviKvsTreeNodeExpressionVariableOperand(const QChar * pLocation,KviKvsTreeNodeData * pData); + KviKvsTreeNodeExpressionVariableOperand(const TQChar * pLocation,KviKvsTreeNodeData * pData); ~KviKvsTreeNodeExpressionVariableOperand(); protected: KviKvsTreeNodeData * m_pData; // can't be null public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); }; @@ -107,12 +107,12 @@ public: class KVIRC_API KviKvsTreeNodeExpressionConstantOperand : public KviKvsTreeNodeExpression { public: - KviKvsTreeNodeExpressionConstantOperand(const QChar * pLocation,KviKvsVariant * pConstant); + KviKvsTreeNodeExpressionConstantOperand(const TQChar * pLocation,KviKvsVariant * pConstant); ~KviKvsTreeNodeExpressionConstantOperand(); public: KviKvsVariant * m_pConstant; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); }; @@ -132,23 +132,23 @@ public: class KVIRC_API KviKvsTreeNodeExpressionOperator : public KviKvsTreeNodeExpression { public: - KviKvsTreeNodeExpressionOperator(const QChar * pLocation); + KviKvsTreeNodeExpressionOperator(const TQChar * pLocation); ~KviKvsTreeNodeExpressionOperator(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); }; class KVIRC_API KviKvsTreeNodeExpressionUnaryOperator : public KviKvsTreeNodeExpressionOperator { public: - KviKvsTreeNodeExpressionUnaryOperator(const QChar * pLocation,KviKvsTreeNodeExpression * pData); + KviKvsTreeNodeExpressionUnaryOperator(const TQChar * pLocation,KviKvsTreeNodeExpression * pData); ~KviKvsTreeNodeExpressionUnaryOperator(); protected: KviKvsTreeNodeExpression * m_pData; // can't be null! KviKvsNumber m_nData; // result of the number evaluation public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); bool evaluateOperand(KviKvsRunTimeContext * c); }; @@ -156,11 +156,11 @@ public: class KVIRC_API KviKvsTreeNodeExpressionUnaryOperatorNegate : public KviKvsTreeNodeExpressionUnaryOperator { public: - KviKvsTreeNodeExpressionUnaryOperatorNegate(const QChar * pLocation,KviKvsTreeNodeExpression * pData); + KviKvsTreeNodeExpressionUnaryOperatorNegate(const TQChar * pLocation,KviKvsTreeNodeExpression * pData); ~KviKvsTreeNodeExpressionUnaryOperatorNegate(); public: virtual int precedence(); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); }; @@ -168,11 +168,11 @@ public: class KVIRC_API KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot : public KviKvsTreeNodeExpressionUnaryOperator { public: - KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot(const QChar * pLocation,KviKvsTreeNodeExpression * pData); + KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot(const TQChar * pLocation,KviKvsTreeNodeExpression * pData); ~KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot(); public: virtual int precedence(); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); }; @@ -180,11 +180,11 @@ public: class KVIRC_API KviKvsTreeNodeExpressionUnaryOperatorLogicalNot : public KviKvsTreeNodeExpressionUnaryOperator { public: - KviKvsTreeNodeExpressionUnaryOperatorLogicalNot(const QChar * pLocation,KviKvsTreeNodeExpression * pData); + KviKvsTreeNodeExpressionUnaryOperatorLogicalNot(const TQChar * pLocation,KviKvsTreeNodeExpression * pData); ~KviKvsTreeNodeExpressionUnaryOperatorLogicalNot(); public: virtual int precedence(); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); }; @@ -192,7 +192,7 @@ public: class KVIRC_API KviKvsTreeNodeExpressionBinaryOperator : public KviKvsTreeNodeExpressionOperator { public: - KviKvsTreeNodeExpressionBinaryOperator(const QChar * pLocation); + KviKvsTreeNodeExpressionBinaryOperator(const TQChar * pLocation); ~KviKvsTreeNodeExpressionBinaryOperator(); protected: KviKvsTreeNodeExpression * m_pLeft; // can be zero only during parsing (and thus when deleting) @@ -207,7 +207,7 @@ public: virtual int firstBinaryOperator(); public: void dumpOperands(const char * prefix); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); protected: bool evaluateOperands(KviKvsRunTimeContext * c); @@ -217,10 +217,10 @@ protected: class KVIRC_API __name : public KviKvsTreeNodeExpressionBinaryOperator \ { \ public: \ - __name(const QChar * pLocation); \ + __name(const TQChar * pLocation); \ ~__name(); \ public: \ - virtual void contextDescription(QString &szBuffer); \ + virtual void contextDescription(TQString &szBuffer); \ virtual void dump(const char * prefix); \ virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); \ virtual int precedence(); \ diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.cpp b/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.cpp index 28c41b1..1825093 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.cpp @@ -28,7 +28,7 @@ #include "kvi_kvs_runtimecontext.h" #include "kvi_locale.h" -KviKvsTreeNodeExpressionReturn::KviKvsTreeNodeExpressionReturn(const QChar * pLocation,KviKvsTreeNodeExpression * pExpression) +KviKvsTreeNodeExpressionReturn::KviKvsTreeNodeExpressionReturn(const TQChar * pLocation,KviKvsTreeNodeExpression * pExpression) : KviKvsTreeNodeInstruction(pLocation) { #ifdef COMPILE_NEW_KVS @@ -45,7 +45,7 @@ KviKvsTreeNodeExpressionReturn::~KviKvsTreeNodeExpressionReturn() } -void KviKvsTreeNodeExpressionReturn::contextDescription(QString &szBuffer) +void KviKvsTreeNodeExpressionReturn::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Expression Return Evaluation"; @@ -56,7 +56,7 @@ void KviKvsTreeNodeExpressionReturn::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s ExpressionReturn",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp += " "; m_pExpression->dump(tmp.utf8().data()); #endif diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.h b/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.h index 8622da0..7654c53 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.h @@ -32,12 +32,12 @@ class KviKvsTreeNodeExpression; class KVIRC_API KviKvsTreeNodeExpressionReturn : public KviKvsTreeNodeInstruction { public: - KviKvsTreeNodeExpressionReturn(const QChar * pLocation,KviKvsTreeNodeExpression * pExpression); + KviKvsTreeNodeExpressionReturn(const TQChar * pLocation,KviKvsTreeNodeExpression * pExpression); ~KviKvsTreeNodeExpressionReturn(); protected: KviKvsTreeNodeExpression * m_pExpression; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp index 4990674..74f5829 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp @@ -28,7 +28,7 @@ #include "kvi_kvs_runtimecontext.h" #include "kvi_locale.h" -KviKvsTreeNodeExtendedScopeVariable::KviKvsTreeNodeExtendedScopeVariable(const QChar * pLocation,const QString &szIdentifier) +KviKvsTreeNodeExtendedScopeVariable::KviKvsTreeNodeExtendedScopeVariable(const TQChar * pLocation,const TQString &szIdentifier) : KviKvsTreeNodeVariable(pLocation,szIdentifier) { } @@ -37,7 +37,7 @@ KviKvsTreeNodeExtendedScopeVariable::~KviKvsTreeNodeExtendedScopeVariable() { } -void KviKvsTreeNodeExtendedScopeVariable::contextDescription(QString &szBuffer) +void KviKvsTreeNodeExtendedScopeVariable::contextDescription(TQString &szBuffer) { szBuffer = "Extended Scope Variable \""; szBuffer += m_szIdentifier; @@ -57,7 +57,7 @@ bool KviKvsTreeNodeExtendedScopeVariable::evaluateReadOnly(KviKvsRunTimeContext return false; } - KviKvsVariant * v = c->extendedScopeVariables()->find(m_szIdentifier); + KviKvsVariant * v = c->extendedScopeVariables()->tqfind(m_szIdentifier); if(v) { pBuffer->copyFrom(v); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.h b/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.h index 06fba6e..84fadc8 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.h @@ -33,10 +33,10 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeExtendedScopeVariable : public KviKvsTreeNodeVariable { public: - KviKvsTreeNodeExtendedScopeVariable(const QChar * pLocation,const QString &szIdentifier); + KviKvsTreeNodeExtendedScopeVariable(const TQChar * pLocation,const TQString &szIdentifier); ~KviKvsTreeNodeExtendedScopeVariable(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_functioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_functioncall.cpp index 1f8403e..81be2cd 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_functioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_functioncall.cpp @@ -27,7 +27,7 @@ #include "kvi_kvs_treenode_functioncall.h" -KviKvsTreeNodeFunctionCall::KviKvsTreeNodeFunctionCall(const QChar * pLocation,const QString &szFunctionName,KviKvsTreeNodeDataList * pParams) +KviKvsTreeNodeFunctionCall::KviKvsTreeNodeFunctionCall(const TQChar * pLocation,const TQString &szFunctionName,KviKvsTreeNodeDataList * pParams) : KviKvsTreeNodeData(pLocation) { m_szFunctionName = szFunctionName; @@ -40,7 +40,7 @@ KviKvsTreeNodeFunctionCall::~KviKvsTreeNodeFunctionCall() delete m_pParams; } -void KviKvsTreeNodeFunctionCall::contextDescription(QString &szBuffer) +void KviKvsTreeNodeFunctionCall::contextDescription(TQString &szBuffer) { szBuffer = "Function Call"; } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_functioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_functioncall.h index 88d8250..c437810 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_functioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_functioncall.h @@ -31,13 +31,13 @@ class KVIRC_API KviKvsTreeNodeFunctionCall : public KviKvsTreeNodeData { public: - KviKvsTreeNodeFunctionCall(const QChar * pLocation,const QString &szFunctionName,KviKvsTreeNodeDataList * pParams); + KviKvsTreeNodeFunctionCall(const TQChar * pLocation,const TQString &szFunctionName,KviKvsTreeNodeDataList * pParams); ~KviKvsTreeNodeFunctionCall(); protected: - QString m_szFunctionName; + TQString m_szFunctionName; KviKvsTreeNodeDataList * m_pParams; // never 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool canEvaluateToObjectReference(); // yes virtual bool isFunctionCall(); // yes diff --git a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp index ea6bd03..a74ebc0 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp @@ -27,7 +27,7 @@ #include "kvi_kvs_treenode_globalvariable.h" #include "kvi_kvs_runtimecontext.h" -KviKvsTreeNodeGlobalVariable::KviKvsTreeNodeGlobalVariable(const QChar * pLocation,const QString &szIdentifier) +KviKvsTreeNodeGlobalVariable::KviKvsTreeNodeGlobalVariable(const TQChar * pLocation,const TQString &szIdentifier) : KviKvsTreeNodeVariable(pLocation,szIdentifier) { } @@ -36,7 +36,7 @@ KviKvsTreeNodeGlobalVariable::~KviKvsTreeNodeGlobalVariable() { } -void KviKvsTreeNodeGlobalVariable::contextDescription(QString &szBuffer) +void KviKvsTreeNodeGlobalVariable::contextDescription(TQString &szBuffer) { szBuffer = "Global Variable \""; szBuffer += m_szIdentifier; @@ -51,7 +51,7 @@ void KviKvsTreeNodeGlobalVariable::dump(const char * prefix) bool KviKvsTreeNodeGlobalVariable::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) { - KviKvsVariant * v = c->globalVariables()->find(m_szIdentifier); + KviKvsVariant * v = c->globalVariables()->tqfind(m_szIdentifier); if(v)pBuffer->copyFrom(v); else pBuffer->setNothing(); return true; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.h b/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.h index 9f6bcf0..a30430a 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.h @@ -33,10 +33,10 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeGlobalVariable : public KviKvsTreeNodeVariable { public: - KviKvsTreeNodeGlobalVariable(const QChar * pLocation,const QString &szIdentifier); + KviKvsTreeNodeGlobalVariable(const TQChar * pLocation,const TQString &szIdentifier); ~KviKvsTreeNodeGlobalVariable(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashcount.cpp b/src/kvirc/kvs/kvi_kvs_treenode_hashcount.cpp index 3ecfaf5..9e1a3c0 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_hashcount.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_hashcount.cpp @@ -31,7 +31,7 @@ #include "kvi_locale.h" -KviKvsTreeNodeHashCount::KviKvsTreeNodeHashCount(const QChar * pLocation,KviKvsTreeNodeData * pSource) +KviKvsTreeNodeHashCount::KviKvsTreeNodeHashCount(const TQChar * pLocation,KviKvsTreeNodeData * pSource) : KviKvsTreeNodeIndirectData(pLocation,pSource) { } @@ -40,7 +40,7 @@ KviKvsTreeNodeHashCount::~KviKvsTreeNodeHashCount() { } -void KviKvsTreeNodeHashCount::contextDescription(QString &szBuffer) +void KviKvsTreeNodeHashCount::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Hash Count Operator"; @@ -69,7 +69,7 @@ bool KviKvsTreeNodeHashCount::evaluateReadOnlyInObjectScope(KviKvsObject *o,KviK { if(!val.isNothing()) { - QString szType; + TQString szType; val.getTypeName(szType); c->warning(this,__tr2qs("The argument of the hash count '#' operator didn't evaluate to a hash: automatic conversion from type '%Q' supplied"),&szType); } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashcount.h b/src/kvirc/kvs/kvi_kvs_treenode_hashcount.h index b59cf37..9119bde 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_hashcount.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_hashcount.h @@ -35,10 +35,10 @@ class KviKvsObject; class KVIRC_API KviKvsTreeNodeHashCount : public KviKvsTreeNodeIndirectData { public: - KviKvsTreeNodeHashCount(const QChar * pLocation,KviKvsTreeNodeData * pSource); + KviKvsTreeNodeHashCount(const TQChar * pLocation,KviKvsTreeNodeData * pSource); ~KviKvsTreeNodeHashCount(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject *o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp b/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp index 645478f..196b992 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp @@ -30,7 +30,7 @@ #include "kvi_kvs_hash.h" #include "kvi_kvs_object.h" -KviKvsTreeNodeHashElement::KviKvsTreeNodeHashElement(const QChar * pLocation,KviKvsTreeNodeData * pSource,KviKvsTreeNodeData * pKey) +KviKvsTreeNodeHashElement::KviKvsTreeNodeHashElement(const TQChar * pLocation,KviKvsTreeNodeData * pSource,KviKvsTreeNodeData * pKey) : KviKvsTreeNodeArrayOrHashElement(pLocation,pSource) { #ifdef COMPILE_NEW_KVS @@ -47,7 +47,7 @@ KviKvsTreeNodeHashElement::~KviKvsTreeNodeHashElement() #endif } -void KviKvsTreeNodeHashElement::contextDescription(QString &szBuffer) +void KviKvsTreeNodeHashElement::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Hash Element Evaluation"; @@ -58,7 +58,7 @@ void KviKvsTreeNodeHashElement::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s HashElement",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pSource->dump(tmp.utf8().data()); m_pKey->dump(tmp.utf8().data()); @@ -72,7 +72,7 @@ bool KviKvsTreeNodeHashElement::evaluateReadOnlyInObjectScope(KviKvsObject *o,Kv KviKvsVariant key; if(!m_pKey->evaluateReadOnly(c,&key))return false; - QString szKey; + TQString szKey; key.asString(szKey); if(szKey.isEmpty()) @@ -94,7 +94,7 @@ bool KviKvsTreeNodeHashElement::evaluateReadOnlyInObjectScope(KviKvsObject *o,Kv { if(!val.isNothing()) { - QString szType; + TQString szType; val.getTypeName(szType); c->warning(this,__tr2qs("The argument of the {} subscript didn't evaluate to a hash: automatic conversion from type '%Q' supplied"),&szType); } @@ -102,7 +102,7 @@ bool KviKvsTreeNodeHashElement::evaluateReadOnlyInObjectScope(KviKvsObject *o,Kv return true; } - KviKvsVariant * v = val.hash()->find(szKey); + KviKvsVariant * v = val.hash()->tqfind(szKey); if(!v) { pBuffer->setNothing(); @@ -120,7 +120,7 @@ KviKvsRWEvaluationResult * KviKvsTreeNodeHashElement::evaluateReadWriteInObjectS KviKvsVariant key; if(!m_pKey->evaluateReadOnly(c,&key))return 0; - QString szKey; + TQString szKey; key.asString(szKey); if(szKey.isEmpty()) @@ -139,7 +139,7 @@ KviKvsRWEvaluationResult * KviKvsTreeNodeHashElement::evaluateReadWriteInObjectS //#warning "Supply a *real* conversion from other types to array ?" if(!result->result()->isNothing()) { - QString szType; + TQString szType; result->result()->getTypeName(szType); c->warning(this,__tr2qs("The argument of the {} subscript didn't evaluate to a hash automatic conversion from %Q supplied"),&szType); } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.h b/src/kvirc/kvs/kvi_kvs_treenode_hashelement.h index 5b46a7e..ce36d12 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_hashelement.h @@ -35,12 +35,12 @@ class KviKvsObject; class KVIRC_API KviKvsTreeNodeHashElement : public KviKvsTreeNodeArrayOrHashElement { public: - KviKvsTreeNodeHashElement(const QChar * pLocation,KviKvsTreeNodeData * pSource,KviKvsTreeNodeData * pIndex); + KviKvsTreeNodeHashElement(const TQChar * pLocation,KviKvsTreeNodeData * pSource,KviKvsTreeNodeData * pIndex); ~KviKvsTreeNodeHashElement(); protected: KviKvsTreeNodeData * m_pKey; // can't be null public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp b/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp index 799cc1e..954e221 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp @@ -30,7 +30,7 @@ #include "kvi_kvs_variant.h" #include "kvi_locale.h" -KviKvsTreeNodeHashReferenceAssert::KviKvsTreeNodeHashReferenceAssert(const QChar * pLocation,KviKvsTreeNodeData * pSource) +KviKvsTreeNodeHashReferenceAssert::KviKvsTreeNodeHashReferenceAssert(const TQChar * pLocation,KviKvsTreeNodeData * pSource) : KviKvsTreeNodeIndirectData(pLocation,pSource) { } @@ -44,7 +44,7 @@ bool KviKvsTreeNodeHashReferenceAssert::isReadOnly() return m_pSource->isReadOnly(); } -void KviKvsTreeNodeHashReferenceAssert::contextDescription(QString &szBuffer) +void KviKvsTreeNodeHashReferenceAssert::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Hash Reference Assert"; @@ -72,7 +72,7 @@ bool KviKvsTreeNodeHashReferenceAssert::evaluateReadOnlyInObjectScope(KviKvsObje { if(!pBuffer->isNothing()) { - QString szType; + TQString szType; pBuffer->getTypeName(szType); c->error(this,__tr2qs("Hash reference assert failed: the variable evaluated to type '%Q'"),&szType); return false; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.h b/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.h index 43cb57c..e97de6d 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.h @@ -36,13 +36,13 @@ class KviKvsObject; class KVIRC_API KviKvsTreeNodeHashReferenceAssert : public KviKvsTreeNodeIndirectData { public: - KviKvsTreeNodeHashReferenceAssert(const QChar * pLocation,KviKvsTreeNodeData * pSource); + KviKvsTreeNodeHashReferenceAssert(const TQChar * pLocation,KviKvsTreeNodeData * pSource); ~KviKvsTreeNodeHashReferenceAssert(); protected: public: virtual bool isReadOnly(); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.cpp b/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.cpp index 285c9d9..bd57336 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.cpp @@ -26,7 +26,7 @@ #include "kvi_kvs_treenode_indirectdata.h" -KviKvsTreeNodeIndirectData::KviKvsTreeNodeIndirectData(const QChar * pLocation,KviKvsTreeNodeData * pSource) +KviKvsTreeNodeIndirectData::KviKvsTreeNodeIndirectData(const TQChar * pLocation,KviKvsTreeNodeData * pSource) : KviKvsTreeNodeData(pLocation) { m_pSource = pSource; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.h b/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.h index 31a9410..f244bb0 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.h @@ -31,7 +31,7 @@ class KVIRC_API KviKvsTreeNodeIndirectData : public KviKvsTreeNodeData { public: - KviKvsTreeNodeIndirectData(const QChar * pLocation,KviKvsTreeNodeData * pSource); + KviKvsTreeNodeIndirectData(const TQChar * pLocation,KviKvsTreeNodeData * pSource); ~KviKvsTreeNodeIndirectData(); protected: KviKvsTreeNodeData * m_pSource; // can't be null! diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instruction.cpp b/src/kvirc/kvs/kvi_kvs_treenode_instruction.cpp index 37cb3d0..8f1b2eb 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_instruction.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_instruction.cpp @@ -26,7 +26,7 @@ #include "kvi_kvs_treenode_instruction.h" -void KviKvsTreeNodeInstruction::contextDescription(QString &szBuffer) +void KviKvsTreeNodeInstruction::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Instruction"; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instruction.h b/src/kvirc/kvs/kvi_kvs_treenode_instruction.h index 1e0c09c..8326b2e 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_instruction.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_instruction.h @@ -33,11 +33,11 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeInstruction : public KviKvsTreeNode { public: - KviKvsTreeNodeInstruction(const QChar * pLocation) + KviKvsTreeNodeInstruction(const TQChar * pLocation) : KviKvsTreeNode(pLocation){}; ~KviKvsTreeNodeInstruction(){}; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); // execute() is the main entry point to the tree visit diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp b/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp index 75afd45..1a49ec1 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp @@ -28,7 +28,7 @@ #include "kvi_kvs_treenode_instructionblock.h" #include "kvi_kvs_runtimecontext.h" -KviKvsTreeNodeInstructionBlock::KviKvsTreeNodeInstructionBlock(const QChar * pLocation) +KviKvsTreeNodeInstructionBlock::KviKvsTreeNodeInstructionBlock(const TQChar * pLocation) : KviKvsTreeNodeInstruction(pLocation) { m_pInstructionList = new KviPointerList<KviKvsTreeNodeInstruction>; @@ -40,7 +40,7 @@ KviKvsTreeNodeInstructionBlock::~KviKvsTreeNodeInstructionBlock() delete m_pInstructionList; } -void KviKvsTreeNodeInstructionBlock::contextDescription(QString &szBuffer) +void KviKvsTreeNodeInstructionBlock::contextDescription(TQString &szBuffer) { szBuffer = "Instruction Block"; } @@ -48,7 +48,7 @@ void KviKvsTreeNodeInstructionBlock::contextDescription(QString &szBuffer) void KviKvsTreeNodeInstructionBlock::dump(const char * prefix) { debug("%s InstructionBlock",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); for(KviKvsTreeNodeInstruction * i = m_pInstructionList->first();i;i = m_pInstructionList->next()) { diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h b/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h index f4aa32f..659aab5 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h @@ -36,7 +36,7 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeInstructionBlock : public KviKvsTreeNodeInstruction { public: - KviKvsTreeNodeInstructionBlock(const QChar * pLocation); + KviKvsTreeNodeInstructionBlock(const TQChar * pLocation); ~KviKvsTreeNodeInstructionBlock(); protected: KviPointerList<KviKvsTreeNodeInstruction> * m_pInstructionList; @@ -44,7 +44,7 @@ public: unsigned int instructionCount(){ return m_pInstructionList->count(); }; void addInstruction(KviKvsTreeNodeInstruction * i); KviKvsTreeNodeInstruction * releaseFirst(); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp index 95221ca..f98dfb4 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp @@ -27,7 +27,7 @@ #include "kvi_kvs_treenode_localvariable.h" #include "kvi_kvs_runtimecontext.h" -KviKvsTreeNodeLocalVariable::KviKvsTreeNodeLocalVariable(const QChar * pLocation,const QString &szIdentifier) +KviKvsTreeNodeLocalVariable::KviKvsTreeNodeLocalVariable(const TQChar * pLocation,const TQString &szIdentifier) : KviKvsTreeNodeVariable(pLocation,szIdentifier) { } @@ -36,7 +36,7 @@ KviKvsTreeNodeLocalVariable::~KviKvsTreeNodeLocalVariable() { } -void KviKvsTreeNodeLocalVariable::contextDescription(QString &szBuffer) +void KviKvsTreeNodeLocalVariable::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Local Variable \""; @@ -55,7 +55,7 @@ void KviKvsTreeNodeLocalVariable::dump(const char * prefix) bool KviKvsTreeNodeLocalVariable::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) { #ifdef COMPILE_NEW_KVS - KviKvsVariant * v = c->localVariables()->find(m_szIdentifier); + KviKvsVariant * v = c->localVariables()->tqfind(m_szIdentifier); if(v) { pBuffer->copyFrom(v); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.h b/src/kvirc/kvs/kvi_kvs_treenode_localvariable.h index 9f6998d..4200fbc 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_localvariable.h @@ -33,10 +33,10 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeLocalVariable : public KviKvsTreeNodeVariable { public: - KviKvsTreeNodeLocalVariable(const QChar * pLocation,const QString &szIdentifier); + KviKvsTreeNodeLocalVariable(const TQChar * pLocation,const TQString &szIdentifier); ~KviKvsTreeNodeLocalVariable(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp index bc6b9c5..0914ccd 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp @@ -33,7 +33,7 @@ #include "kvi_kvs_moduleinterface.h" #include "kvi_kvs_runtimecontext.h" -KviKvsTreeNodeModuleCallbackCommand::KviKvsTreeNodeModuleCallbackCommand(const QChar * pLocation,const QString &szModuleName,const QString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsScript * pCallback) +KviKvsTreeNodeModuleCallbackCommand::KviKvsTreeNodeModuleCallbackCommand(const TQChar * pLocation,const TQString &szModuleName,const TQString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsScript * pCallback) : KviKvsTreeNodeCallbackCommand(pLocation,szCmdName,params,pCallback) { m_szModuleName = szModuleName; @@ -44,7 +44,7 @@ KviKvsTreeNodeModuleCallbackCommand::~KviKvsTreeNodeModuleCallbackCommand() { } -void KviKvsTreeNodeModuleCallbackCommand::contextDescription(QString &szBuffer) +void KviKvsTreeNodeModuleCallbackCommand::contextDescription(TQString &szBuffer) { szBuffer = "Module Callback Command \""; szBuffer += m_szModuleName; @@ -67,7 +67,7 @@ bool KviKvsTreeNodeModuleCallbackCommand::execute(KviKvsRunTimeContext * c) KviModule * m = g_pModuleManager->getModule(m_szModuleName.utf8().data()); if(!m) { - QString szErr = g_pModuleManager->lastError().ptr(); // <-- fixme! + TQString szErr = g_pModuleManager->lastError().ptr(); // <-- fixme! c->error(this,__tr2qs("Module command call failed: can't load the module '%Q': %Q"),&m_szModuleName,&szErr); return false; } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.h b/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.h index cc484f9..c24f1c5 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.h @@ -36,12 +36,12 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeModuleCallbackCommand : public KviKvsTreeNodeCallbackCommand { public: - KviKvsTreeNodeModuleCallbackCommand(const QChar * pLocation,const QString &szModuleName,const QString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsScript * pCallback); + KviKvsTreeNodeModuleCallbackCommand(const TQChar * pLocation,const TQString &szModuleName,const TQString &szCmdName,KviKvsTreeNodeDataList * params,KviKvsScript * pCallback); ~KviKvsTreeNodeModuleCallbackCommand(); protected: - QString m_szModuleName; + TQString m_szModuleName; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); bool execute(KviKvsRunTimeContext* c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp index e7f0a46..54172d6 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp @@ -33,7 +33,7 @@ #include "kvi_kvs_runtimecontext.h" -KviKvsTreeNodeModuleFunctionCall::KviKvsTreeNodeModuleFunctionCall(const QChar * pLocation,const QString &szModuleName,const QString &szFncName,KviKvsTreeNodeDataList * pParams) +KviKvsTreeNodeModuleFunctionCall::KviKvsTreeNodeModuleFunctionCall(const TQChar * pLocation,const TQString &szModuleName,const TQString &szFncName,KviKvsTreeNodeDataList * pParams) : KviKvsTreeNodeFunctionCall(pLocation,szFncName,pParams) { m_szModuleName = szModuleName; @@ -43,7 +43,7 @@ KviKvsTreeNodeModuleFunctionCall::~KviKvsTreeNodeModuleFunctionCall() { } -void KviKvsTreeNodeModuleFunctionCall::contextDescription(QString &szBuffer) +void KviKvsTreeNodeModuleFunctionCall::contextDescription(TQString &szBuffer) { szBuffer = "Module Function Call \""; szBuffer += m_szModuleName; @@ -55,7 +55,7 @@ void KviKvsTreeNodeModuleFunctionCall::contextDescription(QString &szBuffer) void KviKvsTreeNodeModuleFunctionCall::dump(const char * prefix) { debug("%s ModuleFunctionCall(%s.%s)",prefix,m_szModuleName.utf8().data(),m_szFunctionName.utf8().data()); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pParams->dump(tmp.utf8().data()); } @@ -66,7 +66,7 @@ bool KviKvsTreeNodeModuleFunctionCall::evaluateReadOnly(KviKvsRunTimeContext * c KviModule * m = g_pModuleManager->getModule(m_szModuleName.utf8().data()); if(!m) { - QString szErr = g_pModuleManager->lastError().ptr(); // <-- fixme! + TQString szErr = g_pModuleManager->lastError().ptr(); // <-- fixme! c->error(this,__tr2qs("Module function call failed: can't load the module '%Q': %Q"),&m_szModuleName,&szErr); return false; } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.h index 9581d03..86dde62 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.h @@ -35,12 +35,12 @@ class KviKvsVariant; class KVIRC_API KviKvsTreeNodeModuleFunctionCall : public KviKvsTreeNodeFunctionCall { public: - KviKvsTreeNodeModuleFunctionCall(const QChar * pLocation,const QString &szModuleName,const QString &szFncName,KviKvsTreeNodeDataList * pParams); + KviKvsTreeNodeModuleFunctionCall(const TQChar * pLocation,const TQString &szModuleName,const TQString &szFncName,KviKvsTreeNodeDataList * pParams); ~KviKvsTreeNodeModuleFunctionCall(); protected: - QString m_szModuleName; + TQString m_szModuleName; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp index 78b6f02..408d7fd 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp @@ -33,7 +33,7 @@ #include "kvi_kvs_moduleinterface.h" #include "kvi_kvs_runtimecontext.h" -KviKvsTreeNodeModuleSimpleCommand::KviKvsTreeNodeModuleSimpleCommand(const QChar * pLocation,const QString &szModuleName,const QString &szCmdName,KviKvsTreeNodeDataList * params) +KviKvsTreeNodeModuleSimpleCommand::KviKvsTreeNodeModuleSimpleCommand(const TQChar * pLocation,const TQString &szModuleName,const TQString &szCmdName,KviKvsTreeNodeDataList * params) : KviKvsTreeNodeSimpleCommand(pLocation,szCmdName,params) { m_szModuleName = szModuleName; @@ -44,7 +44,7 @@ KviKvsTreeNodeModuleSimpleCommand::~KviKvsTreeNodeModuleSimpleCommand() { } -void KviKvsTreeNodeModuleSimpleCommand::contextDescription(QString &szBuffer) +void KviKvsTreeNodeModuleSimpleCommand::contextDescription(TQString &szBuffer) { szBuffer = "Module Callback Command \""; szBuffer += m_szModuleName; @@ -66,7 +66,7 @@ bool KviKvsTreeNodeModuleSimpleCommand::execute(KviKvsRunTimeContext * c) KviModule * m = g_pModuleManager->getModule(m_szModuleName.utf8().data()); if(!m) { - QString szErr = g_pModuleManager->lastError().ptr(); // <-- fixme! + TQString szErr = g_pModuleManager->lastError().ptr(); // <-- fixme! c->error(this,__tr2qs("Module command call failed: can't load the module '%Q': %Q"),&m_szModuleName,&szErr); return false; } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.h b/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.h index 2a6ee96..5396cc5 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.h @@ -34,12 +34,12 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeModuleSimpleCommand : public KviKvsTreeNodeSimpleCommand { public: - KviKvsTreeNodeModuleSimpleCommand(const QChar * pLocation,const QString &szModuleName,const QString &szCmdName,KviKvsTreeNodeDataList * params); + KviKvsTreeNodeModuleSimpleCommand(const TQChar * pLocation,const TQString &szModuleName,const TQString &szCmdName,KviKvsTreeNodeDataList * params); ~KviKvsTreeNodeModuleSimpleCommand(); protected: - QString m_szModuleName; + TQString m_szModuleName; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp b/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp index 405575d..4c877ca 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp @@ -29,7 +29,7 @@ #include "kvi_kvs_variant.h" -KviKvsTreeNodeMultipleParameterIdentifier::KviKvsTreeNodeMultipleParameterIdentifier(const QChar * pLocation,int iStart,int iEnd) +KviKvsTreeNodeMultipleParameterIdentifier::KviKvsTreeNodeMultipleParameterIdentifier(const TQChar * pLocation,int iStart,int iEnd) : KviKvsTreeNodeData(pLocation) { m_iStart = iStart; @@ -40,11 +40,11 @@ KviKvsTreeNodeMultipleParameterIdentifier::~KviKvsTreeNodeMultipleParameterIdent { } -void KviKvsTreeNodeMultipleParameterIdentifier::contextDescription(QString &szBuffer) +void KviKvsTreeNodeMultipleParameterIdentifier::contextDescription(TQString &szBuffer) { szBuffer = "Multiple Parameter Identifier \"$"; - if(m_iEnd < m_iStart)KviQString::appendFormatted(szBuffer,"%d-",m_iStart); - else KviQString::appendFormatted(szBuffer,"%d-%d",m_iStart,m_iEnd); + if(m_iEnd < m_iStart)KviTQString::appendFormatted(szBuffer,"%d-",m_iStart); + else KviTQString::appendFormatted(szBuffer,"%d-%d",m_iStart,m_iEnd); szBuffer += "\""; } @@ -63,7 +63,7 @@ bool KviKvsTreeNodeMultipleParameterIdentifier::evaluateReadOnly(KviKvsRunTimeCo return true; } - QString sz; + TQString sz; v->asString(sz); if(m_iEnd >= m_iStart) @@ -72,7 +72,7 @@ bool KviKvsTreeNodeMultipleParameterIdentifier::evaluateReadOnly(KviKvsRunTimeCo int idx = m_iStart; for(v = c->parameterList()->next();v && (idx < m_iEnd);v = c->parameterList()->next()) { - sz += QChar(' '); + sz += TQChar(' '); v->appendAsString(sz); idx++; } @@ -80,7 +80,7 @@ bool KviKvsTreeNodeMultipleParameterIdentifier::evaluateReadOnly(KviKvsRunTimeCo // all up to the end of the list for(v = c->parameterList()->next();v;v = c->parameterList()->next()) { - sz += QChar(' '); + sz += TQChar(' '); v->appendAsString(sz); } } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.h b/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.h index ad3edbd..54d86ec 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.h @@ -34,13 +34,13 @@ class KviKvsVariant; class KVIRC_API KviKvsTreeNodeMultipleParameterIdentifier : public KviKvsTreeNodeData { public: - KviKvsTreeNodeMultipleParameterIdentifier(const QChar * pLocation,int iStart,int iEnd); + KviKvsTreeNodeMultipleParameterIdentifier(const TQChar * pLocation,int iStart,int iEnd); ~KviKvsTreeNodeMultipleParameterIdentifier(); protected: int m_iStart; int m_iEnd; // the index of the last parameter wanted (may be -1: in that case all up to the end) public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp b/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp index 6ac81b9..f0e4957 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp @@ -29,7 +29,7 @@ #include "kvi_kvs_object.h" #include "kvi_kvs_hash.h" -KviKvsTreeNodeObjectField::KviKvsTreeNodeObjectField(const QChar * pLocation,const QString &szIdentifier) +KviKvsTreeNodeObjectField::KviKvsTreeNodeObjectField(const TQChar * pLocation,const TQString &szIdentifier) : KviKvsTreeNodeVariable(pLocation,szIdentifier) { } @@ -38,7 +38,7 @@ KviKvsTreeNodeObjectField::~KviKvsTreeNodeObjectField() { } -void KviKvsTreeNodeObjectField::contextDescription(QString &szBuffer) +void KviKvsTreeNodeObjectField::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Object Field \""; @@ -62,7 +62,7 @@ bool KviKvsTreeNodeObjectField::canEvaluateInObjectScope() bool KviKvsTreeNodeObjectField::evaluateReadOnlyInObjectScope(KviKvsObject * o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) { #ifdef COMPILE_NEW_KVS - KviKvsVariant * v = o->dataContainer()->find(m_szIdentifier); + KviKvsVariant * v = o->dataContainer()->tqfind(m_szIdentifier); if(v)pBuffer->copyFrom(v); else pBuffer->setNothing(); #endif diff --git a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.h b/src/kvirc/kvs/kvi_kvs_treenode_objectfield.h index ef56ca1..607a69f 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_objectfield.h @@ -34,10 +34,10 @@ class KviKvsObject; class KVIRC_API KviKvsTreeNodeObjectField : public KviKvsTreeNodeVariable { public: - KviKvsTreeNodeObjectField(const QChar * pLocation,const QString &szIdentifier); + KviKvsTreeNodeObjectField(const TQChar * pLocation,const TQString &szIdentifier); ~KviKvsTreeNodeObjectField(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool canEvaluateInObjectScope(); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject * o,KviKvsRunTimeContext * c,KviKvsVariant * pResult); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.cpp index d9d5f23..9cf06be 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.cpp @@ -26,7 +26,7 @@ #include "kvi_kvs_treenode_objectfunctioncall.h" -KviKvsTreeNodeObjectFunctionCall::KviKvsTreeNodeObjectFunctionCall(const QChar * pLocation,const QString &szFncName,KviKvsTreeNodeDataList * pParams) +KviKvsTreeNodeObjectFunctionCall::KviKvsTreeNodeObjectFunctionCall(const TQChar * pLocation,const TQString &szFncName,KviKvsTreeNodeDataList * pParams) : KviKvsTreeNodeFunctionCall(pLocation,szFncName,pParams) { } @@ -35,7 +35,7 @@ KviKvsTreeNodeObjectFunctionCall::~KviKvsTreeNodeObjectFunctionCall() { } -void KviKvsTreeNodeObjectFunctionCall::contextDescription(QString &szBuffer) +void KviKvsTreeNodeObjectFunctionCall::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Object Function Call \""; @@ -48,7 +48,7 @@ void KviKvsTreeNodeObjectFunctionCall::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s ObjectFunctionCall(%s)",prefix,m_szFunctionName.utf8().data()); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pParams->dump(tmp.utf8().data()); #endif diff --git a/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.h index c1e8063..5588a02 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.h @@ -33,10 +33,10 @@ class KVIRC_API KviKvsTreeNodeObjectFunctionCall : public KviKvsTreeNodeFunctionCall { public: - KviKvsTreeNodeObjectFunctionCall(const QChar * pLocation,const QString &szFncName,KviKvsTreeNodeDataList * pParams); + KviKvsTreeNodeObjectFunctionCall(const TQChar * pLocation,const TQString &szFncName,KviKvsTreeNodeDataList * pParams); ~KviKvsTreeNodeObjectFunctionCall(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool canEvaluateInObjectScope(); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp b/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp index 179d50e..e8c50b9 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp @@ -29,12 +29,12 @@ #include "kvi_kvs_runtimecontext.h" #include "kvi_locale.h" -#include <qregexp.h> +#include <tqregexp.h> #include <math.h> -KviKvsTreeNodeOperation::KviKvsTreeNodeOperation(const QChar * pLocation) +KviKvsTreeNodeOperation::KviKvsTreeNodeOperation(const TQChar * pLocation) : KviKvsTreeNodeInstruction(pLocation) { //m_pTargetData = 0; no need to set it @@ -51,7 +51,7 @@ void KviKvsTreeNodeOperation::setTargetVariableReference(KviKvsTreeNodeData * r) m_pTargetData->setParent(this); } -void KviKvsTreeNodeOperation::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperation::contextDescription(TQString &szBuffer) { szBuffer = "Operation"; } @@ -59,7 +59,7 @@ void KviKvsTreeNodeOperation::contextDescription(QString &szBuffer) void KviKvsTreeNodeOperation::dump(const char * prefix) { debug("%s Operation",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); } @@ -68,7 +68,7 @@ void KviKvsTreeNodeOperation::dump(const char * prefix) -KviKvsTreeNodeOperationAssignment::KviKvsTreeNodeOperationAssignment(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationAssignment::KviKvsTreeNodeOperationAssignment(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { m_pRightSide = pRightSide; @@ -80,7 +80,7 @@ KviKvsTreeNodeOperationAssignment::~KviKvsTreeNodeOperationAssignment() delete m_pRightSide; } -void KviKvsTreeNodeOperationAssignment::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationAssignment::contextDescription(TQString &szBuffer) { szBuffer = "Assignment"; } @@ -89,7 +89,7 @@ void KviKvsTreeNodeOperationAssignment::contextDescription(QString &szBuffer) void KviKvsTreeNodeOperationAssignment::dump(const char * prefix) { debug("%s OperationAssignment",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -113,7 +113,7 @@ bool KviKvsTreeNodeOperationAssignment::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationDecrement::KviKvsTreeNodeOperationDecrement(const QChar * pLocation) +KviKvsTreeNodeOperationDecrement::KviKvsTreeNodeOperationDecrement(const TQChar * pLocation) : KviKvsTreeNodeOperation(pLocation) { } @@ -122,7 +122,7 @@ KviKvsTreeNodeOperationDecrement::~KviKvsTreeNodeOperationDecrement() { } -void KviKvsTreeNodeOperationDecrement::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationDecrement::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"--\""; @@ -134,7 +134,7 @@ void KviKvsTreeNodeOperationDecrement::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationDecrement",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); #endif @@ -176,7 +176,7 @@ bool KviKvsTreeNodeOperationDecrement::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationIncrement::KviKvsTreeNodeOperationIncrement(const QChar * pLocation) +KviKvsTreeNodeOperationIncrement::KviKvsTreeNodeOperationIncrement(const TQChar * pLocation) : KviKvsTreeNodeOperation(pLocation) { } @@ -185,7 +185,7 @@ KviKvsTreeNodeOperationIncrement::~KviKvsTreeNodeOperationIncrement() { } -void KviKvsTreeNodeOperationIncrement::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationIncrement::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"++\""; @@ -197,7 +197,7 @@ void KviKvsTreeNodeOperationIncrement::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationIncrement",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); #endif @@ -235,7 +235,7 @@ bool KviKvsTreeNodeOperationIncrement::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationSelfAnd::KviKvsTreeNodeOperationSelfAnd(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfAnd::KviKvsTreeNodeOperationSelfAnd(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -251,7 +251,7 @@ KviKvsTreeNodeOperationSelfAnd::~KviKvsTreeNodeOperationSelfAnd() #endif } -void KviKvsTreeNodeOperationSelfAnd::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfAnd::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"&=\""; @@ -263,7 +263,7 @@ void KviKvsTreeNodeOperationSelfAnd::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfAnd",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -305,7 +305,7 @@ bool KviKvsTreeNodeOperationSelfAnd::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationSelfDivision::KviKvsTreeNodeOperationSelfDivision(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfDivision::KviKvsTreeNodeOperationSelfDivision(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -321,7 +321,7 @@ KviKvsTreeNodeOperationSelfDivision::~KviKvsTreeNodeOperationSelfDivision() #endif } -void KviKvsTreeNodeOperationSelfDivision::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfDivision::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"/=\""; @@ -333,7 +333,7 @@ void KviKvsTreeNodeOperationSelfDivision::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfDivision",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -399,7 +399,7 @@ bool KviKvsTreeNodeOperationSelfDivision::execute(KviKvsRunTimeContext * c) return true; } -KviKvsTreeNodeOperationSelfModulus::KviKvsTreeNodeOperationSelfModulus(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfModulus::KviKvsTreeNodeOperationSelfModulus(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -415,7 +415,7 @@ KviKvsTreeNodeOperationSelfModulus::~KviKvsTreeNodeOperationSelfModulus() #endif } -void KviKvsTreeNodeOperationSelfModulus::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfModulus::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"Self Modulo\""; @@ -427,7 +427,7 @@ void KviKvsTreeNodeOperationSelfModulus::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfModulus",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -494,7 +494,7 @@ bool KviKvsTreeNodeOperationSelfModulus::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationSelfMultiplication::KviKvsTreeNodeOperationSelfMultiplication(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfMultiplication::KviKvsTreeNodeOperationSelfMultiplication(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -510,7 +510,7 @@ KviKvsTreeNodeOperationSelfMultiplication::~KviKvsTreeNodeOperationSelfMultiplic #endif } -void KviKvsTreeNodeOperationSelfMultiplication::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfMultiplication::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"*=\""; @@ -522,7 +522,7 @@ void KviKvsTreeNodeOperationSelfMultiplication::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfMultiplication",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -573,7 +573,7 @@ bool KviKvsTreeNodeOperationSelfMultiplication::execute(KviKvsRunTimeContext * c -KviKvsTreeNodeOperationSelfOr::KviKvsTreeNodeOperationSelfOr(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfOr::KviKvsTreeNodeOperationSelfOr(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -589,7 +589,7 @@ KviKvsTreeNodeOperationSelfOr::~KviKvsTreeNodeOperationSelfOr() #endif } -void KviKvsTreeNodeOperationSelfOr::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfOr::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"|=\""; @@ -601,7 +601,7 @@ void KviKvsTreeNodeOperationSelfOr::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfOr",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -643,7 +643,7 @@ bool KviKvsTreeNodeOperationSelfOr::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationSelfShl::KviKvsTreeNodeOperationSelfShl(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfShl::KviKvsTreeNodeOperationSelfShl(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -659,7 +659,7 @@ KviKvsTreeNodeOperationSelfShl::~KviKvsTreeNodeOperationSelfShl() #endif } -void KviKvsTreeNodeOperationSelfShl::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfShl::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"<<=\""; @@ -671,7 +671,7 @@ void KviKvsTreeNodeOperationSelfShl::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfShl",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -715,7 +715,7 @@ bool KviKvsTreeNodeOperationSelfShl::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationSelfShr::KviKvsTreeNodeOperationSelfShr(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfShr::KviKvsTreeNodeOperationSelfShr(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -731,7 +731,7 @@ KviKvsTreeNodeOperationSelfShr::~KviKvsTreeNodeOperationSelfShr() #endif } -void KviKvsTreeNodeOperationSelfShr::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfShr::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \">>=\""; @@ -743,7 +743,7 @@ void KviKvsTreeNodeOperationSelfShr::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfShr",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -793,7 +793,7 @@ bool KviKvsTreeNodeOperationSelfShr::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationSelfSubtraction::KviKvsTreeNodeOperationSelfSubtraction(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfSubtraction::KviKvsTreeNodeOperationSelfSubtraction(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -809,7 +809,7 @@ KviKvsTreeNodeOperationSelfSubtraction::~KviKvsTreeNodeOperationSelfSubtraction( #endif } -void KviKvsTreeNodeOperationSelfSubtraction::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfSubtraction::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"-=\""; @@ -821,7 +821,7 @@ void KviKvsTreeNodeOperationSelfSubtraction::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfSubtraction",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -876,7 +876,7 @@ bool KviKvsTreeNodeOperationSelfSubtraction::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationSelfSum::KviKvsTreeNodeOperationSelfSum(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfSum::KviKvsTreeNodeOperationSelfSum(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -892,7 +892,7 @@ KviKvsTreeNodeOperationSelfSum::~KviKvsTreeNodeOperationSelfSum() #endif } -void KviKvsTreeNodeOperationSelfSum::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfSum::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"+=\""; @@ -904,7 +904,7 @@ void KviKvsTreeNodeOperationSelfSum::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfSum",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -961,7 +961,7 @@ bool KviKvsTreeNodeOperationSelfSum::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationSelfXor::KviKvsTreeNodeOperationSelfXor(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationSelfXor::KviKvsTreeNodeOperationSelfXor(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -977,7 +977,7 @@ KviKvsTreeNodeOperationSelfXor::~KviKvsTreeNodeOperationSelfXor() #endif } -void KviKvsTreeNodeOperationSelfXor::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationSelfXor::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"^=\""; @@ -989,7 +989,7 @@ void KviKvsTreeNodeOperationSelfXor::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationSelfXor",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -1035,7 +1035,7 @@ bool KviKvsTreeNodeOperationSelfXor::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationStringAppend::KviKvsTreeNodeOperationStringAppend(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationStringAppend::KviKvsTreeNodeOperationStringAppend(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { m_pRightSide = pRightSide; @@ -1047,7 +1047,7 @@ KviKvsTreeNodeOperationStringAppend::~KviKvsTreeNodeOperationStringAppend() delete m_pRightSide; } -void KviKvsTreeNodeOperationStringAppend::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationStringAppend::contextDescription(TQString &szBuffer) { szBuffer = "Operator \"<<\""; } @@ -1056,7 +1056,7 @@ void KviKvsTreeNodeOperationStringAppend::contextDescription(QString &szBuffer) void KviKvsTreeNodeOperationStringAppend::dump(const char * prefix) { debug("%s OperationStringAppend",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -1069,7 +1069,7 @@ bool KviKvsTreeNodeOperationStringAppend::execute(KviKvsRunTimeContext * c) KviKvsRWEvaluationResult * target = m_pTargetData->evaluateReadWrite(c); if(!target)return false; - QString sz1; + TQString sz1; target->result()->asString(sz1); v.appendAsString(sz1); target->result()->setString(sz1); @@ -1082,7 +1082,7 @@ bool KviKvsTreeNodeOperationStringAppend::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationArrayAppend::KviKvsTreeNodeOperationArrayAppend(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationArrayAppend::KviKvsTreeNodeOperationArrayAppend(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { m_pRightSide = pRightSide; @@ -1094,7 +1094,7 @@ KviKvsTreeNodeOperationArrayAppend::~KviKvsTreeNodeOperationArrayAppend() delete m_pRightSide; } -void KviKvsTreeNodeOperationArrayAppend::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationArrayAppend::contextDescription(TQString &szBuffer) { szBuffer = "Operator \"<+\""; } @@ -1103,7 +1103,7 @@ void KviKvsTreeNodeOperationArrayAppend::contextDescription(QString &szBuffer) void KviKvsTreeNodeOperationArrayAppend::dump(const char * prefix) { debug("%s OperationArrayAppend",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -1165,7 +1165,7 @@ bool KviKvsTreeNodeOperationArrayAppend::execute(KviKvsRunTimeContext * c) -KviKvsTreeNodeOperationStringAppendWithComma::KviKvsTreeNodeOperationStringAppendWithComma(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationStringAppendWithComma::KviKvsTreeNodeOperationStringAppendWithComma(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -1181,7 +1181,7 @@ KviKvsTreeNodeOperationStringAppendWithComma::~KviKvsTreeNodeOperationStringAppe #endif } -void KviKvsTreeNodeOperationStringAppendWithComma::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationStringAppendWithComma::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"<,\""; @@ -1193,7 +1193,7 @@ void KviKvsTreeNodeOperationStringAppendWithComma::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationStringAppendWithComma",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -1208,15 +1208,15 @@ bool KviKvsTreeNodeOperationStringAppendWithComma::execute(KviKvsRunTimeContext KviKvsRWEvaluationResult * target = m_pTargetData->evaluateReadWrite(c); if(!target)return false; - QString sz1; + TQString sz1; target->result()->asString(sz1); if(sz1.isEmpty()) { v.asString(sz1); } else { - QString sz2; + TQString sz2; v.asString(sz2); - sz1 += QChar(','); + sz1 += TQChar(','); sz1 += sz2; } target->result()->setString(sz1); @@ -1230,7 +1230,7 @@ bool KviKvsTreeNodeOperationStringAppendWithComma::execute(KviKvsRunTimeContext -KviKvsTreeNodeOperationStringAppendWithSpace::KviKvsTreeNodeOperationStringAppendWithSpace(const QChar * pLocation,KviKvsTreeNodeData * pRightSide) +KviKvsTreeNodeOperationStringAppendWithSpace::KviKvsTreeNodeOperationStringAppendWithSpace(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -1246,7 +1246,7 @@ KviKvsTreeNodeOperationStringAppendWithSpace::~KviKvsTreeNodeOperationStringAppe #endif } -void KviKvsTreeNodeOperationStringAppendWithSpace::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationStringAppendWithSpace::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Operator \"<+\""; @@ -1258,7 +1258,7 @@ void KviKvsTreeNodeOperationStringAppendWithSpace::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationStringAppendWithSpace",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pTargetData->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); @@ -1273,15 +1273,15 @@ bool KviKvsTreeNodeOperationStringAppendWithSpace::execute(KviKvsRunTimeContext KviKvsRWEvaluationResult * target = m_pTargetData->evaluateReadWrite(c); if(!target)return false; - QString sz1; + TQString sz1; target->result()->asString(sz1); if(sz1.isEmpty()) { v.asString(sz1); } else { - QString sz2; + TQString sz2; v.asString(sz2); - sz1 += QChar(' '); + sz1 += TQChar(' '); sz1 += sz2; } target->result()->setString(sz1); @@ -1298,7 +1298,7 @@ bool KviKvsTreeNodeOperationStringAppendWithSpace::execute(KviKvsRunTimeContext -KviKvsTreeNodeOperationStringTransliteration::KviKvsTreeNodeOperationStringTransliteration(const QChar * pLocation,KviKvsTreeNodeData * pLeft,KviKvsTreeNodeData * pRight,KviKvsTreeNodeData * pFlags) +KviKvsTreeNodeOperationStringTransliteration::KviKvsTreeNodeOperationStringTransliteration(const TQChar * pLocation,KviKvsTreeNodeData * pLeft,KviKvsTreeNodeData * pRight,KviKvsTreeNodeData * pFlags) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -1321,7 +1321,7 @@ KviKvsTreeNodeOperationStringTransliteration::~KviKvsTreeNodeOperationStringTran } -void KviKvsTreeNodeOperationStringTransliteration::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationStringTransliteration::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Binding Operator tr///"; @@ -1333,7 +1333,7 @@ void KviKvsTreeNodeOperationStringTransliteration::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationStringTransliteration",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pLeft->dump(tmp.utf8().data()); m_pRight->dump(tmp.utf8().data()); @@ -1355,15 +1355,15 @@ bool KviKvsTreeNodeOperationStringTransliteration::execute(KviKvsRunTimeContext KviKvsRWEvaluationResult * target = m_pTargetData->evaluateReadWrite(c); if(!target)return false; - QString szL,szR,szF; + TQString szL,szR,szF; vl.asString(szL); vr.asString(szR); //vf.asString(szF); - QString sz1; + TQString sz1; target->result()->asString(sz1); - KviQString::transliterate(sz1,szL,szR); + KviTQString::transliterate(sz1,szL,szR); target->result()->setString(sz1); delete target; #endif @@ -1379,7 +1379,7 @@ bool KviKvsTreeNodeOperationStringTransliteration::execute(KviKvsRunTimeContext -KviKvsTreeNodeOperationStringSubstitution::KviKvsTreeNodeOperationStringSubstitution(const QChar * pLocation,KviKvsTreeNodeData * pLeft,KviKvsTreeNodeData * pRight,KviKvsTreeNodeData * pFlags) +KviKvsTreeNodeOperationStringSubstitution::KviKvsTreeNodeOperationStringSubstitution(const TQChar * pLocation,KviKvsTreeNodeData * pLeft,KviKvsTreeNodeData * pRight,KviKvsTreeNodeData * pFlags) : KviKvsTreeNodeOperation(pLocation) { #ifdef COMPILE_NEW_KVS @@ -1402,7 +1402,7 @@ KviKvsTreeNodeOperationStringSubstitution::~KviKvsTreeNodeOperationStringSubstit } -void KviKvsTreeNodeOperationStringSubstitution::contextDescription(QString &szBuffer) +void KviKvsTreeNodeOperationStringSubstitution::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Binding Operator s///"; @@ -1414,7 +1414,7 @@ void KviKvsTreeNodeOperationStringSubstitution::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s OperationStringSubstitution",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pLeft->dump(tmp.utf8().data()); m_pRight->dump(tmp.utf8().data()); @@ -1434,19 +1434,19 @@ bool KviKvsTreeNodeOperationStringSubstitution::execute(KviKvsRunTimeContext * c KviKvsRWEvaluationResult * target = m_pTargetData->evaluateReadWrite(c); if(!target)return false; - QString szL,szR,szF; + TQString szL,szR,szF; vl.asString(szL); vr.asString(szR); vf.asString(szF); - QString str; + TQString str; target->result()->asString(str); - bool bGlobal = szF.find('g',false) != -1; + bool bGlobal = szF.tqfind('g',false) != -1; - QRegExp re(szL,szF.find('i',false) == -1,szF.find('w',false) != -1); - re.setMinimal(szF.find('m',false) != -1); // greedy or minimal ? + TQRegExp re(szL,szF.tqfind('i',false) == -1,szF.tqfind('w',false) != -1); + re.setMinimal(szF.tqfind('m',false) != -1); // greedy or minimal ? int idx = 0; @@ -1464,24 +1464,24 @@ bool KviKvsTreeNodeOperationStringSubstitution::execute(KviKvsRunTimeContext * c } str.remove(idx,len); - QString szReplaced; - const QChar * p2 = KviQString::nullTerminatedArray(szR); - const QChar * begin = p2; - while(p2->unicode()) + TQString szReplaced; + const TQChar * p2 = KviTQString::nullTerminatedArray(szR); + const TQChar * begin = p2; + while(p2->tqunicode()) { - if(p2->unicode() == '\\') + if(p2->tqunicode() == '\\') { p2++; - if(p2->unicode() >= '0' && p2->unicode() <= '9') + if(p2->tqunicode() >= '0' && p2->tqunicode() <= '9') { - szReplaced.append(QString(begin,(p2 - begin) - 1)); - szReplaced.append(re.cap(p2->unicode() - '0')); + szReplaced.append(TQString(begin,(p2 - begin) - 1)); + szReplaced.append(re.cap(p2->tqunicode() - '0')); p2++; begin = p2; - } else if(p2->unicode())p2++; + } else if(p2->tqunicode())p2++; } else p2++; } - if(begin != p2)szReplaced.append(QString(begin,p2 - begin)); + if(begin != p2)szReplaced.append(TQString(begin,p2 - begin)); str.insert(idx,szReplaced); idx += szReplaced.length(); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_operation.h b/src/kvirc/kvs/kvi_kvs_treenode_operation.h index e4a4463..cc57df0 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_operation.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_operation.h @@ -35,25 +35,25 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeOperation : public KviKvsTreeNodeInstruction { public: - KviKvsTreeNodeOperation(const QChar * pLocation); + KviKvsTreeNodeOperation(const TQChar * pLocation); ~KviKvsTreeNodeOperation(); protected: KviKvsTreeNodeData * m_pTargetData; // can't be null public: void setTargetVariableReference(KviKvsTreeNodeData * r); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); }; class KviKvsTreeNodeOperationAssignment : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationAssignment(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationAssignment(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationAssignment(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -61,10 +61,10 @@ public: class KviKvsTreeNodeOperationDecrement : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationDecrement(const QChar * pLocation); + KviKvsTreeNodeOperationDecrement(const TQChar * pLocation); ~KviKvsTreeNodeOperationDecrement(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -72,10 +72,10 @@ public: class KviKvsTreeNodeOperationIncrement : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationIncrement(const QChar * pLocation); + KviKvsTreeNodeOperationIncrement(const TQChar * pLocation); ~KviKvsTreeNodeOperationIncrement(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -83,12 +83,12 @@ public: class KviKvsTreeNodeOperationSelfAnd : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationSelfAnd(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationSelfAnd(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationSelfAnd(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -96,12 +96,12 @@ public: class KviKvsTreeNodeOperationSelfDivision : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationSelfDivision(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationSelfDivision(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationSelfDivision(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -109,12 +109,12 @@ public: class KviKvsTreeNodeOperationSelfModulus : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationSelfModulus(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationSelfModulus(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationSelfModulus(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -122,12 +122,12 @@ public: class KviKvsTreeNodeOperationSelfMultiplication : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationSelfMultiplication(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationSelfMultiplication(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationSelfMultiplication(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -135,12 +135,12 @@ public: class KviKvsTreeNodeOperationSelfOr : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationSelfOr(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationSelfOr(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationSelfOr(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -148,12 +148,12 @@ public: class KviKvsTreeNodeOperationSelfShl : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationSelfShl(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationSelfShl(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationSelfShl(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -161,12 +161,12 @@ public: class KviKvsTreeNodeOperationSelfShr : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationSelfShr(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationSelfShr(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationSelfShr(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -174,12 +174,12 @@ public: class KviKvsTreeNodeOperationSelfSubtraction : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationSelfSubtraction(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationSelfSubtraction(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationSelfSubtraction(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -187,12 +187,12 @@ public: class KviKvsTreeNodeOperationSelfSum : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationSelfSum(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationSelfSum(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationSelfSum(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -200,12 +200,12 @@ public: class KviKvsTreeNodeOperationSelfXor : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationSelfXor(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationSelfXor(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationSelfXor(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -213,12 +213,12 @@ public: class KviKvsTreeNodeOperationStringAppend : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationStringAppend(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationStringAppend(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationStringAppend(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -226,12 +226,12 @@ public: class KviKvsTreeNodeOperationArrayAppend : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationArrayAppend(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationArrayAppend(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationArrayAppend(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -239,12 +239,12 @@ public: class KviKvsTreeNodeOperationStringAppendWithComma : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationStringAppendWithComma(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationStringAppendWithComma(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationStringAppendWithComma(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -252,12 +252,12 @@ public: class KviKvsTreeNodeOperationStringAppendWithSpace : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationStringAppendWithSpace(const QChar * pLocation,KviKvsTreeNodeData * pRightSide); + KviKvsTreeNodeOperationStringAppendWithSpace(const TQChar * pLocation,KviKvsTreeNodeData * pRightSide); ~KviKvsTreeNodeOperationStringAppendWithSpace(); protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -265,14 +265,14 @@ public: class KviKvsTreeNodeOperationStringTransliteration : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationStringTransliteration(const QChar * pLocation,KviKvsTreeNodeData * pLeft,KviKvsTreeNodeData * pRight,KviKvsTreeNodeData * pFlags); + KviKvsTreeNodeOperationStringTransliteration(const TQChar * pLocation,KviKvsTreeNodeData * pLeft,KviKvsTreeNodeData * pRight,KviKvsTreeNodeData * pFlags); ~KviKvsTreeNodeOperationStringTransliteration(); protected: KviKvsTreeNodeData * m_pLeft; // can't be 0 KviKvsTreeNodeData * m_pRight; // can't be 0 KviKvsTreeNodeData * m_pFlags; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -280,14 +280,14 @@ public: class KviKvsTreeNodeOperationStringSubstitution : public KviKvsTreeNodeOperation { public: - KviKvsTreeNodeOperationStringSubstitution(const QChar * pLocation,KviKvsTreeNodeData * pLeft,KviKvsTreeNodeData * pRight,KviKvsTreeNodeData * pFlags); + KviKvsTreeNodeOperationStringSubstitution(const TQChar * pLocation,KviKvsTreeNodeData * pLeft,KviKvsTreeNodeData * pRight,KviKvsTreeNodeData * pFlags); ~KviKvsTreeNodeOperationStringSubstitution(); protected: KviKvsTreeNodeData * m_pLeft; // can't be 0 KviKvsTreeNodeData * m_pRight; // can't be 0 KviKvsTreeNodeData * m_pFlags; // can't be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.cpp b/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.cpp index e4a1634..694d733 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.cpp @@ -29,7 +29,7 @@ #include "kvi_kvs_variantlist.h" #include "kvi_locale.h" -KviKvsTreeNodeParameterReturn::KviKvsTreeNodeParameterReturn(const QChar * pLocation,KviKvsTreeNodeDataList * pDataList) +KviKvsTreeNodeParameterReturn::KviKvsTreeNodeParameterReturn(const TQChar * pLocation,KviKvsTreeNodeDataList * pDataList) : KviKvsTreeNodeInstruction(pLocation) { #ifdef COMPILE_NEW_KVS @@ -45,7 +45,7 @@ KviKvsTreeNodeParameterReturn::~KviKvsTreeNodeParameterReturn() #endif } -void KviKvsTreeNodeParameterReturn::contextDescription(QString &szBuffer) +void KviKvsTreeNodeParameterReturn::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Parameter Return Evaluation"; @@ -57,7 +57,7 @@ void KviKvsTreeNodeParameterReturn::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s ParameterReturn",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp += " "; m_pDataList->dump(tmp.utf8().data()); #endif @@ -79,7 +79,7 @@ bool KviKvsTreeNodeParameterReturn::execute(KviKvsRunTimeContext * c) return true; } - QString all; + TQString all; lBuffer.allAsString(all); c->returnValue()->setString(all); #endif diff --git a/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.h b/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.h index 4bd3127..da65b6d 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.h @@ -32,12 +32,12 @@ class KviKvsTreeNodeDataList; class KVIRC_API KviKvsTreeNodeParameterReturn : public KviKvsTreeNodeInstruction { public: - KviKvsTreeNodeParameterReturn(const QChar * pLocation,KviKvsTreeNodeDataList * pDataList); + KviKvsTreeNodeParameterReturn(const TQChar * pLocation,KviKvsTreeNodeDataList * pDataList); ~KviKvsTreeNodeParameterReturn(); protected: KviKvsTreeNodeDataList * m_pDataList; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.cpp b/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.cpp index 64e7769..0ca02a9 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.cpp @@ -31,7 +31,7 @@ #include "kvi_locale.h" #include "kvi_kvs_runtimecontext.h" -KviKvsTreeNodeRebindingSwitch::KviKvsTreeNodeRebindingSwitch(const QChar * pLocation,KviKvsTreeNodeData * pTargetWindow,KviKvsTreeNodeCommand * pChildCommand) +KviKvsTreeNodeRebindingSwitch::KviKvsTreeNodeRebindingSwitch(const TQChar * pLocation,KviKvsTreeNodeData * pTargetWindow,KviKvsTreeNodeCommand * pChildCommand) : KviKvsTreeNodeCommand(pLocation,pChildCommand->commandName()) { m_pTargetWindow = pTargetWindow; @@ -47,7 +47,7 @@ KviKvsTreeNodeRebindingSwitch::~KviKvsTreeNodeRebindingSwitch() } -void KviKvsTreeNodeRebindingSwitch::contextDescription(QString &szBuffer) +void KviKvsTreeNodeRebindingSwitch::contextDescription(TQString &szBuffer) { szBuffer = "Window Rebinding Switch"; } @@ -55,13 +55,13 @@ void KviKvsTreeNodeRebindingSwitch::contextDescription(QString &szBuffer) void KviKvsTreeNodeRebindingSwitch::dump(const char * prefix) { debug("%sRebindingSwitch",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp += " "; m_pTargetWindow->dump(tmp.utf8().data()); m_pChildCommand->dump(tmp.utf8().data()); } -const QString & KviKvsTreeNodeRebindingSwitch::commandName() +const TQString & KviKvsTreeNodeRebindingSwitch::commandName() { return m_pChildCommand->commandName(); } @@ -73,7 +73,7 @@ bool KviKvsTreeNodeRebindingSwitch::execute(KviKvsRunTimeContext * c) KviWindow * pNewWindow; - QString szWinId; + TQString szWinId; vWindow.asString(szWinId); if(szWinId.isEmpty()) { diff --git a/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.h b/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.h index c81dcd9..b71945e 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.h @@ -34,15 +34,15 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeRebindingSwitch : public KviKvsTreeNodeCommand { public: - KviKvsTreeNodeRebindingSwitch(const QChar * pLocation,KviKvsTreeNodeData * pTargetWindow,KviKvsTreeNodeCommand * pChildCommand); + KviKvsTreeNodeRebindingSwitch(const TQChar * pLocation,KviKvsTreeNodeData * pTargetWindow,KviKvsTreeNodeCommand * pChildCommand); ~KviKvsTreeNodeRebindingSwitch(); protected: KviKvsTreeNodeData * m_pTargetWindow; KviKvsTreeNodeCommand * m_pChildCommand; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); - const QString & commandName(); + const TQString & commandName(); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.cpp b/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.cpp index 0d12761..85b2f29 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.cpp @@ -36,7 +36,7 @@ #include "kvi_locale.h" -KviKvsTreeNodeScopeOperator::KviKvsTreeNodeScopeOperator(const QChar * pLocation,KviKvsTreeNodeData * pObject,KviKvsTreeNodeData * pData) +KviKvsTreeNodeScopeOperator::KviKvsTreeNodeScopeOperator(const TQChar * pLocation,KviKvsTreeNodeData * pObject,KviKvsTreeNodeData * pData) : KviKvsTreeNodeData(pLocation) { m_pObjectReference = pObject; @@ -51,7 +51,7 @@ KviKvsTreeNodeScopeOperator::~KviKvsTreeNodeScopeOperator() delete m_pRightSide; } -void KviKvsTreeNodeScopeOperator::contextDescription(QString &szBuffer) +void KviKvsTreeNodeScopeOperator::contextDescription(TQString &szBuffer) { szBuffer = "Scope Operator"; } @@ -60,7 +60,7 @@ void KviKvsTreeNodeScopeOperator::contextDescription(QString &szBuffer) void KviKvsTreeNodeScopeOperator::dump(const char * prefix) { debug("%s ScopeOperator",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pObjectReference->dump(tmp.utf8().data()); m_pRightSide->dump(tmp.utf8().data()); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.h b/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.h index 3042726..c132a43 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.h @@ -32,13 +32,13 @@ class KviKvsObject; class KVIRC_API KviKvsTreeNodeScopeOperator : public KviKvsTreeNodeData { public: - KviKvsTreeNodeScopeOperator(const QChar * pLocation,KviKvsTreeNodeData * pObject,KviKvsTreeNodeData * pData); + KviKvsTreeNodeScopeOperator(const TQChar * pLocation,KviKvsTreeNodeData * pObject,KviKvsTreeNodeData * pData); ~KviKvsTreeNodeScopeOperator(); public: KviKvsTreeNodeData * m_pObjectReference; // can't be null KviKvsTreeNodeData * m_pRightSide; // can't be null public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool isReadOnly(); // gets the m_pRightSide read only state virtual bool canEvaluateToObjectReference(); // gets the m_pRightSide result diff --git a/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.cpp index dd055b9..e30a005 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.cpp @@ -27,7 +27,7 @@ #include "kvi_kvs_treenode_simplecommand.h" #include "kvi_kvs_treenode_datalist.h" -KviKvsTreeNodeSimpleCommand::KviKvsTreeNodeSimpleCommand(const QChar * pLocation,const QString &szCmdName,KviKvsTreeNodeDataList * params) +KviKvsTreeNodeSimpleCommand::KviKvsTreeNodeSimpleCommand(const TQChar * pLocation,const TQString &szCmdName,KviKvsTreeNodeDataList * params) : KviKvsTreeNodeCommandWithParameters(pLocation,szCmdName,params) { } @@ -36,7 +36,7 @@ KviKvsTreeNodeSimpleCommand::~KviKvsTreeNodeSimpleCommand() { } -void KviKvsTreeNodeSimpleCommand::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSimpleCommand::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Simple Command \""; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.h b/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.h index d9aec78..3636c5e 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.h @@ -32,10 +32,10 @@ class KviKvsTreeNodeDataList; class KVIRC_API KviKvsTreeNodeSimpleCommand : public KviKvsTreeNodeCommandWithParameters { public: - KviKvsTreeNodeSimpleCommand(const QChar * pLocation,const QString &szCmdName,KviKvsTreeNodeDataList * params); + KviKvsTreeNodeSimpleCommand(const TQChar * pLocation,const TQString &szCmdName,KviKvsTreeNodeDataList * params); ~KviKvsTreeNodeSimpleCommand(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.cpp b/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.cpp index d67c82b..984ad7a 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.cpp @@ -28,7 +28,7 @@ #include "kvi_kvs_runtimecontext.h" #include "kvi_kvs_variant.h" -KviKvsTreeNodeSingleParameterIdentifier::KviKvsTreeNodeSingleParameterIdentifier(const QChar * pLocation,int iStart) +KviKvsTreeNodeSingleParameterIdentifier::KviKvsTreeNodeSingleParameterIdentifier(const TQChar * pLocation,int iStart) : KviKvsTreeNodeData(pLocation) { #ifdef COMPILE_NEW_KVS @@ -40,11 +40,11 @@ KviKvsTreeNodeSingleParameterIdentifier::~KviKvsTreeNodeSingleParameterIdentifie { } -void KviKvsTreeNodeSingleParameterIdentifier::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSingleParameterIdentifier::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Single Parameter Identifier \"$"; - KviQString::appendFormatted(szBuffer,"%d",m_iStart); + KviTQString::appendFormatted(szBuffer,"%d",m_iStart); szBuffer += "\""; #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.h b/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.h index fb7590c..0a9f802 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.h @@ -34,12 +34,12 @@ class KviKvsVariant; class KVIRC_API KviKvsTreeNodeSingleParameterIdentifier : public KviKvsTreeNodeData { public: - KviKvsTreeNodeSingleParameterIdentifier(const QChar * pLocation,int iStart); + KviKvsTreeNodeSingleParameterIdentifier(const TQChar * pLocation,int iStart); ~KviKvsTreeNodeSingleParameterIdentifier(); protected: int m_iStart; // the index of the parameter wanted (always >= 0) public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool canEvaluateToObjectReference(); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.cpp index bfca30a..6573b98 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.cpp @@ -26,7 +26,7 @@ #include "kvi_kvs_treenode_specialcommand.h" -KviKvsTreeNodeSpecialCommand::KviKvsTreeNodeSpecialCommand(const QChar * pLocation,const QString &szCmdName) +KviKvsTreeNodeSpecialCommand::KviKvsTreeNodeSpecialCommand(const TQChar * pLocation,const TQString &szCmdName) : KviKvsTreeNodeCommand(pLocation,szCmdName) { } @@ -35,7 +35,7 @@ KviKvsTreeNodeSpecialCommand::~KviKvsTreeNodeSpecialCommand() { } -void KviKvsTreeNodeSpecialCommand::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommand::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Special Command \""; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.h index 9ac8867..c7d1153 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.h @@ -31,10 +31,10 @@ class KVIRC_API KviKvsTreeNodeSpecialCommand : public KviKvsTreeNodeCommand { public: - KviKvsTreeNodeSpecialCommand(const QChar * pLocation,const QString &szCmdName); + KviKvsTreeNodeSpecialCommand(const TQChar * pLocation,const TQString &szCmdName); ~KviKvsTreeNodeSpecialCommand(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.cpp index ad75040..851c111 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.cpp @@ -28,7 +28,7 @@ #include "kvi_kvs_runtimecontext.h" #include "kvi_locale.h" -KviKvsTreeNodeSpecialCommandBreak::KviKvsTreeNodeSpecialCommandBreak(const QChar * pLocation) +KviKvsTreeNodeSpecialCommandBreak::KviKvsTreeNodeSpecialCommandBreak(const TQChar * pLocation) : KviKvsTreeNodeSpecialCommand(pLocation,"break") { } @@ -37,7 +37,7 @@ KviKvsTreeNodeSpecialCommandBreak::~KviKvsTreeNodeSpecialCommandBreak() { } -void KviKvsTreeNodeSpecialCommandBreak::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandBreak::contextDescription(TQString &szBuffer) { szBuffer = "Special Command \"break\""; } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.h index a4b061e..44cdac6 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.h @@ -34,10 +34,10 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeSpecialCommandBreak : public KviKvsTreeNodeSpecialCommand { public: - KviKvsTreeNodeSpecialCommandBreak(const QChar * pLocation); + KviKvsTreeNodeSpecialCommandBreak(const TQChar * pLocation); ~KviKvsTreeNodeSpecialCommandBreak(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp index 05d35ed..0ec0f27 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp @@ -31,7 +31,7 @@ #include "kvi_kvs_object_controller.h" #include "kvi_kvs_object_class.h" -KviKvsTreeNodeSpecialCommandClassFunctionDefinition::KviKvsTreeNodeSpecialCommandClassFunctionDefinition(const QChar * pLocation,const QString &szName,const QString &szBuffer,unsigned int uHandlerFlags) +KviKvsTreeNodeSpecialCommandClassFunctionDefinition::KviKvsTreeNodeSpecialCommandClassFunctionDefinition(const TQChar * pLocation,const TQString &szName,const TQString &szBuffer,unsigned int uHandlerFlags) : KviKvsTreeNode(pLocation) { m_uHandlerFlags = uHandlerFlags; @@ -45,12 +45,12 @@ void KviKvsTreeNodeSpecialCommandClassFunctionDefinition::dump(const char * pref debug("%s (command buffer with %d characters)",prefix,m_szBuffer.length()); } -void KviKvsTreeNodeSpecialCommandClassFunctionDefinition::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandClassFunctionDefinition::contextDescription(TQString &szBuffer) { - KviQString::sprintf(szBuffer,"Object Member Function Definition \"%Q\"",&m_szName); + KviTQString::sprintf(szBuffer,"Object Member Function Definition \"%Q\"",&m_szName); } -KviKvsTreeNodeSpecialCommandClass::KviKvsTreeNodeSpecialCommandClass(const QChar * pLocation,KviKvsTreeNodeDataList * pParams) +KviKvsTreeNodeSpecialCommandClass::KviKvsTreeNodeSpecialCommandClass(const TQChar * pLocation,KviKvsTreeNodeDataList * pParams) : KviKvsTreeNodeSpecialCommand(pLocation,"class") { m_pParams = pParams; @@ -72,7 +72,7 @@ void KviKvsTreeNodeSpecialCommandClass::addFunctionDefinition(KviKvsTreeNodeSpec } -void KviKvsTreeNodeSpecialCommandClass::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandClass::contextDescription(TQString &szBuffer) { szBuffer = "Special Command \"class\""; } @@ -80,7 +80,7 @@ void KviKvsTreeNodeSpecialCommandClass::contextDescription(QString &szBuffer) void KviKvsTreeNodeSpecialCommandClass::dump(const char * prefix) { debug("%s SpecialCommandClass",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pParams->dump(tmp.utf8().data()); for(KviKvsTreeNodeSpecialCommandClassFunctionDefinition * d = m_pFunctions->first();d;d = m_pFunctions->next()) @@ -100,8 +100,8 @@ bool KviKvsTreeNodeSpecialCommandClass::execute(KviKvsRunTimeContext * c) } KviKvsVariant * pBaseClassName = l.next(); - QString szClassName; - QString szBaseClassName; + TQString szClassName; + TQString szBaseClassName; pClassName->asString(szClassName); if(pBaseClassName) pBaseClassName->asString(szBaseClassName); @@ -115,7 +115,7 @@ bool KviKvsTreeNodeSpecialCommandClass::execute(KviKvsRunTimeContext * c) if(szBaseClassName.isEmpty())szBaseClassName = "object"; // avoid infinite recursion in loading the base class - if(KviQString::equalCI(szBaseClassName,szClassName)) + if(KviTQString::equalCI(szBaseClassName,szClassName)) { c->error(__tr2qs("A class can't be a subclass of itself")); return false; @@ -132,12 +132,12 @@ bool KviKvsTreeNodeSpecialCommandClass::execute(KviKvsRunTimeContext * c) KviKvsObjectClass * pClass = pBaseClass; while(pClass) { - if(KviQString::equalCI(pClass->name(),szClassName)) + if(KviTQString::equalCI(pClass->name(),szClassName)) { c->error(this,__tr2qs("Detected a loop in the inheritance tree of the base class \"%Q\": redefine that class first"),&szBaseClassName); return false; } - pClass = pClass->parentClass(); + pClass = pClass->tqparentClass(); } KviKvsObjectClass * pActualClass = KviKvsKernel::instance()->objectController()->lookupClass(szClassName,true); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.h index 0a8a69b..592c454 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.h @@ -35,17 +35,17 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeSpecialCommandClassFunctionDefinition : public KviKvsTreeNode { public: - KviKvsTreeNodeSpecialCommandClassFunctionDefinition(const QChar * pLocation,const QString &szName,const QString &szBuffer,unsigned int uHandlerFlags); + KviKvsTreeNodeSpecialCommandClassFunctionDefinition(const TQChar * pLocation,const TQString &szName,const TQString &szBuffer,unsigned int uHandlerFlags); virtual ~KviKvsTreeNodeSpecialCommandClassFunctionDefinition(){}; protected: - QString m_szName; - QString m_szBuffer; + TQString m_szName; + TQString m_szBuffer; unsigned int m_uHandlerFlags; public: unsigned int handlerFlags(){ return m_uHandlerFlags; }; - const QString & name(){ return m_szName; }; - const QString & buffer(){ return m_szBuffer; }; - virtual void contextDescription(QString &szBuffer); + const TQString & name(){ return m_szName; }; + const TQString & buffer(){ return m_szBuffer; }; + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); }; @@ -54,14 +54,14 @@ public: class KVIRC_API KviKvsTreeNodeSpecialCommandClass : public KviKvsTreeNodeSpecialCommand { public: - KviKvsTreeNodeSpecialCommandClass(const QChar * pLocation,KviKvsTreeNodeDataList * pParams); + KviKvsTreeNodeSpecialCommandClass(const TQChar * pLocation,KviKvsTreeNodeDataList * pParams); virtual ~KviKvsTreeNodeSpecialCommandClass(); protected: KviKvsTreeNodeDataList * m_pParams; KviPointerList<KviKvsTreeNodeSpecialCommandClassFunctionDefinition> * m_pFunctions; public: void addFunctionDefinition(KviKvsTreeNodeSpecialCommandClassFunctionDefinition * pDef); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp index eea02bd..7462130 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp @@ -33,7 +33,7 @@ #include "kvi_kvs_popupmenu.h" #include "kvi_kvs_script.h" -void KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Label \"extpopup\" For Special Command \"defpopup\""; @@ -44,9 +44,9 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup::dump(const char * prefix { #ifdef COMPILE_NEW_KVS debug("%s SpecialCommandDefpopupLabelExtpopup",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); - QString x = tmp; + TQString x = tmp; x += "CONDITION: "; x += m_szCondition; debug("%s",x.utf8().data()); @@ -74,7 +74,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup::execute(KviKvsRunTimeCon } -void KviKvsTreeNodeSpecialCommandDefpopupLabelItem::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandDefpopupLabelItem::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Label \"item\" For Special Command \"defpopup\""; @@ -86,9 +86,9 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelItem::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s SpecialCommandDefpopupLabelItem",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); - QString x = tmp; + TQString x = tmp; x += "CONDITION: "; x += m_szCondition; debug("%s",x.utf8().data()); @@ -115,7 +115,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopupLabelItem::execute(KviKvsRunTimeContext return true; } -void KviKvsTreeNodeSpecialCommandDefpopupLabelLabel::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandDefpopupLabelLabel::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Label \"label\" For Special Command \"defpopup\""; @@ -127,9 +127,9 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelLabel::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s SpecialCommandDefpopupLabelLabel",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); - QString x = tmp; + TQString x = tmp; x += "CONDITION: "; x += m_szCondition; debug("%s",x.utf8().data()); @@ -155,7 +155,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopupLabelLabel::execute(KviKvsRunTimeContex -void KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Label \"separator\" For Special Command \"defpopup\""; @@ -167,7 +167,7 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator::dump(const char * prefi { #ifdef COMPILE_NEW_KVS debug("%s SpecialCommandDefpopupLabelSeparator",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" CONDITION:"); tmp.append(m_szCondition); debug("%s",tmp.utf8().data()); @@ -184,7 +184,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator::execute(KviKvsRunTimeCo -void KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Label \"epilogue\" For Special Command \"defpopup\""; @@ -196,7 +196,7 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue::dump(const char * prefix { #ifdef COMPILE_NEW_KVS debug("%s SpecialCommandDefpopupLabelEpilogue",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" INSTRUCTION: "); tmp += m_szInstruction; debug("%s",tmp.utf8().data()); @@ -212,7 +212,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue::execute(KviKvsRunTimeCon } -void KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Label \"prologue\" For Special Command \"defpopup\""; @@ -225,7 +225,7 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue::dump(const char * prefix { #ifdef COMPILE_NEW_KVS debug("%s SpecialCommandDefpopupLabelPrologue",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" INSTRUCTION: "); tmp += m_szInstruction; debug("%s",tmp.utf8().data()); @@ -248,8 +248,8 @@ bool KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue::execute(KviKvsRunTimeCon -KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::KviKvsTreeNodeSpecialCommandDefpopupLabelPopup(const QChar * pLocation) -: KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon(pLocation,QString::null,QString::null,QString::null,QString::null) +KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::KviKvsTreeNodeSpecialCommandDefpopupLabelPopup(const TQChar * pLocation) +: KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon(pLocation,TQString(),TQString(),TQString(),TQString()) { #ifdef COMPILE_NEW_KVS m_pLabels = new KviPointerList<KviKvsTreeNodeSpecialCommandDefpopupLabel>; @@ -264,7 +264,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::~KviKvsTreeNodeSpecialCommandDef #endif } -void KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Label \"popup\" For Special Command \"defpopup\""; @@ -276,9 +276,9 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s SpecialCommandDefpopupLabelPopup",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); - QString x = tmp; + TQString x = tmp; x += "CONDITION: "; x += m_szCondition; debug(x.utf8().data()); @@ -332,7 +332,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::fill(KviKvsRunTimeContext* -KviKvsTreeNodeSpecialCommandDefpopup::KviKvsTreeNodeSpecialCommandDefpopup(const QChar * pLocation,KviKvsTreeNodeData * pPopupName,KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * pMainPopup) +KviKvsTreeNodeSpecialCommandDefpopup::KviKvsTreeNodeSpecialCommandDefpopup(const TQChar * pLocation,KviKvsTreeNodeData * pPopupName,KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * pMainPopup) : KviKvsTreeNodeSpecialCommand(pLocation,"defpopup") { #ifdef COMPILE_NEW_KVS @@ -351,7 +351,7 @@ KviKvsTreeNodeSpecialCommandDefpopup::~KviKvsTreeNodeSpecialCommandDefpopup() #endif } -void KviKvsTreeNodeSpecialCommandDefpopup::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandDefpopup::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Special Command \"defpopup\""; @@ -363,7 +363,7 @@ void KviKvsTreeNodeSpecialCommandDefpopup::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s SpecialCommandDefpopup",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pPopupName->dump(tmp.utf8().data()); m_pMainPopup->dump(tmp.utf8().data()); @@ -375,7 +375,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopup::execute(KviKvsRunTimeContext * c) #ifdef COMPILE_NEW_KVS KviKvsVariant v; if(!m_pPopupName->evaluateReadOnly(c,&v))return false; - QString szName; + TQString szName; v.asString(szName); KviKvsSwitchList swl; @@ -410,7 +410,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopup::execute(KviKvsRunTimeContext * c) } // we want to (re)create it - if(!swl.find('m',"--merge"))pPopup->doClear(); + if(!swl.tqfind('m',"--merge"))pPopup->doClear(); } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.h index 53a02fb..b55b1fb 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.h @@ -39,36 +39,36 @@ class KviKvsPopupMenu; class KVIRC_API KviKvsTreeNodeSpecialCommandDefpopupLabel : public KviKvsTreeNode { public: - QString m_szItemName; + TQString m_szItemName; public: - KviKvsTreeNodeSpecialCommandDefpopupLabel(const QChar * pLocation,const QString &szItemName) + KviKvsTreeNodeSpecialCommandDefpopupLabel(const TQChar * pLocation,const TQString &szItemName) : KviKvsTreeNode(pLocation), m_szItemName(szItemName) {}; ~KviKvsTreeNodeSpecialCommandDefpopupLabel(){}; public: - void setItemName(const QString &szItemName){ m_szItemName = szItemName; }; + void setItemName(const TQString &szItemName){ m_szItemName = szItemName; }; virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p) = 0; }; class KVIRC_API KviKvsTreeNodeSpecialCommandDefpopupConditionalLabel : public KviKvsTreeNodeSpecialCommandDefpopupLabel { protected: - QString m_szCondition; // may be null! + TQString m_szCondition; // may be null! public: - KviKvsTreeNodeSpecialCommandDefpopupConditionalLabel(const QChar * pLocation,const QString &szCondition,const QString &szItemName) + KviKvsTreeNodeSpecialCommandDefpopupConditionalLabel(const TQChar * pLocation,const TQString &szCondition,const TQString &szItemName) : KviKvsTreeNodeSpecialCommandDefpopupLabel(pLocation,szItemName), m_szCondition(szCondition) {}; ~KviKvsTreeNodeSpecialCommandDefpopupConditionalLabel(){}; public: - void setCondition(const QString &szCondition){ m_szCondition = szCondition; }; + void setCondition(const TQString &szCondition){ m_szCondition = szCondition; }; }; class KVIRC_API KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator : public KviKvsTreeNodeSpecialCommandDefpopupConditionalLabel { public: - KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator(const QChar * pLocation,const QString &szCondition,const QString &szItemName) + KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator(const TQChar * pLocation,const TQString &szCondition,const TQString &szItemName) : KviKvsTreeNodeSpecialCommandDefpopupConditionalLabel(pLocation,szCondition,szItemName){}; ~KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator(){}; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); }; @@ -76,27 +76,27 @@ public: class KVIRC_API KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon : public KviKvsTreeNodeSpecialCommandDefpopupConditionalLabel { protected: - QString m_szText; - QString m_szIcon; + TQString m_szText; + TQString m_szIcon; public: - KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon(const QChar * pLocation,const QString &szCondition,const QString &szText,const QString &szIcon,const QString &szItemName) + KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon(const TQChar * pLocation,const TQString &szCondition,const TQString &szText,const TQString &szIcon,const TQString &szItemName) : KviKvsTreeNodeSpecialCommandDefpopupConditionalLabel(pLocation,szCondition,szItemName), m_szText(szText), m_szIcon(szIcon){}; ~KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon(){}; public: - void setText(const QString &szText){ m_szText = szText; }; - void setIcon(const QString &szIcon){ m_szIcon = szIcon; }; + void setText(const TQString &szText){ m_szText = szText; }; + void setIcon(const TQString &szIcon){ m_szIcon = szIcon; }; }; class KVIRC_API KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup : public KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon { protected: - QString m_szName; + TQString m_szName; public: - KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup(const QChar * pLocation,const QString &szCondition,const QString &szText,const QString &szIcon,const QString &szName,const QString &szItemName) + KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup(const TQChar * pLocation,const TQString &szCondition,const TQString &szText,const TQString &szIcon,const TQString &szName,const TQString &szItemName) : KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon(pLocation,szCondition,szText,szIcon,szItemName), m_szName(szName){}; ~KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup(){}; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); }; @@ -104,13 +104,13 @@ public: class KVIRC_API KviKvsTreeNodeSpecialCommandDefpopupLabelItem : public KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon { protected: - QString m_szInstruction; + TQString m_szInstruction; public: - KviKvsTreeNodeSpecialCommandDefpopupLabelItem(const QChar * pLocation,const QString &szCondition,const QString &szText,const QString &szIcon,const QString &szInstruction,const QString &szItemName) + KviKvsTreeNodeSpecialCommandDefpopupLabelItem(const TQChar * pLocation,const TQString &szCondition,const TQString &szText,const TQString &szIcon,const TQString &szInstruction,const TQString &szItemName) : KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon(pLocation,szCondition,szText,szIcon,szItemName), m_szInstruction(szInstruction) {}; ~KviKvsTreeNodeSpecialCommandDefpopupLabelItem(){}; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); }; @@ -119,11 +119,11 @@ public: class KVIRC_API KviKvsTreeNodeSpecialCommandDefpopupLabelLabel : public KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon { public: - KviKvsTreeNodeSpecialCommandDefpopupLabelLabel(const QChar * pLocation,const QString &szCondition,const QString &szText,const QString &szIcon,const QString &szItemName) + KviKvsTreeNodeSpecialCommandDefpopupLabelLabel(const TQChar * pLocation,const TQString &szCondition,const TQString &szText,const TQString &szIcon,const TQString &szItemName) : KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon(pLocation,szCondition,szText,szIcon,szItemName){}; ~KviKvsTreeNodeSpecialCommandDefpopupLabelLabel(){}; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); }; @@ -133,13 +133,13 @@ public: class KVIRC_API KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue : public KviKvsTreeNodeSpecialCommandDefpopupLabel { protected: - QString m_szInstruction; + TQString m_szInstruction; public: - KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue(const QChar * pLocation,const QString &szInstruction,const QString &szItemName) + KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue(const TQChar * pLocation,const TQString &szInstruction,const TQString &szItemName) : KviKvsTreeNodeSpecialCommandDefpopupLabel(pLocation,szItemName), m_szInstruction(szInstruction){}; ~KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue(){}; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); }; @@ -147,13 +147,13 @@ public: class KVIRC_API KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue : public KviKvsTreeNodeSpecialCommandDefpopupLabel { protected: - QString m_szInstruction; + TQString m_szInstruction; public: - KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue(const QChar * pLocation,const QString &szInstruction,const QString &szItemName) + KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue(const TQChar * pLocation,const TQString &szInstruction,const TQString &szItemName) : KviKvsTreeNodeSpecialCommandDefpopupLabel(pLocation,szItemName), m_szInstruction(szInstruction){}; ~KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue(){}; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); }; @@ -162,14 +162,14 @@ public: class KVIRC_API KviKvsTreeNodeSpecialCommandDefpopupLabelPopup : public KviKvsTreeNodeSpecialCommandDefpopupConditionalLabelWithTextAndIcon { public: - KviKvsTreeNodeSpecialCommandDefpopupLabelPopup(const QChar * pLocation); + KviKvsTreeNodeSpecialCommandDefpopupLabelPopup(const TQChar * pLocation); ~KviKvsTreeNodeSpecialCommandDefpopupLabelPopup(); protected: KviPointerList<KviKvsTreeNodeSpecialCommandDefpopupLabel> * m_pLabels; public: bool isEmpty(){ return m_pLabels->isEmpty(); }; void addLabel(KviKvsTreeNodeSpecialCommandDefpopupLabel * pLabel); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); bool fill(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); @@ -179,13 +179,13 @@ public: class KVIRC_API KviKvsTreeNodeSpecialCommandDefpopup : public KviKvsTreeNodeSpecialCommand { public: - KviKvsTreeNodeSpecialCommandDefpopup(const QChar * pLocation,KviKvsTreeNodeData * pPopupName,KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * pMainPopup); + KviKvsTreeNodeSpecialCommandDefpopup(const TQChar * pLocation,KviKvsTreeNodeData * pPopupName,KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * pMainPopup); ~KviKvsTreeNodeSpecialCommandDefpopup(); private: KviKvsTreeNodeData * m_pPopupName; // can't be zero KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * m_pMainPopup; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp index 5b083c8..012b0e7 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp @@ -31,7 +31,7 @@ #include "kvi_kvs_runtimecontext.h" #include "kvi_locale.h" -KviKvsTreeNodeSpecialCommandDo::KviKvsTreeNodeSpecialCommandDo(const QChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * i) +KviKvsTreeNodeSpecialCommandDo::KviKvsTreeNodeSpecialCommandDo(const TQChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * i) : KviKvsTreeNodeSpecialCommand(pLocation,"do") { m_pExpression = e; @@ -46,7 +46,7 @@ KviKvsTreeNodeSpecialCommandDo::~KviKvsTreeNodeSpecialCommandDo() if(m_pInstruction)delete m_pInstruction; } -void KviKvsTreeNodeSpecialCommandDo::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandDo::contextDescription(TQString &szBuffer) { szBuffer = "Special Command \"do\""; } @@ -54,7 +54,7 @@ void KviKvsTreeNodeSpecialCommandDo::contextDescription(QString &szBuffer) void KviKvsTreeNodeSpecialCommandDo::dump(const char * prefix) { debug("%s SpecialCommandDo",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pExpression->dump(tmp); if(m_pInstruction)m_pInstruction->dump(tmp); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.h index dde8d00..834d0ea 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.h @@ -36,13 +36,13 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeSpecialCommandDo : public KviKvsTreeNodeSpecialCommand { public: - KviKvsTreeNodeSpecialCommandDo(const QChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * i); + KviKvsTreeNodeSpecialCommandDo(const TQChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * i); ~KviKvsTreeNodeSpecialCommandDo(); private: KviKvsTreeNodeExpression * m_pExpression; // can't be 0 KviKvsTreeNodeInstruction * m_pInstruction; // may be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp index 82526bc..e608988 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp @@ -30,7 +30,7 @@ #include "kvi_kvs_runtimecontext.h" #include "kvi_locale.h" -KviKvsTreeNodeSpecialCommandFor::KviKvsTreeNodeSpecialCommandFor(const QChar * pLocation,KviKvsTreeNodeInstruction * pInit,KviKvsTreeNodeExpression * pCond,KviKvsTreeNodeInstruction * pUpd,KviKvsTreeNodeInstruction * pLoop) +KviKvsTreeNodeSpecialCommandFor::KviKvsTreeNodeSpecialCommandFor(const TQChar * pLocation,KviKvsTreeNodeInstruction * pInit,KviKvsTreeNodeExpression * pCond,KviKvsTreeNodeInstruction * pUpd,KviKvsTreeNodeInstruction * pLoop) : KviKvsTreeNodeSpecialCommand(pLocation,"for") { m_pInitialization = pInit; @@ -51,7 +51,7 @@ KviKvsTreeNodeSpecialCommandFor::~KviKvsTreeNodeSpecialCommandFor() if(m_pLoop)delete m_pLoop; } -void KviKvsTreeNodeSpecialCommandFor::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandFor::contextDescription(TQString &szBuffer) { szBuffer = "Special Command \"for\""; } @@ -59,7 +59,7 @@ void KviKvsTreeNodeSpecialCommandFor::contextDescription(QString &szBuffer) void KviKvsTreeNodeSpecialCommandFor::dump(const char * prefix) { debug("%s SpecialCommandFor",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); if(m_pInitialization)m_pInitialization->dump(tmp.utf8().data()); if(m_pCondition)m_pCondition->dump(tmp.utf8().data()); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.h index 4c53f2c..3800c95 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.h @@ -36,7 +36,7 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeSpecialCommandFor : public KviKvsTreeNodeSpecialCommand { public: - KviKvsTreeNodeSpecialCommandFor(const QChar * pLocation,KviKvsTreeNodeInstruction * pInit,KviKvsTreeNodeExpression * pCond,KviKvsTreeNodeInstruction * pUpd,KviKvsTreeNodeInstruction * pLoop); + KviKvsTreeNodeSpecialCommandFor(const TQChar * pLocation,KviKvsTreeNodeInstruction * pInit,KviKvsTreeNodeExpression * pCond,KviKvsTreeNodeInstruction * pUpd,KviKvsTreeNodeInstruction * pLoop); ~KviKvsTreeNodeSpecialCommandFor(); private: KviKvsTreeNodeInstruction * m_pInitialization; // can be 0 @@ -44,7 +44,7 @@ private: KviKvsTreeNodeInstruction * m_pUpdate; // can be 0 KviKvsTreeNodeInstruction * m_pLoop; // can be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp index db98e39..90e0d1c 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp @@ -32,7 +32,7 @@ #include "kvi_kvs_runtimecontext.h" #include "kvi_locale.h" -KviKvsTreeNodeSpecialCommandForeach::KviKvsTreeNodeSpecialCommandForeach(const QChar * pLocation,KviKvsTreeNodeData * pVar,KviKvsTreeNodeDataList * pArgs,KviKvsTreeNodeInstruction * pLoop) +KviKvsTreeNodeSpecialCommandForeach::KviKvsTreeNodeSpecialCommandForeach(const TQChar * pLocation,KviKvsTreeNodeData * pVar,KviKvsTreeNodeDataList * pArgs,KviKvsTreeNodeInstruction * pLoop) : KviKvsTreeNodeSpecialCommand(pLocation,"foreach") { m_pIterationVariable = pVar; @@ -50,7 +50,7 @@ KviKvsTreeNodeSpecialCommandForeach::~KviKvsTreeNodeSpecialCommandForeach() delete m_pLoop; } -void KviKvsTreeNodeSpecialCommandForeach::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandForeach::contextDescription(TQString &szBuffer) { szBuffer = "Special Command \"foreach\""; } @@ -58,7 +58,7 @@ void KviKvsTreeNodeSpecialCommandForeach::contextDescription(QString &szBuffer) void KviKvsTreeNodeSpecialCommandForeach::dump(const char * prefix) { debug("%s SpecialCommandForeach",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pIterationVariable->dump(tmp.utf8().data()); m_pIterationData->dump(tmp.utf8().data()); @@ -84,7 +84,7 @@ bool KviKvsTreeNodeSpecialCommandForeach::execute(KviKvsRunTimeContext * c) if(!(m_pSwitches->evaluate(c,&swl)))return false; } - bool bIncludeEmptyScalars = swl.find('a',"all") != 0; + bool bIncludeEmptyScalars = swl.tqfind('a',"all") != 0; for(KviKvsVariant * pArg = l.first();pArg;pArg = l.next()) { diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.h index 9f2e765..d3b8ff2 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.h @@ -37,14 +37,14 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeSpecialCommandForeach : public KviKvsTreeNodeSpecialCommand { public: - KviKvsTreeNodeSpecialCommandForeach(const QChar * pLocation,KviKvsTreeNodeData * pVar,KviKvsTreeNodeDataList * pArgs,KviKvsTreeNodeInstruction * pLoop); + KviKvsTreeNodeSpecialCommandForeach(const TQChar * pLocation,KviKvsTreeNodeData * pVar,KviKvsTreeNodeDataList * pArgs,KviKvsTreeNodeInstruction * pLoop); ~KviKvsTreeNodeSpecialCommandForeach(); private: KviKvsTreeNodeData * m_pIterationVariable; // can't be zero! KviKvsTreeNodeDataList * m_pIterationData; // can't be zero! KviKvsTreeNodeInstruction * m_pLoop; // can't be zero! public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp index bc9e31d..2c17022 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp @@ -30,7 +30,7 @@ #include "kvi_kvs_runtimecontext.h" #include "kvi_locale.h" -KviKvsTreeNodeSpecialCommandIf::KviKvsTreeNodeSpecialCommandIf(const QChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * pIf,KviKvsTreeNodeInstruction * pElse) +KviKvsTreeNodeSpecialCommandIf::KviKvsTreeNodeSpecialCommandIf(const TQChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * pIf,KviKvsTreeNodeInstruction * pElse) : KviKvsTreeNodeSpecialCommand(pLocation,"if") { #ifdef COMPILE_NEW_KVS @@ -52,7 +52,7 @@ KviKvsTreeNodeSpecialCommandIf::~KviKvsTreeNodeSpecialCommandIf() #endif } -void KviKvsTreeNodeSpecialCommandIf::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandIf::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Special Command \"if\""; @@ -63,7 +63,7 @@ void KviKvsTreeNodeSpecialCommandIf::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s SpecialCommandIf",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pExpression->dump(tmp); if(m_pIfInstruction)m_pIfInstruction->dump(tmp); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.h index bc89af4..856b895 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.h @@ -35,14 +35,14 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeSpecialCommandIf : public KviKvsTreeNodeSpecialCommand { public: - KviKvsTreeNodeSpecialCommandIf(const QChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * pIf,KviKvsTreeNodeInstruction * pElse); + KviKvsTreeNodeSpecialCommandIf(const TQChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * pIf,KviKvsTreeNodeInstruction * pElse); ~KviKvsTreeNodeSpecialCommandIf(); private: KviKvsTreeNodeExpression * m_pExpression; // can't be 0 KviKvsTreeNodeInstruction * m_pIfInstruction; // may be 0 KviKvsTreeNodeInstruction * m_pElseInstruction; // may be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp index 28b7b1f..d24efa0 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp @@ -30,9 +30,9 @@ #include "kvi_kvs_runtimecontext.h" #include "kvi_locale.h" -#include <qregexp.h> +#include <tqregexp.h> -KviKvsTreeNodeSpecialCommandSwitchLabel::KviKvsTreeNodeSpecialCommandSwitchLabel(const QChar * pLocation) +KviKvsTreeNodeSpecialCommandSwitchLabel::KviKvsTreeNodeSpecialCommandSwitchLabel(const TQChar * pLocation) : KviKvsTreeNode(pLocation) { m_pParameter = 0; @@ -64,7 +64,7 @@ void KviKvsTreeNodeSpecialCommandSwitchLabel::setInstruction(KviKvsTreeNodeInstr -KviKvsTreeNodeSpecialCommandSwitchLabelCase::KviKvsTreeNodeSpecialCommandSwitchLabelCase(const QChar * pLocation) +KviKvsTreeNodeSpecialCommandSwitchLabelCase::KviKvsTreeNodeSpecialCommandSwitchLabelCase(const TQChar * pLocation) : KviKvsTreeNodeSpecialCommandSwitchLabel(pLocation) { } @@ -73,7 +73,7 @@ KviKvsTreeNodeSpecialCommandSwitchLabelCase::~KviKvsTreeNodeSpecialCommandSwitch { } -void KviKvsTreeNodeSpecialCommandSwitchLabelCase::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandSwitchLabelCase::contextDescription(TQString &szBuffer) { szBuffer = "Label \"case\" For Special Command \"switch\""; } @@ -81,7 +81,7 @@ void KviKvsTreeNodeSpecialCommandSwitchLabelCase::contextDescription(QString &sz void KviKvsTreeNodeSpecialCommandSwitchLabelCase::dump(const char * prefix) { debug("%s SpecialCommandSwitchLabelCase",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); if(m_pParameter)m_pParameter->dump(tmp.utf8().data()); if(m_pInstruction)m_pInstruction->dump(tmp.utf8().data()); @@ -115,10 +115,10 @@ bool KviKvsTreeNodeSpecialCommandSwitchLabelCase::execute(KviKvsRunTimeContext * } } else { // string comparision, case insensitive - QString reg; + TQString reg; v.asString(reg); - QString val; + TQString val; pRealParameter->asString(val); if(reg.lower() != val.lower())return true; @@ -139,7 +139,7 @@ bool KviKvsTreeNodeSpecialCommandSwitchLabelCase::execute(KviKvsRunTimeContext * -KviKvsTreeNodeSpecialCommandSwitchLabelMatch::KviKvsTreeNodeSpecialCommandSwitchLabelMatch(const QChar * pLocation) +KviKvsTreeNodeSpecialCommandSwitchLabelMatch::KviKvsTreeNodeSpecialCommandSwitchLabelMatch(const TQChar * pLocation) : KviKvsTreeNodeSpecialCommandSwitchLabel(pLocation) { } @@ -148,7 +148,7 @@ KviKvsTreeNodeSpecialCommandSwitchLabelMatch::~KviKvsTreeNodeSpecialCommandSwitc { } -void KviKvsTreeNodeSpecialCommandSwitchLabelMatch::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandSwitchLabelMatch::contextDescription(TQString &szBuffer) { szBuffer = "Label \"match\" For Special Command \"switch\""; } @@ -157,7 +157,7 @@ void KviKvsTreeNodeSpecialCommandSwitchLabelMatch::contextDescription(QString &s void KviKvsTreeNodeSpecialCommandSwitchLabelMatch::dump(const char * prefix) { debug("%s SpecialCommandSwitchLabelMatch",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); if(m_pParameter)m_pParameter->dump(tmp.utf8().data()); if(m_pInstruction)m_pInstruction->dump(tmp.utf8().data()); @@ -168,12 +168,12 @@ bool KviKvsTreeNodeSpecialCommandSwitchLabelMatch::execute(KviKvsRunTimeContext KviKvsVariant v; if(!m_pParameter->evaluateReadOnly(c,&v))return false; - QString reg; + TQString reg; v.asString(reg); - QRegExp rx(reg,false,true); + TQRegExp rx(reg,false,true); - QString val; + TQString val; pRealParameter->asString(val); if(!rx.exactMatch(val))return true; // no match @@ -193,7 +193,7 @@ bool KviKvsTreeNodeSpecialCommandSwitchLabelMatch::execute(KviKvsRunTimeContext -KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::KviKvsTreeNodeSpecialCommandSwitchLabelRegexp(const QChar * pLocation) +KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::KviKvsTreeNodeSpecialCommandSwitchLabelRegexp(const TQChar * pLocation) : KviKvsTreeNodeSpecialCommandSwitchLabel(pLocation) { } @@ -202,7 +202,7 @@ KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::~KviKvsTreeNodeSpecialCommandSwit { } -void KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::contextDescription(TQString &szBuffer) { szBuffer = "Label \"regexp\" For Special Command \"switch\""; } @@ -211,7 +211,7 @@ void KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::contextDescription(QString & void KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::dump(const char * prefix) { debug("%s SpecialCommandSwitchLabelRegexp",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); if(m_pParameter)m_pParameter->dump(tmp.utf8().data()); if(m_pInstruction)m_pInstruction->dump(tmp.utf8().data()); @@ -222,12 +222,12 @@ bool KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::execute(KviKvsRunTimeContext KviKvsVariant v; if(!m_pParameter->evaluateReadOnly(c,&v))return false; - QString reg; + TQString reg; v.asString(reg); - QRegExp rx(reg,false,false); + TQRegExp rx(reg,false,false); - QString val; + TQString val; pRealParameter->asString(val); if(!rx.exactMatch(val))return true; // no match @@ -249,7 +249,7 @@ bool KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::execute(KviKvsRunTimeContext -KviKvsTreeNodeSpecialCommandSwitchLabelDefault::KviKvsTreeNodeSpecialCommandSwitchLabelDefault(const QChar * pLocation) +KviKvsTreeNodeSpecialCommandSwitchLabelDefault::KviKvsTreeNodeSpecialCommandSwitchLabelDefault(const TQChar * pLocation) : KviKvsTreeNodeSpecialCommandSwitchLabel(pLocation) { } @@ -258,7 +258,7 @@ KviKvsTreeNodeSpecialCommandSwitchLabelDefault::~KviKvsTreeNodeSpecialCommandSwi { } -void KviKvsTreeNodeSpecialCommandSwitchLabelDefault::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandSwitchLabelDefault::contextDescription(TQString &szBuffer) { szBuffer = "Label \"default\" For Special Command \"switch\""; } @@ -267,7 +267,7 @@ void KviKvsTreeNodeSpecialCommandSwitchLabelDefault::contextDescription(QString void KviKvsTreeNodeSpecialCommandSwitchLabelDefault::dump(const char * prefix) { debug("%s SpecialCommandSwitchLabelDefault",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); if(m_pInstruction)m_pInstruction->dump(tmp.utf8().data()); } @@ -289,7 +289,7 @@ bool KviKvsTreeNodeSpecialCommandSwitchLabelDefault::execute(KviKvsRunTimeContex -KviKvsTreeNodeSpecialCommandSwitch::KviKvsTreeNodeSpecialCommandSwitch(const QChar * pLocation,KviKvsTreeNodeExpression * e) +KviKvsTreeNodeSpecialCommandSwitch::KviKvsTreeNodeSpecialCommandSwitch(const TQChar * pLocation,KviKvsTreeNodeExpression * e) : KviKvsTreeNodeSpecialCommand(pLocation,"switch") { m_pExpression = e; @@ -310,7 +310,7 @@ void KviKvsTreeNodeSpecialCommandSwitch::addLabel(KviKvsTreeNodeSpecialCommandSw l->setParent(this); } -void KviKvsTreeNodeSpecialCommandSwitch::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandSwitch::contextDescription(TQString &szBuffer) { szBuffer = "Special Command \"switch\""; } @@ -319,7 +319,7 @@ void KviKvsTreeNodeSpecialCommandSwitch::contextDescription(QString &szBuffer) void KviKvsTreeNodeSpecialCommandSwitch::dump(const char * prefix) { debug("%s SpecialCommandSwitch",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pExpression->dump(tmp.utf8().data()); for(KviKvsTreeNodeSpecialCommandSwitchLabel * l = m_pLabels->first();l;l = m_pLabels->next()) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.h index ecad6e2..aa5473b 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.h @@ -37,7 +37,7 @@ class KviKvsVariant; class KVIRC_API KviKvsTreeNodeSpecialCommandSwitchLabel : public KviKvsTreeNode { public: - KviKvsTreeNodeSpecialCommandSwitchLabel(const QChar * pLocation); + KviKvsTreeNodeSpecialCommandSwitchLabel(const TQChar * pLocation); ~KviKvsTreeNodeSpecialCommandSwitchLabel(); protected: KviKvsTreeNodeData * m_pParameter; @@ -54,10 +54,10 @@ public: class KVIRC_API KviKvsTreeNodeSpecialCommandSwitchLabelCase : public KviKvsTreeNodeSpecialCommandSwitchLabel { public: - KviKvsTreeNodeSpecialCommandSwitchLabelCase(const QChar * pLocation); + KviKvsTreeNodeSpecialCommandSwitchLabelCase(const TQChar * pLocation); ~KviKvsTreeNodeSpecialCommandSwitchLabelCase(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsVariant * pRealParameter); }; @@ -66,10 +66,10 @@ public: class KVIRC_API KviKvsTreeNodeSpecialCommandSwitchLabelMatch : public KviKvsTreeNodeSpecialCommandSwitchLabel { public: - KviKvsTreeNodeSpecialCommandSwitchLabelMatch(const QChar * pLocation); + KviKvsTreeNodeSpecialCommandSwitchLabelMatch(const TQChar * pLocation); ~KviKvsTreeNodeSpecialCommandSwitchLabelMatch(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsVariant * pRealParameter); }; @@ -77,10 +77,10 @@ public: class KVIRC_API KviKvsTreeNodeSpecialCommandSwitchLabelRegexp : public KviKvsTreeNodeSpecialCommandSwitchLabel { public: - KviKvsTreeNodeSpecialCommandSwitchLabelRegexp(const QChar * pLocation); + KviKvsTreeNodeSpecialCommandSwitchLabelRegexp(const TQChar * pLocation); ~KviKvsTreeNodeSpecialCommandSwitchLabelRegexp(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsVariant * pRealParameter); }; @@ -88,11 +88,11 @@ public: class KVIRC_API KviKvsTreeNodeSpecialCommandSwitchLabelDefault : public KviKvsTreeNodeSpecialCommandSwitchLabel { public: - KviKvsTreeNodeSpecialCommandSwitchLabelDefault(const QChar * pLocation); + KviKvsTreeNodeSpecialCommandSwitchLabelDefault(const TQChar * pLocation); ~KviKvsTreeNodeSpecialCommandSwitchLabelDefault(); public: virtual void dump(const char * prefix); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual bool execute(KviKvsRunTimeContext * c,KviKvsVariant * pRealParameter); }; @@ -101,7 +101,7 @@ public: class KVIRC_API KviKvsTreeNodeSpecialCommandSwitch : public KviKvsTreeNodeSpecialCommand { public: - KviKvsTreeNodeSpecialCommandSwitch(const QChar * pLocation,KviKvsTreeNodeExpression * e); + KviKvsTreeNodeSpecialCommandSwitch(const TQChar * pLocation,KviKvsTreeNodeExpression * e); ~KviKvsTreeNodeSpecialCommandSwitch(); private: KviKvsTreeNodeExpression * m_pExpression; // can't be 0 @@ -109,7 +109,7 @@ private: public: void addLabel(KviKvsTreeNodeSpecialCommandSwitchLabel * l); bool isEmpty(){ return m_pLabels->isEmpty(); }; - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp index be7c5df..a37cef6 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp @@ -29,7 +29,7 @@ #include "kvi_kvs_rwevaluationresult.h" #include "kvi_locale.h" -KviKvsTreeNodeSpecialCommandUnset::KviKvsTreeNodeSpecialCommandUnset(const QChar * pLocation,KviPointerList<KviKvsTreeNodeVariable> * pVariableList) +KviKvsTreeNodeSpecialCommandUnset::KviKvsTreeNodeSpecialCommandUnset(const TQChar * pLocation,KviPointerList<KviKvsTreeNodeVariable> * pVariableList) : KviKvsTreeNodeSpecialCommand(pLocation,"unset") { m_pVariableList = pVariableList; @@ -44,7 +44,7 @@ KviKvsTreeNodeSpecialCommandUnset::~KviKvsTreeNodeSpecialCommandUnset() delete m_pVariableList; } -void KviKvsTreeNodeSpecialCommandUnset::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandUnset::contextDescription(TQString &szBuffer) { szBuffer = "Special Command \"unset\""; } @@ -52,7 +52,7 @@ void KviKvsTreeNodeSpecialCommandUnset::contextDescription(QString &szBuffer) void KviKvsTreeNodeSpecialCommandUnset::dump(const char * prefix) { debug("%s SpecialCommandUnset",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); for(KviKvsTreeNodeVariable * pVar = m_pVariableList->first();pVar;pVar = m_pVariableList->next()) { diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.h index 3d12506..9d36517 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.h @@ -34,12 +34,12 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeSpecialCommandUnset : public KviKvsTreeNodeSpecialCommand { public: - KviKvsTreeNodeSpecialCommandUnset(const QChar * pLocation,KviPointerList<KviKvsTreeNodeVariable> * pVarList); + KviKvsTreeNodeSpecialCommandUnset(const TQChar * pLocation,KviPointerList<KviKvsTreeNodeVariable> * pVarList); ~KviKvsTreeNodeSpecialCommandUnset(); private: KviPointerList<KviKvsTreeNodeVariable> * m_pVariableList; public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp index 377921d..d1378d9 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp @@ -30,7 +30,7 @@ #include "kvi_kvs_runtimecontext.h" #include "kvi_locale.h" -KviKvsTreeNodeSpecialCommandWhile::KviKvsTreeNodeSpecialCommandWhile(const QChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * i) +KviKvsTreeNodeSpecialCommandWhile::KviKvsTreeNodeSpecialCommandWhile(const TQChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * i) : KviKvsTreeNodeSpecialCommand(pLocation,"while") { #ifdef COMPILE_NEW_KVS @@ -49,7 +49,7 @@ KviKvsTreeNodeSpecialCommandWhile::~KviKvsTreeNodeSpecialCommandWhile() #endif } -void KviKvsTreeNodeSpecialCommandWhile::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSpecialCommandWhile::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Special Command \"while\""; @@ -60,7 +60,7 @@ void KviKvsTreeNodeSpecialCommandWhile::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s SpecialCommandWhile",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pExpression->dump(tmp); if(m_pInstruction)m_pInstruction->dump(tmp); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.h index 87b3b90..38c4907 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.h @@ -36,13 +36,13 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeSpecialCommandWhile : public KviKvsTreeNodeSpecialCommand { public: - KviKvsTreeNodeSpecialCommandWhile(const QChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * i); + KviKvsTreeNodeSpecialCommandWhile(const TQChar * pLocation,KviKvsTreeNodeExpression * e,KviKvsTreeNodeInstruction * i); ~KviKvsTreeNodeSpecialCommandWhile(); private: KviKvsTreeNodeExpression * m_pExpression; // can't be 0 KviKvsTreeNodeInstruction * m_pInstruction; // may be 0 public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_stringcast.cpp b/src/kvirc/kvs/kvi_kvs_treenode_stringcast.cpp index 8c4f76c..630d646 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_stringcast.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_stringcast.cpp @@ -27,7 +27,7 @@ #include "kvi_kvs_treenode_stringcast.h" #include "kvi_qstring.h" -KviKvsTreeNodeStringCast::KviKvsTreeNodeStringCast(const QChar * pLocation,KviKvsTreeNodeData * pChildData) +KviKvsTreeNodeStringCast::KviKvsTreeNodeStringCast(const TQChar * pLocation,KviKvsTreeNodeData * pChildData) : KviKvsTreeNodeData(pLocation) { m_pChildData = pChildData; @@ -45,14 +45,14 @@ bool KviKvsTreeNodeStringCast::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsV if(!m_pChildData->evaluateReadOnly(c,pBuffer))return false; if(!pBuffer->isString()) { - QString tmp; + TQString tmp; pBuffer->asString(tmp); pBuffer->setString(tmp); } return true; } -void KviKvsTreeNodeStringCast::contextDescription(QString &szBuffer) +void KviKvsTreeNodeStringCast::contextDescription(TQString &szBuffer) { szBuffer = "String Cast"; } @@ -60,7 +60,7 @@ void KviKvsTreeNodeStringCast::contextDescription(QString &szBuffer) void KviKvsTreeNodeStringCast::dump(const char * prefix) { debug("%s StringCast",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pChildData->dump(tmp.utf8().data()); } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_stringcast.h b/src/kvirc/kvs/kvi_kvs_treenode_stringcast.h index af537f9..3cc3de6 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_stringcast.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_stringcast.h @@ -30,13 +30,13 @@ class KVIRC_API KviKvsTreeNodeStringCast : public KviKvsTreeNodeData { public: - KviKvsTreeNodeStringCast(const QChar * pLocation,KviKvsTreeNodeData * pChildData); + KviKvsTreeNodeStringCast(const TQChar * pLocation,KviKvsTreeNodeData * pChildData); ~KviKvsTreeNodeStringCast(); protected: KviKvsTreeNodeData * m_pChildData; public: virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp index c821529..32018c2 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp @@ -27,7 +27,7 @@ #include "kvi_kvs_treenode_switchlist.h" #include "kvi_kvs_runtimecontext.h" -KviKvsTreeNodeSwitchList::KviKvsTreeNodeSwitchList(const QChar * pLocation) +KviKvsTreeNodeSwitchList::KviKvsTreeNodeSwitchList(const TQChar * pLocation) : KviKvsTreeNode(pLocation) { m_pShortSwitchDict = 0; @@ -40,7 +40,7 @@ KviKvsTreeNodeSwitchList::~KviKvsTreeNodeSwitchList() if(m_pLongSwitchDict)delete m_pLongSwitchDict; } -void KviKvsTreeNodeSwitchList::contextDescription(QString &szBuffer) +void KviKvsTreeNodeSwitchList::contextDescription(TQString &szBuffer) { szBuffer = "Switch List Evaluation"; } @@ -54,9 +54,9 @@ void KviKvsTreeNodeSwitchList::dump(const char * prefix) KviPointerHashTableIterator<int,KviKvsTreeNodeData> it(*m_pShortSwitchDict); while(it.current()) { - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" Sw("); - QChar c((unsigned short)it.currentKey()); + TQChar c((unsigned short)it.currentKey()); tmp.append(c); tmp.append("): "); it.current()->dump(tmp.utf8().data()); @@ -65,10 +65,10 @@ void KviKvsTreeNodeSwitchList::dump(const char * prefix) } if(m_pLongSwitchDict) { - KviPointerHashTableIterator<QString,KviKvsTreeNodeData> it(*m_pLongSwitchDict); + KviPointerHashTableIterator<TQString,KviKvsTreeNodeData> it(*m_pLongSwitchDict); while(it.current()) { - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" Sw("); tmp.append(it.currentKey()); tmp.append("): "); @@ -86,19 +86,19 @@ void KviKvsTreeNodeSwitchList::addShort(int iShortKey,KviKvsTreeNodeData * p) m_pShortSwitchDict->setAutoDelete(true); } - m_pShortSwitchDict->replace(iShortKey,p); + m_pShortSwitchDict->tqreplace(iShortKey,p); p->setParent(this); } -void KviKvsTreeNodeSwitchList::addLong(const QString &szLongKey,KviKvsTreeNodeData * p) +void KviKvsTreeNodeSwitchList::addLong(const TQString &szLongKey,KviKvsTreeNodeData * p) { if(!m_pLongSwitchDict) { - m_pLongSwitchDict = new KviPointerHashTable<QString,KviKvsTreeNodeData>(11); + m_pLongSwitchDict = new KviPointerHashTable<TQString,KviKvsTreeNodeData>(11); m_pLongSwitchDict->setAutoDelete(true); } - m_pLongSwitchDict->replace(szLongKey,p); + m_pLongSwitchDict->tqreplace(szLongKey,p); p->setParent(this); } @@ -124,7 +124,7 @@ bool KviKvsTreeNodeSwitchList::evaluate(KviKvsRunTimeContext * c,KviKvsSwitchLis } if(m_pLongSwitchDict) { - KviPointerHashTableIterator<QString,KviKvsTreeNodeData> it(*m_pLongSwitchDict); + KviPointerHashTableIterator<TQString,KviKvsTreeNodeData> it(*m_pLongSwitchDict); while(KviKvsTreeNodeData * d = it.current()) { KviKvsVariant * v = new KviKvsVariant(); @@ -145,7 +145,7 @@ KviKvsTreeNodeData * KviKvsTreeNodeSwitchList::getStandardRebindingSwitch() KviKvsTreeNodeData * d; if(m_pShortSwitchDict) { - d = m_pShortSwitchDict->find('r'); + d = m_pShortSwitchDict->tqfind('r'); if(d) { m_pShortSwitchDict->setAutoDelete(false); @@ -156,7 +156,7 @@ KviKvsTreeNodeData * KviKvsTreeNodeSwitchList::getStandardRebindingSwitch() } if(m_pLongSwitchDict) { - d = m_pLongSwitchDict->find("rebind"); + d = m_pLongSwitchDict->tqfind("rebind"); if(d) { m_pLongSwitchDict->setAutoDelete(false); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.h b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.h index 9e6510a..0bc6855 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.h @@ -39,17 +39,17 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeSwitchList : public KviKvsTreeNode { public: - KviKvsTreeNodeSwitchList(const QChar * pLocation); + KviKvsTreeNodeSwitchList(const TQChar * pLocation); ~KviKvsTreeNodeSwitchList(); public: KviPointerHashTable<int,KviKvsTreeNodeData> * m_pShortSwitchDict; - KviPointerHashTable<QString,KviKvsTreeNodeData> *m_pLongSwitchDict; + KviPointerHashTable<TQString,KviKvsTreeNodeData> *m_pLongSwitchDict; public: void addShort(int iShortKey,KviKvsTreeNodeData * p); - void addLong(const QString &szLongKey,KviKvsTreeNodeData * p); + void addLong(const TQString &szLongKey,KviKvsTreeNodeData * p); bool isEmpty(){ return (m_pShortSwitchDict == 0) && (m_pLongSwitchDict == 0); }; virtual void dump(const char * prefix); - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); KviKvsTreeNodeData * getStandardRebindingSwitch(); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp index 6f3e757..128daba 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp @@ -28,7 +28,7 @@ #include "kvi_kvs_object.h" -KviKvsTreeNodeThisObjectFunctionCall::KviKvsTreeNodeThisObjectFunctionCall(const QChar * pLocation,const QString &szFncName,KviKvsTreeNodeDataList * pParams) +KviKvsTreeNodeThisObjectFunctionCall::KviKvsTreeNodeThisObjectFunctionCall(const TQChar * pLocation,const TQString &szFncName,KviKvsTreeNodeDataList * pParams) : KviKvsTreeNodeObjectFunctionCall(pLocation,szFncName,pParams) { } @@ -37,7 +37,7 @@ KviKvsTreeNodeThisObjectFunctionCall::~KviKvsTreeNodeThisObjectFunctionCall() { } -void KviKvsTreeNodeThisObjectFunctionCall::contextDescription(QString &szBuffer) +void KviKvsTreeNodeThisObjectFunctionCall::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "\"This\" Object Function Call \""; @@ -50,7 +50,7 @@ void KviKvsTreeNodeThisObjectFunctionCall::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s ThisObjectFunctionCall(%s)",prefix,m_szFunctionName.utf8().data()); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pParams->dump(tmp.utf8().data()); #endif @@ -64,7 +64,7 @@ bool KviKvsTreeNodeThisObjectFunctionCall::evaluateReadOnlyInObjectScope(KviKvsO if(!m_pParams->evaluate(c,&l))return false; pBuffer->setNothing(); c->setDefaultReportLocation(this); - return o->callFunction(c->thisObject(),m_szFunctionName,QString::null,c,pBuffer,&l); + return o->callFunction(c->thisObject(),m_szFunctionName,TQString(),c,pBuffer,&l); #else return false; #endif diff --git a/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.h index 2b245f5..b31f9eb 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.h @@ -37,10 +37,10 @@ class KviKvsVariant; class KVIRC_API KviKvsTreeNodeThisObjectFunctionCall : public KviKvsTreeNodeObjectFunctionCall { public: - KviKvsTreeNodeThisObjectFunctionCall(const QChar * pLocation,const QString &szFncName,KviKvsTreeNodeDataList * pParams); + KviKvsTreeNodeThisObjectFunctionCall(const TQChar * pLocation,const TQString &szFncName,KviKvsTreeNodeDataList * pParams); ~KviKvsTreeNodeThisObjectFunctionCall(); public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject * o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_variable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_variable.cpp index 2d0f56e..3c6ab78 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_variable.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_variable.cpp @@ -26,7 +26,7 @@ #include "kvi_kvs_treenode_variable.h" -KviKvsTreeNodeVariable::KviKvsTreeNodeVariable(const QChar * pLocation,const QString &szIdentifier) +KviKvsTreeNodeVariable::KviKvsTreeNodeVariable(const TQChar * pLocation,const TQString &szIdentifier) : KviKvsTreeNodeData(pLocation) { #ifdef COMPILE_NEW_KVS diff --git a/src/kvirc/kvs/kvi_kvs_treenode_variable.h b/src/kvirc/kvs/kvi_kvs_treenode_variable.h index 7368e68..a4098fc 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_variable.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_variable.h @@ -34,10 +34,10 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeVariable : public KviKvsTreeNodeData { public: - KviKvsTreeNodeVariable(const QChar * pLocation,const QString &szIdentifier); + KviKvsTreeNodeVariable(const TQChar * pLocation,const TQString &szIdentifier); ~KviKvsTreeNodeVariable(); protected: - QString m_szIdentifier; + TQString m_szIdentifier; protected: virtual bool isReadOnly(); virtual bool canEvaluateInObjectScope(); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.cpp index 0a788ef..c5215cd 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.cpp @@ -27,7 +27,7 @@ #include "kvi_kvs_treenode_voidfunctioncall.h" #include "kvi_kvs_runtimecontext.h" -KviKvsTreeNodeVoidFunctionCall::KviKvsTreeNodeVoidFunctionCall(const QChar * pLocation,KviKvsTreeNodeFunctionCall * r) +KviKvsTreeNodeVoidFunctionCall::KviKvsTreeNodeVoidFunctionCall(const TQChar * pLocation,KviKvsTreeNodeFunctionCall * r) : KviKvsTreeNodeInstruction(pLocation) { #ifdef COMPILE_NEW_KVS @@ -42,7 +42,7 @@ KviKvsTreeNodeVoidFunctionCall::~KviKvsTreeNodeVoidFunctionCall() #endif } -void KviKvsTreeNodeVoidFunctionCall::contextDescription(QString &szBuffer) +void KviKvsTreeNodeVoidFunctionCall::contextDescription(TQString &szBuffer) { #ifdef COMPILE_NEW_KVS szBuffer = "Void Function Call"; @@ -53,7 +53,7 @@ void KviKvsTreeNodeVoidFunctionCall::dump(const char * prefix) { #ifdef COMPILE_NEW_KVS debug("%s VoidFunctionCall",prefix); - QString tmp = prefix; + TQString tmp = prefix; tmp.append(" "); m_pFunctionCall->dump(tmp.utf8().data()); #endif diff --git a/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.h index 13b08ba..584034d 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.h @@ -34,12 +34,12 @@ class KviKvsRunTimeContext; class KVIRC_API KviKvsTreeNodeVoidFunctionCall : public KviKvsTreeNodeInstruction { public: - KviKvsTreeNodeVoidFunctionCall(const QChar * pLocation,KviKvsTreeNodeFunctionCall * r); + KviKvsTreeNodeVoidFunctionCall(const TQChar * pLocation,KviKvsTreeNodeFunctionCall * r); ~KviKvsTreeNodeVoidFunctionCall(); protected: KviKvsTreeNodeFunctionCall * m_pFunctionCall; // may be scope operator or direct function call public: - virtual void contextDescription(QString &szBuffer); + virtual void contextDescription(TQString &szBuffer); virtual void dump(const char * prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_useraction.cpp b/src/kvirc/kvs/kvi_kvs_useraction.cpp index 47a342a..01ad59e 100644 --- a/src/kvirc/kvs/kvi_kvs_useraction.cpp +++ b/src/kvirc/kvs/kvi_kvs_useraction.cpp @@ -33,24 +33,24 @@ #include "kvi_window.h" #include "kvi_cmdformatter.h" -KviKvsUserAction::KviKvsUserAction(QObject * pParent, - const QString &szName, - const QString &szScriptCode, - const QString &szVisibleNameCode, - const QString &szDescriptionCode, - const QString &szCategory, - const QString &szBigIcon, - const QString &szSmallIcon, +KviKvsUserAction::KviKvsUserAction(TQObject * pParent, + const TQString &szName, + const TQString &szScriptCode, + const TQString &szVisibleNameCode, + const TQString &szDescriptionCode, + const TQString &szCategory, + const TQString &szBigIcon, + const TQString &szSmallIcon, unsigned int uFlags, - const QString &szKeySequence) + const TQString &szKeySequence) : KviKvsAction(pParent,szName,szScriptCode,szVisibleNameCode,szDescriptionCode,0,szBigIcon,0,uFlags,szKeySequence) { m_szSmallIcon = szSmallIcon; - QString szKvsName = "action::"; + TQString szKvsName = "action::"; szKvsName += szName; - QString szTmp = szKvsName; + TQString szTmp = szKvsName; szTmp += "::description"; m_pDescriptionScript = new KviKvsScript(szTmp,szDescriptionCode,KviKvsScript::Parameter); @@ -63,8 +63,8 @@ KviKvsUserAction::KviKvsUserAction(QObject * pParent, } -KviKvsUserAction::KviKvsUserAction(QObject * pParent) - : KviKvsAction(pParent,QString::null,QString::null,QString::null,QString::null) +KviKvsUserAction::KviKvsUserAction(TQObject * pParent) + : KviKvsAction(pParent,TQString(),TQString(),TQString(),TQString()) { // needs loading! m_pDescriptionScript = 0; @@ -77,36 +77,36 @@ KviKvsUserAction::~KviKvsUserAction() if(m_pVisibleNameScript)delete m_pVisibleNameScript; } -KviKvsUserAction * KviKvsUserAction::createInstance(QObject * pParent, - const QString &szName, - const QString &szScriptCode, - const QString &szVisibleNameCode, - const QString &szDescriptionCode, - const QString &szCategory, - const QString &szBigIcon, - const QString &szSmallIcon, +KviKvsUserAction * KviKvsUserAction::createInstance(TQObject * pParent, + const TQString &szName, + const TQString &szScriptCode, + const TQString &szVisibleNameCode, + const TQString &szDescriptionCode, + const TQString &szCategory, + const TQString &szBigIcon, + const TQString &szSmallIcon, unsigned int uFlags, - const QString &szKeySequence) + const TQString &szKeySequence) { return new KviKvsUserAction(pParent,szName,szScriptCode,szVisibleNameCode,szDescriptionCode,szCategory,szBigIcon,szSmallIcon,uFlags,szKeySequence); } -void KviKvsUserAction::exportToKvs(QString &szBuffer) +void KviKvsUserAction::exportToKvs(TQString &szBuffer) { exportToKvs(szBuffer,m_szName,scriptCode(),visibleNameCode(),descriptionCode(),m_szCategory,m_szBigIcon,m_szSmallIcon,m_uFlags,m_szKeySequence); } -void KviKvsUserAction::exportToKvs(QString &szBuffer, - const QString &szName, - const QString &szScriptCode, - const QString &szVisibleName, - const QString &szDescription, - const QString &szCategory, - const QString &szBigIcon, - const QString &szSmallIcon, +void KviKvsUserAction::exportToKvs(TQString &szBuffer, + const TQString &szName, + const TQString &szScriptCode, + const TQString &szVisibleName, + const TQString &szDescription, + const TQString &szCategory, + const TQString &szBigIcon, + const TQString &szSmallIcon, unsigned int uFlags, - const QString &szKeySequence) + const TQString &szKeySequence) { szBuffer += "action.create"; if(uFlags & NeedsContext) @@ -120,7 +120,7 @@ void KviKvsUserAction::exportToKvs(QString &szBuffer, } if(uFlags & InternalWindowMask) { - QString szWins; + TQString szWins; if(uFlags & WindowConsole)szWins += "x"; if(uFlags & WindowChannel)szWins += "c"; if(uFlags & WindowQuery)szWins += "q"; @@ -147,24 +147,24 @@ void KviKvsUserAction::exportToKvs(QString &szBuffer, szBuffer += " (\""; szBuffer += szName; szBuffer += "\","; - QString tmp = szVisibleName; - if(tmp.contains('$')) + TQString tmp = szVisibleName; + if(tmp.tqcontains('$')) { szBuffer += tmp; szBuffer += ","; } else { - tmp.replace("\"","\\\""); + tmp.tqreplace("\"","\\\""); szBuffer += "\""; szBuffer += tmp; szBuffer += "\","; } tmp = szDescription; - if(tmp.contains('$')) + if(tmp.tqcontains('$')) { szBuffer += tmp; szBuffer += ",\""; } else { - tmp.replace("\"","\\\""); + tmp.tqreplace("\"","\\\""); szBuffer += "\""; szBuffer += tmp; szBuffer += "\",\""; @@ -182,33 +182,33 @@ void KviKvsUserAction::exportToKvs(QString &szBuffer, // FIXME: Cache this stuff ?? -const QString & KviKvsUserAction::visibleName() +const TQString & KviKvsUserAction::visibleName() { if(!m_pVisibleNameScript)return m_szVisibleName; if(!m_pVisibleNameScript->run(g_pActiveWindow,0,m_szVisibleName))m_szVisibleName = m_pVisibleNameScript->code(); return m_szVisibleName; } -const QString & KviKvsUserAction::description() +const TQString & KviKvsUserAction::description() { if(!m_pDescriptionScript)return m_szDescription; if(!m_pDescriptionScript->run(g_pActiveWindow,0,m_szDescription))m_szDescription = m_pDescriptionScript->code(); return m_szDescription; } -const QString & KviKvsUserAction::visibleNameCode() +const TQString & KviKvsUserAction::visibleNameCode() { if(!m_pVisibleNameScript)return m_szVisibleName; return m_pVisibleNameScript->code(); } -const QString & KviKvsUserAction::descriptionCode() +const TQString & KviKvsUserAction::descriptionCode() { if(!m_pDescriptionScript)return m_szDescription; return m_pDescriptionScript->code(); } -QPixmap * KviKvsUserAction::smallIcon() +TQPixmap * KviKvsUserAction::smallIcon() { return g_pIconManager->getImage(m_szSmallIcon.utf8().data()); } @@ -222,18 +222,18 @@ bool KviKvsUserAction::load(KviConfig * cfg) { m_szName = cfg->group(); if(m_szName.isEmpty())return false; - m_szVisibleName = cfg->readQStringEntry("VisibleName"); + m_szVisibleName = cfg->readTQStringEntry("VisibleName"); if(m_szVisibleName.isEmpty())return false; - QString szKvsName = "action::"; + TQString szKvsName = "action::"; szKvsName += m_szName; - QString szTmp = szKvsName; + TQString szTmp = szKvsName; szTmp += "::label"; if(m_pVisibleNameScript)delete m_pVisibleNameScript; m_pVisibleNameScript = new KviKvsScript(szTmp,m_szVisibleName,KviKvsScript::Parameter); if(m_szVisibleName.isEmpty())return false; - m_szDescription = cfg->readQStringEntry("Description"); + m_szDescription = cfg->readTQStringEntry("Description"); szTmp = szKvsName; szTmp += "::description"; @@ -241,18 +241,18 @@ bool KviKvsUserAction::load(KviConfig * cfg) m_pDescriptionScript = new KviKvsScript(szTmp,m_szDescription,KviKvsScript::Parameter); - m_szBigIcon = cfg->readQStringEntry("BigIcon"); - m_szSmallIcon = cfg->readQStringEntry("SmallIcon"); - m_szKeySequence = cfg->readQStringEntry("KeySequence"); - m_szCategory = cfg->readQStringEntry("Category"); + m_szBigIcon = cfg->readTQStringEntry("BigIcon"); + m_szSmallIcon = cfg->readTQStringEntry("SmallIcon"); + m_szKeySequence = cfg->readTQStringEntry("KeySequence"); + m_szCategory = cfg->readTQStringEntry("Category"); m_pCategory = KviActionManager::instance()->category(m_szCategory); m_uFlags = cfg->readUIntEntry("Flags",0); - QString szCode = cfg->readQStringEntry("Code"); + TQString szCode = cfg->readTQStringEntry("Code"); if(szCode.isEmpty())return false; if(m_pScript)delete m_pScript; - QString tmp = KVI_KVS_ACTION_SCRIPT_NAME_PREFIX; + TQString tmp = KVI_KVS_ACTION_SCRIPT_NAME_PREFIX; tmp += m_szName; m_pScript = new KviKvsScript(tmp,szCode); diff --git a/src/kvirc/kvs/kvi_kvs_useraction.h b/src/kvirc/kvs/kvi_kvs_useraction.h index 2edd033..7d1cf59 100644 --- a/src/kvirc/kvs/kvi_kvs_useraction.h +++ b/src/kvirc/kvs/kvi_kvs_useraction.h @@ -34,38 +34,39 @@ class KVIRC_API KviKvsUserAction : public KviKvsAction { friend class KviActionManager; Q_OBJECT + TQ_OBJECT public: - KviKvsUserAction(QObject * pParent, - const QString &szName, - const QString &szScriptCode, - const QString &szVisibleNameCode, - const QString &szDescriptionCode, - const QString &szCategory, - const QString &szBigIcon, - const QString &szSmallIcon, + KviKvsUserAction(TQObject * pParent, + const TQString &szName, + const TQString &szScriptCode, + const TQString &szVisibleNameCode, + const TQString &szDescriptionCode, + const TQString &szCategory, + const TQString &szBigIcon, + const TQString &szSmallIcon, unsigned int uFlags, - const QString &szKeySequence = QString::null); - KviKvsUserAction(QObject * pParent); + const TQString &szKeySequence = TQString()); + KviKvsUserAction(TQObject * pParent); ~KviKvsUserAction(); // Static allocator function. // This MUST be used by the modules to allocate action structures // instead of the new operator. // See kvi_heapobject.cpp for an explaination. - static KviKvsUserAction * createInstance(QObject * pParent, - const QString &szName, - const QString &szScriptCode, - const QString &szVisibleNameCode, - const QString &szDescriptionCode, - const QString &szCategory, - const QString &szBigIcon, - const QString &szSmallIcon, + static KviKvsUserAction * createInstance(TQObject * pParent, + const TQString &szName, + const TQString &szScriptCode, + const TQString &szVisibleNameCode, + const TQString &szDescriptionCode, + const TQString &szCategory, + const TQString &szBigIcon, + const TQString &szSmallIcon, unsigned int uFlags, - const QString &szKeySequence = QString::null); + const TQString &szKeySequence = TQString()); void suicide() { delete this; }; protected: - QString m_szSmallIcon; - QString m_szCategory; + TQString m_szSmallIcon; + TQString m_szCategory; KviKvsScript * m_pDescriptionScript; KviKvsScript * m_pVisibleNameScript; protected: @@ -73,24 +74,24 @@ protected: bool load(KviConfig * cfg); void save(KviConfig * cfg); public: - virtual const QString & visibleName(); - virtual const QString & description(); - const QString & visibleNameCode(); - const QString & descriptionCode(); - virtual QPixmap * smallIcon(); - const QString & category(){ return m_szCategory; }; - const QString & smallIconString(){ return m_szSmallIcon; }; - static void exportToKvs(QString &szBuffer, - const QString &szName, - const QString &szScriptCode, - const QString &szVisibleName, - const QString &szDescription, - const QString &szCategory, - const QString &szBigIcon, - const QString &szSmallIcon, + virtual const TQString & visibleName(); + virtual const TQString & description(); + const TQString & visibleNameCode(); + const TQString & descriptionCode(); + virtual TQPixmap * smallIcon(); + const TQString & category(){ return m_szCategory; }; + const TQString & smallIconString(){ return m_szSmallIcon; }; + static void exportToKvs(TQString &szBuffer, + const TQString &szName, + const TQString &szScriptCode, + const TQString &szVisibleName, + const TQString &szDescription, + const TQString &szCategory, + const TQString &szBigIcon, + const TQString &szSmallIcon, unsigned int uFlags, - const QString &szKeySequence); - void exportToKvs(QString &szBuffer); + const TQString &szKeySequence); + void exportToKvs(TQString &szBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_variant.cpp b/src/kvirc/kvs/kvi_kvs_variant.cpp index b21fd95..492bd26 100644 --- a/src/kvirc/kvs/kvi_kvs_variant.cpp +++ b/src/kvirc/kvs/kvi_kvs_variant.cpp @@ -36,7 +36,7 @@ KviKvsVariant::KviKvsVariant() m_pData = 0; } -KviKvsVariant::KviKvsVariant(QString * pString) +KviKvsVariant::KviKvsVariant(TQString * pString) { m_pData = new KviKvsVariantData; m_pData->m_eType = KviKvsVariantData::String; @@ -44,12 +44,12 @@ KviKvsVariant::KviKvsVariant(QString * pString) m_pData->m_u.pString = pString; } -KviKvsVariant::KviKvsVariant(const QString &szString) +KviKvsVariant::KviKvsVariant(const TQString &szString) { m_pData = new KviKvsVariantData; m_pData->m_eType = KviKvsVariantData::String; m_pData->m_uRefs = 1; - m_pData->m_u.pString = new QString(szString); + m_pData->m_u.pString = new TQString(szString); } KviKvsVariant::KviKvsVariant(const char * szString) @@ -57,7 +57,7 @@ KviKvsVariant::KviKvsVariant(const char * szString) m_pData = new KviKvsVariantData; m_pData->m_eType = KviKvsVariantData::String; m_pData->m_uRefs = 1; - m_pData->m_u.pString = new QString(QString::fromUtf8(szString)); + m_pData->m_u.pString = new TQString(TQString::fromUtf8(szString)); } @@ -167,18 +167,18 @@ KviKvsVariant::~KviKvsVariant() DETACH_CONTENTS } -void KviKvsVariant::setString(QString * pString) +void KviKvsVariant::setString(TQString * pString) { RENEW_VARIANT_DATA m_pData->m_eType = KviKvsVariantData::String; m_pData->m_u.pString = pString; } -void KviKvsVariant::setString(const QString &szString) +void KviKvsVariant::setString(const TQString &szString) { RENEW_VARIANT_DATA m_pData->m_eType = KviKvsVariantData::String; - m_pData->m_u.pString = new QString(szString); + m_pData->m_u.pString = new TQString(szString); } void KviKvsVariant::setReal(kvs_real_t dReal) @@ -272,7 +272,7 @@ bool KviKvsVariant::asBoolean() const if(m_pData->m_u.pString->isEmpty())return false; // check integer or real values bool bOk; - kvs_int_t iVal = (kvs_int_t)KviQString::toI64(*(m_pData->m_u.pString),&bOk); + kvs_int_t iVal = (kvs_int_t)KviTQString::toI64(*(m_pData->m_u.pString),&bOk); if(bOk)return iVal; kvs_real_t dVal = m_pData->m_u.pString->toDouble(&bOk); if(bOk)return (dVal != 0.0); @@ -413,7 +413,7 @@ void KviKvsVariant::castToArray(KviKvsArrayCast *c) const break; case KviKvsVariantData::Hash: { - KviPointerHashTableIterator<QString,KviKvsVariant> it(*(m_pData->m_u.pHash->dict())); + KviPointerHashTableIterator<TQString,KviKvsVariant> it(*(m_pData->m_u.pHash->dict())); KviKvsArray * a = new KviKvsArray(); kvs_int_t idx = 0; while(KviKvsVariant * v = it.current()) @@ -451,7 +451,7 @@ void KviKvsVariant::convertToArray() break; case KviKvsVariantData::Hash: { - KviPointerHashTableIterator<QString,KviKvsVariant> it(*(m_pData->m_u.pHash->dict())); + KviPointerHashTableIterator<TQString,KviKvsVariant> it(*(m_pData->m_u.pHash->dict())); KviKvsArray * a = new KviKvsArray(); kvs_int_t idx = 0; while(KviKvsVariant * v = it.current()) @@ -486,7 +486,7 @@ bool KviKvsVariant::asInteger(kvs_int_t &iVal) const case KviKvsVariantData::String: { bool bOk; - iVal = (kvs_int_t)KviQString::toI64(*(m_pData->m_u.pString),&bOk); + iVal = (kvs_int_t)KviTQString::toI64(*(m_pData->m_u.pString),&bOk); return bOk; } break; @@ -530,7 +530,7 @@ void KviKvsVariant::castToInteger(kvs_int_t &iVal) const case KviKvsVariantData::String: { bool bOk; - iVal = (kvs_int_t)KviQString::toI64(*(m_pData->m_u.pString),&bOk); + iVal = (kvs_int_t)KviTQString::toI64(*(m_pData->m_u.pString),&bOk); if(bOk)return; iVal = m_pData->m_u.pString->length(); } @@ -581,24 +581,24 @@ bool KviKvsVariant::asReal(kvs_real_t & dVal) const return false; } -void KviKvsVariant::asString(QString &szBuffer) const +void KviKvsVariant::asString(TQString &szBuffer) const { if(!m_pData) { - szBuffer = QString::null; + szBuffer = TQString(); return; } switch(m_pData->m_eType) { case KviKvsVariantData::String: szBuffer = *(m_pData->m_u.pString); break; - case KviKvsVariantData::Array: szBuffer = QString::null; m_pData->m_u.pArray->appendAsString(szBuffer); break; - case KviKvsVariantData::Hash: szBuffer = QString::null; m_pData->m_u.pHash->appendAsString(szBuffer); break; + case KviKvsVariantData::Array: szBuffer = TQString(); m_pData->m_u.pArray->appendAsString(szBuffer); break; + case KviKvsVariantData::Hash: szBuffer = TQString(); m_pData->m_u.pHash->appendAsString(szBuffer); break; case KviKvsVariantData::Integer: szBuffer.setNum(m_pData->m_u.iInteger); break; case KviKvsVariantData::Real: szBuffer.setNum(*(m_pData->m_u.pReal)); break; case KviKvsVariantData::Boolean: szBuffer.setNum(m_pData->m_u.bBoolean ? 1 : 0); break; case KviKvsVariantData::HObject: if(m_pData->m_u.hObject) - KviQString::sprintf(szBuffer,"object[%lx]",m_pData->m_u.hObject); + KviTQString::sprintf(szBuffer,"object[%lx]",m_pData->m_u.hObject); else szBuffer = "null-object"; break; @@ -606,7 +606,7 @@ void KviKvsVariant::asString(QString &szBuffer) const } } -void KviKvsVariant::appendAsString(QString &szBuffer) const +void KviKvsVariant::appendAsString(TQString &szBuffer) const { if(!m_pData)return; switch(m_pData->m_eType) @@ -614,9 +614,9 @@ void KviKvsVariant::appendAsString(QString &szBuffer) const case KviKvsVariantData::String: szBuffer.append(*(m_pData->m_u.pString)); break; case KviKvsVariantData::Array: m_pData->m_u.pArray->appendAsString(szBuffer); break; case KviKvsVariantData::Hash: m_pData->m_u.pHash->appendAsString(szBuffer); break; - case KviKvsVariantData::Integer: KviQString::appendNumber(szBuffer,m_pData->m_u.iInteger); break; - case KviKvsVariantData::Real: KviQString::appendNumber(szBuffer,*(m_pData->m_u.pReal)); break; - case KviKvsVariantData::Boolean: KviQString::appendNumber(szBuffer,m_pData->m_u.bBoolean ? 1 : 0); break; + case KviKvsVariantData::Integer: KviTQString::appendNumber(szBuffer,m_pData->m_u.iInteger); break; + case KviKvsVariantData::Real: KviTQString::appendNumber(szBuffer,*(m_pData->m_u.pReal)); break; + case KviKvsVariantData::Boolean: KviTQString::appendNumber(szBuffer,m_pData->m_u.bBoolean ? 1 : 0); break; case KviKvsVariantData::HObject: szBuffer.append(m_pData->m_u.hObject ? "object" : "null-object"); break; default: /* make gcc happy */ break; } @@ -671,7 +671,7 @@ void KviKvsVariant::takeFrom(KviKvsVariant &v) v.m_pData = 0; } -void KviKvsVariant::getTypeName(QString &szBuffer) const +void KviKvsVariant::getTypeName(TQString &szBuffer) const { if(!m_pData) { @@ -752,9 +752,9 @@ public: return CMP_OTHERGREATER; } // compare as strings instead - QString szString; + TQString szString; v1->asString(szString); - return -1 * KviQString::cmpCI(szString,*(v2->m_pData->m_u.pString)); + return -1 * KviTQString::cmpCI(szString,*(v2->m_pData->m_u.pString)); } static inline int compare_integer_real(const KviKvsVariant * v1,const KviKvsVariant * v2) @@ -813,9 +813,9 @@ public: return CMP_OTHERGREATER; } // compare as strings instead - QString szString; + TQString szString; v1->asString(szString); - return -1 * KviQString::cmpCI(szString,*(v2->m_pData->m_u.pString)); + return -1 * KviTQString::cmpCI(szString,*(v2->m_pData->m_u.pString)); } static inline int compare_real_boolean(const KviKvsVariant * v1,const KviKvsVariant * v2) @@ -929,21 +929,21 @@ public: } }; -void KviKvsVariant::serializeString(QString& buffer) +void KviKvsVariant::serializeString(TQString& buffer) { - buffer.replace('\\',"\\\\"); - buffer.replace('\n',"\\n"); - buffer.replace('\r',"\\r"); - buffer.replace('\b',"\\b"); - buffer.replace('\t',"\\t"); - buffer.replace('\f',"\\f"); - buffer.replace('/',"\\/"); - buffer.replace('"',"\\\""); + buffer.tqreplace('\\',"\\\\"); + buffer.tqreplace('\n',"\\n"); + buffer.tqreplace('\r',"\\r"); + buffer.tqreplace('\b',"\\b"); + buffer.tqreplace('\t',"\\t"); + buffer.tqreplace('\f',"\\f"); + buffer.tqreplace('/',"\\/"); + buffer.tqreplace('"',"\\\""); buffer.prepend('"'); buffer.append('"'); } -void KviKvsVariant::serialize(QString& result) +void KviKvsVariant::serialize(TQString& result) { switch(m_pData->m_eType) { @@ -977,9 +977,9 @@ void KviKvsVariant::serialize(QString& result) } } -KviKvsVariant* KviKvsVariant::unserializeTrue(const QChar** aux) +KviKvsVariant* KviKvsVariant::unserializeTrue(const TQChar** aux) { - if(KviQString::equalCIN(QString("true"),*aux,4)) + if(KviTQString::equalCIN(TQString("true"),*aux,4)) { (*aux)+=4; return new KviKvsVariant(true); @@ -987,9 +987,9 @@ KviKvsVariant* KviKvsVariant::unserializeTrue(const QChar** aux) return 0; } -KviKvsVariant* KviKvsVariant::unserializeFalse(const QChar** aux) +KviKvsVariant* KviKvsVariant::unserializeFalse(const TQChar** aux) { - if(KviQString::equalCIN(QString("false"),*aux,5)) + if(KviTQString::equalCIN(TQString("false"),*aux,5)) { (*aux)+=5; return new KviKvsVariant(false); @@ -997,9 +997,9 @@ KviKvsVariant* KviKvsVariant::unserializeFalse(const QChar** aux) return 0; } -KviKvsVariant* KviKvsVariant::unserializeNull(const QChar** aux) +KviKvsVariant* KviKvsVariant::unserializeNull(const TQChar** aux) { - if(KviQString::equalCIN(QString("null"),*aux,4)) + if(KviTQString::equalCIN(TQString("null"),*aux,4)) { (*aux)+=4; return new KviKvsVariant(); @@ -1007,10 +1007,10 @@ KviKvsVariant* KviKvsVariant::unserializeNull(const QChar** aux) return 0; } -KviKvsVariant* KviKvsVariant::unserializeRealOrInteger(const QChar** aux) +KviKvsVariant* KviKvsVariant::unserializeRealOrInteger(const TQChar** aux) { - QString data; - if((*aux)->unicode() == '-') + TQString data; + if((*aux)->tqunicode() == '-') { data.append('-'); (*aux)++; @@ -1024,16 +1024,16 @@ KviKvsVariant* KviKvsVariant::unserializeRealOrInteger(const QChar** aux) data.append(**aux); (*aux)++; } - if((*aux)->unicode()=='.') + if((*aux)->tqunicode()=='.') { return unserializeReal(aux,data); } return unserializeInteger(aux,data); } -KviKvsVariant* KviKvsVariant::unserializeReal(const QChar** aux,QString& data) +KviKvsVariant* KviKvsVariant::unserializeReal(const TQChar** aux,TQString& data) { - QString exponent; + TQString exponent; (*aux)++; //skip . data.append('.'); while((*aux)->isDigit()) @@ -1042,15 +1042,15 @@ KviKvsVariant* KviKvsVariant::unserializeReal(const QChar** aux,QString& data) (*aux)++; } - if((*aux)->unicode() == 'e' || (*aux)->unicode() == 'E') + if((*aux)->tqunicode() == 'e' || (*aux)->tqunicode() == 'E') { (*aux)++; - if((*aux)->unicode() == '-') + if((*aux)->tqunicode() == '-') { exponent.append('-'); (*aux)++; } else { - if((*aux)->unicode() == '+') + if((*aux)->tqunicode() == '+') { exponent.append('+'); (*aux)++; @@ -1074,20 +1074,20 @@ KviKvsVariant* KviKvsVariant::unserializeReal(const QChar** aux,QString& data) return new KviKvsVariant(value); } -KviKvsVariant* KviKvsVariant::unserializeInteger(const QChar** aux,QString& data) +KviKvsVariant* KviKvsVariant::unserializeInteger(const TQChar** aux,TQString& data) { - QString exponent; + TQString exponent; - if((*aux)->unicode() == 'e' || (*aux)->unicode() == 'E') + if((*aux)->tqunicode() == 'e' || (*aux)->tqunicode() == 'E') { (*aux)++; - if((*aux)->unicode() == '-') + if((*aux)->tqunicode() == '-') { exponent.append('-'); (*aux)++; } else { - if((*aux)->unicode() == '+') + if((*aux)->tqunicode() == '+') { exponent.append('+'); (*aux)++; @@ -1109,22 +1109,22 @@ KviKvsVariant* KviKvsVariant::unserializeInteger(const QChar** aux,QString& data return new KviKvsVariant(value); } -KviKvsVariant* KviKvsVariant::unserializeString(const QChar** aux) +KviKvsVariant* KviKvsVariant::unserializeString(const TQChar** aux) { - QString buffer; + TQString buffer; unserializeString(aux,buffer); return new KviKvsVariant(buffer); } -void KviKvsVariant::unserializeString(const QChar** aux,QString& data) +void KviKvsVariant::unserializeString(const TQChar** aux,TQString& data) { data=""; - QString hex; //temp var + TQString hex; //temp var //skip leading " (*aux)++; - while((*aux)->unicode()) + while((*aux)->tqunicode()) { - switch((*aux)->unicode()) + switch((*aux)->tqunicode()) { case '"': //EOF @@ -1134,7 +1134,7 @@ void KviKvsVariant::unserializeString(const QChar** aux,QString& data) case '\\': //Special (*aux)++; - switch((*aux)->unicode()) + switch((*aux)->tqunicode()) { case 't': data.append('\t'); @@ -1159,11 +1159,11 @@ void KviKvsVariant::unserializeString(const QChar** aux,QString& data) //4 hexadecmical digits pending... hex=""; (*aux)++; - for(int k=0;k<4 && (*aux)->unicode(); k++) + for(int k=0;k<4 && (*aux)->tqunicode(); k++) { if((*aux)->isDigit() || - ((*aux)->unicode() >='A' && (*aux)->unicode() <='F')|| //ABCDEF - ((*aux)->unicode() >='a' && (*aux)->unicode() <='f')) //abcdef + ((*aux)->tqunicode() >='A' && (*aux)->tqunicode() <='F')|| //ABCDEF + ((*aux)->tqunicode() >='a' && (*aux)->tqunicode() <='f')) //abcdef { hex.append(**aux); (*aux)++; @@ -1172,7 +1172,7 @@ void KviKvsVariant::unserializeString(const QChar** aux,QString& data) } } (*aux)--; - data.append(QChar(hex.toUInt(0,16))); + data.append(TQChar(hex.toUInt(0,16))); break; default: //Fallback; incorrect escape @@ -1189,10 +1189,10 @@ void KviKvsVariant::unserializeString(const QChar** aux,QString& data) } } -KviKvsVariant* KviKvsVariant::unserializeHash(const QChar** aux) +KviKvsVariant* KviKvsVariant::unserializeHash(const TQChar** aux) { KviKvsHash* pHash = new KviKvsHash(); - QString szKey; + TQString szKey; KviKvsVariant* pElement = 0; //skip leading '{' (*aux)++; @@ -1203,7 +1203,7 @@ KviKvsVariant* KviKvsVariant::unserializeHash(const QChar** aux) while((*aux)->isSpace()) (*aux)++; //waiting for starting of string - if((*aux)->unicode()!='\"') + if((*aux)->tqunicode()!='\"') { //strange characters delete pHash; @@ -1221,7 +1221,7 @@ KviKvsVariant* KviKvsVariant::unserializeHash(const QChar** aux) while((*aux)->isSpace()) (*aux)++; //waiting for name-value delimeter - if((*aux)->unicode()!=':') + if((*aux)->tqunicode()!=':') { //strange characters delete pHash; @@ -1238,7 +1238,7 @@ KviKvsVariant* KviKvsVariant::unserializeHash(const QChar** aux) i++; while((*aux)->isSpace()) (*aux)++; - switch((*aux)->unicode()) + switch((*aux)->tqunicode()) { case ',': //goto next @@ -1263,7 +1263,7 @@ KviKvsVariant* KviKvsVariant::unserializeHash(const QChar** aux) return 0; } -KviKvsVariant* KviKvsVariant::unserializeArray(const QChar** aux) +KviKvsVariant* KviKvsVariant::unserializeArray(const TQChar** aux) { KviKvsArray* pArray = new KviKvsArray(); KviKvsVariant* pElement = 0; @@ -1278,7 +1278,7 @@ KviKvsVariant* KviKvsVariant::unserializeArray(const QChar** aux) i++; while((*aux)->isSpace()) (*aux)++; - switch((*aux)->unicode()) + switch((*aux)->tqunicode()) { case ',': //goto next @@ -1303,14 +1303,14 @@ KviKvsVariant* KviKvsVariant::unserializeArray(const QChar** aux) return 0; } -KviKvsVariant* KviKvsVariant::unserialize(const QChar** aux) +KviKvsVariant* KviKvsVariant::unserialize(const TQChar** aux) { KviKvsVariant* pResult = 0; while((*aux)->isSpace()) (*aux)++; - switch((*aux)->unicode()) + switch((*aux)->tqunicode()) { case 't': //true @@ -1361,19 +1361,19 @@ KviKvsVariant* KviKvsVariant::unserialize(const QChar** aux) return pResult; } -KviKvsVariant* KviKvsVariant::unserialize(const QString& data) +KviKvsVariant* KviKvsVariant::unserialize(const TQString& data) { KviKvsVariant* pResult = 0; #ifdef COMPILE_USE_QT4 - const QChar * aux = (const QChar *)data.constData(); + const TQChar * aux = (const TQChar *)data.constData(); #else - const QChar * aux = (const QChar *)data.ucs2(); + const TQChar * aux = (const TQChar *)data.ucs2(); #endif pResult = unserialize(&aux); - if(aux->unicode()) + if(aux->tqunicode()) { //strange extra characters? if(pResult) delete pResult; @@ -1507,7 +1507,7 @@ int KviKvsVariant::compare(const KviKvsVariant * pOther,bool bPreferNumeric) con } } } - return -1 * KviQString::cmpCI(*(m_pData->m_u.pString),*(pOther->m_pData->m_u.pString)); + return -1 * KviTQString::cmpCI(*(m_pData->m_u.pString),*(pOther->m_pData->m_u.pString)); case KviKvsVariantData::Real: return -1 * KviKvsVariantComparison::compare_real_string(pOther,this); case KviKvsVariantData::Integer: diff --git a/src/kvirc/kvs/kvi_kvs_variant.h b/src/kvirc/kvs/kvi_kvs_variant.h index 99b6471..234bbc7 100644 --- a/src/kvirc/kvs/kvi_kvs_variant.h +++ b/src/kvirc/kvs/kvi_kvs_variant.h @@ -61,7 +61,7 @@ class KviKvsVariantData public: enum Type { Nothing = 0, // m_pData not initialized - String = 1, // QString (scalar) + String = 1, // TQString (scalar) Integer = 2, // long int (scalar) Real = 4, // double (scalar) Array = 8, // KviKvsArray @@ -75,7 +75,7 @@ public: union { kvs_int_t iInteger; kvs_real_t * pReal; - QString * pString; + TQString * pString; KviKvsArray * pArray; KviKvsHash * pHash; bool bBoolean; @@ -95,9 +95,9 @@ public: KviKvsVariant(kvs_real_t dReal); KviKvsVariant(kvs_real_t * pReal); KviKvsVariant(bool bBoolean); - KviKvsVariant(const QString &szString); - KviKvsVariant(const char * szString); // without this gcc chooses the conversion (const char *)->(void *) instead of (const char *)->(QString) and obviously calls the wrong constructor - KviKvsVariant(QString * pString); + KviKvsVariant(const TQString &szString); + KviKvsVariant(const char * szString); // without this gcc chooses the conversion (const char *)->(void *) instead of (const char *)->(TQString) and obviously calls the wrong constructor + KviKvsVariant(TQString * pString); KviKvsVariant(KviKvsArray * pArray); KviKvsVariant(KviKvsHash * pHash); KviKvsVariant(kvs_hobject_t hObject); @@ -111,8 +111,8 @@ public: void setReal(kvs_real_t dReal); void setReal(kvs_real_t * pReal); void setInteger(kvs_int_t iInteger); - void setString(const QString &szString); - void setString(QString * pString); + void setString(const TQString &szString); + void setString(TQString * pString); void setArray(KviKvsArray * pArray); void setHash(KviKvsHash * pHash); void setBoolean(bool bBoolean); @@ -120,7 +120,7 @@ public: void setNothing(); //void unset(){ setNothing(); }; - void getTypeName(QString &szBuffer) const; + void getTypeName(TQString &szBuffer) const; bool isNothing() const { return !m_pData; }; bool isInteger() const { return m_pData ? (m_pData->m_eType == KviKvsVariantData::Integer) : false; }; @@ -149,8 +149,8 @@ public: // evaluates to an object handle bool asHObject(kvs_hobject_t &hObject) const; // evaluates anything to a string - void asString(QString &szBuffer) const; - void appendAsString(QString &szBuffer) const; + void asString(TQString &szBuffer) const; + void appendAsString(TQString &szBuffer) const; // always evaluates to some number... void castToNumber(KviKvsNumber &n) const; @@ -163,7 +163,7 @@ public: kvs_int_t integer() const { return m_pData ? m_pData->m_u.iInteger : 0; }; kvs_real_t real() const { return m_pData ? *(m_pData->m_u.pReal) : 0.0; }; - const QString & string() const { return m_pData ? *(m_pData->m_u.pString) : KviQString::empty; }; + const TQString & string() const { return m_pData ? *(m_pData->m_u.pString) : KviTQString::empty; }; KviKvsArray * array() const { return m_pData ? m_pData->m_u.pArray : 0; }; KviKvsHash * hash() const { return m_pData ? m_pData->m_u.pHash : 0; }; bool boolean() const { return m_pData ? m_pData->m_u.bBoolean : false; }; @@ -184,21 +184,21 @@ public: void operator = (const KviKvsVariant &v){ copyFrom(v); }; //JSON serialization - void serialize(QString& result); - static void serializeString(QString& buffer); - static KviKvsVariant* unserialize(const QString& buffer); + void serialize(TQString& result); + static void serializeString(TQString& buffer); + static KviKvsVariant* unserialize(const TQString& buffer); private: - static KviKvsVariant* unserialize(const QChar** aux); - static KviKvsVariant* unserializeTrue(const QChar** aux); - static KviKvsVariant* unserializeFalse(const QChar** aux); - static KviKvsVariant* unserializeNull(const QChar** aux); - static KviKvsVariant* unserializeArray(const QChar** aux); - static KviKvsVariant* unserializeHash(const QChar** aux); - static void unserializeString(const QChar** aux,QString& buffer); - static KviKvsVariant* unserializeString(const QChar** aux); - static KviKvsVariant* unserializeRealOrInteger(const QChar** aux); - static KviKvsVariant* unserializeReal(const QChar** aux,QString& data); - static KviKvsVariant* unserializeInteger(const QChar** aux,QString& data); + static KviKvsVariant* unserialize(const TQChar** aux); + static KviKvsVariant* unserializeTrue(const TQChar** aux); + static KviKvsVariant* unserializeFalse(const TQChar** aux); + static KviKvsVariant* unserializeNull(const TQChar** aux); + static KviKvsVariant* unserializeArray(const TQChar** aux); + static KviKvsVariant* unserializeHash(const TQChar** aux); + static void unserializeString(const TQChar** aux,TQString& buffer); + static KviKvsVariant* unserializeString(const TQChar** aux); + static KviKvsVariant* unserializeRealOrInteger(const TQChar** aux); + static KviKvsVariant* unserializeReal(const TQChar** aux,TQString& data); + static KviKvsVariant* unserializeInteger(const TQChar** aux,TQString& data); }; #include "kvi_kvs_array.h" diff --git a/src/kvirc/kvs/kvi_kvs_variantlist.cpp b/src/kvirc/kvs/kvi_kvs_variantlist.cpp index 6c10a2a..2fe00fb 100644 --- a/src/kvirc/kvs/kvi_kvs_variantlist.cpp +++ b/src/kvirc/kvs/kvi_kvs_variantlist.cpp @@ -102,14 +102,14 @@ KviKvsVariantList::KviKvsVariantList(KviKvsVariant * v1,KviKvsVariant * v2,KviKv m_pList->append(v7); } -KviKvsVariantList::KviKvsVariantList(QString * s1) +KviKvsVariantList::KviKvsVariantList(TQString * s1) { m_pList = new KviPointerList<KviKvsVariant>(); m_pList->setAutoDelete(true); m_pList->append(new KviKvsVariant(s1)); } -KviKvsVariantList::KviKvsVariantList(QString * s1,QString * s2) +KviKvsVariantList::KviKvsVariantList(TQString * s1,TQString * s2) { m_pList = new KviPointerList<KviKvsVariant>(); m_pList->setAutoDelete(true); @@ -117,7 +117,7 @@ KviKvsVariantList::KviKvsVariantList(QString * s1,QString * s2) m_pList->append(new KviKvsVariant(s2)); } -KviKvsVariantList::KviKvsVariantList(QString * s1,QString * s2,QString * s3) +KviKvsVariantList::KviKvsVariantList(TQString * s1,TQString * s2,TQString * s3) { m_pList = new KviPointerList<KviKvsVariant>(); m_pList->setAutoDelete(true); @@ -126,7 +126,7 @@ KviKvsVariantList::KviKvsVariantList(QString * s1,QString * s2,QString * s3) m_pList->append(new KviKvsVariant(s3)); } -KviKvsVariantList::KviKvsVariantList(QString * s1,QString * s2,QString * s3,QString * s4) +KviKvsVariantList::KviKvsVariantList(TQString * s1,TQString * s2,TQString * s3,TQString * s4) { m_pList = new KviPointerList<KviKvsVariant>(); m_pList->setAutoDelete(true); @@ -136,7 +136,7 @@ KviKvsVariantList::KviKvsVariantList(QString * s1,QString * s2,QString * s3,QStr m_pList->append(new KviKvsVariant(s4)); } -KviKvsVariantList::KviKvsVariantList(QString * s1,QString * s2,QString * s3,QString * s4,QString * s5) +KviKvsVariantList::KviKvsVariantList(TQString * s1,TQString * s2,TQString * s3,TQString * s4,TQString * s5) { m_pList = new KviPointerList<KviKvsVariant>(); m_pList->setAutoDelete(true); @@ -147,7 +147,7 @@ KviKvsVariantList::KviKvsVariantList(QString * s1,QString * s2,QString * s3,QStr m_pList->append(new KviKvsVariant(s5)); } -KviKvsVariantList::KviKvsVariantList(QString * s1,QString * s2,QString * s3,QString * s4,QString * s5,QString * s6) +KviKvsVariantList::KviKvsVariantList(TQString * s1,TQString * s2,TQString * s3,TQString * s4,TQString * s5,TQString * s6) { m_pList = new KviPointerList<KviKvsVariant>(); m_pList->setAutoDelete(true); @@ -170,9 +170,9 @@ void KviKvsVariantList::setAutoDelete(bool bAutoDelete) m_pList->setAutoDelete(bAutoDelete); } -void KviKvsVariantList::allAsString(QString &szBuffer) +void KviKvsVariantList::allAsString(TQString &szBuffer) { - szBuffer = QString::null; + szBuffer = TQString(); bool bFirst = true; for(KviKvsVariant * v = first();v;v = next()) { @@ -182,7 +182,7 @@ void KviKvsVariantList::allAsString(QString &szBuffer) } } -bool KviKvsVariantList::firstAsString(QString &szBuffer) +bool KviKvsVariantList::firstAsString(TQString &szBuffer) { KviKvsVariant * v = first(); if(!v)return false; @@ -190,7 +190,7 @@ bool KviKvsVariantList::firstAsString(QString &szBuffer) return true; } -bool KviKvsVariantList::nextAsString(QString &szBuffer) +bool KviKvsVariantList::nextAsString(TQString &szBuffer) { KviKvsVariant * v = next(); if(!v)return false; diff --git a/src/kvirc/kvs/kvi_kvs_variantlist.h b/src/kvirc/kvs/kvi_kvs_variantlist.h index 09a2498..77b7a46 100644 --- a/src/kvirc/kvs/kvi_kvs_variantlist.h +++ b/src/kvirc/kvs/kvi_kvs_variantlist.h @@ -41,12 +41,12 @@ public: KviKvsVariantList(KviKvsVariant * v1,KviKvsVariant * v2,KviKvsVariant * v3,KviKvsVariant * v4,KviKvsVariant * v5); KviKvsVariantList(KviKvsVariant * v1,KviKvsVariant * v2,KviKvsVariant * v3,KviKvsVariant * v4,KviKvsVariant * v5,KviKvsVariant * v6); KviKvsVariantList(KviKvsVariant * v1,KviKvsVariant * v2,KviKvsVariant * v3,KviKvsVariant * v4,KviKvsVariant * v5,KviKvsVariant * v6,KviKvsVariant * v7); - KviKvsVariantList(QString * s1); - KviKvsVariantList(QString * s1,QString * s2); - KviKvsVariantList(QString * s1,QString * s2,QString * s3); - KviKvsVariantList(QString * s1,QString * s2,QString * s3,QString * s4); - KviKvsVariantList(QString * s1,QString * s2,QString * s3,QString * s4,QString * s5); - KviKvsVariantList(QString * s1,QString * s2,QString * s3,QString * s4,QString * s5,QString * s6); + KviKvsVariantList(TQString * s1); + KviKvsVariantList(TQString * s1,TQString * s2); + KviKvsVariantList(TQString * s1,TQString * s2,TQString * s3); + KviKvsVariantList(TQString * s1,TQString * s2,TQString * s3,TQString * s4); + KviKvsVariantList(TQString * s1,TQString * s2,TQString * s3,TQString * s4,TQString * s5); + KviKvsVariantList(TQString * s1,TQString * s2,TQString * s3,TQString * s4,TQString * s5,TQString * s6); ~KviKvsVariantList(); protected: KviPointerList<KviKvsVariant> * m_pList; @@ -58,7 +58,7 @@ public: void clear(){ m_pList->clear(); }; - void append(const QString &szParam){ m_pList->append(new KviKvsVariant(szParam)); }; + void append(const TQString &szParam){ m_pList->append(new KviKvsVariant(szParam)); }; void append(kvs_int_t iInteger){ m_pList->append(new KviKvsVariant(iInteger)); }; void append(kvs_real_t dReal){ m_pList->append(new KviKvsVariant(dReal)); }; void append(bool bBoolean){ m_pList->append(new KviKvsVariant(bBoolean)); }; @@ -71,11 +71,11 @@ public: void setAutoDelete(bool bAutoDelete); // this is TRUE by default - void allAsString(QString &szBuffer); + void allAsString(TQString &szBuffer); // returns true if there was a first parameter at all - bool firstAsString(QString &szBuffer); + bool firstAsString(TQString &szBuffer); // returns true if there was a next parameter at all - bool nextAsString(QString &szBuffer); + bool nextAsString(TQString &szBuffer); }; #endif //!_KVI_KVS_VARIANTLIST_H_ diff --git a/src/kvirc/kvs/moc_kvi_kvs_action.cpp b/src/kvirc/kvs/moc_kvi_kvs_action.cpp index 25fafd8..b5cc8fa 100644 --- a/src/kvirc/kvs/moc_kvi_kvs_action.cpp +++ b/src/kvirc/kvs/moc_kvi_kvs_action.cpp @@ -2,21 +2,21 @@ ** KviKvsAction meta object code from reading C++ file 'kvi_kvs_action.h' ** ** Created: Mon Feb 25 00:11:56 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_kvs_action.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviKvsAction::className() const @@ -24,69 +24,69 @@ const char *KviKvsAction::className() const return "KviKvsAction"; } -QMetaObject *KviKvsAction::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviKvsAction( "KviKvsAction", &KviKvsAction::staticMetaObject ); +TQMetaObject *KviKvsAction::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviKvsAction( "KviKvsAction", &KviKvsAction::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviKvsAction::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviKvsAction::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsAction", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviKvsAction", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviKvsAction::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviKvsAction::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsAction", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviKvsAction", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviKvsAction::staticMetaObject() +TQMetaObject* KviKvsAction::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviAction::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviKvsAction", parentObject, + TQMetaObject* tqparentObject = KviAction::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviKvsAction", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviKvsAction.setMetaObject( metaObj ); return metaObj; } -void* KviKvsAction::qt_cast( const char* clname ) +void* KviKvsAction::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviKvsAction" ) ) return this; - return KviAction::qt_cast( clname ); + return KviAction::tqqt_cast( clname ); } -bool KviKvsAction::qt_invoke( int _id, QUObject* _o ) +bool KviKvsAction::qt_invoke( int _id, TQUObject* _o ) { return KviAction::qt_invoke(_id,_o); } -bool KviKvsAction::qt_emit( int _id, QUObject* _o ) +bool KviKvsAction::qt_emit( int _id, TQUObject* _o ) { return KviAction::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviKvsAction::qt_property( int id, int f, QVariant* v) +bool KviKvsAction::qt_property( int id, int f, TQVariant* v) { return KviAction::qt_property( id, f, v); } -bool KviKvsAction::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviKvsAction::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/kvs/moc_kvi_kvs_asyncdnsoperation.cpp b/src/kvirc/kvs/moc_kvi_kvs_asyncdnsoperation.cpp index 0c436dd..ca87397 100644 --- a/src/kvirc/kvs/moc_kvi_kvs_asyncdnsoperation.cpp +++ b/src/kvirc/kvs/moc_kvi_kvs_asyncdnsoperation.cpp @@ -2,21 +2,21 @@ ** KviKvsAsyncDnsOperation meta object code from reading C++ file 'kvi_kvs_asyncdnsoperation.h' ** ** Created: Mon Feb 25 00:11:58 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_kvs_asyncdnsoperation.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviKvsAsyncDnsOperation::className() const @@ -24,67 +24,67 @@ const char *KviKvsAsyncDnsOperation::className() const return "KviKvsAsyncDnsOperation"; } -QMetaObject *KviKvsAsyncDnsOperation::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviKvsAsyncDnsOperation( "KviKvsAsyncDnsOperation", &KviKvsAsyncDnsOperation::staticMetaObject ); +TQMetaObject *KviKvsAsyncDnsOperation::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviKvsAsyncDnsOperation( "KviKvsAsyncDnsOperation", &KviKvsAsyncDnsOperation::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviKvsAsyncDnsOperation::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviKvsAsyncDnsOperation::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsAsyncDnsOperation", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviKvsAsyncDnsOperation", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviKvsAsyncDnsOperation::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviKvsAsyncDnsOperation::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsAsyncDnsOperation", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviKvsAsyncDnsOperation", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviKvsAsyncDnsOperation::staticMetaObject() +TQMetaObject* KviKvsAsyncDnsOperation::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviKvsAsyncOperation::staticMetaObject(); - static const QUParameter param_slot_0[] = { - { 0, &static_QUType_ptr, "KviDns", QUParameter::In } + TQMetaObject* tqparentObject = KviKvsAsyncOperation::staticMetaObject(); + static const TQUParameter param_slot_0[] = { + { 0, &static_TQUType_ptr, "KviDns", TQUParameter::In } }; - static const QUMethod slot_0 = {"lookupTerminated", 1, param_slot_0 }; - static const QUMethod slot_1 = {"dnsStartFailed", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "lookupTerminated(KviDns*)", &slot_0, QMetaData::Protected }, - { "dnsStartFailed()", &slot_1, QMetaData::Protected } + static const TQUMethod slot_0 = {"lookupTerminated", 1, param_slot_0 }; + static const TQUMethod slot_1 = {"dnsStartFailed", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "lookupTerminated(KviDns*)", &slot_0, TQMetaData::Protected }, + { "dnsStartFailed()", &slot_1, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviKvsAsyncDnsOperation", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviKvsAsyncDnsOperation", tqparentObject, slot_tbl, 2, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviKvsAsyncDnsOperation.setMetaObject( metaObj ); return metaObj; } -void* KviKvsAsyncDnsOperation::qt_cast( const char* clname ) +void* KviKvsAsyncDnsOperation::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviKvsAsyncDnsOperation" ) ) return this; - return KviKvsAsyncOperation::qt_cast( clname ); + return KviKvsAsyncOperation::tqqt_cast( clname ); } -bool KviKvsAsyncDnsOperation::qt_invoke( int _id, QUObject* _o ) +bool KviKvsAsyncDnsOperation::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { - case 0: lookupTerminated((KviDns*)static_QUType_ptr.get(_o+1)); break; + case 0: lookupTerminated((KviDns*)static_TQUType_ptr.get(_o+1)); break; case 1: dnsStartFailed(); break; default: return KviKvsAsyncOperation::qt_invoke( _id, _o ); @@ -92,16 +92,16 @@ bool KviKvsAsyncDnsOperation::qt_invoke( int _id, QUObject* _o ) return TRUE; } -bool KviKvsAsyncDnsOperation::qt_emit( int _id, QUObject* _o ) +bool KviKvsAsyncDnsOperation::qt_emit( int _id, TQUObject* _o ) { return KviKvsAsyncOperation::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviKvsAsyncDnsOperation::qt_property( int id, int f, QVariant* v) +bool KviKvsAsyncDnsOperation::qt_property( int id, int f, TQVariant* v) { return KviKvsAsyncOperation::qt_property( id, f, v); } -bool KviKvsAsyncDnsOperation::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviKvsAsyncDnsOperation::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/kvs/moc_kvi_kvs_asyncoperation.cpp b/src/kvirc/kvs/moc_kvi_kvs_asyncoperation.cpp index 72b75b2..256ec05 100644 --- a/src/kvirc/kvs/moc_kvi_kvs_asyncoperation.cpp +++ b/src/kvirc/kvs/moc_kvi_kvs_asyncoperation.cpp @@ -2,21 +2,21 @@ ** KviKvsAsyncOperation meta object code from reading C++ file 'kvi_kvs_asyncoperation.h' ** ** Created: Mon Feb 25 00:12:00 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_kvs_asyncoperation.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviKvsAsyncOperation::className() const @@ -24,69 +24,69 @@ const char *KviKvsAsyncOperation::className() const return "KviKvsAsyncOperation"; } -QMetaObject *KviKvsAsyncOperation::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviKvsAsyncOperation( "KviKvsAsyncOperation", &KviKvsAsyncOperation::staticMetaObject ); +TQMetaObject *KviKvsAsyncOperation::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviKvsAsyncOperation( "KviKvsAsyncOperation", &KviKvsAsyncOperation::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviKvsAsyncOperation::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviKvsAsyncOperation::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsAsyncOperation", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviKvsAsyncOperation", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviKvsAsyncOperation::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviKvsAsyncOperation::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsAsyncOperation", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviKvsAsyncOperation", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviKvsAsyncOperation::staticMetaObject() +TQMetaObject* KviKvsAsyncOperation::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QObject::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviKvsAsyncOperation", parentObject, + TQMetaObject* tqparentObject = TQObject::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviKvsAsyncOperation", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviKvsAsyncOperation.setMetaObject( metaObj ); return metaObj; } -void* KviKvsAsyncOperation::qt_cast( const char* clname ) +void* KviKvsAsyncOperation::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviKvsAsyncOperation" ) ) return this; - return QObject::qt_cast( clname ); + return TQObject::tqqt_cast( clname ); } -bool KviKvsAsyncOperation::qt_invoke( int _id, QUObject* _o ) +bool KviKvsAsyncOperation::qt_invoke( int _id, TQUObject* _o ) { - return QObject::qt_invoke(_id,_o); + return TQObject::qt_invoke(_id,_o); } -bool KviKvsAsyncOperation::qt_emit( int _id, QUObject* _o ) +bool KviKvsAsyncOperation::qt_emit( int _id, TQUObject* _o ) { - return QObject::qt_emit(_id,_o); + return TQObject::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviKvsAsyncOperation::qt_property( int id, int f, QVariant* v) +bool KviKvsAsyncOperation::qt_property( int id, int f, TQVariant* v) { - return QObject::qt_property( id, f, v); + return TQObject::qt_property( id, f, v); } -bool KviKvsAsyncOperation::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviKvsAsyncOperation::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/kvs/moc_kvi_kvs_dnsmanager.cpp b/src/kvirc/kvs/moc_kvi_kvs_dnsmanager.cpp index 2728412..00b1990 100644 --- a/src/kvirc/kvs/moc_kvi_kvs_dnsmanager.cpp +++ b/src/kvirc/kvs/moc_kvi_kvs_dnsmanager.cpp @@ -2,21 +2,21 @@ ** KviKvsDnsManager meta object code from reading C++ file 'kvi_kvs_dnsmanager.h' ** ** Created: Mon Feb 25 00:12:02 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_kvs_dnsmanager.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviKvsDnsManager::className() const @@ -24,81 +24,81 @@ const char *KviKvsDnsManager::className() const return "KviKvsDnsManager"; } -QMetaObject *KviKvsDnsManager::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviKvsDnsManager( "KviKvsDnsManager", &KviKvsDnsManager::staticMetaObject ); +TQMetaObject *KviKvsDnsManager::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviKvsDnsManager( "KviKvsDnsManager", &KviKvsDnsManager::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviKvsDnsManager::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviKvsDnsManager::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsDnsManager", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviKvsDnsManager", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviKvsDnsManager::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviKvsDnsManager::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsDnsManager", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviKvsDnsManager", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviKvsDnsManager::staticMetaObject() +TQMetaObject* KviKvsDnsManager::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QObject::staticMetaObject(); - static const QUParameter param_slot_0[] = { - { "pDns", &static_QUType_ptr, "KviDns", QUParameter::In } + TQMetaObject* tqparentObject = TQObject::staticMetaObject(); + static const TQUParameter param_slot_0[] = { + { "pDns", &static_TQUType_ptr, "KviDns", TQUParameter::In } }; - static const QUMethod slot_0 = {"dnsLookupTerminated", 1, param_slot_0 }; - static const QMetaData slot_tbl[] = { - { "dnsLookupTerminated(KviDns*)", &slot_0, QMetaData::Protected } + static const TQUMethod slot_0 = {"dnsLookupTerminated", 1, param_slot_0 }; + static const TQMetaData slot_tbl[] = { + { "dnsLookupTerminated(KviDns*)", &slot_0, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviKvsDnsManager", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviKvsDnsManager", tqparentObject, slot_tbl, 1, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviKvsDnsManager.setMetaObject( metaObj ); return metaObj; } -void* KviKvsDnsManager::qt_cast( const char* clname ) +void* KviKvsDnsManager::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviKvsDnsManager" ) ) return this; - return QObject::qt_cast( clname ); + return TQObject::tqqt_cast( clname ); } -bool KviKvsDnsManager::qt_invoke( int _id, QUObject* _o ) +bool KviKvsDnsManager::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { - case 0: dnsLookupTerminated((KviDns*)static_QUType_ptr.get(_o+1)); break; + case 0: dnsLookupTerminated((KviDns*)static_TQUType_ptr.get(_o+1)); break; default: - return QObject::qt_invoke( _id, _o ); + return TQObject::qt_invoke( _id, _o ); } return TRUE; } -bool KviKvsDnsManager::qt_emit( int _id, QUObject* _o ) +bool KviKvsDnsManager::qt_emit( int _id, TQUObject* _o ) { - return QObject::qt_emit(_id,_o); + return TQObject::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviKvsDnsManager::qt_property( int id, int f, QVariant* v) +bool KviKvsDnsManager::qt_property( int id, int f, TQVariant* v) { - return QObject::qt_property( id, f, v); + return TQObject::qt_property( id, f, v); } -bool KviKvsDnsManager::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviKvsDnsManager::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/kvs/moc_kvi_kvs_object.cpp b/src/kvirc/kvs/moc_kvi_kvs_object.cpp index a578edc..e43ea65 100644 --- a/src/kvirc/kvs/moc_kvi_kvs_object.cpp +++ b/src/kvirc/kvs/moc_kvi_kvs_object.cpp @@ -2,21 +2,21 @@ ** KviKvsObject meta object code from reading C++ file 'kvi_kvs_object.h' ** ** Created: Mon Feb 25 00:12:06 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_kvs_object.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviKvsObject::className() const @@ -24,81 +24,81 @@ const char *KviKvsObject::className() const return "KviKvsObject"; } -QMetaObject *KviKvsObject::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviKvsObject( "KviKvsObject", &KviKvsObject::staticMetaObject ); +TQMetaObject *KviKvsObject::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviKvsObject( "KviKvsObject", &KviKvsObject::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviKvsObject::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviKvsObject::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsObject", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviKvsObject", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviKvsObject::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviKvsObject::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsObject", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviKvsObject", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviKvsObject::staticMetaObject() +TQMetaObject* KviKvsObject::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QObject::staticMetaObject(); - static const QUMethod slot_0 = {"delayedDie", 0, 0 }; - static const QUMethod slot_1 = {"objectDestroyed", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "delayedDie()", &slot_0, QMetaData::Protected }, - { "objectDestroyed()", &slot_1, QMetaData::Protected } + TQMetaObject* tqparentObject = TQObject::staticMetaObject(); + static const TQUMethod slot_0 = {"delayedDie", 0, 0 }; + static const TQUMethod slot_1 = {"objectDestroyed", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "delayedDie()", &slot_0, TQMetaData::Protected }, + { "objectDestroyed()", &slot_1, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviKvsObject", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviKvsObject", tqparentObject, slot_tbl, 2, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviKvsObject.setMetaObject( metaObj ); return metaObj; } -void* KviKvsObject::qt_cast( const char* clname ) +void* KviKvsObject::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviKvsObject" ) ) return this; - return QObject::qt_cast( clname ); + return TQObject::tqqt_cast( clname ); } -bool KviKvsObject::qt_invoke( int _id, QUObject* _o ) +bool KviKvsObject::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: delayedDie(); break; case 1: objectDestroyed(); break; default: - return QObject::qt_invoke( _id, _o ); + return TQObject::qt_invoke( _id, _o ); } return TRUE; } -bool KviKvsObject::qt_emit( int _id, QUObject* _o ) +bool KviKvsObject::qt_emit( int _id, TQUObject* _o ) { - return QObject::qt_emit(_id,_o); + return TQObject::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviKvsObject::qt_property( int id, int f, QVariant* v) +bool KviKvsObject::qt_property( int id, int f, TQVariant* v) { - return QObject::qt_property( id, f, v); + return TQObject::qt_property( id, f, v); } -bool KviKvsObject::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviKvsObject::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/kvs/moc_kvi_kvs_popupmenu.cpp b/src/kvirc/kvs/moc_kvi_kvs_popupmenu.cpp index d69f722..6fd559b 100644 --- a/src/kvirc/kvs/moc_kvi_kvs_popupmenu.cpp +++ b/src/kvirc/kvs/moc_kvi_kvs_popupmenu.cpp @@ -2,21 +2,21 @@ ** KviKvsPopupMenuItemLabelHelper meta object code from reading C++ file 'kvi_kvs_popupmenu.h' ** ** Created: Mon Feb 25 00:12:08 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_kvs_popupmenu.h" -#include <qmetaobject.h> -#include <qapplication.h> - -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <tqmetaobject.h> +#include <tqapplication.h> + +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviKvsPopupMenuItemLabelHelper::className() const @@ -24,81 +24,81 @@ const char *KviKvsPopupMenuItemLabelHelper::className() const return "KviKvsPopupMenuItemLabelHelper"; } -QMetaObject *KviKvsPopupMenuItemLabelHelper::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviKvsPopupMenuItemLabelHelper( "KviKvsPopupMenuItemLabelHelper", &KviKvsPopupMenuItemLabelHelper::staticMetaObject ); +TQMetaObject *KviKvsPopupMenuItemLabelHelper::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviKvsPopupMenuItemLabelHelper( "KviKvsPopupMenuItemLabelHelper", &KviKvsPopupMenuItemLabelHelper::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviKvsPopupMenuItemLabelHelper::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviKvsPopupMenuItemLabelHelper::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsPopupMenuItemLabelHelper", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviKvsPopupMenuItemLabelHelper", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviKvsPopupMenuItemLabelHelper::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviKvsPopupMenuItemLabelHelper::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsPopupMenuItemLabelHelper", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviKvsPopupMenuItemLabelHelper", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviKvsPopupMenuItemLabelHelper::staticMetaObject() +TQMetaObject* KviKvsPopupMenuItemLabelHelper::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QObject::staticMetaObject(); - static const QUMethod slot_0 = {"labelDestroyed", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "labelDestroyed()", &slot_0, QMetaData::Protected } + TQMetaObject* tqparentObject = TQObject::staticMetaObject(); + static const TQUMethod slot_0 = {"labelDestroyed", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "labelDestroyed()", &slot_0, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviKvsPopupMenuItemLabelHelper", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviKvsPopupMenuItemLabelHelper", tqparentObject, slot_tbl, 1, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviKvsPopupMenuItemLabelHelper.setMetaObject( metaObj ); return metaObj; } -void* KviKvsPopupMenuItemLabelHelper::qt_cast( const char* clname ) +void* KviKvsPopupMenuItemLabelHelper::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviKvsPopupMenuItemLabelHelper" ) ) return this; - return QObject::qt_cast( clname ); + return TQObject::tqqt_cast( clname ); } -bool KviKvsPopupMenuItemLabelHelper::qt_invoke( int _id, QUObject* _o ) +bool KviKvsPopupMenuItemLabelHelper::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: labelDestroyed(); break; default: - return QObject::qt_invoke( _id, _o ); + return TQObject::qt_invoke( _id, _o ); } return TRUE; } -bool KviKvsPopupMenuItemLabelHelper::qt_emit( int _id, QUObject* _o ) +bool KviKvsPopupMenuItemLabelHelper::qt_emit( int _id, TQUObject* _o ) { - return QObject::qt_emit(_id,_o); + return TQObject::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviKvsPopupMenuItemLabelHelper::qt_property( int id, int f, QVariant* v) +bool KviKvsPopupMenuItemLabelHelper::qt_property( int id, int f, TQVariant* v) { - return QObject::qt_property( id, f, v); + return TQObject::qt_property( id, f, v); } -bool KviKvsPopupMenuItemLabelHelper::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviKvsPopupMenuItemLabelHelper::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviKvsPopupMenu::className() const @@ -106,112 +106,112 @@ const char *KviKvsPopupMenu::className() const return "KviKvsPopupMenu"; } -QMetaObject *KviKvsPopupMenu::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviKvsPopupMenu( "KviKvsPopupMenu", &KviKvsPopupMenu::staticMetaObject ); +TQMetaObject *KviKvsPopupMenu::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviKvsPopupMenu( "KviKvsPopupMenu", &KviKvsPopupMenu::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviKvsPopupMenu::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviKvsPopupMenu::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsPopupMenu", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviKvsPopupMenu", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviKvsPopupMenu::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviKvsPopupMenu::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsPopupMenu", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviKvsPopupMenu", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviKvsPopupMenu::staticMetaObject() +TQMetaObject* KviKvsPopupMenu::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviTalPopupMenu::staticMetaObject(); - static const QUMethod slot_0 = {"setupMenuContents", 0, 0 }; - static const QUParameter param_slot_1[] = { - { "itemId", &static_QUType_int, 0, QUParameter::In } + TQMetaObject* tqparentObject = KviTalPopupMenu::staticMetaObject(); + static const TQUMethod slot_0 = {"setupMenuContents", 0, 0 }; + static const TQUParameter param_slot_1[] = { + { "itemId", &static_TQUType_int, 0, TQUParameter::In } }; - static const QUMethod slot_1 = {"itemClicked", 1, param_slot_1 }; - static const QMetaData slot_tbl[] = { - { "setupMenuContents()", &slot_0, QMetaData::Private }, - { "itemClicked(int)", &slot_1, QMetaData::Protected } + static const TQUMethod slot_1 = {"itemClicked", 1, param_slot_1 }; + static const TQMetaData slot_tbl[] = { + { "setupMenuContents()", &slot_0, TQMetaData::Private }, + { "itemClicked(int)", &slot_1, TQMetaData::Protected } }; - static const QUParameter param_signal_0[] = { - { "it", &static_QUType_ptr, "KviKvsPopupMenuItem", QUParameter::In } + static const TQUParameter param_signal_0[] = { + { "it", &static_TQUType_ptr, "KviKvsPopupMenuItem", TQUParameter::In } }; - static const QUMethod signal_0 = {"testModeItemClicked", 1, param_signal_0 }; - static const QMetaData signal_tbl[] = { - { "testModeItemClicked(KviKvsPopupMenuItem*)", &signal_0, QMetaData::Protected } + static const TQUMethod signal_0 = {"testModeItemClicked", 1, param_signal_0 }; + static const TQMetaData signal_tbl[] = { + { "testModeItemClicked(KviKvsPopupMenuItem*)", &signal_0, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviKvsPopupMenu", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviKvsPopupMenu", tqparentObject, slot_tbl, 2, signal_tbl, 1, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviKvsPopupMenu.setMetaObject( metaObj ); return metaObj; } -void* KviKvsPopupMenu::qt_cast( const char* clname ) +void* KviKvsPopupMenu::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviKvsPopupMenu" ) ) return this; - return KviTalPopupMenu::qt_cast( clname ); + return KviTalPopupMenu::tqqt_cast( clname ); } -#include <qobjectdefs.h> -#include <qsignalslotimp.h> +#include <tqobjectdefs.h> +#include <tqtqsignalslotimp.h> -// SIGNAL testModeItemClicked +// TQT_SIGNAL testModeItemClicked void KviKvsPopupMenu::testModeItemClicked( KviKvsPopupMenuItem* t0 ) { if ( signalsBlocked() ) return; - QConnectionList *clist = receivers( staticMetaObject()->signalOffset() + 0 ); + TQConnectionList *clist = tqreceivers( staticMetaObject()->signalOffset() + 0 ); if ( !clist ) return; - QUObject o[2]; - static_QUType_ptr.set(o+1,t0); + TQUObject o[2]; + static_TQUType_ptr.set(o+1,t0); activate_signal( clist, o ); } -bool KviKvsPopupMenu::qt_invoke( int _id, QUObject* _o ) +bool KviKvsPopupMenu::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: setupMenuContents(); break; - case 1: itemClicked((int)static_QUType_int.get(_o+1)); break; + case 1: itemClicked((int)static_TQUType_int.get(_o+1)); break; default: return KviTalPopupMenu::qt_invoke( _id, _o ); } return TRUE; } -bool KviKvsPopupMenu::qt_emit( int _id, QUObject* _o ) +bool KviKvsPopupMenu::qt_emit( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->signalOffset() ) { - case 0: testModeItemClicked((KviKvsPopupMenuItem*)static_QUType_ptr.get(_o+1)); break; + case 0: testModeItemClicked((KviKvsPopupMenuItem*)static_TQUType_ptr.get(_o+1)); break; default: return KviTalPopupMenu::qt_emit(_id,_o); } return TRUE; } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviKvsPopupMenu::qt_property( int id, int f, QVariant* v) +bool KviKvsPopupMenu::qt_property( int id, int f, TQVariant* v) { return KviTalPopupMenu::qt_property( id, f, v); } -bool KviKvsPopupMenu::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviKvsPopupMenu::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/kvs/moc_kvi_kvs_processmanager.cpp b/src/kvirc/kvs/moc_kvi_kvs_processmanager.cpp index 6afd668..38cc563 100644 --- a/src/kvirc/kvs/moc_kvi_kvs_processmanager.cpp +++ b/src/kvirc/kvs/moc_kvi_kvs_processmanager.cpp @@ -2,21 +2,21 @@ ** KviKvsProcessAsyncOperation meta object code from reading C++ file 'kvi_kvs_processmanager.h' ** ** Created: Mon Feb 25 00:12:10 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_kvs_processmanager.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviKvsProcessAsyncOperation::className() const @@ -24,69 +24,69 @@ const char *KviKvsProcessAsyncOperation::className() const return "KviKvsProcessAsyncOperation"; } -QMetaObject *KviKvsProcessAsyncOperation::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviKvsProcessAsyncOperation( "KviKvsProcessAsyncOperation", &KviKvsProcessAsyncOperation::staticMetaObject ); +TQMetaObject *KviKvsProcessAsyncOperation::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviKvsProcessAsyncOperation( "KviKvsProcessAsyncOperation", &KviKvsProcessAsyncOperation::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviKvsProcessAsyncOperation::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviKvsProcessAsyncOperation::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsProcessAsyncOperation", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviKvsProcessAsyncOperation", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviKvsProcessAsyncOperation::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviKvsProcessAsyncOperation::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsProcessAsyncOperation", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviKvsProcessAsyncOperation", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviKvsProcessAsyncOperation::staticMetaObject() +TQMetaObject* KviKvsProcessAsyncOperation::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviKvsAsyncOperation::staticMetaObject(); - static const QUMethod slot_0 = {"maxRunTimeExpired", 0, 0 }; - static const QUMethod slot_1 = {"ping", 0, 0 }; - static const QUMethod slot_2 = {"readStdout", 0, 0 }; - static const QUMethod slot_3 = {"readStderr", 0, 0 }; - static const QUMethod slot_4 = {"processExited", 0, 0 }; - static const QUMethod slot_5 = {"selfDelete", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "maxRunTimeExpired()", &slot_0, QMetaData::Private }, - { "ping()", &slot_1, QMetaData::Private }, - { "readStdout()", &slot_2, QMetaData::Private }, - { "readStderr()", &slot_3, QMetaData::Private }, - { "processExited()", &slot_4, QMetaData::Private }, - { "selfDelete()", &slot_5, QMetaData::Private } + TQMetaObject* tqparentObject = KviKvsAsyncOperation::staticMetaObject(); + static const TQUMethod slot_0 = {"maxRunTimeExpired", 0, 0 }; + static const TQUMethod slot_1 = {"ping", 0, 0 }; + static const TQUMethod slot_2 = {"readStdout", 0, 0 }; + static const TQUMethod slot_3 = {"readStderr", 0, 0 }; + static const TQUMethod slot_4 = {"processExited", 0, 0 }; + static const TQUMethod slot_5 = {"selfDelete", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "maxRunTimeExpired()", &slot_0, TQMetaData::Private }, + { "ping()", &slot_1, TQMetaData::Private }, + { "readStdout()", &slot_2, TQMetaData::Private }, + { "readStderr()", &slot_3, TQMetaData::Private }, + { "processExited()", &slot_4, TQMetaData::Private }, + { "selfDelete()", &slot_5, TQMetaData::Private } }; - metaObj = QMetaObject::new_metaobject( - "KviKvsProcessAsyncOperation", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviKvsProcessAsyncOperation", tqparentObject, slot_tbl, 6, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviKvsProcessAsyncOperation.setMetaObject( metaObj ); return metaObj; } -void* KviKvsProcessAsyncOperation::qt_cast( const char* clname ) +void* KviKvsProcessAsyncOperation::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviKvsProcessAsyncOperation" ) ) return this; - return KviKvsAsyncOperation::qt_cast( clname ); + return KviKvsAsyncOperation::tqqt_cast( clname ); } -bool KviKvsProcessAsyncOperation::qt_invoke( int _id, QUObject* _o ) +bool KviKvsProcessAsyncOperation::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: maxRunTimeExpired(); break; @@ -101,16 +101,16 @@ bool KviKvsProcessAsyncOperation::qt_invoke( int _id, QUObject* _o ) return TRUE; } -bool KviKvsProcessAsyncOperation::qt_emit( int _id, QUObject* _o ) +bool KviKvsProcessAsyncOperation::qt_emit( int _id, TQUObject* _o ) { return KviKvsAsyncOperation::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviKvsProcessAsyncOperation::qt_property( int id, int f, QVariant* v) +bool KviKvsProcessAsyncOperation::qt_property( int id, int f, TQVariant* v) { return KviKvsAsyncOperation::qt_property( id, f, v); } -bool KviKvsProcessAsyncOperation::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviKvsProcessAsyncOperation::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/kvs/moc_kvi_kvs_timermanager.cpp b/src/kvirc/kvs/moc_kvi_kvs_timermanager.cpp index 05f81bc..8375d94 100644 --- a/src/kvirc/kvs/moc_kvi_kvs_timermanager.cpp +++ b/src/kvirc/kvs/moc_kvi_kvs_timermanager.cpp @@ -2,21 +2,21 @@ ** KviKvsTimerManager meta object code from reading C++ file 'kvi_kvs_timermanager.h' ** ** Created: Mon Feb 25 00:12:04 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_kvs_timermanager.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviKvsTimerManager::className() const @@ -24,69 +24,69 @@ const char *KviKvsTimerManager::className() const return "KviKvsTimerManager"; } -QMetaObject *KviKvsTimerManager::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviKvsTimerManager( "KviKvsTimerManager", &KviKvsTimerManager::staticMetaObject ); +TQMetaObject *KviKvsTimerManager::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviKvsTimerManager( "KviKvsTimerManager", &KviKvsTimerManager::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviKvsTimerManager::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviKvsTimerManager::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsTimerManager", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviKvsTimerManager", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviKvsTimerManager::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviKvsTimerManager::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsTimerManager", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviKvsTimerManager", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviKvsTimerManager::staticMetaObject() +TQMetaObject* KviKvsTimerManager::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QObject::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviKvsTimerManager", parentObject, + TQMetaObject* tqparentObject = TQObject::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviKvsTimerManager", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviKvsTimerManager.setMetaObject( metaObj ); return metaObj; } -void* KviKvsTimerManager::qt_cast( const char* clname ) +void* KviKvsTimerManager::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviKvsTimerManager" ) ) return this; - return QObject::qt_cast( clname ); + return TQObject::tqqt_cast( clname ); } -bool KviKvsTimerManager::qt_invoke( int _id, QUObject* _o ) +bool KviKvsTimerManager::qt_invoke( int _id, TQUObject* _o ) { - return QObject::qt_invoke(_id,_o); + return TQObject::qt_invoke(_id,_o); } -bool KviKvsTimerManager::qt_emit( int _id, QUObject* _o ) +bool KviKvsTimerManager::qt_emit( int _id, TQUObject* _o ) { - return QObject::qt_emit(_id,_o); + return TQObject::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviKvsTimerManager::qt_property( int id, int f, QVariant* v) +bool KviKvsTimerManager::qt_property( int id, int f, TQVariant* v) { - return QObject::qt_property( id, f, v); + return TQObject::qt_property( id, f, v); } -bool KviKvsTimerManager::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviKvsTimerManager::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/kvs/moc_kvi_kvs_useraction.cpp b/src/kvirc/kvs/moc_kvi_kvs_useraction.cpp index b2bd5c6..76c6514 100644 --- a/src/kvirc/kvs/moc_kvi_kvs_useraction.cpp +++ b/src/kvirc/kvs/moc_kvi_kvs_useraction.cpp @@ -2,21 +2,21 @@ ** KviKvsUserAction meta object code from reading C++ file 'kvi_kvs_useraction.h' ** ** Created: Mon Feb 25 00:12:12 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_kvs_useraction.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviKvsUserAction::className() const @@ -24,69 +24,69 @@ const char *KviKvsUserAction::className() const return "KviKvsUserAction"; } -QMetaObject *KviKvsUserAction::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviKvsUserAction( "KviKvsUserAction", &KviKvsUserAction::staticMetaObject ); +TQMetaObject *KviKvsUserAction::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviKvsUserAction( "KviKvsUserAction", &KviKvsUserAction::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviKvsUserAction::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviKvsUserAction::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsUserAction", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviKvsUserAction", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviKvsUserAction::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviKvsUserAction::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviKvsUserAction", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviKvsUserAction", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviKvsUserAction::staticMetaObject() +TQMetaObject* KviKvsUserAction::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviKvsAction::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviKvsUserAction", parentObject, + TQMetaObject* tqparentObject = KviKvsAction::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviKvsUserAction", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviKvsUserAction.setMetaObject( metaObj ); return metaObj; } -void* KviKvsUserAction::qt_cast( const char* clname ) +void* KviKvsUserAction::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviKvsUserAction" ) ) return this; - return KviKvsAction::qt_cast( clname ); + return KviKvsAction::tqqt_cast( clname ); } -bool KviKvsUserAction::qt_invoke( int _id, QUObject* _o ) +bool KviKvsUserAction::qt_invoke( int _id, TQUObject* _o ) { return KviKvsAction::qt_invoke(_id,_o); } -bool KviKvsUserAction::qt_emit( int _id, QUObject* _o ) +bool KviKvsUserAction::qt_emit( int _id, TQUObject* _o ) { return KviKvsAction::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviKvsUserAction::qt_property( int id, int f, QVariant* v) +bool KviKvsUserAction::qt_property( int id, int f, TQVariant* v) { return KviKvsAction::qt_property( id, f, v); } -bool KviKvsUserAction::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviKvsUserAction::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/module/kvi_mexlinkfilter.cpp b/src/kvirc/module/kvi_mexlinkfilter.cpp index 5898738..b479d3c 100644 --- a/src/kvirc/module/kvi_mexlinkfilter.cpp +++ b/src/kvirc/module/kvi_mexlinkfilter.cpp @@ -26,7 +26,7 @@ #include "kvi_mexlinkfilter.h" KviMexLinkFilter::KviMexLinkFilter(KviModuleExtensionDescriptor * d) -: QObject(), KviModuleExtension(d) +: TQObject(), KviModuleExtension(d) { } diff --git a/src/kvirc/module/kvi_mexlinkfilter.h b/src/kvirc/module/kvi_mexlinkfilter.h index aaf2a09..88b704d 100644 --- a/src/kvirc/module/kvi_mexlinkfilter.h +++ b/src/kvirc/module/kvi_mexlinkfilter.h @@ -27,13 +27,14 @@ #include "kvi_settings.h" #include "kvi_moduleextension.h" -#include <qobject.h> +#include <tqobject.h> class KviDataBuffer; -class KVIRC_API KviMexLinkFilter : public QObject, public KviModuleExtension +class KVIRC_API KviMexLinkFilter : public TQObject, public KviModuleExtension { Q_OBJECT + TQ_OBJECT public: KviMexLinkFilter(KviModuleExtensionDescriptor * d); ~KviMexLinkFilter(); diff --git a/src/kvirc/module/kvi_mexserverimport.cpp b/src/kvirc/module/kvi_mexserverimport.cpp index 1dfc61e..59ac15e 100644 --- a/src/kvirc/module/kvi_mexserverimport.cpp +++ b/src/kvirc/module/kvi_mexserverimport.cpp @@ -24,7 +24,7 @@ #include "kvi_mexserverimport.h" KviMexServerImport::KviMexServerImport(KviModuleExtensionDescriptor * d) -: QObject() , KviModuleExtension(d) +: TQObject() , KviModuleExtension(d) { } diff --git a/src/kvirc/module/kvi_mexserverimport.h b/src/kvirc/module/kvi_mexserverimport.h index f15ce7a..7912d71 100644 --- a/src/kvirc/module/kvi_mexserverimport.h +++ b/src/kvirc/module/kvi_mexserverimport.h @@ -27,11 +27,12 @@ #include "kvi_settings.h" #include "kvi_ircserverdb.h" #include "kvi_moduleextension.h" -#include <qobject.h> +#include <tqobject.h> -class KVIRC_API KviMexServerImport : public QObject, public KviModuleExtension +class KVIRC_API KviMexServerImport : public TQObject, public KviModuleExtension { Q_OBJECT + TQ_OBJECT public: KviMexServerImport(KviModuleExtensionDescriptor * d); ~KviMexServerImport(); diff --git a/src/kvirc/module/kvi_mextoolbar.cpp b/src/kvirc/module/kvi_mextoolbar.cpp index 4d86878..ccae2f3 100644 --- a/src/kvirc/module/kvi_mextoolbar.cpp +++ b/src/kvirc/module/kvi_mextoolbar.cpp @@ -25,8 +25,8 @@ #include "kvi_mextoolbar.h" #include "kvi_frame.h" -KviMexToolBar::KviMexToolBar(KviModuleExtensionDescriptor * d,const QString &szName) -: KviToolBar(szName,QT_DOCK_TOP) , KviModuleExtension(d) +KviMexToolBar::KviMexToolBar(KviModuleExtensionDescriptor * d,const TQString &szName) +: KviToolBar(szName,TQT_DOCK_TOP) , KviModuleExtension(d) { g_pFrame->registerModuleExtensionToolBar(this); } diff --git a/src/kvirc/module/kvi_mextoolbar.h b/src/kvirc/module/kvi_mextoolbar.h index d8176e8..8a00925 100644 --- a/src/kvirc/module/kvi_mextoolbar.h +++ b/src/kvirc/module/kvi_mextoolbar.h @@ -30,8 +30,9 @@ class KviFrame; class KVIRC_API KviMexToolBar : public KviToolBar , public KviModuleExtension { Q_OBJECT + TQ_OBJECT public: - KviMexToolBar(KviModuleExtensionDescriptor * d,const QString &szName); + KviMexToolBar(KviModuleExtensionDescriptor * d,const TQString &szName); ~KviMexToolBar(); }; diff --git a/src/kvirc/module/kvi_module.cpp b/src/kvirc/module/kvi_module.cpp index f0e50d0..8716c16 100644 --- a/src/kvirc/module/kvi_module.cpp +++ b/src/kvirc/module/kvi_module.cpp @@ -33,10 +33,6 @@ #include <time.h> -#if QT_VERSION < 300 - #include <qobjectdict.h> -#endif - #ifdef COMPILE_CRYPT_SUPPORT extern KviCryptEngineManager * g_pCryptEngineManager; #endif @@ -173,13 +169,13 @@ KviModule::~KviModule() */ } -KviModuleExtensionDescriptor * KviModule::registerExtension(const KviStr &szType,const KviStr &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r) +KviModuleExtensionDescriptor * KviModule::registerExtension(const KviStr &szType,const KviStr &szName,const TQString &szVisibleName,KviModuleExtensionAllocRoutine r) { - QPixmap pix; // null + TQPixmap pix; // null return g_pModuleExtensionManager->registerExtension(this,szType,szName,szVisibleName,r,pix); } -KviModuleExtensionDescriptor * KviModule::registerExtension(const KviStr &szType,const KviStr &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r,const QPixmap &icon) +KviModuleExtensionDescriptor * KviModule::registerExtension(const KviStr &szType,const KviStr &szName,const TQString &szVisibleName,KviModuleExtensionAllocRoutine r,const TQPixmap &icon) { return g_pModuleExtensionManager->registerExtension(this,szType,szName,szVisibleName,r,icon); } @@ -216,32 +212,32 @@ void KviModule::setGenericFunctionParseProc(KviModuleFunctionParseProc proc) } } -void KviModule::completeCommand(const QString &cmd,KviPointerList<QString> * matches) +void KviModule::completeCommand(const TQString &cmd,KviPointerList<TQString> * matches) { KviPointerHashTableIterator<const char *,KviModuleCommandParseProc> it(*m_pCommandDict); while(it.current()) { - if(KviQString::equalCIN(cmd,it.currentKey(),cmd.length())) + if(KviTQString::equalCIN(cmd,it.currentKey(),cmd.length())) { - QString * s = new QString(); - KviQString::sprintf(*s,"%s.%s",name(),it.currentKey()); + TQString * s = new TQString(); + KviTQString::sprintf(*s,"%s.%s",name(),it.currentKey()); matches->append(s); } ++it; } } -void KviModule::completeFunction(const QString &cmd,KviPointerList<QString> * matches) +void KviModule::completeFunction(const TQString &cmd,KviPointerList<TQString> * matches) { KviPointerHashTableIterator<const char *,KviModuleFunctionParseProc> it(*m_pFunctionDict); while(it.current()) { - if(KviQString::equalCIN(cmd,it.currentKey(),cmd.length())) + if(KviTQString::equalCIN(cmd,it.currentKey(),cmd.length())) { - QString * s = new QString(); - KviQString::sprintf(*s,"%s.%s",name(),it.currentKey()); + TQString * s = new TQString(); + KviTQString::sprintf(*s,"%s.%s",name(),it.currentKey()); matches->append(s); } ++it; @@ -251,8 +247,8 @@ void KviModule::completeFunction(const QString &cmd,KviPointerList<QString> * ma void KviModule::unregisterMetaObject(const char * metaObjName) { -#if QT_VERSION < 300 -// FIXME: #warning "We might need zeroing the d->slotAccess member of QMetaObject!" +#if [[[TQT_VERSION IS DEPRECATED]]] < 300 +// FIXME: #warning "We might need zeroing the d->slotAccess member of TQMetaObject!" if(!objectDict)return; objectDict->remove(metaObjName); #endif @@ -270,7 +266,7 @@ unsigned int KviModule::secondsSinceLastAccess() /* void KviModule::registerCommand(const char * cmd,KviModuleCommandParseProc proc) { - if(m_pCommandDict->find(cmd))m_pCommandDict->remove(cmd); + if(m_pCommandDict->tqfind(cmd))m_pCommandDict->remove(cmd); m_pCommandDict->insert(cmd,new KviModuleCommandParseProc(proc)); } @@ -316,7 +312,7 @@ void KviModule::unregisterAllEventHandlers() void KviModule::registerFunction(const char * fnc,KviModuleFunctionParseProc proc) { - if(m_pFunctionDict->find(fnc))m_pFunctionDict->remove(fnc); + if(m_pFunctionDict->tqfind(fnc))m_pFunctionDict->remove(fnc); m_pFunctionDict->insert(fnc,new KviModuleFunctionParseProc(proc)); } @@ -364,9 +360,9 @@ void KviModule::getDefaultConfigFileName(KviStr &buffer) g_pApp->getLocalKvircDirectory(buffer,KviApp::ConfigPlugins,szName.ptr()); } -void KviModule::getDefaultConfigFileName(QString &szBuffer) +void KviModule::getDefaultConfigFileName(TQString &szBuffer) { - QString tmp = "libkvi"; + TQString tmp = "libkvi"; tmp += m_szName.ptr(); tmp += ".kvc"; g_pApp->getLocalKvircDirectory(szBuffer,KviApp::ConfigPlugins,tmp); diff --git a/src/kvirc/module/kvi_module.h b/src/kvirc/module/kvi_module.h index 7c23764..f07c461 100644 --- a/src/kvirc/module/kvi_module.h +++ b/src/kvirc/module/kvi_module.h @@ -170,7 +170,7 @@ public: // don't want to be unloaded. // The usage of this method is encouraged // only when you have blocking dialogs inside the module code, like the - // QMessageBox or QFileDialog static methods. + // TQMessageBox or TQFileDialog static methods. // In this case you're entering a modal event loop that you can't control // and if some script will attempt to forcibly unload the module // it will surely lead to a crash when the static method returns (jumping into no mans land). @@ -185,7 +185,7 @@ public: bool ctrl(const char * operation,void * param); void getDefaultConfigFileName(KviStr &buffer); - void getDefaultConfigFileName(QString &szBuffer); + void getDefaultConfigFileName(TQString &szBuffer); static void unregisterMetaObject(const char * metaObjName); @@ -195,8 +195,8 @@ public: void unregisterCryptEngines(); #endif - KviModuleExtensionDescriptor * registerExtension(const KviStr &szType,const KviStr &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r); - KviModuleExtensionDescriptor * registerExtension(const KviStr &szType,const KviStr &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r,const QPixmap &icon); + KviModuleExtensionDescriptor * registerExtension(const KviStr &szType,const KviStr &szName,const TQString &szVisibleName,KviModuleExtensionAllocRoutine r); + KviModuleExtensionDescriptor * registerExtension(const KviStr &szType,const KviStr &szName,const TQString &szVisibleName,KviModuleExtensionAllocRoutine r,const TQPixmap &icon); KviModuleExtensionDescriptor * findExtensionDescriptor(const KviStr &szType,const KviStr &szName); void unregisterAllExtensions(); }; diff --git a/src/kvirc/module/kvi_moduleextension.cpp b/src/kvirc/module/kvi_moduleextension.cpp index fb6a9ae..5e82f63 100644 --- a/src/kvirc/module/kvi_moduleextension.cpp +++ b/src/kvirc/module/kvi_moduleextension.cpp @@ -32,7 +32,7 @@ KVIRC_API KviModuleExtensionManager * g_pModuleExtensionManager = 0; -KviModuleExtensionDescriptor::KviModuleExtensionDescriptor(KviModule * m,const KviStr &szType,const KviStr &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r,const QPixmap &pix) +KviModuleExtensionDescriptor::KviModuleExtensionDescriptor(KviModule * m,const KviStr &szType,const KviStr &szName,const TQString &szVisibleName,KviModuleExtensionAllocRoutine r,const TQPixmap &pix) { m_iId = KviApp::getGloballyUniqueId(); @@ -44,7 +44,7 @@ KviModuleExtensionDescriptor::KviModuleExtensionDescriptor(KviModule * m,const K m_pObjectList = new KviPointerList<KviModuleExtension>; m_pObjectList->setAutoDelete(false); if(pix.isNull())m_pIcon = 0; - else m_pIcon = new QPixmap(pix); + else m_pIcon = new TQPixmap(pix); } KviModuleExtensionDescriptor::~KviModuleExtensionDescriptor() @@ -54,14 +54,14 @@ KviModuleExtensionDescriptor::~KviModuleExtensionDescriptor() if(m_pIcon)delete m_pIcon; } -void KviModuleExtensionDescriptor::setIcon(const QPixmap &pix) +void KviModuleExtensionDescriptor::setIcon(const TQPixmap &pix) { if(m_pIcon)delete m_pIcon; if(pix.isNull())m_pIcon = 0; - else m_pIcon = new QPixmap(pix); + else m_pIcon = new TQPixmap(pix); } -KviModuleExtension * KviModuleExtensionDescriptor::allocate(KviWindow * pWnd,KviPointerHashTable<QString,QVariant> * pParams,void * pSpecial) +KviModuleExtension * KviModuleExtensionDescriptor::allocate(KviWindow * pWnd,KviPointerHashTable<TQString,TQVariant> * pParams,void * pSpecial) { KviModuleExtensionAllocStruct s; s.pDescriptor = this; @@ -103,13 +103,13 @@ KviModuleExtensionManager::~KviModuleExtensionManager() KviModuleExtensionDescriptorList * KviModuleExtensionManager::getExtensionList(const KviStr &szType) { g_pModuleManager->loadModulesByCaps(szType.ptr()); - return m_pExtensionDict->find(szType.ptr()); + return m_pExtensionDict->tqfind(szType.ptr()); } -KviModuleExtensionDescriptor * KviModuleExtensionManager::registerExtension(KviModule * m,const KviStr &szType,const KviStr &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r,const QPixmap &icon) +KviModuleExtensionDescriptor * KviModuleExtensionManager::registerExtension(KviModule * m,const KviStr &szType,const KviStr &szName,const TQString &szVisibleName,KviModuleExtensionAllocRoutine r,const TQPixmap &icon) { KviModuleExtensionDescriptor * d = new KviModuleExtensionDescriptor(m,szType,szName,szVisibleName,r,icon); - KviModuleExtensionDescriptorList * l = m_pExtensionDict->find(szType.ptr()); + KviModuleExtensionDescriptorList * l = m_pExtensionDict->tqfind(szType.ptr()); if(!l) { l = new KviModuleExtensionDescriptorList(); @@ -157,12 +157,12 @@ KviModuleExtensionDescriptorList * KviModuleExtensionManager::allocateExtensionG (void)m; // get rid of the unused warning :D } - KviModuleExtensionDescriptorList * l = m_pExtensionDict->find(szType.ptr()); + KviModuleExtensionDescriptorList * l = m_pExtensionDict->tqfind(szType.ptr()); if(!l) { // retry : it might have been unloaded g_pModuleManager->loadModulesByCaps(szType.ptr()); - l = m_pExtensionDict->find(szType.ptr()); + l = m_pExtensionDict->tqfind(szType.ptr()); } return l; @@ -170,7 +170,7 @@ KviModuleExtensionDescriptorList * KviModuleExtensionManager::allocateExtensionG KviModuleExtensionDescriptor * KviModuleExtensionManager::findExtensionDescriptor(const KviStr &szType,const KviStr &szName) { - KviModuleExtensionDescriptorList * l = m_pExtensionDict->find(szType.ptr()); + KviModuleExtensionDescriptorList * l = m_pExtensionDict->tqfind(szType.ptr()); if(!l)return 0; for(KviModuleExtensionDescriptor * d = l->first();d;d = l->next()) @@ -181,7 +181,7 @@ KviModuleExtensionDescriptor * KviModuleExtensionManager::findExtensionDescripto return 0; } -KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &szType,const KviStr &szName,KviWindow * pWnd,KviPointerHashTable<QString,QVariant> * pParams,void * pSpecial,const char * preloadModule) +KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &szType,const KviStr &szName,KviWindow * pWnd,KviPointerHashTable<TQString,TQVariant> * pParams,void * pSpecial,const char * preloadModule) { KviModuleExtensionDescriptorList * l = allocateExtensionGetDescriptorList(szType,preloadModule); if(!l)return 0; @@ -196,7 +196,7 @@ KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr & // uhm... not there ? g_pModuleManager->loadModulesByCaps(szType.ptr()); // try again after loading the modules - // l = m_pExtensionDict->find(szType.ptr()); <--- this shouldn't change! + // l = m_pExtensionDict->tqfind(szType.ptr()); <--- this shouldn't change! for(d = l->first();d;d = l->next()) { if(d->name().equalsCI(szName))return d->allocate(pWnd,pParams,pSpecial); @@ -208,7 +208,7 @@ KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr & } -KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &szType,int id,KviWindow * pWnd,KviPointerHashTable<QString,QVariant> * pParams,void * pSpecial,const char * preloadModule) +KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &szType,int id,KviWindow * pWnd,KviPointerHashTable<TQString,TQVariant> * pParams,void * pSpecial,const char * preloadModule) { KviModuleExtensionDescriptorList * l = allocateExtensionGetDescriptorList(szType,preloadModule); if(!l)return 0; @@ -222,7 +222,7 @@ KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr & // uhm... not there ? g_pModuleManager->loadModulesByCaps(szType.ptr()); // try again after loading the modules - // l = m_pExtensionDict->find(szType.ptr()); <--- this shouldn't change! + // l = m_pExtensionDict->tqfind(szType.ptr()); <--- this shouldn't change! for(d = l->first();d;d = l->next()) { if(d->id() == id)return d->allocate(pWnd,pParams,pSpecial); diff --git a/src/kvirc/module/kvi_moduleextension.h b/src/kvirc/module/kvi_moduleextension.h index 0d1b242..7bbc360 100644 --- a/src/kvirc/module/kvi_moduleextension.h +++ b/src/kvirc/module/kvi_moduleextension.h @@ -28,8 +28,8 @@ #include "kvi_heapobject.h" #include "kvi_pointerhashtable.h" -#include <qpixmap.h> -#include <qvariant.h> +#include <tqpixmap.h> +#include <tqvariant.h> #include "kvi_pointerhashtable.h" class KviWindow; @@ -41,7 +41,7 @@ typedef struct _KviModuleExtensionAllocStructTag { KviModuleExtensionDescriptor * pDescriptor; // module extension that this alloc routine refers to KviWindow * pWindow; // may be 0! - KviPointerHashTable<QString,QVariant> * pParams; // parameter dict (may be 0!) + KviPointerHashTable<TQString,TQVariant> * pParams; // parameter dict (may be 0!) void * pSpecial; // special parameter passed to the alloc routine, may be 0 } KviModuleExtensionAllocStruct; @@ -52,41 +52,41 @@ class KVIRC_API KviModuleExtensionDescriptor friend class KviModuleExtension; friend class KviModuleExtensionManager; // only the manager allocates and deallocates these structures protected: - KviModuleExtensionDescriptor(KviModule * m,const KviStr &szType,const KviStr &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r,const QPixmap &pix); -public: // this has to be public because of QPtrList... but should be protected + KviModuleExtensionDescriptor(KviModule * m,const KviStr &szType,const KviStr &szName,const TQString &szVisibleName,KviModuleExtensionAllocRoutine r,const TQPixmap &pix); +public: // this has to be public because of TQPtrList... but should be protected ~KviModuleExtensionDescriptor(); private: int m_iId; // unique id assigned at creation time KviStr m_szType; // name of the service (toolbar , crypt engine...) KviStr m_szName; // name of the extension - QString m_szVisibleName; // name that is VISIBLE and possibly translated + TQString m_szVisibleName; // name that is VISIBLE and possibly translated KviStr m_szAuthor; // Author (visible) KviStr m_szDescription; // Description (visible!) int m_iFlags; // Flags (0 if not applicable) - QPixmap * m_pIcon; // Icon (may be null!) + TQPixmap * m_pIcon; // Icon (may be null!) KviModuleExtensionAllocRoutine m_allocRoutine; KviPointerList<KviModuleExtension> * m_pObjectList; KviModule * m_pModule; // module pointer public: // pParams ownership is NOT taken - KviModuleExtension * allocate(KviWindow * pWnd = 0,KviPointerHashTable<QString,QVariant> * pParams = 0,void * pSpecial = 0); + KviModuleExtension * allocate(KviWindow * pWnd = 0,KviPointerHashTable<TQString,TQVariant> * pParams = 0,void * pSpecial = 0); int id(){ return m_iId; }; KviModule * module(){ return m_pModule; }; const KviStr &type(){ return m_szType; }; const KviStr &name(){ return m_szName; }; - const QString &visibleName(){ return m_szVisibleName; }; + const TQString &visibleName(){ return m_szVisibleName; }; const KviStr &author(){ return m_szAuthor; }; const KviStr &description(){ return m_szDescription; }; - const QPixmap * icon(){ return m_pIcon; }; + const TQPixmap * icon(){ return m_pIcon; }; int flags(){ return m_iFlags; }; void setAuthor(const KviStr &szAuthor){ m_szAuthor = szAuthor; }; void setDescription(const KviStr &szDescription){ m_szDescription = szDescription; }; void setVisibleName(const KviStr &szVisibleName){ m_szVisibleName = szVisibleName; }; void setFlags(int iFlags){ m_iFlags = iFlags; }; - void setIcon(const QPixmap &pix); + void setIcon(const TQPixmap &pix); protected: void registerObject(KviModuleExtension * e); @@ -110,14 +110,14 @@ protected: KviPointerHashTable<const char *,KviModuleExtensionDescriptorList> * m_pExtensionDict; protected: // Only KviModule can call this - KviModuleExtensionDescriptor * registerExtension(KviModule * m,const KviStr &szType,const KviStr &szName,const QString &szVisibleName,KviModuleExtensionAllocRoutine r,const QPixmap &icon); + KviModuleExtensionDescriptor * registerExtension(KviModule * m,const KviStr &szType,const KviStr &szName,const TQString &szVisibleName,KviModuleExtensionAllocRoutine r,const TQPixmap &icon); void unregisterExtensionsByModule(KviModule * m); public: KviModuleExtensionDescriptor * findExtensionDescriptor(const KviStr &szType,const KviStr &szName); static KviModuleExtensionManager * instance(){ return g_pModuleExtensionManager; }; KviModuleExtensionDescriptorList * getExtensionList(const KviStr &szType); - KviModuleExtension * allocateExtension(const KviStr &szType,const KviStr &szName,KviWindow * pWnd = 0,KviPointerHashTable<QString,QVariant> * pParams = 0,void * pSpecial = 0,const char * preloadModule = 0); - KviModuleExtension * allocateExtension(const KviStr &szType,int id,KviWindow * pWnd = 0,KviPointerHashTable<QString,QVariant> * pParams = 0,void * pSpecial = 0,const char * preloadModule = 0); + KviModuleExtension * allocateExtension(const KviStr &szType,const KviStr &szName,KviWindow * pWnd = 0,KviPointerHashTable<TQString,TQVariant> * pParams = 0,void * pSpecial = 0,const char * preloadModule = 0); + KviModuleExtension * allocateExtension(const KviStr &szType,int id,KviWindow * pWnd = 0,KviPointerHashTable<TQString,TQVariant> * pParams = 0,void * pSpecial = 0,const char * preloadModule = 0); private: KviModuleExtensionDescriptorList * allocateExtensionGetDescriptorList(const KviStr &szType,const char * preloadModule); }; diff --git a/src/kvirc/module/kvi_modulemanager.cpp b/src/kvirc/module/kvi_modulemanager.cpp index e13d2fd..4df7de1 100644 --- a/src/kvirc/module/kvi_modulemanager.cpp +++ b/src/kvirc/module/kvi_modulemanager.cpp @@ -36,7 +36,7 @@ #include "kvi_library.h" -#include <qdir.h> +#include <tqdir.h> KviModuleManager * g_pModuleManager = 0; @@ -46,8 +46,8 @@ KviModuleManager::KviModuleManager() m_pModuleDict = new KviPointerHashTable<const char *,KviModule>(17,false); m_pModuleDict->setAutoDelete(false); - m_pCleanupTimer = new QTimer(this); - connect(m_pCleanupTimer,SIGNAL(timeout()),this,SLOT(cleanupUnusedModules())); + m_pCleanupTimer = new TQTimer(this); + connect(m_pCleanupTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(cleanupUnusedModules())); } KviModuleManager::~KviModuleManager() @@ -63,12 +63,12 @@ void KviModuleManager::loadModulesByCaps(const char * caps,const char * dir) KviStr szCapsPath(KviStr::Format,"%s%ccaps%c%s%c",dir,KVI_PATH_SEPARATOR_CHAR, KVI_PATH_SEPARATOR_CHAR,caps,KVI_PATH_SEPARATOR_CHAR); - QDir d(QString(szCapsPath.ptr())); + TQDir d(TQString(szCapsPath.ptr())); // FIXME: maybe check timestamps ? (old modules) - QStringList sl = d.entryList(QDir::Files | QDir::Readable | QDir::NoSymLinks); - for(QStringList::Iterator it = sl.begin();it != sl.end();++it) + TQStringList sl = d.entryList(TQDir::Files | TQDir::Readable | TQDir::NoSymLinks); + for(TQStringList::Iterator it = sl.begin();it != sl.end();++it) { KviStr modname = *it; modname.cutToLast(KVI_PATH_SEPARATOR_CHAR); @@ -85,9 +85,9 @@ void KviModuleManager::loadModulesByCaps(const char * caps) loadModulesByCaps(caps,szDir.ptr()); } -void KviModuleManager::completeModuleNames(const QString &path,const QString &word,KviPointerList<QString> * matches) +void KviModuleManager::completeModuleNames(const TQString &path,const TQString &word,KviPointerList<TQString> * matches) { - QDir d(path); + TQDir d(path); #ifdef COMPILE_ON_WINDOWS d.setNameFilter("kvi*.dll"); #else @@ -95,15 +95,15 @@ void KviModuleManager::completeModuleNames(const QString &path,const QString &wo #endif // FIXME: maybe check timestamps ? (old modules) - QStringList sl = d.entryList(QDir::Files | QDir::Readable | QDir::NoSymLinks); - for(QStringList::Iterator it = sl.begin();it != sl.end();++it) + TQStringList sl = d.entryList(TQDir::Files | TQDir::Readable | TQDir::NoSymLinks); + for(TQStringList::Iterator it = sl.begin();it != sl.end();++it) { - QString * modname = new QString(*it); - KviQString::cutToLast(*modname,KVI_PATH_SEPARATOR_CHAR); - KviQString::cutToFirst(*modname,"kvi"); - if(KviQString::equalCIN(word,*modname,word.length())) + TQString * modname = new TQString(*it); + KviTQString::cutToLast(*modname,KVI_PATH_SEPARATOR_CHAR); + KviTQString::cutToFirst(*modname,"kvi"); + if(KviTQString::equalCIN(word,*modname,word.length())) { - KviQString::cutFromLast(*modname,".so"); + KviTQString::cutFromLast(*modname,".so"); if(!modname->isEmpty()) matches->append(modname); else @@ -112,9 +112,9 @@ void KviModuleManager::completeModuleNames(const QString &path,const QString &wo } } -void KviModuleManager::completeModuleNames(const QString &word,KviPointerList<QString> * matches) +void KviModuleManager::completeModuleNames(const TQString &word,KviPointerList<TQString> * matches) { - QString szDir; + TQString szDir; // FIXME: Should check for duplicate names here! g_pApp->getLocalKvircDirectory(szDir,KviApp::Plugins); completeModuleNames(szDir,word,matches); @@ -124,18 +124,18 @@ void KviModuleManager::completeModuleNames(const QString &word,KviPointerList<QS KviModule * KviModuleManager::findModule(const char * modName) { - KviModule * m = m_pModuleDict->find(modName); + KviModule * m = m_pModuleDict->tqfind(modName); if(m)m->updateAccessTime(); return m; } KviModule * KviModuleManager::getModule(const char * modName) { - KviModule * m = m_pModuleDict->find(modName); + KviModule * m = m_pModuleDict->tqfind(modName); if(!m) { if(!loadModule(modName)) return 0; - m = m_pModuleDict->find(modName); + m = m_pModuleDict->tqfind(modName); } if(m)m->updateAccessTime(); return m; @@ -161,12 +161,12 @@ bool KviModuleManager::loadModule(const char * modName) //debug("MODULE %s ALREADY IN CORE MEMORY",modName); return true; } - QString tmp; - QString szName; + TQString tmp; + TQString szName; #ifdef COMPILE_ON_WINDOWS - KviQString::appendFormatted(szName,"kvi%s.dll",modName); + KviTQString::appendFormatted(szName,"kvi%s.dll",modName); #else - KviQString::appendFormatted(szName,"libkvi%s.so",modName); + KviTQString::appendFormatted(szName,"libkvi%s.so",modName); #endif szName=szName.lower(); diff --git a/src/kvirc/module/kvi_modulemanager.h b/src/kvirc/module/kvi_modulemanager.h index bba3544..dce988f 100644 --- a/src/kvirc/module/kvi_modulemanager.h +++ b/src/kvirc/module/kvi_modulemanager.h @@ -27,22 +27,23 @@ #include "kvi_settings.h" -#include <qobject.h> +#include <tqobject.h> #include "kvi_pointerhashtable.h" -#include <qtimer.h> +#include <tqtimer.h> #include "kvi_pointerlist.h" #include "kvi_module.h" -class KVIRC_API KviModuleManager : public QObject +class KVIRC_API KviModuleManager : public TQObject { Q_OBJECT + TQ_OBJECT public: KviModuleManager(); ~KviModuleManager(); private: KviPointerHashTable<const char *,KviModule> * m_pModuleDict; - QTimer * m_pCleanupTimer; + TQTimer * m_pCleanupTimer; KviStr m_szLastError; public: KviStr & lastError(){ return m_szLastError; }; @@ -56,9 +57,9 @@ public: void loadModulesByCaps(const char * caps,const char * dir); void loadModulesByCaps(const char * caps); bool hasLockedModules(); - void completeModuleNames(const QString &word,KviPointerList<QString> * matches); + void completeModuleNames(const TQString &word,KviPointerList<TQString> * matches); protected: - void completeModuleNames(const QString &path,const QString &work,KviPointerList<QString> * matches); + void completeModuleNames(const TQString &path,const TQString &work,KviPointerList<TQString> * matches); public slots: void cleanupUnusedModules(); signals: diff --git a/src/kvirc/module/moc_kvi_mexlinkfilter.cpp b/src/kvirc/module/moc_kvi_mexlinkfilter.cpp index 17ee562..3bfb8fb 100644 --- a/src/kvirc/module/moc_kvi_mexlinkfilter.cpp +++ b/src/kvirc/module/moc_kvi_mexlinkfilter.cpp @@ -2,21 +2,21 @@ ** KviMexLinkFilter meta object code from reading C++ file 'kvi_mexlinkfilter.h' ** ** Created: Mon Feb 25 00:12:13 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_mexlinkfilter.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviMexLinkFilter::className() const @@ -24,71 +24,71 @@ const char *KviMexLinkFilter::className() const return "KviMexLinkFilter"; } -QMetaObject *KviMexLinkFilter::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviMexLinkFilter( "KviMexLinkFilter", &KviMexLinkFilter::staticMetaObject ); +TQMetaObject *KviMexLinkFilter::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviMexLinkFilter( "KviMexLinkFilter", &KviMexLinkFilter::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviMexLinkFilter::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviMexLinkFilter::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviMexLinkFilter", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviMexLinkFilter", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviMexLinkFilter::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviMexLinkFilter::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviMexLinkFilter", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviMexLinkFilter", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviMexLinkFilter::staticMetaObject() +TQMetaObject* KviMexLinkFilter::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QObject::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviMexLinkFilter", parentObject, + TQMetaObject* tqparentObject = TQObject::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviMexLinkFilter", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviMexLinkFilter.setMetaObject( metaObj ); return metaObj; } -void* KviMexLinkFilter::qt_cast( const char* clname ) +void* KviMexLinkFilter::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviMexLinkFilter" ) ) return this; if ( !qstrcmp( clname, "KviModuleExtension" ) ) return (KviModuleExtension*)this; - return QObject::qt_cast( clname ); + return TQObject::tqqt_cast( clname ); } -bool KviMexLinkFilter::qt_invoke( int _id, QUObject* _o ) +bool KviMexLinkFilter::qt_invoke( int _id, TQUObject* _o ) { - return QObject::qt_invoke(_id,_o); + return TQObject::qt_invoke(_id,_o); } -bool KviMexLinkFilter::qt_emit( int _id, QUObject* _o ) +bool KviMexLinkFilter::qt_emit( int _id, TQUObject* _o ) { - return QObject::qt_emit(_id,_o); + return TQObject::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviMexLinkFilter::qt_property( int id, int f, QVariant* v) +bool KviMexLinkFilter::qt_property( int id, int f, TQVariant* v) { - return QObject::qt_property( id, f, v); + return TQObject::qt_property( id, f, v); } -bool KviMexLinkFilter::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviMexLinkFilter::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/module/moc_kvi_mexserverimport.cpp b/src/kvirc/module/moc_kvi_mexserverimport.cpp index 1ef542e..de46ea8 100644 --- a/src/kvirc/module/moc_kvi_mexserverimport.cpp +++ b/src/kvirc/module/moc_kvi_mexserverimport.cpp @@ -2,21 +2,21 @@ ** KviMexServerImport meta object code from reading C++ file 'kvi_mexserverimport.h' ** ** Created: Mon Feb 25 00:12:15 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_mexserverimport.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviMexServerImport::className() const @@ -24,101 +24,101 @@ const char *KviMexServerImport::className() const return "KviMexServerImport"; } -QMetaObject *KviMexServerImport::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviMexServerImport( "KviMexServerImport", &KviMexServerImport::staticMetaObject ); +TQMetaObject *KviMexServerImport::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviMexServerImport( "KviMexServerImport", &KviMexServerImport::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviMexServerImport::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviMexServerImport::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviMexServerImport", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviMexServerImport", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviMexServerImport::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviMexServerImport::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviMexServerImport", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviMexServerImport", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviMexServerImport::staticMetaObject() +TQMetaObject* KviMexServerImport::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QObject::staticMetaObject(); - static const QUParameter param_signal_0[] = { - { "s", &static_QUType_ptr, "KviIrcServer", QUParameter::In }, - { "network", &static_QUType_charstar, 0, QUParameter::In } + TQMetaObject* tqparentObject = TQObject::staticMetaObject(); + static const TQUParameter param_signal_0[] = { + { "s", &static_TQUType_ptr, "KviIrcServer", TQUParameter::In }, + { "network", &static_TQUType_charstar, 0, TQUParameter::In } }; - static const QUMethod signal_0 = {"server", 2, param_signal_0 }; - static const QMetaData signal_tbl[] = { - { "server(const KviIrcServer&,const char*)", &signal_0, QMetaData::Public } + static const TQUMethod signal_0 = {"server", 2, param_signal_0 }; + static const TQMetaData signal_tbl[] = { + { "server(const KviIrcServer&,const char*)", &signal_0, TQMetaData::Public } }; - metaObj = QMetaObject::new_metaobject( - "KviMexServerImport", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviMexServerImport", tqparentObject, 0, 0, signal_tbl, 1, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviMexServerImport.setMetaObject( metaObj ); return metaObj; } -void* KviMexServerImport::qt_cast( const char* clname ) +void* KviMexServerImport::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviMexServerImport" ) ) return this; if ( !qstrcmp( clname, "KviModuleExtension" ) ) return (KviModuleExtension*)this; - return QObject::qt_cast( clname ); + return TQObject::tqqt_cast( clname ); } -#include <qobjectdefs.h> -#include <qsignalslotimp.h> +#include <tqobjectdefs.h> +#include <tqtqsignalslotimp.h> -// SIGNAL server +// TQT_SIGNAL server void KviMexServerImport::server( const KviIrcServer& t0, const char* t1 ) { if ( signalsBlocked() ) return; - QConnectionList *clist = receivers( staticMetaObject()->signalOffset() + 0 ); + TQConnectionList *clist = tqreceivers( staticMetaObject()->signalOffset() + 0 ); if ( !clist ) return; - QUObject o[3]; - static_QUType_ptr.set(o+1,&t0); - static_QUType_charstar.set(o+2,t1); + TQUObject o[3]; + static_TQUType_ptr.set(o+1,&t0); + static_TQUType_charstar.set(o+2,t1); activate_signal( clist, o ); } -bool KviMexServerImport::qt_invoke( int _id, QUObject* _o ) +bool KviMexServerImport::qt_invoke( int _id, TQUObject* _o ) { - return QObject::qt_invoke(_id,_o); + return TQObject::qt_invoke(_id,_o); } -bool KviMexServerImport::qt_emit( int _id, QUObject* _o ) +bool KviMexServerImport::qt_emit( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->signalOffset() ) { - case 0: server((const KviIrcServer&)*((const KviIrcServer*)static_QUType_ptr.get(_o+1)),(const char*)static_QUType_charstar.get(_o+2)); break; + case 0: server((const KviIrcServer&)*((const KviIrcServer*)static_TQUType_ptr.get(_o+1)),(const char*)static_TQUType_charstar.get(_o+2)); break; default: - return QObject::qt_emit(_id,_o); + return TQObject::qt_emit(_id,_o); } return TRUE; } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviMexServerImport::qt_property( int id, int f, QVariant* v) +bool KviMexServerImport::qt_property( int id, int f, TQVariant* v) { - return QObject::qt_property( id, f, v); + return TQObject::qt_property( id, f, v); } -bool KviMexServerImport::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviMexServerImport::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/module/moc_kvi_mextoolbar.cpp b/src/kvirc/module/moc_kvi_mextoolbar.cpp index a537e3f..5f2c40f 100644 --- a/src/kvirc/module/moc_kvi_mextoolbar.cpp +++ b/src/kvirc/module/moc_kvi_mextoolbar.cpp @@ -2,21 +2,21 @@ ** KviMexToolBar meta object code from reading C++ file 'kvi_mextoolbar.h' ** ** Created: Mon Feb 25 00:12:16 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_mextoolbar.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviMexToolBar::className() const @@ -24,71 +24,71 @@ const char *KviMexToolBar::className() const return "KviMexToolBar"; } -QMetaObject *KviMexToolBar::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviMexToolBar( "KviMexToolBar", &KviMexToolBar::staticMetaObject ); +TQMetaObject *KviMexToolBar::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviMexToolBar( "KviMexToolBar", &KviMexToolBar::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviMexToolBar::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviMexToolBar::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviMexToolBar", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviMexToolBar", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviMexToolBar::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviMexToolBar::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviMexToolBar", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviMexToolBar", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviMexToolBar::staticMetaObject() +TQMetaObject* KviMexToolBar::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviToolBar::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviMexToolBar", parentObject, + TQMetaObject* tqparentObject = KviToolBar::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviMexToolBar", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviMexToolBar.setMetaObject( metaObj ); return metaObj; } -void* KviMexToolBar::qt_cast( const char* clname ) +void* KviMexToolBar::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviMexToolBar" ) ) return this; if ( !qstrcmp( clname, "KviModuleExtension" ) ) return (KviModuleExtension*)this; - return KviToolBar::qt_cast( clname ); + return KviToolBar::tqqt_cast( clname ); } -bool KviMexToolBar::qt_invoke( int _id, QUObject* _o ) +bool KviMexToolBar::qt_invoke( int _id, TQUObject* _o ) { return KviToolBar::qt_invoke(_id,_o); } -bool KviMexToolBar::qt_emit( int _id, QUObject* _o ) +bool KviMexToolBar::qt_emit( int _id, TQUObject* _o ) { return KviToolBar::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviMexToolBar::qt_property( int id, int f, QVariant* v) +bool KviMexToolBar::qt_property( int id, int f, TQVariant* v) { return KviToolBar::qt_property( id, f, v); } -bool KviMexToolBar::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviMexToolBar::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/module/moc_kvi_modulemanager.cpp b/src/kvirc/module/moc_kvi_modulemanager.cpp index e9b815a..f9b1f44 100644 --- a/src/kvirc/module/moc_kvi_modulemanager.cpp +++ b/src/kvirc/module/moc_kvi_modulemanager.cpp @@ -2,21 +2,21 @@ ** KviModuleManager meta object code from reading C++ file 'kvi_modulemanager.h' ** ** Created: Mon Feb 25 00:12:18 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_modulemanager.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviModuleManager::className() const @@ -24,106 +24,106 @@ const char *KviModuleManager::className() const return "KviModuleManager"; } -QMetaObject *KviModuleManager::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviModuleManager( "KviModuleManager", &KviModuleManager::staticMetaObject ); +TQMetaObject *KviModuleManager::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviModuleManager( "KviModuleManager", &KviModuleManager::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviModuleManager::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviModuleManager::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviModuleManager", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviModuleManager", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviModuleManager::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviModuleManager::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviModuleManager", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviModuleManager", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviModuleManager::staticMetaObject() +TQMetaObject* KviModuleManager::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QObject::staticMetaObject(); - static const QUMethod slot_0 = {"cleanupUnusedModules", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "cleanupUnusedModules()", &slot_0, QMetaData::Public } + TQMetaObject* tqparentObject = TQObject::staticMetaObject(); + static const TQUMethod slot_0 = {"cleanupUnusedModules", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "cleanupUnusedModules()", &slot_0, TQMetaData::Public } }; - static const QUParameter param_signal_0[] = { - { "m", &static_QUType_ptr, "KviModule", QUParameter::In } + static const TQUParameter param_signal_0[] = { + { "m", &static_TQUType_ptr, "KviModule", TQUParameter::In } }; - static const QUMethod signal_0 = {"moduleAboutToUnload", 1, param_signal_0 }; - static const QMetaData signal_tbl[] = { - { "moduleAboutToUnload(KviModule*)", &signal_0, QMetaData::Public } + static const TQUMethod signal_0 = {"moduleAboutToUnload", 1, param_signal_0 }; + static const TQMetaData signal_tbl[] = { + { "moduleAboutToUnload(KviModule*)", &signal_0, TQMetaData::Public } }; - metaObj = QMetaObject::new_metaobject( - "KviModuleManager", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviModuleManager", tqparentObject, slot_tbl, 1, signal_tbl, 1, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviModuleManager.setMetaObject( metaObj ); return metaObj; } -void* KviModuleManager::qt_cast( const char* clname ) +void* KviModuleManager::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviModuleManager" ) ) return this; - return QObject::qt_cast( clname ); + return TQObject::tqqt_cast( clname ); } -#include <qobjectdefs.h> -#include <qsignalslotimp.h> +#include <tqobjectdefs.h> +#include <tqtqsignalslotimp.h> -// SIGNAL moduleAboutToUnload +// TQT_SIGNAL moduleAboutToUnload void KviModuleManager::moduleAboutToUnload( KviModule* t0 ) { if ( signalsBlocked() ) return; - QConnectionList *clist = receivers( staticMetaObject()->signalOffset() + 0 ); + TQConnectionList *clist = tqreceivers( staticMetaObject()->signalOffset() + 0 ); if ( !clist ) return; - QUObject o[2]; - static_QUType_ptr.set(o+1,t0); + TQUObject o[2]; + static_TQUType_ptr.set(o+1,t0); activate_signal( clist, o ); } -bool KviModuleManager::qt_invoke( int _id, QUObject* _o ) +bool KviModuleManager::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: cleanupUnusedModules(); break; default: - return QObject::qt_invoke( _id, _o ); + return TQObject::qt_invoke( _id, _o ); } return TRUE; } -bool KviModuleManager::qt_emit( int _id, QUObject* _o ) +bool KviModuleManager::qt_emit( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->signalOffset() ) { - case 0: moduleAboutToUnload((KviModule*)static_QUType_ptr.get(_o+1)); break; + case 0: moduleAboutToUnload((KviModule*)static_TQUType_ptr.get(_o+1)); break; default: - return QObject::qt_emit(_id,_o); + return TQObject::qt_emit(_id,_o); } return TRUE; } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviModuleManager::qt_property( int id, int f, QVariant* v) +bool KviModuleManager::qt_property( int id, int f, TQVariant* v) { - return QObject::qt_property( id, f, v); + return TQObject::qt_property( id, f, v); } -bool KviModuleManager::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviModuleManager::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/sparser/kvi_antispam.cpp b/src/kvirc/sparser/kvi_antispam.cpp index e1eec8a..9aafcfb 100644 --- a/src/kvirc/sparser/kvi_antispam.cpp +++ b/src/kvirc/sparser/kvi_antispam.cpp @@ -56,7 +56,7 @@ // Ideas: // - A spam message is generally a single PRIVMSG <mynick> :<text> // so this function should be (and is) called when -// a PRIVMSG is received from a person that has no QUERY +// a PRIVMSG is received from a person that has no TQUERY // window open yet. // - 95% of spam messages contain an URL inside (http,ftp,www) or a channel name. // - The other 5% contain words like auto-msg , msg me or query <nickname> @@ -103,10 +103,10 @@ bool kvi_mayBeSpam(KviStr * msg,KviStr &spamWord) { - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistSpamWords).begin(); + for(TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistSpamWords).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistSpamWords).end() ; ++it) { - // FIXME : This is SLOOOOOOOOW (QString -> ascii translation!!) + // FIXME : This is SLOOOOOOOOW (TQString -> ascii translation!!) const char * aux = (*it).ascii(); if(aux) diff --git a/src/kvirc/sparser/kvi_ircmessage.cpp b/src/kvirc/sparser/kvi_ircmessage.cpp index 512f03e..0441794 100644 --- a/src/kvirc/sparser/kvi_ircmessage.cpp +++ b/src/kvirc/sparser/kvi_ircmessage.cpp @@ -40,7 +40,7 @@ KviIrcMessage::KviIrcMessage(const char * message,KviIrcConnection * pConnection m_pParams = new KviPointerList<KviStr>; m_pParams->setAutoDelete(true); - //m_pcParams = new KviPointerList<QCString>; + //m_pcParams = new KviPointerList<TQCString>; //m_pcParams->setAutoDelete(true); while(*m_ptr == ' ')++m_ptr; @@ -65,13 +65,13 @@ KviIrcMessage::KviIrcMessage(const char * message,KviIrcConnection * pConnection { ++m_ptr; m_pParams->append(new KviStr(m_ptr)); - //m_pcParams->append(new QCString(m_ptr)); + //m_pcParams->append(new TQCString(m_ptr)); break; // this was the last } else { aux = m_ptr; while(*m_ptr && (*m_ptr != ' '))++m_ptr; m_pParams->append(new KviStr(aux,m_ptr)); - //m_pcParams->append(new QCString(KviStr(aux,m_ptr).ptr())); + //m_pcParams->append(new TQCString(KviStr(aux,m_ptr).ptr())); while(*m_ptr == ' ')++m_ptr; } } @@ -103,7 +103,7 @@ KviIrcMessage::KviIrcMessage(const char * message,KviIrcConnection * pConnection m_iNumericCommand = -1; m_szCommand.toUpper(); } - //m_SafeTrailingString=QCString(m_pParams->last()->ptr()); + //m_SafeTrailingString=TQCString(m_pParams->last()->ptr()); } KviIrcMessage::~KviIrcMessage() @@ -111,9 +111,9 @@ KviIrcMessage::~KviIrcMessage() delete m_pParams; } -void KviIrcMessage::decodeAndSplitMask(char * b,QString &szNick,QString &szUser,QString &szHost) +void KviIrcMessage::decodeAndSplitMask(char * b,TQString &szNick,TQString &szUser,TQString &szHost) { - static QString szWild("*"); + static TQString szWild("*"); char * p = b; while(*p && *p != '!')p++; @@ -158,7 +158,7 @@ void KviIrcMessage::decodeAndSplitMask(char * b,QString &szNick,QString &szUser, } -void KviIrcMessage::decodeAndSplitPrefix(QString &szNick,QString &szUser,QString &szHost) +void KviIrcMessage::decodeAndSplitPrefix(TQString &szNick,TQString &szUser,TQString &szHost) { char * b; if(m_szPrefix.hasData())b = m_szPrefix.ptr(); diff --git a/src/kvirc/sparser/kvi_ircmessage.h b/src/kvirc/sparser/kvi_ircmessage.h index b77946f..e2bf17d 100644 --- a/src/kvirc/sparser/kvi_ircmessage.h +++ b/src/kvirc/sparser/kvi_ircmessage.h @@ -99,8 +99,8 @@ public: void setUnrecognized(){ m_iFlags |= KVI_IRCMSG_FLAG_UNRECOGNIZED; }; bool unrecognized(){ return (m_iFlags & KVI_IRCMSG_FLAG_UNRECOGNIZED); }; - void decodeAndSplitPrefix(QString &szNick,QString &szUser,QString &szHost); - void decodeAndSplitMask(char * mask,QString &szNick,QString &szUser,QString &szHost); + void decodeAndSplitPrefix(TQString &szNick,TQString &szUser,TQString &szHost); + void decodeAndSplitMask(char * tqmask,TQString &szNick,TQString &szUser,TQString &szHost); }; #endif //_KVI_IRCMESSAGE_H_ diff --git a/src/kvirc/sparser/kvi_numeric.h b/src/kvirc/sparser/kvi_numeric.h index 2f5adee..41d246f 100644 --- a/src/kvirc/sparser/kvi_numeric.h +++ b/src/kvirc/sparser/kvi_numeric.h @@ -61,8 +61,8 @@ #define RPL_MAPEND 7 /* :End of /MAP [U] # */ //[03:45:18] [dune.webchat.org][007] newbie dune.webchat.org 1037760291 :Tue, 19 Nov 2002 18:44:51 -0800 -#define RPL_SNOMASK 8 /* %d :: Server notice mask (%#x) [U] # */ -//[03:45:18] [dune.webchat.org][008] newbie -/NAJgAxq7HQPwnkK^ 124963541 :This is your Session ID and Session Key. +#define RPL_SNOMASK 8 /* %d :: Server notice tqmask (%#x) [U] # */ +//[03:45:18] [dune.webchat.org][008] newbie -/NAJgAxq7HTQPwnkK^ 124963541 :This is your Session ID and Session Key. #define RPL_STATMEMTOT 9 /* %u %u :Bytes Blocks [U] # */ //[03:45:18] [dune.webchat.org][009] newbie ASCII :Current character mapping. @@ -98,13 +98,13 @@ #define RPL_STATSILINE 215 /* [I,E,U,D] "%c %s * %s %d %d"*/ #define RPL_STATSKLINE 216 /* [I,E,U,D] */ #define RPL_STATSPLINE 217 /* [U] */ -#define RPL_STATSQLINE 217 /* [I,E,U,D] */ +#define RPL_STATSTQLINE 217 /* [I,E,U,D] */ #define RPL_STATSYLINE 218 /* [I,E,U,D] */ #define RPL_ENDOFSTATS 219 // [I,E,U,D] */ // #define RPL_???? 220 #define RPL_UMODEIS 221 /* <nick> <mode> [I,E,U,D] # */ #define RPL_STATSBLINE 222 /* [E] */ -#define RPL_SQLINE_NICK 222 /* [D] */ +#define RPL_STQLINE_NICK 222 /* [D] */ #define RPL_STATSELINE 223 /* [E] */ #define RPL_STATSFLINE 224 /* [E] */ #define RPL_STATSDLINE 225 /* [E] */ @@ -216,9 +216,9 @@ #define RPL_INVITING 341 /* [I,E,U,D] */ #define RPL_SUMMONING 342 /* [I,E,D] */ // RPL_????????? 343-345 -#define RPL_INVITELIST 346 /* "<channel> <exceptionmask>" [I] # */ +#define RPL_INVITELIST 346 /* "<channel> <exceptiontqmask>" [I] # */ #define RPL_ENDOFINVITELIST 347 /* "<channel> :End of Channel Invite List" [I] # */ -#define RPL_EXCEPTLIST 348 /* "<channel> <exceptionmask>" [I] # */ +#define RPL_EXCEPTLIST 348 /* "<channel> <exceptiontqmask>" [I] # */ #define RPL_ENDOFEXCEPTLIST 349 /* "<channel> :End of Channel Exception List" [I] # */ // RPL_?????????? 350 #define RPL_VERSION 351 /* "%s.%s %s :%s" [I,E,U,D] # */ @@ -229,10 +229,10 @@ #define RPL_KILLDONE 361 /* [I,E,U,D] */ #define RPL_CLOSING 362 /* [I,E,U,D] */ #define RPL_CLOSEEND 363 /* [I,E,U,D] */ -#define RPL_LINKS 364 /* "<host> <parent> :<hops> <description>" [I,E,U,D] # */ +#define RPL_LINKS 364 /* "<host> <tqparent> :<hops> <description>" [I,E,U,D] # */ #define RPL_ENDOFLINKS 365 /* %s :End of /LINKS" [I,E,U,D] # */ #define RPL_ENDOFNAMES 366 /* "%s :End of /NAMES list." [I,E,U,D] # */ -#define RPL_BANLIST 367 /* "<channel> <banmask>" [I,E,U,D] # */ +#define RPL_BANLIST 367 /* "<channel> <bantqmask>" [I,E,U,D] # */ #define RPL_ENDOFBANLIST 368 /* "<channel> :End of channel Ban List" [I,E,U,D] # */ #define RPL_ENDOFWHOWAS 369 /* "%s :END of /WHOWAS" [I,E,U,D] # */ #define RPL_INFO 371 /* ":%s" [I,E,U,D] # */ @@ -280,7 +280,7 @@ #define ERR_WILDTOPLEVEL 414 /* "%s :Wildcard in toplevel Domain" [I,E,U,D] */ #define ERR_BADMASK 415 /* ??? [I] */ //#define ERR_TOOMANYTARGETS 416 /* Can not understand this ... but I've found it in some docs [I] */ -#define ERR_QUERYTOOLONG 416 /* "<target> <erroneous command> :Too many lines in the output, please restrict your query [U] */ +#define ERR_TQUERYTOOLONG 416 /* "<target> <erroneous command> :Too many lines in the output, please restrict your query [U] */ // ERR_?????????? 417-420 #define ERR_UNKNOWNCOMMAND 421 /* "%s :Unknown command" [I,E,U,D] # */ #define ERR_NOMOTD 422 /* ":MOTD File is missing" [I,E,U,D] */ @@ -385,7 +385,7 @@ ///* 342 */ RPL_SUMMONING, "%s :User summoned to irc", ///* 352 */ RPL_WHOREPLY, , ///* 361 */ RPL_KILLDONE, (char *)NULL, -///* 362 */ RPL_CLOSING, "%s :Closed. Status = %d", +///* 362 */ RPL_CLOSING, "%s :Closed. tqStatus = %d", ///* 363 */ RPL_CLOSEEND, "%d: Connections Closed", ///* 364 */ RPL_LINKS, "%s %s :%d %s", ///* 365 */ RPL_ENDOFLINKS, "%s :End of /LINKS list.", @@ -405,7 +405,7 @@ ///* 395 */ RPL_NOUSERS, ":Nobody logged in.", ///* 216 */ RPL_STATSKLINE, "%c %s * %s %s", ///* 216 */ RPL_STATSKLINE, "%c %s %s %s %d %d", -///* 217 */ RPL_STATSQLINE, "%c %s * %s %d %d", +///* 217 */ RPL_STATSTQLINE, "%c %s * %s %d %d", ///* 218 */ RPL_STATSYLINE, "%c %d %d %d %d %ld", ///* 219 */ RPL_ENDOFSTATS, "%c :End of /STATS report", ///* 221 */ RPL_UMODEIS, "%s", diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp index 1e3736a..fdf9dc1 100644 --- a/src/kvirc/sparser/kvi_sp_ctcp.cpp +++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp @@ -24,7 +24,7 @@ #define __KVIRC__ // FIXME: #warning "CTCP BEEP == WAKEUP == AWAKE" -// FIXME: #warning "CTCP AVATARREQ or QUERYAVATAR" +// FIXME: #warning "CTCP AVATARREQ or TQUERYAVATAR" #include "kvi_mirccntrl.h" #include "kvi_osinfo.h" @@ -58,12 +58,12 @@ #include <stdlib.h> -#include <qdatetime.h> +#include <tqdatetime.h> #ifdef COMPILE_USE_QT4 - #include <QTextDocument> + #include <TQTextDocument> #else - #include <qstylesheet.h> + #include <tqstylesheet.h> #endif @@ -97,8 +97,8 @@ extern KVIRC_API KviCtcpPageDialog * g_pCtcpPageDialog; use the symbol <0x01> for this delimiter. You may receive a CTCP message from server in one of the following two ways:[br] - [b]:<source_mask> PRIVMSG <target> :<0x01><ctcp message><0x01>[/b][br] - [b]:<source_mask> NOTICE <target>:<0x01><ctcp message><0x01>[/b][br] + [b]:<source_tqmask> PRIVMSG <target> :<0x01><ctcp message><0x01>[/b][br] + [b]:<source_tqmask> NOTICE <target>:<0x01><ctcp message><0x01>[/b][br] The PRIVMSG is used for CTCP REQUESTS, the NOTICE for CTCP REPLIES. The NOTICE form should never generate an automatic reply.[br] The two delimiters were used to begin and terminate the @@ -463,13 +463,13 @@ void KviServerParser::encodeCtcpParameter(const char * param,KviStr &buffer,bool if(param != begin)buffer.append(begin,param - begin); } -void KviServerParser::encodeCtcpParameter(const char * parametr,QString &resultBuffer,bool bSpaceBreaks) +void KviServerParser::encodeCtcpParameter(const char * parametr,TQString &resultBuffer,bool bSpaceBreaks) { // // This one encodes a single ctcp parameter with the simplest // subset of rules and places it in the supplied buffer // - KviQCString buffer; + KviTQCString buffer; register const char* param=parametr; if(!param) { @@ -585,7 +585,7 @@ const char * KviServerParser::decodeCtcpEscape(const char * msg_ptr,KviStr &buff } -const char * KviServerParser::decodeCtcpEscape(const char * msg_ptr,KviQCString &buffer) +const char * KviServerParser::decodeCtcpEscape(const char * msg_ptr,KviTQCString &buffer) { // // This one decodes an octal sequence @@ -721,7 +721,7 @@ const char * KviServerParser::extractCtcpParameter(const char * msg_ptr,KviStr & return msg_ptr; } -const char * KviServerParser::extractCtcpParameter(const char * p_msg_ptr,QString &resultBuffer,bool bSpaceBreaks) +const char * KviServerParser::extractCtcpParameter(const char * p_msg_ptr,TQString &resultBuffer,bool bSpaceBreaks) { // // This one extracts the "next" ctcp parameter in p_msg_ptr @@ -734,7 +734,7 @@ const char * KviServerParser::extractCtcpParameter(const char * p_msg_ptr,QStrin // based CTCP message. // - KviQCString buffer; + KviTQCString buffer; register const char* msg_ptr=p_msg_ptr; int bInString = 0; if(!msg_ptr) return 0; @@ -825,9 +825,9 @@ void KviServerParser::parseCtcpRequest(KviCtcpMessage *msg) if (KVI_OPTION_BOOL(KviOption_boolIgnoreCtcpDcc)) { msg->msg->console()->output(KVI_OUT_IGNORE,__tr2qs("Ignoring DCC from \r!nc\r%s\r [%s@\r!h\r%s\r]"), - KviQString::toUtf8(msg->pSource->nick()).data(), - KviQString::toUtf8(msg->pSource->user()).data(), - KviQString::toUtf8(msg->pSource->host()).data() + KviTQString::toUtf8(msg->pSource->nick()).data(), + KviTQString::toUtf8(msg->pSource->user()).data(), + KviTQString::toUtf8(msg->pSource->host()).data() ); return; } @@ -842,9 +842,9 @@ void KviServerParser::parseCtcpRequest(KviCtcpMessage *msg) if (KVI_OPTION_BOOL(KviOption_boolVerboseIgnore)) { msg->msg->console()->output(KVI_OUT_IGNORE,__tr2qs("Ignoring CTCP from \r!nc\r%s\r [%s@\r!h\r%s\r]"), - KviQString::toUtf8(msg->pSource->nick()).data(), - KviQString::toUtf8(msg->pSource->user()).data(), - KviQString::toUtf8(msg->pSource->host()).data() + KviTQString::toUtf8(msg->pSource->nick()).data(), + KviTQString::toUtf8(msg->pSource->user()).data(), + KviTQString::toUtf8(msg->pSource->host()).data() ); } return; @@ -852,15 +852,15 @@ void KviServerParser::parseCtcpRequest(KviCtcpMessage *msg) } } - bool bCtcpVersion = KviQString::equalCI(msg->szTag,"VERSION"); + bool bCtcpVersion = KviTQString::equalCI(msg->szTag,"VERSION"); for(int i=0;m_ctcpRequestParseProcTable[i].msgName;i++) { - if(KviQString::equalCI(msg->szTag,m_ctcpRequestParseProcTable[i].msgName)) + if(KviTQString::equalCI(msg->szTag,m_ctcpRequestParseProcTable[i].msgName)) { if(!(m_ctcpReplyParseProcTable[i].iFlags & KVI_CTCP_MESSAGE_PARSE_TRIGGERNOEVENT)) { - QString szData = msg->msg->connection()->decodeText(msg->pData); + TQString szData = msg->msg->connection()->decodeText(msg->pData); //do not allow to make faked version reply if(!(bCtcpVersion && KVI_OPTION_BOOL(KviOption_boolIgnoreCtcpVersion))) { @@ -879,7 +879,7 @@ void KviServerParser::parseCtcpRequest(KviCtcpMessage *msg) } } - QString szData = msg->msg->connection()->decodeText(msg->pData); + TQString szData = msg->msg->connection()->decodeText(msg->pData); // trigger the event on unrecognized requests too if(KVS_TRIGGER_EVENT_6_HALTED(KviEvent_OnCtcpRequest, \ msg->msg->console(), \ @@ -902,11 +902,11 @@ void KviServerParser::parseCtcpReply(KviCtcpMessage *msg) for(int i=0;m_ctcpReplyParseProcTable[i].msgName;i++) { - if(KviQString::equalCI(msg->szTag,m_ctcpReplyParseProcTable[i].msgName)) + if(KviTQString::equalCI(msg->szTag,m_ctcpReplyParseProcTable[i].msgName)) { if(!(m_ctcpReplyParseProcTable[i].iFlags & KVI_CTCP_MESSAGE_PARSE_TRIGGERNOEVENT)) { - QString szData = msg->msg->connection()->decodeText(msg->pData); + TQString szData = msg->msg->connection()->decodeText(msg->pData); if(KVS_TRIGGER_EVENT_6_HALTED(KviEvent_OnCtcpReply, \ msg->msg->console(),msg->pSource->nick(),msg->pSource->user(), \ msg->pSource->host(),msg->szTarget,msg->szTag,szData))return; @@ -916,7 +916,7 @@ void KviServerParser::parseCtcpReply(KviCtcpMessage *msg) } } - QString szData = msg->msg->connection()->decodeText(msg->pData); + TQString szData = msg->msg->connection()->decodeText(msg->pData); // trigger the event on unrecognized replies too if(KVS_TRIGGER_EVENT_6_HALTED(KviEvent_OnCtcpReply, \ msg->msg->console(),msg->pSource->nick(),msg->pSource->user(), \ @@ -959,7 +959,7 @@ bool KviServerParser::checkCtcpFlood(KviCtcpMessage *msg) void KviServerParser::replyCtcp(KviCtcpMessage *msg,const char * data) { - KviQCString szNick = msg->msg->connection()->encodeText(msg->pSource->nick()); + KviTQCString szNick = msg->msg->connection()->encodeText(msg->pSource->nick()); msg->msg->connection()->sendFmtData("NOTICE %s :%c%s %s%c", szNick.data(),0x01,msg->msg->connection()->encodeText(msg->szTag).data(),msg->msg->connection()->encodeText(data).data(),0x01); } @@ -984,9 +984,9 @@ void KviServerParser::echoCtcpReply(KviCtcpMessage * msg) } else bIsChannel = true; } - QString szData = msg->msg->connection()->decodeText(msg->pData); + TQString szData = msg->msg->connection()->decodeText(msg->pData); - QString szWhat = bIsChannel ? __tr2qs("Channel CTCP") : QString("CTCP"); + TQString szWhat = bIsChannel ? __tr2qs("Channel CTCP") : TQString("CTCP"); pOut->output( msg->bUnknown ? KVI_OUT_CTCPREPLYUNKNOWN : KVI_OUT_CTCPREPLY, @@ -1002,7 +1002,7 @@ void KviServerParser::echoCtcpRequest(KviCtcpMessage *msg) // FIXME: #warning "DEDICATED CTCP WINDOW...MINIMIZED ?" if(!msg->msg->haltOutput()) { - QString req = msg->szTag; + TQString req = msg->szTag; if(*(msg->pData)) { req.append(" "); req.append(msg->pData); @@ -1025,20 +1025,20 @@ void KviServerParser::echoCtcpRequest(KviCtcpMessage *msg) } else bIsChannel = true; } - QString szRequest = pOut->decodeText(req); - QString szTag = pOut->decodeText(msg->szTag); - QString szWhat = bIsChannel ? __tr2qs("Channel CTCP") : QString("CTCP"); + TQString szRequest = pOut->decodeText(req); + TQString szTag = pOut->decodeText(msg->szTag); + TQString szWhat = bIsChannel ? __tr2qs("Channel CTCP") : TQString("CTCP"); if(msg->bIsFlood) { - QString szData = msg->msg->connection()->decodeText(msg->pData); + TQString szData = msg->msg->connection()->decodeText(msg->pData); if(!KVS_TRIGGER_EVENT_6_HALTED(KviEvent_OnCtcpFlood,pOut,msg->pSource->nick(),msg->pSource->username(),msg->pSource->host(),msg->szTarget,msg->szTag,szData)) pOut->output(KVI_OUT_CTCPREQUESTFLOOD, __tr2qs("%Q %Q%c request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q), ignored (flood limit exceeded)"), &szWhat,&szTag,KVI_TEXT_RESET,&(msg->pSource->nick()), &(msg->pSource->user()),&(msg->pSource->host()),&szRequest); } else { - QString szAction = msg->bUnknown ? __tr2qs("ignored (unrecognized)") : + TQString szAction = msg->bUnknown ? __tr2qs("ignored (unrecognized)") : (msg->bIgnored ? __tr2qs("ignored") : __tr2qs("replied")); pOut->output( msg->bUnknown ? KVI_OUT_CTCPREQUESTUNKNOWN : @@ -1098,7 +1098,7 @@ void KviServerParser::parseCtcpReplyPing(KviCtcpMessage * msg) bool bOk; - if(szTime.contains('.')) + if(szTime.tqcontains('.')) { KviStr szUSecs = szTime; szUSecs.cutToFirst('.'); @@ -1130,7 +1130,7 @@ void KviServerParser::parseCtcpReplyPing(KviCtcpMessage * msg) } unsigned int uDiffMSecs = (tv.tv_usec - uMSecs) / 1000; - QString szWhat = bIsChannel ? __tr2qs("Channel CTCP") : QString("CTCP"); + TQString szWhat = bIsChannel ? __tr2qs("Channel CTCP") : TQString("CTCP"); pOut->output( msg->bUnknown ? KVI_OUT_CTCPREPLYUNKNOWN : KVI_OUT_CTCPREPLY, @@ -1147,7 +1147,7 @@ void KviServerParser::parseCtcpRequestVersion(KviCtcpMessage *msg) { if(!KVI_OPTION_BOOL(KviOption_boolIgnoreCtcpVersion)) { - QString szVersion; + TQString szVersion; #ifdef COMPILE_USE_QT4 #define QT4_TAG " (QT4) " #else @@ -1156,15 +1156,15 @@ void KviServerParser::parseCtcpRequestVersion(KviCtcpMessage *msg) #ifdef COMPILE_ON_WINDOWS szVersion = "KVIrc " KVI_VERSION QT4_TAG " '" KVI_RELEASE_NAME "' " KVI_SOURCES_DATE " - build " KVI_BUILD_DATE; - szVersion.append(QString(" - %1").arg(KviOsInfo::version())); + szVersion.append(TQString(" - %1").tqarg(KviOsInfo::version())); #else szVersion = "KVIrc " KVI_VERSION QT4_TAG " '" KVI_RELEASE_NAME "' " KVI_SOURCES_DATE " - build " KVI_BUILD_DATE " - " KVI_BUILD_FLAGS; - szVersion.append(QString(" - %1 (%2)").arg(KviOsInfo::name()).arg(KviOsInfo::release())); + szVersion.append(TQString(" - %1 (%2)").tqarg(KviOsInfo::name()).tqarg(KviOsInfo::release())); #endif - //szVersion.append(QString(" - QT Version: %1 - %2").arg(qVersion()).arg(__tr2qs("http://www.kvirc.net/"))); + //szVersion.append(TQString(" - QT Version: %1 - %2").tqarg(qVersion()).tqarg(__tr2qs("http://www.kvirc.net/"))); if(!KVI_OPTION_STRING(KviOption_stringCtcpVersionPostfix).isEmpty()) { - QString sz = KVI_OPTION_STRING(KviOption_stringCtcpVersionPostfix); + TQString sz = KVI_OPTION_STRING(KviOption_stringCtcpVersionPostfix); if(!sz.isEmpty()) { szVersion.append(" :"); @@ -1184,7 +1184,7 @@ void KviServerParser::parseCtcpRequestUserinfo(KviCtcpMessage *msg) { if(!KVI_OPTION_BOOL(KviOption_boolIgnoreCtcpUserinfo)) { - QString szReply; + TQString szReply; if(!KVI_OPTION_STRING(KviOption_stringCtcpUserInfoAge).isEmpty()) { szReply = "Age="; @@ -1312,7 +1312,7 @@ void KviServerParser::parseCtcpRequestSource(KviCtcpMessage *msg) { if(!KVI_OPTION_BOOL(KviOption_boolIgnoreCtcpSource)) { - QString version = "KVIrc " KVI_VERSION " '" KVI_RELEASE_NAME "' - http://www.kvirc.net/"; + TQString version = "KVIrc " KVI_VERSION " '" KVI_RELEASE_NAME "' - http://www.kvirc.net/"; if(!KVI_OPTION_STRING(KviOption_stringCtcpSourcePostfix).isEmpty()) { version+=" :"; @@ -1331,7 +1331,7 @@ void KviServerParser::parseCtcpRequestTime(KviCtcpMessage *msg) { if(!KVI_OPTION_BOOL(KviOption_boolIgnoreCtcpTime)) { - replyCtcp(msg,QDateTime::currentDateTime().toString()); + replyCtcp(msg,TQDateTime::tqcurrentDateTime().toString()); } else msg->bIgnored = true; } @@ -1355,7 +1355,7 @@ void KviServerParser::parseCtcpRequestPage(KviCtcpMessage *msg) if(!g_pCtcpPageDialog)g_pCtcpPageDialog = new KviCtcpPageDialog(); KviStr szData8; szData8 = msg->pData; - QString szData; + TQString szData; szData = msg->msg->connection()->decodeText(szData8.ptr()); g_pCtcpPageDialog->addPage(msg->pSource->nick(),msg->pSource->user(),msg->pSource->host(),szData); g_pCtcpPageDialog->popup(); @@ -1376,7 +1376,7 @@ void KviServerParser::parseCtcpRequestAction(KviCtcpMessage *msg) KviWindow * pOut = 0; bool bIsChannel = !IS_ME(msg->msg,msg->szTarget); - QString szData; + TQString szData; if(bIsChannel) { @@ -1444,13 +1444,13 @@ void KviServerParser::parseCtcpRequestAction(KviCtcpMessage *msg) pOut->demandAttention(); if(KVI_OPTION_BOOL(KviOption_boolPopupNotifierOnHighlightedMessages)) { - QString szMsg = "<b>"; + TQString szMsg = "<b>"; szMsg += msg->pSource->nick(); szMsg += "</b> "; #ifdef COMPILE_USE_QT4 - szMsg += Qt::escape(szData); + szMsg += TQt::escape(szData); #else - szMsg += QStyleSheet::escape(szData); + szMsg += TQStyleSheet::escape(szData); #endif //debug("kvi_sp_ctcp.cpp:975 debug: %s",szMsg.data()); g_pApp->notifierMessage(pOut,KVI_OPTION_MSGTYPE(KVI_OUT_ACTION).pixId(),szMsg,90); @@ -1460,7 +1460,7 @@ void KviServerParser::parseCtcpRequestAction(KviCtcpMessage *msg) if(bTargetFound) { - QString szMsg = QString("\r!n\r%1\r ").arg(msg->pSource->nick()); + TQString szMsg = TQString("\r!n\r%1\r ").tqarg(msg->pSource->nick()); szMsg += szData; if(bIsChannel) { @@ -1490,10 +1490,10 @@ void KviServerParser::parseCtcpRequestAvatar(KviCtcpMessage *msg) // AVATAR if(!KVI_OPTION_BOOL(KviOption_boolIgnoreCtcpAvatar)) { - QString szGenderTag=" "; - if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).startsWith("m",false)){ + TQString szGenderTag=" "; + if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).tqstartsWith("m",false)){ szGenderTag.append("M"); - } else if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).startsWith("f",false)){ + } else if(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender).tqstartsWith("f",false)){ szGenderTag.append("F"); } else { szGenderTag.append("?"); @@ -1505,13 +1505,13 @@ void KviServerParser::parseCtcpRequestAvatar(KviCtcpMessage *msg) if(!checkCtcpFlood(msg)) { // FIXME: #warning "OPTION FOR SETTING A FIXED BIND ADDRESS FOR OUTGOING DCC OFFERS" - QString szUserMask; - msg->pSource->mask(szUserMask); + TQString szUserMask; + msg->pSource->tqmask(szUserMask); - QString szReply,szFileName; + TQString szReply,szFileName; szFileName=a->name(); if(KVI_OPTION_BOOL(KviOption_boolDCCFileTransferReplaceOutgoingSpacesWithUnderscores)) - szFileName.replace(" ","_"); + szFileName.tqreplace(" ","_"); // escape the spaces with the right octal code encodeCtcpParameter(szFileName,szReply); @@ -1531,7 +1531,7 @@ void KviServerParser::parseCtcpRequestAvatar(KviCtcpMessage *msg) KVI_OPTION_UINT(KviOption_uintAvatarOfferTimeoutInSecs),&(a->name()),&(a->localPath()),&szUserMask); } } - //if(o)szReply.append(QString(" %1").arg(o->fileSize())); + //if(o)szReply.append(TQString(" %1").tqarg(o->fileSize())); } szReply.append(szGenderTag); @@ -1554,9 +1554,9 @@ void KviServerParser::parseCtcpRequestAvatar(KviCtcpMessage *msg) void KviServerParser::parseCtcpReplyAvatar(KviCtcpMessage *msg) { - QString szRemoteFile; - QString szGender; - QString decoded=msg->msg->console()->decodeText(msg->pData); + TQString szRemoteFile; + TQString szGender; + TQString decoded=msg->msg->console()->decodeText(msg->pData); decoded = extractCtcpParameter(decoded.utf8().data(),szRemoteFile,true); decoded = extractCtcpParameter(decoded.utf8().data(),szGender,true); @@ -1564,16 +1564,16 @@ void KviServerParser::parseCtcpReplyAvatar(KviCtcpMessage *msg) bool bPrivate = IS_ME(msg->msg,msg->szTarget); - QString textLine; + TQString textLine; KviAvatar * avatar = 0; bool bResetAvatar = true; - QString nickLink; + TQString nickLink; - KviQString::sprintf(nickLink,"\r!n\r%Q\r",&(msg->pSource->nick())); + KviTQString::sprintf(nickLink,"\r!n\r%Q\r",&(msg->pSource->nick())); - KviIrcUserEntry * e = msg->msg->connection()->userDataBase()->find(msg->pSource->nick()); + KviIrcUserEntry * e = msg->msg->connection()->userDataBase()->tqfind(msg->pSource->nick()); if(e){ if( (szGender=="m") || (szGender=="M") ) { e->setGender(KviIrcUserEntry::Male); @@ -1584,33 +1584,33 @@ void KviServerParser::parseCtcpReplyAvatar(KviCtcpMessage *msg) } } - QString szWhere = bPrivate ? __tr2qs("private") : __tr2qs("channel notification:"); - QString szWhat = bPrivate ? __tr2qs("notification") : msg->szTarget; + TQString szWhere = bPrivate ? __tr2qs("private") : __tr2qs("channel notification:"); + TQString szWhat = bPrivate ? __tr2qs("notification") : msg->szTarget; if(szRemoteFile.isEmpty()) { // avatar unset - KviQString::sprintf(textLine,__tr2qs("%Q unsets avatar"), + KviTQString::sprintf(textLine,__tr2qs("%Q unsets avatar"), &nickLink); if(_OUTPUT_VERBOSE) - KviQString::appendFormatted(textLine," (%Q %Q)",&szWhere,&szWhat); + KviTQString::appendFormatted(textLine," (%Q %Q)",&szWhere,&szWhat); } else { // FIXME: #warning "The avatar should be the one with the requested size!!" - KviQString::sprintf(textLine,__tr2qs("%Q changes avatar to %s"), + KviTQString::sprintf(textLine,__tr2qs("%Q changes avatar to %s"), &nickLink,szRemoteFile.utf8().data(),&szWhere,&szWhat); if(_OUTPUT_VERBOSE) - KviQString::appendFormatted(textLine," (%Q %Q)",&szWhere,&szWhat); + KviTQString::appendFormatted(textLine," (%Q %Q)",&szWhere,&szWhat); - bool bIsUrl = KviQString::equalCIN("http://",szRemoteFile,7) && (szRemoteFile.length() > 7); + bool bIsUrl = KviTQString::equalCIN("http://",szRemoteFile,7) && (szRemoteFile.length() > 7); if(!bIsUrl) { // no hacks - KviQString::cutToLast(szRemoteFile,'/'); - KviQString::cutToLast(szRemoteFile,'\\'); + KviTQString::cutToLast(szRemoteFile,'/'); + KviTQString::cutToLast(szRemoteFile,'\\'); } - avatar = g_pIconManager->getAvatar(QString::null,szRemoteFile); + avatar = g_pIconManager->getAvatar(TQString(),szRemoteFile); if((avatar == 0) && e) { @@ -1628,11 +1628,11 @@ void KviServerParser::parseCtcpReplyAvatar(KviCtcpMessage *msg) g_pIconManager->urlToCachedFileName(szLocalFile); g_pApp->getLocalKvircDirectory(szLocalFilePath,KviApp::Avatars,szLocalFile.ptr()); szLocalFilePath.replaceAll('\\',"\\\\"); // <-- this is especially for windows - QString szCommand = "http.get -w=nm "; + TQString szCommand = "http.get -w=nm "; unsigned int uMaxSize = KVI_OPTION_UINT(KviOption_uintMaximumRequestedAvatarSize); - if(uMaxSize > 0)KviQString::appendFormatted(szCommand,"-m=%u ",uMaxSize); - szRemoteFile = szRemoteFile.replace(";","%3B"); - szRemoteFile = szRemoteFile.replace("\"","%22"); + if(uMaxSize > 0)KviTQString::appendFormatted(szCommand,"-m=%u ",uMaxSize); + szRemoteFile = szRemoteFile.tqreplace(";","%3B"); + szRemoteFile = szRemoteFile.tqreplace("\"","%22"); szCommand += "\""+szRemoteFile+"\""; szCommand += " \""; szCommand += szLocalFilePath.ptr(); @@ -1642,7 +1642,7 @@ void KviServerParser::parseCtcpReplyAvatar(KviCtcpMessage *msg) { if(_OUTPUT_VERBOSE) { - KviQString::appendFormatted(textLine, + KviTQString::appendFormatted(textLine, __tr2qs(": No valid local copy of avatar available, requesting one (HTTP GET %s)"), szRemoteFile.utf8().data()); } @@ -1650,19 +1650,19 @@ void KviServerParser::parseCtcpReplyAvatar(KviCtcpMessage *msg) szRemoteFile,msg->pSource->nick(),msg->pSource->username(),msg->pSource->host()); } else { if(_OUTPUT_VERBOSE) - KviQString::appendFormatted(textLine,__tr2qs(": No valid local copy of avatar available; failed to start an HTTP transfer, ignoring")); + KviTQString::appendFormatted(textLine,__tr2qs(": No valid local copy of avatar available; failed to start an HTTP transfer, ignoring")); } } else { if(!checkCtcpFlood(msg)) { if(_OUTPUT_VERBOSE) { - KviQString::appendFormatted(textLine, + KviTQString::appendFormatted(textLine, __tr2qs(": No valid local copy of avatar available, requesting one (DCC GET %s)"), szRemoteFile.utf8().data()); } - QString szFName; + TQString szFName; encodeCtcpParameter(szRemoteFile.utf8().data(),szFName); msg->msg->connection()->sendFmtData("PRIVMSG %s :%cDCC GET %s%c", msg->msg->connection()->encodeText(msg->pSource->nick()).data(),0x01,msg->msg->connection()->encodeText(szFName.utf8().data()).data(),0x01); @@ -1670,12 +1670,12 @@ void KviServerParser::parseCtcpReplyAvatar(KviCtcpMessage *msg) szRemoteFile,msg->pSource->nick(),msg->pSource->username(),msg->pSource->host()); } else { if(_OUTPUT_VERBOSE) - KviQString::appendFormatted(textLine,__tr2qs(": No valid local copy of avatar available; flood limit exceeded, ignoring")); + KviTQString::appendFormatted(textLine,__tr2qs(": No valid local copy of avatar available; flood limit exceeded, ignoring")); } } } else { if(_OUTPUT_VERBOSE) - KviQString::appendFormatted(textLine,__tr2qs(": No valid local copy of avatar available, ignoring")); + KviTQString::appendFormatted(textLine,__tr2qs(": No valid local copy of avatar available, ignoring")); } } } @@ -1683,7 +1683,7 @@ void KviServerParser::parseCtcpReplyAvatar(KviCtcpMessage *msg) if(!e) { if(_OUTPUT_VERBOSE) - KviQString::appendFormatted(textLine,__tr2qs(": No such nickname in the user database, ignoring the change")); + KviTQString::appendFormatted(textLine,__tr2qs(": No such nickname in the user database, ignoring the change")); msg->msg->console()->outputNoFmt(KVI_OUT_AVATAR,textLine); return; } @@ -1691,7 +1691,7 @@ void KviServerParser::parseCtcpReplyAvatar(KviCtcpMessage *msg) if(bResetAvatar)e->setAvatar(avatar); msg->msg->console()->avatarChanged(avatar,msg->pSource->nick(),msg->pSource->user(),msg->pSource->host(), - msg->msg->haltOutput() ? QString::null : textLine); + msg->msg->haltOutput() ? TQString() : textLine); } @@ -1763,7 +1763,7 @@ void KviServerParser::parseCtcpRequestDcc(KviCtcpMessage *msg) { if(!msg->msg->haltOutput()) { - QString decoded = msg->msg->console()->decodeText(p.szType.ptr()); + TQString decoded = msg->msg->console()->decodeText(p.szType.ptr()); msg->msg->console()->output(KVI_OUT_DCCREQUEST, __tr2qs("Processing DCC %Q request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%s %s)"), &decoded,&(msg->pSource->nick()), @@ -1795,20 +1795,20 @@ void KviServerParser::parseCtcpRequestDcc(KviCtcpMessage *msg) void KviServerParser::parseCtcpReplyUserinfo(KviCtcpMessage *msg) { - QString szRemoteFile; - QString szGender; - QString decoded=msg->msg->console()->decodeText(msg->pData); + TQString szRemoteFile; + TQString szGender; + TQString decoded=msg->msg->console()->decodeText(msg->pData); bool bNeedToUpdateUserlist = false; - KviIrcUserEntry * e = msg->msg->connection()->userDataBase()->find(msg->pSource->nick()); + KviIrcUserEntry * e = msg->msg->connection()->userDataBase()->tqfind(msg->pSource->nick()); if(e) { - int pos = decoded.find("Gender=",0,false); + int pos = decoded.tqfind("Gender=",0,false); if(pos>=0) { - QChar c = decoded[pos+7]; - switch(c.unicode()) + TQChar c = decoded[pos+7]; + switch(c.tqunicode()) { case 'F': case 'f': @@ -1826,7 +1826,7 @@ void KviServerParser::parseCtcpReplyUserinfo(KviCtcpMessage *msg) if(bNeedToUpdateUserlist) { - if(KviQString::equalCS(g_pActiveWindow->className(),QString("KviChannel"))) + if(KviTQString::equalCS(g_pActiveWindow->className(),TQString("KviChannel"))) { ((KviChannel*)g_pActiveWindow)->userListView()->updateArea(); } diff --git a/src/kvirc/sparser/kvi_sp_literal.cpp b/src/kvirc/sparser/kvi_sp_literal.cpp index f6a63a5..c86523f 100644 --- a/src/kvirc/sparser/kvi_sp_literal.cpp +++ b/src/kvirc/sparser/kvi_sp_literal.cpp @@ -70,12 +70,12 @@ //#include "kvi_regusersdb.h" //#include "kvi_iconmanager.h" -#include <qdatetime.h> +#include <tqdatetime.h> #ifdef COMPILE_USE_QT4 - #include <QTextDocument> + #include <TQTextDocument> #else - #include <qstylesheet.h> + #include <tqstylesheet.h> #endif extern KviNickServRuleSet * g_pNickServRuleSet; @@ -92,8 +92,8 @@ void KviServerParser::parseLiteralPing(KviIrcMessage *msg) // <optional_prefix> PING :<argument> msg->connection()->sendFmtData("PONG %s",msg->console()->connection()->encodeText(msg->allParams()).data()); - QString szPrefix = msg->connection()->decodeText(msg->safePrefix()); - QString szAllParams = msg->connection()->decodeText(msg->allParams()); + TQString szPrefix = msg->connection()->decodeText(msg->safePrefix()); + TQString szAllParams = msg->connection()->decodeText(msg->allParams()); if(KVS_TRIGGER_EVENT_2_HALTED(KviEvent_OnPing,msg->console(),szPrefix,szAllParams)) msg->setHaltOutput(); @@ -113,8 +113,8 @@ void KviServerParser::parseLiteralPing(KviIrcMessage *msg) void KviServerParser::parseLiteralPong(KviIrcMessage *msg) { - QString szPrefix = msg->connection()->decodeText(msg->safePrefix()); - QString szAllParams = msg->connection()->decodeText(msg->allParams()); + TQString szPrefix = msg->connection()->decodeText(msg->safePrefix()); + TQString szAllParams = msg->connection()->decodeText(msg->allParams()); if(KVS_TRIGGER_EVENT_2_HALTED(KviEvent_OnPong,msg->console(),szPrefix,szAllParams)) msg->setHaltOutput(); @@ -145,8 +145,8 @@ void KviServerParser::parseLiteralError(KviIrcMessage *msg) // <optional_prefix> ERROR :<argument> // ERROR :Closing Link: phoenix.pragmaware.net (Ping timeout) - QString szPrefix = msg->connection()->decodeText(msg->safePrefix()); - QString szParams = msg->connection()->decodeText(msg->allParams()); + TQString szPrefix = msg->connection()->decodeText(msg->safePrefix()); + TQString szParams = msg->connection()->decodeText(msg->allParams()); if(KVS_TRIGGER_EVENT_2_HALTED(KviEvent_OnError,msg->console(),szPrefix,szParams)) msg->setHaltOutput(); @@ -167,12 +167,12 @@ void KviServerParser::parseLiteralError(KviIrcMessage *msg) void KviServerParser::parseLiteralJoin(KviIrcMessage *msg) { // JOIN - // :<joiner_mask> JOIN :<channel> - QString szNick,szUser,szHost; + // :<joiner_tqmask> JOIN :<channel> + TQString szNick,szUser,szHost; msg->decodeAndSplitPrefix(szNick,szUser,szHost); const char * encodedChan = msg->safeTrailing(); - QString channel = msg->connection()->decodeText(encodedChan); + TQString channel = msg->connection()->decodeText(encodedChan); if(channel.isEmpty()) { @@ -184,15 +184,15 @@ void KviServerParser::parseLiteralJoin(KviIrcMessage *msg) // check for extended join syntax. // it is used in splits only (AFAIK) // nick!user@host JOIN :#channel\x07[o|v] - const QChar * pExt = KviQString::nullTerminatedArray(channel); + const TQChar * pExt = KviTQString::nullTerminatedArray(channel); char chExtMode = 0; - while(pExt->unicode() && (pExt->unicode() != 0x07))pExt++; - if(pExt->unicode()) + while(pExt->tqunicode() && (pExt->tqunicode() != 0x07))pExt++; + if(pExt->tqunicode()) { ++pExt; - if(pExt->unicode()) + if(pExt->tqunicode()) { - chExtMode = (char)pExt->unicode(); + chExtMode = (char)pExt->tqunicode(); channel.remove(channel.length() - 2,2); // assuming that we're at the end (we should be) } // else { senseless 0x07 in channel name ? } @@ -229,7 +229,7 @@ void KviServerParser::parseLiteralJoin(KviIrcMessage *msg) if(av) { it->globalData()->setAvatar(av); - console->avatarChanged(av,szNick,szUser,szHost,QString::null); + console->avatarChanged(av,szNick,szUser,szHost,TQString()); } } @@ -262,7 +262,7 @@ void KviServerParser::parseLiteralJoin(KviIrcMessage *msg) } } - // MODE %s b MUST BE THE LAST AUTOMATIC CHANNEL QUERY + // MODE %s b MUST BE THE LAST AUTOMATIC CHANNEL TQUERY // so we get RPL_ENDOFBANLIST as the last reply // and we know that the channel is in sync @@ -319,14 +319,14 @@ void KviServerParser::parseLiteralJoin(KviIrcMessage *msg) } //if(!bisMe) deleted because we can open query with our nick - QString szChans; + TQString szChans; int iChans = msg->connection()->getCommonChannels(szNick,szChans); KviQuery * q = console->connection()->findQuery(szNick); if(q) { if(KVI_OPTION_BOOL(KviOption_boolEnableQueryTracing)) { - q->output(KVI_OUT_QUERYTRACE, + q->output(KVI_OUT_TQUERYTRACE, __tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just joined \r!c\r%Q\r"),&szNick,&szUser, &szHost,&channel); q->notifyCommonChannels(szNick,szUser,szHost,iChans,szChans); @@ -345,11 +345,11 @@ void KviServerParser::parseLiteralJoin(KviIrcMessage *msg) void KviServerParser::parseLiteralPart(KviIrcMessage *msg) { // PART - // :<source_mask> PART <channel> :<part message> - QString szNick,szUser,szHost; + // :<source_tqmask> PART <channel> :<part message> + TQString szNick,szUser,szHost; msg->decodeAndSplitPrefix(szNick,szUser,szHost); - QString szChan = msg->connection()->decodeText(msg->safeParam(0)); + TQString szChan = msg->connection()->decodeText(msg->safeParam(0)); // Now lookup the channel KviConsole * console = msg->console(); @@ -363,7 +363,7 @@ void KviServerParser::parseLiteralPart(KviIrcMessage *msg) } // always decode with the textEncoding of the channel - QString partMsg = msg->paramCount() > 1 ? chan->decodeText(msg->safeTrailing()) : QString::null; + TQString partMsg = msg->paramCount() > 1 ? chan->decodeText(msg->safeTrailing()) : TQString(); if(IS_ME(msg,szNick)) { @@ -416,17 +416,17 @@ void KviServerParser::parseLiteralPart(KviIrcMessage *msg) if(KVI_OPTION_BOOL(KviOption_boolEnableQueryTracing)) { - QString szChans; + TQString szChans; int iChans = console->connection()->getCommonChannels(szNick,szChans); KviQuery * q = console->connection()->findQuery(szNick); if(q) { if(!partMsg.isEmpty()) - q->output(KVI_OUT_QUERYTRACE, + q->output(KVI_OUT_TQUERYTRACE, __tr2qs("\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r: %Q"), &szNick,&szUser,&szHost,&szChan,&partMsg); else - q->output(KVI_OUT_QUERYTRACE, + q->output(KVI_OUT_TQUERYTRACE, __tr2qs("\r!nc\r%Q\r [%Q@\r!h\r%Q\r] has just left \r!c\r%Q\r"), &szNick,&szUser,&szHost,&szChan); q->notifyCommonChannels(szNick,szUser,szHost,iChans,szChans); @@ -437,15 +437,15 @@ void KviServerParser::parseLiteralPart(KviIrcMessage *msg) /////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // -// QUIT +// TQUIT // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////// void KviServerParser::parseLiteralQuit(KviIrcMessage *msg) { - // QUIT - // :<source_mask> QUIT :<quit message> - QString szNick,szUser,szHost; + // TQUIT + // :<source_tqmask> TQUIT :<quit message> + TQString szNick,szUser,szHost; msg->decodeAndSplitPrefix(szNick,szUser,szHost); KviConsole * console = msg->console(); @@ -475,10 +475,10 @@ void KviServerParser::parseLiteralQuit(KviIrcMessage *msg) int diff = ((unsigned int)curTime) - ((unsigned int)ndd->lastNetsplitOnQuitTime()); bool bDuplicate = false; - QString szReason = aux; + TQString szReason = aux; if(diff < 6) { - if(KviQString::equalCI(ndd->lastNetsplitOnQuitReason(),szReason)) + if(KviTQString::equalCI(ndd->lastNetsplitOnQuitReason(),szReason)) { bDuplicate = true; } @@ -492,8 +492,8 @@ void KviServerParser::parseLiteralQuit(KviIrcMessage *msg) KviStr sz1(aux,daSpace - aux); KviStr sz2(daSpace + 1); - QString szD1 = msg->connection()->decodeText(sz1.ptr()); - QString szD2 = msg->connection()->decodeText(sz2.ptr()); + TQString szD1 = msg->connection()->decodeText(sz1.ptr()); + TQString szD2 = msg->connection()->decodeText(sz2.ptr()); if(!KVS_TRIGGER_EVENT_2_HALTED(KviEvent_OnNetsplit,console,szD1,szD2)) { if(!msg->haltOutput()) @@ -508,8 +508,8 @@ void KviServerParser::parseLiteralQuit(KviIrcMessage *msg) if(KviKvsEventManager::instance()->hasAppHandlers(KviEvent_OnQuit)) { // compute the channel list - QString chanlist; - QString szReason = msg->connection()->decodeText(msg->safeTrailing()); + TQString chanlist; + TQString szReason = msg->connection()->decodeText(msg->safeTrailing()); for(KviChannel *daChan=console->channelList()->first();daChan;daChan=console->channelList()->next()) { @@ -541,14 +541,14 @@ void KviServerParser::parseLiteralQuit(KviIrcMessage *msg) { if(!msg->haltOutput()) { - QString quitMsg = c->decodeText(msg->safeTrailing()); + TQString quitMsg = c->decodeText(msg->safeTrailing()); if(bWasSplit) { quitMsg.prepend("NETSPLIT "); } - if(!msg->haltOutput())c->output(KVI_OUT_QUIT, + if(!msg->haltOutput())c->output(KVI_OUT_TQUIT, __tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] has quit IRC: %Q"), &szNick,&szUser,&szHost,&quitMsg); } @@ -560,12 +560,12 @@ void KviServerParser::parseLiteralQuit(KviIrcMessage *msg) KviQuery * q = msg->connection()->findQuery(szNick); if(q) { - QString quitMsg = q->decodeText(msg->safeTrailing()); + TQString quitMsg = q->decodeText(msg->safeTrailing()); if(bWasSplit) { quitMsg.prepend("NETSPLIT "); } - q->output(KVI_OUT_QUIT,__tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] has quit IRC: %Q"), + q->output(KVI_OUT_TQUIT,__tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] has quit IRC: %Q"), &szNick,&szUser,&szHost,&quitMsg); } } @@ -580,12 +580,12 @@ void KviServerParser::parseLiteralQuit(KviIrcMessage *msg) void KviServerParser::parseLiteralKick(KviIrcMessage *msg) { // KICK - // :<source_mask> KICK <channel> <nick> :<kick message> - QString szNick,szUser,szHost; + // :<source_tqmask> KICK <channel> <nick> :<kick message> + TQString szNick,szUser,szHost; msg->decodeAndSplitPrefix(szNick,szUser,szHost); - QString szChan = msg->connection()->decodeText(msg->safeParam(0)); - QString victim = msg->connection()->decodeText(msg->safeParam(1)); + TQString szChan = msg->connection()->decodeText(msg->safeParam(0)); + TQString victim = msg->connection()->decodeText(msg->safeParam(1)); KviConsole * console = msg->console(); KviChannel * chan = msg->connection()->findChannel(szChan); @@ -596,7 +596,7 @@ void KviServerParser::parseLiteralKick(KviIrcMessage *msg) return; } - QString szKickMsg = chan->decodeText(msg->safeTrailing()); + TQString szKickMsg = chan->decodeText(msg->safeTrailing()); if(IS_ME(msg,victim)) { @@ -607,7 +607,7 @@ void KviServerParser::parseLiteralKick(KviIrcMessage *msg) msg->setHaltOutput(); if(!KVI_OPTION_STRING(KviOption_stringOnMeKickedSound).isEmpty()) KviKvsScript::run("snd.play $0",0,new KviKvsVariantList(new KviKvsVariant(KVI_OPTION_STRING(KviOption_stringOnMeKickedSound)))); - QString szPass = chan->channelKey(); + TQString szPass = chan->channelKey(); if(KVI_OPTION_BOOL(KviOption_boolKeepChannelOpenOnKick)) { @@ -637,10 +637,10 @@ void KviServerParser::parseLiteralKick(KviIrcMessage *msg) { if(_OUTPUT_VERBOSE) console->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Attempting to rejoin \r!c\r%Q\r..."),&szChan); - KviQCString szC = msg->connection()->encodeText(szChan); + KviTQCString szC = msg->connection()->encodeText(szChan); if(!szPass.isEmpty()) { - KviQCString szP = msg->connection()->encodeText(szChan); + KviTQCString szP = msg->connection()->encodeText(szChan); msg->connection()->sendFmtData("JOIN %s %s",szC.data(),szP.data()); } else msg->connection()->sendFmtData("JOIN %s",szC.data()); } @@ -651,10 +651,10 @@ void KviServerParser::parseLiteralKick(KviIrcMessage *msg) szNick,szUser,szHost,victim,szKickMsg)) msg->setHaltOutput(); - KviIrcUserEntry * e = msg->connection()->userDataBase()->find(victim); + KviIrcUserEntry * e = msg->connection()->userDataBase()->tqfind(victim); - QString szVHost; - QString szVUser; + TQString szVHost; + TQString szVUser; if(e) { @@ -682,9 +682,9 @@ void KviServerParser::parseLiteralKick(KviIrcMessage *msg) KviQuery * q = console->connection()->findQuery(victim); if(q) { - QString szChans; + TQString szChans; int iChans = console->connection()->getCommonChannels(victim,szChans); - q->output(KVI_OUT_QUERYTRACE, + q->output(KVI_OUT_TQUERYTRACE, __tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] has just been kicked from \r!c\r%Q\r by \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"), &victim,&szVUser,&szVHost,&szChan, &szNick,&szUser,&szHost,&szKickMsg); @@ -711,7 +711,7 @@ void KviServerParser::parseLiteralKick(KviIrcMessage *msg) break; \ default: /* also case KviCryptEngine::DecryptError: */ \ { \ - QString szEngineError = cinf->pEngine->lastError(); \ + TQString szEngineError = cinf->pEngine->lastError(); \ _target->output(KVI_OUT_SYSTEMERROR, \ __tr2qs("The following message appears to be encrypted, but the crypto engine failed to decode it: %Q"), \ &szEngineError); \ @@ -732,11 +732,11 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg) { // PRIVMSG // :source PRIVMSG <target> :<message> - QString szNick,szUser,szHost; + TQString szNick,szUser,szHost; msg->decodeAndSplitPrefix(szNick,szUser,szHost); - QString szTarget = msg->connection()->decodeText(msg->safeParam(0)); - QString szMsg = msg->connection()->decodeText(msg->safeTrailing()); + TQString szTarget = msg->connection()->decodeText(msg->safeParam(0)); + TQString szMsg = msg->connection()->decodeText(msg->safeTrailing()); KviConsole * console = msg->console(); KviRegisteredUser * u = msg->connection()->userDataBase()->registeredUser(szNick,szUser,szHost); @@ -844,7 +844,7 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg) // FIXME: OnSpam ? if(!(msg->haltOutput() || KVI_OPTION_BOOL(KviOption_boolSilentAntiSpam))) { - QString szMsg = msg->connection()->decodeText(msg->safeTrailing()); + TQString szMsg = msg->connection()->decodeText(msg->safeTrailing()); console->output(KVI_OUT_SPAM, __tr2qs("Spam privmsg from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%s\")"), &szNick,&szUser,&szHost,&szMsg,spamWord.ptr()); @@ -861,7 +861,7 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg) // it manually or they can set the option to true at KVIrc startup if(KVI_OPTION_BOOL(KviOption_boolCreateQueryOnPrivmsg)) { - QString szMsg = msg->connection()->decodeText(msg->safeTrailing()); + TQString szMsg = msg->connection()->decodeText(msg->safeTrailing()); // We still want to create it // Give the scripter a chance to filter it out again if(KVS_TRIGGER_EVENT_4_HALTED(KviEvent_OnQueryWindowRequest, @@ -886,9 +886,9 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg) query->userAction(szNick,szUser,szHost,KVI_USERACTION_PRIVMSG); // decrypt the message if needed KviStr szBuffer; const char * txtptr; int msgtype; - DECRYPT_IF_NEEDED(query,msg->safeTrailing(),KVI_OUT_QUERYPRIVMSG,KVI_OUT_QUERYPRIVMSGCRYPTED,szBuffer,txtptr,msgtype) + DECRYPT_IF_NEEDED(query,msg->safeTrailing(),KVI_OUT_TQUERYPRIVMSG,KVI_OUT_TQUERYPRIVMSGCRYPTED,szBuffer,txtptr,msgtype) // trigger the script event and eventually kill the output - QString szMsgText = query->decodeText(txtptr); + TQString szMsgText = query->decodeText(txtptr); if(KVS_TRIGGER_EVENT_4_HALTED(KviEvent_OnQueryMessage,query,szNick,szUser,szHost,szMsgText)) msg->setHaltOutput(); @@ -917,12 +917,12 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg) // don't send the message to the notifier twice iFlags |= KviConsole::NoNotifier; #ifdef COMPILE_USE_QT4 - QString szMsg = Qt::escape(szMsgText); + TQString szMsg = TQt::escape(szMsgText); #else - QString szMsg = QStyleSheet::escape(szMsgText); + TQString szMsg = TQStyleSheet::escape(szMsgText); #endif //debug("kvi_sp_literal.cpp:908 debug: %s",szMsg.data()); - g_pApp->notifierMessage(query,KVI_SMALLICON_QUERYPRIVMSG,szMsg,1800); + g_pApp->notifierMessage(query,KVI_SMALLICON_TQUERYPRIVMSG,szMsg,1800); } } console->outputPrivmsg(query,msgtype,szNick,szUser,szHost,szMsgText,iFlags); @@ -930,7 +930,7 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg) } else { // no query creation: no decryption possible // trigger the query message event in the console - QString szMsgText = msg->connection()->decodeText(msg->safeTrailing()); + TQString szMsgText = msg->connection()->decodeText(msg->safeTrailing()); if(KVS_TRIGGER_EVENT_4_HALTED(KviEvent_OnQueryMessage,console,szNick,szUser,szHost,szMsgText)) msg->setHaltOutput(); @@ -963,7 +963,7 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg) } } - pOut->output(KVI_OUT_QUERYPRIVMSG,"[PRIVMSG \r!nc\r%Q\r]: %Q",&szNick,&szMsgText); + pOut->output(KVI_OUT_TQUERYPRIVMSG,"[PRIVMSG \r!nc\r%Q\r]: %Q",&szNick,&szMsgText); } } } else { @@ -971,8 +971,8 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg) KviChannel * chan = msg->connection()->findChannel(szTarget); - QString szOriginalTarget = szTarget; - QString szPrefixes; + TQString szOriginalTarget = szTarget; + TQString szPrefixes; //Ignore it? if(u) @@ -993,7 +993,7 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg) if(!chan) { // check if the channel has some leading mode prefixes - while((szTarget.length() > 0) && console->connection()->serverInfo()->isSupportedModePrefix(szTarget[0].unicode())) + while((szTarget.length() > 0) && console->connection()->serverInfo()->isSupportedModePrefix(szTarget[0].tqunicode())) { szPrefixes += szTarget[0]; szTarget.remove(0,1); @@ -1005,11 +1005,11 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg) { if(!msg->haltOutput()) { - QString szMsgText = msg->connection()->decodeText(msg->safeTrailing()); + TQString szMsgText = msg->connection()->decodeText(msg->safeTrailing()); KviWindow * pOut = KVI_OPTION_BOOL(KviOption_boolOperatorMessagesToActiveWindow) ? console->activeWindow() : (KviWindow *)(console); - QString broad; - KviQString::sprintf(broad,"[>> %Q] %Q",&szOriginalTarget,&szMsgText); + TQString broad; + KviTQString::sprintf(broad,"[>> %Q] %Q",&szOriginalTarget,&szMsgText); console->outputPrivmsg(pOut,KVI_OUT_BROADCASTPRIVMSG,szNick,szUser,szHost,broad,0); } } else { @@ -1018,7 +1018,7 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg) KviStr szBuffer; const char * txtptr; int msgtype; DECRYPT_IF_NEEDED(chan,msg->safeTrailing(),KVI_OUT_CHANPRIVMSG,KVI_OUT_CHANPRIVMSGCRYPTED,szBuffer,txtptr,msgtype) - QString szMsgText = chan->decodeText(txtptr); + TQString szMsgText = chan->decodeText(txtptr); if(KVS_TRIGGER_EVENT_5_HALTED(KviEvent_OnChannelMessage,chan,szNick,szUser,szHost,szMsgText,szPrefixes)) msg->setHaltOutput(); @@ -1027,8 +1027,8 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg) { if(szPrefixes.length() > 0) { - QString szBroad; - KviQString::sprintf(szBroad,"[>> %Q\r!c\r%Q\r] %Q",&szPrefixes,&szTarget,&szMsgText); + TQString szBroad; + KviTQString::sprintf(szBroad,"[>> %Q\r!c\r%Q\r] %Q",&szPrefixes,&szTarget,&szMsgText); console->outputPrivmsg(chan,msgtype,szNick,szUser,szHost,szBroad,0); } else { console->outputPrivmsg(chan,msgtype,szNick,szUser,szHost,szMsgText,0); @@ -1043,7 +1043,7 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg) { // NOTICE // :source NOTICE <target> :<message> - QString szNick,szUser,szHost; + TQString szNick,szUser,szHost; msg->decodeAndSplitPrefix(szNick,szUser,szHost); KviConsole * console = msg->console(); @@ -1052,11 +1052,11 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg) { if(szUser == "*") { - if(szNick.find('.') != -1) + if(szNick.tqfind('.') != -1) { // server notice // FIXME: "Dedicated window for server notices ?" - QString szMsgText = msg->connection()->decodeText(msg->safeTrailing()); + TQString szMsgText = msg->connection()->decodeText(msg->safeTrailing()); if(KVS_TRIGGER_EVENT_2_HALTED(KviEvent_OnServerNotice,console,szNick,szMsgText)) msg->setHaltOutput(); if(!msg->haltOutput()) @@ -1095,7 +1095,7 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg) } } - QString szTarget = msg->connection()->decodeText(msg->safeParam(0)); + TQString szTarget = msg->connection()->decodeText(msg->safeParam(0)); KviRegisteredUser * u = msg->connection()->userDataBase()->registeredUser(szNick,szUser,szHost); //Ignore it? @@ -1105,7 +1105,7 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg) { if(KVI_OPTION_BOOL(KviOption_boolVerboseIgnore)) { - QString szMsg = msg->connection()->decodeText(msg->safeTrailing()); + TQString szMsg = msg->connection()->decodeText(msg->safeTrailing()); console->output(KVI_OUT_IGNORE,__tr2qs("Ignoring Notice from \r!nc\r%Q\r [%Q@\r!h\r%Q\r]: %Q"),&szNick,&szUser,&szHost,&szMsg); } return; @@ -1117,9 +1117,9 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg) { // FIXME: "The NickServ and ChanServ handling should be optional!" - if(KviQString::equalCI(szNick,"NickServ")) + if(KviTQString::equalCI(szNick,"NickServ")) { - QString szMsgText = msg->connection()->decodeText(msg->safeTrailing()); + TQString szMsgText = msg->connection()->decodeText(msg->safeTrailing()); if(KVS_TRIGGER_EVENT_4_HALTED(KviEvent_OnNickServNotice,console,szNick,szUser,szHost,szMsgText)) msg->setHaltOutput(); @@ -1171,9 +1171,9 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg) return; } - if(KviQString::equalCI(szNick,"ChanServ")) + if(KviTQString::equalCI(szNick,"ChanServ")) { - QString szMsgText = msg->connection()->decodeText(msg->safeTrailing()); + TQString szMsgText = msg->connection()->decodeText(msg->safeTrailing()); if(KVS_TRIGGER_EVENT_4_HALTED(KviEvent_OnChanServNotice,console,szNick,szUser,szHost,szMsgText)) msg->setHaltOutput(); if(!msg->haltOutput()) @@ -1211,8 +1211,8 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg) if(!(msg->haltOutput() || KVI_OPTION_BOOL(KviOption_boolSilentAntiSpam))) { - QString szMsgText = msg->connection()->decodeText(msg->safeTrailing()); - QString szSpamWord = spamWord.ptr(); + TQString szMsgText = msg->connection()->decodeText(msg->safeTrailing()); + TQString szSpamWord = spamWord.ptr(); console->output(KVI_OUT_SPAM,__tr2qs("Spam notice from \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q (matching spamword \"%Q\")"), &szNick,&szUser,&szHost,&szMsgText,&szSpamWord); } @@ -1228,7 +1228,7 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg) // it manually or they can set the option to true at KVIrc startup if(KVI_OPTION_BOOL(KviOption_boolCreateQueryOnNotice)) { - QString szMsgText = msg->connection()->decodeText(msg->safeTrailing()); + TQString szMsgText = msg->connection()->decodeText(msg->safeTrailing()); // We still want to create it // Give the scripter a chance to filter it out again if(KVS_TRIGGER_EVENT_4_HALTED(KviEvent_OnQueryWindowRequest,console,szNick,szUser,szHost,szMsgText)) @@ -1252,8 +1252,8 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg) query->userAction(szNick,szUser,szHost,KVI_USERACTION_NOTICE); // decrypt it if needed KviStr szBuffer; const char * txtptr; int msgtype; - DECRYPT_IF_NEEDED(query,msg->safeTrailing(),KVI_OUT_QUERYNOTICE,KVI_OUT_QUERYNOTICECRYPTED,szBuffer,txtptr,msgtype) - QString szMsgText = query->decodeText(txtptr); + DECRYPT_IF_NEEDED(query,msg->safeTrailing(),KVI_OUT_TQUERYNOTICE,KVI_OUT_TQUERYNOTICECRYPTED,szBuffer,txtptr,msgtype) + TQString szMsgText = query->decodeText(txtptr); // trigger the script event and eventually kill the output if(KVS_TRIGGER_EVENT_4_HALTED(KviEvent_OnQueryNotice,query,szNick,szUser,szHost,szMsgText)) msg->setHaltOutput(); @@ -1275,19 +1275,19 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg) // don't send the message twice to the notifier iFlags |= KviConsole::NoNotifier; #ifdef COMPILE_USE_QT4 - QString szMsg = Qt::escape(szMsgText); + TQString szMsg = TQt::escape(szMsgText); #else - QString szMsg = QStyleSheet::escape(szMsgText); + TQString szMsg = TQStyleSheet::escape(szMsgText); #endif //debug("kvi_sp_literal.cpp:908 debug: %s",szMsg.data()); - g_pApp->notifierMessage(query,KVI_SMALLICON_QUERYNOTICE,szMsg,1800); + g_pApp->notifierMessage(query,KVI_SMALLICON_TQUERYNOTICE,szMsg,1800); } } console->outputPrivmsg(query,msgtype,szNick,szUser,szHost,szMsgText,iFlags); } } else { - QString szMsgText = msg->connection()->decodeText(msg->safeTrailing()); + TQString szMsgText = msg->connection()->decodeText(msg->safeTrailing()); // no query creation: no decryption possible // trigger the query message event in the console if(KVS_TRIGGER_EVENT_4_HALTED(KviEvent_OnQueryNotice,console,szNick,szUser,szHost,szMsgText)) @@ -1313,7 +1313,7 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg) } } - pOut->output(KVI_OUT_QUERYNOTICE,"*\r!n\r%Q\r* %Q",&szNick,&szMsgText); + pOut->output(KVI_OUT_TQUERYNOTICE,"*\r!n\r%Q\r* %Q",&szNick,&szMsgText); } } return; @@ -1322,13 +1322,13 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg) // Channel NOTICE KviChannel * chan = msg->connection()->findChannel(szTarget); - QString szOriginalTarget = szTarget; - QString szPrefixes; + TQString szOriginalTarget = szTarget; + TQString szPrefixes; if(!chan) { // check if the channel has some leading mode prefixes - while((szTarget.length() > 0) && console->connection()->serverInfo()->isSupportedModePrefix(szTarget[0].unicode())) + while((szTarget.length() > 0) && console->connection()->serverInfo()->isSupportedModePrefix(szTarget[0].tqunicode())) { szPrefixes += szTarget[0]; szTarget.remove(0,1); @@ -1342,9 +1342,9 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg) { KviWindow * pOut = KVI_OPTION_BOOL(KviOption_boolOperatorMessagesToActiveWindow) ? console->activeWindow() : (KviWindow *)(console); - QString szBroad; - QString szMsgText = msg->connection()->decodeText(msg->safeTrailing()); - KviQString::sprintf(szBroad,"[>> %Q] %Q",&szOriginalTarget,&szMsgText); + TQString szBroad; + TQString szMsgText = msg->connection()->decodeText(msg->safeTrailing()); + KviTQString::sprintf(szBroad,"[>> %Q] %Q",&szOriginalTarget,&szMsgText); console->outputPrivmsg(pOut,KVI_OUT_BROADCASTNOTICE,szNick,szUser,szHost,szBroad,0); return; } @@ -1353,7 +1353,7 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg) KviStr szBuffer; const char * txtptr; int msgtype; DECRYPT_IF_NEEDED(chan,msg->safeTrailing(),KVI_OUT_CHANNELNOTICE,KVI_OUT_CHANNELNOTICECRYPTED,szBuffer,txtptr,msgtype) - QString szMsgText = chan->decodeText(txtptr); + TQString szMsgText = chan->decodeText(txtptr); if(KVS_TRIGGER_EVENT_3_HALTED(KviEvent_OnChannelNotice,chan,szNick,szMsgText,szOriginalTarget))msg->setHaltOutput(); @@ -1361,8 +1361,8 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg) { if(szPrefixes.length() > 0) { - QString szBroad; - KviQString::sprintf(szBroad,"[>> %Q\r!c\r%Q\r] %Q",&szPrefixes,&szTarget,&szMsgText); + TQString szBroad; + KviTQString::sprintf(szBroad,"[>> %Q\r!c\r%Q\r] %Q",&szPrefixes,&szTarget,&szMsgText); console->outputPrivmsg(chan,msgtype,szNick,szUser,szHost,szBroad,0); } else { console->outputPrivmsg(chan,msgtype,szNick,szUser,szHost,szMsgText,0); @@ -1381,10 +1381,10 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg) void KviServerParser::parseLiteralTopic(KviIrcMessage *msg) { // TOPIC - // :<source_mask> TOPIC <channel> :<topic> - QString szNick,szUser,szHost; + // :<source_tqmask> TOPIC <channel> :<topic> + TQString szNick,szUser,szHost; msg->decodeAndSplitPrefix(szNick,szUser,szHost); - QString szTarget = msg->connection()->decodeText(msg->safeParam(0)); + TQString szTarget = msg->connection()->decodeText(msg->safeParam(0)); // Now lookup the channel KviChannel * chan = msg->connection()->findChannel(szTarget); @@ -1395,14 +1395,14 @@ void KviServerParser::parseLiteralTopic(KviIrcMessage *msg) return; } - QString szTopic = chan->decodeText(msg->safeTrailing()); + TQString szTopic = chan->decodeText(msg->safeTrailing()); if(KVS_TRIGGER_EVENT_4_HALTED(KviEvent_OnTopic,chan,szNick,szUser,szHost,szTopic)) msg->setHaltOutput(); chan->topicWidget()->setTopic(szTopic); chan->topicWidget()->setTopicSetBy(szNick); - QString tmp = QDateTime::currentDateTime().toString(); + TQString tmp = TQDateTime::tqcurrentDateTime().toString(); chan->topicWidget()->setTopicSetAt(tmp); chan->userAction(szNick,szUser,szHost,KVI_USERACTION_TOPIC); @@ -1419,10 +1419,10 @@ void KviServerParser::parseLiteralNick(KviIrcMessage *msg) { // NICK // :source NICK <newnick> - QString szNick,szUser,szHost; + TQString szNick,szUser,szHost; msg->decodeAndSplitPrefix(szNick,szUser,szHost); KviConsole * console = msg->console(); - QString szNewNick = msg->connection()->decodeText(msg->safeTrailing()); + TQString szNewNick = msg->connection()->decodeText(msg->safeTrailing()); bool bIsMe = IS_ME(msg,szNick); @@ -1465,21 +1465,21 @@ void KviServerParser::parseLiteralNick(KviIrcMessage *msg) } KviQuery * q = console->connection()->findQuery(szNick); // It CAN happen that szNewNick first queries us without being - // on any channel then he QUITS , he reconnects , he joins + // on any channel then he TQUITS , he reconnects , he joins // a channel with szNick , queries us and changes nick to szNewNick : gotcha! // should merge the queries! KviQuery * old = console->connection()->findQuery(szNewNick); if(old && (old != q)) { - if(KVI_OPTION_BOOL(KviOption_boolEnableQueryTracing) && (!_OUTPUT_QUIET)) + if(KVI_OPTION_BOOL(KviOption_boolEnableQueryTracing) && (!_OUTPUT_TQUIET)) { - old->output(KVI_OUT_QUERYTRACE, + old->output(KVI_OUT_TQUERYTRACE, __tr2qs("The target of this query was lost and has been found when \r!n\r%Q\r [%Q@\r!h\r%Q\r] changed his nickname to \r!n\r%Q\r"), &szNick,&szUser,&szHost,&szNewNick); } if(q) { - bool bQWasActive = (q == g_pActiveWindow); + bool bTQWasActive = (q == g_pActiveWindow); if(!_OUTPUT_MUTE) { old->output(KVI_OUT_SYSTEMWARNING, @@ -1494,11 +1494,11 @@ void KviServerParser::parseLiteralNick(KviIrcMessage *msg) if(!_OUTPUT_MUTE) old->output(KVI_OUT_SYSTEMWARNING,__tr2qs("End of merged output")); old->userAction(szNewNick,szUser,szHost,KVI_USERACTION_NICK); - if(bQWasActive)old->delayedAutoRaise(); + if(bTQWasActive)old->delayedAutoRaise(); } if(KVI_OPTION_BOOL(KviOption_boolEnableQueryTracing)) { - QString szChans; + TQString szChans; int iChans = console->connection()->getCommonChannels(szNewNick,szChans); old->notifyCommonChannels(szNewNick,szUser,szHost,iChans,szChans); } @@ -1522,11 +1522,11 @@ void KviServerParser::parseLiteralInvite(KviIrcMessage *msg) { // INVITE // :source INVITE <target> <channel> - QString szNick,szUser,szHost; + TQString szNick,szUser,szHost; msg->decodeAndSplitPrefix(szNick,szUser,szHost); - QString szTarget = msg->connection()->decodeText(msg->safeParam(0)); - QString szChannel = msg->connection()->decodeText(msg->safeParam(1)); + TQString szTarget = msg->connection()->decodeText(msg->safeParam(0)); + TQString szChannel = msg->connection()->decodeText(msg->safeParam(1)); KviConsole * console = msg->console(); KviRegisteredUser * u = msg->connection()->userDataBase()->registeredUser(szNick,szUser,szHost); @@ -1552,7 +1552,7 @@ void KviServerParser::parseLiteralInvite(KviIrcMessage *msg) { KviWindow * pOut = KVI_OPTION_BOOL(KviOption_boolInvitesToActiveWindow) ? msg->console()->activeWindow() : (KviWindow *)(msg->console()); - QString szAction = KVI_OPTION_BOOL(KviOption_boolAutoJoinOnInvite) ? __tr2qs("autojoining") : __tr2qs("double-click the channel name to join"); + TQString szAction = KVI_OPTION_BOOL(KviOption_boolAutoJoinOnInvite) ? __tr2qs("autojoining") : __tr2qs("double-click the channel name to join"); pOut->output(KVI_OUT_INVITE,__tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] invites you to channel \r!c\r%Q\r (%Q)"), &szNick,&szUser,&szHost,&szChannel,&szAction); } @@ -1569,10 +1569,10 @@ void KviServerParser::parseLiteralWallops(KviIrcMessage *msg) { // WALLOPS // :source WALLOPS :msg - QString szNick,szUser,szHost; + TQString szNick,szUser,szHost; msg->decodeAndSplitPrefix(szNick,szUser,szHost); - QString szMsg = msg->connection()->decodeText(msg->safeTrailing()); + TQString szMsg = msg->connection()->decodeText(msg->safeTrailing()); if(KVS_TRIGGER_EVENT_4_HALTED(KviEvent_OnWallops,msg->console(),szNick,szUser,szHost,szMsg)) msg->setHaltOutput(); @@ -1607,8 +1607,8 @@ void KviServerParser::parseUserMode(KviIrcMessage *msg,const char * modeflptr) // There was a mode change if(KviKvsEventManager::instance()->hasAppHandlers(KviEvent_OnUserMode)) { - QString szModeFlag(bSet ? QChar('+') : QChar('-')); - szModeFlag += QChar(*modeflptr); + TQString szModeFlag(bSet ? TQChar('+') : TQChar('-')); + szModeFlag += TQChar(*modeflptr); KviKvsVariantList vList(new KviKvsVariant(szModeFlag)); if(KviKvsEventManager::instance()->trigger(KviEvent_OnUserMode,msg->console(),&vList)) msg->setHaltOutput(); @@ -1628,17 +1628,17 @@ void KviServerParser::parseLiteralMode(KviIrcMessage *msg) // :source MODE target <params> // :source MODE <me> +|-modeflag // :source MODE <channel> +-modeflags [parameters] - QString szNick,szUser,szHost; + TQString szNick,szUser,szHost; msg->decodeAndSplitPrefix(szNick,szUser,szHost); // if(!source.hasHost()) // { // // This is a server or a channel service // KviStr snick = source.nick(); - // if(snick.contains('.'))source.setHost(source.nick()); // this is a server + // if(snick.tqcontains('.'))source.setHost(source.nick()); // this is a server // } - QString szTarget = msg->connection()->decodeText(msg->safeParam(0)); + TQString szTarget = msg->connection()->decodeText(msg->safeParam(0)); KviStr modefl(msg->safeParam(1)); if(IS_ME(msg,szTarget)) @@ -1661,34 +1661,34 @@ void KviServerParser::parseLiteralMode(KviIrcMessage *msg) } } -void KviServerParser::parseChannelMode(const QString &szNick,const QString &szUser,const QString &szHost,KviChannel * chan,KviStr &modefl,KviIrcMessage *msg,int curParam) +void KviServerParser::parseChannelMode(const TQString &szNick,const TQString &szUser,const TQString &szHost,KviChannel * chan,KviStr &modefl,KviIrcMessage *msg,int curParam) { // FIXME: freenode has two ugly incompatible extensions: // mode e: that is NOT viewable (???) // mode q that stands for "quiet-ban" - // mode #chan +q mask - // adds mask to the banlist with the prefix % - // and doesn't allow the users matching the mask to talk to the channel + // mode #chan +q tqmask + // adds tqmask to the banlist with the prefix % + // and doesn't allow the users matching the tqmask to talk to the channel bool bSet = true; const char * aux = modefl.ptr(); - QString aParam; + TQString aParam; - QString nickBuffer; - QString hostBuffer; + TQString nickBuffer; + TQString hostBuffer; if(szHost != "*") { - KviQString::sprintf(nickBuffer,"\r!n\r%Q\r",&szNick); - KviQString::sprintf(hostBuffer,"\r!h\r%Q\r",&szHost); + KviTQString::sprintf(nickBuffer,"\r!n\r%Q\r",&szNick); + KviTQString::sprintf(hostBuffer,"\r!h\r%Q\r",&szHost); } else { - if(nickBuffer.find('.') != -1) + if(nickBuffer.tqfind('.') != -1) { // This looks a lot like a server! - KviQString::sprintf(nickBuffer,"\r!s\r%Q\r",&szNick); + KviTQString::sprintf(nickBuffer,"\r!s\r%Q\r",&szNick); } else { // Probably a service....whois should work - KviQString::sprintf(nickBuffer,"\r!n\r%Q\r",&szNick); + KviTQString::sprintf(nickBuffer,"\r!n\r%Q\r",&szNick); } hostBuffer = szHost; } @@ -1800,7 +1800,7 @@ void KviServerParser::parseChannelMode(const QString &szNick,const QString &szUs #define CHANNEL_MODE(__modefl,__evmeset,__evmeunset,__evset,__evunset,__icomeset,__icomeunset,__icoset,__icounset) \ case __modefl: \ aParam = msg->connection()->decodeText(msg->safeParam(curParam++)); \ - chan->setMask(*aux,aParam,bSet,msg->connection()->decodeText(msg->safePrefix()),QDateTime::currentDateTime().toTime_t()); \ + chan->setMask(*aux,aParam,bSet,msg->connection()->decodeText(msg->safePrefix()),TQDateTime::tqcurrentDateTime().toTime_t()); \ auxMask = new KviIrcMask(aParam); \ bIsMe = auxMask->matchesFixed( \ msg->connection()->userInfo()->nickName(), \ @@ -1840,8 +1840,8 @@ void KviServerParser::parseChannelMode(const QString &szNick,const QString &szUs ++aux; } - QString param; - QString params; + TQString param; + TQString params; param = msg->connection()->decodeText(msg->safeParam(curParamSave++)); while(!param.isEmpty()) { diff --git a/src/kvirc/sparser/kvi_sp_numeric.cpp b/src/kvirc/sparser/kvi_sp_numeric.cpp index a4481e8..4b71c36 100644 --- a/src/kvirc/sparser/kvi_sp_numeric.cpp +++ b/src/kvirc/sparser/kvi_sp_numeric.cpp @@ -51,18 +51,18 @@ #include "kvi_lagmeter.h" #include "kvi_qcstring.h" -#include <qpixmap.h> -#include <qdatetime.h> -#include <qtextcodec.h> -#include <qregexp.h> +#include <tqpixmap.h> +#include <tqdatetime.h> +#include <tqtextcodec.h> +#include <tqregexp.h> #include "kvi_kvs_eventtriggers.h" #include "kvi_kvs_script.h" #include "kvi_kvs_variantlist.h" // #define IS_CHANNEL_TYPE_FLAG(_str) ((*(_str) == '#') || (*(_str) == '&') || (*(_str) == '!')) -#define IS_CHANNEL_TYPE_FLAG(_qchar) (msg->connection()->serverInfo()->supportedChannelTypes().find(_qchar) != -1) -#define IS_USER_MODE_PREFIX(_qchar) (msg->connection()->serverInfo()->supportedModePrefixes().find(_qchar) != -1) +#define IS_CHANNEL_TYPE_FLAG(_qchar) (msg->connection()->serverInfo()->supportedChannelTypes().tqfind(_qchar) != -1) +#define IS_USER_MODE_PREFIX(_qchar) (msg->connection()->serverInfo()->supportedModePrefixes().tqfind(_qchar) != -1) // Numeric message handlers @@ -72,13 +72,13 @@ void KviServerParser::parseNumeric001(KviIrcMessage *msg) { // 001: RPL_WELCOME - // :prefix 001 target :Welcome to the Internet Relay Network <usermask> + // :prefix 001 target :Welcome to the Internet Relay Network <usertqmask> // FIXME: #warning "SET THE USERMASK FROM SERVER" - QString szText = msg->connection()->decodeText(msg->safeTrailing()); - QRegExp rx( " ([^ ]+)!([^ ]+)@([^ ]+)$" ); + TQString szText = msg->connection()->decodeText(msg->safeTrailing()); + TQRegExp rx( " ([^ ]+)!([^ ]+)@([^ ]+)$" ); if( rx.search(szText) != -1) { - msg->connection()->userInfo()->setUnmaskedHostName(rx.cap(3)); + msg->connection()->userInfo()->setUntqmaskedHostName(rx.cap(3)); msg->connection()->userInfo()->setNickName(rx.cap(1)); msg->connection()->userInfoReceived(rx.cap(2),rx.cap(3)); } @@ -126,7 +126,7 @@ void KviServerParser::parseNumeric004(KviIrcMessage *msg) do { umodes = msg->safeParam(uModeParam); - } while (((umodes.contains('.')) || (umodes.contains('-'))) && uModeParam++ < uParams); + } while (((umodes.tqcontains('.')) || (umodes.tqcontains('-'))) && uModeParam++ < uParams); KviStr chanmodes = msg->safeParam(uModeParam+1); @@ -139,9 +139,9 @@ void KviServerParser::parseNumeric004(KviIrcMessage *msg) if((umodes.occurences('o') != 1) || (chanmodes.occurences('o') != 1) || (chanmodes.occurences('b') != 1) || (chanmodes.occurences('v') != 1) || (chanmodes.occurences('t') != 1) || (chanmodes.occurences('n') != 1) || - (chanmodes.contains('.')) || (chanmodes.contains('-')) || (chanmodes.contains('('))) + (chanmodes.tqcontains('.')) || (chanmodes.tqcontains('-')) || (chanmodes.tqcontains('('))) { - if(!_OUTPUT_QUIET) + if(!_OUTPUT_TQUIET) { msg->console()->output(KVI_OUT_SYSTEMWARNING,__tr2qs( "One or more standard mode flags are missing in the server available modes.\n" \ @@ -159,15 +159,15 @@ void KviServerParser::parseNumeric004(KviIrcMessage *msg) if(umodes.hasData())msg->console()->outputNoFmt(KVI_OUT_SERVERINFO,__tr2qs("Available user modes:")); const char * aux = umodes.ptr(); - QString tmp; + TQString tmp; while(*aux) { tmp = msg->connection()->serverInfo()->getUserModeDescription(*aux); if(tmp.isEmpty()) { - QString tmp2 = __tr2qs(": Unknown user mode"); - KviQString::sprintf(tmp,"%c: %Q",*aux,&tmp2); + TQString tmp2 = __tr2qs(": Unknown user mode"); + KviTQString::sprintf(tmp,"%c: %Q",*aux,&tmp2); } msg->console()->outputNoFmt(KVI_OUT_SERVERINFO,tmp); @@ -180,13 +180,13 @@ void KviServerParser::parseNumeric004(KviIrcMessage *msg) while(*aux) { - KviQString::sprintf(tmp,"%c: %Q",*aux,&(msg->connection()->serverInfo()->getChannelModeDescription(*aux))); + KviTQString::sprintf(tmp,"%c: %Q",*aux,&(msg->connection()->serverInfo()->getChannelModeDescription(*aux))); msg->console()->outputNoFmt(KVI_OUT_SERVERINFO,tmp); aux++; } } - QString szServer = msg->connection()->decodeText(msg->safeParam(1)); + TQString szServer = msg->connection()->decodeText(msg->safeParam(1)); msg->connection()->serverInfoReceived(szServer,umodes.ptr(),chanmodes.ptr()); @@ -246,7 +246,7 @@ void KviServerParser::parseNumeric005(KviIrcMessage *msg) } else if(kvi_strEqualCIN("TOPICLEN=",p,9)) { p += 9; - QString tmp = p; + TQString tmp = p; if(!tmp.isEmpty()) { bool ok; int len = tmp.toInt( &ok ); @@ -255,7 +255,7 @@ void KviServerParser::parseNumeric005(KviIrcMessage *msg) } else if(kvi_strEqualCIN("NETWORK=",p,8)) { p += 8; - QString tmp = p; + TQString tmp = p; if(!tmp.isEmpty())msg->console()->connection()->target()->setNetworkName(tmp); if((!_OUTPUT_MUTE) && (!msg->haltOutput()) && KVI_OPTION_BOOL(KviOption_boolShowExtendedServerInfo)) { @@ -274,12 +274,12 @@ void KviServerParser::parseNumeric005(KviIrcMessage *msg) } else if(kvi_strEqualCIN("CHANMODES=",p,10)) { p+=10; - QString tmp = p; + TQString tmp = p; msg->connection()->serverInfo()->setSupportedChannelModes(tmp); }else if(kvi_strEqualCIN("MODES=",p,6)) { p+=6; - QString tmp = p; + TQString tmp = p; bool bok; int num=tmp.toUInt(&bok); if(bok) @@ -295,7 +295,7 @@ void KviServerParser::parseNumeric005(KviIrcMessage *msg) }else if(kvi_strEqualCIN("CHARSET=",p,8)) { p+=8; - QString tmp = p; + TQString tmp = p; msg->connection()->serverInfo()->setSupportsCodePages(true); if((!_OUTPUT_MUTE) && (!msg->haltOutput()) && KVI_OPTION_BOOL(KviOption_boolShowExtendedServerInfo)) @@ -303,7 +303,7 @@ void KviServerParser::parseNumeric005(KviIrcMessage *msg) msg->console()->outputNoFmt(KVI_OUT_SERVERINFO,__tr2qs("This server supports the CODEPAGE command, it will be used")); } - /*if( tmp.contains(msg->console()->textCodec()->name(),false) || tmp.contains("*",false) ) + /*if( tmp.tqcontains(msg->console()->textCodec()->name(),false) || tmp.tqcontains("*",false) ) { msg->connection()->sendFmtData("CODEPAGE %s",msg->console()->textCodec()->name()); }*/ @@ -322,7 +322,7 @@ void KviServerParser::parseNumeric005(KviIrcMessage *msg) } } } else { - QString inf = msg->connection()->decodeText(msg->safeTrailing()); + TQString inf = msg->connection()->decodeText(msg->safeTrailing()); if(!msg->haltOutput())msg->console()->outputNoFmt(KVI_OUT_SERVERINFO,inf); } // } else { @@ -356,7 +356,7 @@ void KviServerParser::parseNumericEndOfNames(KviIrcMessage *msg) { // 366: RPL_ENDOFNAMES [I,E,U,D] // :prefix 366 target <channel> :End of /NAMES list. - QString szChan = msg->connection()->decodeText(msg->safeParam(1)); + TQString szChan = msg->connection()->decodeText(msg->safeParam(1)); KviChannel * chan = msg->connection()->findChannel(szChan); if(chan) { @@ -380,10 +380,10 @@ void KviServerParser::parseNumeric020(KviIrcMessage *msg) { // 020: RPL_CONNECTING //:irc.dotsrc.org 020 * :Please wait while we process your connection. - QString szServer; + TQString szServer; if(!msg->haltOutput()) { - QString szWText = msg->console()->decodeText(msg->safeTrailing()); + TQString szWText = msg->console()->decodeText(msg->safeTrailing()); msg->console()->output( KVI_OUT_CONNECTION,"%c\r!s\r%s\r%c: %Q",KVI_TEXT_BOLD, msg->safePrefix(),KVI_TEXT_BOLD,&szWText); @@ -398,8 +398,8 @@ void KviServerParser::parseNumericNames(KviIrcMessage *msg) // [=|*|@] is the type of the channel: // = --> public * --> private @ --> secret // ...but we ignore it - //QString szChan = msg->connection()->decodeText(msg->cSafeParam(2)->data()); // <-- KviQCString::data() is implicitly unsafe: it CAN return 0 - QString szChan = msg->connection()->decodeText(msg->safeParam(2)); + //TQString szChan = msg->connection()->decodeText(msg->cSafeParam(2)->data()); // <-- KviTQCString::data() is implicitly unsafe: it CAN return 0 + TQString szChan = msg->connection()->decodeText(msg->safeParam(2)); KviChannel * chan = msg->connection()->findChannel(szChan); // and run to the first nickname char * aux = msg->safeTrailingString().ptr(); @@ -442,11 +442,11 @@ void KviServerParser::parseNumericNames(KviIrcMessage *msg) char save = *aux; *aux = 0; // NAMESX + UHNAMES support - KviIrcMask mask(msg->connection()->decodeText(begin)); + KviIrcMask tqmask(msg->connection()->decodeText(begin)); // and make it join - if(!mask.nick().isEmpty())chan->join(mask.nick(), - mask.hasUser() ? mask.user() : QString::null, - mask.hasHost() ? mask.host() : QString::null, + if(!tqmask.nick().isEmpty())chan->join(tqmask.nick(), + tqmask.hasUser() ? tqmask.user() : TQString(), + tqmask.hasHost() ? tqmask.host() : TQString(), iFlags); *aux = ' '; *aux = save; @@ -468,7 +468,7 @@ void KviServerParser::parseNumericNames(KviIrcMessage *msg) // FIXME: #warning "KVI_OUT_NAMES missing" KviWindow * pOut = chan ? chan : KVI_OPTION_BOOL(KviOption_boolServerRepliesToActiveWindow) ? msg->console()->activeWindow() : (KviWindow *)(msg->console()); - QString szTrailing = trailing ? msg->connection()->decodeText(trailing) : QString(""); + TQString szTrailing = trailing ? msg->connection()->decodeText(trailing) : TQString(""); pOut->output(KVI_OUT_UNHANDLED,__tr2qs("Names for \r!c\r%Q\r: %Q"),&szChan,&szTrailing); } } @@ -477,11 +477,11 @@ void KviServerParser::parseNumericTopic(KviIrcMessage *msg) { // 332: RPL_TOPIC [I,E,U,D] // :prefix 332 target <channel> :<topic> - QString szChan = msg->connection()->decodeText(msg->safeParam(1)); + TQString szChan = msg->connection()->decodeText(msg->safeParam(1)); KviChannel * chan = msg->connection()->findChannel(szChan); if(chan) { - QString szTopic = chan->decodeText(msg->safeTrailing()); + TQString szTopic = chan->decodeText(msg->safeTrailing()); chan->topicWidget()->setTopic(szTopic); chan->topicWidget()->setTopicSetBy(__tr2qs("(unknown)")); @@ -494,7 +494,7 @@ void KviServerParser::parseNumericTopic(KviIrcMessage *msg) KviWindow * pOut = KVI_OPTION_BOOL(KviOption_boolServerRepliesToActiveWindow) ? msg->console()->activeWindow() : (KviWindow *)(msg->console()); - QString szTopic = msg->connection()->decodeText(msg->safeTrailing()); + TQString szTopic = msg->connection()->decodeText(msg->safeTrailing()); pOut->output(KVI_OUT_TOPIC,__tr2qs("Topic for \r!c\r%Q\r is: %Q"), &szChan,&szTopic); } @@ -505,7 +505,7 @@ void KviServerParser::parseNumericNoTopic(KviIrcMessage *msg) { // 331: RPL_NOTOPIC [I,E,U,D] // :prefix 331 target <channel> :No topic is set - QString szChan = msg->connection()->decodeText(msg->safeParam(1)); + TQString szChan = msg->connection()->decodeText(msg->safeParam(1)); KviChannel * chan = msg->connection()->findChannel(szChan); if(chan) { @@ -528,7 +528,7 @@ void KviServerParser::parseNumericTopicWhoTime(KviIrcMessage *msg) // 333: RPL_TOPICWHOTIME [e,U,D] // :prefix 333 target <channel> <whoset> <time> - QString szChan = msg->connection()->decodeText(msg->safeParam(1)); + TQString szChan = msg->connection()->decodeText(msg->safeParam(1)); KviChannel * chan = msg->connection()->findChannel(szChan); KviStr tmp = msg->safeParam(3); @@ -536,18 +536,18 @@ void KviServerParser::parseNumericTopicWhoTime(KviIrcMessage *msg) unsigned long t = 0; if(tmp.hasData())t = tmp.toUInt(&bOk); - QDateTime dt; + TQDateTime dt; dt.setTime_t(t); - QString szDate = dt.toString(); - QString szWho = msg->connection()->decodeText(msg->safeParam(2)); + TQString szDate = dt.toString(); + TQString szWho = msg->connection()->decodeText(msg->safeParam(2)); KviIrcMask who(szWho); - QString szDisplayableWho; + TQString szDisplayableWho; if( !(who.hasUser() && who.hasHost()) ) { szDisplayableWho="\r!n\r"+szWho+"\r"; } else { - KviQString::sprintf(szDisplayableWho,"\r!n\r%Q\r!%Q@\r!h\r%Q\r",&(who.nick()),&(who.user()),&(who.host())); + KviTQString::sprintf(szDisplayableWho,"\r!n\r%Q\r!%Q@\r!h\r%Q\r",&(who.nick()),&(who.user()),&(who.host())); } if(chan) { @@ -579,8 +579,8 @@ void KviServerParser::parseNumericChannelModeIs(KviIrcMessage *msg) { // 324: RPL_CHANNELMODEIS [I,E,U,D] // :prefix 324 target <channel> +<chanmode> - QString szSource = msg->connection()->decodeText(msg->safePrefix()); - QString szChan = msg->connection()->decodeText(msg->safeParam(1)); + TQString szSource = msg->connection()->decodeText(msg->safePrefix()); + TQString szChan = msg->connection()->decodeText(msg->safeParam(1)); KviChannel * chan = msg->connection()->findChannel(szChan); KviStr modefl = msg->safeParam(2); if(chan)parseChannelMode(szSource,"*","*",chan,modefl,msg,3); @@ -598,22 +598,22 @@ void KviServerParser::parseNumericChannelModeIs(KviIrcMessage *msg) } } -void getDateTimeStringFromCharTimeT(QString &buffer,const char *time_t_string) +void getDateTimeStringFromCharTimeT(TQString &buffer,const char *time_t_string) { KviStr tmp=time_t_string; bool bOk=false; unsigned int uTime = tmp.toUInt(&bOk); if(bOk){ - QDateTime dt; + TQDateTime dt; dt.setTime_t(uTime); buffer = dt.toString(); } else buffer = __tr2qs("(Unknown)"); } -#define PARSE_NUMERIC_ENDOFLIST(__funcname,__setGotIt,__didSendRequest,__setDone,__daicon,__szWhatQString) \ +#define PARSE_NUMERIC_ENDOFLIST(__funcname,__setGotIt,__didSendRequest,__setDone,__daicon,__szWhatTQString) \ void KviServerParser::__funcname(KviIrcMessage *msg) \ { \ - QString szChan = msg->connection()->decodeText(msg->safeParam(1)); \ + TQString szChan = msg->connection()->decodeText(msg->safeParam(1)); \ KviChannel * chan = msg->connection()->findChannel(szChan); \ if(chan) \ { \ @@ -628,7 +628,7 @@ void getDateTimeStringFromCharTimeT(QString &buffer,const char *time_t_string) { \ KviWindow * pOut = chan ? chan : KVI_OPTION_BOOL(KviOption_boolServerRepliesToActiveWindow) ? \ msg->console()->activeWindow() : (KviWindow *)(msg->console()); \ - pOut->output(__daicon,__tr2qs("End of channel %Q for \r!c\r%Q\r"),&(__szWhatQString),&szChan); \ + pOut->output(__daicon,__tr2qs("End of channel %Q for \r!c\r%Q\r"),&(__szWhatTQString),&szChan); \ } \ } @@ -636,19 +636,19 @@ PARSE_NUMERIC_ENDOFLIST(parseNumericEndOfBanList,setHasBanList,sentBanListReques PARSE_NUMERIC_ENDOFLIST(parseNumericEndOfInviteList,setHasInviteList,sentInviteListRequest,setInviteListDone,KVI_OUT_INVITEEXCEPT,__tr2qs("invite list")) PARSE_NUMERIC_ENDOFLIST(parseNumericEndOfExceptList,setHasBanExceptionList,sentBanExceptionListRequest,setBanExceptionListDone,KVI_OUT_BANEXCEPT,__tr2qs("ban exception list")) -#define PARSE_NUMERIC_LIST(__funcname,__modechar,__sentRequest,__ico,__szWhatQString) \ +#define PARSE_NUMERIC_LIST(__funcname,__modechar,__sentRequest,__ico,__szWhatTQString) \ void KviServerParser::__funcname(KviIrcMessage *msg) \ { \ - QString szChan = msg->connection()->decodeText(msg->safeParam(1)); \ - QString banmask = msg->connection()->decodeText(msg->safeParam(2)); \ - QString bansetby = msg->connection()->decodeText(msg->safeParam(3)); \ - QString bansetat; \ + TQString szChan = msg->connection()->decodeText(msg->safeParam(1)); \ + TQString bantqmask = msg->connection()->decodeText(msg->safeParam(2)); \ + TQString bansetby = msg->connection()->decodeText(msg->safeParam(3)); \ + TQString bansetat; \ getDateTimeStringFromCharTimeT(bansetat,msg->safeParam(4)); \ if(bansetby.isEmpty())bansetby = __tr2qs("(Unknown)"); \ KviChannel * chan = msg->connection()->findChannel(szChan); \ if(chan) \ { \ - chan->setMask(__modechar,banmask,true,bansetby,QString(msg->safeParam(4)).toUInt()); \ + chan->setMask(__modechar,bantqmask,true,bansetby,TQString(msg->safeParam(4)).toUInt()); \ if(chan->__sentRequest())return; \ } \ if(!msg->haltOutput()) \ @@ -656,18 +656,18 @@ PARSE_NUMERIC_ENDOFLIST(parseNumericEndOfExceptList,setHasBanExceptionList,sentB KviWindow * pOut = chan ? chan : KVI_OPTION_BOOL(KviOption_boolServerRepliesToActiveWindow) ? \ msg->console()->activeWindow() : (KviWindow *)(msg->console()); \ pOut->output(__ico,__tr2qs("%Q for \r!c\r%Q\r: \r!m-%c\r%Q\r (set by %Q on %Q)"), \ - &(__szWhatQString),&szChan,__modechar,&banmask,&bansetby,&bansetat); \ + &(__szWhatTQString),&szChan,__modechar,&bantqmask,&bansetby,&bansetat); \ } \ } // 367: RPL_BANLIST [I,E,U,D] -// :prefix 367 target <channel> <banmask> [bansetby] [bansetat] +// :prefix 367 target <channel> <bantqmask> [bansetby] [bansetat] PARSE_NUMERIC_LIST(parseNumericBanList,'b',sentBanListRequest,KVI_OUT_BAN,__tr2qs("Ban listing")) // 346: RPL_INVITELIST [I,E,U,D] -// :prefix 346 target <channel> <invitemask> [invitesetby] [invitesetat] +// :prefix 346 target <channel> <invitetqmask> [invitesetby] [invitesetat] PARSE_NUMERIC_LIST(parseNumericInviteList,'I',sentInviteListRequest,KVI_OUT_INVITEEXCEPT,__tr2qs("Invite listing")) // 346: RPL_EXCEPTLIST [I,E,U,D] -// :prefix 346 target <channel> <banmask> [bansetby] [bansetat] +// :prefix 346 target <channel> <bantqmask> [bansetby] [bansetat] PARSE_NUMERIC_LIST(parseNumericExceptList,'e',sentBanExceptionListRequest,KVI_OUT_BANEXCEPT,__tr2qs("Ban exception listing")); @@ -676,24 +676,24 @@ void KviServerParser::parseNumericWhoReply(KviIrcMessage *msg) // 352: RPL_WHOREPLY [I,E,U,D] // :prefix 352 target <chan> <usr> <hst> <srv> <nck> <stat> :<hops> <real> - QString szChan = msg->connection()->decodeText(msg->safeParam(1)); - QString szUser = msg->connection()->decodeText(msg->safeParam(2)); - QString szHost = msg->connection()->decodeText(msg->safeParam(3)); - QString szServ = msg->connection()->decodeText(msg->safeParam(4)); - QString szNick = msg->connection()->decodeText(msg->safeParam(5)); - QString szFlag = msg->connection()->decodeText(msg->safeParam(6)); - bool bAway = szFlag.find('G') != -1; + TQString szChan = msg->connection()->decodeText(msg->safeParam(1)); + TQString szUser = msg->connection()->decodeText(msg->safeParam(2)); + TQString szHost = msg->connection()->decodeText(msg->safeParam(3)); + TQString szServ = msg->connection()->decodeText(msg->safeParam(4)); + TQString szNick = msg->connection()->decodeText(msg->safeParam(5)); + TQString szFlag = msg->connection()->decodeText(msg->safeParam(6)); + bool bAway = szFlag.tqfind('G') != -1; KviStr trailing = msg->safeTrailing(); KviStr hops = trailing.getToken(' '); bool bHopsOk = false; int iHops = hops.toInt(&bHopsOk); - QString szReal = msg->connection()->decodeText(trailing.ptr()); + TQString szReal = msg->connection()->decodeText(trailing.ptr()); // Update the user entry KviIrcUserDataBase * db = msg->connection()->userDataBase(); - KviIrcUserEntry * e = db->find(szNick); + KviIrcUserEntry * e = db->tqfind(szNick); if(e) { if(bHopsOk)e->setHops(iHops); @@ -734,7 +734,7 @@ void KviServerParser::parseNumericWhoReply(KviIrcMessage *msg) KviWindow * pOut = chan ? chan : KVI_OPTION_BOOL(KviOption_boolServerRepliesToActiveWindow) ? msg->console()->activeWindow() : (KviWindow *)(msg->console()); - QString szAway = bAway ? __tr2qs("Yes") : __tr2qs("No"); + TQString szAway = bAway ? __tr2qs("Yes") : __tr2qs("No"); pOut->output(KVI_OUT_WHO, __tr2qs("WHO entry for %c\r!n\r%Q\r%c [%Q@\r!h\r%Q\r]: %cChannel%c: \r!c\r%Q\r, %cServer%c: \r!s\r%Q\r, %cHops%c: %d, %cFlags%c: %Q, %cAway%c: %Q, %cReal name%c: %Q"), @@ -755,7 +755,7 @@ void KviServerParser::parseNumericEndOfWho(KviIrcMessage *msg) { // 315: RPL_ENDOFWHO [I,E,U,D] // :prefix 315 target <channel/nick> :End of /WHO List. - QString szChan = msg->connection()->decodeText(msg->safeParam(1)); + TQString szChan = msg->connection()->decodeText(msg->safeParam(1)); KviChannel * chan = msg->connection()->findChannel(szChan); if(chan) { @@ -788,7 +788,7 @@ void KviServerParser::parseNumericEndOfWho(KviIrcMessage *msg) { KviWindow * pOut = chan ? chan : KVI_OPTION_BOOL(KviOption_boolServerRepliesToActiveWindow) ? msg->console()->activeWindow() : (KviWindow *)(msg->console()); - QString whoTarget = msg->connection()->decodeText(msg->safeParam(1)); + TQString whoTarget = msg->connection()->decodeText(msg->safeParam(1)); if(IS_CHANNEL_TYPE_FLAG(whoTarget[0])) whoTarget.prepend("\r!c\r"); else @@ -801,7 +801,7 @@ void KviServerParser::parseNumericEndOfWho(KviIrcMessage *msg) void KviServerParser::parseLoginNicknameProblem(KviIrcMessage *msg) { // ops...not logged in yet... - QString nextNick; + TQString nextNick; unsigned int uNickCnt; switch(msg->connection()->stateData()->loginNickIndex()) { @@ -836,7 +836,7 @@ void KviServerParser::parseLoginNicknameProblem(KviIrcMessage *msg) nextNick.stripWhiteSpace(); if(nextNick.isEmpty())nextNick = KVI_DEFAULT_NICKNAME1; nextNick = nextNick.left(7); - QString num; + TQString num; num.setNum(msg->connection()->stateData()->loginNickIndex()); nextNick.append(num); uNickCnt = msg->connection()->stateData()->loginNickIndex() + 1; @@ -844,7 +844,7 @@ void KviServerParser::parseLoginNicknameProblem(KviIrcMessage *msg) break; } - QString szOldNick = msg->connection()->userInfo()->nickName(); + TQString szOldNick = msg->connection()->userInfo()->nickName(); msg->console()->notifyListView()->nickChange(szOldNick,nextNick); msg->connection()->userInfo()->setNickName(nextNick); @@ -865,14 +865,14 @@ void KviServerParser::parseLoginNicknameProblem(KviIrcMessage *msg) if(!msg->haltOutput()) { - QString szActual = msg->connection()->decodeText(msg->safeParam(1)); - QString szWText = msg->connection()->decodeText(msg->safeTrailing()); + TQString szActual = msg->connection()->decodeText(msg->safeParam(1)); + TQString szWText = msg->connection()->decodeText(msg->safeTrailing()); msg->console()->output(KVI_OUT_NICKNAMEPROBLEM, __tr2qs("No way to login as '\r!n\r%Q\r' (%d: %Q), trying '%Q'..."), &szActual,msg->numeric(),&szWText,&nextNick); } - KviQCString d = msg->connection()->encodeText(nextNick); + KviTQCString d = msg->connection()->encodeText(nextNick); msg->connection()->sendFmtData("NICK %s",d.data()); } @@ -887,8 +887,8 @@ void KviServerParser::parseNumericUnavailResource(KviIrcMessage *msg) // already connected... just say that we have problems if(!msg->haltOutput()) { - QString szNk = msg->connection()->decodeText(msg->safeParam(1)); - QString szWText = msg->connection()->decodeText(msg->safeTrailing()); + TQString szNk = msg->connection()->decodeText(msg->safeParam(1)); + TQString szWText = msg->connection()->decodeText(msg->safeTrailing()); msg->console()->output(KVI_OUT_NICKNAMEPROBLEM, "\r!n\r%Q\r: %Q",&szNk,&szWText); } @@ -906,8 +906,8 @@ void KviServerParser::parseNumericCantJoinChannel(KviIrcMessage *msg) { KviWindow * pOut = (KviWindow *)(msg->connection()->findChannel(msg->safeParam(1))); if(!pOut)pOut = (KviWindow *)(msg->console()); - QString szChannel = msg->connection()->decodeText(msg->safeParam(1)); - QString szWText = msg->connection()->decodeText(msg->safeTrailing()); + TQString szChannel = msg->connection()->decodeText(msg->safeParam(1)); + TQString szWText = msg->connection()->decodeText(msg->safeTrailing()); pOut->output(KVI_OUT_JOINERROR, "\r!c\r%Q\r: %Q",&szChannel,&szWText); } @@ -925,8 +925,8 @@ void KviServerParser::otherChannelError(KviIrcMessage *msg) { KviWindow * pOut = (KviWindow *)(msg->connection()->findChannel(msg->safeParam(1))); if(!pOut)pOut = (KviWindow *)(msg->console()); - QString szChannel = msg->connection()->decodeText(msg->safeParam(1)); - QString szWText = msg->connection()->decodeText(msg->safeTrailing()); + TQString szChannel = msg->connection()->decodeText(msg->safeParam(1)); + TQString szWText = msg->connection()->decodeText(msg->safeTrailing()); pOut->output(KVI_OUT_GENERICERROR, "\r!c\r%Q\r: %Q",&szChannel,&szWText); } @@ -939,8 +939,8 @@ void KviServerParser::parseCommandSyntaxHelp(KviIrcMessage *msg) if(!msg->haltOutput()) { KviWindow * pOut = (KviWindow *)(msg->console()); - QString szCommand = msg->connection()->decodeText(msg->safeParam(1)); - QString szWText = msg->connection()->decodeText(msg->safeTrailing()); + TQString szCommand = msg->connection()->decodeText(msg->safeParam(1)); + TQString szWText = msg->connection()->decodeText(msg->safeTrailing()); pOut->output(KVI_OUT_HELP, __tr2qs("Command syntax %Q: %Q"),&szCommand,&szWText); // Pragma: wheee..... that should be in english :D } @@ -953,8 +953,8 @@ void KviServerParser::parseCommandHelp(KviIrcMessage *msg) if(!msg->haltOutput()) { KviWindow * pOut = (KviWindow *)(msg->console()); - QString szCommand = msg->connection()->decodeText(msg->safeParam(1)); - QString szWText = msg->connection()->decodeText(msg->safeTrailing()); + TQString szCommand = msg->connection()->decodeText(msg->safeParam(1)); + TQString szWText = msg->connection()->decodeText(msg->safeTrailing()); pOut->outputNoFmt(KVI_OUT_HELP,szWText); } } @@ -965,8 +965,8 @@ void KviServerParser::parseChannelHelp(KviIrcMessage *msg) // :prefix 477 <target> <channel> :text if(!msg->haltOutput()) { - QString szChan = msg->connection()->decodeText(msg->safeParam(1)); - QString szText = msg->connection()->decodeText(msg->safeTrailing()); + TQString szChan = msg->connection()->decodeText(msg->safeParam(1)); + TQString szText = msg->connection()->decodeText(msg->safeTrailing()); KviWindow * pOut = msg->connection()->findChannel(szChan); if(pOut) { @@ -988,7 +988,7 @@ void KviServerParser::parseCommandEndOfHelp(KviIrcMessage *msg) if(!msg->haltOutput()) { KviWindow * pOut = (KviWindow *)(msg->console()); - QString szCommand = msg->connection()->decodeText(msg->safeParam(1)); + TQString szCommand = msg->connection()->decodeText(msg->safeParam(1)); pOut->output(KVI_OUT_HELP, __tr2qs("End of help about %Q"),&szCommand); } @@ -1008,8 +1008,8 @@ void KviServerParser::parseNumericNicknameProblem(KviIrcMessage *msg) // already connected... just say that we have problems if(!msg->haltOutput()) { - QString szNk = msg->connection()->decodeText(msg->safeParam(1)); - QString szWText = msg->connection()->decodeText(msg->safeTrailing()); + TQString szNk = msg->connection()->decodeText(msg->safeParam(1)); + TQString szWText = msg->connection()->decodeText(msg->safeTrailing()); msg->console()->output(KVI_OUT_NICKNAMEPROBLEM, "\r!n\r%Q\r: %Q",&szNk,&szWText); } @@ -1021,16 +1021,16 @@ void KviServerParser::parseNumericWhoisAway(KviIrcMessage * msg) // FIXME: #warning "Need an icon here too: sth like KVI_OUT_WHOISSERVER, but with 'A' letter" msg->connection()->stateData()->setLastReceivedWhoisReply(kvi_unixTime()); - QString szNk = msg->connection()->decodeText(msg->safeParam(1)); + TQString szNk = msg->connection()->decodeText(msg->safeParam(1)); KviIrcUserDataBase * db = msg->connection()->userDataBase(); - KviIrcUserEntry * e = db->find(szNk); + KviIrcUserEntry * e = db->tqfind(szNk); if(e)e->setAway(true); KviQuery * q = msg->connection()->findQuery(szNk); if(q) q->updateLabelText(); if(!msg->haltOutput()) { KviWindow * pOut = (KviWindow *)(msg->connection()->findQuery(szNk)); - QString szWText = pOut ? pOut->decodeText(msg->safeTrailing()) : msg->connection()->decodeText(msg->safeTrailing()); + TQString szWText = pOut ? pOut->decodeText(msg->safeTrailing()) : msg->connection()->decodeText(msg->safeTrailing()); if(!pOut)pOut = KVI_OPTION_BOOL(KviOption_boolWhoisRepliesToActiveWindow) ? msg->console()->activeWindow() : (KviWindow *)(msg->console()); @@ -1045,19 +1045,19 @@ void KviServerParser::parseNumericWhoisUser(KviIrcMessage *msg) // :prefix 311 <target> <nick> <user> <host> * :<real_name> msg->connection()->stateData()->setLastReceivedWhoisReply(kvi_unixTime()); - QString szNick = msg->connection()->decodeText(msg->safeParam(1)); - QString szUser = msg->connection()->decodeText(msg->safeParam(2)); - QString szHost = msg->connection()->decodeText(msg->safeParam(3)); - QString szReal = msg->connection()->decodeText(msg->safeTrailing()); + TQString szNick = msg->connection()->decodeText(msg->safeParam(1)); + TQString szUser = msg->connection()->decodeText(msg->safeParam(2)); + TQString szHost = msg->connection()->decodeText(msg->safeParam(3)); + TQString szReal = msg->connection()->decodeText(msg->safeTrailing()); KviIrcUserDataBase * db = msg->connection()->userDataBase(); - KviIrcUserEntry * e = db->find(szNick); + KviIrcUserEntry * e = db->tqfind(szNick); if(e) { e->setUser(szUser); e->setHost(szHost); e->setRealName(szReal); if(e->gender()!=KviIrcUserEntry::Unknown) { - if(KviQString::equalCS(g_pActiveWindow->className(),QString("KviChannel"))) + if(KviTQString::equalCS(g_pActiveWindow->className(),TQString("KviChannel"))) { ((KviChannel*)g_pActiveWindow)->userListView()->updateArea(); } @@ -1104,10 +1104,10 @@ void KviServerParser::parseNumericWhowasUser(KviIrcMessage * msg) if(!msg->haltOutput()) { - QString szNick = msg->connection()->decodeText(msg->safeParam(1)); - QString szUser = msg->connection()->decodeText(msg->safeParam(2)); - QString szHost = msg->connection()->decodeText(msg->safeParam(3)); - QString szReal = msg->connection()->decodeText(msg->safeTrailing()); + TQString szNick = msg->connection()->decodeText(msg->safeParam(1)); + TQString szUser = msg->connection()->decodeText(msg->safeParam(2)); + TQString szHost = msg->connection()->decodeText(msg->safeParam(3)); + TQString szReal = msg->connection()->decodeText(msg->safeTrailing()); KviWindow * pOut = KVI_OPTION_BOOL(KviOption_boolWhoisRepliesToActiveWindow) ? msg->console()->activeWindow() : (KviWindow *)(msg->console()); @@ -1129,8 +1129,8 @@ void KviServerParser::parseNumericWhoisChannels(KviIrcMessage *msg) msg->connection()->stateData()->setLastReceivedWhoisReply(kvi_unixTime()); - QString szNick = msg->connection()->decodeText(msg->safeParam(1)); - QString szChans = msg->connection()->decodeText(msg->safeTrailing()); + TQString szNick = msg->connection()->decodeText(msg->safeParam(1)); + TQString szChans = msg->connection()->decodeText(msg->safeTrailing()); KviAsyncWhoisInfo * i = msg->connection()->asyncWhoisData()->lookup(szNick); if(i) @@ -1144,12 +1144,12 @@ void KviServerParser::parseNumericWhoisChannels(KviIrcMessage *msg) KviWindow * pOut = KVI_OPTION_BOOL(KviOption_boolWhoisRepliesToActiveWindow) ? msg->console()->activeWindow() : (KviWindow *)(msg->console()); - QStringList sl = QStringList::split(" ",szChans); - QString szChanList; + TQStringList sl = TQStringList::split(" ",szChans); + TQString szChanList; - for(QStringList::Iterator it = sl.begin();it != sl.end();++it) + for(TQStringList::Iterator it = sl.begin();it != sl.end();++it) { - QString szCur = *it; + TQString szCur = *it; // deals with <flag>[#channel] and [##channel] int len = szCur.length(); int i =0; @@ -1166,11 +1166,11 @@ void KviServerParser::parseNumericWhoisChannels(KviIrcMessage *msg) len = szCur.length() - i; if(szChanList.length() > 0)szChanList.append(", "); szChanList += szCur.left(i); - QString szR = szCur.right(len); - KviQString::appendFormatted(szChanList,"\r!c\r%Q\r",&szR); + TQString szR = szCur.right(len); + KviTQString::appendFormatted(szChanList,"\r!c\r%Q\r",&szR); } else { if(szChanList.length() > 0)szChanList.append(", "); - KviQString::appendFormatted(szChanList,"\r!c\r%Q\r",&szCur); + KviTQString::appendFormatted(szChanList,"\r!c\r%Q\r",&szCur); } } else { // we dunno what is this.. just append @@ -1193,7 +1193,7 @@ void KviServerParser::parseNumericWhoisIdle(KviIrcMessage *msg) // FIXME: #warning "and NICK LINKS" msg->connection()->stateData()->setLastReceivedWhoisReply(kvi_unixTime()); - QString szNick = msg->connection()->decodeText(msg->safeParam(1)); + TQString szNick = msg->connection()->decodeText(msg->safeParam(1)); KviAsyncWhoisInfo * i = msg->connection()->asyncWhoisData()->lookup(szNick); if(i) @@ -1233,9 +1233,9 @@ void KviServerParser::parseNumericWhoisIdle(KviIrcMessage *msg) uTime = sign.toUInt(&bOk); if(bOk) { - QDateTime dt; + TQDateTime dt; dt.setTime_t((time_t)uTime); - QString tmp = dt.toString(); + TQString tmp = dt.toString(); pOut->output( KVI_OUT_WHOISIDLE,__tr2qs("%c\r!n\r%Q\r%c's signon time: %Q"),KVI_TEXT_BOLD, &szNick,KVI_TEXT_BOLD,&tmp); @@ -1249,11 +1249,11 @@ void KviServerParser::parseNumericWhoisServer(KviIrcMessage *msg) // :prefix 312 <target> <nick> <server> :<server description / last whowas date> msg->connection()->stateData()->setLastReceivedWhoisReply(kvi_unixTime()); - QString szNick = msg->connection()->decodeText(msg->safeParam(1)); - QString szServ = msg->connection()->decodeText(msg->safeParam(2)); + TQString szNick = msg->connection()->decodeText(msg->safeParam(1)); + TQString szServ = msg->connection()->decodeText(msg->safeParam(2)); KviIrcUserDataBase * db = msg->connection()->userDataBase(); - KviIrcUserEntry * e = db->find(szNick); + KviIrcUserEntry * e = db->tqfind(szNick); if(e)e->setServer(szServ); KviQuery * q = msg->connection()->findQuery(szNick); if(q) q->updateLabelText(); @@ -1269,7 +1269,7 @@ void KviServerParser::parseNumericWhoisServer(KviIrcMessage *msg) { KviWindow * pOut = KVI_OPTION_BOOL(KviOption_boolWhoisRepliesToActiveWindow) ? msg->console()->activeWindow() : (KviWindow *)(msg->console()); - QString szWText = pOut->decodeText(msg->safeTrailing()); + TQString szWText = pOut->decodeText(msg->safeTrailing()); pOut->output( KVI_OUT_WHOISSERVER,__tr2qs("%c\r!n\r%Q\r%c's server: \r!s\r%Q\r - %Q"),KVI_TEXT_BOLD, &szNick,KVI_TEXT_BOLD,&szServ,&szWText); @@ -1282,8 +1282,8 @@ void KviServerParser::parseNumericWhoisAuth(KviIrcMessage *msg) // actually seen only on Quakenet msg->connection()->stateData()->setLastReceivedWhoisReply(kvi_unixTime()); - QString szNick = msg->connection()->decodeText(msg->safeParam(1)); - QString szAuth = msg->connection()->decodeText(msg->safeParam(2)); + TQString szNick = msg->connection()->decodeText(msg->safeParam(1)); + TQString szAuth = msg->connection()->decodeText(msg->safeParam(2)); if(!msg->haltOutput()) { @@ -1305,8 +1305,8 @@ void KviServerParser::parseNumericWhoisOther(KviIrcMessage *msg) msg->connection()->stateData()->setLastReceivedWhoisReply(kvi_unixTime()); - QString szNick = msg->connection()->decodeText(msg->safeParam(1)); - QString szOth = msg->connection()->decodeText(msg->safeTrailing()); + TQString szNick = msg->connection()->decodeText(msg->safeParam(1)); + TQString szOth = msg->connection()->decodeText(msg->safeTrailing()); KviAsyncWhoisInfo * i = msg->connection()->asyncWhoisData()->lookup(szNick); if(i) @@ -1336,7 +1336,7 @@ void KviServerParser::parseNumericEndOfWhois(KviIrcMessage *msg) msg->connection()->stateData()->setLastReceivedWhoisReply(0); - QString szNick = msg->connection()->decodeText(msg->safeParam(1)); + TQString szNick = msg->connection()->decodeText(msg->safeParam(1)); KviAsyncWhoisInfo * i = msg->connection()->asyncWhoisData()->lookup(szNick); if(i) @@ -1354,7 +1354,7 @@ void KviServerParser::parseNumericEndOfWhois(KviIrcMessage *msg) vl.append(new KviKvsVariant(i->szIdle)); vl.append(new KviKvsVariant(i->szSignon)); vl.append(new KviKvsVariant(i->szChannels)); - vl.append(new KviKvsVariant(QString(msg->safePrefix()))); + vl.append(new KviKvsVariant(TQString(msg->safePrefix()))); vl.append(new KviKvsVariant(i->szSpecial)); vl.append(new KviKvsVariant(*(i->pMagic))); i->pCallback->run(i->pWindow,&vl,0,KviKvsScript::PreserveParams); @@ -1367,7 +1367,7 @@ void KviServerParser::parseNumericEndOfWhois(KviIrcMessage *msg) { KviWindow * pOut = KVI_OPTION_BOOL(KviOption_boolWhoisRepliesToActiveWindow) ? msg->console()->activeWindow() : (KviWindow *)(msg->console()); - QString pref = msg->connection()->decodeText(msg->safePrefix()); + TQString pref = msg->connection()->decodeText(msg->safePrefix()); pOut->output( KVI_OUT_WHOISOTHER,__tr2qs("%c\r!n\r%Q\r%c WHOIS info from \r!s\r%Q\r"),KVI_TEXT_BOLD, &szNick,KVI_TEXT_BOLD,&pref); @@ -1381,10 +1381,10 @@ void KviServerParser::parseNumericEndOfWhowas(KviIrcMessage *msg) // :prefix 369 <target> <nick> :End of /WHOWAS list if(!msg->haltOutput()) { - QString szNick = msg->connection()->decodeText(msg->safeParam(1)); + TQString szNick = msg->connection()->decodeText(msg->safeParam(1)); KviWindow * pOut = KVI_OPTION_BOOL(KviOption_boolWhoisRepliesToActiveWindow) ? msg->console()->activeWindow() : (KviWindow *)(msg->console()); - QString pref = msg->connection()->decodeText(msg->safePrefix()); + TQString pref = msg->connection()->decodeText(msg->safePrefix()); pOut->output( KVI_OUT_WHOISOTHER,__tr2qs("%c\r!n\r%Q\r%c WHOWAS info from \r!s\r%Q\r"),KVI_TEXT_BOLD, &szNick,KVI_TEXT_BOLD,&pref); @@ -1397,7 +1397,7 @@ void KviServerParser::parseNumericNoSuchNick(KviIrcMessage *msg) // 406: ERR_WASNOSUCHNICK [I,E,U,D] // :prefix 401 <target> <nick> :No such nick/channel // :prefix 406 <target> <nick> :There was no such nickname - QString szNick = msg->connection()->decodeText(msg->safeParam(1)); + TQString szNick = msg->connection()->decodeText(msg->safeParam(1)); if(msg->numeric() == ERR_NOSUCHNICK) { @@ -1425,7 +1425,7 @@ void KviServerParser::parseNumericNoSuchNick(KviIrcMessage *msg) } } // FIXME: #warning "KVI_OUT_NOSUCHNICKCHANNEL ?" - // FIXME: #warning "QUERIES SHOULD REPORT NO TARGET HERE! (?)" + // FIXME: #warning "TQUERIES SHOULD REPORT NO TARGET HERE! (?)" if(!msg->haltOutput()) { KviWindow * pOut = (KviWindow *)(msg->connection()->findQuery(szNick)); @@ -1436,7 +1436,7 @@ void KviServerParser::parseNumericNoSuchNick(KviIrcMessage *msg) //} else { // ((KviQuery *)pOut)->removeTarget(msg->safeParam(1)); //} - QString szWText = pOut->decodeText(msg->safeTrailing()); + TQString szWText = pOut->decodeText(msg->safeTrailing()); pOut->output(KVI_OUT_NICKNAMEPROBLEM,"\r!n\r%Q\r: %Q", &szNick,&szWText); } @@ -1446,10 +1446,10 @@ void KviServerParser::parseNumericCreationTime(KviIrcMessage *msg) { // 329: RPL_CREATIONTIME // :prefix 329 <target> <channel> <creation_time> - QString szChan = msg->connection()->decodeText(msg->safeParam(1)); + TQString szChan = msg->connection()->decodeText(msg->safeParam(1)); KviChannel * chan = msg->connection()->findChannel(szChan); KviStr tmstr = msg->safeParam(2); - QDateTime dt; + TQDateTime dt; dt.setTime_t((time_t)tmstr.toUInt()); if(!tmstr.isUnsignedNum()) @@ -1457,7 +1457,7 @@ void KviServerParser::parseNumericCreationTime(KviIrcMessage *msg) UNRECOGNIZED_MESSAGE(msg,__tr2qs("Can't evaluate creation time")); return; } - QString szDate = dt.toString(); + TQString szDate = dt.toString(); if(chan) { if(!msg->haltOutput()) @@ -1487,8 +1487,8 @@ void KviServerParser::parseNumericIsOn(KviIrcMessage *msg) { KviWindow * pOut = KVI_OPTION_BOOL(KviOption_boolServerRepliesToActiveWindow) ? msg->console()->activeWindow() : (KviWindow *)(msg->console()); - QString szPrefix = msg->connection()->decodeText(msg->safePrefix()); - QString szAllParms = msg->connection()->decodeText(msg->allParams()); + TQString szPrefix = msg->connection()->decodeText(msg->safePrefix()); + TQString szAllParms = msg->connection()->decodeText(msg->allParams()); pOut->output(KVI_OUT_UNHANDLED, "[%Q][%s] %Q",&szPrefix,msg->command(),&szAllParms); } @@ -1507,7 +1507,7 @@ void KviServerParser::parseNumericUserhost(KviIrcMessage *msg) { KviWindow * pOut = KVI_OPTION_BOOL(KviOption_boolServerRepliesToActiveWindow) ? msg->console()->activeWindow() : (KviWindow *)(msg->console()); - QString szUser = msg->connection()->decodeText(msg->safeTrailing()); + TQString szUser = msg->connection()->decodeText(msg->safeTrailing()); pOut->output(KVI_OUT_WHOISUSER,__tr2qs("USERHOST info: %Q"),&szUser); } } @@ -1555,7 +1555,7 @@ void KviServerParser::parseNumericList(KviIrcMessage *msg) msg->console()->ircContext()->listWindow()->processData(msg); } else { // ops...can't load the module... - QString szList = msg->connection()->decodeText(msg->allParams()); + TQString szList = msg->connection()->decodeText(msg->allParams()); msg->console()->output(KVI_OUT_LIST,__tr2qs("List: %Q"),&szList); } } @@ -1578,7 +1578,7 @@ void KviServerParser::parseNumericListEnd(KviIrcMessage *msg) void KviServerParser::parseNumericLinks(KviIrcMessage *msg) { // 364: RPL_LINKS [I,E,U,D] - // :prefix 364 <target> <host> <parent> :<hops> <description> + // :prefix 364 <target> <host> <tqparent> :<hops> <description> if(!(msg->console()->ircContext()->linksWindow())) { // attempt to load the module... @@ -1593,7 +1593,7 @@ void KviServerParser::parseNumericLinks(KviIrcMessage *msg) // ops...can't load the module... or the event halted the window creation if(!msg->haltOutput()) { - QString szList = msg->connection()->decodeText(msg->allParams()); + TQString szList = msg->connection()->decodeText(msg->allParams()); msg->console()->output(KVI_OUT_LINKS,__tr2qs("Link: %Q"),&szList); } } @@ -1619,15 +1619,15 @@ void KviServerParser::parseNumericBackFromAway(KviIrcMessage * msg) // 305: RPL_UNAWAY [I,E,U,D] // :prefix 305 <target> :You are no longer away bool bWasAway = msg->connection()->userInfo()->isAway(); - QString szNickBeforeAway; - QString szWText = msg->connection()->decodeText(msg->safeTrailing()); + TQString szNickBeforeAway; + TQString szWText = msg->connection()->decodeText(msg->safeTrailing()); if(bWasAway)szNickBeforeAway = msg->connection()->userInfo()->nickNameBeforeAway(); msg->connection()->changeAwayState(false); // trigger the event - QString tmp; - KviQString::sprintf(tmp,"%u",bWasAway ? (unsigned int)(msg->connection()->userInfo()->awayTime()) : 0); + TQString tmp; + KviTQString::sprintf(tmp,"%u",bWasAway ? (unsigned int)(msg->connection()->userInfo()->awayTime()) : 0); if(KVS_TRIGGER_EVENT_2_HALTED(KviEvent_OnMeBack,msg->console(),tmp,szWText)) msg->setHaltOutput(); if(!msg->haltOutput()) @@ -1650,7 +1650,7 @@ void KviServerParser::parseNumericBackFromAway(KviIrcMessage * msg) { if(_OUTPUT_PARANOIC) msg->console()->output(KVI_OUT_AWAY,__tr2qs("Restoring pre-away nickname (%Q)"),&szNickBeforeAway); - KviQCString szDat = msg->connection()->encodeText(szNickBeforeAway); + KviTQCString szDat = msg->connection()->encodeText(szNickBeforeAway); msg->connection()->sendFmtData("NICK %s",szDat.data()); } @@ -1661,7 +1661,7 @@ void KviServerParser::parseNumericAway(KviIrcMessage * msg) // 306: RPL_NOWAWAY [I,E,U,D] // :prefix 305 <target> :You're away man msg->connection()->changeAwayState(true); - QString szWText = msg->connection()->decodeText(msg->safeTrailing()); + TQString szWText = msg->connection()->decodeText(msg->safeTrailing()); if(KVS_TRIGGER_EVENT_1_HALTED(KviEvent_OnMeAway,msg->console(),szWText))msg->setHaltOutput(); @@ -1674,8 +1674,8 @@ void KviServerParser::parseNumericAway(KviIrcMessage * msg) if(KVI_OPTION_BOOL(KviOption_boolChangeNickAway)) { - QString nick = msg->connection()->decodeText(msg->safeParam(0)); - QString szNewNick; + TQString nick = msg->connection()->decodeText(msg->safeParam(0)); + TQString szNewNick; if(KVI_OPTION_BOOL(KviOption_boolAutoGeneratedAwayNick)) { if(nick.length() > 5)szNewNick = nick.left(5); @@ -1683,12 +1683,12 @@ void KviServerParser::parseNumericAway(KviIrcMessage * msg) szNewNick.append("AWAY"); } else { szNewNick = KVI_OPTION_STRING(KviOption_stringCustomAwayNick); - szNewNick.replace("%nick%",nick); + szNewNick.tqreplace("%nick%",nick); } if(_OUTPUT_PARANOIC) msg->console()->output(KVI_OUT_AWAY,__tr2qs("Setting away nickname (%Q)"),&szNewNick); - KviQCString dat = msg->connection()->encodeText(szNewNick); + KviTQCString dat = msg->connection()->encodeText(szNewNick); msg->connection()->sendFmtData("NICK %s",dat.data()); } } @@ -1758,7 +1758,7 @@ void KviServerParser::parseNumericServerAdminInfoServerName(KviIrcMessage * msg) if(!msg->haltOutput()) { KviWindow * pOut = (KviWindow *)(msg->console()); - QString szInfo = msg->connection()->decodeText(msg->safeTrailing()); + TQString szInfo = msg->connection()->decodeText(msg->safeTrailing()); pOut->output(KVI_OUT_SERVERINFO,__tr2qs("%c\r!s\r%s\r%c's server info: %s"),KVI_TEXT_BOLD,msg->prefix(),KVI_TEXT_BOLD,szInfo.utf8().data()); } } @@ -1769,7 +1769,7 @@ void KviServerParser::parseNumericServerAdminInfoAdminName(KviIrcMessage * msg) if(!msg->haltOutput()) { KviWindow * pOut = (KviWindow *)(msg->console()); - QString szInfo = msg->connection()->decodeText(msg->safeTrailing()); + TQString szInfo = msg->connection()->decodeText(msg->safeTrailing()); pOut->output(KVI_OUT_SERVERINFO,__tr2qs("%c\r!s\r%s\r%c's administrator is %s"),KVI_TEXT_BOLD,msg->prefix(),KVI_TEXT_BOLD,szInfo.utf8().data()); } } @@ -1780,7 +1780,7 @@ void KviServerParser::parseNumericServerAdminInfoAdminContact(KviIrcMessage * ms if(!msg->haltOutput()) { KviWindow * pOut = (KviWindow *)(msg->console()); - QString szInfo = msg->connection()->decodeText(msg->safeTrailing()); + TQString szInfo = msg->connection()->decodeText(msg->safeTrailing()); pOut->output(KVI_OUT_SERVERINFO,__tr2qs("%c\r!s\r%s\r%c's contact adress is %s"),KVI_TEXT_BOLD,msg->prefix(),KVI_TEXT_BOLD,szInfo.utf8().data()); } } @@ -1800,9 +1800,9 @@ void KviServerParser::parseNumericInviting(KviIrcMessage * msg) //RPL_INVITING 341 if(!msg->haltOutput()) { - QString szWho = msg->connection()->decodeText(msg->safeParam(0)); - QString szTarget = msg->connection()->decodeText(msg->safeParam(1)); - QString szChan = msg->connection()->decodeText(msg->safeParam(2)); + TQString szWho = msg->connection()->decodeText(msg->safeParam(0)); + TQString szTarget = msg->connection()->decodeText(msg->safeParam(1)); + TQString szChan = msg->connection()->decodeText(msg->safeParam(2)); KviChannel * chan = msg->connection()->findChannel(szChan); if(chan) { @@ -1820,7 +1820,7 @@ void KviServerParser::parseNumericInfo(KviIrcMessage * msg) if(!msg->haltOutput()) { KviWindow * pOut = (KviWindow *)(msg->console()); - QString szInfo = msg->connection()->decodeText(msg->safeTrailing()); + TQString szInfo = msg->connection()->decodeText(msg->safeTrailing()); pOut->outputNoFmt(KVI_OUT_SERVERINFO,szInfo); } } @@ -1851,7 +1851,7 @@ void KviServerParser::parseNumericTime(KviIrcMessage * msg) if(!msg->haltOutput()) { KviWindow * pOut = (KviWindow *)(msg->console()); - QString szInfo = msg->connection()->decodeText(msg->safeTrailing()); + TQString szInfo = msg->connection()->decodeText(msg->safeTrailing()); pOut->output(KVI_OUT_SERVERINFO,__tr2qs("%c\r!s\r%s\r%c's time is %Q"),KVI_TEXT_BOLD,msg->prefix(),KVI_TEXT_BOLD,&szInfo); } } @@ -1862,7 +1862,7 @@ void KviServerParser::parseNumericNoSuchServer(KviIrcMessage * msg) if(!msg->haltOutput()) { KviWindow * pOut = (KviWindow *)(msg->console()); - QString szWhat = msg->connection()->decodeText(msg->safeParam(1)); + TQString szWhat = msg->connection()->decodeText(msg->safeParam(1)); pOut->output(KVI_OUT_GENERICERROR,__tr2qs("%Q: no such server"),&szWhat); } } @@ -1873,7 +1873,7 @@ void KviServerParser::parseNumericNoSuchChannel(KviIrcMessage * msg) if(!msg->haltOutput()) { KviWindow * pOut = (KviWindow *)(msg->console()); - QString szWhat = msg->connection()->decodeText(msg->safeParam(1)); + TQString szWhat = msg->connection()->decodeText(msg->safeParam(1)); pOut->output(KVI_OUT_GENERICERROR,__tr2qs("%Q: no such channel"),&szWhat); } } @@ -1883,8 +1883,8 @@ void KviServerParser::parseNumericCannotSendColor(KviIrcMessage * msg) // ERR_NOCOLORSONCHAN 408 if(!msg->haltOutput()) { - QString szChan = msg->connection()->decodeText(msg->safeParam(1)); - QString szInfo = msg->connection()->decodeText(msg->safeTrailing()); + TQString szChan = msg->connection()->decodeText(msg->safeParam(1)); + TQString szInfo = msg->connection()->decodeText(msg->safeTrailing()); KviChannel * chan = msg->connection()->findChannel(szChan); if(chan) { @@ -1901,8 +1901,8 @@ void KviServerParser::parseNumericCannotSend(KviIrcMessage * msg) // ERR_CANNOTSENDTOCHAN 404 if(!msg->haltOutput()) { - QString szChan = msg->connection()->decodeText(msg->safeParam(1)); - QString szInfo = msg->connection()->decodeText(msg->safeTrailing()); + TQString szChan = msg->connection()->decodeText(msg->safeParam(1)); + TQString szInfo = msg->connection()->decodeText(msg->safeTrailing()); KviChannel * chan = msg->connection()->findChannel(szChan); if(chan) { @@ -1921,7 +1921,7 @@ void KviServerParser::parseNumericCodePageSet(KviIrcMessage *msg) // 700: RPL_CODEPAGESET // :prefix 700 target <encoding> :is now your translation scheme - QString encoding = msg->connection()->decodeText(msg->safeParam(1)); + TQString encoding = msg->connection()->decodeText(msg->safeParam(1)); if(msg->connection()->serverInfo()->supportsCodePages()) { if(encoding=="NONE") encoding="KOI8-R"; //RusNet default codepage @@ -1929,7 +1929,7 @@ void KviServerParser::parseNumericCodePageSet(KviIrcMessage *msg) msg->console()->setTextEncoding(encoding); msg->connection()->setEncoding(encoding); } else { - QString szMe = msg->connection()->decodeText(msg->safeParam(0)); + TQString szMe = msg->connection()->decodeText(msg->safeParam(0)); if( (szMe==msg->connection()->currentNickName() || szMe == "*" ) //fix for pre-login codepage message && KviLocale::codecForName(encoding.utf8().data())) { @@ -1938,7 +1938,7 @@ void KviServerParser::parseNumericCodePageSet(KviIrcMessage *msg) msg->connection()->setEncoding(encoding); } else if(!msg->haltOutput()) // simply unhandled { - QString szWText = msg->connection()->decodeText(msg->allParams()); + TQString szWText = msg->connection()->decodeText(msg->allParams()); msg->connection()->console()->output(KVI_OUT_UNHANDLED, "[%s][%s] %Q",msg->prefix(),msg->command(),&szWText); } @@ -1955,14 +1955,14 @@ void KviServerParser::parseNumericCodePageScheme(KviIrcMessage *msg) if(msg->connection()->serverInfo()->supportsCodePages()) { - QString szNick = msg->connection()->decodeText(msg->safeParam(1)); - QString szCodepage = msg->connection()->decodeText(msg->safeParam(2)); + TQString szNick = msg->connection()->decodeText(msg->safeParam(1)); + TQString szCodepage = msg->connection()->decodeText(msg->safeParam(2)); if(!msg->haltOutput()) { KviWindow * pOut = KVI_OPTION_BOOL(KviOption_boolWhoisRepliesToActiveWindow) ? msg->console()->activeWindow() : (KviWindow *)(msg->console()); - QString szWText = pOut->decodeText(msg->safeTrailing()); + TQString szWText = pOut->decodeText(msg->safeTrailing()); pOut->output( KVI_OUT_WHOISOTHER,__tr2qs("%c\r!n\r%Q\r%c's codepage is %Q: %Q"),KVI_TEXT_BOLD, &szNick,KVI_TEXT_BOLD,&szCodepage,&szWText); @@ -1971,7 +1971,7 @@ void KviServerParser::parseNumericCodePageScheme(KviIrcMessage *msg) // simply unhandled if(!msg->haltOutput()) { - QString szWText = msg->connection()->decodeText(msg->allParams()); + TQString szWText = msg->connection()->decodeText(msg->allParams()); msg->connection()->console()->output(KVI_OUT_UNHANDLED, "[%s][%s] %Q",msg->prefix(),msg->command(),&szWText); } @@ -1997,7 +1997,7 @@ void KviServerParser::parseNumericEndOfStats(KviIrcMessage *msg) if(!msg->haltOutput()) { KviWindow * pOut = (KviWindow *)(msg->console()); - QString szText = msg->connection()->decodeText(msg->safeTrailing()); + TQString szText = msg->connection()->decodeText(msg->safeTrailing()); pOut->outputNoFmt(KVI_OUT_STATS, szText); } } diff --git a/src/kvirc/sparser/kvi_sp_tables.cpp b/src/kvirc/sparser/kvi_sp_tables.cpp index 948a5c0..4432230 100644 --- a/src/kvirc/sparser/kvi_sp_tables.cpp +++ b/src/kvirc/sparser/kvi_sp_tables.cpp @@ -34,7 +34,7 @@ KviLiteralMessageParseStruct KviServerParser::m_literalParseProcTable[]= { "TOPIC" , PTM(parseLiteralTopic) }, { "JOIN" , PTM(parseLiteralJoin) }, { "PART" , PTM(parseLiteralPart) }, - { "QUIT" , PTM(parseLiteralQuit) }, + { "TQUIT" , PTM(parseLiteralQuit) }, { "NICK" , PTM(parseLiteralNick) }, { "KICK" , PTM(parseLiteralKick) }, { "NOTICE" , PTM(parseLiteralNotice) }, diff --git a/src/kvirc/sparser/kvi_sparser.cpp b/src/kvirc/sparser/kvi_sparser.cpp index d0b69ea..b06267e 100644 --- a/src/kvirc/sparser/kvi_sparser.cpp +++ b/src/kvirc/sparser/kvi_sparser.cpp @@ -38,7 +38,7 @@ KviServerParser * g_pServerParser = 0; KviServerParser::KviServerParser() -: QObject(0,"server_parser") +: TQObject(0,"server_parser") { } @@ -125,7 +125,7 @@ void KviServerParser::parseMessage(const char * message,KviIrcConnection * pConn // unhandled || unrecognized if(!msg.haltOutput() && !_OUTPUT_MUTE) { - QString szWText = pConnection->decodeText(msg.allParams()); + TQString szWText = pConnection->decodeText(msg.allParams()); if(msg.unrecognized()) { pConnection->console()->output(KVI_OUT_UNRECOGNIZED, diff --git a/src/kvirc/sparser/kvi_sparser.h b/src/kvirc/sparser/kvi_sparser.h index 72139ed..86cd6ff 100644 --- a/src/kvirc/sparser/kvi_sparser.h +++ b/src/kvirc/sparser/kvi_sparser.h @@ -30,7 +30,7 @@ #include <time.h> -#include <qobject.h> +#include <tqobject.h> #include "kvi_pointerlist.h" #include "kvi_qstring.h" @@ -51,7 +51,7 @@ class KviIrcConnection; _msg->setUnrecognized(); \ m_szLastParserError = _err; -#define IS_ME(_msg,_nick) KviQString::equalCI(_msg->connection()->currentNickName(),_nick) +#define IS_ME(_msg,_nick) KviTQString::equalCI(_msg->connection()->currentNickName(),_nick) typedef void (KviServerParser::*messageParseProc)(KviIrcMessage *); @@ -67,13 +67,13 @@ typedef struct _KviCtcpMessage { KviIrcMessage * msg; const char * pData; - QString szTarget; + TQString szTarget; KviIrcMask * pSource; bool bIgnored; bool bIsFlood; bool bUnknown; - QString szTag; + TQString szTag; } KviCtcpMessage; typedef struct _KviDccRequest @@ -117,9 +117,10 @@ public: }; -class KVIRC_API KviServerParser : public QObject +class KVIRC_API KviServerParser : public TQObject { Q_OBJECT + TQ_OBJECT public: KviServerParser(); ~KviServerParser(); @@ -221,7 +222,7 @@ private: void parseLiteralWallops(KviIrcMessage *msg); void parseLiteralPong(KviIrcMessage *msg); void parseLiteralError(KviIrcMessage *msg); - void parseChannelMode(const QString &szNick,const QString &szUser,const QString &szHost,KviChannel * chan,KviStr &modefl,KviIrcMessage *msg,int curParam); + void parseChannelMode(const TQString &szNick,const TQString &szUser,const TQString &szHost,KviChannel * chan,KviStr &modefl,KviIrcMessage *msg,int curParam); void parseUserMode(KviIrcMessage *msg,const char * modeflptr); @@ -253,11 +254,11 @@ private: // void parseCtcpReply(const char * msg_ptr,KviIrcUser &source,const char * target); public: static void encodeCtcpParameter(const char * param,KviStr &buffer,bool bSpaceBreaks = true); - static void encodeCtcpParameter(const char * param,QString &buffer,bool bSpaceBreaks = true); + static void encodeCtcpParameter(const char * param,TQString &buffer,bool bSpaceBreaks = true); static const char * decodeCtcpEscape(const char * msg_ptr,KviStr &buffer); - static const char * decodeCtcpEscape(const char * msg_ptr,KviQCString &buffer); + static const char * decodeCtcpEscape(const char * msg_ptr,KviTQCString &buffer); static const char * extractCtcpParameter(const char * msg_ptr,KviStr &buffer,bool bSpaceBreaks = true); - static const char * extractCtcpParameter(const char * msg_ptr,QString &buffer,bool bSpaceBreaks = true); + static const char * extractCtcpParameter(const char * msg_ptr,TQString &buffer,bool bSpaceBreaks = true); }; #ifndef _KVI_SPARSER_CPP_ diff --git a/src/kvirc/ui/kvi_actiondrawer.cpp b/src/kvirc/ui/kvi_actiondrawer.cpp index a465914..bfa7eb5 100644 --- a/src/kvirc/ui/kvi_actiondrawer.cpp +++ b/src/kvirc/ui/kvi_actiondrawer.cpp @@ -30,19 +30,19 @@ #include "kvi_iconmanager.h" #include "kvi_locale.h" -#include <qlayout.h> -#include <qlabel.h> -//#include <qscrollview.h> -#include <qpainter.h> -#include <qpixmap.h> +#include <tqlayout.h> +#include <tqlabel.h> +//#include <tqscrollview.h> +#include <tqpainter.h> +#include <tqpixmap.h> #ifdef COMPILE_USE_QT4 - #include <q3header.h> - #include <q3simplerichtext.h> - #include <qmime.h> - #include <qevent.h> + #include <tq3header.h> + #include <tq3simplerichtext.h> + #include <tqmime.h> + #include <tqevent.h> #else - #include <qheader.h> - #include <qsimplerichtext.h> + #include <tqheader.h> + #include <tqsimplerichtext.h> #endif #include "kvi_draganddrop.h" @@ -59,7 +59,7 @@ KviActionDrawerPageListViewItem::KviActionDrawerPageListViewItem(KviTalListView m_pListView = v; setDragEnabled(true); m_szName = a->name(); - QString t = "<b>" + a->visibleName() + "</b>"; + TQString t = "<b>" + a->visibleName() + "</b>"; if(a->isKviUserActionNeverOverrideThis()) t += " <font color=\"#a0a0a0\">[" + __tr2qs("Script") + "]</font>"; t += "<br><font size=\"-1\">" + a->description()+ "</font>"; @@ -67,10 +67,10 @@ KviActionDrawerPageListViewItem::KviActionDrawerPageListViewItem(KviTalListView #ifdef COMPILE_USE_QT4 m_pText = new Q3SimpleRichText(t,v->font()); #else - m_pText = new QSimpleRichText(t,v->font()); + m_pText = new TQSimpleRichText(t,v->font()); #endif - QPixmap * p = a->bigIcon(); - m_pIcon = p ? new QPixmap(*p) : new QPixmap(LVI_ICON_SIZE,LVI_ICON_SIZE); + TQPixmap * p = a->bigIcon(); + m_pIcon = p ? new TQPixmap(*p) : new TQPixmap(LVI_ICON_SIZE,LVI_ICON_SIZE); } KviActionDrawerPageListViewItem::~KviActionDrawerPageListViewItem() @@ -79,7 +79,7 @@ KviActionDrawerPageListViewItem::~KviActionDrawerPageListViewItem() delete m_pText; } -QString KviActionDrawerPageListViewItem::key(int,bool) const +TQString KviActionDrawerPageListViewItem::key(int,bool) const { return m_szKey; } @@ -96,29 +96,29 @@ void KviActionDrawerPageListViewItem::setup() setHeight(iHeight); } -void KviActionDrawerPageListViewItem::paintCell(QPainter * p,const QColorGroup & cg,int column,int width,int align) +void KviActionDrawerPageListViewItem::paintCell(TQPainter * p,const TQColorGroup & cg,int column,int width,int align) { KviTalListViewItem::paintCell(p,cg,column,width,align); - //p->fillRect(QRect(0,0,width,height()),isSelected() ? cg.highlight() : cg.base()); + //p->fillRect(TQRect(0,0,width,height()),isSelected() ? cg.highlight() : cg.base()); p->drawPixmap(LVI_BORDER,LVI_BORDER,*m_pIcon); int afterIcon = LVI_BORDER + LVI_ICON_SIZE + LVI_SPACING; int www = m_pListView->visibleWidth() - (afterIcon + LVI_BORDER); m_pText->setWidth(www); if(isSelected()) { - QColorGroup cg2(cg); - cg2.setColor(QColorGroup::HighlightedText,cg.text()); - m_pText->draw(p,afterIcon,LVI_BORDER,QRect(afterIcon,LVI_BORDER,www,height() - (LVI_BORDER * 2)),cg2); + TQColorGroup cg2(cg); + cg2.setColor(TQColorGroup::HighlightedText,cg.text()); + m_pText->draw(p,afterIcon,LVI_BORDER,TQRect(afterIcon,LVI_BORDER,www,height() - (LVI_BORDER * 2)),cg2); } else { - m_pText->draw(p,afterIcon,LVI_BORDER,QRect(afterIcon,LVI_BORDER,www,height() - (LVI_BORDER * 2)),cg); + m_pText->draw(p,afterIcon,LVI_BORDER,TQRect(afterIcon,LVI_BORDER,www,height() - (LVI_BORDER * 2)),cg); } } KviActionDrawerPageListView::KviActionDrawerPageListView(KviActionDrawerPage * pParent) : KviListView(pParent) { - QPixmap * p = g_pIconManager->getImage("kvi_actiondrawer.png"); - if(p)setBackgroundOverlayPixmap(p,Qt::AlignRight | Qt::AlignBottom); + TQPixmap * p = g_pIconManager->getImage("kvi_actiondrawer.png"); + if(p)setBackgroundOverlayPixmap(p,TQt::AlignRight | TQt::AlignBottom); // m_pPage = pParent; setSelectionMode(Single); @@ -134,17 +134,17 @@ KviActionDrawerPageListView::~KviActionDrawerPageListView() } -void KviActionDrawerPageListView::contentsMousePressEvent(QMouseEvent * e) +void KviActionDrawerPageListView::contentsMousePressEvent(TQMouseEvent * e) { KviListView::contentsMousePressEvent(e); - KviActionDrawerPageListViewItem * i = (KviActionDrawerPageListViewItem *)itemAt(QPoint(5,contentsToViewport(e->pos()).y())); + KviActionDrawerPageListViewItem * i = (KviActionDrawerPageListViewItem *)itemAt(TQPoint(5,contentsToViewport(e->pos()).y())); if(!i)return; KviTextDrag * dr = new KviTextDrag(i->name(),this); // does this leak memory ? - if(i->icon())dr->setPixmap(*(i->icon()),QPoint(3,3)); + if(i->icon())dr->setPixmap(*(i->icon()),TQPoint(3,3)); dr->dragCopy(); } -void KviActionDrawerPageListView::resizeEvent(QResizeEvent * e) +void KviActionDrawerPageListView::resizeEvent(TQResizeEvent * e) { KviListView::resizeEvent(e); int iWidth = visibleWidth(); @@ -153,13 +153,13 @@ void KviActionDrawerPageListView::resizeEvent(QResizeEvent * e) } -KviActionDrawerPage::KviActionDrawerPage(QWidget * pParent,const QString &szDescription) -: QWidget(pParent) +KviActionDrawerPage::KviActionDrawerPage(TQWidget * pParent,const TQString &szDescription) +: TQWidget(pParent) { - QGridLayout * g = new QGridLayout(this,2,1,4,4); + TQGridLayout * g = new TQGridLayout(this,2,1,4,4); - QString t = "<b>" + szDescription + "</b>"; - QLabel * l = new QLabel(t,this); + TQString t = "<b>" + szDescription + "</b>"; + TQLabel * l = new TQLabel(t,this); g->addWidget(l,0,0); m_pListView = new KviActionDrawerPageListView(this); @@ -178,8 +178,8 @@ void KviActionDrawerPage::add(KviAction * a) (void)new KviActionDrawerPageListViewItem(m_pListView,a); } -KviActionDrawer::KviActionDrawer(QWidget * pParent) -: QTabWidget(pParent) +KviActionDrawer::KviActionDrawer(TQWidget * pParent) +: TQTabWidget(pParent) { setMinimumWidth(400); setMinimumHeight(300); @@ -193,22 +193,22 @@ void KviActionDrawer::fill() { KviActionManager::loadAllAvailableActions(); - KviPointerHashTable<QString,KviActionDrawerPage> pages; + KviPointerHashTable<TQString,KviActionDrawerPage> pages; pages.setAutoDelete(false); - KviPointerHashTable<QString,KviAction> * d = KviActionManager::instance()->actions(); + KviPointerHashTable<TQString,KviAction> * d = KviActionManager::instance()->actions(); if(!d)return; // ooops - KviPointerHashTableIterator<QString,KviAction> it(*d); + KviPointerHashTableIterator<TQString,KviAction> it(*d); while(KviAction * a = it.current()) { KviActionCategory * c = a->category(); if(!c)c = KviActionManager::categoryGeneric(); - KviActionDrawerPage * p = pages.find(c->visibleName()); + KviActionDrawerPage * p = pages.tqfind(c->visibleName()); if(!p) { p = new KviActionDrawerPage(this,c->description()); - pages.replace(c->visibleName(),p); + pages.tqreplace(c->visibleName(),p); addTab(p,c->visibleName()); //p->show(); } @@ -216,7 +216,7 @@ void KviActionDrawer::fill() ++it; } - KviActionDrawerPage * p = pages.find(KviActionManager::categoryIrc()->visibleName()); + KviActionDrawerPage * p = pages.tqfind(KviActionManager::categoryIrc()->visibleName()); if(p) { int iii = indexOf(p); diff --git a/src/kvirc/ui/kvi_actiondrawer.h b/src/kvirc/ui/kvi_actiondrawer.h index d9cd277..fa405f3 100644 --- a/src/kvirc/ui/kvi_actiondrawer.h +++ b/src/kvirc/ui/kvi_actiondrawer.h @@ -27,17 +27,17 @@ #include "kvi_settings.h" #include "kvi_qstring.h" -#include <qwidget.h> -#include <qtabwidget.h> +#include <tqwidget.h> +#include <tqtabwidget.h> #include "kvi_listview.h" class KviActionDrawerPage; -class QPixmap; +class TQPixmap; #ifdef COMPILE_USE_QT4 class Q3SimpleRichText; #else - class QSimpleRichText; + class TQSimpleRichText; #endif class KviAction; @@ -47,28 +47,29 @@ public: KviActionDrawerPageListViewItem(KviTalListView * v,KviAction * a); ~KviActionDrawerPageListViewItem(); protected: - QString m_szName; + TQString m_szName; #ifdef COMPILE_USE_QT4 Q3SimpleRichText * m_pText; #else - QSimpleRichText * m_pText; + TQSimpleRichText * m_pText; #endif - QPixmap * m_pIcon; + TQPixmap * m_pIcon; KviTalListView * m_pListView; - QString m_szKey; + TQString m_szKey; public: - QPixmap * icon(){ return m_pIcon; }; - const QString & name(){ return m_szName; }; + TQPixmap * icon(){ return m_pIcon; }; + const TQString & name(){ return m_szName; }; protected: - virtual void paintCell(QPainter * p,const QColorGroup & cg,int column,int width,int align); + virtual void paintCell(TQPainter * p,const TQColorGroup & cg,int column,int width,int align); virtual void setup(); - virtual QString key(int,bool) const; + virtual TQString key(int,bool) const; }; class KVIRC_API KviActionDrawerPageListView : public KviListView { friend class KviActionDrawerPage; Q_OBJECT + TQ_OBJECT protected: KviActionDrawerPageListView(KviActionDrawerPage * pParent); public: @@ -76,16 +77,17 @@ public: //protected: // KviActionDrawerPage * m_pPage; protected: - virtual void resizeEvent(QResizeEvent * e); - virtual void contentsMousePressEvent(QMouseEvent * e); + virtual void resizeEvent(TQResizeEvent * e); + virtual void contentsMousePressEvent(TQMouseEvent * e); }; -class KVIRC_API KviActionDrawerPage : public QWidget +class KVIRC_API KviActionDrawerPage : public TQWidget { friend class KviActionDrawer; Q_OBJECT + TQ_OBJECT protected: - KviActionDrawerPage(QWidget * pParent,const QString &szDescription); + KviActionDrawerPage(TQWidget * pParent,const TQString &szDescription); public: ~KviActionDrawerPage(); protected: @@ -94,11 +96,12 @@ protected: void add(KviAction * a); }; -class KVIRC_API KviActionDrawer : public QTabWidget +class KVIRC_API KviActionDrawer : public TQTabWidget { Q_OBJECT + TQ_OBJECT public: - KviActionDrawer(QWidget * pParent); + KviActionDrawer(TQWidget * pParent); ~KviActionDrawer(); public: void fill(); diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp index a06ab14..8ad6ffb 100644 --- a/src/kvirc/ui/kvi_channel.cpp +++ b/src/kvirc/ui/kvi_channel.cpp @@ -69,15 +69,15 @@ #include <time.h> -#include <qsplitter.h> -#include <qtoolbutton.h> -#include <qlabel.h> -#include <qevent.h> +#include <tqsplitter.h> +#include <tqtoolbutton.h> +#include <tqlabel.h> +#include <tqevent.h> -#include <qpalette.h> +#include <tqpalette.h> #include "kvi_tal_popupmenu.h" #include "kvi_pointerhashtable.h" -#include <qmessagebox.h> +#include <tqmessagebox.h> #include "kvi_tal_widgetstack.h" #ifndef AVERAGE_CHANNEL_USERS @@ -107,16 +107,16 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name m_pActionHistory->setAutoDelete(true); m_uActionHistoryHotActionCount = 0; - m_pTmpHighLighted = new KviPointerHashTable<const char *,QString>(); + m_pTmpHighLighted = new KviPointerHashTable<const char *,TQString>(); m_pTmpHighLighted->setAutoDelete(true); // Register ourselves connection()->registerChannel(this); - // And create the widgets layout + // And create the widgets tqlayout // Button box m_pButtonBox = new KviTalHBox(this); - m_pTopSplitter = new QSplitter(Qt::Horizontal,m_pButtonBox); + m_pTopSplitter = new TQSplitter(Qt::Horizontal,m_pButtonBox); m_pButtonBox->setStretchFactor(m_pTopSplitter,1); @@ -125,8 +125,8 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name // Topic widget on the left m_pTopicWidget = new KviTopicWidget(m_pTopSplitter,"topic_widget"); - connect(m_pTopicWidget,SIGNAL(topicSelected(const QString &)), - this,SLOT(topicSelected(const QString &))); + connect(m_pTopicWidget,TQT_SIGNAL(topicSelected(const TQString &)), + this,TQT_SLOT(topicSelected(const TQString &))); // mode label follows the topic widget m_pModeWidget = new KviModeWidget(m_pTopSplitter,this,"mode_"); KviTalToolTip::add(m_pModeWidget,__tr2qs("Channel mode")); @@ -134,7 +134,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name createTextEncodingButton(m_pButtonContainer); // Central splitter - m_pSplitter = new QSplitter(Qt::Horizontal,this); + m_pSplitter = new TQSplitter(Qt::Horizontal,this); #ifdef COMPILE_USE_QT4 m_pSplitter->setObjectName(name); #else @@ -142,7 +142,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name #endif m_pSplitter->setOpaqueResize(false); // Spitted vertially on the left - m_pVertSplitter = new QSplitter(Qt::Vertical,m_pSplitter); + m_pVertSplitter = new TQSplitter(Qt::Vertical,m_pSplitter); m_pVertSplitter->setOpaqueResize(false); // With the IRC view over m_pIrcView = new KviIrcView(m_pVertSplitter,lpFrm,this); @@ -151,7 +151,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name #else m_pIrcView->setName(name); #endif - connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked())); + connect(m_pIrcView,TQT_SIGNAL(rightClicked()),this,TQT_SLOT(textViewRightClicked())); // And the double view (that may be unused) m_pMessageView = 0; // The userlist on the right @@ -160,29 +160,29 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name // and the related buttons m_pDoubleViewButton = createToolButton(m_pButtonContainer,"double_view_button",KVI_SMALLICON_HIDEDOUBLEVIEW,KVI_SMALLICON_SHOWDOUBLEVIEW,__tr2qs("Split View"),false); - connect(m_pDoubleViewButton,SIGNAL(clicked()),this,SLOT(toggleDoubleView())); + connect(m_pDoubleViewButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleDoubleView())); m_pListViewButton = new KviWindowToolPageButton(KVI_SMALLICON_HIDELISTVIEW,KVI_SMALLICON_SHOWLISTVIEW,__tr2qs("User List"),buttonContainer(),true,"list_view_button"); - connect(m_pListViewButton,SIGNAL(clicked()),this,SLOT(toggleListView())); + connect(m_pListViewButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleListView())); m_pBanEditorButton = new KviWindowToolPageButton(KVI_SMALLICON_UNBAN,KVI_SMALLICON_BAN,__tr2qs("Ban Editor"),buttonContainer(),false,"ban_editor_button"); - connect(m_pBanEditorButton,SIGNAL(clicked()),this,SLOT(toggleBanEditor())); + connect(m_pBanEditorButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleBanEditor())); - if(m_pConsole->connection()->serverInfo()->supportedListModes().contains('e')) + if(m_pConsole->connection()->serverInfo()->supportedListModes().tqcontains('e')) { m_pBanExceptionEditorButton =new KviWindowToolPageButton(KVI_SMALLICON_BANUNEXCEPT,KVI_SMALLICON_BANEXCEPT,__tr2qs("Ban Exception Editor"),buttonContainer(),false,"ban_exception_editor_button"); - connect(m_pBanExceptionEditorButton,SIGNAL(clicked()),this,SLOT(toggleBanExceptionEditor())); + connect(m_pBanExceptionEditorButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleBanExceptionEditor())); } else { m_pBanExceptionEditorButton=0; } - if(m_pConsole->connection()->serverInfo()->supportedListModes().contains('I')) + if(m_pConsole->connection()->serverInfo()->supportedListModes().tqcontains('I')) { m_pInviteEditorButton =new KviWindowToolPageButton(KVI_SMALLICON_INVITEUNEXCEPT,KVI_SMALLICON_INVITEEXCEPT,__tr2qs("Invite Exception Editor"),buttonContainer(),false,"invite_exception_editor_button"); - connect(m_pInviteEditorButton,SIGNAL(clicked()),this,SLOT(toggleInviteEditor())); + connect(m_pInviteEditorButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleInviteEditor())); } else { m_pInviteEditorButton = 0; } m_pModeEditorButton = new KviWindowToolPageButton(KVI_SMALLICON_CHANMODEHIDE,KVI_SMALLICON_CHANMODE,__tr2qs("Mode Editor"),buttonContainer(),false,"mode_editor_button"); - connect(m_pModeEditorButton,SIGNAL(clicked()),this,SLOT(toggleModeEditor())); + connect(m_pModeEditorButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleModeEditor())); m_pModeEditor = 0; #ifdef COMPILE_CRYPT_SUPPORT @@ -201,7 +201,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name if(g_pIconManager->getBigIcon("kvi_horizontal_left.png")) m_pHideToolsButton->setPixmap(*(g_pIconManager->getBigIcon("kvi_horizontal_left.png"))); - connect(m_pHideToolsButton,SIGNAL(clicked()),this,SLOT(toggleToolButtons())); + connect(m_pHideToolsButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleToolButtons())); m_pUserListView = new KviUserListView(m_pSplitter,m_pListViewButton,connection()->userDataBase(),this, AVERAGE_CHANNEL_USERS,__tr2qs("User List"),"user_list_view"); @@ -209,7 +209,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name // m_pEditorsContainer->raiseWidget(m_pUserListView); // And finally the input line on the bottom m_pInput = new KviInput(this,m_pUserListView); - // no mask editors yet + // no tqmask editors yet m_pBanEditor = 0; m_pBanExceptionEditor = 0; m_pInviteEditor = 0; @@ -220,7 +220,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name if(KVI_OPTION_BOOL(KviOption_boolAutoLogChannels))m_pIrcView->startLogging(); applyOptions(); - m_joinTime = QDateTime::currentDateTime(); + m_joinTime = TQDateTime::tqcurrentDateTime(); m_tLastReceivedWhoReply = (kvi_time_t)m_joinTime.toTime_t(); @@ -245,7 +245,7 @@ void KviChannel::toggleToolButtons() { if(!buttonContainer()) return; toggleButtonContainer(); - QPixmap* pix= buttonContainer()->isVisible() ? + TQPixmap* pix= buttonContainer()->isVisible() ? g_pIconManager->getBigIcon("kvi_horizontal_left.png") : g_pIconManager->getBigIcon("kvi_horizontal_right.png"); if(pix) @@ -262,10 +262,10 @@ void KviChannel::textViewRightClicked() KVS_TRIGGER_EVENT_0(KviEvent_OnChannelPopupRequest,this); } -void KviChannel::getBaseLogFileName(QString &buffer) +void KviChannel::getBaseLogFileName(TQString &buffer) { - QString szChan(windowName()); - szChan.replace(".","%2e"); + TQString szChan(windowName()); + szChan.tqreplace(".","%2e"); if (console()->connection()) { buffer=szChan; @@ -287,11 +287,11 @@ void KviChannel::applyOptions() m_pModeWidget->applyOptions(); - // this applies options for IrcView and Input and forces the window to relayout + // this applies options for IrcView and Input and forces the window to retqlayout KviWindow::applyOptions(); } -void KviChannel::getConfigGroupName(QString &buf) +void KviChannel::getConfigGroupName(TQString &buf) { buf = windowName(); } @@ -302,9 +302,9 @@ void KviChannel::saveProperties(KviConfig *cfg) cfg->writeEntry("TopSplitter",m_pTopSplitter->sizes()); cfg->writeEntry("Splitter",m_pSplitter->sizes()); #ifdef COMPILE_USE_QT4 - QList<int> tmp = m_pVertSplitter->sizes(); + TQList<int> tmp = m_pVertSplitter->sizes(); KviValueList<int> tmp2; - for(QList<int>::Iterator it = tmp.begin();it != tmp.end();++it) + for(TQList<int>::Iterator it = tmp.begin();it != tmp.end();++it) tmp2.append(*it); cfg->writeEntry("VertSplitter",m_pMessageView ? tmp2 : m_VertSplitterSizesList); #else @@ -378,7 +378,7 @@ void KviChannel::showDoubleView(bool bShow) { m_pMessageView->setPrivateBackgroundPixmap(*(m_privateBackground.pixmap())); } - connect(m_pMessageView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked())); + connect(m_pMessageView,TQT_SIGNAL(rightClicked()),this,TQT_SLOT(textViewRightClicked())); m_pMessageView->setMasterView(m_pIrcView); m_pIrcView->splitMessagesTo(m_pMessageView); m_pMessageView->show(); @@ -414,10 +414,10 @@ void KviChannel::toggleModeEditor() resizeEvent(0); } else { m_pModeEditor = new KviModeEditor(m_pSplitter,m_pModeEditorButton,"mode_editor",console(),m_szChannelMode,m_szChannelKey,m_szChannelLimit.ptr()); - connect(m_pModeEditor,SIGNAL(setMode(const char *)),this,SLOT(setMode(const char *))); - connect(m_pModeEditor,SIGNAL(done()),this,SLOT(modeSelectorDone())); + connect(m_pModeEditor,TQT_SIGNAL(setMode(const char *)),this,TQT_SLOT(setMode(const char *))); + connect(m_pModeEditor,TQT_SIGNAL(done()),this,TQT_SLOT(modeSelectorDone())); m_pModeEditor->show(); - //setFocusHandlerNoClass(m_pInput,m_pModeEditor,"QLineEdit"); + //setFocusHandlerNoClass(m_pInput,m_pModeEditor,TQLINEEDIT_OBJECT_NAME_STRING); if(!m_pModeEditorButton->isOn())m_pModeEditorButton->setOn(true); } } @@ -430,7 +430,7 @@ void KviChannel::modeSelectorDone() void KviChannel::setMode(const char * mode) { if(!connection())return; - KviQCString tmp = connection()->encodeText(m_szName); + KviTQCString tmp = connection()->encodeText(m_szName); connection()->sendFmtData("MODE %s %s",tmp.data(),mode); } @@ -490,14 +490,14 @@ void KviChannel::toggleEditor(KviMaskEditor ** ppEd,KviWindowToolPageButton ** p { if(connection()) { - KviQCString szName = connection()->encodeText(m_szName); + KviTQCString szName = connection()->encodeText(m_szName); connection()->sendFmtData("MODE %s %c",szName.data(),flag); } } *ppEd = new KviMaskEditor(m_pSplitter,*ppBtn,l,flag,edName); - connect(*ppEd,SIGNAL(removeMasks(KviMaskEditor *,KviPointerList<KviMaskEntry> *)), - this,SLOT(removeMasks(KviMaskEditor *,KviPointerList<KviMaskEntry> *))); + connect(*ppEd,TQT_SIGNAL(removeMasks(KviMaskEditor *,KviPointerList<KviMaskEntry> *)), + this,TQT_SLOT(removeMasks(KviMaskEditor *,KviPointerList<KviMaskEntry> *))); //setFocusHandler(m_pInput,*ppEd); //socket it! (*ppEd)->show(); if(!(*ppBtn))return; @@ -507,76 +507,76 @@ void KviChannel::toggleEditor(KviMaskEditor ** ppEd,KviWindowToolPageButton ** p void KviChannel::removeMasks(KviMaskEditor *ed,KviPointerList<KviMaskEntry> *l) { - KviStr masks; + KviStr tqmasks; KviStr flags; unsigned int count = 0; for(KviMaskEntry * e = l->first();e;e = l->next()) { - if(masks.hasData())masks.append(' '); - masks.append(e->szMask); + if(tqmasks.hasData())tqmasks.append(' '); + tqmasks.append(e->szMask); flags.append(ed->flag()); count++; if(count == connection()->serverInfo()->maxModeChanges()) { if(connection()) { - KviQCString szName = connection()->encodeText(m_szName); - connection()->sendFmtData("MODE %s -%s %s",szName.data(),flags.ptr(),connection()->encodeText(QString(masks)).data()); + KviTQCString szName = connection()->encodeText(m_szName); + connection()->sendFmtData("MODE %s -%s %s",szName.data(),flags.ptr(),connection()->encodeText(TQString(tqmasks)).data()); } flags = ""; - masks = ""; + tqmasks = ""; count = 0; } } - if(masks.hasData()) + if(tqmasks.hasData()) { if(connection()) { - KviQCString szName = connection()->encodeText(m_szName); - connection()->sendFmtData("MODE %s -%s %s",szName.data(),flags.ptr(),connection()->encodeText(QString(masks)).data()); + KviTQCString szName = connection()->encodeText(m_szName); + connection()->sendFmtData("MODE %s -%s %s",szName.data(),flags.ptr(),connection()->encodeText(TQString(tqmasks)).data()); } } } -QPixmap * KviChannel::myIconPtr() +TQPixmap * KviChannel::myIconPtr() { return g_pIconManager->getSmallIcon((m_iStateFlags & KVI_CHANNEL_STATE_DEADCHAN) ? KVI_SMALLICON_DEADCHANNEL : KVI_SMALLICON_CHANNEL); } -void KviChannel::resizeEvent(QResizeEvent *e) +void KviChannel::resizeEvent(TQResizeEvent *e) { #ifdef COMPILE_USE_QT4 int hght = m_pInput->heightHint(); - int hght2 = m_pTopicWidget->sizeHint().height(); + int hght2 = m_pTopicWidget->tqsizeHint().height(); m_pButtonBox->setGeometry(0,0,width(),hght2); m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2)); m_pInput->setGeometry(0,height() - hght,width(),hght); #else int hght = m_pInput->heightHint(); - int hght2 = m_pButtonBox->sizeHint().height(); + int hght2 = m_pButtonBox->tqsizeHint().height(); m_pButtonBox->setGeometry(0,0,width(),hght2); m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2)); m_pInput->setGeometry(0,height() - hght,width(),hght); #endif } -QSize KviChannel::sizeHint() const +TQSize KviChannel::tqsizeHint() const { - QSize ret(m_pSplitter->sizeHint().width(), - m_pIrcView->sizeHint().height() + m_pInput->heightHint() + m_pButtonBox->sizeHint().height()); + TQSize ret(m_pSplitter->tqsizeHint().width(), + m_pIrcView->tqsizeHint().height() + m_pInput->heightHint() + m_pButtonBox->tqsizeHint().height()); return ret; } void KviChannel::setChannelMode(char mode,bool bAdd) { - if(!m_pConsole->connection()->serverInfo()->supportedListModes().contains(mode)){ + if(!m_pConsole->connection()->serverInfo()->supportedListModes().tqcontains(mode)){ if(bAdd) { - if(!(m_szChannelMode.contains(mode)))m_szChannelMode.append(mode); + if(!(m_szChannelMode.tqcontains(mode)))m_szChannelMode.append(mode); } else { - if(m_szChannelMode.contains(mode)) + if(m_szChannelMode.tqcontains(mode)) { - m_szChannelMode.replace(mode,""); + m_szChannelMode.tqreplace(mode,""); } } updateModeLabel(); @@ -602,7 +602,7 @@ void KviChannel::addHighlightedUser(const char * nick) { if(!m_pUserListView->findEntry(nick))return; else - m_pTmpHighLighted->replace(nick,new QString()); + m_pTmpHighLighted->tqreplace(nick,new TQString()); } void KviChannel::removeHighlightedUser(const char * nick) @@ -610,7 +610,7 @@ void KviChannel::removeHighlightedUser(const char * nick) m_pTmpHighLighted->remove(nick); } -void KviChannel::getChannelModeString(QString &buffer) +void KviChannel::getChannelModeString(TQString &buffer) { buffer = m_szChannelMode; if(!m_szChannelKey.isEmpty())buffer.append('k'); @@ -655,7 +655,7 @@ void KviChannel::setAliveChan() m_iStateFlags = 0; setType(KVI_WINDOW_TYPE_CHANNEL); m_pUserListView->setUserDataBase(connection()->userDataBase()); - m_joinTime = QDateTime::currentDateTime(); + m_joinTime = TQDateTime::tqcurrentDateTime(); context()->unregisterDeadChannel(this); connection()->registerChannel(this); // Update log file name @@ -665,7 +665,7 @@ void KviChannel::setAliveChan() m_pTopicWidget->reset(); // reset the topic (fixes bug #20 signaled by Klaus Weidenbach) } -void KviChannel::getTalkingUsersStats(QString &buffer,QStringList &l,bool bPast) +void KviChannel::getTalkingUsersStats(TQString &buffer,TQStringList &l,bool bPast) { if(l.count() < 1)return; @@ -704,29 +704,29 @@ void KviChannel::getTalkingUsersStats(QString &buffer,QStringList &l,bool bPast) } else { // (l.count() - 1) is > 1 buffer += "</b> "; - buffer += __tr2qs("and other %1 users").arg(l.count() - 1); + buffer += __tr2qs("and other %1 users").tqarg(l.count() - 1); } buffer += " "; buffer += bPast ? __tr2qs("were talking recently") : __tr2qs("are talking"); } } -void KviChannel::getTaskBarTipText(QString &buffer) +void KviChannel::getTaskBarTipText(TQString &buffer) { - static QString html_bold("<b>"); - static QString html_tab(" "); - static QString html_eofbold("</b> "); - static QString p5(" ("); + static TQString html_bold("<b>"); + static TQString html_tab(" "); + static TQString html_eofbold("</b> "); + static TQString p5(" ("); // p6 == p4 - static QString p7(" ("); - static QString p8(": "); - static QString p9(")"); - static QString p10("<br>"); + static TQString p7(" ("); + static TQString p8(": "); + static TQString p9(")"); + static TQString p10("<br>"); - static QString end_of_doc = "</table></body></html>"; - static QString end_of_fontboldrow = END_TABLE_BOLD_ROW; - static QString start_of_row = "<tr><td>"; - static QString end_of_row = "</td></tr>"; + static TQString end_of_doc = "</table></body></html>"; + static TQString end_of_fontboldrow = END_TABLE_BOLD_ROW; + static TQString start_of_row = "<tr><td>"; + static TQString end_of_row = "</td></tr>"; buffer = "<html>" \ "<body>" \ @@ -750,15 +750,15 @@ void KviChannel::getTaskBarTipText(QString &buffer) buffer += start_of_row; - QString op = __tr2qs("operator"); - QString ops = __tr2qs("operators"); + TQString op = __tr2qs("operator"); + TQString ops = __tr2qs("operators"); ////////////////////// buffer += html_tab; buffer += html_bold; - QString num; + TQString num; num.setNum(s.uActive); buffer += num; @@ -940,7 +940,7 @@ void KviChannel::getTaskBarTipText(QString &buffer) if(cas.dActionsPerMinute >= 0.1) { - QString num; + TQString num; num.sprintf(" [%u%% ",cas.uHotActionPercent); buffer += num; buffer += __tr2qs("human"); @@ -955,15 +955,15 @@ void KviChannel::getTaskBarTipText(QString &buffer) void KviChannel::fillCaptionBuffers() { - static QString begin("<nobr><font color=\""); - static QString boldbegin("\"><b>"); - static QString endofbold("</b></font> <font color=\""); - static QString endoffont("\">"); - static QString end("</font></nobr>"); + static TQString begin("<nobr><font color=\""); + static TQString boldbegin("\"><b>"); + static TQString endofbold("</b></font> <font color=\""); + static TQString endoffont("\">"); + static TQString end("</font></nobr>"); if(!connection()) { - QString dead = __tr2qs("[Dead channel]"); + TQString dead = __tr2qs("[Dead channel]"); m_szNameWithUserFlag = m_szName; @@ -998,13 +998,13 @@ void KviChannel::fillCaptionBuffers() if(uFlag) { - m_szNameWithUserFlag = QChar(uFlag); + m_szNameWithUserFlag = TQChar(uFlag); m_szNameWithUserFlag += m_szName; } else { m_szNameWithUserFlag = m_szName; } - QString szChanMode; + TQString szChanMode; getChannelModeString(szChanMode); m_szPlainTextCaption = m_szNameWithUserFlag; @@ -1012,16 +1012,16 @@ void KviChannel::fillCaptionBuffers() { m_szPlainTextCaption += " (+"; m_szPlainTextCaption += szChanMode; - m_szPlainTextCaption += QChar(')'); + m_szPlainTextCaption += TQChar(')'); } - QString szNickOnServer = QChar('['); + TQString szNickOnServer = TQChar('['); szNickOnServer += connection()->currentNickName(); szNickOnServer += __tr2qs(" on "); szNickOnServer += connection()->currentServerName(); - szNickOnServer += QChar(']'); + szNickOnServer += TQChar(']'); - m_szPlainTextCaption += QChar(' '); + m_szPlainTextCaption += TQChar(' '); m_szPlainTextCaption += szNickOnServer; m_szHtmlActiveCaption = begin; @@ -1045,12 +1045,12 @@ void KviChannel::fillCaptionBuffers() m_szHtmlInactiveCaption += end; } -void KviChannel::ownMessage(const QString &buffer) +void KviChannel::ownMessage(const TQString &buffer) { if(!connection())return; - KviQCString szName = connection()->encodeText(windowName()); - KviQCString szData = encodeText(buffer); + KviTQCString szName = connection()->encodeText(windowName()); + KviTQCString szData = encodeText(buffer); const char * d = szData.data(); if(!d)return; @@ -1068,20 +1068,20 @@ void KviChannel::ownMessage(const QString &buffer) case KviCryptEngine::Encrypted: if(!connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),encrypted.ptr()))return; m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED, - QString::null,QString::null,QString::null,buffer,KviConsole::NoNotifications); + TQString(),TQString(),TQString(),buffer,KviConsole::NoNotifications); break; case KviCryptEngine::Encoded: { if(!connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),encrypted.ptr()))return; // ugly ,but we must redecode here - QString szRedecoded = decodeText(encrypted.ptr()); + TQString szRedecoded = decodeText(encrypted.ptr()); m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG, - QString::null,QString::null,QString::null,szRedecoded,KviConsole::NoNotifications); + TQString(),TQString(),TQString(),szRedecoded,KviConsole::NoNotifications); } break; default: // also case KviCryptEngine::EncryptError { - QString szEngineError = cryptSessionInfo()->pEngine->lastError(); + TQString szEngineError = cryptSessionInfo()->pEngine->lastError(); output(KVI_OUT_SYSTEMERROR, __tr2qs("The crypto engine was unable to encrypt the current message (%Q): %Q, no data sent to the server"), &buffer,&szEngineError); @@ -1092,9 +1092,9 @@ void KviChannel::ownMessage(const QString &buffer) return; } else { d++; //eat the escape code - QString tmp = buffer.right(buffer.length() - 1); + TQString tmp = buffer.right(buffer.length() - 1); if(!connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),d))return; - m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString::null,QString::null,QString::null,tmp,KviConsole::NoNotifications); + m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,TQString(),TQString(),TQString(),tmp,KviConsole::NoNotifications); userAction(connection()->currentNickName(),KVI_USERACTION_PRIVMSG); return; } @@ -1104,21 +1104,21 @@ void KviChannel::ownMessage(const QString &buffer) if(connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),d)) { - m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString::null,QString::null,QString::null,buffer,KviConsole::NoNotifications); + m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,TQString(),TQString(),TQString(),buffer,KviConsole::NoNotifications); userAction(connection()->currentNickName(),KVI_USERACTION_PRIVMSG); } } -void KviChannel::ownAction(const QString &buffer) +void KviChannel::ownAction(const TQString &buffer) { if(!connection())return; - KviQCString szName = connection()->encodeText(m_szName); - KviQCString szData = encodeText(buffer); + KviTQCString szName = connection()->encodeText(m_szName); + KviTQCString szData = encodeText(buffer); const char * d = szData.data(); if(!d)return; if(!connection()->sendFmtData("PRIVMSG %s :%cACTION %s%c",szName.data(),0x01,d,0x01))return; - if(KVS_TRIGGER_EVENT_1_HALTED(KviEvent_OnMeAction,this,QString(d)))return; - QString szBuffer = "\r!nc\r"; + if(KVS_TRIGGER_EVENT_1_HALTED(KviEvent_OnMeAction,this,TQString(d)))return; + TQString szBuffer = "\r!nc\r"; szBuffer += connection()->currentNickName(); szBuffer += "\r "; szBuffer += buffer; @@ -1126,14 +1126,14 @@ void KviChannel::ownAction(const QString &buffer) userAction(connection()->currentNickName(),KVI_USERACTION_ACTION); } -bool KviChannel::nickChange(const QString &oldNick,const QString &newNick) +bool KviChannel::nickChange(const TQString &oldNick,const TQString &newNick) { bool bWasHere = m_pUserListView->nickChange(oldNick,newNick); if(bWasHere)channelAction(newNick,KVI_USERACTION_NICK,kvi_getUserActionTemperature(KVI_USERACTION_NICK)); return bWasHere; } -bool KviChannel::part(const QString &nick) +bool KviChannel::part(const TQString &nick) { bool bWasHere = m_pUserListView->part(nick); if(bWasHere)channelAction(nick,KVI_USERACTION_PART,kvi_getUserActionTemperature(KVI_USERACTION_PART)); @@ -1170,7 +1170,7 @@ bool KviChannel::activityMeter(unsigned int * puActivityValue,unsigned int * puA if(m_pActionHistory->count() < KVI_CHANNEL_ACTION_HISTORY_MAX_COUNT) { - if(m_joinTime.secsTo(QDateTime::currentDateTime()) < KVI_CHANNEL_ACTION_HISTORY_MAX_TIMESPAN) + if(m_joinTime.secsTo(TQDateTime::tqcurrentDateTime()) < KVI_CHANNEL_ACTION_HISTORY_MAX_TIMESPAN) { // we can't exactly estimate if(dSpan < 60.0)dSpan = 60.0; @@ -1208,7 +1208,7 @@ bool KviChannel::activityMeter(unsigned int * puActivityValue,unsigned int * puA } -void KviChannel::channelAction(const QString &nick,unsigned int uActionType,int iTemperature) +void KviChannel::channelAction(const TQString &nick,unsigned int uActionType,int iTemperature) { KviChannelAction * a = new KviChannelAction; a->tTime = kvi_unixTime(); @@ -1281,7 +1281,7 @@ void KviChannel::getChannelActivityStats(KviChannelActivityStats * s) if(s->uActionCount < KVI_CHANNEL_ACTION_HISTORY_MAX_COUNT) { - if(m_joinTime.secsTo(QDateTime::currentDateTime()) < KVI_CHANNEL_ACTION_HISTORY_MAX_TIMESPAN) + if(m_joinTime.secsTo(TQDateTime::tqcurrentDateTime()) < KVI_CHANNEL_ACTION_HISTORY_MAX_TIMESPAN) { // we can't exactly estimate s->bStatsInaccurate = true; @@ -1301,7 +1301,7 @@ void KviChannel::getChannelActivityStats(KviChannelActivityStats * s) tTwoMinsAgo-= 120; tNow -= 60; - KviPointerHashTable<QString,int> userDict; + KviPointerHashTable<TQString,int> userDict; userDict.setAutoDelete(false); int fake; @@ -1319,7 +1319,7 @@ void KviChannel::getChannelActivityStats(KviChannelActivityStats * s) (a->uActionType == KVI_USERACTION_NOTICE) || (a->uActionType == KVI_USERACTION_ACTION)) { - if(!userDict.find(a->szNick)) + if(!userDict.tqfind(a->szNick)) { if(isOn(a->szNick.ascii())) { @@ -1338,14 +1338,14 @@ void KviChannel::getChannelActivityStats(KviChannelActivityStats * s) -void KviChannel::userAction(const QString &nick,const QString &user,const QString &host,unsigned int uActionType) +void KviChannel::userAction(const TQString &nick,const TQString &user,const TQString &host,unsigned int uActionType) { int iTemperature = kvi_getUserActionTemperature(uActionType); channelAction(nick,uActionType,iTemperature); m_pUserListView->userAction(nick,user,host,iTemperature); } -void KviChannel::userAction(const QString &nick,unsigned int uActionType) +void KviChannel::userAction(const TQString &nick,unsigned int uActionType) { int iTemperature = kvi_getUserActionTemperature(uActionType); channelAction(nick,uActionType,iTemperature); @@ -1359,15 +1359,15 @@ void KviChannel::userAction(KviIrcMask * user,unsigned int uActionType) m_pUserListView->userAction(user,iTemperature); } -void KviChannel::topicSelected(const QString & topic) +void KviChannel::topicSelected(const TQString & topic) { if(!connection())return; - KviQCString szEncoded = encodeText(topic); - KviQCString szName = connection()->encodeText(m_szName); + KviTQCString szEncoded = encodeText(topic); + KviTQCString szName = connection()->encodeText(m_szName); connection()->sendFmtData("TOPIC %s :%s",szName.data(),szEncoded.length() ? szEncoded.data() : ""); } -void KviChannel::closeEvent(QCloseEvent *e) +void KviChannel::closeEvent(TQCloseEvent *e) { if((m_iStateFlags & KVI_CHANNEL_STATE_SENTPART) || (m_iStateFlags & KVI_CHANNEL_STATE_DEADCHAN) || !(m_pConsole->isConnected())) { @@ -1378,16 +1378,16 @@ void KviChannel::closeEvent(QCloseEvent *e) // FIXME: #warning "THIS PART SHOULD BECOME A COMMAND /PART $option()..so the identifiers are parsed" if(connection()) { - QString tmp = KVI_OPTION_STRING(KviOption_stringPartMessage); - tmp.replace(";","\\;"); - tmp.replace("\n"," "); + TQString tmp = KVI_OPTION_STRING(KviOption_stringPartMessage); + tmp.tqreplace(";","\\;"); + tmp.tqreplace("\n"," "); KviKvsVariant vRet; if(KviKvsScript::evaluate(tmp,this,0,&vRet))vRet.asString(tmp); - KviQCString dat = encodeText(tmp); + KviTQCString dat = encodeText(tmp); partMessageSent(); - KviQCString szName = connection()->encodeText(m_szName); + KviTQCString szName = connection()->encodeText(m_szName); connection()->sendFmtData("PART %s :%s",szName.data(),dat.data() ? dat.data() : ""); // be sure to not reference ourselves here.. we could be disconnected! } else { @@ -1424,7 +1424,7 @@ int KviChannel::myFlags() } -void KviChannel::setMask(char flag, const QString &mask,bool bAdd,const QString &setBy,unsigned int setAt) +void KviChannel::setMask(char flag, const TQString &tqmask,bool bAdd,const TQString &setBy,unsigned int setAt) { if(!connection())return; KviPointerList<KviMaskEntry> * list = m_pBanList; @@ -1446,21 +1446,21 @@ void KviChannel::setMask(char flag, const QString &mask,bool bAdd,const QString break; } - internalMask(mask,bAdd,setBy,setAt,list,&editor); + internalMask(tqmask,bAdd,setBy,setAt,list,&editor); m_pUserListView->setMaskEntries(flag,(int)list->count()); } -void KviChannel::internalMask(const QString &mask,bool bAdd,const QString &setBy,unsigned int setAt,KviPointerList<KviMaskEntry> *l,KviMaskEditor **ppEd) +void KviChannel::internalMask(const TQString &tqmask,bool bAdd,const TQString &setBy,unsigned int setAt,KviPointerList<KviMaskEntry> *l,KviMaskEditor **ppEd) { KviMaskEntry * e = 0; if(bAdd) { for(e = l->first();e;e = l->next()) { - if(KviQString::equalCI(e->szMask,mask))return; //already there + if(KviTQString::equalCI(e->szMask,tqmask))return; //already there } e = new KviMaskEntry; - e->szMask = mask; + e->szMask = tqmask; e->szSetBy = (!setBy.isEmpty()) ? setBy : __tr2qs("(Unknown)"); e->uSetAt = setAt; l->append(e); @@ -1468,7 +1468,7 @@ void KviChannel::internalMask(const QString &mask,bool bAdd,const QString &setBy } else { for(e = l->first();e;e = l->next()) { - if(KviQString::equalCI(e->szMask,mask))break; + if(KviTQString::equalCI(e->szMask,tqmask))break; } if(e) { @@ -1480,29 +1480,29 @@ void KviChannel::internalMask(const QString &mask,bool bAdd,const QString &setBy void KviChannel::updateModeLabel() { - QString tmp = m_szChannelMode; - QString tip = __tr2qs("<b>Channel mode:</b>"); + TQString tmp = m_szChannelMode; + TQString tip = __tr2qs("<b>Channel mode:</b>"); //const char * aux = m_szChannelMode.utf8().data(); leaks memory and will not work with getChannelModeDescription() (can channel modes be multibyte ?) KviStr mod = m_szChannelMode; const char * aux = mod.ptr(); while(*aux) { - KviQString::appendFormatted(tip,"<br>%c: %Q",*aux,&(m_pConsole->connection()->serverInfo()->getChannelModeDescription(*aux))); + KviTQString::appendFormatted(tip,"<br>%c: %Q",*aux,&(m_pConsole->connection()->serverInfo()->getChannelModeDescription(*aux))); ++aux; } if(!m_szChannelKey.isEmpty()) { if(!tmp.isEmpty())tmp.append(' '); - KviQString::appendFormatted(tmp,"k:%s",m_szChannelKey.utf8().data()); - KviQString::appendFormatted(tip,__tr2qs("<br><b>Key:</b> %s"),m_szChannelKey.utf8().data()); + KviTQString::appendFormatted(tmp,"k:%s",m_szChannelKey.utf8().data()); + KviTQString::appendFormatted(tip,__tr2qs("<br><b>Key:</b> %s"),m_szChannelKey.utf8().data()); } if(m_szChannelLimit.hasData()) { if(!tmp.isEmpty())tmp.append(' '); - KviQString::appendFormatted(tmp,"l:%s",m_szChannelLimit.ptr()); - KviQString::appendFormatted(tip,__tr2qs("<br><b>Limit:</b> %s"),m_szChannelLimit.ptr()); + KviTQString::appendFormatted(tmp,"l:%s",m_szChannelLimit.ptr()); + KviTQString::appendFormatted(tip,__tr2qs("<br><b>Limit:</b> %s"),m_szChannelLimit.ptr()); } m_pModeWidget->refreshModes(); @@ -1541,11 +1541,11 @@ void KviChannel::outputMessage(int msg_type,const char *format,...) } */ -void KviChannel::outputMessage(int msg_type,const QString &msg) +void KviChannel::outputMessage(int msg_type,const TQString &msg) { - QString szBuf(msg); + TQString szBuf(msg); preprocessMessage(szBuf); - const QChar * pC = KviQString::nullTerminatedArray(szBuf); + const TQChar * pC = KviTQString::nullTerminatedArray(szBuf); if(!pC)return; internalOutput(m_pMessageView ? m_pMessageView : m_pIrcView,msg_type,(const kvi_wchar_t *)pC); } @@ -1580,7 +1580,7 @@ void KviChannel::checkChannelSync() // we already have all the spontaneous server replies // (so probably mode, topic (or no topic is set),names) // we have already received the I and e lists (if requested) - kvs_int_t iSyncTime = m_joinTime.time().msecsTo(QTime::currentTime()); + kvs_int_t iSyncTime = m_joinTime.time().msecsTo(TQTime::currentTime()); if(iSyncTime < 0)iSyncTime += 86400000; bool bStop = KVS_TRIGGER_EVENT_1_HALTED(KviEvent_OnChannelSync,this,iSyncTime); @@ -1591,9 +1591,9 @@ void KviChannel::checkChannelSync() } } -bool KviChannel::eventFilter(QObject * o, QEvent * e) +bool KviChannel::eventFilter(TQObject * o, TQEvent * e) { - if(e->type() == QEvent::FocusOut && o == m_pTopicWidget && \ + if(e->type() == TQEvent::FocusOut && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pTopicWidget) && \ m_pTopicWidget->isVisible()) m_pTopicWidget->deactivate(); @@ -1601,20 +1601,20 @@ bool KviChannel::eventFilter(QObject * o, QEvent * e) } -void KviChannel::preprocessMessage(QString & szMessage) +void KviChannel::preprocessMessage(TQString & szMessage) { - QStringList strings = QStringList::split(" ",szMessage, TRUE); - for ( QStringList::Iterator it = strings.begin(); it != strings.end(); ++it ) { - if((*it).contains('\r')) continue; - QString tmp = KviMircCntrl::stripControlBytes(*it); - if( findEntry(*it) ) *it=QString("\r!n\r%1\r").arg(*it); + TQStringList strings = TQStringList::split(" ",szMessage, TRUE); + for ( TQStringList::Iterator it = strings.begin(); it != strings.end(); ++it ) { + if((*it).tqcontains('\r')) continue; + TQString tmp = KviMircCntrl::stripControlBytes(*it); + if( findEntry(*it) ) *it=TQString("\r!n\r%1\r").tqarg(*it); if(m_pConsole) if(m_pConsole->connection()) - if(m_pConsole->connection()->serverInfo()->supportedChannelTypes().contains(tmp[0])) + if(m_pConsole->connection()->serverInfo()->supportedChannelTypes().tqcontains(tmp[0])) if((*it)==tmp) - *it=QString("\r!c\r%1\r").arg(*it); + *it=TQString("\r!c\r%1\r").tqarg(*it); else - *it=QString("\r!c%1\r%2\r").arg(tmp).arg(*it); + *it=TQString("\r!c%1\r%2\r").tqarg(tmp).tqarg(*it); } szMessage=strings.join(" "); } diff --git a/src/kvirc/ui/kvi_channel.h b/src/kvirc/ui/kvi_channel.h index 0efdabb..98f9fc6 100644 --- a/src/kvirc/ui/kvi_channel.h +++ b/src/kvirc/ui/kvi_channel.h @@ -37,13 +37,13 @@ #include "kvi_modew.h" #include "kvi_valuelist.h" -#include <qdatetime.h> +#include <tqdatetime.h> #include "kvi_pointerhashtable.h" -#include <qstringlist.h> +#include <tqstringlist.h> class KviConsole; -class QSplitter; -class QToolButton; +class TQSplitter; +class TQToolButton; class KviTopicWidget; class KviIrcMask; class KviThemedLabel; @@ -51,9 +51,9 @@ class KviTalHBox; #ifdef COMPILE_ON_WINDOWS // windows compiler wants this instead of the forward decl - #include "kvi_maskeditor.h" + #include "kvi_tqmaskeditor.h" #else - typedef struct _KviMaskEntry KviMaskEntry; // kvi_maskeditor.h + typedef struct _KviMaskEntry KviMaskEntry; // kvi_tqmaskeditor.h #endif class KviMaskEditor; class KviModeEditor; @@ -79,7 +79,7 @@ class KviModeEditor; typedef struct _KviChannelAction { - QString szNick; // action source nick + TQString szNick; // action source nick unsigned int uActionType; // type of the action kvi_time_t tTime; // time of the action int iTemperature; // temperature of the action @@ -102,19 +102,20 @@ typedef struct _KviChannelActivityStats int iAverageActionTemperature; // the average chan temperature unsigned int uHotActionCount; unsigned int uHotActionPercent; - QStringList lTalkingUsers; // users that seem to be talking NOW - QStringList lWereTalkingUsers; + TQStringList lTalkingUsers; // users that seem to be talking NOW + TQStringList lWereTalkingUsers; } KviChannelActivityStats; class KVIRC_API KviChannel : public KviWindow { Q_OBJECT + TQ_OBJECT public: KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name); ~KviChannel(); protected: - QSplitter * m_pTopSplitter; - QSplitter * m_pVertSplitter; + TQSplitter * m_pTopSplitter; + TQSplitter * m_pVertSplitter; BUTTON_CLASS * m_pDoubleViewButton; KviWindowToolPageButton * m_pListViewButton; KviWindowToolPageButton * m_pBanEditorButton; @@ -130,50 +131,50 @@ protected: KviUserListView * m_pUserListView; KviModeWidget * m_pModeWidget; int m_iStateFlags; - QString m_szChannelMode; - QString m_szChannelKey; + TQString m_szChannelMode; + TQString m_szChannelKey; KviStr m_szChannelLimit; KviPointerList<KviMaskEntry> * m_pBanList; KviPointerList<KviMaskEntry> * m_pBanExceptionList; KviPointerList<KviMaskEntry> * m_pInviteList; KviPixmap m_privateBackground; - QDateTime m_joinTime; - QString m_szNameWithUserFlag; - KviPointerHashTable<const char *,QString> * m_pTmpHighLighted; + TQDateTime m_joinTime; + TQString m_szNameWithUserFlag; + KviPointerHashTable<const char *,TQString> * m_pTmpHighLighted; unsigned int m_uActionHistoryHotActionCount; KviPointerList<KviChannelAction> * m_pActionHistory; kvi_time_t m_tLastReceivedWhoReply; KviValueList<int> m_VertSplitterSizesList; KviTalHBox * m_pButtonContainer; protected: - bool eventFilter(QObject *, QEvent *); - virtual QPixmap * myIconPtr(); + bool eventFilter(TQObject *, TQEvent *); + virtual TQPixmap * myIconPtr(); virtual void fillCaptionBuffers(); - virtual void resizeEvent(QResizeEvent *e); - virtual void closeEvent(QCloseEvent *e); + virtual void resizeEvent(TQResizeEvent *e); + virtual void closeEvent(TQCloseEvent *e); // virtual void fillContextPopup(KviTalPopupMenu * p); - virtual void getConfigGroupName(QString &buf); + virtual void getConfigGroupName(TQString &buf); virtual void saveProperties(KviConfig * cfg); virtual void loadProperties(KviConfig * cfg); virtual void applyOptions(); - virtual void getBaseLogFileName(QString &buffer); + virtual void getBaseLogFileName(TQString &buffer); virtual void triggerCreationEvents(); void toggleEditor(KviMaskEditor ** ppEd,KviWindowToolPageButton ** ppBtn,KviPointerList<KviMaskEntry> *l,char flag,const char *edName); - void internalMask(const QString &mask,bool bAdd,const QString &setBy,unsigned int setAt,KviPointerList<KviMaskEntry> *l,KviMaskEditor **ppEd); + void internalMask(const TQString &tqmask,bool bAdd,const TQString &setBy,unsigned int setAt,KviPointerList<KviMaskEntry> *l,KviMaskEditor **ppEd); void checkChannelSync(); void showDoubleView(bool bShow); void fixActionHistory(); - void getTalkingUsersStats(QString &buffer,QStringList &l,bool bPast); + void getTalkingUsersStats(TQString &buffer,TQStringList &l,bool bPast); public: void getChannelActivityStats(KviChannelActivityStats * s); - //void getChannelActivityStatsDescription(QString &buffer); + //void getChannelActivityStatsDescription(TQString &buffer); KviPointerList<KviMaskEntry> * banList(){ return m_pBanList; }; KviPointerList<KviMaskEntry> * banExceptionList(){ return m_pBanExceptionList; }; KviPointerList<KviMaskEntry> * inviteList(){ return m_pInviteList; }; - QString * firstSelectedNickname(){ return m_pUserListView->firstSelectedNickname(); }; - QString * nextSelectedNickname(){ return m_pUserListView->nextSelectedNickname(); }; + TQString * firstSelectedNickname(){ return m_pUserListView->firstSelectedNickname(); }; + TQString * nextSelectedNickname(){ return m_pUserListView->nextSelectedNickname(); }; int selectedCount(){ return m_pUserListView->selectedCount(); }; int opCount(){ return m_pUserListView->opCount(); }; @@ -188,10 +189,10 @@ public: unsigned int banExceptionCount(){ return m_pBanExceptionList->count(); }; unsigned int inviteCount(){ return m_pInviteList->count(); }; - const QString & nameWithUserFlag(){ return m_szNameWithUserFlag; }; - virtual const QString & target(){ return windowName(); }; + const TQString & nameWithUserFlag(){ return m_szNameWithUserFlag; }; + virtual const TQString & target(){ return windowName(); }; // void appendSelectedNicknames(KviStr &buffer); - void setMask(char flag, const QString &mask,bool bAdd,const QString &setBy,unsigned int setAt); + void setMask(char flag, const TQString &tqmask,bool bAdd,const TQString &setBy,unsigned int setAt); kvi_time_t lastReceivedWhoReply(){ return m_tLastReceivedWhoReply; }; void setLastReceivedWhoReply(kvi_time_t tTime){ m_tLastReceivedWhoReply = tTime; }; @@ -229,28 +230,28 @@ public: void setDeadChan(); void setAliveChan(); - void prependUserFlag(const QString &nick,QString &buffer){ m_pUserListView->prependUserFlag(nick,buffer); }; - char getUserFlag(const QString &nick){ return m_pUserListView->getUserFlag(nick); }; + void prependUserFlag(const TQString &nick,TQString &buffer){ m_pUserListView->prependUserFlag(nick,buffer); }; + char getUserFlag(const TQString &nick){ return m_pUserListView->getUserFlag(nick); }; bool isDeadChan(){ return (m_iStateFlags & KVI_CHANNEL_STATE_DEADCHAN); }; - virtual QSize sizeHint() const; + virtual TQSize tqsizeHint() const; void enableUserListUpdates(bool bEnable){ m_pUserListView->enableUpdates(bEnable); }; - KviUserListEntry * join(const QString &nick,const QString &user = QString::null,const QString &host = QString::null,int iFlags = 0) + KviUserListEntry * join(const TQString &nick,const TQString &user = TQString(),const TQString &host = TQString(),int iFlags = 0) { return m_pUserListView->join(nick,user,host,iFlags); }; - bool op(const QString &nick,bool bOp){ return m_pUserListView->op(nick,bOp); }; - bool avatarChanged(const QString &nick){ return m_pUserListView->avatarChanged(nick); }; - bool voice(const QString &nick,bool bVoice){ return m_pUserListView->voice(nick,bVoice); }; - bool halfop(const QString &nick,bool bHalfOp){ return m_pUserListView->halfop(nick,bHalfOp); }; - bool userop(const QString &nick,bool bUserOp){ return m_pUserListView->userop(nick,bUserOp); }; - bool setChanOwner(const QString &nick,bool bChanOwner){ return m_pUserListView->setChanOwner(nick,bChanOwner); }; - bool setChanAdmin(const QString &nick,bool bChanAdmin){ return m_pUserListView->setChanAdmin(nick,bChanAdmin); }; + bool op(const TQString &nick,bool bOp){ return m_pUserListView->op(nick,bOp); }; + bool avatarChanged(const TQString &nick){ return m_pUserListView->avatarChanged(nick); }; + bool voice(const TQString &nick,bool bVoice){ return m_pUserListView->voice(nick,bVoice); }; + bool halfop(const TQString &nick,bool bHalfOp){ return m_pUserListView->halfop(nick,bHalfOp); }; + bool userop(const TQString &nick,bool bUserOp){ return m_pUserListView->userop(nick,bUserOp); }; + bool setChanOwner(const TQString &nick,bool bChanOwner){ return m_pUserListView->setChanOwner(nick,bChanOwner); }; + bool setChanAdmin(const TQString &nick,bool bChanAdmin){ return m_pUserListView->setChanAdmin(nick,bChanAdmin); }; void userAction(KviIrcMask * user,unsigned int uActionType); - void userAction(const QString &nick,unsigned int uActionType); - void userAction(const QString &nick,const QString &user,const QString &host,unsigned int uActionType); - bool nickChange(const QString &oldNick,const QString &newNick); - void channelAction(const QString &nick,unsigned int uActionType,int iTemperature); - bool part(const QString &nick); - bool isOn(const QString &nick){ return (m_pUserListView->findEntry(nick) != 0); }; - KviUserListEntry * findEntry(const QString &nick){ return m_pUserListView->findEntry(nick); }; + void userAction(const TQString &nick,unsigned int uActionType); + void userAction(const TQString &nick,const TQString &user,const TQString &host,unsigned int uActionType); + bool nickChange(const TQString &oldNick,const TQString &newNick); + void channelAction(const TQString &nick,unsigned int uActionType,int iTemperature); + bool part(const TQString &nick); + bool isOn(const TQString &nick){ return (m_pUserListView->findEntry(nick) != 0); }; + KviUserListEntry * findEntry(const TQString &nick){ return m_pUserListView->findEntry(nick); }; KviUserListView * userListView(){ return m_pUserListView; }; bool isMeOp(bool bAtLeast = false); bool isMeChanOwner(bool bAtLeast = false); @@ -258,41 +259,41 @@ public: bool isMeVoice(bool bAtLeast = false); bool isMeHalfOp(bool bAtLeast = false); bool isMeUserOp(bool bAtLeast = false); - bool isOp(const QString &nick,bool bAtLeast = false){ return m_pUserListView->isOp(nick,bAtLeast); }; - bool isVoice(const QString &nick,bool bAtLeast = false){ return m_pUserListView->isVoice(nick,bAtLeast); }; - bool isHalfOp(const QString &nick,bool bAtLeast = false){ return m_pUserListView->isHalfOp(nick,bAtLeast); }; - bool isUserOp(const QString &nick,bool bAtLeast = false){ return m_pUserListView->isUserOp(nick,bAtLeast); }; - bool isChanOwner(const QString &nick,bool bAtLeast = false){ return m_pUserListView->isChanOwner(nick,bAtLeast); }; - bool isChanAdmin(const QString &nick,bool bAtLeast = false){ return m_pUserListView->isChanAdmin(nick,bAtLeast); }; + bool isOp(const TQString &nick,bool bAtLeast = false){ return m_pUserListView->isOp(nick,bAtLeast); }; + bool isVoice(const TQString &nick,bool bAtLeast = false){ return m_pUserListView->isVoice(nick,bAtLeast); }; + bool isHalfOp(const TQString &nick,bool bAtLeast = false){ return m_pUserListView->isHalfOp(nick,bAtLeast); }; + bool isUserOp(const TQString &nick,bool bAtLeast = false){ return m_pUserListView->isUserOp(nick,bAtLeast); }; + bool isChanOwner(const TQString &nick,bool bAtLeast = false){ return m_pUserListView->isChanOwner(nick,bAtLeast); }; + bool isChanAdmin(const TQString &nick,bool bAtLeast = false){ return m_pUserListView->isChanAdmin(nick,bAtLeast); }; int myFlags(); void updateModeLabel(); KviTopicWidget * topicWidget(){ return m_pTopicWidget; }; - virtual void outputMessage(int msg_type,const QString &msg); - void ownMessage(const QString &buffer); - void ownAction(const QString &buffer); + virtual void outputMessage(int msg_type,const TQString &msg); + void ownMessage(const TQString &buffer); + void ownAction(const TQString &buffer); void setChannelMode(char mode,bool bAdd); void setChannelKey(const char * key); void setChannelLimit(const char * limit); - void getChannelModeString(QString &buffer); + void getChannelModeString(TQString &buffer); KviStr & channelLimit(){ return m_szChannelLimit; }; bool hasChannelLimit(){ return m_szChannelLimit.hasData(); }; bool hasChannelKey() { return !m_szChannelKey.isEmpty(); }; - QString & channelKey(){ return m_szChannelKey; }; + TQString & channelKey(){ return m_szChannelKey; }; void addHighlightedUser(const char * nick); void removeHighlightedUser(const char * nick); - bool isHighlightedUser(const char * nick) { return m_pTmpHighLighted->find(nick); }; + bool isHighlightedUser(const char * nick) { return m_pTmpHighLighted->tqfind(nick); }; KviIrcView * messageView() const { return m_pMessageView; }; virtual void lostUserFocus(); - virtual void getTaskBarTipText(QString &buffer); - QString channelMode() { return m_szChannelMode; }; + virtual void getTaskBarTipText(TQString &buffer); + TQString channelMode() { return m_szChannelMode; }; void unhighlight(); - QFrame * buttonContainer() { return (QFrame*)m_pButtonContainer; }; + TQFrame * buttonContainer() { return (TQFrame*)m_pButtonContainer; }; private slots: void toggleDoubleView(); void toggleListView(); @@ -300,14 +301,14 @@ private slots: void toggleBanExceptionEditor(); void toggleInviteEditor(); void toggleModeEditor(); - void topicSelected(const QString & topic); + void topicSelected(const TQString & topic); void setMode(const char * mode); void modeSelectorDone(); void textViewRightClicked(); void removeMasks(KviMaskEditor *ed,KviPointerList<KviMaskEntry> *l); void toggleToolButtons(); protected: - virtual void preprocessMessage(QString & szMessage); + virtual void preprocessMessage(TQString & szMessage); }; #endif //_KVI_CHANNEL_H_ diff --git a/src/kvirc/ui/kvi_colorwin.cpp b/src/kvirc/ui/kvi_colorwin.cpp index 9cc1c6e..39a7051 100644 --- a/src/kvirc/ui/kvi_colorwin.cpp +++ b/src/kvirc/ui/kvi_colorwin.cpp @@ -29,27 +29,27 @@ #include "kvi_options.h" -#include <qnamespace.h> -#include <qpainter.h> -#include <qstring.h> -#include <qevent.h> +#include <tqnamespace.h> +#include <tqpainter.h> +#include <tqstring.h> +#include <tqevent.h> KviColorWindow::KviColorWindow() -:QWidget(0,"toplevel_color_window",Qt::WType_Popup) +:TQWidget(0,"toplevel_color_window",TQt::WType_Popup) { #ifdef COMPILE_USE_QT4 - setFocusPolicy(Qt::NoFocus); + setFocusPolicy(TTQ_NoFocus); #else - setFocusPolicy(QWidget::NoFocus); + setFocusPolicy(TQ_NoFocus); #endif - setBackgroundMode(Qt::NoBackground); + setBackgroundMode(TQt::NoBackground); setFixedSize(146,38); m_pOwner = 0; - QFont fnt = QFont(); - fnt.setStyleHint(QFont::TypeWriter); + TQFont fnt = TQFont(); + fnt.setStyleHint(TQFont::TypeWriter); fnt.setPointSize(10); - //QFont fnt("fixed",10); + //TQFont fnt("fixed",10); setFont(fnt); m_iTimerId = -1; } @@ -61,28 +61,28 @@ KviColorWindow::~KviColorWindow() // if(m_pOwner)m_pOwner->setFocus(); } -void KviColorWindow::popup(QWidget *owner) +void KviColorWindow::popup(TQWidget *owner) { m_pOwner = owner; show(); } -void KviColorWindow::paintEvent(QPaintEvent *) +void KviColorWindow::paintEvent(TQPaintEvent *) { static int clrIdx[16]={ 1,0,0,0,0,0,0,0,1,1,1,1,0,0,0,1 }; - QPainter p(this); + TQPainter p(this); for(int i=0;i<16;i++) { p.fillRect((i % 8) * 18,(i / 8) * 18,18,18,KVI_OPTION_MIRCCOLOR(i)); p.setPen(KVI_OPTION_MIRCCOLOR(clrIdx[i])); KviStr szI(KviStr::Format,"%d",i); - p.drawText((i % 8) * 18,(i / 8) * 18,18,18,Qt::AlignVCenter | Qt::AlignHCenter,szI.ptr()); + p.drawText((i % 8) * 18,(i / 8) * 18,18,18,TQt::AlignVCenter | TQt::AlignHCenter,szI.ptr()); } } -void KviColorWindow::keyPressEvent(QKeyEvent *e) +void KviColorWindow::keyPressEvent(TQKeyEvent *e) { if(m_iTimerId != -1) killTimer(m_iTimerId); @@ -90,17 +90,17 @@ void KviColorWindow::keyPressEvent(QKeyEvent *e) if(m_pOwner)g_pApp->sendEvent(m_pOwner,e); } -void KviColorWindow::mousePressEvent(QMouseEvent *e) +void KviColorWindow::mousePressEvent(TQMouseEvent *e) { - QString str; + TQString str; int key=e->x()/18; if (e->x()<36 && e->y()>18) key +=8; if (e->x()>36 && e->y()>18) key -=2; int ascii=key+48; str.setNum(key); if (e->x()>36 && e->y()>18) - if(m_pOwner) g_pApp->sendEvent(m_pOwner,new QKeyEvent(QEvent::KeyPress,Qt::Key_1,49,Qt::NoButton,"1")); - if(m_pOwner) g_pApp->sendEvent(m_pOwner,new QKeyEvent(QEvent::KeyPress,key,ascii,Qt::NoButton,str)); + if(m_pOwner) g_pApp->sendEvent(m_pOwner,new TQKeyEvent(TQEvent::KeyPress,TQt::Key_1,49,Qt::NoButton,"1")); + if(m_pOwner) g_pApp->sendEvent(m_pOwner,new TQKeyEvent(TQEvent::KeyPress,key,ascii,Qt::NoButton,str)); if(m_iTimerId != -1) killTimer(m_iTimerId); hide(); @@ -108,10 +108,10 @@ void KviColorWindow::mousePressEvent(QMouseEvent *e) void KviColorWindow::show() { m_iTimerId = startTimer(10000); //10 sec ...seems enough - QWidget::show(); + TQWidget::show(); } -void KviColorWindow::timerEvent(QTimerEvent *) +void KviColorWindow::timerEvent(TQTimerEvent *) { if(m_iTimerId != -1) killTimer(m_iTimerId); diff --git a/src/kvirc/ui/kvi_colorwin.h b/src/kvirc/ui/kvi_colorwin.h index 21cf1ae..9528cf6 100644 --- a/src/kvirc/ui/kvi_colorwin.h +++ b/src/kvirc/ui/kvi_colorwin.h @@ -23,25 +23,26 @@ // #include "kvi_settings.h" -#include <qwidget.h> +#include <tqwidget.h> -class KVIRC_API KviColorWindow : public QWidget +class KVIRC_API KviColorWindow : public TQWidget { Q_OBJECT + TQ_OBJECT public: KviColorWindow(); ~KviColorWindow(); private: - QWidget *m_pOwner; + TQWidget *m_pOwner; int m_iTimerId; public: - void popup(QWidget *owner); + void popup(TQWidget *owner); private: virtual void show(); - virtual void paintEvent(QPaintEvent *); - virtual void keyPressEvent(QKeyEvent *e); - virtual void mousePressEvent(QMouseEvent *); - virtual void timerEvent(QTimerEvent *); + virtual void paintEvent(TQPaintEvent *); + virtual void keyPressEvent(TQKeyEvent *e); + virtual void mousePressEvent(TQMouseEvent *); + virtual void timerEvent(TQTimerEvent *); }; #endif //_KVI_COLORWIN_H_ diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp index df0bd70..a843ae1 100644 --- a/src/kvirc/ui/kvi_console.cpp +++ b/src/kvirc/ui/kvi_console.cpp @@ -81,26 +81,26 @@ #include "kvi_kvs_script.h" #include "kvi_kvs_eventtriggers.h" -#include <qsplitter.h> -#include <qtoolbar.h> -#include <qtoolbutton.h> -#include <qtimer.h> +#include <tqsplitter.h> +#include <tqtoolbar.h> +#include <tqtoolbutton.h> +#include <tqtimer.h> #include "kvi_tal_hbox.h" #include "kvi_tal_popupmenu.h" -#include <qmessagebox.h> -#include <qstringlist.h> +#include <tqmessagebox.h> +#include <tqstringlist.h> #ifdef COMPILE_USE_QT4 - #include <q3mimefactory.h> + #include <tq3mimefactory.h> #endif #define __KVI_DEBUG__ #include "kvi_debug.h" #ifdef COMPILE_USE_QT4 - #include <QTextDocument> + #include <TQTextDocument> #else - #include <qstylesheet.h> + #include <tqstylesheet.h> #endif extern KVIRC_API KviIrcServerDataBase * g_pIrcServerDataBase; @@ -128,35 +128,35 @@ KviConsole::KviConsole(KviFrame * lpFrm,int iFlags) m_pButtonBox = new KviTalHBox(this); m_pButtonBox->setSpacing(0); m_pButtonBox->setMargin(0); - new QLabel(__tr2qs("Address:"),m_pButtonBox,"url_label"); - m_pAddressEdit = new QComboBox(m_pButtonBox,"url_editor"); + new TQLabel(__tr2qs("Address:"),m_pButtonBox,"url_label"); + m_pAddressEdit = new TQComboBox(m_pButtonBox,"url_editor"); m_pAddressEdit->setAutoCompletion(true); m_pAddressEdit->setDuplicatesEnabled(false); m_pAddressEdit->setEditable(true); m_pAddressEdit->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_URL))); recentUrlsChanged(); m_pAddressEdit->setCurrentText(""); - m_pAddressEdit->setInsertionPolicy(QComboBox::NoInsertion); + m_pAddressEdit->setInsertionPolicy(TQComboBox::NoInsertion); m_pAddressEdit->setMinimumHeight(24); //icon is 16px, + margins m_pButtonBox->setStretchFactor(m_pAddressEdit,1); #ifdef COMPILE_USE_QT4 - m_pButtonBox->setObjectName( QLatin1String( "kvi_window_button_box" ) ); + m_pButtonBox->setObjectName( TQLatin1String( "kvi_window_button_box" ) ); #endif KviTalToolTip::add(m_pAddressEdit,__tr2qs("Current IRC URI")); - connect(m_pAddressEdit,SIGNAL(activated(const QString & )),this,SLOT(ircUriChanged(const QString & ))); - connect(g_pApp,SIGNAL(recentUrlsChanged()),this,SLOT(recentUrlsChanged())); + connect(m_pAddressEdit,TQT_SIGNAL(activated(const TQString & )),this,TQT_SLOT(ircUriChanged(const TQString & ))); + connect(g_pApp,TQT_SIGNAL(recentUrlsChanged()),this,TQT_SLOT(recentUrlsChanged())); - m_pSplitter = new QSplitter(Qt::Horizontal,this,"splitter"); + m_pSplitter = new TQSplitter(Qt::Horizontal,this,"splitter"); m_pIrcView = new KviIrcView(m_pSplitter,lpFrm,this); - connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked())); + connect(m_pIrcView,TQT_SIGNAL(rightClicked()),this,TQT_SLOT(textViewRightClicked())); // FIXME: #warning "If notify list is disabled avoid to show this" // FIXME: #warning "Button to show/hide the notifyListView (NOT DELETE RE_CREATE!)" // The userlist on the right //m_pEditorsContainer= new KviToolWindowsContainer(m_pSplitter); m_pNotifyViewButton = new KviWindowToolPageButton(KVI_SMALLICON_HIDELISTVIEW,KVI_SMALLICON_SHOWLISTVIEW,__tr2qs("Notify List"),buttonContainer(),true,"list_view_button"); - connect(m_pNotifyViewButton,SIGNAL(clicked()),this,SLOT(toggleNotifyView())); + connect(m_pNotifyViewButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleNotifyView())); m_pNotifyListView = new KviUserListView(m_pSplitter,m_pNotifyViewButton,0,this,19,__tr2qs("Notify List"),"notify_list_view"); @@ -173,10 +173,10 @@ int KviConsole::selectedCount() } void KviConsole::recentUrlsChanged(){ - QString cur = m_pAddressEdit->currentText(); + TQString cur = m_pAddressEdit->currentText(); m_pAddressEdit->clear(); for ( - QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentIrcUrls).begin(); + TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentIrcUrls).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentIrcUrls).end(); ++it ) { @@ -200,7 +200,7 @@ bool KviConsole::connectionInProgress() KviConsole::~KviConsole() { - // FIXME: #warning "WARNING : THIS SHOULD BECOME A COMMAND /QUIT $option() so the idents are parsed!" + // FIXME: #warning "WARNING : THIS SHOULD BECOME A COMMAND /TQUIT $option() so the idents are parsed!" // Force connection close: it will just return if no connection is present context()->terminateConnectionRequest(true); @@ -229,9 +229,9 @@ unsigned int KviConsole::ircContextId() return m_pContext->id(); } -QString KviConsole::currentNetworkName() +TQString KviConsole::currentNetworkName() { - return (connection() ? connection()->networkName() : QString::null); + return (connection() ? connection()->networkName() : TQString()); } @@ -265,24 +265,24 @@ void KviConsole::fillContextPopup(KviTalPopupMenu * p) cc = channelCount(); qc = queryCount(); p->insertSeparator(); - id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Part All Channels"),connection(),SLOT(partAllChannels())); + id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Part All Channels"),connection(),TQT_SLOT(partAllChannels())); if(!cc)p->setItemEnabled(id,false); - id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUERY)),__tr2qs("Close All Queries"),connection(),SLOT(closeAllQueries())); + id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUERY)),__tr2qs("Close All Queries"),connection(),TQT_SLOT(closeAllQueries())); if(!qc)p->setItemEnabled(id,false); } p->insertSeparator(); - p->insertItem(__tr2qs("Unhighlight All Windows"),context(),SLOT(unhighlightAllWindows())); + p->insertItem(__tr2qs("Unhighlight All Windows"),context(),TQT_SLOT(unhighlightAllWindows())); if(connection()) { - id = p->insertItem(__tr2qs("Unhighlight All Channels"),connection(),SLOT(unhighlightAllChannels())); + id = p->insertItem(__tr2qs("Unhighlight All Channels"),connection(),TQT_SLOT(unhighlightAllChannels())); if(!cc)p->setItemEnabled(id,false); - id = p->insertItem(__tr2qs("Unhighlight All Queries"),connection(),SLOT(unhighlightAllQueries())); + id = p->insertItem(__tr2qs("Unhighlight All Queries"),connection(),TQT_SLOT(unhighlightAllQueries())); if(!qc)p->setItemEnabled(id,false); } } -void KviConsole::completeChannel(const QString &word,KviPointerList<QString> * matches) +void KviConsole::completeChannel(const TQString &word,KviPointerList<TQString> * matches) { // FIXME: first look in our context ? /* @@ -292,35 +292,35 @@ void KviConsole::completeChannel(const QString &word,KviPointerList<QString> * m if(kvi_strEqualCIN(c->windowName(),word.ptr(),word.len()))matches->append(new KviStr((*it) } */ - QStringList *pList = g_pApp->getRecentChannels(currentNetworkName()); + TQStringList *pList = g_pApp->getRecentChannels(currentNetworkName()); if(pList) { - for(QStringList::Iterator it = pList->begin(); it != pList->end(); ++it) + for(TQStringList::Iterator it = pList->begin(); it != pList->end(); ++it) { - if(KviQString::equalCIN((*it),word,word.length()))matches->append(new QString(*it)); + if(KviTQString::equalCIN((*it),word,word.length()))matches->append(new TQString(*it)); } } } -void KviConsole::completeServer(const QString &word, KviPointerList<QString> * matches) +void KviConsole::completeServer(const TQString &word, KviPointerList<TQString> * matches) { - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).end(); ++it) + for(TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).end(); ++it) { - QString srv((*it)); + TQString srv((*it)); - KviQString::cutToFirst(srv,'/'); + KviTQString::cutToFirst(srv,'/'); while(srv.startsWith("/"))srv.remove(0,1); - KviQString::cutFromLast(srv,':'); + KviTQString::cutFromLast(srv,':'); //We should have a full server name here, without the irc:// and without the port - if(KviQString::equalCIN(srv,word,word.length())) + if(KviTQString::equalCIN(srv,word,word.length())) { - matches->append(new QString(srv)); + matches->append(new TQString(srv)); } } } -void KviConsole::getUserTipText(const QString &nick,KviIrcUserEntry *e,QString &buffer) +void KviConsole::getUserTipText(const TQString &nick,KviIrcUserEntry *e,TQString &buffer) { KviRegisteredMask *u = g_pRegisteredUserDataBase->findMatchingMask(nick,e->user(),e->host()); @@ -330,15 +330,15 @@ void KviConsole::getUserTipText(const QString &nick,KviIrcUserEntry *e,QString & buffer += nick; buffer += "!"; - buffer += e->user().isEmpty() ? QString("*") : e->user(); + buffer += e->user().isEmpty() ? TQString("*") : e->user(); buffer += "@"; - buffer += e->host().isEmpty() ? QString("*") : e->host(); + buffer += e->host().isEmpty() ? TQString("*") : e->host(); buffer += "</b></font></center></td></tr>"; if(u) { - QString szComment=u->user()->getProperty("comment"); + TQString szComment=u->user()->getProperty("comment"); if(!szComment.isEmpty()) { buffer += "<tr bgcolor=\"#F0F0F0\"><td><center><font size=\"-1\">("; @@ -351,9 +351,9 @@ void KviConsole::getUserTipText(const QString &nick,KviIrcUserEntry *e,QString & #ifdef COMPILE_USE_QT4 Q3MimeSourceFactory::defaultFactory()->setPixmap("ulv_avatar",*(e->avatar()->pixmap())); #else - QMimeSourceFactory::defaultFactory()->setPixmap("ulv_avatar",*(e->avatar()->pixmap())); + TQMimeSourceFactory::defaultFactory()->setPixmap("ulv_avatar",*(e->avatar()->pixmap())); #endif - buffer += QString("<tr><td><center><img src=\"ulv_avatar\" width=\"%1\"></center></td></tr>").arg(e->avatar()->pixmap()->width()); + buffer += TQString("<tr><td><center><img src=\"ulv_avatar\" width=\"%1\"></center></td></tr>").tqarg(e->avatar()->pixmap()->width()); } if(e->hasRealName()) @@ -374,8 +374,8 @@ void KviConsole::getUserTipText(const QString &nick,KviIrcUserEntry *e,QString & if(u) { - QString mask; - u->mask()->mask(mask); + TQString tqmask; + u->tqmask()->tqmask(tqmask); buffer += "<tr bgcolor=\"#F0F0F0\"><td>"; buffer += __tr2qs("Registered as"); buffer += " <b>"; @@ -385,13 +385,13 @@ void KviConsole::getUserTipText(const QString &nick,KviIrcUserEntry *e,QString & buffer += "</td></tr><tr bgcolor=\"#F0F0F0\"><td><font size=\"-1\">"; buffer += __tr2qs("(Matched by"); buffer += " "; - buffer += mask; + buffer += tqmask; buffer += ")</td></tr>"; } if(connection()) { - QString chans; + TQString chans; if(connection()->getCommonChannels(nick,chans,false)) { buffer += "<tr><td bgcolor=\"#F0F0F0\">"; @@ -404,12 +404,12 @@ void KviConsole::getUserTipText(const QString &nick,KviIrcUserEntry *e,QString & if(e->hasServer()) { buffer += "<tr><td bgcolor=\"#F0F0F0\"><nobr>"; - buffer += __tr2qs("Using server <b>%1</b>").arg(e->server()); + buffer += __tr2qs("Using server <b>%1</b>").tqarg(e->server()); if(e->hasHops()) { buffer += " ("; - buffer += __tr2qs("%1 hops").arg(e->hops()); + buffer += __tr2qs("%1 hops").tqarg(e->hops()); buffer += ")</nobr></td></tr>"; } else { buffer += "</nobr></td></tr></table>"; @@ -443,9 +443,9 @@ void KviConsole::saveProperties(KviConfig *cfg) } -void KviConsole::getBaseLogFileName(QString &buffer) +void KviConsole::getBaseLogFileName(TQString &buffer) { - buffer=QString("CONSOLE%1").arg(ircContextId()); + buffer=TQString("CONSOLE%1").tqarg(ircContextId()); } void KviConsole::showNotifyList(bool bShow) @@ -492,7 +492,7 @@ KviWindow * KviConsole::activeWindow() return this; } -void KviConsole::ircUriChanged(const QString & text){ +void KviConsole::ircUriChanged(const TQString & text){ if(KviIrcUrl::run(text,KviIrcUrl::CurrentContext,this) & KviIrcUrl::InvalidProtocol) { KviMessageBox::warning(__tr2qs("KVIrc can accept only irc://, irc6://, ircs:// or irc6s:// URL's\n" @@ -502,7 +502,7 @@ void KviConsole::ircUriChanged(const QString & text){ void KviConsole::updateUri() { - QString uri; + TQString uri; if(connection()) { KviIrcServer* server = connection()->target()->server(); @@ -527,7 +527,7 @@ void KviConsole::updateUri() void KviConsole::connectionAttached() { //need to update URI - connect(m_pContext->connection(),SIGNAL(chanListChanged()),this,SLOT(updateUri())); + connect(m_pContext->connection(),TQT_SIGNAL(chanListChanged()),this,TQT_SLOT(updateUri())); updateUri(); m_pNotifyListView->setUserDataBase(connection()->userDataBase()); } @@ -545,7 +545,7 @@ bool KviConsole::isIpV6Connection() return connection()->server()->isIpV6(); } -void KviConsole::closeEvent(QCloseEvent *e) +void KviConsole::closeEvent(TQCloseEvent *e) { if(g_pFrame->consoleCount() > 1) { @@ -554,7 +554,7 @@ void KviConsole::closeEvent(QCloseEvent *e) { if(!KVI_OPTION_BOOL(KviOption_boolAlwaysDisconnectClosingConnectedConsole)) { - switch(QMessageBox::warning(this, + switch(TQMessageBox::warning(this, __tr2qs("Confirmation - KVIrc"), __tr2qs("You have just attempted to close a console window with an active connection inside.\n" \ "Are you sure you wish to terminate the connection?"), @@ -588,7 +588,7 @@ void KviConsole::closeEvent(QCloseEvent *e) // this is the only console... ask if the user really wants to quit KVirc if(!KVI_OPTION_BOOL(KviOption_boolAlwaysQuitKVIrcClosingLastConsole)) { - switch(QMessageBox::warning(this, + switch(TQMessageBox::warning(this, __tr2qs("Confirmation - KVIrc"), __tr2qs("You have just attempted to close the last console window.\nAre you sure you wish to quit KVIrc?"), __tr2qs("&Always"), @@ -612,11 +612,11 @@ void KviConsole::closeEvent(QCloseEvent *e) } // internal helper for applyHighlighting -int KviConsole::triggerOnHighlight(KviWindow *wnd,int type,const QString &nick,const QString &user,const QString &host,const QString &szMsg,const QString &trigger) +int KviConsole::triggerOnHighlight(KviWindow *wnd,int type,const TQString &nick,const TQString &user,const TQString &host,const TQString &szMsg,const TQString &trigger) { if(!KVI_OPTION_STRING(KviOption_stringOnHighlightedMessageSound).isEmpty() && wnd!=g_pActiveWindow) KviKvsScript::run("snd.play $0",0,new KviKvsVariantList(new KviKvsVariant(KVI_OPTION_STRING(KviOption_stringOnHighlightedMessageSound)))); - QString szMessageType; - KviQString::sprintf(szMessageType,"%d",type); + TQString szMessageType; + KviTQString::sprintf(szMessageType,"%d",type); if(KVS_TRIGGER_EVENT_7_HALTED(KviEvent_OnHighlight, wnd,nick,user,host, szMsg,trigger, @@ -626,17 +626,17 @@ int KviConsole::triggerOnHighlight(KviWindow *wnd,int type,const QString &nick,c } // if it returns -1 you should just return and not display the message -int KviConsole::applyHighlighting(KviWindow *wnd,int type,const QString &nick,const QString &user,const QString &host,const QString &szMsg) +int KviConsole::applyHighlighting(KviWindow *wnd,int type,const TQString &nick,const TQString &user,const TQString &host,const TQString &szMsg) { - QString szPattern=KVI_OPTION_STRING(KviOption_stringWordSplitters); - QString szSource; - QString szStripMsg=KviMircCntrl::stripControlBytes(szMsg); - QChar* aux=(QChar*)(szStripMsg.ucs2()); + TQString szPattern=KVI_OPTION_STRING(KviOption_stringWordSplitters); + TQString szSource; + TQString szStripMsg=KviMircCntrl::stripControlBytes(szMsg); + TQChar* aux=(TQChar*)(szStripMsg.ucs2()); if(aux) { - while(aux->unicode()) + while(aux->tqunicode()) { - if( KVI_OPTION_STRING(KviOption_stringWordSplitters).find(*aux) > -1 ) + if( KVI_OPTION_STRING(KviOption_stringWordSplitters).tqfind(*aux) > -1 ) szSource.append(' '); else szSource.append(*aux); @@ -649,19 +649,19 @@ int KviConsole::applyHighlighting(KviWindow *wnd,int type,const QString &nick,co szSource.prepend(' '); if(KVI_OPTION_BOOL(KviOption_boolAlwaysHighlightNick) && connection()) { - if(szSource.find(QString(" %1 ").arg(connection()->userInfo()->nickName()),0,false) > -1) + if(szSource.tqfind(TQString(" %1 ").tqarg(connection()->userInfo()->nickName()),0,false) > -1) return triggerOnHighlight(wnd,type,nick,user,host,szMsg,connection()->userInfo()->nickName()); } if(KVI_OPTION_BOOL(KviOption_boolUseWordHighlighting)) { - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistHighlightWords).begin(); + for(TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistHighlightWords).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistHighlightWords).end() ; ++it) { if((*it).isEmpty()) continue; - // FIXME : This is SLOOOOOOOOW (QString -> ascii translation!!) !!!! - if(szSource.find(QString(" %1 ").arg(*it),0,false) > -1) + // FIXME : This is SLOOOOOOOOW (TQString -> ascii translation!!) !!!! + if(szSource.tqfind(TQString(" %1 ").tqarg(*it),0,false) > -1) { return triggerOnHighlight(wnd,type,nick,user,host,szMsg,*it); } @@ -714,13 +714,13 @@ static const char * g_nickColors[KVI_NUM_NICK_COLORS]= void KviConsole::outputPrivmsg(KviWindow *wnd, int type, - const QString &daNick, - const QString &daUser, - const QString &daHost, - const QString &msg, + const TQString &daNick, + const TQString &daUser, + const TQString &daHost, + const TQString &msg, int iFlags, - const QString &prefix, - const QString &suffix) + const TQString &prefix, + const TQString &suffix) { // FIXME: #warning "THIS IS USED BY WINDOWS THAT ARE NOT BOUND TO THIS IRC CONTEXT" // FIXME: #warning "REMEMBER IT IN ESCAPE COMMANDS" @@ -728,11 +728,11 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, bool bIsChan = (wnd->type() == KVI_WINDOW_TYPE_CHANNEL); bool bIsNotice = ((type == KVI_OUT_CHANNELNOTICE)||(type == KVI_OUT_CHANNELNOTICECRYPTED) \ - ||(type == KVI_OUT_QUERYNOTICE)||(type == KVI_OUT_QUERYNOTICECRYPTED)); + ||(type == KVI_OUT_TQUERYNOTICE)||(type == KVI_OUT_TQUERYNOTICECRYPTED)); - QString nick = daNick; // not that beautiful.. :/ - QString user = daUser; - QString host = daHost; + TQString nick = daNick; // not that beautiful.. :/ + TQString user = daUser; + TQString host = daHost; if(connection()) { @@ -741,7 +741,7 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, if(host.isEmpty())host = connection()->userInfo()->hostName(); } - QString szDecodedMessage = msg; // shallow copy + TQString szDecodedMessage = msg; // shallow copy if(KVI_OPTION_BOOL(KviOption_boolStripMircColorsInUserMessages)) szDecodedMessage = KviMircCntrl::stripControlBytes(szDecodedMessage); @@ -764,13 +764,13 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, if(KVI_OPTION_BOOL(KviOption_boolPopupNotifierOnHighlightedMessages) && (!(iFlags & NoNotifier))) { - QString szMsg = "<b><"; + TQString szMsg = "<b><"; szMsg += nick; szMsg += "></b> "; #ifdef COMPILE_USE_QT4 - szMsg += Qt::escape(szDecodedMessage); + szMsg += TQt::escape(szDecodedMessage); #else - szMsg += QStyleSheet::escape(szDecodedMessage); + szMsg += TQStyleSheet::escape(szDecodedMessage); #endif //debug("kvi_console.cpp:629 debug: %s",szMsg.data()); g_pApp->notifierMessage(wnd,KVI_OPTION_MSGTYPE(iSaveType).pixId(),szMsg,90); @@ -781,11 +781,11 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, // <PREFIX>nick[!user@host]<POSTFIX>This is a test message - QString szNick; - KviQString::sprintf(szNick,"\r!nc\r%Q\r",&nick); + TQString szNick; + KviTQString::sprintf(szNick,"\r!nc\r%Q\r",&nick); if(KVI_OPTION_BOOL(KviOption_boolShowUserAndHostInPrivmsgView)) - KviQString::appendFormatted(szNick,"!%Q@\r!h\r%Q\r",&user,&host); + KviTQString::appendFormatted(szNick,"!%Q@\r!h\r%Q\r",&user,&host); if(bIsChan && KVI_OPTION_BOOL(KviOption_boolShowChannelUserFlagInPrivmsgView)) ((KviChannel *)wnd)->prependUserFlag(nick,szNick); @@ -794,11 +794,11 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, { int sum = 0; int i = nick.length(); - const QChar * aux = nick.unicode(); + const TQChar * aux = nick.tqunicode(); // FIXME: Shouldn't this be case insensitive ? while(i > 0) { - sum += aux->unicode(); + sum += aux->tqunicode(); aux++; i--; } @@ -815,11 +815,11 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, { int sum = 0; int i = nick.length(); - const QChar * aux = nick.unicode(); + const TQChar * aux = nick.tqunicode(); // FIXME: Shouldn't this be case insensitive ? while(i > 0) { - sum += aux->unicode(); + sum += aux->tqunicode(); aux++; i--; } @@ -835,7 +835,7 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, KVI_COLOR_EXT_USER_HALFOP : ((e->flags() & KVI_USERFLAG_VOICE) ? \ KVI_COLOR_EXT_USER_VOICE : KVI_COLOR_EXT_USER_USEROP)))); } - szNick.prepend(QString("%1").arg(color)); + szNick.prepend(TQString("%1").tqarg(color)); szNick.prepend(KVI_TEXT_COLOR); szNick.append(KVI_TEXT_COLOR); } @@ -847,7 +847,7 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, szNick.append(KVI_TEXT_BOLD); } - QString szMessage; + TQString szMessage; if(KVI_OPTION_BOOL(KviOption_boolUseExtendedPrivmsgView)) { @@ -857,14 +857,14 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, } else { if(bIsNotice) { - static QString pre1("*"); - static QString suf1("* "); + static TQString pre1("*"); + static TQString suf1("* "); szMessage = prefix.isEmpty() ? pre1 : prefix; szMessage += szNick; szMessage += suffix.isEmpty() ? suf1 : suffix; } else { - static QString pre2("<"); - static QString suf2("> "); + static TQString pre2("<"); + static TQString suf2("> "); szMessage = prefix.isEmpty() ? pre2 : prefix; szMessage += szNick; szMessage += suffix.isEmpty() ? suf2 : suffix; @@ -877,12 +877,12 @@ void KviConsole::outputPrivmsg(KviWindow *wnd, else wnd->outputNoFmt(type,szMessage); } -void KviConsole::avatarChangedUpdateWindows(const QString &nick,const QString &textLine) +void KviConsole::avatarChangedUpdateWindows(const TQString &nick,const TQString &textLine) { if(!connection())return; //ops... // in quiet mode avoid bugging the user about avatar changes - bool bOut = ((!textLine.isEmpty()) && (!(_OUTPUT_QUIET))); + bool bOut = ((!textLine.isEmpty()) && (!(_OUTPUT_TQUIET))); for(KviChannel * c = connection()->channelList()->first();c;c = connection()->channelList()->next()) { @@ -901,7 +901,7 @@ void KviConsole::avatarChangedUpdateWindows(const QString &nick,const QString &t m_pNotifyListView->avatarChanged(nick); // recalc the item height here too! } -void KviConsole::avatarChanged(KviAvatar * avatar,const QString &nick,const QString &user,const QString &host,const QString &textLine) +void KviConsole::avatarChanged(KviAvatar * avatar,const TQString &nick,const TQString &user,const TQString &host,const TQString &textLine) { if(!connection())return; //ops... @@ -910,13 +910,13 @@ void KviConsole::avatarChanged(KviAvatar * avatar,const QString &nick,const QStr if(KVI_OPTION_BOOL(KviOption_boolSetLastAvatarAsDefaultForRegisteredUsers)) { // Don't even try to do it for myself - if(!KviQString::equalCI(nick,connection()->userInfo()->nickName())) + if(!KviTQString::equalCI(nick,connection()->userInfo()->nickName())) { KviRegisteredUser * u = connection()->userDataBase()->registeredUser(nick,user,host); if(u) { if(avatar)u->setProperty("avatar",avatar->identificationString()); - else u->setProperty("avatar",QString::null); + else u->setProperty("avatar",TQString()); bRegisteredStuff = true; } } @@ -926,7 +926,7 @@ void KviConsole::avatarChanged(KviAvatar * avatar,const QString &nick,const QStr { // cache it if(avatar) - KviAvatarCache::instance()->replace(avatar->identificationString(),KviIrcMask(nick,user,host),currentNetworkName().utf8().data()); + KviAvatarCache::instance()->tqreplace(avatar->identificationString(),KviIrcMask(nick,user,host),currentNetworkName().utf8().data()); else KviAvatarCache::instance()->remove(KviIrcMask(nick,user,host),currentNetworkName().utf8().data()); } @@ -934,19 +934,19 @@ void KviConsole::avatarChanged(KviAvatar * avatar,const QString &nick,const QStr avatarChangedUpdateWindows(nick,textLine); } -void KviConsole::checkDefaultAvatar(KviIrcUserEntry *e,const QString &nick,const QString &user,const QString &host) +void KviConsole::checkDefaultAvatar(KviIrcUserEntry *e,const TQString &nick,const TQString &user,const TQString &host) { // look it up in the cache - QString szAvatar = KviAvatarCache::instance()->lookup(KviIrcMask(nick,user,host),currentNetworkName().utf8().data()); + TQString szAvatar = KviAvatarCache::instance()->lookup(KviIrcMask(nick,user,host),currentNetworkName().utf8().data()); if(!szAvatar.isEmpty()) { // got a cache hit... is it on disk ? - KviAvatar * avatar = g_pIconManager->getAvatar(QString::null,szAvatar); + KviAvatar * avatar = g_pIconManager->getAvatar(TQString(),szAvatar); if(avatar) { // cached image on disk e->setAvatar(avatar); - avatarChangedUpdateWindows(nick,QString::null); + avatarChangedUpdateWindows(nick,TQString()); return; } else { // no cached image on disk.. will need to requery it anyway @@ -960,15 +960,15 @@ void KviConsole::checkDefaultAvatar(KviIrcUserEntry *e,const QString &nick,const if(u) { // the user is registered... - QString szAvatar; + TQString szAvatar; if(u->getProperty("avatar",szAvatar)) { // the user has a default avatar... - KviAvatar * avatar = g_pIconManager->getAvatar(QString::null,szAvatar); + KviAvatar * avatar = g_pIconManager->getAvatar(TQString(),szAvatar); if(avatar) { e->setAvatar(avatar); - avatarChangedUpdateWindows(nick,QString::null); + avatarChangedUpdateWindows(nick,TQString()); return; } } @@ -979,40 +979,40 @@ void KviConsole::resetAvatarForMatchingUsers(KviRegisteredUser * u) { if(!connection())return; - QString szAvatar; + TQString szAvatar; if(!u->getProperty("avatar",szAvatar))return; - KviPointerHashTableIterator<QString,KviIrcUserEntry> it(*(connection()->userDataBase()->dict())); + KviPointerHashTableIterator<TQString,KviIrcUserEntry> it(*(connection()->userDataBase()->dict())); while(KviIrcUserEntry * e = it.current()) { if(e->hasHost()) { if(u->matchesFixed(it.currentKey(),e->user(),e->host())) { - KviAvatar * a = g_pIconManager->getAvatar(QString::null,szAvatar); + KviAvatar * a = g_pIconManager->getAvatar(TQString(),szAvatar); e->setAvatar(a); - avatarChangedUpdateWindows(it.currentKey(),QString::null); + avatarChangedUpdateWindows(it.currentKey(),TQString()); } } ++it; } } -KviAvatar * KviConsole::setAvatar(const QString &nick,const QString &user,const QString &host,const QString &szLocalPath,const QString &szName) +KviAvatar * KviConsole::setAvatar(const TQString &nick,const TQString &user,const TQString &host,const TQString &szLocalPath,const TQString &szName) { if(!connection())return 0; - KviIrcUserEntry * e = connection()->userDataBase()->find(nick); + KviIrcUserEntry * e = connection()->userDataBase()->tqfind(nick); if(e) { // User and host must match if((!user.isEmpty()) && e->hasUser()) { - if(!KviQString::equalCI(user,e->user()))return 0; + if(!KviTQString::equalCI(user,e->user()))return 0; } if((!host.isEmpty()) && e->hasHost()) { - if(!KviQString::equalCI(host,e->host()))return 0; + if(!KviTQString::equalCI(host,e->host()))return 0; } // Ok...got it @@ -1021,7 +1021,7 @@ KviAvatar * KviConsole::setAvatar(const QString &nick,const QString &user,const if(avatar) { e->setAvatar(avatar); - avatarChanged(avatar,nick,user,host,QString::null); + avatarChanged(avatar,nick,user,host,TQString()); return avatar; } else { if(_OUTPUT_PARANOIC) @@ -1033,17 +1033,17 @@ KviAvatar * KviConsole::setAvatar(const QString &nick,const QString &user,const KviAvatar * KviConsole::defaultAvatarFromOptions() { - QPixmap * avatar = KVI_OPTION_PIXMAP(KviOption_pixmapMyAvatar).pixmap(); + TQPixmap * avatar = KVI_OPTION_PIXMAP(KviOption_pixmapMyAvatar).pixmap(); if(!avatar)return 0; if(avatar->isNull())return 0; if(KVI_OPTION_STRING(KviOption_stringMyAvatar).isEmpty())return 0; - return new KviAvatar(KVI_OPTION_PIXMAP(KviOption_pixmapMyAvatar).path(),KVI_OPTION_STRING(KviOption_stringMyAvatar),new QPixmap(*avatar)); + return new KviAvatar(KVI_OPTION_PIXMAP(KviOption_pixmapMyAvatar).path(),KVI_OPTION_STRING(KviOption_stringMyAvatar),new TQPixmap(*avatar)); } KviAvatar * KviConsole::currentAvatar() { if(!connection())return 0; - KviIrcUserEntry * e = connection()->userDataBase()->find(connection()->userInfo()->nickName()); + KviIrcUserEntry * e = connection()->userDataBase()->tqfind(connection()->userInfo()->nickName()); if(!e)return 0; KviAvatar * a = e->avatar(); if(!a) @@ -1052,7 +1052,7 @@ KviAvatar * KviConsole::currentAvatar() if(a) { e->setAvatar(a); - avatarChanged(a,connection()->userInfo()->nickName(),QString::null,QString::null,QString::null); + avatarChanged(a,connection()->userInfo()->nickName(),TQString(),TQString(),TQString()); } } return a; @@ -1061,13 +1061,13 @@ KviAvatar * KviConsole::currentAvatar() void KviConsole::setAvatarFromOptions() { if(!connection())return; - KviIrcUserEntry * e = connection()->userDataBase()->find(connection()->userInfo()->nickName()); + KviIrcUserEntry * e = connection()->userDataBase()->tqfind(connection()->userInfo()->nickName()); if(!e)return; KviAvatar * a = defaultAvatarFromOptions(); if(a) { e->setAvatar(a); - avatarChanged(a,connection()->userInfo()->nickName(),QString::null,QString::null,QString::null); + avatarChanged(a,connection()->userInfo()->nickName(),TQString(),TQString(),TQString()); } } @@ -1084,18 +1084,18 @@ void KviConsole::applyOptions() resize(width() + 1,height() + 1); } -void KviConsole::resizeEvent(QResizeEvent *e) +void KviConsole::resizeEvent(TQResizeEvent *e) { int hght = m_pInput->heightHint(); - int hght2 = m_pButtonBox->sizeHint().height(); + int hght2 = m_pButtonBox->tqsizeHint().height(); m_pButtonBox->setGeometry(0,0,width(),hght2); m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2)); m_pInput->setGeometry(0,height() - hght,width(),hght); } -QSize KviConsole::sizeHint() const +TQSize KviConsole::tqsizeHint() const { - QSize ret(m_pIrcView->sizeHint().height(),m_pIrcView->sizeHint().height() + m_pInput->heightHint()); + TQSize ret(m_pIrcView->tqsizeHint().height(),m_pIrcView->tqsizeHint().height() + m_pInput->heightHint()); return ret; } @@ -1115,16 +1115,16 @@ void KviConsole::fillStatusString() if(connection()->userInfo()->isAway()) { - m_szStatusString += QChar(' '); + m_szStatusString += TQChar(' '); m_szStatusString += __tr2qs("away"); } - m_szStatusString += QChar(')'); + m_szStatusString += TQChar(')'); } else { if(connection()->userInfo()->isAway()) { m_szStatusString += " ("; m_szStatusString += __tr2qs("away"); - m_szStatusString += QChar(')'); + m_szStatusString += TQChar(')'); } } @@ -1138,16 +1138,16 @@ void KviConsole::fillCaptionBuffers() { fillStatusString(); - static QString begin("<nobr><font color=\""); - static QString boldbegin("\"><b>"); - static QString endofbold("</b></font> <font color=\""); - static QString endoffont("\">"); - static QString end("</font></nobr>"); + static TQString begin("<nobr><font color=\""); + static TQString boldbegin("\"><b>"); + static TQString endofbold("</b></font> <font color=\""); + static TQString endoffont("\">"); + static TQString end("</font></nobr>"); m_szPlainTextCaption = windowName(); m_szPlainTextCaption += " ["; m_szPlainTextCaption += m_szStatusString; - m_szPlainTextCaption += QChar(']'); + m_szPlainTextCaption += TQChar(']'); m_szHtmlActiveCaption = begin; m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name(); @@ -1171,29 +1171,29 @@ void KviConsole::fillCaptionBuffers() } -QPixmap * KviConsole::myIconPtr() +TQPixmap * KviConsole::myIconPtr() { return g_pIconManager->getSmallIcon(isConnected() ? KVI_SMALLICON_LINKS : KVI_SMALLICON_CONSOLE); } -void KviConsole::getTaskBarTipText(QString &buffer) +void KviConsole::getTaskBarTipText(TQString &buffer) { fillStatusString(); - static QString html_bold("<b>"); - static QString html_tab(" "); - static QString html_eofbold("</b>"); - static QString html_hrbr("<br><hr>"); - static QString html_channel(__tr2qs("channel")); - static QString html_channels(__tr2qs("channels")); - static QString html_query(__tr2qs("query")); - static QString html_queries(__tr2qs("queries")); - static QString html_space(" "); - static QString html_commaspace(", "); - static QString html_br("<br>"); - static QString html_spaceparopen(" ("); - static QString html_spaceparclosed(")"); + static TQString html_bold("<b>"); + static TQString html_tab(" "); + static TQString html_eofbold("</b>"); + static TQString html_hrbr("<br><hr>"); + static TQString html_channel(__tr2qs("channel")); + static TQString html_channels(__tr2qs("channels")); + static TQString html_query(__tr2qs("query")); + static TQString html_queries(__tr2qs("queries")); + static TQString html_space(" "); + static TQString html_commaspace(", "); + static TQString html_br("<br>"); + static TQString html_spaceparopen(" ("); + static TQString html_spaceparclosed(")"); buffer = "<table width=\"100%\">" \ START_TABLE_BOLD_ROW; @@ -1201,7 +1201,7 @@ void KviConsole::getTaskBarTipText(QString &buffer) buffer += END_TABLE_BOLD_ROW; if((context()->state() == KviIrcContext::Connected) && connection()) { - QString num; + TQString num; unsigned int uD; unsigned int uH; @@ -1239,7 +1239,7 @@ void KviConsole::getTaskBarTipText(QString &buffer) buffer += "</td></tr>"; } - QDateTime dt; + TQDateTime dt; dt.setTime_t(connection()->statistics()->connectionStartTime()); buffer += START_TABLE_NORMAL_ROW; @@ -1255,7 +1255,7 @@ void KviConsole::getTaskBarTipText(QString &buffer) //buffer += html_spaceparopen; - QString tspan = KviTimeUtils::formatTimeInterval((unsigned int)(kvi_secondsSince(connection()->statistics()->connectionStartTime())), + TQString tspan = KviTimeUtils::formatTimeInterval((unsigned int)(kvi_secondsSince(connection()->statistics()->connectionStartTime())), KviTimeUtils::NoLeadingEmptyIntervals | KviTimeUtils::NoLeadingZeroes); buffer += __tr2qs("Online for"); diff --git a/src/kvirc/ui/kvi_console.h b/src/kvirc/ui/kvi_console.h index b9f494c..18c02ee 100644 --- a/src/kvirc/ui/kvi_console.h +++ b/src/kvirc/ui/kvi_console.h @@ -34,11 +34,11 @@ #include "kvi_pointerlist.h" #include <time.h> -#include <qcombobox.h> +#include <tqcombobox.h> -class QToolBar; -class QToolButton; +class TQToolBar; +class TQToolButton; class KviAvatar; class KviDns; @@ -51,7 +51,7 @@ class KviProxy; class KviChannel; class KviQuery; #else - // windoze wants it to compile QList<KviChannel> and QList<KviQuery> + // windoze wants it to compile TQList<KviChannel> and TQList<KviQuery> #include "kvi_channel.h" #include "kvi_query.h" #endif @@ -80,6 +80,7 @@ class KVIRC_API KviConsole : public KviWindow friend class KviQuery; friend class KviIrcContext; Q_OBJECT + TQ_OBJECT protected: KviConsole(KviFrame * lpFrm,int iFlags); public: @@ -89,18 +90,18 @@ protected: // UI KviUserListView * m_pNotifyListView; KviWindowToolPageButton * m_pNotifyViewButton; - QComboBox * m_pAddressEdit; - QString m_szStatusString; // nick (flags) on server | not connected + TQComboBox * m_pAddressEdit; + TQString m_szStatusString; // nick (flags) on server | not connected protected: // UI - virtual QPixmap * myIconPtr(); + virtual TQPixmap * myIconPtr(); virtual void fillCaptionBuffers(); - virtual void resizeEvent(QResizeEvent *e); - virtual void closeEvent(QCloseEvent *e); - virtual void getBaseLogFileName(QString &buffer); - virtual void getTaskBarTipText(QString &buffer); + virtual void resizeEvent(TQResizeEvent *e); + virtual void closeEvent(TQCloseEvent *e); + virtual void getBaseLogFileName(TQString &buffer); + virtual void getTaskBarTipText(TQString &buffer); virtual void fillContextPopup(KviTalPopupMenu * p); - virtual QSize sizeHint() const; + virtual TQSize tqsizeHint() const; virtual void applyOptions(); virtual void triggerCreationEvents(); void fillStatusString(); @@ -113,7 +114,7 @@ protected: void destroyConnection(); // internal helper for applyHighlighting - int triggerOnHighlight(KviWindow *wnd,int type,const QString &nick,const QString &user,const QString &host,const QString &szMsg,const QString &trigger); + int triggerOnHighlight(KviWindow *wnd,int type,const TQString &nick,const TQString &user,const TQString &host,const TQString &szMsg,const TQString &trigger); void showNotifyList(bool bShow); @@ -142,33 +143,33 @@ public: // // This connection info // - QString currentNetworkName(); + TQString currentNetworkName(); KviAvatar * currentAvatar(); // // IRC Context wide helpers (connection related) // - void getUserTipText(const QString &nick,KviIrcUserEntry *e,QString &buffer); + void getUserTipText(const TQString &nick,KviIrcUserEntry *e,TQString &buffer); enum OutputPrivmsgFlags { NoWindowFlashing = 1, // has meaning only if NoHighlighting is NOT given, otherwise it is implied NoNotifier = 2, // has meaning only if NoHighlighitng is NOT given, otherwise it is implied NoHighlighting = 4, NoNotifications = 7 // this is 1|2|4 implies NoWindowFlashing and NoNotifier }; - void outputPrivmsg(KviWindow *wnd,int type,const QString &nick, - const QString &user,const QString &host,const QString &msg,int iFlags = 0,const QString &prefix = QString::null,const QString &suffix = QString::null); + void outputPrivmsg(KviWindow *wnd,int type,const TQString &nick, + const TQString &user,const TQString &host,const TQString &msg,int iFlags = 0,const TQString &prefix = TQString(),const TQString &suffix = TQString()); // this applies highlighting to the specified message // and triggers the OnHighlight event. // it returns KVI_OUT_HIGHLIGHT if highlighting was applied // and -1 if OnHighlight called halt // otherwise it returns <type> - int applyHighlighting(KviWindow *wnd,int type,const QString &nick,const QString &user,const QString &host,const QString &szMsg); + int applyHighlighting(KviWindow *wnd,int type,const TQString &nick,const TQString &user,const TQString &host,const TQString &szMsg); // Avatar helpers (conneciton related) void resetAvatarForMatchingUsers(KviRegisteredUser * u); // this should be protected at least - void avatarChangedUpdateWindows(const QString &nick,const QString &textLine); - void avatarChanged(KviAvatar * avatar,const QString &nick,const QString &user,const QString &host,const QString &textLine); - KviAvatar * setAvatar(const QString &nick,const QString &user,const QString &host,const QString &szLocalPath,const QString &szName); - void checkDefaultAvatar(KviIrcUserEntry *e,const QString &nick,const QString &user,const QString &host); + void avatarChangedUpdateWindows(const TQString &nick,const TQString &textLine); + void avatarChanged(KviAvatar * avatar,const TQString &nick,const TQString &user,const TQString &host,const TQString &textLine); + KviAvatar * setAvatar(const TQString &nick,const TQString &user,const TQString &host,const TQString &szLocalPath,const TQString &szName); + void checkDefaultAvatar(KviIrcUserEntry *e,const TQString &nick,const TQString &user,const TQString &host); void setAvatarFromOptions(); // This returns the default avatar for the current KVIrc user @@ -180,8 +181,8 @@ public: void terminateConnectionRequest(bool bForce = false,const char * quitMsg = 0); - // Status string (usermode + nick) (connection related too) - const QString & statusString(){ return m_szStatusString; }; + // tqStatus string (usermode + nick) (connection related too) + const TQString & statusString(){ return m_szStatusString; }; // forwarders from KviIrcConnection KVI_DEPRECATED KviPointerList<KviChannel> * channelList(){ return connection() ? connection()->channelList() : 0; }; @@ -195,8 +196,8 @@ public: KviWindow * activeWindow(); // User db, connection related - void completeChannel(const QString &word,KviPointerList<QString> * matches); - void completeServer(const QString &word,KviPointerList<QString> * matches); + void completeChannel(const TQString &word,KviPointerList<TQString> * matches); + void completeServer(const TQString &word,KviPointerList<TQString> * matches); void connectionAttached(); void connectionDetached(); public slots: @@ -204,7 +205,7 @@ public slots: void executeInternalCommand(int index); void recentUrlsChanged(); protected slots: - void ircUriChanged(const QString & ); + void ircUriChanged(const TQString & ); void toggleNotifyView(); void textViewRightClicked(); }; diff --git a/src/kvirc/ui/kvi_cryptcontroller.cpp b/src/kvirc/ui/kvi_cryptcontroller.cpp index 6cbdd5b..f9a7a13 100644 --- a/src/kvirc/ui/kvi_cryptcontroller.cpp +++ b/src/kvirc/ui/kvi_cryptcontroller.cpp @@ -40,7 +40,7 @@ #include "kvi_memmove.h" #include "kvi_toolwindows_container.h" - #include <qlayout.h> + #include <tqlayout.h> #include "kvi_pointerhashtable.h" // kvi_app.cpp @@ -65,7 +65,7 @@ - KviCryptController::KviCryptController(QWidget * par,KviWindowToolPageButton* button,const char * name,KviWindow * wnd,KviCryptSessionInfo * cur) + KviCryptController::KviCryptController(TQWidget * par,KviWindowToolPageButton* button,const char * name,KviWindow * wnd,KviCryptSessionInfo * cur) : KviWindowToolWidget(par,button) { // FIXME: #warning "Load the available modules here" @@ -79,51 +79,51 @@ m_pWindow = wnd; #ifdef COMPILE_USE_QT4 - setFocusPolicy(Qt::ClickFocus); + setFocusPolicy(TTQ_ClickFocus); #else - setFocusPolicy(QWidget::ClickFocus); + setFocusPolicy(TQ_ClickFocus); #endif - QGridLayout *g = new QGridLayout(this,10,4,2,2); + TQGridLayout *g = new TQGridLayout(this,10,4,2,2); - QLabel *l = new QLabel(this); + TQLabel *l = new TQLabel(this); l->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LOCKED))); g->addWidget(l,0,0); - l = new QLabel(__tr2qs("Cryptography/text transformation"),this); + l = new TQLabel(__tr2qs("Cryptography/text transformation"),this); g->addMultiCellWidget(l,0,0,1,3); - QFrame * frm = new QFrame(this); - frm->setFrameStyle(QFrame::HLine | QFrame::Sunken); + TQFrame * frm = new TQFrame(this); + frm->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); g->addMultiCellWidget(frm,1,1,0,3); m_pEnableCheck = new KviStyledCheckBox(__tr2qs("Use the crypt engine"),this); g->addMultiCellWidget(m_pEnableCheck,2,2,0,3); - connect(m_pEnableCheck,SIGNAL(toggled(bool)),this,SLOT(enableCheckToggled(bool))); + connect(m_pEnableCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableCheckToggled(bool))); m_pListBox = new KviTalListBox(this); - connect(m_pListBox,SIGNAL(highlighted(KviTalListBoxItem *)),this,SLOT(engineHighlighted(KviTalListBoxItem *))); + connect(m_pListBox,TQT_SIGNAL(highlighted(KviTalListBoxItem *)),this,TQT_SLOT(engineHighlighted(KviTalListBoxItem *))); g->addMultiCellWidget(m_pListBox,3,8,0,0); - m_pDescriptionLabel = new QLabel(this); - m_pDescriptionLabel->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel); + m_pDescriptionLabel = new TQLabel(this); + m_pDescriptionLabel->setFrameStyle(TQFrame::Sunken | TQFrame::StyledPanel); #ifdef COMPILE_USE_QT4 - m_pDescriptionLabel->setAlignment(Qt::AlignTop | Qt::AlignLeft); + m_pDescriptionLabel->tqsetAlignment(TQt::AlignTop | TQt::AlignLeft); #else - m_pDescriptionLabel->setAlignment(Qt::AlignTop | Qt::AlignLeft); + m_pDescriptionLabel->tqsetAlignment(TQt::AlignTop | TQt::AlignLeft); #endif g->addMultiCellWidget(m_pDescriptionLabel,3,3,1,3); - m_pAuthorLabel = new QLabel(this); - m_pAuthorLabel->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel); + m_pAuthorLabel = new TQLabel(this); + m_pAuthorLabel->setFrameStyle(TQFrame::Sunken | TQFrame::StyledPanel); g->addMultiCellWidget(m_pAuthorLabel,4,4,1,3); m_pEnableEncrypt = new KviStyledCheckBox(__tr2qs("Enable encryption"),this); g->addMultiCellWidget(m_pEnableEncrypt,5,5,1,3); - m_pEncryptKeyLabel = new QLabel(__tr2qs("Encrypt key:"),this); + m_pEncryptKeyLabel = new TQLabel(__tr2qs("Encrypt key:"),this); g->addWidget(m_pEncryptKeyLabel,6,1); - m_pEncryptKeyEdit = new QLineEdit(this); + m_pEncryptKeyEdit = new TQLineEdit(this); g->addWidget(m_pEncryptKeyEdit,6,2); m_pEncryptHexKeyCheck = new KviStyledCheckBox(__tr2qs("Hex"),this); @@ -132,18 +132,18 @@ m_pEnableDecrypt = new KviStyledCheckBox(__tr2qs("Enable decryption"),this); g->addMultiCellWidget(m_pEnableDecrypt,7,7,1,3); - m_pDecryptKeyLabel = new QLabel(__tr2qs("Decrypt key:"),this); + m_pDecryptKeyLabel = new TQLabel(__tr2qs("Decrypt key:"),this); g->addWidget(m_pDecryptKeyLabel,8,1); - m_pDecryptKeyEdit = new QLineEdit(this); + m_pDecryptKeyEdit = new TQLineEdit(this); g->addWidget(m_pDecryptKeyEdit,8,2); m_pDecryptHexKeyCheck = new KviStyledCheckBox(__tr2qs("Hex"),this); g->addWidget(m_pDecryptHexKeyCheck,8,3); - m_pOkButton = new QPushButton(__tr2qs("OK"),this); + m_pOkButton = new TQPushButton(__tr2qs("OK"),this); g->addMultiCellWidget(m_pOkButton,9,9,0,3); - connect(m_pOkButton,SIGNAL(clicked()),this,SLOT(okClicked())); + connect(m_pOkButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked())); g->setRowStretch(3,1); g->setColStretch(2,1); @@ -155,7 +155,7 @@ if(cur) { - KviTalListBoxItem * it = (KviTalListBoxItem *)m_pListBox->findItem(cur->szEngineName.ptr()); + KviTalListBoxItem * it = (KviTalListBoxItem *)m_pListBox->tqfindItem(cur->szEngineName.ptr()); if(it) { m_pEnableCheck->setChecked(true); @@ -184,10 +184,10 @@ void KviCryptController::fillEngineList() { - const KviPointerHashTable<QString,KviCryptEngineDescription> * a = g_pCryptEngineManager->engineDict(); + const KviPointerHashTable<TQString,KviCryptEngineDescription> * a = g_pCryptEngineManager->engineDict(); if(a) { - KviPointerHashTableIterator<QString,KviCryptEngineDescription> it(*a); + KviPointerHashTableIterator<TQString,KviCryptEngineDescription> it(*a); while(it.current()) { KviStr modName = it.current()->providerHandle ? ((KviModule *)(it.current()->providerHandle))->name() : ""; @@ -205,7 +205,7 @@ { KviEngineListBoxItem * eit = (KviEngineListBoxItem *)it; m_pAuthorLabel->setText(eit->m_szAuthor.ptr()); - QString des = "<p>"; + TQString des = "<p>"; des += eit->m_szDescription.ptr(); des += "<br><br>"; des += __tr2qs("If you dont want to encrypt a particular text line then just start it with the CTRL+P prefix"); diff --git a/src/kvirc/ui/kvi_cryptcontroller.h b/src/kvirc/ui/kvi_cryptcontroller.h index 1d6afcb..17e26a4 100644 --- a/src/kvirc/ui/kvi_cryptcontroller.h +++ b/src/kvirc/ui/kvi_cryptcontroller.h @@ -26,17 +26,19 @@ #include "kvi_settings.h" +#ifdef Q_MOC_RUN +#define COMPILE_CRYPT_SUPPORT +#endif // Q_MOC_RUN +// TQt4 tqmoc bails out on this ?????? -// Qt4 moc bails out on this ?????? - -#if defined(COMPILE_CRYPT_SUPPORT) || defined(Q_MOC_RUN) - #include <qwidget.h> +#if defined(COMPILE_CRYPT_SUPPORT) || defined(TQ_TQMOC_RUN) + #include <tqwidget.h> #include "kvi_tal_listbox.h" - #include <qpushbutton.h> - #include <qcheckbox.h> - #include <qlabel.h> - #include <qlineedit.h> + #include <tqpushbutton.h> + #include <tqcheckbox.h> + #include <tqlabel.h> + #include <tqlineedit.h> #include "kvi_styled_controls.h" #include "kvi_crypt.h" @@ -72,23 +74,24 @@ class KVIRC_API KviCryptController : public KviWindowToolWidget { Q_OBJECT + TQ_OBJECT public: - KviCryptController(QWidget * parent,KviWindowToolPageButton* button,const char * name,KviWindow * wnd,KviCryptSessionInfo * cur); + KviCryptController(TQWidget * tqparent,KviWindowToolPageButton* button,const char * name,KviWindow * wnd,KviCryptSessionInfo * cur); ~KviCryptController(); protected: KviWindow * m_pWindow; KviTalListBox * m_pListBox; - QPushButton * m_pOkButton; + TQPushButton * m_pOkButton; KviStyledCheckBox * m_pEnableCheck; - QLabel * m_pDescriptionLabel; - QLabel * m_pAuthorLabel; + TQLabel * m_pDescriptionLabel; + TQLabel * m_pAuthorLabel; KviStyledCheckBox * m_pEnableEncrypt; - QLabel * m_pEncryptKeyLabel; - QLineEdit * m_pEncryptKeyEdit; + TQLabel * m_pEncryptKeyLabel; + TQLineEdit * m_pEncryptKeyEdit; KviStyledCheckBox * m_pEncryptHexKeyCheck; KviStyledCheckBox * m_pEnableDecrypt; - QLabel * m_pDecryptKeyLabel; - QLineEdit * m_pDecryptKeyEdit; + TQLabel * m_pDecryptKeyLabel; + TQLineEdit * m_pDecryptKeyEdit; KviStyledCheckBox * m_pDecryptHexKeyCheck; KviEngineListBoxItem * m_pLastItem; KviCryptSessionInfo * m_pSessionInfo; diff --git a/src/kvirc/ui/kvi_ctcppagedialog.cpp b/src/kvirc/ui/kvi_ctcppagedialog.cpp index e6f392d..da82146 100644 --- a/src/kvirc/ui/kvi_ctcppagedialog.cpp +++ b/src/kvirc/ui/kvi_ctcppagedialog.cpp @@ -29,40 +29,40 @@ #include "kvi_iconmanager.h" -#include <qdatetime.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qpixmap.h> +#include <tqdatetime.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqpixmap.h> #ifdef COMPILE_USE_QT4 - #include <qdesktopwidget.h> + #include <tqdesktopwidget.h> #endif // kvi_app.cpp extern KVIRC_API KviCtcpPageDialog * g_pCtcpPageDialog; KviCtcpPageDialog::KviCtcpPageDialog() -: QWidget(0,"kvirc_ctcppage_dialog", +: TQWidget(0,"kvirc_ctcppage_dialog", #ifdef COMPILE_USE_QT4 - Qt::WindowStaysOnTopHint | Qt::Tool | Qt::Dialog | Qt::Window) + TQt::WindowStaysOnTopHint | TQt::Tool | TQt::Dialog | TQt::Window) #else WStyle_StaysOnTop | WStyle_Tool | WType_Dialog | WType_TopLevel) #endif { - QGridLayout * g = new QGridLayout(this,4,1,6,0); + TQGridLayout * g = new TQGridLayout(this,4,1,6,0); m_pWidgetStack = new KviTalWidgetStack(this); g->addWidget(m_pWidgetStack,0,0); - m_pTabBar = new QTabBar(this); - m_pTabBar->setShape(QTabBar::TriangularBelow); - connect(m_pTabBar,SIGNAL(selected(int)),this,SLOT(tabSelected(int))); + m_pTabBar = new TQTabBar(this); + m_pTabBar->setShape(TQTabBar::TriangularBelow); + connect(m_pTabBar,TQT_SIGNAL(selected(int)),this,TQT_SLOT(tabSelected(int))); g->addWidget(m_pTabBar,1,0); g->setRowStretch(0,1); g->addRowSpacing(2,15); - m_pCloseButton = new QPushButton(__tr2qs("Close"),this); - connect(m_pCloseButton,SIGNAL(clicked()),this,SLOT(die())); + m_pCloseButton = new TQPushButton(__tr2qs("Close"),this); + connect(m_pCloseButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(die())); g->addWidget(m_pCloseButton,3,0); setMinimumSize(300,200); @@ -93,19 +93,19 @@ void KviCtcpPageDialog::tabSelected(int id) m_pWidgetStack->raiseWidget(id); } -void KviCtcpPageDialog::addPage(const QString &szNick,const QString &szUser,const QString &szHost,const QString &szMsg) +void KviCtcpPageDialog::addPage(const TQString &szNick,const TQString &szUser,const TQString &szHost,const TQString &szMsg) { #ifdef COMPILE_USE_QT4 int id = m_pTabBar->addTab(szNick); #else - int id = m_pTabBar->addTab(new QTab(szNick)); + int id = m_pTabBar->addTab(new TQTab(szNick)); #endif - QLabel * l = new QLabel(this); - l->setFrameStyle(QFrame::Raised | QFrame::StyledPanel); + TQLabel * l = new TQLabel(this); + l->setFrameStyle(TQFrame::Raised | TQFrame::StyledPanel); //l->setMaximumWidth(600); - QString date = QDateTime::currentDateTime().toString(); + TQString date = TQDateTime::tqcurrentDateTime().toString(); - QString tmp = "<center>"; + TQString tmp = "<center>"; tmp += __tr2qs("You have been paged by"); tmp += "<br><b>"; tmp += szNick; @@ -125,7 +125,7 @@ void KviCtcpPageDialog::addPage(const QString &szNick,const QString &szUser,cons m_pTabBar->setCurrentTab(id); } -void KviCtcpPageDialog::closeEvent(QCloseEvent *) +void KviCtcpPageDialog::closeEvent(TQCloseEvent *) { delete this; } @@ -138,9 +138,9 @@ void KviCtcpPageDialog::popup() m_pCloseButton->setFocus(); } -void KviCtcpPageDialog::showEvent(QShowEvent *e) +void KviCtcpPageDialog::showEvent(TQShowEvent *e) { - QWidget::showEvent(e); + TQWidget::showEvent(e); center(); } diff --git a/src/kvirc/ui/kvi_ctcppagedialog.h b/src/kvirc/ui/kvi_ctcppagedialog.h index ea61525..d1e4ba7 100644 --- a/src/kvirc/ui/kvi_ctcppagedialog.h +++ b/src/kvirc/ui/kvi_ctcppagedialog.h @@ -27,30 +27,31 @@ #include "kvi_string.h" #include "kvi_tal_widgetstack.h" -#include <qtabbar.h> -#include <qwidget.h> -#include <qpushbutton.h> +#include <tqtabbar.h> +#include <tqwidget.h> +#include <tqpushbutton.h> -class KVIRC_API KviCtcpPageDialog : public QWidget +class KVIRC_API KviCtcpPageDialog : public TQWidget { Q_OBJECT + TQ_OBJECT public: KviCtcpPageDialog(); ~KviCtcpPageDialog(); protected: KviTalWidgetStack * m_pWidgetStack; - QTabBar * m_pTabBar; - QPushButton * m_pCloseButton; + TQTabBar * m_pTabBar; + TQPushButton * m_pCloseButton; public: void popup(); - void addPage(const QString &szNick,const QString &szUser,const QString &szHost,const QString &szMsg); + void addPage(const TQString &szNick,const TQString &szUser,const TQString &szHost,const TQString &szMsg); protected slots: void tabSelected(int id); void die(); protected: void center(); - virtual void showEvent(QShowEvent *e); - virtual void closeEvent(QCloseEvent *); + virtual void showEvent(TQShowEvent *e); + virtual void closeEvent(TQCloseEvent *); }; #endif //_KVI_CTCPPAGEDIALOG_H_ diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp index 7aa6f1c..b4e0630 100644 --- a/src/kvirc/ui/kvi_customtoolbar.cpp +++ b/src/kvirc/ui/kvi_customtoolbar.cpp @@ -31,69 +31,69 @@ #include "kvi_actionmanager.h" #include "kvi_customtoolbardescriptor.h" -#include <qcursor.h> +#include <tqcursor.h> #include "kvi_tal_popupmenu.h" -#include <qlayout.h> -#include <qpixmap.h> -#include <qcursor.h> -#include <qtoolbutton.h> -#include <qpainter.h> -#include <qstyle.h> +#include <tqlayout.h> +#include <tqpixmap.h> +#include <tqcursor.h> +#include <tqtoolbutton.h> +#include <tqpainter.h> +#include <tqstyle.h> #ifdef COMPILE_USE_QT4 - #include <qevent.h> - #include <q3dragobject.h> + #include <tqevent.h> + #include <tq3dragobject.h> - #define QDragObject Q3DragObject - #define QTextDrag Q3TextDrag - #define QIconDrag Q3IconDrag + #define TQDragObject Q3DragObject + #define TQTextDrag Q3TextDrag + #define TQIconDrag Q3IconDrag - #include <qstyleoption.h> + #include <tqstyleoption.h> #else - #include <qobjectlist.h> - #include <qdragobject.h> + #include <tqobjectlist.h> + #include <tqdragobject.h> #endif KviCustomToolBarSeparator::KviCustomToolBarSeparator(KviCustomToolBar *pParent,const char * name) -: QWidget(pParent,name) +: TQWidget(pParent,name) { m_pToolBar = pParent; setBackgroundMode(pParent->backgroundMode()); setBackgroundOrigin(ParentOrigin); - setSizePolicy(QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum)); + tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum)); } -QSize KviCustomToolBarSeparator::sizeHint() const +TQSize KviCustomToolBarSeparator::tqsizeHint() const { #ifdef COMPILE_USE_QT4 - QStyleOption opt; + TQStyleOption opt; opt.initFrom(this); - int extent = style()->pixelMetric(QStyle::PM_ToolBarSeparatorExtent,&opt,this); + int extent = tqstyle()->tqpixelMetric(TQStyle::PM_ToolBarSeparatorExtent,&opt,this); #else - int extent = style().pixelMetric(QStyle::PM_DockWindowSeparatorExtent,this); + int extent = tqstyle().tqpixelMetric(TQStyle::PM_DockWindowSeparatorExtent,this); #endif - if(m_pToolBar->orientation() == Qt::Horizontal)return QSize(extent,0); - else return QSize(0,extent); + if(m_pToolBar->orientation() == Qt::Horizontal)return TQSize(extent,0); + else return TQSize(0,extent); } -void KviCustomToolBarSeparator::paintEvent(QPaintEvent *) +void KviCustomToolBarSeparator::paintEvent(TQPaintEvent *) { - QPainter p(this); + TQPainter p(this); #ifdef COMPILE_USE_QT4 - QStyleOption opt; + TQStyleOption opt; opt.initFrom(this); - style()->drawPrimitive(QStyle::PE_Q3DockWindowSeparator,&opt,&p,this); + tqstyle()->drawPrimitive(TQStyle::PE_Q3DockWindowSeparator,&opt,&p,this); #else - QStyle::SFlags flags = QStyle::Style_Default; - if(m_pToolBar->orientation() == Qt::Horizontal)flags |= QStyle::Style_Horizontal; - style().drawPrimitive(QStyle::PE_DockWindowSeparator,&p,rect(),colorGroup(),flags); + TQStyle::SFlags flags = TQStyle::Style_Default; + if(m_pToolBar->orientation() == Qt::Horizontal)flags |= TQStyle::Style_Horizontal; + tqstyle().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator,&p,rect(),tqcolorGroup(),flags); #endif } -KviCustomToolBar::KviCustomToolBar(KviCustomToolBarDescriptor * d,const QString &label,QT_TOOLBARDOCK_TYPE dock,bool bNewLine,const char * nam) +KviCustomToolBar::KviCustomToolBar(KviCustomToolBarDescriptor * d,const TQString &label,TQT_TOOLBARDOCK_TYPE dock,bool bNewLine,const char * nam) : KviToolBar(label,dock,bNewLine,nam) { m_pDescriptor = d; @@ -101,8 +101,8 @@ KviCustomToolBar::KviCustomToolBar(KviCustomToolBarDescriptor * d,const QString m_pDraggedChild = 0; m_pFilteredChildren = 0; setAcceptDrops(true); - connect(KviActionManager::instance(),SIGNAL(beginCustomizeToolBars()),this,SLOT(beginCustomize())); - connect(KviActionManager::instance(),SIGNAL(endCustomizeToolBars()),this,SLOT(endCustomize())); + connect(KviActionManager::instance(),TQT_SIGNAL(beginCustomizeToolBars()),this,TQT_SLOT(beginCustomize())); + connect(KviActionManager::instance(),TQT_SIGNAL(endCustomizeToolBars()),this,TQT_SLOT(endCustomize())); setMinimumSize(20,20); d->registerToolBar(this); if(KviActionManager::customizingToolBars()) @@ -122,13 +122,13 @@ KviCustomToolBar::~KviCustomToolBar() if(m_pFilteredChildren)delete m_pFilteredChildren; } -void KviCustomToolBar::paintEvent(QPaintEvent * e) +void KviCustomToolBar::paintEvent(TQPaintEvent * e) { KviToolBar::paintEvent(e); if(KviActionManager::customizingToolBars() && (KviActionManager::currentToolBar() == this)) { - QPainter p(this); - p.setPen(Qt::red); + TQPainter p(this); + p.setPen(TQt::red); p.drawRect(0,0,width(),height()); } } @@ -136,30 +136,30 @@ void KviCustomToolBar::paintEvent(QPaintEvent * e) void KviCustomToolBar::filteredChildDestroyed() { if(!m_pFilteredChildren)return; - const QObject * o = sender(); + const TQObject * o = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); m_pFilteredChildren->remove((void *)o); } -void KviCustomToolBar::filterChild(QObject * o) +void KviCustomToolBar::filterChild(TQObject * o) { - bool * b = new bool(((QWidget *)o)->isEnabled()); + bool * b = new bool(((TQWidget *)o)->isEnabled()); if(m_pFilteredChildren) m_pFilteredChildren->insert(o,b); - if(!*b)((QWidget *)o)->setEnabled(true); + if(!*b)((TQWidget *)o)->setEnabled(true); o->installEventFilter(this); - connect(o,SIGNAL(destroyed()),this,SLOT(filteredChildDestroyed())); + connect(o,TQT_SIGNAL(destroyed()),this,TQT_SLOT(filteredChildDestroyed())); } -void KviCustomToolBar::unfilterChild(QObject * o) +void KviCustomToolBar::unfilterChild(TQObject * o) { if(m_pFilteredChildren) { - bool * b = m_pFilteredChildren->find(o); + bool * b = m_pFilteredChildren->tqfind(o); if(b) { - if(!*b)((QWidget *)o)->setEnabled(false); + if(!*b)((TQWidget *)o)->setEnabled(false); o->removeEventFilter(this); - disconnect(o,SIGNAL(destroyed()),this,SLOT(filteredChildDestroyed())); + disconnect(o,TQT_SIGNAL(destroyed()),this,TQT_SLOT(filteredChildDestroyed())); } } } @@ -169,18 +169,18 @@ void KviCustomToolBar::beginCustomize() if(m_pFilteredChildren)delete m_pFilteredChildren; m_pFilteredChildren = new KviPointerHashTable<void *,bool>; m_pFilteredChildren->setAutoDelete(true); - // filter the events for all the children + // filter the events for all the tqchildren #ifdef COMPILE_USE_QT4 - QList<QObject*> l = children(); - for(QList<QObject*>::Iterator it = l.begin();it != l.end();++it) + TQList<TQObject*> l = tqchildren(); + for(TQList<TQObject*>::Iterator it = l.begin();it != l.end();++it) { if((*it)->isWidgetType()) filterChild(*it); } #else - const QObjectList * l = children(); - QObjectListIterator it(*l); - while(QObject * o = it.current()) + const TQObjectList l = childrenListObject(); + TQObjectListIterator it(l); + while(TQObject * o = it.current()) { if(o->isWidgetType()) filterChild(o); @@ -193,23 +193,23 @@ void KviCustomToolBar::endCustomize() { // stop filtering events #ifdef COMPILE_USE_QT4 - QList<QObject*> l = children(); - for(QList<QObject*>::Iterator it = l.begin();it != l.end();++it) + TQList<TQObject*> l = tqchildren(); + for(TQList<TQObject*>::Iterator it = l.begin();it != l.end();++it) { if((*it)->isWidgetType()) unfilterChild(*it); } #else - const QObjectList * l = children(); - QObjectListIterator it(*l); - while(QObject * o = it.current()) + const TQObjectList l = childrenListObject(); + TQObjectListIterator it(l); + while(TQObject * o = it.current()) { if(o->isWidgetType()) unfilterChild(o); ++it; } #endif - // FIXME: We SHOULD MAKE SURE that the children are re-enabled... + // FIXME: We SHOULD MAKE SURE that the tqchildren are re-enabled... // this could be done by calling setEnabled(isEnabled()) on each action ? if(m_pFilteredChildren) { @@ -222,34 +222,34 @@ void KviCustomToolBar::endCustomize() void KviCustomToolBar::syncDescriptor() { // store the item order in the descriptor - QBoxLayout * lay = boxLayout(); - QLayoutIterator iter = lay->iterator(); - QLayoutItem * i; + TQBoxLayout * lay = boxLayout(); + TQLayoutIterator iter = lay->iterator(); + TQLayoutItem * i; m_pDescriptor->actions()->clear(); while((i = iter.current())) { - if(QWidget * w = i->widget()) - m_pDescriptor->actions()->append(new QString(w->name())); + if(TQWidget * w = i->widget()) + m_pDescriptor->actions()->append(new TQString(w->name())); ++iter; } } -void KviCustomToolBar::childEvent(QChildEvent *e) +void KviCustomToolBar::childEvent(TQChildEvent *e) { if(KviActionManager::customizingToolBars()) { - // this is useful for droppped and dragged-out children - if(e->type() == QEvent::ChildInserted) + // this is useful for droppped and dragged-out tqchildren + if(e->type() == TQEvent::ChildInserted) { if(e->child()->isWidgetType()) - filterChild(e->child()); + filterChild(TQT_TQOBJECT(e->child())); goto done; } - if(e->type() == QEvent::ChildRemoved) + if(e->type() == TQEvent::ChildRemoved) { if(e->child()->isWidgetType()) - unfilterChild(e->child()); + unfilterChild(TQT_TQOBJECT(e->child())); goto done; } } @@ -257,12 +257,12 @@ done: KviToolBar::childEvent(e); } -void KviCustomToolBar::dragEnterEvent(QDragEnterEvent *e) +void KviCustomToolBar::dragEnterEvent(TQDragEnterEvent *e) { if(!KviActionManager::customizingToolBars())return; KviActionManager::instance()->setCurrentToolBar(this); - QString text; - if(QTextDrag::decode(e,text)) + TQString text; + if(TQTextDrag::decode(e,text)) { if(!text.isEmpty()) { @@ -270,12 +270,12 @@ void KviCustomToolBar::dragEnterEvent(QDragEnterEvent *e) if(a) { e->accept(true); - int idx = dropIndexAt(mapFromGlobal(QCursor::pos()),0,0); + int idx = dropIndexAt(mapFromGlobal(TQCursor::pos()),0,0); m_pDraggedChild = a->addToCustomToolBar(this); #ifdef COMPILE_USE_QT4 - QWidget * pWidgetToMove = widgetAt(idx); + TQWidget * pWidgetToMove = widgetAt(idx); bool bDone = false; - QAction * a; + TQAction * a; if(pWidgetToMove) { a = actionForWidget(pWidgetToMove); @@ -293,23 +293,23 @@ void KviCustomToolBar::dragEnterEvent(QDragEnterEvent *e) boxLayout()->insertWidget(idx,m_pDraggedChild); #ifdef COMPILE_KDE_SUPPORT // bleah :///// - insertWidget(-1,m_pDraggedChild->sizeHint().width(),m_pDraggedChild,idx); + insertWidget(-1,m_pDraggedChild->tqsizeHint().width(),m_pDraggedChild,idx); #endif #endif - QEvent ev(QEvent::LayoutHint); - QApplication::sendEvent(this,&ev); + TQEvent ev(TQEvent::LayoutHint); + TQApplication::sendEvent(this,&ev); } else e->accept(false); } else e->accept(false); } else e->accept(false); } -void KviCustomToolBar::dragMoveEvent(QDragMoveEvent *e) +void KviCustomToolBar::dragMoveEvent(TQDragMoveEvent *e) { if(!m_pDraggedChild)return; - drag(m_pDraggedChild,mapFromGlobal(QCursor::pos())); + drag(m_pDraggedChild,mapFromGlobal(TQCursor::pos())); } -void KviCustomToolBar::dragLeaveEvent(QDragLeaveEvent *e) +void KviCustomToolBar::dragLeaveEvent(TQDragLeaveEvent *e) { if(m_pDraggedChild) { @@ -320,7 +320,7 @@ void KviCustomToolBar::dragLeaveEvent(QDragLeaveEvent *e) } } -void KviCustomToolBar::dropEvent(QDropEvent *e) +void KviCustomToolBar::dropEvent(TQDropEvent *e) { if(!m_pDraggedChild)return; m_pDraggedChild = 0; @@ -328,30 +328,30 @@ void KviCustomToolBar::dropEvent(QDropEvent *e) // nuthin :) } -int KviCustomToolBar::dropIndexAt(const QPoint &pnt,QWidget * exclude,int * excludeIdx) +int KviCustomToolBar::dropIndexAt(const TQPoint &pnt,TQWidget * exclude,int * excludeIdx) { // find the widget at the current poisition // treating exclude as if it was going to be removed // find also the exclude index if needed #ifdef COMPILE_USE_QT4 - QLayout * l = layout(); + TQLayout * l = tqlayout(); #else - QBoxLayout * l = boxLayout(); + TQBoxLayout * l = boxLayout(); #endif - QLayoutItem * i = 0; + TQLayoutItem * i = 0; if(excludeIdx)*excludeIdx = -1; int idx = 0; if(!l)return 0; - QLayoutIterator it = l->iterator(); + TQLayoutIterator it = l->iterator(); - // find the children with minimum distance + // find the tqchildren with minimum distance int iMinDistIdx = -1; - QWidget * pMinDistW = 0; + TQWidget * pMinDistW = 0; unsigned int uMinDist = 0xffffffff; int iExcludeIdx = -1; - QPoint pntExclude; - QWidget * w = 0; + TQPoint pntExclude; + TQWidget * w = 0; while((i = it.current())) { @@ -451,25 +451,25 @@ int KviCustomToolBar::dropIndexAt(const QPoint &pnt,QWidget * exclude,int * excl } #ifdef COMPILE_USE_QT4 -QWidget * KviCustomToolBar::widgetAt(int index) +TQWidget * KviCustomToolBar::widgetAt(int index) { - QLayout * l = layout(); + TQLayout * l = tqlayout(); if(!l) return NULL; - QLayoutItem * it = l->itemAt(index); + TQLayoutItem * it = l->itemAt(index); if(!it) return NULL; return it->widget(); } -QAction * KviCustomToolBar::actionForWidget(QWidget * pWidget) +TQAction * KviCustomToolBar::actionForWidget(TQWidget * pWidget) { return actionAt(pWidget->x() + 1,pWidget->y() + 1); } #endif -void KviCustomToolBar::drag(QWidget * child,const QPoint &pnt) +void KviCustomToolBar::drag(TQWidget * child,const TQPoint &pnt) { int me = -1; int idx = dropIndexAt(pnt,child,&me); @@ -477,15 +477,15 @@ void KviCustomToolBar::drag(QWidget * child,const QPoint &pnt) if(idx == me) return; // would move over itself #ifdef COMPILE_USE_QT4 - QWidget * pWidgetToMove = widgetAt(idx > me ? idx-1 : idx); + TQWidget * pWidgetToMove = widgetAt(idx > me ? idx-1 : idx); debug("SEARCHING FOR WIDGET TO MOVE AT %d AND FOUND %x (ME=%x)",idx > me ? idx-1 : idx,pWidgetToMove,child); if(pWidgetToMove == child) return; // hmmm bool bDone = false; - QAction * pMyOwnAction = actionForWidget(child); + TQAction * pMyOwnAction = actionForWidget(child); if(!pMyOwnAction) return; - QAction * a; + TQAction * a; removeAction(pMyOwnAction); if(pWidgetToMove) { @@ -511,46 +511,46 @@ void KviCustomToolBar::drag(QWidget * child,const QPoint &pnt) insertWidget(-1,child->width(),child,idx); #endif #endif - QEvent ev(QEvent::LayoutHint); - QApplication::sendEvent(this,&ev); + TQEvent ev(TQEvent::LayoutHint); + TQApplication::sendEvent(this,&ev); } -void KviCustomToolBar::mousePressEvent(QMouseEvent * e) +void KviCustomToolBar::mousePressEvent(TQMouseEvent * e) { if(KviActionManager::customizingToolBars()) KviActionManager::instance()->setCurrentToolBar(this); KviToolBar::mousePressEvent(e); } -bool KviCustomToolBar::eventFilter(QObject *o,QEvent *e) +bool KviCustomToolBar::eventFilter(TQObject *o,TQEvent *e) { if(!KviActionManager::customizingToolBars())goto unhandled; // anything here is done when customizing only - if(e->type() == QEvent::Enter) + if(e->type() == TQEvent::Enter) { - if(m_pMovedChild)return true; // kill it while moving other children + if(m_pMovedChild)return true; // kill it while moving other tqchildren } - if(e->type() == QEvent::Leave) + if(e->type() == TQEvent::Leave) { - if(m_pMovedChild)return true; // kill it while moving other children + if(m_pMovedChild)return true; // kill it while moving other tqchildren } - if(e->type() == QEvent::MouseButtonPress) + if(e->type() == TQEvent::MouseButtonPress) { KviActionManager::instance()->setCurrentToolBar(this); - QMouseEvent * ev = (QMouseEvent *)e; + TQMouseEvent * ev = (TQMouseEvent *)e; if(ev->button() & Qt::LeftButton) { if(o->isWidgetType()) { if(!( o->inherits("KviTalPopupMenu") || - o->inherits("QToolBarHandle") || - o->inherits("QDockWindowHandle") || - o->inherits("QDockWindowResizeHandle") || - o->inherits("QToolBarExtensionWidget") + o->inherits("TQToolBarHandle") || + o->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING) || + o->inherits("TQDockWindowResizeHandle") || + o->inherits("TQToolBarExtensionWidget") )) { - m_pMovedChild = (QWidget *)o; - // allow resizing of children + m_pMovedChild = (TQWidget *)o; + // allow resizing of tqchildren // FIXME: do it only if the child is really resizable if(m_pMovedChild->width() > 20) // might be an applet { @@ -560,14 +560,14 @@ bool KviCustomToolBar::eventFilter(QObject *o,QEvent *e) goto unhandled; // let the applet handle the event it } } - g_pApp->setOverrideCursor(Qt::sizeAllCursor); + g_pApp->setOverrideCursor(TQt::sizeAllCursor); return true; } } } goto unhandled; } - if(e->type() == QEvent::MouseButtonRelease) + if(e->type() == TQEvent::MouseButtonRelease) { if(m_pMovedChild) { @@ -577,56 +577,56 @@ bool KviCustomToolBar::eventFilter(QObject *o,QEvent *e) } goto unhandled; } - if(e->type() == QEvent::MouseMove) + if(e->type() == TQEvent::MouseMove) { if(m_pMovedChild) { - QMouseEvent * ev = (QMouseEvent *)e; + TQMouseEvent * ev = (TQMouseEvent *)e; - QPoint pnt = mapFromGlobal(m_pMovedChild->mapToGlobal(ev->pos())); + TQPoint pnt = mapFromGlobal(m_pMovedChild->mapToGlobal(ev->pos())); if((pnt.y() < 0) || (pnt.y() > height()) || (pnt.x() < 0) || (pnt.x() > width())) { // drag out! -// FIXME: This is screwed up in Qt4.... :/ +// FIXME: This is screwed up in TQt4.... :/ #ifdef COMPILE_USE_QT4 - QDrag * d = new QDrag(this); - QMimeData * m = new QMimeData(); + TQDrag * d = new TQDrag(this); + TQMimeData * m = new TQMimeData(); m->setText(m_pMovedChild->name()); d->setMimeData(m); #else - QDragObject * d = new QTextDrag(m_pMovedChild->name(),this); + TQDragObject * d = new TQTextDrag(m_pMovedChild->name(),this); #endif KviAction * act = KviActionManager::instance()->getAction(m_pMovedChild->name()); if(act) { - QPixmap * pixie = act->bigIcon(); + TQPixmap * pixie = act->bigIcon(); #ifdef COMPILE_USE_QT4 if(pixie) { d->setPixmap(*pixie); - d->setHotSpot(QPoint(3,3)); + d->setHotSpot(TQPoint(3,3)); } #else - if(pixie)d->setPixmap(*pixie,QPoint(3,3)); + if(pixie)d->setPixmap(*pixie,TQPoint(3,3)); #endif } - //d->setPixmap(QPixmap::grabWidget(m_pMovedChild),QPoint(m_pMovedChild->width() / 2,m_pMovedChild->height() / 2)); + //d->setPixmap(TQPixmap::grabWidget(m_pMovedChild),TQPoint(m_pMovedChild->width() / 2,m_pMovedChild->height() / 2)); // throw it somewhere else for now if(m_pFilteredChildren) - unfilterChild(m_pMovedChild); + unfilterChild(TQT_TQOBJECT(m_pMovedChild)); #ifdef COMPILE_USE_QT4 - QAction * pActionForMovedChild = actionForWidget(m_pMovedChild); + TQAction * pActionForMovedChild = actionForWidget(m_pMovedChild); if(pActionForMovedChild) pActionForMovedChild->setVisible(false); m_pMovedChild->hide(); #else m_pMovedChild->hide(); - m_pMovedChild->reparent(g_pFrame,QPoint(-1000,-1000),false); + m_pMovedChild->reparent(g_pFrame,TQPoint(-1000,-1000),false); #endif - QEvent ev(QEvent::LayoutHint); - QApplication::sendEvent(this,&ev); + TQEvent ev(TQEvent::LayoutHint); + TQApplication::sendEvent(this,&ev); #ifdef COMPILE_USE_QT4 - if(!d->exec(Qt::MoveAction) != Qt::MoveAction) + if(!d->exec(TQt::MoveAction) != TQt::MoveAction) #else if(!d->dragMove()) #endif @@ -636,10 +636,10 @@ bool KviCustomToolBar::eventFilter(QObject *o,QEvent *e) KviActionManager::instance()->emitRemoveActionsHintRequest(); // will filter it as ChildInserted #ifndef COMPILE_USE_QT4 - m_pMovedChild->reparent(this,QPoint(0,0),false); + m_pMovedChild->reparent(this,TQPoint(0,0),false); #endif #ifdef COMPILE_USE_QT4 - QAction * pActionForMovedChild = actionForWidget(m_pMovedChild); + TQAction * pActionForMovedChild = actionForWidget(m_pMovedChild); if(pActionForMovedChild) pActionForMovedChild->setVisible(false); #else @@ -650,10 +650,10 @@ bool KviCustomToolBar::eventFilter(QObject *o,QEvent *e) insertWidget(-1,m_pMovedChild->width(),m_pMovedChild,0); #endif #endif - QEvent ev(QEvent::LayoutHint); - QApplication::sendEvent(this,&ev); + TQEvent ev(TQEvent::LayoutHint); + TQApplication::sendEvent(this,&ev); } else { - QApplication::sendPostedEvents(m_pMovedChild,0); + TQApplication::sendPostedEvents(m_pMovedChild,0); m_pMovedChild->deleteLater(); m_pMovedChild = 0; } diff --git a/src/kvirc/ui/kvi_customtoolbar.h b/src/kvirc/ui/kvi_customtoolbar.h index 64e9526..ec6483b 100644 --- a/src/kvirc/ui/kvi_customtoolbar.h +++ b/src/kvirc/ui/kvi_customtoolbar.h @@ -35,50 +35,52 @@ #endif class KviCustomToolBar; -class KviCustomToolBarSeparator : public QWidget +class KviCustomToolBarSeparator : public TQWidget { Q_OBJECT + TQ_OBJECT public: KviCustomToolBarSeparator(KviCustomToolBar *pParent,const char * name); - QSize sizeHint() const; + TQSize tqsizeHint() const; protected: KviCustomToolBar * m_pToolBar; protected: - void paintEvent(QPaintEvent *e); + void paintEvent(TQPaintEvent *e); }; class KVIRC_API KviCustomToolBar : public KviToolBar { friend class KviCustomToolBarDescriptor; Q_OBJECT + TQ_OBJECT protected: - KviCustomToolBar(KviCustomToolBarDescriptor * d,const QString &label,QT_TOOLBARDOCK_TYPE dock = QT_DOCK_TOP,bool bNewLine = false,const char * nam = 0); + KviCustomToolBar(KviCustomToolBarDescriptor * d,const TQString &label,TQT_TOOLBARDOCK_TYPE dock = TQT_DOCK_TOP,bool bNewLine = false,const char * nam = 0); public: ~KviCustomToolBar(); protected: KviCustomToolBarDescriptor * m_pDescriptor; - QWidget * m_pMovedChild; - QWidget * m_pDraggedChild; + TQWidget * m_pMovedChild; + TQWidget * m_pDraggedChild; KviPointerHashTable<void *,bool> * m_pFilteredChildren; public: KviCustomToolBarDescriptor * descriptor(){ return m_pDescriptor; }; protected: - virtual void mousePressEvent(QMouseEvent * e); - virtual void dragEnterEvent(QDragEnterEvent *e); - virtual void dragMoveEvent(QDragMoveEvent *e); - virtual void dragLeaveEvent(QDragLeaveEvent *e); - virtual void dropEvent(QDropEvent *e); - virtual void childEvent(QChildEvent *e); - virtual bool eventFilter(QObject *o,QEvent *e); - int dropIndexAt(const QPoint &pnt,QWidget * exclude,int * excludeIdx); + virtual void mousePressEvent(TQMouseEvent * e); + virtual void dragEnterEvent(TQDragEnterEvent *e); + virtual void dragMoveEvent(TQDragMoveEvent *e); + virtual void dragLeaveEvent(TQDragLeaveEvent *e); + virtual void dropEvent(TQDropEvent *e); + virtual void childEvent(TQChildEvent *e); + virtual bool eventFilter(TQObject *o,TQEvent *e); + int dropIndexAt(const TQPoint &pnt,TQWidget * exclude,int * excludeIdx); #ifdef COMPILE_USE_QT4 - QWidget * widgetAt(int index); - QAction * actionForWidget(QWidget * pWidget); + TQWidget * widgetAt(int index); + TQAction * actionForWidget(TQWidget * pWidget); #endif - void drag(QWidget * child,const QPoint &pnt); - void filterChild(QObject * o); - void unfilterChild(QObject * o); - virtual void paintEvent(QPaintEvent * e); + void drag(TQWidget * child,const TQPoint &pnt); + void filterChild(TQObject * o); + void unfilterChild(TQObject * o); + virtual void paintEvent(TQPaintEvent * e); void syncDescriptor(); protected slots: void beginCustomize(); diff --git a/src/kvirc/ui/kvi_debugwindow.cpp b/src/kvirc/ui/kvi_debugwindow.cpp index 81067c0..8110967 100644 --- a/src/kvirc/ui/kvi_debugwindow.cpp +++ b/src/kvirc/ui/kvi_debugwindow.cpp @@ -36,9 +36,9 @@ #include "kvi_frame.h" #include "kvi_valuelist.h" -#include <qpixmap.h> -#include <qsplitter.h> -#include <qtoolbutton.h> +#include <tqpixmap.h> +#include <tqsplitter.h> +#include <tqtoolbutton.h> KviDebugWindow * KviDebugWindow::m_pInstance = 0; @@ -47,7 +47,7 @@ KviDebugWindow::KviDebugWindow() : KviWindow(KVI_WINDOW_TYPE_DEBUG,g_pFrame,__tr2qs("Debug Messages"),0) { m_pInstance = this; - m_pSplitter = new QSplitter(Qt::Horizontal,this,"main_splitter"); + m_pSplitter = new TQSplitter(Qt::Horizontal,this,"main_splitter"); m_pIrcView = new KviIrcView(m_pSplitter,g_pFrame,this); m_pInput = new KviInput(this,0); updateCaption(); @@ -70,7 +70,7 @@ KviDebugWindow * KviDebugWindow::getInstance() -void KviDebugWindow::getBaseLogFileName(QString &buffer) +void KviDebugWindow::getBaseLogFileName(TQString &buffer) { buffer = "debug"; } @@ -93,9 +93,9 @@ void KviDebugWindow::loadProperties(KviConfig *cfg) void KviDebugWindow::fillCaptionBuffers() { - static QString begin("<nobr><font color=\""); - static QString boldbegin("\"><b>"); - static QString end("</b></font></nobr>"); + static TQString begin("<nobr><font color=\""); + static TQString boldbegin("\"><b>"); + static TQString end("</b></font></nobr>"); m_szPlainTextCaption = windowName(); @@ -112,21 +112,21 @@ void KviDebugWindow::fillCaptionBuffers() m_szHtmlInactiveCaption += end; } -QPixmap * KviDebugWindow::myIconPtr() +TQPixmap * KviDebugWindow::myIconPtr() { return g_pIconManager->getSmallIcon(KVI_SMALLICON_BUG); } -void KviDebugWindow::resizeEvent(QResizeEvent *e) +void KviDebugWindow::resizeEvent(TQResizeEvent *e) { int hght = m_pInput->heightHint(); m_pSplitter->setGeometry(0,0,width(),height() - hght); m_pInput->setGeometry(0,height() - hght,width(),hght); } -QSize KviDebugWindow::sizeHint() const +TQSize KviDebugWindow::tqsizeHint() const { - QSize ret(m_pSplitter->sizeHint().width(),m_pIrcView->sizeHint().height() + m_pInput->heightHint()); + TQSize ret(m_pSplitter->tqsizeHint().width(),m_pIrcView->tqsizeHint().height() + m_pInput->heightHint()); return ret; } diff --git a/src/kvirc/ui/kvi_debugwindow.h b/src/kvirc/ui/kvi_debugwindow.h index b9646e2..616752a 100644 --- a/src/kvirc/ui/kvi_debugwindow.h +++ b/src/kvirc/ui/kvi_debugwindow.h @@ -28,11 +28,12 @@ #include "kvi_window.h" #include "kvi_string.h" -class QSplitter; +class TQSplitter; class KVIRC_API KviDebugWindow : public KviWindow { Q_OBJECT + TQ_OBJECT public: KviDebugWindow(); ~KviDebugWindow(); @@ -42,13 +43,13 @@ public: static KviDebugWindow * instance(){ return m_pInstance; }; static KviDebugWindow * getInstance(); protected: - virtual QPixmap * myIconPtr(); + virtual TQPixmap * myIconPtr(); virtual void fillCaptionBuffers(); - virtual void resizeEvent(QResizeEvent *e); + virtual void resizeEvent(TQResizeEvent *e); virtual void loadProperties(KviConfig * cfg); virtual void saveProperties(KviConfig * cfg); - virtual void getBaseLogFileName(QString &buffer); - virtual QSize sizeHint() const; + virtual void getBaseLogFileName(TQString &buffer); + virtual TQSize tqsizeHint() const; }; #endif //_KVI_DEBUGWINDOW_H_ diff --git a/src/kvirc/ui/kvi_dynamictooltip.cpp b/src/kvirc/ui/kvi_dynamictooltip.cpp index 3e6f22c..fe67619 100644 --- a/src/kvirc/ui/kvi_dynamictooltip.cpp +++ b/src/kvirc/ui/kvi_dynamictooltip.cpp @@ -22,8 +22,8 @@ #define __KVIRC__ #include "kvi_dynamictooltip.h" -KviDynamicToolTipHelper::KviDynamicToolTipHelper(QWidget * parent,KviDynamicToolTip * parToolTip) -: KviTalToolTip(parent) +KviDynamicToolTipHelper::KviDynamicToolTipHelper(TQWidget * tqparent,KviDynamicToolTip * parToolTip) +: KviTalToolTip(tqparent) { m_pParentToolTip = parToolTip; } @@ -32,15 +32,15 @@ KviDynamicToolTipHelper::~KviDynamicToolTipHelper() { } -void KviDynamicToolTipHelper::maybeTip(const QPoint & pnt) +void KviDynamicToolTipHelper::maybeTip(const TQPoint & pnt) { m_pParentToolTip->maybeTip(pnt); } -KviDynamicToolTip::KviDynamicToolTip(QWidget * parent,const char * name) -: QObject(parent,name) +KviDynamicToolTip::KviDynamicToolTip(TQWidget * tqparent,const char * name) +: TQObject(tqparent,name) { - m_pHelper = new KviDynamicToolTipHelper(parent,this); + m_pHelper = new KviDynamicToolTipHelper(tqparent,this); } KviDynamicToolTip::~KviDynamicToolTip() @@ -48,12 +48,12 @@ KviDynamicToolTip::~KviDynamicToolTip() delete m_pHelper; } -void KviDynamicToolTip::maybeTip(const QPoint &pnt) +void KviDynamicToolTip::maybeTip(const TQPoint &pnt) { emit tipRequest(this,pnt); } -void KviDynamicToolTip::tip(const QRect &rct,const QString & text) +void KviDynamicToolTip::tip(const TQRect &rct,const TQString & text) { m_pHelper->tip(rct,text); } diff --git a/src/kvirc/ui/kvi_dynamictooltip.h b/src/kvirc/ui/kvi_dynamictooltip.h index 119c224..d6a6adf 100644 --- a/src/kvirc/ui/kvi_dynamictooltip.h +++ b/src/kvirc/ui/kvi_dynamictooltip.h @@ -25,7 +25,7 @@ #include "kvi_settings.h" #include "kvi_tal_tooltip.h" -#include <qobject.h> +#include <tqobject.h> class KviDynamicToolTip; @@ -33,29 +33,30 @@ class KVIRC_API KviDynamicToolTipHelper : public KviTalToolTip { friend class KviDynamicToolTip; protected: - KviDynamicToolTipHelper(QWidget * parent,KviDynamicToolTip * parToolTip); + KviDynamicToolTipHelper(TQWidget * tqparent,KviDynamicToolTip * parToolTip); virtual ~KviDynamicToolTipHelper(); protected: KviDynamicToolTip * m_pParentToolTip; protected: - virtual void maybeTip(const QPoint &pnt); + virtual void maybeTip(const TQPoint &pnt); }; -class KVIRC_API KviDynamicToolTip : public QObject +class KVIRC_API KviDynamicToolTip : public TQObject { friend class KviDynamicToolTipHelper; Q_OBJECT + TQ_OBJECT public: - KviDynamicToolTip(QWidget * parent,const char * name = 0); + KviDynamicToolTip(TQWidget * tqparent,const char * name = 0); virtual ~KviDynamicToolTip(); protected: KviDynamicToolTipHelper * m_pHelper; public: - void tip(const QRect &rct,const QString & text); + void tip(const TQRect &rct,const TQString & text); protected: - void maybeTip(const QPoint &pnt); + void maybeTip(const TQPoint &pnt); signals: - void tipRequest(KviDynamicToolTip *tip,const QPoint &pnt); + void tipRequest(KviDynamicToolTip *tip,const TQPoint &pnt); }; #endif //!_KVI_DYNAMICTOOLTIP_H_ diff --git a/src/kvirc/ui/kvi_filedialog.cpp b/src/kvirc/ui/kvi_filedialog.cpp index 99f9c16..2dfba50 100644 --- a/src/kvirc/ui/kvi_filedialog.cpp +++ b/src/kvirc/ui/kvi_filedialog.cpp @@ -29,16 +29,16 @@ #include "kvi_frame.h" #include "kvi_qstring.h" -#include <qdir.h> +#include <tqdir.h> #include "kvi_tal_tooltip.h" -#include <qmessagebox.h> +#include <tqmessagebox.h> extern KviMediaManager * g_pMediaManager; -KviFileDialog::KviFileDialog(const QString &dirName, const QString &filter, - QWidget *parent, const char *name, bool modal) -: KviTalFileDialog(dirName,filter,parent,name,modal) +KviFileDialog::KviFileDialog(const TQString &dirName, const TQString &filter, + TQWidget *tqparent, const char *name, bool modal) +: KviTalFileDialog(dirName,filter,tqparent,name,modal) { setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER))); @@ -56,35 +56,35 @@ void KviFileDialog::goKvirc() KviStr tmp; g_pApp->getLocalKvircDirectory(tmp,KviApp::None); - setDir(QDir(tmp.ptr())); + setDir(TQDir(tmp.ptr())); } void KviFileDialog::goHome() { - setDir(QDir::home()); + setDir(TQDir::home()); } */ -bool KviFileDialog::askForOpenFileName(QString &buffer,const QString &caption,const QString &initial,const QString &filter,bool showHidden, bool showNative,QWidget* parent) +bool KviFileDialog::askForOpenFileName(TQString &buffer,const TQString &caption,const TQString &initial,const TQString &filter,bool showHidden, bool showNative,TQWidget* tqparent) { #ifdef COMPILE_ON_WINDOWS if(showNative) { - buffer=QFileDialog::getOpenFileName(initial,filter,parent,"open_file_name_dialog",caption); + buffer=TQFileDialog::getOpenFileName(initial,filter,tqparent,"open_file_name_dialog",caption); KviFileUtils::adjustFilePath(buffer); return !buffer.isEmpty(); } #endif - KviFileDialog * d = new KviFileDialog(initial,filter,parent,"open_file_name_dialog",true); + KviFileDialog * d = new KviFileDialog(initial,filter,tqparent,"open_file_name_dialog",true); d->setCaption(caption); - d->setMode(QFileDialog::ExistingFile); + d->setMode(TQFileDialog::ExistingFile); //d->setShowHiddenFiles(showHidden); - if(d->exec() == QDialog::Accepted) + if(d->exec() == TQDialog::Accepted) { buffer = d->selectedFile(); KviFileUtils::adjustFilePath(buffer); @@ -96,26 +96,26 @@ bool KviFileDialog::askForOpenFileName(QString &buffer,const QString &caption,co } -bool KviFileDialog::askForSaveFileName(QString &buffer,const QString & caption,const QString &initial,const QString &filter,bool showHidden,bool bConfirmOverwrite,bool showNative,QWidget* parent) +bool KviFileDialog::askForSaveFileName(TQString &buffer,const TQString & caption,const TQString &initial,const TQString &filter,bool showHidden,bool bConfirmOverwrite,bool showNative,TQWidget* tqparent) { #ifdef COMPILE_ON_WINDOWS if (showNative) { while (1) { - buffer=QFileDialog::getSaveFileName(initial,filter,parent,"save_file_name_dialog",caption); + buffer=TQFileDialog::getSaveFileName(initial,filter,tqparent,"save_file_name_dialog",caption); KviFileUtils::adjustFilePath(buffer); //return !buffer.isEmpty(); if(buffer.isEmpty()) return false; if(!bConfirmOverwrite) return true; // Check for the file existence if(!KviFileUtils::fileExists(buffer)) return true; - QString tmp; - KviQString::sprintf(tmp,__tr2qs("The file %s already exists.<br>Do you wish to overwrite it?"),buffer.utf8().data()); - switch(QMessageBox::information(parent,__tr2qs("File Exists - KVIrc"),tmp,QMessageBox::Yes,QMessageBox::No | QMessageBox::Default,QMessageBox::Cancel | QMessageBox::Escape)) + TQString tmp; + KviTQString::sprintf(tmp,__tr2qs("The file %s already exists.<br>Do you wish to overwrite it?"),buffer.utf8().data()); + switch(TQMessageBox::information(tqparent,__tr2qs("File Exists - KVIrc"),tmp,TQMessageBox::Yes,TQMessageBox::No | TQMessageBox::Default,TQMessageBox::Cancel | TQMessageBox::Escape)) { - case QMessageBox::Cancel: return false; break; - case QMessageBox::Yes: return true; break; + case TQMessageBox::Cancel: return false; break; + case TQMessageBox::Yes: return true; break; } } @@ -125,12 +125,12 @@ bool KviFileDialog::askForSaveFileName(QString &buffer,const QString & caption,c #endif - KviFileDialog * d = new KviFileDialog(initial,filter,parent,"save_file_name_dialog",true); + KviFileDialog * d = new KviFileDialog(initial,filter,tqparent,"save_file_name_dialog",true); d->setCaption(caption); - d->setMode(QFileDialog::AnyFile); + d->setMode(TQFileDialog::AnyFile); //d->setShowHiddenFiles(showHidden); - while(d->exec() == QDialog::Accepted) + while(d->exec() == TQDialog::Accepted) { buffer = d->selectedFile(); KviFileUtils::adjustFilePath(buffer); @@ -145,12 +145,12 @@ bool KviFileDialog::askForSaveFileName(QString &buffer,const QString & caption,c // Check for the file existence if(KviFileUtils::fileExists(buffer)) { - QString tmp; - KviQString::sprintf(tmp,__tr2qs("The file %s already exists.<br>Do you wish to overwrite it?"),buffer.utf8().data()); - switch(QMessageBox::information(d,__tr2qs("File Exists - KVIrc"),tmp,QMessageBox::Yes,QMessageBox::No | QMessageBox::Default,QMessageBox::Cancel | QMessageBox::Escape)) + TQString tmp; + KviTQString::sprintf(tmp,__tr2qs("The file %s already exists.<br>Do you wish to overwrite it?"),buffer.utf8().data()); + switch(TQMessageBox::information(d,__tr2qs("File Exists - KVIrc"),tmp,TQMessageBox::Yes,TQMessageBox::No | TQMessageBox::Default,TQMessageBox::Cancel | TQMessageBox::Escape)) { - case QMessageBox::Cancel: delete d; return false; break; - case QMessageBox::Yes: delete d; return true; break; + case TQMessageBox::Cancel: delete d; return false; break; + case TQMessageBox::Yes: delete d; return true; break; } } else { delete d; @@ -167,28 +167,28 @@ bool KviFileDialog::askForSaveFileName(QString &buffer,const QString & caption,c } -bool KviFileDialog::askForDirectoryName(QString &buffer,const QString & caption,const QString & initial,const char * filter,bool showHidden,bool showNative,QWidget* parent) +bool KviFileDialog::askForDirectoryName(TQString &buffer,const TQString & caption,const TQString & initial,const char * filter,bool showHidden,bool showNative,TQWidget* tqparent) { #ifdef COMPILE_ON_WINDOWS if(showNative) { - buffer = QFileDialog::getExistingDirectory(initial,parent,"open_file_name_dialog",caption); + buffer = TQFileDialog::getExistingDirectory(initial,tqparent,"open_file_name_dialog",caption); return !buffer.isEmpty(); } #else #ifdef COMPILE_KDE_SUPPORT // the KDE based dir selection dialog is now quite nice - buffer = KFileDialog::getExistingDirectory(initial,parent,caption); + buffer = KFileDialog::getExistingDirectory(initial,tqparent,caption); return !buffer.isEmpty(); #endif #endif KviFileDialog * d = new KviFileDialog(initial, - filter,parent,"directory_name_dialog",true); + filter,tqparent,"directory_name_dialog",true); d->setCaption(caption); - d->setMode(QFileDialog::Directory); + d->setMode(TQFileDialog::Directory); //d->setShowHiddenFiles(showHidden); - if(d->exec() == QDialog::Accepted) + if(d->exec() == TQDialog::Accepted) { buffer = d->selectedFile(); KviFileUtils::adjustFilePath(buffer); @@ -201,21 +201,21 @@ bool KviFileDialog::askForDirectoryName(QString &buffer,const QString & caption, } -bool KviFileDialog::askForOpenFileNames(QStringList &buffer,const QString & caption,const QString & initial,const char * filter,bool showHidden,bool showNative,QWidget* parent) +bool KviFileDialog::askForOpenFileNames(TQStringList &buffer,const TQString & caption,const TQString & initial,const char * filter,bool showHidden,bool showNative,TQWidget* tqparent) { #ifdef COMPILE_ON_WINDOWS if (showNative) { - buffer=QFileDialog::getOpenFileNames(filter,initial,parent,"open_file_name_dialog",caption); + buffer=TQFileDialog::getOpenFileNames(filter,initial,tqparent,"open_file_name_dialog",caption); return (buffer.count()>0); } #endif - KviFileDialog * d = new KviFileDialog(initial,filter ? QString(filter) : QString::null,parent,"open_file_names_dialog",true); + KviFileDialog * d = new KviFileDialog(initial,filter ? TQString(filter) : TQString(),tqparent,"open_file_names_dialog",true); d->setCaption(caption); - d->setMode(QFileDialog::ExistingFiles); + d->setMode(TQFileDialog::ExistingFiles); //d->setShowHiddenFiles(showHidden); - if(d->exec() == QDialog::Accepted) + if(d->exec() == TQDialog::Accepted) { buffer = d->selectedFiles(); delete d; diff --git a/src/kvirc/ui/kvi_filedialog.h b/src/kvirc/ui/kvi_filedialog.h index 985898d..0bb03f6 100644 --- a/src/kvirc/ui/kvi_filedialog.h +++ b/src/kvirc/ui/kvi_filedialog.h @@ -32,22 +32,23 @@ #include "kvi_tal_filedialog.h" -#include <qstringlist.h> +#include <tqstringlist.h> class KVIRC_API KviFileDialog : public KviTalFileDialog { Q_OBJECT + TQ_OBJECT public: - KviFileDialog(const QString &dirName, const QString &filter=QString::null, - QWidget *parent=0, const char *name=0, bool modal=false); + KviFileDialog(const TQString &dirName, const TQString &filter=TQString(), + TQWidget *tqparent=0, const char *name=0, bool modal=false); ~KviFileDialog(); public: - static bool askForOpenFileName(QString &buffer,const QString & caption,const QString &initial = QString::null,const QString &filter = QString::null,bool showHidden = false,bool showNative = true,QWidget* parent=0); - static bool askForSaveFileName(QString &buffer,const QString & caption,const QString &initial = QString::null,const QString &filter = QString::null,bool showHidden = false,bool bConfirmOverwrite = false,bool showNative = true,QWidget* parent=0); + static bool askForOpenFileName(TQString &buffer,const TQString & caption,const TQString &initial = TQString(),const TQString &filter = TQString(),bool showHidden = false,bool showNative = true,TQWidget* tqparent=0); + static bool askForSaveFileName(TQString &buffer,const TQString & caption,const TQString &initial = TQString(),const TQString &filter = TQString(),bool showHidden = false,bool bConfirmOverwrite = false,bool showNative = true,TQWidget* tqparent=0); - static bool askForDirectoryName(QString &buffer,const QString & caption,const QString & initial,const char * filter = 0,bool showHidden = false,bool showNative=true,QWidget* parent=0); - static bool askForOpenFileNames(QStringList &buffer,const QString & caption,const QString & initial,const char * filter = 0,bool showHidden = false,bool showNative=true,QWidget* parent=0); + static bool askForDirectoryName(TQString &buffer,const TQString & caption,const TQString & initial,const char * filter = 0,bool showHidden = false,bool showNative=true,TQWidget* tqparent=0); + static bool askForOpenFileNames(TQStringList &buffer,const TQString & caption,const TQString & initial,const char * filter = 0,bool showHidden = false,bool showNative=true,TQWidget* tqparent=0); }; diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp index e7b7c0b..6b6db20 100644 --- a/src/kvirc/ui/kvi_frame.cpp +++ b/src/kvirc/ui/kvi_frame.cpp @@ -60,42 +60,40 @@ #include "kvi_kvs_script.h" #include "kvi_kvs_eventtriggers.h" -#include <qsplitter.h> -#include <qvariant.h> -#include <qlineedit.h> -#include <qmessagebox.h> -#include <qcheckbox.h> - -#include <qtimer.h> -#include <qlayout.h> - -#if QT_VERSION >= 300 - #include <qfile.h> - #include <qtextstream.h> - #ifdef COMPILE_USE_QT4 - #include <q3dockarea.h> - #define QDockArea Q3DockArea - #else - #include <qdockarea.h> - #endif +#include <tqsplitter.h> +#include <tqvariant.h> +#include <tqlineedit.h> +#include <tqmessagebox.h> +#include <tqcheckbox.h> + +#include <tqtimer.h> +#include <tqlayout.h> + +#include <tqfile.h> +#include <tqtextstream.h> +#ifdef COMPILE_USE_QT4 + #include <tq3dockarea.h> + #define TQDockArea Q3DockArea +#else + #include <tqdockarea.h> #endif #ifdef COMPILE_USE_QT4 - #include <qdesktopwidget.h> - #include <qevent.h> - #include <QShortcut> + #include <tqdesktopwidget.h> + #include <tqevent.h> + #include <TQShortcut> #else - #include <qaccel.h> + #include <tqaccel.h> #endif #include <time.h> #ifdef COMPILE_PSEUDO_TRANSPARENCY - #include <qpixmap.h> + #include <tqpixmap.h> // kvi_app.h - extern QPixmap * g_pShadedParentGlobalDesktopBackground; - extern QPixmap * g_pShadedChildGlobalDesktopBackground; + extern TQPixmap * g_pShadedParentGlobalDesktopBackground; + extern TQPixmap * g_pShadedChildGlobalDesktopBackground; // FIXME: #warning "When a toolbar is moved , MdiManager is resized but does not update the MdiChild backgrounds" #endif @@ -120,16 +118,16 @@ KviFrame::KviFrame() m_pDockExtension = 0; - m_pSplitter = new QSplitter(Qt::Horizontal,this,"main_splitter"); -// m_pSplitter->setFrameShape(QFrame::NoFrame); + m_pSplitter = new TQSplitter(Qt::Horizontal,this,"main_splitter"); +// m_pSplitter->setFrameShape(TQFrame::NoFrame); setCentralWidget(m_pSplitter); setUsesBigPixmaps(KVI_OPTION_BOOL(KviOption_boolUseBigIcons)); m_pMdi = new KviMdiManager(m_pSplitter,this,"mdi_manager"); - connect(m_pMdi,SIGNAL(enteredSdiMode()),this,SLOT(enteredSdiMode())); - connect(m_pMdi,SIGNAL(leftSdiMode()),this,SLOT(leftSdiMode())); + connect(m_pMdi,TQT_SIGNAL(enteredSdiMode()),this,TQT_SLOT(enteredSdiMode())); + connect(m_pMdi,TQT_SIGNAL(leftSdiMode()),this,TQT_SLOT(leftSdiMode())); // This theoretically had to exists before KviMdiManager (that uses enterSdiMode) m_pMenuBar = new KviMenuBar(this,"main_menu_bar"); @@ -160,7 +158,7 @@ KviFrame::KviFrame() if((KVI_OPTION_RECT(KviOption_rectFrameGeometry).width() < 100) || (KVI_OPTION_RECT(KviOption_rectFrameGeometry).height() < 100)) { // Try to find some reasonable defaults - KVI_OPTION_RECT(KviOption_rectFrameGeometry) = QRect(10,10,g_pApp->desktop()->width() - 200,g_pApp->desktop()->height() - 150); + KVI_OPTION_RECT(KviOption_rectFrameGeometry) = TQRect(10,10,g_pApp->desktop()->width() - 200,g_pApp->desktop()->height() - 150); } resize(KVI_OPTION_RECT(KviOption_rectFrameGeometry).width(), @@ -175,12 +173,12 @@ KviFrame::KviFrame() installAccelerators(this); - layout()->setResizeMode(QLayout::FreeResize); + tqlayout()->setResizeMode(TQLayout::FreeResize); } KviFrame::~KviFrame() { - KVI_OPTION_RECT(KviOption_rectFrameGeometry) = QRect(pos().x(),pos().y(), + KVI_OPTION_RECT(KviOption_rectFrameGeometry) = TQRect(pos().x(),pos().y(), size().width(),size().height()); KVI_OPTION_BOOL(KviOption_boolUseBigIcons) = usesBigPixmaps(); @@ -222,7 +220,7 @@ KviFrame::~KviFrame() g_pFrame = 0; } -int KviFrame::registerAccelerator(const QString &szKeySequence,QObject * recv,const char * slot) +int KviFrame::registerAccelerator(const TQString &szKeySequence,TQObject * recv,const char * slot) { int id = m_pAccel->insertItem(szKeySequence); m_pAccel->connectItem(id,recv,slot); @@ -246,13 +244,13 @@ void KviFrame::unregisterModuleExtensionToolBar(KviMexToolBar * t) void KviFrame::restoreModuleExtensionToolBars() { - for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).begin();it != KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).end();++it) + for(TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).begin();it != KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).end();++it) { - QString szEntry = *it; - int idx = szEntry.find(':'); + TQString szEntry = *it; + int idx = szEntry.tqfind(':'); if(idx != -1) { - QString szMod = szEntry.left(idx); + TQString szMod = szEntry.left(idx); szEntry.remove(0,idx + 1); g_pModuleExtensionManager->allocateExtension("toolbar",KviStr(szEntry),firstConsole(),0,0,szMod); } @@ -265,7 +263,7 @@ void KviFrame::saveModuleExtensionToolBars() for(KviMexToolBar * t = m_pModuleExtensionToolBarList->first();t;t = m_pModuleExtensionToolBarList->next()) { - QString s = t->descriptor()->module()->name(); + TQString s = t->descriptor()->module()->name(); s += ":"; s += t->descriptor()->name().ptr(); @@ -311,7 +309,7 @@ KviMexToolBar * KviFrame::moduleExtensionToolBar(int extensionId) [b]Tab after a leading /[/b]: Completes commands[br] [b]Tab after a / in the middle of input[/b]: Completes directories[br] [b]Tab after a $[/b]: Completes function names[br] - [b]Shift+Tab after the first word of input[/b]: completes masks in the current channel or query[br] + [b]Shift+Tab after the first word of input[/b]: completes tqmasks in the current channel or query[br] [b]Ctrl+B[/b]: Inserts the 'bold' mIRC text control character[br] [b]Ctrl+K[/b]: Inserts the 'color' mIRC text control character[br] [b]Ctrl+R[/b]: Inserts the 'reverse' mIRC text control character[br] @@ -345,63 +343,63 @@ KviMexToolBar * KviFrame::moduleExtensionToolBar(int extensionId) </example> */ -KviAccel * KviFrame::installAccelerators(QWidget * wnd) +KviAccel * KviFrame::installAccelerators(TQWidget * wnd) { - QWidget * pParent = wnd ? (QWidget *)wnd : (QWidget *)this; + TQWidget * pParent = wnd ? (TQWidget *)wnd : (TQWidget *)this; #ifdef COMPILE_USE_QT4 - new QShortcut(QKeySequence(Qt::Key_Left + Qt::ALT),pParent,SLOT(switchToPrevWindow())); - new QShortcut(QKeySequence(Qt::Key_Right + Qt::ALT),pParent,SLOT(switchToNextWindow())); - new QShortcut(QKeySequence(Qt::Key_Up + Qt::CTRL),pParent,SLOT(maximizeWindow())); - new QShortcut(QKeySequence(Qt::Key_Down + Qt::CTRL),pParent,SLOT(minimizeWindow())); - new QShortcut(QKeySequence(Qt::Key_Escape +Qt::CTRL),pParent,SLOT(minimizeWindow())); - new QShortcut(QKeySequence(Qt::Key_Left + Qt::ALT + Qt::SHIFT),pParent,SLOT(switchToPrevWindowInContext())); - new QShortcut(QKeySequence(Qt::Key_Right + Qt::ALT + Qt::SHIFT),pParent,SLOT(switchToNextWindowInContext())); + new TQShortcut(TQKeySequence(TQt::Key_Left + TQt::ALT),pParent,TQT_SLOT(switchToPrevWindow())); + new TQShortcut(TQKeySequence(TQt::Key_Right + TQt::ALT),pParent,TQT_SLOT(switchToNextWindow())); + new TQShortcut(TQKeySequence(TQt::Key_Up + TQt::CTRL),pParent,TQT_SLOT(maximizeWindow())); + new TQShortcut(TQKeySequence(TQt::Key_Down + TQt::CTRL),pParent,TQT_SLOT(minimizeWindow())); + new TQShortcut(TQKeySequence(TQt::Key_Escape +TQt::CTRL),pParent,TQT_SLOT(minimizeWindow())); + new TQShortcut(TQKeySequence(TQt::Key_Left + TQt::ALT + TQt::SHIFT),pParent,TQT_SLOT(switchToPrevWindowInContext())); + new TQShortcut(TQKeySequence(TQt::Key_Right + TQt::ALT + TQt::SHIFT),pParent,TQT_SLOT(switchToNextWindowInContext())); #endif KviAccel *ac = new KviAccel(pParent); static int accel_table[] = { - Qt::Key_Left + Qt::ALT , // prev window - Qt::Key_Right + Qt::ALT , // next window - Qt::Key_Up + Qt::CTRL , // maximize window - Qt::Key_Down + Qt::CTRL , // minimize window - Qt::Key_Escape +Qt::CTRL, // minimize window - Qt::Key_Left + Qt::ALT + Qt::SHIFT , // prev window in context - Qt::Key_Right + Qt::ALT + Qt::SHIFT, // next window in context - Qt::Key_F4 + Qt::CTRL , // close current window - Qt::Key_1 + Qt::CTRL , // script accels... - Qt::Key_2 + Qt::CTRL , - Qt::Key_3 + Qt::CTRL , - Qt::Key_4 + Qt::CTRL , - Qt::Key_5 + Qt::CTRL , - Qt::Key_6 + Qt::CTRL , - Qt::Key_7 + Qt::CTRL , - Qt::Key_8 + Qt::CTRL , - Qt::Key_9 + Qt::CTRL , - Qt::Key_0 + Qt::CTRL , - Qt::Key_F1 , // reserved for context sensitive help - Qt::Key_F2 , - Qt::Key_F3 , - Qt::Key_F4 , - Qt::Key_F5 , - Qt::Key_F6 , - Qt::Key_F7 , - Qt::Key_F8 , - Qt::Key_F9 , - Qt::Key_F10 , - Qt::Key_F11 , - Qt::Key_F12 , -/* Qt::Key_F1 + Qt::SHIFT , // window select... - Qt::Key_F2 + Qt::SHIFT , - Qt::Key_F3 + Qt::SHIFT , - Qt::Key_F4 + Qt::SHIFT , - Qt::Key_F5 + Qt::SHIFT , - Qt::Key_F6 + Qt::SHIFT , - Qt::Key_F7 + Qt::SHIFT , - Qt::Key_F8 + Qt::SHIFT , - Qt::Key_F9 + Qt::SHIFT , - Qt::Key_F10 + Qt::SHIFT , - Qt::Key_F11 + Qt::SHIFT , - Qt::Key_F12 + Qt::SHIFT ,*/ + TQt::Key_Left + TQt::ALT , // prev window + TQt::Key_Right + TQt::ALT , // next window + TQt::Key_Up + TQt::CTRL , // maximize window + TQt::Key_Down + TQt::CTRL , // minimize window + TQt::Key_Escape +TQt::CTRL, // minimize window + TQt::Key_Left + TQt::ALT + TQt::SHIFT , // prev window in context + TQt::Key_Right + TQt::ALT + TQt::SHIFT, // next window in context + TQt::Key_F4 + TQt::CTRL , // close current window + TQt::Key_1 + TQt::CTRL , // script accels... + TQt::Key_2 + TQt::CTRL , + TQt::Key_3 + TQt::CTRL , + TQt::Key_4 + TQt::CTRL , + TQt::Key_5 + TQt::CTRL , + TQt::Key_6 + TQt::CTRL , + TQt::Key_7 + TQt::CTRL , + TQt::Key_8 + TQt::CTRL , + TQt::Key_9 + TQt::CTRL , + TQt::Key_0 + TQt::CTRL , + TQt::Key_F1 , // reserved for context sensitive help + TQt::Key_F2 , + TQt::Key_F3 , + TQt::Key_F4 , + TQt::Key_F5 , + TQt::Key_F6 , + TQt::Key_F7 , + TQt::Key_F8 , + TQt::Key_F9 , + TQt::Key_F10 , + TQt::Key_F11 , + TQt::Key_F12 , +/* TQt::Key_F1 + TQt::SHIFT , // window select... + TQt::Key_F2 + TQt::SHIFT , + TQt::Key_F3 + TQt::SHIFT , + TQt::Key_F4 + TQt::SHIFT , + TQt::Key_F5 + TQt::SHIFT , + TQt::Key_F6 + TQt::SHIFT , + TQt::Key_F7 + TQt::SHIFT , + TQt::Key_F8 + TQt::SHIFT , + TQt::Key_F9 + TQt::SHIFT , + TQt::Key_F10 + TQt::SHIFT , + TQt::Key_F11 + TQt::SHIFT , + TQt::Key_F12 + TQt::SHIFT ,*/ 0 }; @@ -413,79 +411,79 @@ KviAccel * KviFrame::installAccelerators(QWidget * wnd) i++; } - connect(ac,SIGNAL(activated(int)),this,SLOT(accelActivated(int))); + connect(ac,TQT_SIGNAL(activated(int)),this,TQT_SLOT(accelActivated(int))); return ac; } void KviFrame::accelActivated(int id) { - KviAccel * acc = (KviAccel *)sender(); + KviAccel * acc = (KviAccel *)TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); int keys = (int)(acc->key(id)); KviTaskBarItem *item = 0; debug("accel"); switch(keys) { - case (Qt::Key_Left+Qt::ALT): switchToPrevWindow(); break; - case (Qt::Key_Right+Qt::ALT): switchToNextWindow(); break; - case (Qt::Key_Up+Qt::CTRL): maximizeWindow(); break; - case (Qt::Key_Escape+Qt::CTRL): - case (Qt::Key_Down+Qt::CTRL): minimizeWindow(); break; - case (Qt::Key_Left+Qt::ALT+Qt::SHIFT): switchToPrevWindowInContext(); break; - case (Qt::Key_Right+Qt::ALT+Qt::SHIFT): switchToNextWindowInContext(); break; - case (Qt::Key_F4+Qt::CTRL): if(g_pActiveWindow)g_pActiveWindow->close(); break; - case (Qt::Key_F1): g_pApp->contextSensitiveHelp(); break; -/* case(Qt::Key_F1 + SHIFT): + case (TQt::Key_Left+TQt::ALT): switchToPrevWindow(); break; + case (TQt::Key_Right+TQt::ALT): switchToNextWindow(); break; + case (TQt::Key_Up+TQt::CTRL): maximizeWindow(); break; + case (TQt::Key_Escape+TQt::CTRL): + case (TQt::Key_Down+TQt::CTRL): minimizeWindow(); break; + case (TQt::Key_Left+TQt::ALT+TQt::SHIFT): switchToPrevWindowInContext(); break; + case (TQt::Key_Right+TQt::ALT+TQt::SHIFT): switchToNextWindowInContext(); break; + case (TQt::Key_F4+TQt::CTRL): if(g_pActiveWindow)g_pActiveWindow->close(); break; + case (TQt::Key_F1): g_pApp->contextSensitiveHelp(); break; +/* case(TQt::Key_F1 + SHIFT): item = m_pTaskBar->item(0); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F2 + SHIFT): + case(TQt::Key_F2 + SHIFT): item = m_pTaskBar->item(1); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F3 + SHIFT): + case(TQt::Key_F3 + SHIFT): item = m_pTaskBar->item(2); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F4 + SHIFT): + case(TQt::Key_F4 + SHIFT): item = m_pTaskBar->item(3); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F5 + SHIFT): + case(TQt::Key_F5 + SHIFT): item = m_pTaskBar->item(4); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F6 + SHIFT): + case(TQt::Key_F6 + SHIFT): item = m_pTaskBar->item(5); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F7 + SHIFT): + case(TQt::Key_F7 + SHIFT): item = m_pTaskBar->item(6); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F8 + SHIFT): + case(TQt::Key_F8 + SHIFT): item = m_pTaskBar->item(7); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F9 + SHIFT): + case(TQt::Key_F9 + SHIFT): item = m_pTaskBar->item(8); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F10 + SHIFT): + case(TQt::Key_F10 + SHIFT): item = m_pTaskBar->item(9); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F11 + SHIFT): + case(TQt::Key_F11 + SHIFT): item = m_pTaskBar->item(10); if(item) setActiveWindow(item->window()); break; - case(Qt::Key_F12 + SHIFT): + case(TQt::Key_F12 + SHIFT): item = m_pTaskBar->item(11); if(item) setActiveWindow(item->window()); break;*/ default: { - KVS_TRIGGER_EVENT_1(KviEvent_OnAccelKeyPressed,g_pActiveWindow,(QString)(acc->key(id))); + KVS_TRIGGER_EVENT_1(KviEvent_OnAccelKeyPressed,g_pActiveWindow,(TQString)(acc->key(id))); } break; }; @@ -511,7 +509,7 @@ void KviFrame::saveWindowProperties(KviWindow * wnd,const char * szSection) unsigned int minVal = time(0); while(it.current() && minVal) { - QString * pVal = it.current()->find("EntryTimestamp"); + TQString * pVal = it.current()->tqfind("EntryTimestamp"); if(pVal) { bool bOk; @@ -560,7 +558,7 @@ void KviFrame::closeWindow(KviWindow *wnd) // save it's properties if(KVI_OPTION_BOOL(KviOption_boolWindowsRememberProperties)) // && (wnd->type() == KVI_WINDOW_TYPE_CHANNEL)) { - QString group; + TQString group; wnd->getConfigGroupName(group); // not uses default settings : store it always saveWindowProperties(wnd,group); @@ -617,7 +615,7 @@ void KviFrame::addWindow(KviWindow *wnd,bool bShow) m_pWinList->append(wnd); wnd->createTaskBarItem(); // create the window taskbar item AFTER it has been constructed - QString group; + TQString group; wnd->getConfigGroupName(group); bool bGroupSettings = false; @@ -652,7 +650,7 @@ void KviFrame::addWindow(KviWindow *wnd,bool bShow) //KVI_OPTION_BOOL(KviOption_boolMdiManagerInSdiMode) = false; } else bMaximized = false; - QRect rect = g_pWinPropertiesConfig->readRectEntry("WinRect",QRect(10,10,500,380)); + TQRect rect = g_pWinPropertiesConfig->readRectEntry("WinRect",TQRect(10,10,500,380)); if(bDocked) { @@ -713,7 +711,7 @@ docking_done: } } -KviMdiChild * KviFrame::dockWindow(KviWindow *wnd,bool bShow,bool bCascade,QRect *setGeom) +KviMdiChild * KviFrame::dockWindow(KviWindow *wnd,bool bShow,bool bCascade,TQRect *setGeom) { if(wnd->mdiParent())return wnd->mdiParent(); KviMdiChild * lpC = new KviMdiChild(m_pMdi,""); @@ -807,7 +805,7 @@ void KviFrame::unhighlightWindowsOfContext(KviIrcContext * c) void KviFrame::setActiveWindow(KviWindow *wnd) { - // ASSERT(m_pWinList->findRef(wnd)) + // ASSERT(m_pWinList->tqfindRef(wnd)) if(wnd->isMinimized())wnd->restore(); if(wnd->mdiParent())wnd->setFocus(); else wnd->delayedAutoRaise(); @@ -869,7 +867,7 @@ void KviFrame::childConnectionUserModeChange(KviIrcConnection * c) void KviFrame::childWindowActivated(KviWindow *wnd) { - // ASSERT(m_pWinList->findRef(wnd)) + // ASSERT(m_pWinList->tqfindRef(wnd)) if(g_pActiveWindow == wnd)return; if(g_pActiveWindow)g_pActiveWindow->lostUserFocus(); // YES: it's HERE! @@ -881,7 +879,7 @@ void KviFrame::childWindowActivated(KviWindow *wnd) if(wnd->isMaximized() && wnd->mdiParent())updateCaption(); m_pTaskBar->setActiveItem(wnd->taskBarItem()); - //wnd->gainedActiveWindowStatus(); // <-- atm unused + //wnd->gainedActiveWindowtqStatus(); // <-- atm unused if(g_pActiveWindow->view()) g_pActiveWindow->view()->clearUnreaded(); @@ -934,8 +932,8 @@ void KviFrame::updateCaption() { if(g_pActiveWindow->isMaximized() && g_pActiveWindow->mdiParent()) { - QString tmp = g_pActiveWindow->plainTextCaption(); - tmp += QChar(' '); + TQString tmp = g_pActiveWindow->plainTextCaption(); + tmp += TQChar(' '); tmp += KVI_DEFAULT_FRAME_CAPTION; setCaption(tmp); return; @@ -945,7 +943,7 @@ void KviFrame::updateCaption() } -void KviFrame::closeEvent(QCloseEvent *e) +void KviFrame::closeEvent(TQCloseEvent *e) { if(KVI_OPTION_BOOL(KviOption_boolCloseInTray)) @@ -960,7 +958,7 @@ void KviFrame::closeEvent(QCloseEvent *e) { dockExtension()->setPrevWindowState(windowState()); - QTimer::singleShot( 0, this, SLOT(hide()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(hide()) ); } return; } @@ -984,12 +982,12 @@ void KviFrame::closeEvent(QCloseEvent *e) if(bGotRunningConnection) { - QString txt = "<p>"; + TQString txt = "<p>"; txt += __tr2qs("There are active connections, are you sure you wish to "); txt += __tr2qs("quit KVIrc?"); txt += "</p>"; - switch(QMessageBox::warning(this,__tr2qs("Confirmation - KVIrc"),txt,__tr2qs("&Yes"),__tr2qs("&Always"),__tr2qs("&No"),2,2)) + switch(TQMessageBox::warning(this,__tr2qs("Confirmation - KVIrc"),txt,__tr2qs("&Yes"),__tr2qs("&Always"),__tr2qs("&No"),2,2)) { case 0: // ok to close @@ -1012,9 +1010,9 @@ void KviFrame::closeEvent(QCloseEvent *e) g_pApp->destroyFrame(); } -void KviFrame::resizeEvent(QResizeEvent *e) +void KviFrame::resizeEvent(TQResizeEvent *e) { - KVI_OPTION_RECT(KviOption_rectFrameGeometry) = QRect(pos().x(),pos().y(), + KVI_OPTION_RECT(KviOption_rectFrameGeometry) = TQRect(pos().x(),pos().y(), size().width(),size().height()); KviTalMainWindow::resizeEvent(e); } @@ -1032,9 +1030,9 @@ void KviFrame::updatePseudoTransparency() #endif } -void KviFrame::moveEvent(QMoveEvent *e) +void KviFrame::moveEvent(TQMoveEvent *e) { - KVI_OPTION_RECT(KviOption_rectFrameGeometry) = QRect(pos().x(),pos().y(), + KVI_OPTION_RECT(KviOption_rectFrameGeometry) = TQRect(pos().x(),pos().y(), size().width(),size().height()); #ifdef COMPILE_PSEUDO_TRANSPARENCY updatePseudoTransparency(); @@ -1076,8 +1074,8 @@ void KviFrame::fillToolBarsPopup(KviTalPopupMenu * p) { p->clear(); - disconnect(p,SIGNAL(activated(int)),this,SLOT(toolbarsPopupSelected(int))); // just to be sure - connect(p,SIGNAL(activated(int)),this,SLOT(toolbarsPopupSelected(int))); + disconnect(p,TQT_SIGNAL(activated(int)),this,TQT_SLOT(toolbarsPopupSelected(int))); // just to be sure + connect(p,TQT_SIGNAL(activated(int)),this,TQT_SLOT(toolbarsPopupSelected(int))); int id; int cnt = 0; @@ -1087,7 +1085,7 @@ void KviFrame::fillToolBarsPopup(KviTalPopupMenu * p) { for(KviModuleExtensionDescriptor * d = l->first();d;d = l->next()) { - QString label = __tr2qs("Show %1").arg(d->visibleName()); + TQString label = __tr2qs("Show %1").tqarg(d->visibleName()); if(d->icon())id = p->insertItem(*(d->icon()),label); else id = p->insertItem(label); p->setItemChecked(id,moduleExtensionToolBar(d->id())); @@ -1097,14 +1095,14 @@ void KviFrame::fillToolBarsPopup(KviTalPopupMenu * p) } // FIXME: Should this display "Hide %1" when the toolbar is already visible ? - KviPointerHashTableIterator<QString,KviCustomToolBarDescriptor> it2(*(KviCustomToolBarManager::instance()->descriptors())); + KviPointerHashTableIterator<TQString,KviCustomToolBarDescriptor> it2(*(KviCustomToolBarManager::instance()->descriptors())); if(it2.current()) { if(cnt > 0)p->insertSeparator(); while(KviCustomToolBarDescriptor * d = it2.current()) { - QString label = __tr2qs("Show %1").arg(d->label()); - QString ico = d->iconId(); + TQString label = __tr2qs("Show %1").tqarg(d->label()); + TQString ico = d->iconId(); // use the icon only if there is no check if(d->toolBar()) { @@ -1113,7 +1111,7 @@ void KviFrame::fillToolBarsPopup(KviTalPopupMenu * p) } else { if(!ico.isEmpty()) { - QPixmap * pix = g_pIconManager->getImage(d->iconId()); + TQPixmap * pix = g_pIconManager->getImage(d->iconId()); if(pix) { id = p->insertItem(*pix,label); @@ -1131,7 +1129,7 @@ void KviFrame::fillToolBarsPopup(KviTalPopupMenu * p) } if(cnt > 0)p->insertSeparator(); - p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TOOLBAR)),__tr2qs("Customize..."),this,SLOT(customizeToolBars())); + p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TOOLBAR)),__tr2qs("Customize..."),this,TQT_SLOT(customizeToolBars())); } void KviFrame::customizeToolBars() @@ -1141,7 +1139,7 @@ void KviFrame::customizeToolBars() void KviFrame::toolbarsPopupSelected(int id) { - const QObject * o = sender(); + const TQObject * o = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); if(!o)return; if(!o->inherits("KviTalPopupMenu"))return; const KviTalPopupMenu * p = (const KviTalPopupMenu *)o; @@ -1167,20 +1165,20 @@ void KviFrame::toolbarsPopupSelected(int id) bool KviFrame::focusNextPrevChild(bool next) { //debug("FOCUS NEXT PREV CHILD"); - QWidget * w = focusWidget(); + TQWidget * w = tqfocusWidget(); if(w) { #ifdef COMPILE_USE_QT4 - if(w->focusPolicy() == Qt::StrongFocus)return false; + if(w->focusPolicy() == TTQ_StrongFocus)return false; #else - if(w->focusPolicy() == QWidget::StrongFocus)return false; + if(w->focusPolicy() == TQ_StrongFocus)return false; #endif - //QVariant v = w->property("KviProperty_FocusOwner"); + //TQVariant v = w->property("KviProperty_FocusOwner"); //if(v.isValid())return false; // Do NOT change the focus widget! - if(w->parent()) + if(w->tqparent()) { - QVariant v = w->parent()->property("KviProperty_ChildFocusOwner"); + TQVariant v = w->tqparent()->property("KviProperty_ChildFocusOwner"); if(v.isValid())return false; // Do NOT change the focus widget! } } @@ -1200,16 +1198,16 @@ bool KviFrame::focusNextPrevChild(bool next) void KviFrame::saveToolBarPositions() { - QString szTemp; + TQString szTemp; g_pApp->getLocalKvircDirectory(szTemp,KviApp::Config,KVI_CONFIGFILE_TOOLBARS); - QFile f(szTemp); + TQFile f(szTemp); if(f.open(IO_WriteOnly | IO_Truncate)) { #ifdef COMPILE_USE_QT4 f.write(saveState(1)); #else //!COMPILE_USE_QT4 - QTextStream ts(&f); + TQTextStream ts(&f); ts << *this; f.close(); #endif //!COMPILE_USE_QT4 @@ -1218,10 +1216,10 @@ void KviFrame::saveToolBarPositions() void KviFrame::restoreToolBarPositions() { - QString szTemp; + TQString szTemp; g_pApp->getLocalKvircDirectory(szTemp,KviApp::Config,KVI_CONFIGFILE_TOOLBARS); - QFile f(szTemp); + TQFile f(szTemp); bool bNeedDefaults = false; @@ -1231,7 +1229,7 @@ void KviFrame::restoreToolBarPositions() if(!restoreState(f.readAll(),1)) debug("Error while restoring toolbars position"); #else //!COMPILE_USE_QT4 - QTextStream ts(&f); + TQTextStream ts(&f); ts >> *this; f.close(); #endif //!COMPILE_USE_QT4 @@ -1247,7 +1245,7 @@ void KviFrame::restoreToolBarPositions() if(m_pTaskBar->width() > 600) m_pTaskBar->setFixedWidth(250); #else //!COMPILE_USE_QT4 - QDockArea * a = m_pTaskBar->area(); + TQDockArea * a = m_pTaskBar->area(); if((a == topDock()) || (a == bottomDock())) { // nope.... need to move it @@ -1256,7 +1254,7 @@ void KviFrame::restoreToolBarPositions() //int iMaxWidth = m_pTaskBar->maximumWidth(); leftDock()->moveDockWindow(m_pTaskBar); //m_pTaskBar->setMaximumWidth(iMaxWidth); - //m_pTaskBar->setOrientation(Vertical); + //m_pTaskBar->setOrientationQt::Vertical); } // ensure that it is not too wide if(m_pTaskBar->width() > 600) @@ -1264,7 +1262,7 @@ void KviFrame::restoreToolBarPositions() #endif //!COMPILE_USE_QT4 } /*else if(m_pTaskBar->inherits("KviClassicTaskBar")) { - QDockArea * a = m_pTaskBar->area(); + TQDockArea * a = m_pTaskBar->area(); if((a == leftDock()) || (a == rightDock())) { // nope.... need to move it @@ -1287,31 +1285,31 @@ void KviFrame::createTaskBar() { m_pTaskBar = new KviTreeTaskBar(); #ifdef COMPILE_USE_QT4 - m_pTaskBar->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); - addDockWidget(Qt::LeftDockWidgetArea,m_pTaskBar); + m_pTaskBar->setAllowedAreas(TQt::LeftDockWidgetArea | TQt::RightDockWidgetArea); + addDockWidget(TQt::LeftDockWidgetArea,m_pTaskBar); #else //!COMPILE_USE_QT4 - setDockEnabled(m_pTaskBar,Qt::DockTop,false); - setDockEnabled(m_pTaskBar,Qt::DockBottom,false); + setDockEnabled(m_pTaskBar,TQt::DockTop,false); + setDockEnabled(m_pTaskBar,TQt::DockBottom,false); #endif //!COMPILE_USE_QT4 } else { m_pTaskBar = new KviClassicTaskBar(); #ifdef COMPILE_USE_QT4 - m_pTaskBar->setAllowedAreas(Qt::AllDockWidgetAreas); - addDockWidget(Qt::BottomDockWidgetArea,m_pTaskBar); + m_pTaskBar->setAllowedAreas(TQt::AllDockWidgetAreas); + addDockWidget(TQt::BottomDockWidgetArea,m_pTaskBar); #else //!COMPILE_USE_QT4 - setDockEnabled(m_pTaskBar,Qt::DockTop,true); - setDockEnabled(m_pTaskBar,Qt::DockBottom,true); + setDockEnabled(m_pTaskBar,TQt::DockTop,true); + setDockEnabled(m_pTaskBar,TQt::DockBottom,true); #endif //!COMPILE_USE_QT4 } #ifndef COMPILE_USE_QT4 - setDockEnabled(m_pTaskBar,Qt::DockLeft,true); - setDockEnabled(m_pTaskBar,Qt::DockRight,true); + setDockEnabled(m_pTaskBar,TQt::DockLeft,true); + setDockEnabled(m_pTaskBar,TQt::DockRight,true); #endif //!COMPILE_USE_QT4 } void KviFrame::recreateTaskBar() { - QString szOldClass = m_pTaskBar->className(); + TQString szOldClass = m_pTaskBar->className(); saveToolBarPositions(); KviWindow * w; @@ -1332,14 +1330,14 @@ void KviFrame::recreateTaskBar() /* - QString szNewClass = m_pTaskBar->className(); + TQString szNewClass = m_pTaskBar->className(); if(szOldClass != szNewClass) { // the class changed... // make sure that the tree task bar is in the left or right dock // and the classic one is in the top or bottom on - Qt::Dock dock; + TQt::Dock dock; int index; bool nl; int eo; @@ -1347,11 +1345,11 @@ void KviFrame::recreateTaskBar() if(KVI_OPTION_BOOL(KviOption_boolUseTreeWindowListTaskBar)) { - if((dock == Qt::Bottom) || (dock == Qt::Top)) - moveDockWindow(m_pTaskBar,Qt::Left); + if((dock == TQt::Bottom) || (dock == TQt::Top)) + moveDockWindow(m_pTaskBar,TQt::Left); } else { - if((dock == Qt::Left) || (dock == Qt::Right)) - moveDockWindow(m_pTaskBar,Qt::Bottom); + if((dock == TQt::Left) || (dock == TQt::Right)) + moveDockWindow(m_pTaskBar,TQt::Bottom); } } */ @@ -1359,41 +1357,6 @@ void KviFrame::recreateTaskBar() if(g_pActiveWindow)m_pTaskBar->setActiveItem(g_pActiveWindow->taskBarItem()); } - -#if QT_VERSION == 0x030201 -unsigned int KviFrame::windowState() -{ - /* enum GNWindowState { WindowNoState = 0x00000000, WindowMinimized = 0x00000001, - WindowMaximized = 0x00000002, WindowFullScreen = 0x00000004, WindowActive = 0x00000008 }; - GNWindowState GNWState; - if(isMinimized()) GNWState=WindowMinimized; - else if(isMaximized()) GNWState=WindowMaximized; - else if(isActiveWindow()) GNWState=WindowActive; - else if(isFullScreen()) GNWState=WindowFullScreen; - else GNWState=WindowNoState; */ - -/* WindowNoState = 0x00000000 WindowMinimized = 0x00000001 - WindowMaximized = 0x00000002 WindowFullScreen = 0x00000004 WindowActive = 0x00000008*/ - if(isMinimized()) return 0x00000001; - else if(isMaximized()) return 0x00000002; - else if(isActiveWindow()) return 0x00000008; - else if(isFullScreen()) return 0x00000004; - else return 0x00000000; -} -void KviFrame::setWindowState(unsigned int GNWState) -{ - switch(GNWState) - { - case 0x00000001: - showMinimized(); - break; - case 0x00000002: - showMaximized(); - break; - } // switch -} -#endif - //////////////////////////////////////////////////////////////////////////////////////////////////// // Some accelerators //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -1430,7 +1393,7 @@ void KviFrame::switchToNextWindowInContext(void) m_pTaskBar->switchWindow(true,true); } -void KviFrame::hideEvent ( QHideEvent * e) +void KviFrame::hideEvent ( TQHideEvent * e) { if(KVI_OPTION_BOOL(KviOption_boolMinimizeInTray)) { @@ -1441,7 +1404,7 @@ void KviFrame::hideEvent ( QHideEvent * e) { executeInternalCommand(KVI_INTERNALCOMMAND_DOCKWIDGET_SHOW); } - QTimer::singleShot( 0, this, SLOT(hide()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(hide()) ); } } diff --git a/src/kvirc/ui/kvi_frame.h b/src/kvirc/ui/kvi_frame.h index d735a7c..ebc7e67 100644 --- a/src/kvirc/ui/kvi_frame.h +++ b/src/kvirc/ui/kvi_frame.h @@ -43,7 +43,7 @@ class KviMdiChild; class KviWindow; class KviConsole; class KviTaskBarBase; -class QSplitter; +class TQSplitter; class KviConfig; class KviMexToolBar; class KviIrcContext; @@ -91,12 +91,13 @@ class KVIRC_API KviFrame : public KviTalMainWindow // , public KviIrcContextMana friend class KviUserListView; friend class KviUserListViewArea; Q_OBJECT + TQ_OBJECT public: KviFrame(); ~KviFrame(); protected: // subwindows - QSplitter * m_pSplitter; // the frame is splitted vertically and thus can host widgets + TQSplitter * m_pSplitter; // the frame is splitted vertically and thus can host widgets KviMenuBar * m_pMenuBar; // the main menu bar KviMdiManager * m_pMdi; // the mdi manager widget (child of the splitter) KviPointerList<KviMexToolBar> * m_pModuleExtensionToolBarList; // the module extension toolbars @@ -109,10 +110,10 @@ protected: KviDockExtension * m_pDockExtension; // the frame's dock extension: this should be prolly moved ? KviAccel * m_pAccel; // the global accelelrator public: - // the mdi manager: handles mdi children + // the mdi manager: handles mdi tqchildren KviMdiManager * mdiManager(){ return m_pMdi; }; // the splitter is the central widget for this frame - QSplitter * splitter(){ return m_pSplitter; }; + TQSplitter * splitter(){ return m_pSplitter; }; // KviTaskBarBase is the base class for KviTreeTaskBar and the KviClassicTaskBar KviTaskBarBase * taskBar(){ return m_pTaskBar; }; // well.. the menu bar :D @@ -137,7 +138,7 @@ public: // window list. This is useful for asynchronous functions // that keep a window pointer and need to ensure that it is still // valid after an uncontrolled delay. (Think of a /timer implementation) - bool windowExists(KviWindow * wnd){ return (m_pWinList->findRef(wnd) != -1); }; + bool windowExists(KviWindow * wnd){ return (m_pWinList->tqfindRef(wnd) != -1); }; // The number of consoles in this frame unsigned int consoleCount(); // Creates a new console window. DON'T use the KviConsole constructor directly. @@ -167,16 +168,9 @@ public: // Helper to fill the toolbars popup // it is used by KviToolBar and KviMenuBar void fillToolBarsPopup(KviTalPopupMenu * p); - int registerAccelerator(const QString &szKeySequence,QObject * recv,const char * slot); + int registerAccelerator(const TQString &szKeySequence,TQObject * recv,const char * slot); void unregisterAccelerator(int id); -#if QT_VERSION == 0x030201 - - unsigned int windowState(); - void setWindowState(unsigned int GNWState); - -#endif - public slots: void newConsole(); void executeInternalCommand(int index); @@ -193,7 +187,7 @@ protected: void createTaskBar(); void recreateTaskBar(); - KviMdiChild * dockWindow(KviWindow *wnd,bool bShow = true,bool bCascade = true,QRect * setGeom = 0); + KviMdiChild * dockWindow(KviWindow *wnd,bool bShow = true,bool bCascade = true,TQRect * setGeom = 0); void undockWindow(KviWindow *wnd); void closeWindow(KviWindow *wnd); @@ -210,17 +204,17 @@ protected: void childConnectionServerInfoChange(KviIrcConnection * c); void childWindowSelectionStateChange(KviWindow * pWnd,bool bGotSelectionNow); - virtual void closeEvent(QCloseEvent *e); - virtual void resizeEvent(QResizeEvent *e); - virtual void moveEvent(QMoveEvent *e); + virtual void closeEvent(TQCloseEvent *e); + virtual void resizeEvent(TQResizeEvent *e); + virtual void moveEvent(TQMoveEvent *e); virtual bool focusNextPrevChild(bool next); virtual void windowActivationChange(bool bOldActive); void updatePseudoTransparency(); - KviAccel * installAccelerators(QWidget * wnd); + KviAccel * installAccelerators(TQWidget * wnd); - virtual void hideEvent ( QHideEvent * e); + virtual void hideEvent ( TQHideEvent * e); protected slots: void switchToNextWindow(); void switchToPrevWindow(); diff --git a/src/kvirc/ui/kvi_historywin.cpp b/src/kvirc/ui/kvi_historywin.cpp index ba9ca31..6e8219f 100644 --- a/src/kvirc/ui/kvi_historywin.cpp +++ b/src/kvirc/ui/kvi_historywin.cpp @@ -31,10 +31,10 @@ #include "kvi_input.h" #include "kvi_mirccntrl.h" -#include <qnamespace.h> +#include <tqnamespace.h> #ifdef COMPILE_USE_QT4 - #include <qevent.h> + #include <tqevent.h> #endif #include <ctype.h> @@ -43,18 +43,18 @@ extern KviInputHistory * g_pInputHistory; KviHistoryWindow::KviHistoryWindow() #ifdef COMPILE_USE_QT4 -: KviTalListBox(0,Qt::Popup) +: KviTalListBox(0,TQt::Popup) #else -: KviTalListBox(0,Qt::WType_Popup) +: KviTalListBox(0,TQt::WType_Popup) #endif { m_pOwner = 0; #ifdef COMPILE_USE_QT4 setHScrollBarMode(Q3ScrollView::AlwaysOff); #else - setHScrollBarMode(QScrollView::AlwaysOff); + setHScrollBarMode(TQScrollView::AlwaysOff); #endif - connect(this,SIGNAL(selected(const QString &)),this,SLOT(itemSelected(const QString &))); + connect(this,TQT_SIGNAL(selected(const TQString &)),this,TQT_SLOT(itemSelected(const TQString &))); m_iTimerId = -1; } @@ -71,7 +71,7 @@ KviHistoryWindow::~KviHistoryWindow() void KviHistoryWindow::fill() { clear(); - for(QString * s = g_pInputHistory->list()->last();s;s = g_pInputHistory->list()->prev()) + for(TQString * s = g_pInputHistory->list()->last();s;s = g_pInputHistory->list()->prev()) { insertItem(*s); } @@ -80,14 +80,14 @@ void KviHistoryWindow::fill() void KviHistoryWindow::popup(KviInput *owner) { - if(m_pOwner)disconnect(m_pOwner,SIGNAL(destroyed()),this,SLOT(ownerDead())); + if(m_pOwner)disconnect(m_pOwner,TQT_SIGNAL(destroyed()),this,TQT_SLOT(ownerDead())); m_pOwner = owner; - connect(m_pOwner,SIGNAL(destroyed()),this,SLOT(ownerDead())); + connect(m_pOwner,TQT_SIGNAL(destroyed()),this,TQT_SLOT(ownerDead())); fill(); show(); } -void KviHistoryWindow::mousePressEvent(QMouseEvent *e) +void KviHistoryWindow::mousePressEvent(TQMouseEvent *e) { if(e->pos().x() < 0)goto hideme; if(e->pos().x() > width())goto hideme; @@ -136,24 +136,24 @@ got_mit: } */ -void KviHistoryWindow::keyPressEvent(QKeyEvent *e) +void KviHistoryWindow::keyPressEvent(TQKeyEvent *e) { switch(e->key()) { - case Qt::Key_Up: - case Qt::Key_Down: - case Qt::Key_PageUp: - case Qt::Key_PageDown: - case Qt::Key_Return: + case TQt::Key_Up: + case TQt::Key_Down: + case TQt::Key_PageUp: + case TQt::Key_PageDown: + case TQt::Key_Return: KviTalListBox::keyPressEvent(e); return; break; - case Qt::Key_Escape: + case TQt::Key_Escape: doHide(); return; break; /* - case Qt::Key_Backspace: + case TQt::Key_Backspace: if(m_szTypedSeq.hasData()) { m_szTypedSeq.cutRight(1); @@ -166,7 +166,7 @@ void KviHistoryWindow::keyPressEvent(QKeyEvent *e) break; */ /* - case Qt::Key_Space: + case TQt::Key_Space: doHide(); if(findTypedSeq()) { @@ -180,7 +180,7 @@ void KviHistoryWindow::keyPressEvent(QKeyEvent *e) break; */ /* - case Qt::Key_Tab: + case TQt::Key_Tab: doHide(); findTypedSeq(); KviStr szItem = m_szCurFullSeq; @@ -214,10 +214,10 @@ void KviHistoryWindow::ownerDead() void KviHistoryWindow::show() { m_iTimerId = startTimer(100000); //100 sec ...seems enough - QWidget::show(); + TQWidget::show(); } -void KviHistoryWindow::timerEvent(QTimerEvent *) +void KviHistoryWindow::timerEvent(TQTimerEvent *) { m_pOwner = 0; // do not setFocus() to the owner after the timeout doHide(); @@ -235,14 +235,14 @@ void KviHistoryWindow::doHide() m_pOwner->setFocus(); } -void KviHistoryWindow::itemSelected(const QString &str) +void KviHistoryWindow::itemSelected(const TQString &str) { doHide(); if(m_pOwner)m_pOwner->setText(str); } -void KviHistoryWindow::hideEvent(QHideEvent *) +void KviHistoryWindow::hideEvent(TQHideEvent *) { if(m_iTimerId != -1) { diff --git a/src/kvirc/ui/kvi_historywin.h b/src/kvirc/ui/kvi_historywin.h index 9a17eec..17cba60 100644 --- a/src/kvirc/ui/kvi_historywin.h +++ b/src/kvirc/ui/kvi_historywin.h @@ -35,6 +35,7 @@ class KviInput; class KVIRC_API KviHistoryWindow : public KviTalListBox { Q_OBJECT + TQ_OBJECT public: KviHistoryWindow(); ~KviHistoryWindow(); @@ -48,14 +49,14 @@ public: private: virtual void show(); // bool findTypedSeq(); // returns true if it is a complete word - virtual void keyPressEvent(QKeyEvent *e); - virtual void mousePressEvent(QMouseEvent *e); - virtual void timerEvent(QTimerEvent *); - virtual void hideEvent ( QHideEvent * ); + virtual void keyPressEvent(TQKeyEvent *e); + virtual void mousePressEvent(TQMouseEvent *e); + virtual void timerEvent(TQTimerEvent *); + virtual void hideEvent ( TQHideEvent * ); void fill(); public slots: void ownerDead(); - void itemSelected(const QString &str); + void itemSelected(const TQString &str); }; #endif //_KVI_HISTORYWIN_H_ diff --git a/src/kvirc/ui/kvi_htmldialog.cpp b/src/kvirc/ui/kvi_htmldialog.cpp index 6a8b437..7c16fe5 100644 --- a/src/kvirc/ui/kvi_htmldialog.cpp +++ b/src/kvirc/ui/kvi_htmldialog.cpp @@ -27,13 +27,13 @@ #include "kvi_locale.h" #include "kvi_tal_textedit.h" -#include <qlabel.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qtextbrowser.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqtextbrowser.h> -KviHtmlDialog::KviHtmlDialog(QWidget * pParent,KviHtmlDialogData * pData) -: QDialog(pParent) +KviHtmlDialog::KviHtmlDialog(TQWidget * pParent,KviHtmlDialogData * pData) +: TQDialog(pParent) { m_pData = pData; @@ -45,18 +45,18 @@ KviHtmlDialog::KviHtmlDialog(QWidget * pParent,KviHtmlDialogData * pData) if(!pData->pixIcon.isNull()) setIcon(pData->pixIcon); - QGridLayout * g = new QGridLayout(this,4,3,7,7); + TQGridLayout * g = new TQGridLayout(this,4,3,7,7); - QLabel * l; - QTextBrowser * te; - QPushButton * pb; + TQLabel * l; + TQTextBrowser * te; + TQPushButton * pb; int iUp = 0; int iDown = 2; if(!pData->szUpperLabelText.isEmpty()) { - l = new QLabel(this); + l = new TQLabel(this); l->setText(pData->szUpperLabelText); g->addMultiCellWidget(l,0,0,0,2); iUp = 1; @@ -64,13 +64,13 @@ KviHtmlDialog::KviHtmlDialog(QWidget * pParent,KviHtmlDialogData * pData) if(!pData->szLowerLabelText.isEmpty()) { - l = new QLabel(this); + l = new TQLabel(this); l->setText(pData->szLowerLabelText); g->addMultiCellWidget(l,2,2,0,2); iDown = 1; } - te = new QTextBrowser(this); + te = new TQTextBrowser(this); te->setText(pData->szHtmlText); //te->setReadOnly(true); @@ -84,29 +84,29 @@ KviHtmlDialog::KviHtmlDialog(QWidget * pParent,KviHtmlDialogData * pData) if(pData->iCancelButton > iButtons)pData->iCancelButton = iButtons; if(pData->iDefaultButton > iButtons)pData->iDefaultButton = iButtons; - pb = new QPushButton(this); + pb = new TQPushButton(this); pb->setText(pData->szButton1Text.isEmpty() ? __tr2qs("OK") : pData->szButton1Text); pb->setDefault(pData->iDefaultButton == 1); int iCoord = iButtons == 1 ? 1 : 0; g->addWidget(pb,3,iCoord); - connect(pb,SIGNAL(clicked()),this,SLOT(button1Pressed())); + connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(button1Pressed())); if(!pData->szButton2Text.isEmpty()) { - pb = new QPushButton(this); + pb = new TQPushButton(this); pb->setText(pData->szButton2Text); pb->setDefault(pData->iDefaultButton == 2); iCoord = iButtons == 2 ? 2 : 1; g->addWidget(pb,3,iCoord); - connect(pb,SIGNAL(clicked()),this,SLOT(button2Pressed())); + connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(button2Pressed())); if(!pData->szButton3Text.isEmpty()) { - pb = new QPushButton(this); + pb = new TQPushButton(this); pb->setText(pData->szButton3Text); pb->setDefault(pData->iDefaultButton == 3); g->addWidget(pb,3,2); - connect(pb,SIGNAL(clicked()),this,SLOT(button3Pressed())); + connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(button3Pressed())); } } @@ -141,10 +141,10 @@ void KviHtmlDialog::button3Pressed() void KviHtmlDialog::reject() { m_pData->iSelectedButton = m_pData->iCancelButton; - QDialog::reject(); + TQDialog::reject(); } -int KviHtmlDialog::display(QWidget * pParent,KviHtmlDialogData * pData) +int KviHtmlDialog::display(TQWidget * pParent,KviHtmlDialogData * pData) { KviHtmlDialog * pDialog = new KviHtmlDialog(pParent,pData); pDialog->exec(); diff --git a/src/kvirc/ui/kvi_htmldialog.h b/src/kvirc/ui/kvi_htmldialog.h index 3f9a6d2..aa845ea 100644 --- a/src/kvirc/ui/kvi_htmldialog.h +++ b/src/kvirc/ui/kvi_htmldialog.h @@ -28,8 +28,8 @@ #include "kvi_settings.h" -#include <qpixmap.h> -#include <qdialog.h> +#include <tqpixmap.h> +#include <tqdialog.h> class KviHtmlDialogData { @@ -41,39 +41,40 @@ public: int iFlags; // da flags :) int iDefaultButton; // the button to use when Enter is pressed (1,2 or 3) int iCancelButton; // the button to use when Esc is pressed (1,2 or 3) - QString szHtmlText; // Shouldn't be empty :D + TQString szHtmlText; // Shouldn't be empty :D // optional fields - QString szCaption; // KVIrc is used when this is empty - QString szUpperLabelText; // no label is shown if this is empty - QString szLowerLabelText; // no label is shown if this is empty - QString szButton1Text; // OK is used if this is empty - QString szButton2Text; // no button is shown if this is empty - QString szButton3Text; // no button is shown if this is empty + TQString szCaption; // KVIrc is used when this is empty + TQString szUpperLabelText; // no label is shown if this is empty + TQString szLowerLabelText; // no label is shown if this is empty + TQString szButton1Text; // OK is used if this is empty + TQString szButton2Text; // no button is shown if this is empty + TQString szButton3Text; // no button is shown if this is empty int iMinimumWidth; int iMinimumHeight; - QPixmap pixIcon; // may be null + TQPixmap pixIcon; // may be null // output int iSelectedButton; // returns 1,2 or 3 }; -class KVIRC_API KviHtmlDialog : public QDialog +class KVIRC_API KviHtmlDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: // the dialog does NOT delete this structure and assumes that // it remains alive until the dialog closes (i.e. it may access // the structure in the destructor - KviHtmlDialog(QWidget * pParent,KviHtmlDialogData * pData); + KviHtmlDialog(TQWidget * pParent,KviHtmlDialogData * pData); ~KviHtmlDialog(); protected: KviHtmlDialogData * m_pData; public: // displays the dialog as modal and returns 1,2 or 3 - static int display(QWidget * pParent,KviHtmlDialogData * pData); + static int display(TQWidget * pParent,KviHtmlDialogData * pData); protected slots: void button1Pressed(); void button2Pressed(); diff --git a/src/kvirc/ui/kvi_imagedialog.cpp b/src/kvirc/ui/kvi_imagedialog.cpp index adb33a1..8ddb9b1 100644 --- a/src/kvirc/ui/kvi_imagedialog.cpp +++ b/src/kvirc/ui/kvi_imagedialog.cpp @@ -25,14 +25,14 @@ #include "kvi_locale.h" -#include <qlayout.h> -#include <qpushbutton.h> +#include <tqlayout.h> +#include <tqpushbutton.h> -#include <qimage.h> -#include <qfileinfo.h> -#include <qdir.h> +#include <tqimage.h> +#include <tqfileinfo.h> +#include <tqdir.h> -#include <qpainter.h> +#include <tqpainter.h> #include "kvi_fileutils.h" @@ -53,30 +53,30 @@ int KviImageDialogItem::width(const KviTalListBox *lb) const w = lb->fontMetrics().width(text()) + 4; if(w > 100)w = 100; if(w < 24)w = 24; - return QMAX(pixmap()->width() + 10,w); + return TQMAX(pixmap()->width() + 10,w); } -void KviImageDialogItem::paint(QPainter * p) +void KviImageDialogItem::paint(TQPainter * p) { - const QPixmap *pm = pixmap(); + const TQPixmap *pm = pixmap(); if(pm && !pm->isNull())p->drawPixmap(5,5, *pm); if(!m_bIsFolder) { - p->setPen(Qt::gray); + p->setPen(TQt::gray); p->drawRect(3,3,pm->width() + 4,pm->height() + 4); } - QRect daRect(listBox()->itemRect(this)); + TQRect daRect(listBox()->tqitemRect(this)); - p->setPen(Qt::black); + p->setPen(TQt::black); p->drawRect(1,1,daRect.width() - 2,daRect.height() - 2); if(text().isEmpty())return; - QString t = text(); + TQString t = text(); - QFontMetrics fm(p->fontMetrics()); + TQFontMetrics fm(p->fontMetrics()); int wdth = fm.width(t); @@ -90,17 +90,17 @@ void KviImageDialogItem::paint(QPainter * p) idx--; } - p->drawText(3,pm->height() + 8,daRect.width() - 6,daRect.height() - (pm->height() + 6),Qt::AlignLeft | Qt::AlignTop,t); + p->drawText(3,pm->height() + 8,daRect.width() - 6,daRect.height() - (pm->height() + 6),TQt::AlignLeft | TQt::AlignTop,t); } -KviImageDialog::KviImageDialog(QWidget * par, - const QString &szCaption, +KviImageDialog::KviImageDialog(TQWidget * par, + const TQString &szCaption, int types, int initialType, - const QString &szInitialDir, + const TQString &szInitialDir, int maxPreviewFileSize,bool modal) -: QDialog(par) +: TQDialog(par) { m_szInitialPath = szInitialDir; setModal(modal); @@ -108,20 +108,20 @@ KviImageDialog::KviImageDialog(QWidget * par, setCaption(szCaption.isEmpty() ? __tr2qs("Choose image ...") : szCaption); - m_pTimer = new QTimer(this); - connect(m_pTimer,SIGNAL(timeout()),this,SLOT(heartbeat())); + m_pTimer = new TQTimer(this); + connect(m_pTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(heartbeat())); - QGridLayout * g = new QGridLayout(this,4,3,5,3); + TQGridLayout * g = new TQGridLayout(this,4,3,5,3); - m_pTypeComboBox = new QComboBox(this); + m_pTypeComboBox = new TQComboBox(this); g->addMultiCellWidget(m_pTypeComboBox,0,0,0,2); m_pTypeList = new KviValueList<int>; - QString bi = __tr2qs("Builtin images"); + TQString bi = __tr2qs("Builtin images"); - QString tmp = bi; + TQString tmp = bi; if((types & KID_TYPE_ALL) == 0)types = KID_TYPE_FULL_PATH; @@ -139,10 +139,10 @@ KviImageDialog::KviImageDialog(QWidget * par, m_pTypeList->append(KID_TYPE_FULL_PATH); } - int idx = m_pTypeList->findIndex(initialType); + int idx = m_pTypeList->tqfindIndex(initialType); if(idx < 0)idx = 0; - QWidget * l = new QWidget(this); + TQWidget * l = new TQWidget(this); g->addMultiCellWidget(l,1,1,0,2); @@ -154,20 +154,20 @@ KviImageDialog::KviImageDialog(QWidget * par, g->addMultiCellWidget(m_pListBox,2,2,0,2); - QPushButton * b = new QPushButton(__tr2qs("Cancel"),this); - connect(b,SIGNAL(clicked()),this,SLOT(cancelClicked())); + TQPushButton * b = new TQPushButton(__tr2qs("Cancel"),this); + connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked())); g->addWidget(b,3,1); - b = new QPushButton(__tr2qs("Ok"),this); - connect(b,SIGNAL(clicked()),this,SLOT(okClicked())); + b = new TQPushButton(__tr2qs("Ok"),this); + connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked())); g->addWidget(b,3,2); g->setRowStretch(2,1); g->setColStretch(0,1); - connect(m_pTypeComboBox,SIGNAL(activated(int)),this,SLOT(jobTypeSelected(int))); - connect(m_pListBox,SIGNAL(doubleClicked(KviTalListBoxItem *)),this,SLOT(itemDoubleClicked(KviTalListBoxItem *))); - connect(m_pTip,SIGNAL(tipRequest(KviDynamicToolTip *,const QPoint &)),this,SLOT(tipRequest(KviDynamicToolTip *,const QPoint &))); + connect(m_pTypeComboBox,TQT_SIGNAL(activated(int)),this,TQT_SLOT(jobTypeSelected(int))); + connect(m_pListBox,TQT_SIGNAL(doubleClicked(KviTalListBoxItem *)),this,TQT_SLOT(itemDoubleClicked(KviTalListBoxItem *))); + connect(m_pTip,TQT_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQT_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); m_pTypeComboBox->setCurrentItem(idx); jobTypeSelected(idx); @@ -193,7 +193,7 @@ void KviImageDialog::jobTypeSelected(int index) } } -void KviImageDialog::startJob(int type,const QString &szInitialPath) +void KviImageDialog::startJob(int type,const TQString &szInitialPath) { m_pTimer->stop(); m_iJobType = type; @@ -201,12 +201,12 @@ void KviImageDialog::startJob(int type,const QString &szInitialPath) m_iJobIndexHelper = 0; if(m_iJobType == KID_TYPE_FULL_PATH) { - QDir d(szInitialPath); - if(!d.exists())d = QDir::homeDirPath(); - if(!d.exists())d = QDir::rootDirPath(); + TQDir d(szInitialPath); + if(!d.exists())d = TQDir::homeDirPath(); + if(!d.exists())d = TQDir::rootDirPath(); m_szJobPath = d.absPath(); KVI_OPTION_STRING(KviOption_stringLastImageDialogPath) = m_szJobPath; - m_lJobFileList = d.entryList(QDir::Hidden | QDir::All,QDir::DirsFirst | QDir::Name | QDir::IgnoreCase); + m_lJobFileList = d.entryList(TQDir::Hidden | TQDir::All,TQDir::DirsFirst | TQDir::Name | TQDir::IgnoreCase); } m_pTimer->start(100); @@ -235,11 +235,11 @@ void KviImageDialog::heartbeat() if(max > KVI_NUM_SMALL_ICONS)max = KVI_NUM_SMALL_ICONS; while(m_iJobIndexHelper < max) { - QString id = g_pIconManager->getSmallIconName(m_iJobIndexHelper); + TQString id = g_pIconManager->getSmallIconName(m_iJobIndexHelper); KviImageDialogItem * it; - QString tip; - KviQString::sprintf(tip,__tr2qs("Builtin $icon(%Q) [index %d]"),&id,m_iJobIndexHelper); - QString image_id = "$icon("; + TQString tip; + KviTQString::sprintf(tip,__tr2qs("Builtin $icon(%Q) [index %d]"),&id,m_iJobIndexHelper); + TQString image_id = "$icon("; image_id += id; image_id += ")"; it = new KviImageDialogItem(m_pListBox,*(g_pIconManager->getSmallIcon(m_iJobIndexHelper)),id,image_id,tip); @@ -258,18 +258,18 @@ void KviImageDialog::heartbeat() int idx = 0; while((idx < 20) && (!m_lJobFileList.isEmpty())) { - QString szFile = m_lJobFileList.first(); + TQString szFile = m_lJobFileList.first(); m_lJobFileList.remove(szFile); - QString szPath = m_szJobPath; + TQString szPath = m_szJobPath; szPath += KVI_PATH_SEPARATOR; szPath += szFile; - QFileInfo fi(szPath); + TQFileInfo fi(szPath); idx += fi.size() / 128000; // we do less entries when have big files to read if(fi.isDir()) { if(szFile != ".") { - QString tip = szFile; + TQString tip = szFile; tip += "<br><hr>"; tip += __tr2qs("directory"); KviImageDialogItem * it; @@ -278,19 +278,19 @@ void KviImageDialog::heartbeat() } else { if(((int)fi.size()) < m_iMaxPreviewFileSize) { - QImage i(szPath); + TQImage i(szPath); if(i.isNull())continue; - QPixmap pix; + TQPixmap pix; #ifdef COMPILE_USE_QT4 - if((i.width() > 80) || (i.height() > 80))pix = i.scaled(80,80,Qt::KeepAspectRatio); + if((i.width() > 80) || (i.height() > 80))pix = i.scaled(80,80,TQt::KeepAspectRatio); #else - if((i.width() > 80) || (i.height() > 80))pix = i.scale(80,80,QImage::ScaleMin); + if((i.width() > 80) || (i.height() > 80))pix = i.scale(80,80,TQ_ScaleMin); #endif else pix = i; - QString tip = szFile; + TQString tip = szFile; tip += "<br><hr>"; - QString sz; + TQString sz; sz.setNum(i.width()); tip += sz; tip += " x "; @@ -327,14 +327,14 @@ void KviImageDialog::okClicked() void KviImageDialog::cancelClicked() { - m_szSelectedImage = QString::null; + m_szSelectedImage = TQString(); reject(); } -void KviImageDialog::closeEvent(QCloseEvent * e) +void KviImageDialog::closeEvent(TQCloseEvent * e) { - m_szSelectedImage = QString::null; - QDialog::closeEvent(e); + m_szSelectedImage = TQString(); + TQDialog::closeEvent(e); } void KviImageDialog::itemDoubleClicked(KviTalListBoxItem * it) @@ -345,10 +345,10 @@ void KviImageDialog::itemDoubleClicked(KviTalListBoxItem * it) { startJob(KID_TYPE_FULL_PATH,i->imageId()); } else { - QString szImageId = i->imageId(); + TQString szImageId = i->imageId(); if(szImageId.length() > 0) { - if(szImageId.at(0) == QChar('$')) + if(szImageId.at(0) == TQChar('$')) m_szSelectedImage = szImageId; // it's $icon(something) else g_pApp->mapImageFile(m_szSelectedImage,i->imageId()); // it's a file and we need to map it to our filesystem view @@ -357,11 +357,11 @@ void KviImageDialog::itemDoubleClicked(KviTalListBoxItem * it) } } -void KviImageDialog::tipRequest(KviDynamicToolTip *,const QPoint &pnt) +void KviImageDialog::tipRequest(KviDynamicToolTip *,const TQPoint &pnt) { KviTalListBoxItem * it = (KviTalListBoxItem *)m_pListBox->itemAt(pnt); if(!it)return; - QRect r = m_pListBox->itemRect(it); + TQRect r = m_pListBox->tqitemRect(it); KviImageDialogItem * i = (KviImageDialogItem *)it; m_pTip->tip(r,i->tipText()); } diff --git a/src/kvirc/ui/kvi_imagedialog.h b/src/kvirc/ui/kvi_imagedialog.h index 7e1da54..c0fd71e 100644 --- a/src/kvirc/ui/kvi_imagedialog.h +++ b/src/kvirc/ui/kvi_imagedialog.h @@ -27,12 +27,12 @@ -#include <qdialog.h> -#include <qcombobox.h> +#include <tqdialog.h> +#include <tqcombobox.h> #include "kvi_tal_listbox.h" #include "kvi_valuelist.h" -#include <qtimer.h> -#include <qstringlist.h> +#include <tqtimer.h> +#include <tqstringlist.h> #include "kvi_dynamictooltip.h" @@ -40,19 +40,19 @@ class KviImageDialogItem : public KviTalListBoxPixmap { public: bool m_bIsFolder; - QString m_szImageId; - QString m_szTipText; + TQString m_szImageId; + TQString m_szTipText; public: - KviImageDialogItem(KviTalListBox * b,const QPixmap &thumb,const QString &szFile,const QString &image_id,const QString &szTipText = QString::null,bool bIsFolder = false) + KviImageDialogItem(KviTalListBox * b,const TQPixmap &thumb,const TQString &szFile,const TQString &image_id,const TQString &szTipText = TQString(),bool bIsFolder = false) : KviTalListBoxPixmap(b,thumb,szFile) , m_bIsFolder(bIsFolder) , m_szImageId(image_id) , m_szTipText(szTipText) {}; ~KviImageDialogItem(){}; public: bool isFolder(){ return m_bIsFolder; }; - const QString & imageId(){ return m_szImageId; }; - const QString & tipText(){ return m_szTipText; }; + const TQString & imageId(){ return m_szImageId; }; + const TQString & tipText(){ return m_szTipText; }; virtual int height(const KviTalListBox *) const; virtual int width(const KviTalListBox *) const; - virtual void paint(QPainter * p); + virtual void paint(TQPainter * p); }; @@ -61,49 +61,50 @@ public: #define KID_TYPE_ALL 3 -class KVIRC_API KviImageDialog : public QDialog +class KVIRC_API KviImageDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: - KviImageDialog(QWidget * par, - const QString &szCaption = QString::null, + KviImageDialog(TQWidget * par, + const TQString &szCaption = TQString(), int types = KID_TYPE_ALL, int initialType = 0, - const QString &szInitialDir = QString::null, + const TQString &szInitialDir = TQString(), int maxPreviewFileSize = 256000, bool modal=false); virtual ~KviImageDialog(); protected: - QComboBox * m_pTypeComboBox; + TQComboBox * m_pTypeComboBox; KviValueList<int> * m_pTypeList; KviTalListBox * m_pListBox; - QTimer * m_pTimer; + TQTimer * m_pTimer; int m_iJobType; int m_iMaxPreviewFileSize; - QString m_szJobPath; - QStringList m_lJobFileList; + TQString m_szJobPath; + TQStringList m_lJobFileList; int m_iJobIndexHelper; - QString m_szSelectedImage; + TQString m_szSelectedImage; - QString m_szInitialPath; + TQString m_szInitialPath; KviDynamicToolTip * m_pTip; public: - const QString & selectedImage(){ return m_szSelectedImage; }; + const TQString & selectedImage(){ return m_szSelectedImage; }; protected: - void startJob(int type,const QString &szInitialPath = QString::null); + void startJob(int type,const TQString &szInitialPath = TQString()); void jobTerminated(); - virtual void closeEvent(QCloseEvent *e); + virtual void closeEvent(TQCloseEvent *e); protected slots: void okClicked(); void cancelClicked(); void heartbeat(); void jobTypeSelected(int index); void itemDoubleClicked(KviTalListBoxItem * it); - void tipRequest(KviDynamicToolTip *,const QPoint &pnt); + void tipRequest(KviDynamicToolTip *,const TQPoint &pnt); }; #endif //_KVI_IMAGEDIALOG_H_ diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp index c0fbbd9..28ac74f 100644 --- a/src/kvirc/ui/kvi_input.cpp +++ b/src/kvirc/ui/kvi_input.cpp @@ -55,39 +55,35 @@ #include "kvi_texticonmanager.h" #include "kvi_draganddrop.h" -#include <qlabel.h> +#include <tqlabel.h> #include <ctype.h> #include <stdlib.h> -#include <qfiledialog.h> +#include <tqfiledialog.h> #include "kvi_tal_popupmenu.h" -#include <qpainter.h> -#include <qclipboard.h> -#include <qstringlist.h> +#include <tqpainter.h> +#include <tqclipboard.h> +#include <tqstringlist.h> #include "kvi_pointerlist.h" -#include <qapplication.h> -#include <qclipboard.h> -#include <qmessagebox.h> +#include <tqapplication.h> +#include <tqclipboard.h> +#include <tqmessagebox.h> #include "kvi_tal_hbox.h" -#include <qlayout.h> -#include <qstyle.h> -#include <qevent.h> +#include <tqlayout.h> +#include <tqstyle.h> +#include <tqevent.h> #ifndef ACCEL_KEY -#define ACCEL_KEY(k) "\t" + QString(QKeySequence( Qt::CTRL | Qt::Key_ ## k )) +#define ACCEL_KEY(k) "\t" + TQString(TQKeySequence( TQt::CTRL | TQt::Key_ ## k )) #endif // FIXME: #warning "This hack is temporary...later remove it" -#if QT_VERSION >= 300 - #ifndef QT_CLEAN_NAMESPACE - #define QT_CLEAN_NAMESPACE - #include <qcursor.h> - #undef QT_CLEAN_NAMESPACE - #else - #include <qcursor.h> - #endif +#ifndef TQT_CLEAN_NAMESPACE + #define TQT_CLEAN_NAMESPACE + #include <tqcursor.h> + #undef TQT_CLEAN_NAMESPACE #else - #include <qcursor.h> + #include <tqcursor.h> #endif @@ -98,11 +94,11 @@ extern KviTextIconWindow * g_pTextIconWindow; extern KviHistoryWindow * g_pHistoryWindow; extern KviTalPopupMenu * g_pInputPopup; -static QFontMetrics * g_pLastFontMetrics = 0; +static TQFontMetrics * g_pLastFontMetrics = 0; #ifdef COMPILE_PSEUDO_TRANSPARENCY - extern QPixmap * g_pShadedChildGlobalDesktopBackground; + extern TQPixmap * g_pShadedChildGlobalDesktopBackground; #endif @@ -115,7 +111,7 @@ extern KviInputHistory * g_pInputHistory; KviInputHistory::KviInputHistory() { - m_pStringList = new KviPointerList<QString>; + m_pStringList = new KviPointerList<TQString>; m_pStringList->setAutoDelete(true); } @@ -124,7 +120,7 @@ KviInputHistory::~KviInputHistory() delete m_pStringList; } -void KviInputHistory::add(QString * s) +void KviInputHistory::add(TQString * s) { m_pStringList->insert(0,s); if(m_pStringList->count() > KVI_INPUT_MAX_GLOBAL_HISTORY_ENTRIES)m_pStringList->removeLast(); @@ -143,8 +139,8 @@ void KviInputHistory::load(const char * filename) for(int i=0;i<cnt;i++) { tmp.sprintf("S%d",i); - QString entry = c.readQStringEntry(tmp.ptr(),""); - if(!entry.isEmpty())add(new QString(entry)); + TQString entry = c.readTQStringEntry(tmp.ptr(),""); + if(!entry.isEmpty())add(new TQString(entry)); } } @@ -158,7 +154,7 @@ void KviInputHistory::save(const char * filename) KviStr tmp; int idx = 0; - for(QString * s = m_pStringList->first();s;s = m_pStringList->next()) + for(TQString * s = m_pStringList->first();s;s = m_pStringList->next()) { if(!s->isEmpty()) { @@ -175,8 +171,8 @@ static int g_iInputFontCharWidth[256]; static bool g_bInputFontMetricsDirty = true; -KviInputEditor::KviInputEditor(QWidget * par,KviWindow *wnd,KviUserListView * view) -:QFrame(par,"input") +KviInputEditor::KviInputEditor(TQWidget * par,KviWindow *wnd,KviUserListView * view) +:TQFrame(par,"input") { m_pIconMenu = 0; m_pInputParent = par; @@ -201,7 +197,7 @@ KviInputEditor::KviInputEditor(QWidget * par,KviWindow *wnd,KviUserListView * vi m_bUpdatesEnabled = true; m_pKviWindow = wnd; m_pUserListView = view; - m_pHistory = new KviPointerList<QString>; + m_pHistory = new KviPointerList<TQString>; m_pHistory->setAutoDelete(true); m_bReadOnly = FALSE; @@ -209,20 +205,20 @@ KviInputEditor::KviInputEditor(QWidget * par,KviWindow *wnd,KviUserListView * vi #ifdef COMPILE_USE_QT4 setAutoFillBackground(false); - setFocusPolicy(Qt::StrongFocus); + setFocusPolicy(TTQ_StrongFocus); #else - setBackgroundMode(Qt::NoBackground); - setFocusPolicy(QWidget::StrongFocus); + setBackgroundMode(TQt::NoBackground); + setFocusPolicy(TQ_StrongFocus); #endif setAcceptDrops(true); setFrameStyle( LineEditPanel ); setFrameShadow( Plain ); m_pIconMenu = new KviTalPopupMenu(); - connect(m_pIconMenu,SIGNAL(activated(int)),this,SLOT(iconPopupActivated(int))); + connect(m_pIconMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(iconPopupActivated(int))); #ifdef COMPILE_USE_QT4 - setCursor(Qt::IBeamCursor); + setCursor(TQt::IBeamCursor); #else setCursor(IbeamCursor); #endif @@ -238,19 +234,19 @@ KviInputEditor::~KviInputEditor() killDragTimer(); } -void KviInputEditor::recalcFontMetrics(QFontMetrics * pFm) +void KviInputEditor::recalcFontMetrics(TQFontMetrics * pFm) { - QFontMetrics fm(KVI_OPTION_FONT(KviOption_fontInput)); + TQFontMetrics fm(KVI_OPTION_FONT(KviOption_fontInput)); unsigned short i; for(i=1;i<32;i++) { - QChar c = getSubstituteChar(i); + TQChar c = getSubstituteChar(i); g_iInputFontCharWidth[i] = fm.width(c); - if(c != QChar(i))g_iInputFontCharWidth[i] += 4; + if(c != TQChar(i))g_iInputFontCharWidth[i] += 4; } for(i=32;i<256;i++) { - g_iInputFontCharWidth[i] = fm.width(QChar(i)); + g_iInputFontCharWidth[i] = fm.width(TQChar(i)); } g_bInputFontMetricsDirty = false; } @@ -261,7 +257,7 @@ void KviInputEditor::applyOptions() update(); } -void KviInputEditor::dragEnterEvent(QDragEnterEvent *e) +void KviInputEditor::dragEnterEvent(TQDragEnterEvent *e) { if(KviUriDrag::canDecode(e)) { @@ -273,23 +269,23 @@ void KviInputEditor::dragEnterEvent(QDragEnterEvent *e) } else e->accept(false); } -void KviInputEditor::dropEvent(QDropEvent *e) +void KviInputEditor::dropEvent(TQDropEvent *e) { - QStringList list; + TQStringList list; if(KviUriDrag::decodeLocalFiles(e,list)) { //debug("Local files decoded"); if(!list.isEmpty()) { //debug("List not empty"); - QStringList::ConstIterator it = list.begin(); //kewl ! :) + TQStringList::ConstIterator it = list.begin(); //kewl ! :) for( ; it != list.end(); ++it ) { - QString tmp = *it; //wow :) + TQString tmp = *it; //wow :) #ifndef COMPILE_ON_WINDOWS if(tmp.length() > 0) { - if(tmp[0] != QChar('/'))tmp.prepend("/"); //HACK HACK HACK for Qt bug (?!?) + if(tmp[0] != TQChar('/'))tmp.prepend("/"); //HACK HACK HACK for TQt bug (?!?) } #endif tmp.prepend("/PARSE \""); @@ -303,27 +299,27 @@ void KviInputEditor::dropEvent(QDropEvent *e) int KviInputEditor::heightHint() const { - return sizeHint().height(); + return tqsizeHint().height(); } -QSize KviInputEditor::sizeHint() const +TQSize KviInputEditor::tqsizeHint() const { //grabbed from qlineedit.cpp constPolish(); - QFontMetrics fm(KVI_OPTION_FONT(KviOption_fontInput)); - int h = QMAX(fm.lineSpacing(), 14) + 2*2; /* innerMargin */ + TQFontMetrics fm(KVI_OPTION_FONT(KviOption_fontInput)); + int h = TQMAX(fm.lineSpacing(), 14) + 2*2; /* innerMargin */ int w = fm.width( 'x' ) * 17; // "some" int m = frameWidth() * 2; #ifdef COMPILE_USE_QT4 - QStyleOption opt; + TQStyleOption opt; opt.initFrom(this); - return (style()->sizeFromContents(QStyle::CT_LineEdit,&opt, - QSize( w + m, h + m ). - expandedTo(QApplication::globalStrut()),this)); + return (style()->sizeFromContents(TQStyle::CT_LineEdit,&opt, + TQSize( w + m, h + m ). + expandedTo(TQApplication::globalStrut()),this)); #else - return (style().sizeFromContents(QStyle::CT_LineEdit, this, - QSize( w + m, h + m ). - expandedTo(QApplication::globalStrut()))); + return (tqstyle().tqsizeFromContents(TQStyle::CT_LineEdit, this, + TQSize( w + m, h + m ). + expandedTo(TQApplication::globalStrut()))); #endif } @@ -331,35 +327,35 @@ QSize KviInputEditor::sizeHint() const #define KVI_INPUT_DEF_FORE 101 #ifdef COMPILE_USE_QT4 -void KviInputEditor::paintEvent(QPaintEvent *e) +void KviInputEditor::paintEvent(TQPaintEvent *e) { - QPainter p(this); + TQPainter p(this); SET_ANTI_ALIASING(p); drawFrame(&p); drawContents(&p); } #endif -void KviInputEditor::drawContents(QPainter *p) +void KviInputEditor::drawContents(TQPainter *p) { if(!isVisible())return; - QRect rect = contentsRect(); + TQRect rect = contentsRect(); int widgetWidth = rect.width(); int widgetHeight = rect.height(); KviDoubleBuffer doublebuffer(widgetWidth,widgetHeight); - QPixmap * pDoubleBufferPixmap = doublebuffer.pixmap(); + TQPixmap * pDoubleBufferPixmap = doublebuffer.pixmap(); - QPainter pa(pDoubleBufferPixmap); + TQPainter pa(pDoubleBufferPixmap); SET_ANTI_ALIASING(pa); pa.setFont(KVI_OPTION_FONT(KviOption_fontInput)); - QFontMetrics fm(pa.fontMetrics()); + TQFontMetrics fm(pa.fontMetrics()); if(!g_pLastFontMetrics) - g_pLastFontMetrics = new QFontMetrics(pa.fontMetrics()); + g_pLastFontMetrics = new TQFontMetrics(pa.fontMetrics()); if(g_bInputFontMetricsDirty) recalcFontMetrics(&fm); @@ -368,11 +364,11 @@ void KviInputEditor::drawContents(QPainter *p) #ifdef COMPILE_PSEUDO_TRANSPARENCY if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = mapToGlobal(rect.topLeft()); + TQPoint pnt = mapToGlobal(rect.topLeft()); pa.drawTiledPixmap(0,0,widgetWidth,widgetHeight,*g_pShadedChildGlobalDesktopBackground,pnt.x(),pnt.y()); } else { #endif - QPixmap *pix=KVI_OPTION_PIXMAP(KviOption_pixmapInputBackground).pixmap(); + TQPixmap *pix=KVI_OPTION_PIXMAP(KviOption_pixmapInputBackground).pixmap(); pa.fillRect(0,0,widgetWidth,widgetHeight,KVI_OPTION_COLOR(KviOption_colorInputBackground)); if(pix) @@ -415,9 +411,9 @@ void KviInputEditor::drawContents(QPainter *p) int xLeft = xPositionFromCharIndex(fm,iSelStart,TRUE); int xRight = xPositionFromCharIndex(fm,m_iSelectionEnd + 1,TRUE); -// pa.setRasterOp(Qt::NotROP); +// pa.setRasterOp(TQt::NotROP); pa.fillRect(xLeft,frameWidth(),xRight - xLeft,widgetWidth,KVI_OPTION_COLOR(KviOption_colorInputSelectionBackground)); -// pa.setRasterOp(Qt::CopyROP); +// pa.setRasterOp(TQt::CopyROP); } // When m_bIMComposing is true, the text between m_iIMStart and m_iIMStart+m_iIMLength should be highlighted to show that this is the active @@ -433,9 +429,9 @@ void KviInputEditor::drawContents(QPainter *p) if(iIMSelectionStart < m_iFirstVisibleChar) iIMSelectionStart = m_iFirstVisibleChar; int xIMSelectionLeft = xPositionFromCharIndex(fm,iIMSelectionStart,TRUE); int xIMSelectionRight = xPositionFromCharIndex(fm,iIMSelectionStart + m_iIMSelectionLength,TRUE); -// pa.setRasterOp(Qt::NotROP); +// pa.setRasterOp(TQt::NotROP); pa.fillRect(xIMSelectionLeft,0,xIMSelectionRight - xIMSelectionLeft, widgetWidth,KVI_OPTION_COLOR(KviOption_colorInputSelectionBackground)); -// pa.setRasterOp(Qt::CopyROP); +// pa.setRasterOp(TQt::CopyROP); // highlight the IM selection int iIMStart = m_iIMStart; @@ -458,7 +454,7 @@ void KviInputEditor::drawContents(QPainter *p) { pa.setPen(KVI_OPTION_COLOR(KviOption_colorInputControl)); - QString s = getSubstituteChar(m_szTextBuffer[charIdx].unicode()); + TQString s = getSubstituteChar(m_szTextBuffer[charIdx].tqunicode()); // the block width is 4 pixels more than the actual character @@ -525,11 +521,11 @@ void KviInputEditor::drawContents(QPainter *p) while(m_iBlockLen < m_iCursorPosition) { - QChar c = m_szTextBuffer.at(m_iBlockLen); + TQChar c = m_szTextBuffer.at(m_iBlockLen); #ifdef COMPILE_USE_QT4 - m_iLastCursorXPosition+= c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c); + m_iLastCursorXPosition+= c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c); #else - m_iLastCursorXPosition+= (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : fm.width(c); + m_iLastCursorXPosition+= (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c); #endif m_iBlockLen++; } @@ -552,12 +548,12 @@ void KviInputEditor::drawContents(QPainter *p) #endif } -void KviInputEditor::drawTextBlock(QPainter * pa,QFontMetrics & fm,int curXPos,int textBaseline,int charIdx,int len,bool bSelected) +void KviInputEditor::drawTextBlock(TQPainter * pa,TQFontMetrics & fm,int curXPos,int textBaseline,int charIdx,int len,bool bSelected) { - QString tmp = m_szTextBuffer.mid(charIdx,len); + TQString tmp = m_szTextBuffer.mid(charIdx,len); m_iBlockWidth = fm.width(tmp); - QRect rect = contentsRect(); + TQRect rect = contentsRect(); int widgetHeight = rect.height(); if(m_iCurFore == KVI_INPUT_DEF_FORE) @@ -592,66 +588,66 @@ void KviInputEditor::drawTextBlock(QPainter * pa,QFontMetrics & fm,int curXPos,i } -QChar KviInputEditor::getSubstituteChar(unsigned short control_code) +TQChar KviInputEditor::getSubstituteChar(unsigned short control_code) { switch(control_code) { case KVI_TEXT_COLOR: - return QChar('K'); + return TQChar('K'); break; case KVI_TEXT_BOLD: - return QChar('B'); + return TQChar('B'); break; case KVI_TEXT_RESET: - return QChar('O'); + return TQChar('O'); break; case KVI_TEXT_REVERSE: - return QChar('R'); + return TQChar('R'); break; case KVI_TEXT_UNDERLINE: - return QChar('U'); + return TQChar('U'); break; case KVI_TEXT_CRYPTESCAPE: - return QChar('P'); + return TQChar('P'); break; case KVI_TEXT_ICON: - return QChar('I'); + return TQChar('I'); break; default: - return QChar(control_code); + return TQChar(control_code); break; } } -void KviInputEditor::extractNextBlock(int idx,QFontMetrics & fm,int curXPos,int maxXPos) +void KviInputEditor::extractNextBlock(int idx,TQFontMetrics & fm,int curXPos,int maxXPos) { m_iBlockLen = 0; m_iBlockWidth = 0; - QChar c = m_szTextBuffer[idx]; + TQChar c = m_szTextBuffer[idx]; - if((c.unicode() > 32) || - ((c != QChar(KVI_TEXT_COLOR)) && - (c != QChar(KVI_TEXT_BOLD)) && (c != QChar(KVI_TEXT_UNDERLINE)) && - (c != QChar(KVI_TEXT_RESET)) && (c != QChar(KVI_TEXT_REVERSE)) && - (c != QChar(KVI_TEXT_CRYPTESCAPE)) && (c != QChar(KVI_TEXT_ICON)))) + if((c.tqunicode() > 32) || + ((c != TQChar(KVI_TEXT_COLOR)) && + (c != TQChar(KVI_TEXT_BOLD)) && (c != TQChar(KVI_TEXT_UNDERLINE)) && + (c != TQChar(KVI_TEXT_RESET)) && (c != TQChar(KVI_TEXT_REVERSE)) && + (c != TQChar(KVI_TEXT_CRYPTESCAPE)) && (c != TQChar(KVI_TEXT_ICON)))) { m_bControlBlock = false; //Not a control code...run.. while((idx < ((int)(m_szTextBuffer.length()))) && (curXPos < maxXPos)) { c = m_szTextBuffer[idx]; - if((c.unicode() > 32) || - ((c != QChar(KVI_TEXT_COLOR)) && (c != QChar(KVI_TEXT_BOLD)) && - (c != QChar(KVI_TEXT_UNDERLINE)) && (c != QChar(KVI_TEXT_RESET)) && - (c != QChar(KVI_TEXT_REVERSE)) && (c != QChar(KVI_TEXT_CRYPTESCAPE)) && - (c != QChar(KVI_TEXT_ICON)))) + if((c.tqunicode() > 32) || + ((c != TQChar(KVI_TEXT_COLOR)) && (c != TQChar(KVI_TEXT_BOLD)) && + (c != TQChar(KVI_TEXT_UNDERLINE)) && (c != TQChar(KVI_TEXT_RESET)) && + (c != TQChar(KVI_TEXT_REVERSE)) && (c != TQChar(KVI_TEXT_CRYPTESCAPE)) && + (c != TQChar(KVI_TEXT_ICON)))) { m_iBlockLen++; #ifdef COMPILE_USE_QT4 - int xxx = c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c);; + int xxx = c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c);; #else - int xxx = (c.unicode() < 256 ? g_iInputFontCharWidth[c.unicode()] : fm.width(c)); + int xxx = (c.tqunicode() < 256 ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c)); #endif m_iBlockWidth +=xxx; curXPos +=xxx; @@ -662,9 +658,9 @@ void KviInputEditor::extractNextBlock(int idx,QFontMetrics & fm,int curXPos,int } else { m_bControlBlock = true; m_iBlockLen = 1; - m_iBlockWidth = g_iInputFontCharWidth[c.unicode()]; + m_iBlockWidth = g_iInputFontCharWidth[c.tqunicode()]; //Control code - switch(c.unicode()) + switch(c.tqunicode()) { case KVI_TEXT_BOLD: m_bCurBold = ! m_bCurBold; @@ -720,7 +716,7 @@ void KviInputEditor::runUpToTheFirstVisibleChar() register int idx = 0; while(idx < m_iFirstVisibleChar) { - unsigned short c = m_szTextBuffer[idx].unicode(); + unsigned short c = m_szTextBuffer[idx].tqunicode(); if(c < 32) { switch(c) @@ -769,7 +765,7 @@ void KviInputEditor::runUpToTheFirstVisibleChar() } -void KviInputEditor::mousePressEvent(QMouseEvent *e) +void KviInputEditor::mousePressEvent(TQMouseEvent *e) { if(e->button() & Qt::LeftButton) { @@ -779,8 +775,8 @@ void KviInputEditor::mousePressEvent(QMouseEvent *e) if(anchorX > (width()-frameWidth()))m_iFirstVisibleChar++; m_iSelectionAnchorChar = m_iCursorPosition; selectOneChar(-1); - //grabMouse(QCursor(crossCursor)); - repaintWithCursorOn(); + //grabMouse(TQCursor(crossCursor)); + tqrepaintWithCursorOn(); killDragTimer(); m_iDragTimer = startTimer(KVI_INPUT_DRAG_TIMEOUT); @@ -791,17 +787,17 @@ void KviInputEditor::mousePressEvent(QMouseEvent *e) //Popup menu g_pInputPopup->clear(); - QString szClip; + TQString szClip; - QClipboard * c = QApplication::clipboard(); + TQClipboard * c = TQApplication::tqclipboard(); if(c) { - szClip = c->text(QClipboard::Clipboard); + szClip = c->text(TQClipboard::Clipboard); #ifdef COMPILE_USE_QT4 - int occ = szClip.count(QChar('\n')); + int occ = szClip.count(TQChar('\n')); #else - int occ = szClip.contains(QChar('\n')); + int occ = szClip.tqcontains(TQChar('\n')); #endif if(!szClip.isEmpty()) @@ -811,29 +807,29 @@ void KviInputEditor::mousePressEvent(QMouseEvent *e) szClip.truncate(60); szClip.append("..."); } - szClip.replace(QChar('&'),"&"); - szClip.replace(QChar('<'),"<"); - szClip.replace(QChar('>'),">"); - szClip.replace(QChar('\n'),"<br>"); + szClip.tqreplace(TQChar('&'),"&"); + szClip.tqreplace(TQChar('<'),"<"); + szClip.tqreplace(TQChar('>'),">"); + szClip.tqreplace(TQChar('\n'),"<br>"); - QString label = "<center><b>"; + TQString label = "<center><b>"; label += __tr2qs("Clipboard"); label += ":</b><br>"; label += szClip; label += "<br><b>"; - QString num; + TQString num; num.setNum(occ); label += num; - label += QChar(' '); + label += TQChar(' '); label += (occ == 1) ? __tr2qs("line break") : __tr2qs("line breaks"); label += "</b></center>"; - QLabel * l = new QLabel(label,g_pInputPopup); - l->setFrameStyle(QFrame::Raised | QFrame::StyledPanel); + TQLabel * l = new TQLabel(label,g_pInputPopup); + l->setFrameStyle(TQFrame::Raised | TQFrame::StyledPanel); l->setMargin(5); - // FIXME: This does NOT work under Qt 4.x (they seem to consider it as bad UI design) + // FIXME: This does NOT work under TQt 4.x (they seem to consider it as bad UI design) #ifndef COMPILE_USE_QT4 g_pInputPopup->insertItem(l); #else @@ -842,39 +838,39 @@ void KviInputEditor::mousePressEvent(QMouseEvent *e) } } - int id = g_pInputPopup->insertItem(__tr2qs("Cu&t") + ACCEL_KEY(X),this,SLOT(cut())); + int id = g_pInputPopup->insertItem(__tr2qs("Cu&t") + ACCEL_KEY(X),this,TQT_SLOT(cut())); g_pInputPopup->setItemEnabled(id,hasSelection()); - id = g_pInputPopup->insertItem(__tr2qs("&Copy") + ACCEL_KEY(C),this,SLOT(copyToClipboard())); + id = g_pInputPopup->insertItem(__tr2qs("&Copy") + ACCEL_KEY(C),this,TQT_SLOT(copyToClipboard())); g_pInputPopup->setItemEnabled(id,hasSelection()); - id = g_pInputPopup->insertItem(__tr2qs("&Paste") + ACCEL_KEY(V),this,SLOT(pasteClipboardWithConfirmation())); + id = g_pInputPopup->insertItem(__tr2qs("&Paste") + ACCEL_KEY(V),this,TQT_SLOT(pasteClipboardWithConfirmation())); g_pInputPopup->setItemEnabled(id,!szClip.isEmpty() && !m_bReadOnly); - id = g_pInputPopup->insertItem(__tr2qs("Paste (Slowly)"),this,SLOT(pasteSlow())); - if ((type == KVI_WINDOW_TYPE_CHANNEL) || (type == KVI_WINDOW_TYPE_QUERY) || (type == KVI_WINDOW_TYPE_DCCCHAT)) + id = g_pInputPopup->insertItem(__tr2qs("Paste (Slowly)"),this,TQT_SLOT(pasteSlow())); + if ((type == KVI_WINDOW_TYPE_CHANNEL) || (type == KVI_WINDOW_TYPE_TQUERY) || (type == KVI_WINDOW_TYPE_DCCCHAT)) g_pInputPopup->setItemEnabled(id,!szClip.isEmpty() && !m_bReadOnly); else g_pInputPopup->setItemEnabled(id,false); - id = g_pInputPopup->insertItem(__tr2qs("Paste &File") + ACCEL_KEY(F),this,SLOT(pasteFile())); - if ((type != KVI_WINDOW_TYPE_CHANNEL) && (type != KVI_WINDOW_TYPE_QUERY) && (type != KVI_WINDOW_TYPE_DCCCHAT)) + id = g_pInputPopup->insertItem(__tr2qs("Paste &File") + ACCEL_KEY(F),this,TQT_SLOT(pasteFile())); + if ((type != KVI_WINDOW_TYPE_CHANNEL) && (type != KVI_WINDOW_TYPE_TQUERY) && (type != KVI_WINDOW_TYPE_DCCCHAT)) g_pInputPopup->setItemEnabled(id,false); else g_pInputPopup->setItemEnabled(id,!m_bReadOnly); if(m_bSpSlowFlag ==true) { - id = g_pInputPopup->insertItem(__tr2qs("Stop Paste"),this,SLOT(stopPasteSlow())); /*G&N 2005*/ + id = g_pInputPopup->insertItem(__tr2qs("Stop Paste"),this,TQT_SLOT(stopPasteSlow())); /*G&N 2005*/ } - id = g_pInputPopup->insertItem(__tr2qs("Clear"),this,SLOT(clear())); + id = g_pInputPopup->insertItem(__tr2qs("Clear"),this,TQT_SLOT(clear())); g_pInputPopup->setItemEnabled(id,!m_szTextBuffer.isEmpty() && !m_bReadOnly); g_pInputPopup->insertSeparator(); - id = g_pInputPopup->insertItem(__tr2qs("Select All"),this,SLOT(selectAll())); + id = g_pInputPopup->insertItem(__tr2qs("Select All"),this,TQT_SLOT(selectAll())); g_pInputPopup->setItemEnabled(id,(!m_szTextBuffer.isEmpty())); g_pInputPopup->insertSeparator(); m_pIconMenu->clear(); - KviPointerHashTable<QString,KviTextIcon> * d = g_pTextIconManager->textIconDict(); - KviPointerHashTableIterator<QString,KviTextIcon> it(*d); - QStringList strList; + KviPointerHashTable<TQString,KviTextIcon> * d = g_pTextIconManager->textIconDict(); + KviPointerHashTableIterator<TQString,KviTextIcon> it(*d); + TQStringList strList; while(KviTextIcon * i = it.current()) { strList.append(it.currentKey()); @@ -882,9 +878,9 @@ void KviInputEditor::mousePressEvent(QMouseEvent *e) } strList.sort(); KviTextIcon * icon; - QPixmap *pix; + TQPixmap *pix; - for(QStringList::Iterator iter = strList.begin(); iter != strList.end(); ++iter) + for(TQStringList::Iterator iter = strList.begin(); iter != strList.end(); ++iter) { icon=g_pTextIconManager->lookupTextIcon(*iter); if(icon) @@ -904,7 +900,7 @@ void KviInputEditor::iconPopupActivated(int id) { if(!m_bReadOnly) { - QString text = m_pIconMenu->text(id); + TQString text = m_pIconMenu->text(id); if(!text.isEmpty()) { text.prepend(KVI_TEXT_ICON); @@ -922,24 +918,24 @@ bool KviInputEditor::hasSelection() void KviInputEditor::copyToClipboard() { if(!hasSelection())return; - QClipboard * c = QApplication::clipboard(); + TQClipboard * c = TQApplication::tqclipboard(); if(!c)return; - QString szTxt = m_szTextBuffer.mid(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1); - c->setText(szTxt,QClipboard::Clipboard); - repaintWithCursorOn(); + TQString szTxt = m_szTextBuffer.mid(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1); + c->setText(szTxt,TQClipboard::Clipboard); + tqrepaintWithCursorOn(); } void KviInputEditor::copyToSelection(bool bDonNotCopyToClipboard) { if(!hasSelection())return; - QClipboard * c = QApplication::clipboard(); + TQClipboard * c = TQApplication::tqclipboard(); if(!c)return; - QString szTxt = m_szTextBuffer.mid(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1); + TQString szTxt = m_szTextBuffer.mid(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1); if(c->supportsSelection()) - c->setText(szTxt,QClipboard::Selection); + c->setText(szTxt,TQClipboard::Selection); else if(!bDonNotCopyToClipboard) - c->setText(szTxt,QClipboard::Clipboard); - repaintWithCursorOn(); + c->setText(szTxt,TQClipboard::Clipboard); + tqrepaintWithCursorOn(); } @@ -958,7 +954,7 @@ void KviInputEditor::moveCursorTo(int idx,bool bRepaint) m_iCursorPosition = idx; if(m_iFirstVisibleChar > m_iCursorPosition)m_iFirstVisibleChar = m_iCursorPosition; } - if(bRepaint)repaintWithCursorOn(); + if(bRepaint)tqrepaintWithCursorOn(); } void KviInputEditor::removeSelected() @@ -967,49 +963,49 @@ void KviInputEditor::removeSelected() m_szTextBuffer.remove(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1); moveCursorTo(m_iSelectionBegin,false); selectOneChar(-1); - repaintWithCursorOn(); + tqrepaintWithCursorOn(); } void KviInputEditor::cut() { if(!hasSelection())return; - QClipboard * c = QApplication::clipboard(); + TQClipboard * c = TQApplication::tqclipboard(); if(!c)return; - c->setText(m_szTextBuffer.mid(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1),QClipboard::Clipboard); + c->setText(m_szTextBuffer.mid(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1),TQClipboard::Clipboard); m_szTextBuffer.remove(m_iSelectionBegin,(m_iSelectionEnd-m_iSelectionBegin)+1); moveCursorTo(m_iSelectionBegin,false); selectOneChar(-1); - repaintWithCursorOn(); + tqrepaintWithCursorOn(); } -void KviInputEditor::insertText(const QString &text) +void KviInputEditor::insertText(const TQString &text) { - QString szText = text; // crop away constness + TQString szText = text; // crop away constness if(szText.isEmpty())return; //szText.replaceAll('\t'," "); //Do not paste tabs - //szText.replace(QRegExp("\t")," "); // do not paste tabs + //szText.tqreplace(TQRegExp("\t")," "); // do not paste tabs m_bUpdatesEnabled = false; removeSelected(); m_bUpdatesEnabled = true; - if(szText.find('\n') == -1) + if(szText.tqfind('\n') == -1) { m_szTextBuffer.insert(m_iCursorPosition,szText); m_szTextBuffer.truncate(m_iMaxBufferSize); moveCursorTo(m_iCursorPosition + szText.length()); } else { //Multiline paste...do not execute commands here - QString szBlock; + TQString szBlock; while(!szText.isEmpty()) { - int idx = szText.find('\n'); + int idx = szText.tqfind('\n'); if(idx != -1) { szBlock = szText.left(idx); - //else szBlock = QChar(KVI_TEXT_RESET); + //else szBlock = TQChar(KVI_TEXT_RESET); szText.remove(0,idx+1); } else { szBlock = szText; @@ -1021,7 +1017,7 @@ void KviInputEditor::insertText(const QString &text) int pos = 0; while((pos < ((int)(m_szTextBuffer.length()))) && (m_szTextBuffer[pos] < 33))pos++; - if((pos < ((int)(m_szTextBuffer.length()))) && (m_szTextBuffer[pos] == QChar('/')))m_szTextBuffer.insert(pos,"\\"); + if((pos < ((int)(m_szTextBuffer.length()))) && (m_szTextBuffer[pos] == TQChar('/')))m_szTextBuffer.insert(pos,"\\"); returnPressed(idx != -1); } @@ -1031,12 +1027,12 @@ void KviInputEditor::insertText(const QString &text) // Replace (length) characters in the buffer from (start) with (text), returns // the length of the text inserted (different from text.length() only if the // buffer was truncated. -int KviInputEditor::replaceSegment(int start, int length, const QString &text) +int KviInputEditor::replaceSegment(int start, int length, const TQString &text) { m_szTextBuffer.remove(start, length); m_szTextBuffer.insert(start, text); m_szTextBuffer.truncate(m_iMaxBufferSize); - repaintWithCursorOn(); + tqrepaintWithCursorOn(); int iInsertedLength = text.length(); int iMaxInsertedLength = m_iMaxBufferSize - start; @@ -1046,11 +1042,11 @@ int KviInputEditor::replaceSegment(int start, int length, const QString &text) void KviInputEditor::pasteClipboardWithConfirmation() { - QClipboard * c = QApplication::clipboard(); + TQClipboard * c = TQApplication::tqclipboard(); if(!c)return; - QString szText = c->text(QClipboard::Clipboard); + TQString szText = c->text(TQClipboard::Clipboard); - if(szText.contains(QChar('\n')) > 0) + if(szText.tqcontains(TQChar('\n')) > 0) { if(m_pInputParent->inherits("KviInput")) ((KviInput*)(m_pInputParent))->multiLinePaste(szText); @@ -1061,11 +1057,11 @@ void KviInputEditor::pasteClipboardWithConfirmation() void KviInputEditor::pasteSelectionWithConfirmation() { - QClipboard * c = QApplication::clipboard(); + TQClipboard * c = TQApplication::tqclipboard(); if(!c)return; - QString szText = c->text(c->supportsSelection() ? QClipboard::Selection : QClipboard::Clipboard); + TQString szText = c->text(c->supportsSelection() ? TQClipboard::Selection : TQClipboard::Clipboard); - if(szText.contains(QChar('\n')) > 0) + if(szText.tqcontains(TQChar('\n')) > 0) { if(m_pInputParent->inherits("KviInput")) ((KviInput*)(m_pInputParent))->multiLinePaste(szText); @@ -1088,10 +1084,10 @@ void KviInputEditor::stopPasteSlow() void KviInputEditor::pasteFile() { - QString stmp = QFileDialog::getOpenFileName("","",this,"Paste File", "Choose a file" ); + TQString stmp = TQFileDialog::getOpenFileName("","",this,"Paste File", "Choose a file" ); if(stmp!="") { - QString stmp1 = "spaste.file " + stmp ; + TQString stmp1 = "spaste.file " + stmp ; KviKvsScript::run(stmp1,g_pActiveWindow); m_bSpSlowFlag = true; } @@ -1114,7 +1110,7 @@ void KviInputEditor::clear() home(); } -void KviInputEditor::setText(const QString text) +void KviInputEditor::setText(const TQString text) { m_szTextBuffer = text; m_szTextBuffer.truncate(m_iMaxBufferSize); @@ -1122,7 +1118,7 @@ void KviInputEditor::setText(const QString text) end(); } -void KviInputEditor::mouseReleaseEvent(QMouseEvent *) +void KviInputEditor::mouseReleaseEvent(TQMouseEvent *) { if(m_iDragTimer) { @@ -1143,7 +1139,7 @@ void KviInputEditor::killDragTimer() } } -void KviInputEditor::timerEvent(QTimerEvent *e) +void KviInputEditor::timerEvent(TQTimerEvent *e) { if(e->timerId() == m_iCursorTimer) { @@ -1164,7 +1160,7 @@ void KviInputEditor::handleDragSelection() { if(m_iSelectionAnchorChar == -1)return; - QPoint pnt = mapFromGlobal(QCursor::pos()); + TQPoint pnt = mapFromGlobal(TQCursor::pos()); if(pnt.x() <= 0) @@ -1195,7 +1191,7 @@ void KviInputEditor::handleDragSelection() m_iSelectionEnd = m_iSelectionAnchorChar-1; } } - repaintWithCursorOn(); + tqrepaintWithCursorOn(); } void KviInputEditor::returnPressed(bool bRepaint) @@ -1203,9 +1199,9 @@ void KviInputEditor::returnPressed(bool bRepaint) if (!m_szTextBuffer.isEmpty() /* && (!m_pHistory->current() || m_szTextBuffer.compare(*(m_pHistory->current())))*/) { if(m_pInputParent->inherits("KviInput")) - g_pInputHistory->add(new QString(m_szTextBuffer)); + g_pInputHistory->add(new TQString(m_szTextBuffer)); - m_pHistory->insert(0,new QString(m_szTextBuffer)); + m_pHistory->insert(0,new TQString(m_szTextBuffer)); } __range_valid(KVI_INPUT_MAX_LOCAL_HISTORY_ENTRIES > 1); //ABSOLUTELY NEEDED, if not, pHist will be destroyed... @@ -1213,16 +1209,16 @@ void KviInputEditor::returnPressed(bool bRepaint) m_iCurHistoryIdx = -1; - // FIXME: ALL THIS STUFF SHOULD BE CONVERTED TO QString + // FIXME: ALL THIS STUFF SHOULD BE CONVERTED TO TQString /* if(m_pInputParent->inherits("KviInput")) { - QString szBuffer(m_szTextBuffer); + TQString szBuffer(m_szTextBuffer); m_szTextBuffer=""; selectOneChar(-1); m_iCursorPosition = 0; m_iFirstVisibleChar = 0; - if(bRepaint)repaintWithCursorOn(); + if(bRepaint)tqrepaintWithCursorOn(); KviUserInput::parse(szBuffer,m_pKviWindow); } else { */ @@ -1233,7 +1229,7 @@ void KviInputEditor::returnPressed(bool bRepaint) */ } -void KviInputEditor::focusInEvent(QFocusEvent *) +void KviInputEditor::focusInEvent(TQFocusEvent *) { if(m_iCursorTimer==0) { @@ -1243,12 +1239,12 @@ void KviInputEditor::focusInEvent(QFocusEvent *) } // XIM handling... #ifndef COMPILE_USE_QT4 - // THIS SEEMS TO BE GONE IN Qt4.x ? (even if the documentation states that it *should* be there) + // THIS SEEMS TO BE GONE IN TQt4.x ? (even if the documentation states that it *should* be there) setMicroFocusHint(1,1,width() - 2,height() - 2,true,0); #endif } -void KviInputEditor::focusOutEvent(QFocusEvent *) +void KviInputEditor::focusOutEvent(TQFocusEvent *) { if(m_iCursorTimer)killTimer(m_iCursorTimer); m_iCursorTimer = 0; @@ -1295,7 +1291,7 @@ void KviInputEditor::internalCursorLeft(bool bShift) // remember the text before and after the cursor at this point, and put them // before and after the text inserted by IM in imEndEvent. // hagabaka -void KviInputEditor::imStartEvent(QIMEvent *e) +void KviInputEditor::imStartEvent(TQIMEvent *e) { removeSelected(); m_iIMStart = m_iIMSelectionBegin = m_iCursorPosition; @@ -1306,12 +1302,12 @@ void KviInputEditor::imStartEvent(QIMEvent *e) // Whenever the IM's preedit changes, update the visuals and internal data. refer to <http://doc.trolltech.com/3.3/qimevent.html> */ // hagabaka -void KviInputEditor::imComposeEvent(QIMEvent *e) +void KviInputEditor::imComposeEvent(TQIMEvent *e) { // replace the old pre-edit string with e->text() m_bUpdatesEnabled = false; #ifdef COMPILE_USE_QT4 - // Qt 4.x ?????????? + // TQt 4.x ?????????? m_iIMLength = replaceSegment(m_iIMStart, m_iIMLength, e->commitString()); // update selection inside the pre-edit @@ -1329,20 +1325,20 @@ void KviInputEditor::imComposeEvent(QIMEvent *e) #endif - // repaint + // tqrepaint m_bUpdatesEnabled = true; - repaintWithCursorOn(); + tqrepaintWithCursorOn(); e->accept(); } // Input method is done; put its resulting text to where the preedit area was // hagabaka -void KviInputEditor::imEndEvent(QIMEvent *e) +void KviInputEditor::imEndEvent(TQIMEvent *e) { // replace the preedit area with the IM result text m_bUpdatesEnabled = false; #ifdef COMPILE_USE_QT4 - // Qt 4.x ?????????? + // TQt 4.x ?????????? m_iIMLength = replaceSegment(m_iIMStart, m_iIMLength, e->commitString()); #else m_iIMLength = replaceSegment(m_iIMStart, m_iIMLength, e->text()); @@ -1351,9 +1347,9 @@ void KviInputEditor::imEndEvent(QIMEvent *e) // move cursor to after the IM result text moveCursorTo(m_iIMStart + m_iIMLength); - // repaint + // tqrepaint m_bUpdatesEnabled = true; - repaintWithCursorOn(); + tqrepaintWithCursorOn(); // reset data m_bIMComposing = false; @@ -1363,7 +1359,7 @@ void KviInputEditor::imEndEvent(QIMEvent *e) // FIXME According to <http://www.kde.gr.jp/~asaki/how-to-support-input-method.html>, if the XIM // style used is OverTheTop, code needs to be added in keyPressEvent handler */ // hagabaka -void KviInputEditor::keyPressEvent(QKeyEvent *e) +void KviInputEditor::keyPressEvent(TQKeyEvent *e) { // disable the keyPress handling when IM is in composition. if(m_bIMComposing) @@ -1375,9 +1371,9 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) if(!m_bReadOnly) { - if((e->key() == Qt::Key_Tab) || (e->key() == Qt::Key_BackTab)) + if((e->key() == TQt::Key_Tab) || (e->key() == TQt::Key_BackTab)) { - completion(e->state() & Qt::ShiftButton); + completion(e->state() & TQt::ShiftButton); return; } else { m_bLastCompletionFinished=1; @@ -1385,17 +1381,17 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) } - if(e->key() == Qt::Key_Escape) + if(e->key() == TQt::Key_Escape) { emit escapePressed(); return; } - if((e->state() & Qt::AltButton) || (e->state() & Qt::ControlButton)) + if((e->state() & TQt::AltButton) || (e->state() & TQt::ControlButton)) { switch(e->key()) { - case Qt::Key_Backspace: + case TQt::Key_Backspace: if(m_pInputParent->inherits("KviInput")) { ((KviInput*)(m_pInputParent))->multiLinePaste(m_szTextBuffer); @@ -1409,50 +1405,50 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) //Make CtrlKey and CommandKey ("Apple") behave equally on MacOSX. //This way typical X11 and Apple shortcuts can be used simultanously within the input line. #ifndef Q_OS_MACX - if(e->state() & Qt::ControlButton) + if(e->state() & TQt::ControlButton) #else - if((e->state() & Qt::ControlButton) || (e->state() & Qt::MetaButton)) + if((e->state() & TQt::ControlButton) || (e->state() & TQt::MetaButton)) #endif { switch(e->key()) { - case Qt::Key_Right: + case TQt::Key_Right: if(m_iCursorPosition < ((int)(m_szTextBuffer.length()))) { // skip whitespace while(m_iCursorPosition < ((int)(m_szTextBuffer.length()))) { if(!m_szTextBuffer.at(m_iCursorPosition).isSpace())break; - internalCursorRight(e->state() & Qt::ShiftButton); + internalCursorRight(e->state() & TQt::ShiftButton); } // skip nonwhitespace while(m_iCursorPosition < ((int)(m_szTextBuffer.length()))) { if(m_szTextBuffer.at(m_iCursorPosition).isSpace())break; - internalCursorRight(e->state() & Qt::ShiftButton); + internalCursorRight(e->state() & TQt::ShiftButton); } - repaintWithCursorOn(); + tqrepaintWithCursorOn(); } break; - case Qt::Key_Left: + case TQt::Key_Left: if(m_iCursorPosition > 0) { // skip whitespace while(m_iCursorPosition > 0) { if(!m_szTextBuffer.at(m_iCursorPosition - 1).isSpace())break; - internalCursorLeft(e->state() & Qt::ShiftButton); + internalCursorLeft(e->state() & TQt::ShiftButton); } // skip nonwhitespace while(m_iCursorPosition > 0) { if(m_szTextBuffer.at(m_iCursorPosition - 1).isSpace())break; - internalCursorLeft(e->state() & Qt::ShiftButton); + internalCursorLeft(e->state() & TQt::ShiftButton); } - repaintWithCursorOn(); + tqrepaintWithCursorOn(); } break; - case Qt::Key_K: + case TQt::Key_K: { if(!m_bReadOnly) { @@ -1461,27 +1457,27 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) if(xPos > 24)xPos-=24; if(!g_pColorWindow)g_pColorWindow = new KviColorWindow(); if(xPos+g_pColorWindow->width() > width())xPos = width()-(g_pColorWindow->width()+2); - g_pColorWindow->move(mapToGlobal(QPoint(xPos,-35))); + g_pColorWindow->move(mapToGlobal(TQPoint(xPos,-35))); g_pColorWindow->popup(this); } } break; - case Qt::Key_B: + case TQt::Key_B: if(!m_bReadOnly) insertChar(KVI_TEXT_BOLD); break; - case Qt::Key_O: + case TQt::Key_O: if(!m_bReadOnly) insertChar(KVI_TEXT_RESET); break; - case Qt::Key_U: + case TQt::Key_U: if(!m_bReadOnly) insertChar(KVI_TEXT_UNDERLINE); break; - case Qt::Key_R: + case TQt::Key_R: if(!m_bReadOnly) insertChar(KVI_TEXT_REVERSE); break; - case Qt::Key_P: + case TQt::Key_P: if(!m_bReadOnly) insertChar(KVI_TEXT_CRYPTESCAPE); // DO NOT CRYPT THIS STUFF break; - case Qt::Key_I: + case TQt::Key_I: { if(!m_bReadOnly) { @@ -1490,22 +1486,22 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) if(xPos > 24)xPos-=24; if(!g_pTextIconWindow)g_pTextIconWindow = new KviTextIconWindow(); if(xPos+g_pTextIconWindow->width() > width())xPos = width()-(g_pTextIconWindow->width()+2); - g_pTextIconWindow->move(mapToGlobal(QPoint(xPos,-KVI_TEXTICON_WIN_HEIGHT))); + g_pTextIconWindow->move(mapToGlobal(TQPoint(xPos,-KVI_TEXTICON_WIN_HEIGHT))); g_pTextIconWindow->popup(this); } } break; - case Qt::Key_C: + case TQt::Key_C: copyToClipboard(); break; - case Qt::Key_X: + case TQt::Key_X: if(!m_bReadOnly) cut(); break; - case Qt::Key_V: + case TQt::Key_V: if(!m_bReadOnly) pasteClipboardWithConfirmation(); break; - //case Qt::Key_Backspace: - case Qt::Key_W: + //case TQt::Key_Backspace: + case TQt::Key_W: if(m_iCursorPosition > 0 && !m_bReadOnly && !hasSelection()) { // skip whitespace @@ -1524,39 +1520,39 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) m_iCursorPosition--; if(m_iFirstVisibleChar > m_iCursorPosition)m_iFirstVisibleChar--; } - repaintWithCursorOn(); + tqrepaintWithCursorOn(); } break; - case Qt::Key_PageUp: + case TQt::Key_PageUp: if(KVI_OPTION_BOOL(KviOption_boolDisableInputHistory)) break; if(m_pInputParent->inherits("KviInput")) ((KviInput*)(m_pInputParent))->historyButtonClicked(); break; - case Qt::Key_F: + case TQt::Key_F: if(m_pKviWindow) if(m_pKviWindow->view())m_pKviWindow->view()->toggleToolWidget(); break; - case Qt::Key_A: + case TQt::Key_A: m_iSelectionBegin=0; m_iSelectionEnd=m_szTextBuffer.length()-1; m_iCursorPosition=m_szTextBuffer.length(); - repaintWithCursorOn(); + tqrepaintWithCursorOn(); break; - case Qt::Key_Return: - case Qt::Key_Enter: + case TQt::Key_Return: + case TQt::Key_Enter: if(m_pInputParent->inherits("KviInput")) { - QString szBuffer(m_szTextBuffer); + TQString szBuffer(m_szTextBuffer); m_szTextBuffer=""; selectOneChar(-1); m_iCursorPosition = 0; m_iFirstVisibleChar = 0; - repaintWithCursorOn(); + tqrepaintWithCursorOn(); KviUserInput::parseNonCommand(szBuffer,m_pKviWindow); if (!szBuffer.isEmpty()) { - g_pInputHistory->add(new QString(szBuffer)); - m_pHistory->insert(0,new QString(szBuffer)); + g_pInputHistory->add(new TQString(szBuffer)); + m_pHistory->insert(0,new TQString(szBuffer)); } __range_valid(KVI_INPUT_MAX_LOCAL_HISTORY_ENTRIES > 1); //ABSOLUTELY NEEDED, if not, pHist will be destroyed... @@ -1572,10 +1568,10 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) return; } - if((e->state() & Qt::AltButton) && (e->state() & Qt::Keypad)) + if((e->state() & TQt::AltButton) && (e->state() & TQt::Keypad)) { - // Qt::Key_Meta seems to substitute Qt::Key_Alt on some keyboards - if((e->key() == Qt::Key_Alt) || (e->key() == Qt::Key_Meta)) + // TQt::Key_Meta seems to substitute TQt::Key_Alt on some keyboards + if((e->key() == TQt::Key_Alt) || (e->key() == TQt::Key_Meta)) { m_szAltKeyCode = ""; return; @@ -1592,20 +1588,20 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) return; } - if(e->state() & Qt::ShiftButton) + if(e->state() & TQt::ShiftButton) { switch(e->key()) { - case Qt::Key_Insert: + case TQt::Key_Insert: if(!m_bReadOnly) pasteClipboardWithConfirmation(); return; break; - case Qt::Key_PageUp: + case TQt::Key_PageUp: if(m_pKviWindow) if(m_pKviWindow->view())m_pKviWindow->view()->prevLine(); return; break; - case Qt::Key_PageDown: + case TQt::Key_PageDown: if(m_pKviWindow) if(m_pKviWindow->view())m_pKviWindow->view()->nextLine(); return; @@ -1615,21 +1611,21 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) switch(e->key()) { - case Qt::Key_Right: + case TQt::Key_Right: if(m_iCursorPosition < ((int)(m_szTextBuffer.length()))) { - internalCursorRight(e->state() & Qt::ShiftButton); - repaintWithCursorOn(); + internalCursorRight(e->state() & TQt::ShiftButton); + tqrepaintWithCursorOn(); } break; - case Qt::Key_Left: + case TQt::Key_Left: if(m_iCursorPosition > 0) { - internalCursorLeft(e->state() & Qt::ShiftButton); - repaintWithCursorOn(); + internalCursorLeft(e->state() & TQt::ShiftButton); + tqrepaintWithCursorOn(); } break; - case Qt::Key_Backspace: + case TQt::Key_Backspace: if(!m_bReadOnly) { if(hasSelection() && (m_iSelectionEnd >= m_iCursorPosition-1) && (m_iSelectionBegin <= m_iCursorPosition)) @@ -1644,10 +1640,10 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) if(m_iFirstVisibleChar > m_iCursorPosition)m_iFirstVisibleChar--; } selectOneChar(-1); - repaintWithCursorOn(); + tqrepaintWithCursorOn(); } break; - case Qt::Key_Delete: + case TQt::Key_Delete: if(!m_bReadOnly) { if(hasSelection()) removeSelected(); @@ -1655,14 +1651,14 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) { m_szTextBuffer.remove(m_iCursorPosition,1); selectOneChar(-1); - repaintWithCursorOn(); + tqrepaintWithCursorOn(); } } break; - case Qt::Key_Home: + case TQt::Key_Home: if(m_iCursorPosition > 0) { - if(e->state() & Qt::ShiftButton) + if(e->state() & TQt::ShiftButton) { if((m_iSelectionBegin == -1)&&(m_iSelectionEnd == -1))m_iSelectionEnd = m_iCursorPosition - 1; m_iSelectionBegin = 0; @@ -1672,8 +1668,8 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) home(); } break; - case Qt::Key_End://we should call it even the cursor is at the end for deselecting - if(e->state() & Qt::ShiftButton) + case TQt::Key_End://we should call it even the cursor is at the end for deselecting + if(e->state() & TQt::ShiftButton) { if((m_iSelectionBegin == -1)&&(m_iSelectionEnd == -1))m_iSelectionBegin = m_iCursorPosition; m_iSelectionEnd = m_szTextBuffer.length()-1; @@ -1682,7 +1678,7 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) } end(); break; - case Qt::Key_Up: + case TQt::Key_Up: if(!m_bReadOnly) { if(m_pHistory->count() > 0) @@ -1706,7 +1702,7 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) } } break; - case Qt::Key_Down: + case TQt::Key_Down: if(!m_bReadOnly) { if(m_pHistory->count() > 0) @@ -1730,20 +1726,20 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) } } break; - case Qt::Key_PageUp: + case TQt::Key_PageUp: if(m_pKviWindow) if(m_pKviWindow->view())m_pKviWindow->view()->prevPage(); break; - case Qt::Key_PageDown: + case TQt::Key_PageDown: if(m_pKviWindow) if(m_pKviWindow->view())m_pKviWindow->view()->nextPage(); break; - case Qt::Key_Return: - case Qt::Key_Enter: + case TQt::Key_Return: + case TQt::Key_Enter: returnPressed(); break; - case Qt::Key_Alt: - case Qt::Key_Meta: + case TQt::Key_Alt: + case TQt::Key_Meta: m_szAltKeyCode = ""; break; default: @@ -1753,9 +1749,9 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e) } } -void KviInputEditor::keyReleaseEvent(QKeyEvent *e) +void KviInputEditor::keyReleaseEvent(TQKeyEvent *e) { - if((e->key() == Qt::Key_Alt) || (e->key() == Qt::Key_Meta)) + if((e->key() == TQt::Key_Alt) || (e->key() == TQt::Key_Meta)) { if(m_szAltKeyCode.hasData()) { @@ -1764,7 +1760,7 @@ void KviInputEditor::keyReleaseEvent(QKeyEvent *e) if(bOk && ch != 0) { //debug("INSERTING CHAR %d",ch); - insertChar(QChar(ch)); + insertChar(TQChar(ch)); e->accept(); } } @@ -1773,7 +1769,7 @@ void KviInputEditor::keyReleaseEvent(QKeyEvent *e) e->ignore(); } -void KviInputEditor::getWordBeforeCursor(QString &buffer,bool * bIsFirstWordInLine) +void KviInputEditor::getWordBeforeCursor(TQString &buffer,bool * bIsFirstWordInLine) { if(m_szTextBuffer.isEmpty() || m_iCursorPosition <= 0) { @@ -1783,10 +1779,10 @@ void KviInputEditor::getWordBeforeCursor(QString &buffer,bool * bIsFirstWordInLi buffer = m_szTextBuffer.left(m_iCursorPosition); - int idx = buffer.findRev(' '); - int idx2 = buffer.findRev(','); // This is for comma separated lists... - int idx3 = buffer.findRev('('); - int idx4 = buffer.findRev('"'); + int idx = buffer.tqfindRev(' '); + int idx2 = buffer.tqfindRev(','); // This is for comma separated lists... + int idx3 = buffer.tqfindRev('('); + int idx4 = buffer.tqfindRev('"'); if(idx2 > idx)idx = idx2; if(idx3 > idx)idx = idx3; if(idx4 > idx)idx = idx4; @@ -1801,8 +1797,8 @@ void KviInputEditor::completion(bool bShift) // On windows the KVI_PATH_SEPARATOR_CHARacters are breaking everything... // Well.... :D - QString word; - QString match; + TQString word; + TQString match; bool bFirstWordInLine; getWordBeforeCursor(word,&bFirstWordInLine); @@ -1812,18 +1808,18 @@ void KviInputEditor::completion(bool bShift) else { // this is standard nick completion continued standardNickCompletion(bShift,word,bFirstWordInLine); - repaintWithCursorOn(); + tqrepaintWithCursorOn(); return; } } - KviPointerList<QString> tmp; + KviPointerList<TQString> tmp; tmp.setAutoDelete(true); bool bIsCommand = false; bool bIsDir = false; bool bIsNick = false; - unsigned short uc = word[0].unicode(); + unsigned short uc = word[0].tqunicode(); if(uc == '/') { @@ -1849,12 +1845,12 @@ void KviInputEditor::completion(bool bShift) { if(m_pKviWindow) { - if( (word.length()==1) && (m_pKviWindow->windowName()[0].unicode()==uc)) + if( (word.length()==1) && (m_pKviWindow->windowName()[0].tqunicode()==uc)) { match=m_pKviWindow->windowName(); match.append(" "); replaceWordBeforeCursor(word,match,false); - repaintWithCursorOn(); + tqrepaintWithCursorOn(); return; } else { if(m_pKviWindow->console()) @@ -1863,7 +1859,7 @@ void KviInputEditor::completion(bool bShift) } //FIXME: Complete also on irc:// starting strings, not only irc.? - } else if(KviQString::equalCIN(word,"irc.",4)) + } else if(KviTQString::equalCIN(word,"irc.",4)) { // irc server name if(m_pKviWindow) @@ -1879,7 +1875,7 @@ void KviInputEditor::completion(bool bShift) bIsNick = true; } else { standardNickCompletion(bShift,word,bFirstWordInLine); - repaintWithCursorOn(); + tqrepaintWithCursorOn(); return; } } @@ -1902,8 +1898,8 @@ void KviInputEditor::completion(bool bShift) } } } else { - QString all; - QString * s = tmp.first(); + TQString all; + TQString * s = tmp.first(); match = *s; int wLen = word.length(); for(;s;s = tmp.next()) @@ -1911,12 +1907,12 @@ void KviInputEditor::completion(bool bShift) if(s->length() < match.length()) match.remove(s->length(),match.length() - s->length()); // All the matches here have length >= word.len()!!! - const QChar * b1 = KviQString::nullTerminatedArray(*s) + wLen; - const QChar * b2 = KviQString::nullTerminatedArray(match) + wLen; - const QChar * c1 = b1; - const QChar * c2 = b2; - if(bIsDir)while(c1->unicode() && (c1->unicode() == c2->unicode()))c1++,c2++; - else while(c1->unicode() && (c1->lower().unicode() == c2->lower().unicode()))c1++,c2++; + const TQChar * b1 = KviTQString::nullTerminatedArray(*s) + wLen; + const TQChar * b2 = KviTQString::nullTerminatedArray(match) + wLen; + const TQChar * c1 = b1; + const TQChar * c2 = b2; + if(bIsDir)while(c1->tqunicode() && (c1->tqunicode() == c2->tqunicode()))c1++,c2++; + else while(c1->tqunicode() && (c1->lower().tqunicode() == c2->lower().tqunicode()))c1++,c2++; int len = wLen + (c1 - b1); if(len < ((int)(match.length())))match.remove(len,match.length() - len); if(!all.isEmpty())all.append(", "); @@ -1937,10 +1933,10 @@ void KviInputEditor::completion(bool bShift) replaceWordBeforeCursor(word,match,false); } - repaintWithCursorOn(); + tqrepaintWithCursorOn(); } -void KviInputEditor::replaceWordBeforeCursor(const QString &word,const QString &replacement,bool bRepaint) +void KviInputEditor::replaceWordBeforeCursor(const TQString &word,const TQString &replacement,bool bRepaint) { selectOneChar(-1); m_iCursorPosition -= word.length(); @@ -1948,16 +1944,16 @@ void KviInputEditor::replaceWordBeforeCursor(const QString &word,const QString & m_szTextBuffer.insert(m_iCursorPosition,replacement); m_szTextBuffer.truncate(m_iMaxBufferSize); moveCursorTo(m_iCursorPosition + replacement.length()); - if(bRepaint)repaintWithCursorOn(); + if(bRepaint)tqrepaintWithCursorOn(); } -void KviInputEditor::standardNickCompletion(bool bAddMask,QString &word,bool bFirstWordInLine) +void KviInputEditor::standardNickCompletion(bool bAddMask,TQString &word,bool bFirstWordInLine) { // FIXME: this could be really simplified... if(!m_pUserListView)return; selectOneChar(-1); - QString buffer; + TQString buffer; if(m_szLastCompletedNick.isEmpty()) { // New completion session: we NEED sth to complete @@ -2049,17 +2045,17 @@ void KviInputEditor::end() moveRightFirstVisibleCharToShowCursor(); m_iCursorPosition++; } - repaintWithCursorOn(); + tqrepaintWithCursorOn(); } void KviInputEditor::home() { m_iFirstVisibleChar = 0; m_iCursorPosition = 0; - repaintWithCursorOn(); + tqrepaintWithCursorOn(); } -void KviInputEditor::insertChar(QChar c) +void KviInputEditor::insertChar(TQChar c) { if(m_szTextBuffer.length() >= m_iMaxBufferSize)return; @@ -2077,34 +2073,34 @@ void KviInputEditor::insertChar(QChar c) m_szTextBuffer.insert(m_iCursorPosition,c); moveRightFirstVisibleCharToShowCursor(); m_iCursorPosition++; - repaintWithCursorOn(); + tqrepaintWithCursorOn(); } void KviInputEditor::moveRightFirstVisibleCharToShowCursor() { // :) - QFontMetrics fm(KVI_OPTION_FONT(KviOption_fontInput)); + TQFontMetrics fm(KVI_OPTION_FONT(KviOption_fontInput)); - QChar c = m_szTextBuffer.at(m_iCursorPosition); + TQChar c = m_szTextBuffer.at(m_iCursorPosition); #ifdef COMPILE_USE_QT4 - m_iLastCursorXPosition += c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c);; + m_iLastCursorXPosition += c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c);; #else - m_iLastCursorXPosition += (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : fm.width(c); + m_iLastCursorXPosition += (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c); #endif while(m_iLastCursorXPosition >= contentsRect().width()-2*KVI_INPUT_MARGIN) { c = m_szTextBuffer.at(m_iFirstVisibleChar); #ifdef COMPILE_USE_QT4 - m_iLastCursorXPosition -= c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c);; + m_iLastCursorXPosition -= c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c);; #else - m_iLastCursorXPosition -= (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : fm.width(c); + m_iLastCursorXPosition -= (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c); #endif m_iFirstVisibleChar++; } } -void KviInputEditor::repaintWithCursorOn() +void KviInputEditor::tqrepaintWithCursorOn() { // :) if(m_bUpdatesEnabled) @@ -2126,14 +2122,14 @@ int KviInputEditor::charIndexFromXPosition(int xPos) int curChar = m_iFirstVisibleChar; int bufLen = m_szTextBuffer.length(); - QFontMetrics fm(KVI_OPTION_FONT(KviOption_fontInput)); + TQFontMetrics fm(KVI_OPTION_FONT(KviOption_fontInput)); while(curChar < bufLen) { - QChar c = m_szTextBuffer.at(curChar); + TQChar c = m_szTextBuffer.at(curChar); #ifdef COMPILE_USE_QT4 - int widthCh = c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c);; + int widthCh = c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c);; #else - int widthCh = (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : fm.width(c); + int widthCh = (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c); #endif if(xPos < (curXPos+(widthCh/2)))return curChar; else if(xPos < (curXPos+widthCh))return (curChar+1); @@ -2145,18 +2141,18 @@ int KviInputEditor::charIndexFromXPosition(int xPos) return curChar; } -int KviInputEditor::xPositionFromCharIndex(QFontMetrics& fm,int chIdx,bool bContentsCoords) +int KviInputEditor::xPositionFromCharIndex(TQFontMetrics& fm,int chIdx,bool bContentsCoords) { // FIXME: this could use fm.width(m_szTextBuffer,chIdx) int curXPos = bContentsCoords ? KVI_INPUT_MARGIN : frameWidth()+KVI_INPUT_MARGIN; int curChar = m_iFirstVisibleChar; while(curChar < chIdx) { - QChar c = m_szTextBuffer.at(curChar); + TQChar c = m_szTextBuffer.at(curChar); #ifdef COMPILE_USE_QT4 - curXPos += c.unicode() < 32 ? fm.width(getSubstituteChar(c.unicode())) + 3 : fm.width(c);; + curXPos += c.tqunicode() < 32 ? fm.width(getSubstituteChar(c.tqunicode())) + 3 : fm.width(c);; #else - curXPos += (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : fm.width(c); + curXPos += (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : fm.width(c); #endif curChar++; } @@ -2169,14 +2165,14 @@ int KviInputEditor::xPositionFromCharIndex(int chIdx,bool bContentsCoords) int curXPos = bContentsCoords ? KVI_INPUT_MARGIN : frameWidth()+KVI_INPUT_MARGIN; int curChar = m_iFirstVisibleChar; //debug("%i",g_pLastFontMetrics); - if(!g_pLastFontMetrics) g_pLastFontMetrics = new QFontMetrics(KVI_OPTION_FONT(KviOption_fontInput)); + if(!g_pLastFontMetrics) g_pLastFontMetrics = new TQFontMetrics(KVI_OPTION_FONT(KviOption_fontInput)); while(curChar < chIdx) { - QChar c = m_szTextBuffer.at(curChar); + TQChar c = m_szTextBuffer.at(curChar); #ifdef COMPILE_USE_QT4 - curXPos += c.unicode() < 32 ? g_pLastFontMetrics->width(getSubstituteChar(c.unicode())) + 3 : g_pLastFontMetrics->width(c); + curXPos += c.tqunicode() < 32 ? g_pLastFontMetrics->width(getSubstituteChar(c.tqunicode())) + 3 : g_pLastFontMetrics->width(c); #else - curXPos += (c.unicode() < 256) ? g_iInputFontCharWidth[c.unicode()] : g_pLastFontMetrics->width(c); + curXPos += (c.tqunicode() < 256) ? g_iInputFontCharWidth[c.tqunicode()] : g_pLastFontMetrics->width(c); #endif curChar++; } @@ -2278,7 +2274,7 @@ int KviInputEditor::xPositionFromCharIndex(int chIdx,bool bContentsCoords) Ctrl+Shift+CursorLeft: Moves the selection one word left<br> Ctrl+Shift+CursorRight: Moves the selection one word right<br> Tab: Nickname, function/command, or filename completion (see below)<br> - Shift+Tab: Hostmask or function/command completion (see below)<br> + Shift+Tab: Hosttqmask or function/command completion (see below)<br> Alt+<numeric_sequence>: Inserts the character by ASCII/Unicode code<br> <example> Alt+32: Inserts ASCII/Unicode character 32: ' ' (a space) @@ -2313,11 +2309,11 @@ int KviInputEditor::xPositionFromCharIndex(int chIdx,bool bContentsCoords) KviInput::KviInput(KviWindow *par,KviUserListView * view) -: QWidget(par,"input") +: TQWidget(par,"input") { - QBoxLayout* pLayout=new QHBoxLayout(this); + TQBoxLayout* pLayout=new TQHBoxLayout(this); pLayout->setAutoAdd(true); - pLayout->setDirection(QBoxLayout::RightToLeft); + pLayout->setDirection(TQBoxLayout::RightToLeft); pLayout->setMargin(0); pLayout->setSpacing(0); @@ -2333,51 +2329,51 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view) if(g_pIconManager->getBigIcon("kvi_horizontal_left.png")) m_pHideToolsButton->setPixmap(*(g_pIconManager->getBigIcon("kvi_horizontal_left.png"))); - connect(m_pHideToolsButton,SIGNAL(clicked()),this,SLOT(toggleToolButtons())); + connect(m_pHideToolsButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleToolButtons())); m_pButtonContainer=new KviTalHBox(this); m_pButtonContainer->setSpacing(0); #ifdef COMPILE_USE_QT4 - m_pButtonContainer->setSizePolicy(QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Preferred)); -// if(m_pButtonContainer->layout()) -// m_pButtonContainer->layout()->setSizeConstraint(QLayout::SetMinimumSize); + m_pButtonContainer->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Preferred)); +// if(m_pButtonContainer->tqlayout()) +// m_pButtonContainer->tqlayout()->setSizeConstraint(TQLayout::SetMinimumSize); #endif m_pHistoryButton = new KviStyledToolButton(m_pButtonContainer,"historybutton"); m_pHistoryButton->setUsesBigPixmap(false); //m_pHistoryButton->setUpdatesEnabled(TRUE); ??? - QIconSet is1; + TQIconSet is1; if(!KVI_OPTION_BOOL(KviOption_boolDisableInputHistory))//G&N mar 2005 { - is1.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),QIconSet::Small); + is1.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),TQIconSet::Small); m_pHistoryButton->setIconSet(is1); KviTalToolTip::add(m_pHistoryButton,__tr2qs("Show History<br><Ctrl+PageUp>")); - connect(m_pHistoryButton,SIGNAL(clicked()),this,SLOT(historyButtonClicked())); + connect(m_pHistoryButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(historyButtonClicked())); } else { - is1.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITSPLIT)),QIconSet::Small); + is1.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUITSPLIT)),TQIconSet::Small); m_pHistoryButton->setIconSet(is1); KviTalToolTip::add(m_pHistoryButton,__tr2qs("Input History Disabled")); } m_pIconButton = new KviStyledToolButton(m_pButtonContainer,"iconbutton"); m_pIconButton->setUsesBigPixmap(false); - QIconSet is3; - is3.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_BIGGRIN)),QIconSet::Small); + TQIconSet is3; + is3.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_BIGGRIN)),TQIconSet::Small); m_pIconButton->setIconSet(is3); KviTalToolTip::add(m_pIconButton,__tr2qs("Show Icons Popup<br><Ctrl+I><br>See also /help texticons")); - connect(m_pIconButton,SIGNAL(clicked()),this,SLOT(iconButtonClicked())); + connect(m_pIconButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(iconButtonClicked())); m_pCommandlineModeButton = new KviStyledToolButton(m_pButtonContainer,"commandlinemodebutton"); m_pCommandlineModeButton->setUsesBigPixmap(false); m_pCommandlineModeButton->setToggleButton(true); - QIconSet is0; - is0.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SAYSMILE)),QIconSet::Small,QIconSet::Normal,QIconSet::On); - is0.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SAYKVS)),QIconSet::Small,QIconSet::Normal,QIconSet::Off); + TQIconSet is0; + is0.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SAYSMILE)),TQIconSet::Small,TQIconSet::Normal,TQIconSet::On); + is0.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SAYKVS)),TQIconSet::Small,TQIconSet::Normal,TQIconSet::Off); m_pCommandlineModeButton->setIconSet(is0); KviTalToolTip::add(m_pCommandlineModeButton,__tr2qs("User friendly commandline mode<br>See also /help commandline")); if(KVI_OPTION_BOOL(KviOption_boolCommandlineInUserFriendlyModeByDefault)) @@ -2387,22 +2383,22 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view) m_pMultiEditorButton = new KviStyledToolButton(m_pButtonContainer,"multieditorbutton"); m_pMultiEditorButton->setToggleButton(true); m_pMultiEditorButton->setUsesBigPixmap(false); - QIconSet is2; - is2.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),QIconSet::Small,QIconSet::Normal,QIconSet::On); - is2.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),QIconSet::Small,QIconSet::Normal,QIconSet::Off); + TQIconSet is2; + is2.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),TQIconSet::Small,TQIconSet::Normal,TQIconSet::On); + is2.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),TQIconSet::Small,TQIconSet::Normal,TQIconSet::Off); m_pMultiEditorButton->setIconSet(is2); - QString szTip = __tr2qs("Multi-line Editor<br><Alt+Backspace>"); + TQString szTip = __tr2qs("Multi-line Editor<br><Alt+Backspace>"); szTip += " - <Ctrl+Backspace>"; KviTalToolTip::add(m_pMultiEditorButton,szTip); - connect(m_pMultiEditorButton,SIGNAL(toggled(bool)),this,SLOT(multilineEditorButtonToggled(bool))); + connect(m_pMultiEditorButton,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(multilineEditorButtonToggled(bool))); m_pInputEditor = new KviInputEditor(this,par,view); - connect(m_pInputEditor,SIGNAL(enterPressed()),this,SLOT(inputEditorEnterPressed())); + connect(m_pInputEditor,TQT_SIGNAL(enterPressed()),this,TQT_SLOT(inputEditorEnterPressed())); #ifdef COMPILE_USE_QT4 - m_pInputEditor->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Ignored)); + m_pInputEditor->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Ignored)); #else - m_pInputEditor->setSizePolicy(QSizePolicy(QSizePolicy::Ignored,QSizePolicy::Ignored)); + m_pInputEditor->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored)); #endif @@ -2434,7 +2430,7 @@ void KviInput::setButtonsHidden(bool bHidden) if(!m_pHideToolsButton || !m_pButtonContainer) return; if(bHidden==m_pButtonContainer->isHidden()) return; m_pButtonContainer->setHidden(bHidden); - QPixmap* pix= bHidden ? + TQPixmap* pix= bHidden ? g_pIconManager->getBigIcon("kvi_horizontal_right.png") : g_pIconManager->getBigIcon("kvi_horizontal_left.png"); if(pix) @@ -2448,36 +2444,36 @@ void KviInput::toggleToolButtons() void KviInput::inputEditorEnterPressed() { - QString szText = m_pInputEditor->text(); - KviUserInput::parse(szText,m_pWindow,QString::null,m_pCommandlineModeButton->isOn()); + TQString szText = m_pInputEditor->text(); + KviUserInput::parse(szText,m_pWindow,TQString(),m_pCommandlineModeButton->isOn()); m_pInputEditor->setText(""); } -void KviInput::keyPressEvent(QKeyEvent *e) +void KviInput::keyPressEvent(TQKeyEvent *e) { //debug("KviInput::keyPressEvent(key:%d,state:%d,text:%s)",e->key(),e->state(),e->text().isEmpty() ? "empty" : e->text().utf8().data()); - if((e->state() & Qt::ControlButton) || (e->state() & Qt::AltButton) || (e->state() & Qt::MetaButton)) + if((e->state() & TQt::ControlButton) || (e->state() & TQt::AltButton) || (e->state() & TQt::MetaButton)) { switch(e->key()) { - case Qt::Key_Backspace: + case TQt::Key_Backspace: //if(m_pMultiLineEditor) multilineEditorButtonToggled(!m_pMultiLineEditor); break; } } - if(e->state() & Qt::ControlButton) + if(e->state() & TQt::ControlButton) { switch(e->key()) { - case Qt::Key_Enter: - case Qt::Key_Return: + case TQt::Key_Enter: + case TQt::Key_Return: { if(m_pMultiLineEditor) { - QString szText; + TQString szText; m_pMultiLineEditor->getText(szText); if(szText.isEmpty())return; if(KVI_OPTION_BOOL(KviOption_boolWarnAboutPastingMultipleLines)) @@ -2489,11 +2485,11 @@ void KviInput::keyPressEvent(QKeyEvent *e) #ifdef COMPILE_USE_QT4 int nLines = szText.count('\n') + 1; #else - int nLines = szText.contains('\n') + 1; + int nLines = szText.tqcontains('\n') + 1; #endif if(nLines > 15) { - int nRet = QMessageBox::question( + int nRet = TQMessageBox::question( this, __tr2qs("Confirm Multiline Message"), __tr2qs("You're about to send a message with %1 lines of text.<br><br>" \ @@ -2501,7 +2497,7 @@ void KviInput::keyPressEvent(QKeyEvent *e) "here to prevent you from accidentally sending<br>" \ "a really large message just because you didn't edit it<br>" \ "properly after pasting text from the clipboard.<br><br>" \ - "Do you want the message to be sent?").arg(nLines), + "Do you want the message to be sent?").tqarg(nLines), __tr2qs("Yes, always"), __tr2qs("Yes"), __tr2qs("No"), @@ -2521,19 +2517,19 @@ void KviInput::keyPressEvent(QKeyEvent *e) } } } - KviUserInput::parse(szText,m_pWindow,QString::null,m_pCommandlineModeButton->isOn()); + KviUserInput::parse(szText,m_pWindow,TQString(),m_pCommandlineModeButton->isOn()); m_pMultiLineEditor->setText(""); } } break; - case Qt::Key_PageUp: + case TQt::Key_PageUp: historyButtonClicked(); break; } } } -void KviInput::multiLinePaste(const QString &text) +void KviInput::multiLinePaste(const TQString &text) { if(!m_pMultiLineEditor)multilineEditorButtonToggled(true); m_pMultiLineEditor->setText(text); @@ -2547,20 +2543,20 @@ void KviInput::multilineEditorButtonToggled(bool bOn) KviScriptEditor::destroyInstance(m_pMultiLineEditor); m_pMultiLineEditor = 0; m_pInputEditor->show(); - m_pWindow->childrenTreeChanged(0); + m_pWindow->tqchildrenTreeChanged(0); m_pInputEditor->setFocus(); m_pMultiEditorButton->setOn(false); } else { if(!bOn)return; m_pMultiLineEditor = KviScriptEditor::createInstance(this); - QString szText = __tr2qs("<Ctrl+Return>; submits, <Alt+Backspace>; hides this editor"); + TQString szText = __tr2qs("<Ctrl+Return>; submits, <Alt+Backspace>; hides this editor"); // compatibility entry to avoid breaking translation just before a release... :) - szText.replace("Alt+Backspace","Ctrl+Backspace"); + szText.tqreplace("Alt+Backspace","Ctrl+Backspace"); m_pMultiLineEditor->setFindText(szText); m_pMultiLineEditor->setFindLineeditReadOnly(true); m_pInputEditor->hide(); m_pMultiLineEditor->show(); - m_pWindow->childrenTreeChanged(m_pMultiLineEditor); + m_pWindow->tqchildrenTreeChanged(m_pMultiLineEditor); m_pMultiLineEditor->setFocus(); m_pMultiEditorButton->setOn(true); } @@ -2569,7 +2565,7 @@ void KviInput::multilineEditorButtonToggled(bool bOn) void KviInput::iconButtonClicked() { if(!g_pTextIconWindow)g_pTextIconWindow = new KviTextIconWindow(); - QPoint pnt = m_pIconButton->mapToGlobal(QPoint(m_pIconButton->width(),0)); + TQPoint pnt = m_pIconButton->mapToGlobal(TQPoint(m_pIconButton->width(),0)); g_pTextIconWindow->move(pnt.x()-g_pTextIconWindow->width(),pnt.y() - g_pTextIconWindow->height()); g_pTextIconWindow->popup(this,true); } @@ -2578,7 +2574,7 @@ void KviInput::historyButtonClicked() { if(!g_pHistoryWindow)g_pHistoryWindow = new KviHistoryWindow(); - QPoint pnt = mapToGlobal(QPoint(0,0)); + TQPoint pnt = mapToGlobal(TQPoint(0,0)); g_pHistoryWindow->setGeometry(pnt.x(),pnt.y() - KVI_HISTORY_WIN_HEIGHT,width(),KVI_HISTORY_WIN_HEIGHT); g_pHistoryWindow->popup(this); @@ -2586,7 +2582,7 @@ void KviInput::historyButtonClicked() #define BUTTON_WIDTH 20 -/*void KviInput::resizeEvent(QResizeEvent *e) +/*void KviInput::resizeEvent(TQResizeEvent *e) { //m_pButtonContainer m_pInputEditor->setGeometry(0,0,m_pButtonContainer->isVisible() ? width() - (BUTTON_WIDTH * 4)-10 : width() - 10,height()); @@ -2595,19 +2591,19 @@ void KviInput::historyButtonClicked() m_pHideToolsButton->setGeometry(width() - 10,0,10,height()); - QWidget::resizeEvent(e); + TQWidget::resizeEvent(e); }*/ void KviInput::setFocus() { - // redirect setFocus() to the right children + // redirect setFocus() to the right tqchildren if(m_pMultiLineEditor)m_pMultiLineEditor->setFocus(); else m_pInputEditor->setFocus(); } -void KviInput::focusInEvent(QFocusEvent * e) +void KviInput::focusInEvent(TQFocusEvent * e) { - // if we get a focus in event , redirect the focus to the children + // if we get a focus in event , redirect the focus to the tqchildren if(m_pMultiLineEditor)m_pMultiLineEditor->setFocus(); else m_pInputEditor->setFocus(); } @@ -2618,9 +2614,9 @@ int KviInput::heightHint() const return m_pMultiLineEditor ? 120 : m_pInputEditor->heightHint(); } -void KviInput::setText(const QString &text) +void KviInput::setText(const TQString &text) { - // FIXME: Latin1 -> QString ? + // FIXME: Latin1 -> TQString ? if(m_pMultiLineEditor)m_pMultiLineEditor->setText(text); else m_pInputEditor->setText(text); } @@ -2630,7 +2626,7 @@ void KviInput::insertChar(char c) m_pInputEditor->insertChar(c); } -void KviInput::insertText(const QString& text) +void KviInput::insertText(const TQString& text) { m_pInputEditor->insertText(text); } @@ -2642,34 +2638,34 @@ void KviInput::applyOptions() if(KVI_OPTION_BOOL(KviOption_boolDisableInputHistory))//G&N mar 2005 { - QIconSet is1; - is1.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITSPLIT)),QIconSet::Small); + TQIconSet is1; + is1.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUITSPLIT)),TQIconSet::Small); m_pHistoryButton->setIconSet(is1); KviTalToolTip::add(m_pHistoryButton,__tr2qs("Input History Disabled")); - m_pHistoryButton->disconnect(SIGNAL(clicked())); + m_pHistoryButton->disconnect(TQT_SIGNAL(clicked())); } if(!KVI_OPTION_BOOL(KviOption_boolDisableInputHistory)) { - QIconSet is1; - is1.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),QIconSet::Small); + TQIconSet is1; + is1.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),TQIconSet::Small); m_pHistoryButton->setIconSet(is1); KviTalToolTip::add(m_pHistoryButton,__tr2qs("Show History<br><Ctrl+PageUp>")); - connect(m_pHistoryButton,SIGNAL(clicked()),this,SLOT(historyButtonClicked())); + connect(m_pHistoryButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(historyButtonClicked())); } m_pInputEditor->applyOptions(); } -void KviInput::setFocusProxy(QWidget *) +void KviInput::setFocusProxy(TQWidget *) { /* do nothing */ } -//const QString & KviInput::text() -QString KviInput::text() +//const TQString & KviInput::text() +TQString KviInput::text() { - QString szText; + TQString szText; if(m_pMultiLineEditor) m_pMultiLineEditor->getText(szText); else diff --git a/src/kvirc/ui/kvi_input.h b/src/kvirc/ui/kvi_input.h index 56ec507..cc6e3e6 100644 --- a/src/kvirc/ui/kvi_input.h +++ b/src/kvirc/ui/kvi_input.h @@ -28,21 +28,21 @@ #include "kvi_settings.h" -#include <qwidget.h> +#include <tqwidget.h> #include "kvi_tal_hbox.h" -#include <qpixmap.h> +#include <tqpixmap.h> #include "kvi_pointerlist.h" #include "kvi_string.h" -//#include <qdialog.h> -#include <qtoolbutton.h> +//#include <tqdialog.h> +#include <tqtoolbutton.h> class KviUserListView; class KviWindow; class KviInput; class KviTalHBox; -class QFontMetrics; +class TQFontMetrics; // Default maximum buffer size. #define KVI_INPUT_MAX_BUFFER_SIZE 400 @@ -63,31 +63,32 @@ public: KviInputHistory(); ~KviInputHistory(); protected: - KviPointerList<QString> * m_pStringList; + KviPointerList<TQString> * m_pStringList; public: - void add(QString * s); - KviPointerList<QString> * list(){ return m_pStringList; }; + void add(TQString * s); + KviPointerList<TQString> * list(){ return m_pStringList; }; void save(const char * filename); void load(const char * filename); }; #ifdef COMPILE_USE_QT4 - #define QIMEvent QInputMethodEvent + #define TQIMEvent TQInputMethodEvent #endif -class KVIRC_API KviInputEditor : public QFrame +class KVIRC_API KviInputEditor : public TQFrame { // friend class KviUserParser; - //Q_PROPERTY( int KviProperty_FocusOwner READ heightHint ) - Q_PROPERTY( int TransparencyCapable READ heightHint ) + //TQ_PROPERTY( int KviProperty_FocusOwner READ heightHint ) + TQ_PROPERTY( int TransparencyCapable READ heightHint ) Q_OBJECT + TQ_OBJECT public: - KviInputEditor(QWidget * par,KviWindow *wnd,KviUserListView * view = 0); + KviInputEditor(TQWidget * par,KviWindow *wnd,KviUserListView * view = 0); ~KviInputEditor(); protected: - QString m_szTextBuffer; + TQString m_szTextBuffer; int m_iCursorPosition; int m_iFirstVisibleChar; int m_iSelectionBegin; @@ -96,7 +97,7 @@ protected: bool m_bSpSlowFlag; // <-- what is this ? // members for supporting input methods - QString m_szIMText; + TQString m_szIMText; int m_iIMStart; int m_iIMLength; int m_iIMSelectionBegin; @@ -121,15 +122,15 @@ protected: int m_iSelectionAnchorChar; // History stuff - KviPointerList<QString> * m_pHistory; + KviPointerList<TQString> * m_pHistory; int m_iCurHistoryIdx; KviStr m_szSaveTextBuffer; // Nick completion KviUserListView * m_pUserListView; - QString m_szLastCompletedNick; - QString m_szLastCompletionBuffer; + TQString m_szLastCompletedNick; + TQString m_szLastCompletionBuffer; int m_iLastCompletionCursorPosition; int m_iLastCompletionCursorXPosition; int m_iLastCompletionFirstVisibleChar; @@ -138,33 +139,33 @@ protected: bool m_bUpdatesEnabled; KviStr m_szAltKeyCode; KviWindow * m_pKviWindow; - QWidget * m_pInputParent; + TQWidget * m_pInputParent; KviTalPopupMenu * m_pIconMenu; bool m_bReadOnly; public: int heightHint() const; - virtual QSize sizeHint() const; - void setText(const QString text); - QString text() { return m_szTextBuffer; }; - void insertChar(QChar c); - void insertText(const QString &text); + virtual TQSize tqsizeHint() const; + void setText(const TQString text); + TQString text() { return m_szTextBuffer; }; + void insertChar(TQChar c); + void insertText(const TQString &text); void applyOptions(); void setMaxBufferSize(int size) { m_iMaxBufferSize = size; }; void setReadOnly(bool bReadOnly) {m_bReadOnly=bReadOnly; }; bool readOnly() {return m_bReadOnly; }; private: - void replaceWordBeforeCursor(const QString &word,const QString &replacement,bool bRepaint = true); - int replaceSegment(int start, int length, const QString &string); - void getWordBeforeCursor(QString &buffer,bool * bIsFirstWordInLine); + void replaceWordBeforeCursor(const TQString &word,const TQString &replacement,bool bRepaint = true); + int replaceSegment(int start, int length, const TQString &string); + void getWordBeforeCursor(TQString &buffer,bool * bIsFirstWordInLine); void runUpToTheFirstVisibleChar(); - void extractNextBlock(int idx,QFontMetrics & fm,int curXPos,int maxXPos); - void drawTextBlock(QPainter *pa,QFontMetrics & fm,int curXPos,int textBaseline,int idx,int len,bool bSelected=FALSE); - QChar getSubstituteChar(unsigned short control_code); + void extractNextBlock(int idx,TQFontMetrics & fm,int curXPos,int maxXPos); + void drawTextBlock(TQPainter *pa,TQFontMetrics & fm,int curXPos,int textBaseline,int idx,int len,bool bSelected=FALSE); + TQChar getSubstituteChar(unsigned short control_code); void moveRightFirstVisibleCharToShowCursor(); - void repaintWithCursorOn(); + void tqrepaintWithCursorOn(); void selectOneChar(int pos); int charIndexFromXPosition(int xPos); - int xPositionFromCharIndex(QFontMetrics& fm,int chIdx,bool bContentsCoords=FALSE); + int xPositionFromCharIndex(TQFontMetrics& fm,int chIdx,bool bContentsCoords=FALSE); int xPositionFromCharIndex(int chIdx,bool bContentsCoords=FALSE); void killDragTimer(); void handleDragSelection(); @@ -174,8 +175,8 @@ private: void moveCursorTo(int idx,bool bRepaint = true); void returnPressed(bool bRepaint = true); void completion(bool bShift); - void standardNickCompletion(bool bAddMask,QString &word,bool bFirstWordInLine); - void recalcFontMetrics(QFontMetrics * pFm); + void standardNickCompletion(bool bAddMask,TQString &word,bool bFirstWordInLine); + void recalcFontMetrics(TQFontMetrics * pFm); void internalCursorRight(bool bShift); void internalCursorLeft(bool bShift); public slots: @@ -195,30 +196,31 @@ signals: void escapePressed(); void enterPressed(); protected: - virtual void drawContents(QPainter *); - //virtual void resizeEvent(QResizeEvent *); - virtual void timerEvent(QTimerEvent *e); - virtual void focusInEvent(QFocusEvent *); - virtual void focusOutEvent(QFocusEvent *); - virtual void keyPressEvent(QKeyEvent *e); - virtual void keyReleaseEvent(QKeyEvent *e); - virtual void mousePressEvent(QMouseEvent *e); - virtual void mouseReleaseEvent(QMouseEvent *); - virtual void dragEnterEvent(QDragEnterEvent *e); - virtual void dropEvent(QDropEvent *e); - virtual void imStartEvent(QIMEvent *e); - virtual void imComposeEvent(QIMEvent *e); - virtual void imEndEvent(QIMEvent *e); + virtual void drawContents(TQPainter *); + //virtual void resizeEvent(TQResizeEvent *); + virtual void timerEvent(TQTimerEvent *e); + virtual void focusInEvent(TQFocusEvent *); + virtual void focusOutEvent(TQFocusEvent *); + virtual void keyPressEvent(TQKeyEvent *e); + virtual void keyReleaseEvent(TQKeyEvent *e); + virtual void mousePressEvent(TQMouseEvent *e); + virtual void mouseReleaseEvent(TQMouseEvent *); + virtual void dragEnterEvent(TQDragEnterEvent *e); + virtual void dropEvent(TQDropEvent *e); + virtual void imStartEvent(TQIMEvent *e); + virtual void imComposeEvent(TQIMEvent *e); + virtual void imEndEvent(TQIMEvent *e); #ifdef COMPILE_USE_QT4 - virtual void paintEvent(QPaintEvent *e); + virtual void paintEvent(TQPaintEvent *e); #endif }; class KviScriptEditor; -class KVIRC_API KviInput : public QWidget +class KVIRC_API KviInput : public TQWidget { Q_OBJECT + TQ_OBJECT public: KviInput(KviWindow *par,KviUserListView * view = 0); ~KviInput(); @@ -227,16 +229,16 @@ public: KviInputEditor * m_pInputEditor; KviScriptEditor * m_pMultiLineEditor; KviTalHBox * m_pButtonContainer; - QToolButton * m_pMultiEditorButton; - QToolButton * m_pHistoryButton; - QToolButton * m_pIconButton; - QToolButton * m_pCommandlineModeButton; - QToolButton * m_pHideToolsButton; + TQToolButton * m_pMultiEditorButton; + TQToolButton * m_pHistoryButton; + TQToolButton * m_pIconButton; + TQToolButton * m_pCommandlineModeButton; + TQToolButton * m_pHideToolsButton; protected: -// virtual void resizeEvent(QResizeEvent * e); - virtual void focusInEvent(QFocusEvent * e); - virtual void setFocusProxy(QWidget * w); - virtual void keyPressEvent(QKeyEvent * e); +// virtual void resizeEvent(TQResizeEvent * e); + virtual void focusInEvent(TQFocusEvent * e); + virtual void setFocusProxy(TQWidget * w); + virtual void keyPressEvent(TQKeyEvent * e); public slots: void multilineEditorButtonToggled(bool bOn); void historyButtonClicked(); @@ -245,18 +247,18 @@ public slots: void toggleToolButtons(); public: virtual void setFocus(); - void multiLinePaste(const QString &text); + void multiLinePaste(const TQString &text); bool isUserFriendly() { return m_pCommandlineModeButton->isOn(); }; void setUserFriendly(bool bSet) { m_pCommandlineModeButton->setOn(bSet); }; int heightHint() const; - void setText(const QString &text); + void setText(const TQString &text); void insertChar(char c); - void insertText(const QString & text); + void insertText(const TQString & text); void applyOptions(); bool isButtonsHidden(); void setButtonsHidden(bool bHidden); - //const QString & text(); - QString text(); + //const TQString & text(); + TQString text(); }; #endif //_KVI_INPUT_H_ diff --git a/src/kvirc/ui/kvi_ipeditor.cpp b/src/kvirc/ui/kvi_ipeditor.cpp index 13291c2..9d1b363 100644 --- a/src/kvirc/ui/kvi_ipeditor.cpp +++ b/src/kvirc/ui/kvi_ipeditor.cpp @@ -23,18 +23,18 @@ #include "kvi_ipeditor.h" #include "kvi_qcstring.h" -#include <qapplication.h> -#include <qlineedit.h> -#include <qlabel.h> -#include <qframe.h> +#include <tqapplication.h> +#include <tqlineedit.h> +#include <tqlabel.h> +#include <tqframe.h> #include <ctype.h> -#include <qevent.h> +#include <tqevent.h> // FIXME: #warning "THIS COULD GO INTO libkvioptions ?" -KviIpEditor::KviIpEditor(QWidget * parent,AddressType addrType,const QString &ipAddr,const char *name) -:QFrame(parent,name) +KviIpEditor::KviIpEditor(TQWidget * tqparent,AddressType addrType,const TQString &ipAddr,const char *name) +:TQFrame(tqparent,name) { for(int i=0;i<7;i++) @@ -43,12 +43,12 @@ KviIpEditor::KviIpEditor(QWidget * parent,AddressType addrType,const QString &ip m_pLabel[i] = 0; } m_pEdit[7] = 0; - setFrameStyle(QFrame::Sunken|QFrame::StyledPanel); + setFrameStyle(TQFrame::Sunken|TQFrame::StyledPanel); #ifdef COMPILE_USE_QT4 - setBackgroundRole(QPalette::Base); + setBackgroundRole(TQPalette::Base); #else - setBackgroundMode(QWidget::PaletteBase); + setBackgroundMode(TQWidget::PaletteBase); #endif setAddressType(addrType); @@ -63,7 +63,7 @@ KviIpEditor::~KviIpEditor() void KviIpEditor::setEnabled(bool bEnabled) { - QFrame::setEnabled(bEnabled); + TQFrame::setEnabled(bEnabled); for(int i=0;i<8;i++) { if(m_pEdit[i])m_pEdit[i]->setEnabled(bEnabled); @@ -71,17 +71,17 @@ void KviIpEditor::setEnabled(bool bEnabled) { // Is this the right way ? #ifdef COMPILE_USE_QT4 - m_pLabel[i]->setBackgroundRole(isEnabled() ? QPalette::Base : QPalette::Background); + m_pLabel[i]->setBackgroundRole(isEnabled() ? TQPalette::Base : TQPalette::Background); #else - m_pLabel[i]->setBackgroundMode(isEnabled() ? QWidget::PaletteBase : QWidget::PaletteBackground); + m_pLabel[i]->setBackgroundMode(isEnabled() ? TQWidget::PaletteBase : TQWidget::PaletteBackground); #endif m_pLabel[i]->setEnabled(bEnabled); } } #ifdef COMPILE_USE_QT4 - setBackgroundRole(isEnabled() ? QPalette::Base : QPalette::Background); + setBackgroundRole(isEnabled() ? TQPalette::Base : TQPalette::Background); #else - setBackgroundMode(isEnabled() ? QWidget::PaletteBase : QWidget::PaletteBackground); + setBackgroundMode(isEnabled() ? TQWidget::PaletteBase : TQWidget::PaletteBackground); #endif } @@ -120,13 +120,13 @@ void KviIpEditor::clear() } } -bool KviIpEditor::setAddress(const QString &ipAddr) +bool KviIpEditor::setAddress(const TQString &ipAddr) { // FIXME We could check if the addres // is valid before effectively setting the fields clear(); - KviQCString ip = ipAddr.ascii(); // ip addresses are digits & latin letters abcdef (IpV6) + KviTQCString ip = ipAddr.ascii(); // ip addresses are digits & latin letters abcdef (IpV6) ip = ip.stripWhiteSpace(); const char * c = ip.data(); @@ -140,7 +140,7 @@ bool KviIpEditor::setAddress(const QString &ipAddr) const char *anchor = c; while(isdigit(*c))c++; if(c == anchor)return false; // Invalid empty field - KviQCString str(anchor,(c - anchor) + 1); + KviTQCString str(anchor,(c - anchor) + 1); bool bOk; int num = str.toInt(&bOk); if(!bOk)return false; // should never happen , but just to be sure @@ -156,7 +156,7 @@ bool KviIpEditor::setAddress(const QString &ipAddr) { const char *anchor = c; while(isdigit(*c) || ((tolower(*c) >= 'a') && (tolower(*c) <= 'f')) || ((tolower(*c) >= 'A') && (tolower(*c) <= 'F')))c++; - KviQCString str(anchor,(c - anchor) + 1); + KviTQCString str(anchor,(c - anchor) + 1); if(str.length() > 4)return false; // Too long m_pEdit[i]->setText(str.data()); if(i < 7){ @@ -169,9 +169,9 @@ bool KviIpEditor::setAddress(const QString &ipAddr) return true; } -QString KviIpEditor::address() const +TQString KviIpEditor::address() const { - QString ret; + TQString ret; if(m_addrType == IpV6) { @@ -183,7 +183,7 @@ QString KviIpEditor::address() const } else { for(int i=0;i<4;i++) { - QString tmp = m_pEdit[i]->text(); + TQString tmp = m_pEdit[i]->text(); bool bOk; int num = tmp.toInt(&bOk); if(!bOk)num = 0; @@ -200,29 +200,29 @@ void KviIpEditor::recreateChildren() // A bit slow , but compact bool bIpV4 = (m_addrType == IpV4); int max = bIpV4 ? 4 : 8; - QFontMetrics fm(font()); + TQFontMetrics fm(font()); //int minWidth = fm.width(bIpV4 ? "000" : "AAAA") + 4; for(int i=0;i<max;i++) { if(!m_pEdit[i]){ - m_pEdit[i] = new QLineEdit(this); + m_pEdit[i] = new TQLineEdit(this); m_pEdit[i]->installEventFilter(this); m_pEdit[i]->setFrame(false); - m_pEdit[i]->setAlignment(Qt::AlignCenter); + m_pEdit[i]->tqsetAlignment(TQt::AlignCenter); } //m_pEdit[i]->setMinimumWidth(minWidth); m_pEdit[i]->setMaxLength(bIpV4 ? 3 : 4); m_pEdit[i]->show(); if(i < (max - 1)) { - if(!m_pLabel[i])m_pLabel[i] = new QLabel(this); + if(!m_pLabel[i])m_pLabel[i] = new TQLabel(this); m_pLabel[i]->setText(bIpV4 ? "." : ":"); m_pLabel[i]->show(); // Is this the right way ? setBackgroundMode seems to not work well #ifdef COMPILE_USE_QT4 - m_pLabel[i]->setBackgroundRole(isEnabled() ? QPalette::Base : QPalette::Background); + m_pLabel[i]->setBackgroundRole(isEnabled() ? TQPalette::Base : TQPalette::Background); #else - m_pLabel[i]->setBackgroundMode(isEnabled() ? QWidget::PaletteBase : QWidget::PaletteBackground); + m_pLabel[i]->setBackgroundMode(isEnabled() ? TQWidget::PaletteBase : TQWidget::PaletteBackground); #endif } } @@ -243,35 +243,35 @@ void KviIpEditor::recreateChildren() } } } - //setMinimumWidth(4 + (max * minWidth) + ((max - 1) * m_pLabel[0]->sizeHint().width())); - setMinimumHeight(m_pLabel[0]->sizeHint().height() + 4); + //setMinimumWidth(4 + (max * minWidth) + ((max - 1) * m_pLabel[0]->tqsizeHint().width())); + setMinimumHeight(m_pLabel[0]->tqsizeHint().height() + 4); resizeEvent(0); } -bool KviIpEditor::eventFilter(QObject * o,QEvent *e) +bool KviIpEditor::eventFilter(TQObject * o,TQEvent *e) { - if(o->inherits("QLineEdit")) + if(o->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) { - if(e->type() == QEvent::KeyPress) + if(e->type() == TQEvent::KeyPress) { - QString s; + TQString s; // find the editor int edIdx = -1; for(int i=0;i<8;i++) { - if(m_pEdit[i] == o) + if(TQT_BASE_OBJECT(m_pEdit[i]) == TQT_BASE_OBJECT(o)) { edIdx = i; break; } } - if(edIdx == -1)return QFrame::eventFilter(o,e); // user added QLineEdit child ? + if(edIdx == -1)return TQFrame::eventFilter(o,e); // user added TQLineEdit child ? int edMax = (m_addrType == IpV4) ? 3 : 7; - int cursorPos = ((QLineEdit *)o)->cursorPosition(); - switch(((QKeyEvent *)e)->key()) + int cursorPos = ((TQLineEdit *)o)->cursorPosition(); + switch(((TQKeyEvent *)e)->key()) { - case Qt::Key_Right: - s = ((QLineEdit *)o)->text(); + case TQt::Key_Right: + s = ((TQLineEdit *)o)->text(); if(((unsigned int)cursorPos) == s.length()) { if(edIdx < edMax) @@ -282,8 +282,8 @@ bool KviIpEditor::eventFilter(QObject * o,QEvent *e) } } break; - case Qt::Key_Left: - case Qt::Key_Backspace: + case TQt::Key_Left: + case TQt::Key_Backspace: if(cursorPos == 0) { if(edIdx > 0) @@ -294,26 +294,22 @@ bool KviIpEditor::eventFilter(QObject * o,QEvent *e) return true; } } - return QFrame::eventFilter(o,e); + return TQFrame::eventFilter(o,e); break; - case Qt::Key_End: - case Qt::Key_Home: - case Qt::Key_Delete: - case Qt::Key_Tab: - return QFrame::eventFilter(o,e); + case TQt::Key_End: + case TQt::Key_Home: + case TQt::Key_Delete: + case TQt::Key_Tab: + return TQFrame::eventFilter(o,e); break; default: - // a normal key (this part substitutes a QValidator) - const char c = tolower(((QKeyEvent *)e)->ascii()); + // a normal key (this part substitutes a TQValidator) + const char c = tolower(((TQKeyEvent *)e)->ascii()); if(m_addrType == IpV4) { if((c >= '0') && (c <= '9')) { -#if QT_VERSION >= 300 if(m_pEdit[edIdx]->hasSelectedText())m_pEdit[edIdx]->cut(); -#else - if(m_pEdit[edIdx]->hasMarkedText())m_pEdit[edIdx]->cut(); -#endif cursorPos = m_pEdit[edIdx]->cursorPosition(); s = m_pEdit[edIdx]->text(); s.insert(cursorPos,c); @@ -333,19 +329,11 @@ bool KviIpEditor::eventFilter(QObject * o,QEvent *e) return true; } } -#if QT_VERSION >= 300 m_pEdit[edIdx]->cursorForward(false); -#else - m_pEdit[edIdx]->cursorRight(false); -#endif } else { if((c == '.') && (edIdx < edMax)) { -#if QT_VERSION >= 300 if(!m_pEdit[edIdx]->hasSelectedText()) -#else - if(!m_pEdit[edIdx]->hasMarkedText()) -#endif { m_pEdit[++edIdx]->setFocus(); m_pEdit[edIdx]->selectAll(); @@ -355,11 +343,7 @@ bool KviIpEditor::eventFilter(QObject * o,QEvent *e) } else { if( ((c >= '0') && (c <= '9')) || ((c >= 'a') && (c <= 'f')) ) { -#if QT_VERSION >= 300 if(m_pEdit[edIdx]->hasSelectedText())m_pEdit[edIdx]->cut(); -#else - if(m_pEdit[edIdx]->hasMarkedText())m_pEdit[edIdx]->cut(); -#endif cursorPos = m_pEdit[edIdx]->cursorPosition(); s = m_pEdit[edIdx]->text(); @@ -384,21 +368,13 @@ bool KviIpEditor::eventFilter(QObject * o,QEvent *e) m_pEdit[edIdx]->selectAll(); //m_pEdit[edIdx]->setCursorPosition(0); } else { -#if QT_VERSION >= 300 m_pEdit[edIdx]->cursorForward(false); -#else - m_pEdit[edIdx]->cursorRight(false); -#endif } } } else { if((c == ':') && (edIdx < edMax)) { -#if QT_VERSION >= 300 if(!m_pEdit[edIdx]->hasSelectedText()) -#else - if(!m_pEdit[edIdx]->hasMarkedText()) -#endif { m_pEdit[++edIdx]->setFocus(); m_pEdit[edIdx]->selectAll(); @@ -411,15 +387,15 @@ bool KviIpEditor::eventFilter(QObject * o,QEvent *e) } } } - return QFrame::eventFilter(o,e); + return TQFrame::eventFilter(o,e); } -void KviIpEditor::resizeEvent(QResizeEvent *e) +void KviIpEditor::resizeEvent(TQResizeEvent *e) { if(m_pEdit[0]) { int maxW = (m_addrType == IpV4) ? 4 : 8; - int labHint = m_pLabel[0]->sizeHint().width(); + int labHint = m_pLabel[0]->tqsizeHint().width(); int hghHint = height() - 4; int ediWdth = ((width() - 4) - ((maxW - 1) * labHint)) / maxW; int curX = 2; @@ -434,19 +410,19 @@ void KviIpEditor::resizeEvent(QResizeEvent *e) curX += ediWdth; } } - if(e)QFrame::resizeEvent(e); + if(e)TQFrame::resizeEvent(e); } -QSize KviIpEditor::sizeHint() +TQSize KviIpEditor::tqsizeHint() { if(m_pEdit[0]) { - int labHint = m_pLabel[0]->sizeHint().width(); - int hghHint = m_pEdit[0]->sizeHint().height(); - int ediHint = m_pEdit[0]->sizeHint().width(); - if(m_addrType == IpV4)return QSize((labHint * 3) + (ediHint * 4) + 4,hghHint + 4); - else return QSize((labHint * 7) + (ediHint * 8) + 4,hghHint + 4); - } else return QFrame::sizeHint(); + int labHint = m_pLabel[0]->tqsizeHint().width(); + int hghHint = m_pEdit[0]->tqsizeHint().height(); + int ediHint = m_pEdit[0]->tqsizeHint().width(); + if(m_addrType == IpV4)return TQSize((labHint * 3) + (ediHint * 4) + 4,hghHint + 4); + else return TQSize((labHint * 7) + (ediHint * 8) + 4,hghHint + 4); + } else return TQFrame::tqsizeHint(); } diff --git a/src/kvirc/ui/kvi_ipeditor.h b/src/kvirc/ui/kvi_ipeditor.h index 04574e6..3a39841 100644 --- a/src/kvirc/ui/kvi_ipeditor.h +++ b/src/kvirc/ui/kvi_ipeditor.h @@ -25,36 +25,37 @@ #include "kvi_settings.h" -#include <qwidget.h> -#include <qstring.h> -#include <qframe.h> +#include <tqwidget.h> +#include <tqstring.h> +#include <tqframe.h> -class QLineEdit; -class QLabel; +class TQLineEdit; +class TQLabel; -class KVIRC_API KviIpEditor : public QFrame +class KVIRC_API KviIpEditor : public TQFrame { Q_OBJECT + TQ_OBJECT public: enum AddressType { IpV4 , IpV6 }; - KviIpEditor(QWidget * parent,AddressType = IpV4,const QString &ipAddr = QString::null,const char *name = 0); + KviIpEditor(TQWidget * tqparent,AddressType = IpV4,const TQString &ipAddr = TQString(),const char *name = 0); ~KviIpEditor(); private: - QLabel * m_pLabel[7]; - QLineEdit * m_pEdit[8]; + TQLabel * m_pLabel[7]; + TQLineEdit * m_pEdit[8]; AddressType m_addrType; public: - bool setAddress(const QString &ipAddr); - QString address() const; + bool setAddress(const TQString &ipAddr); + TQString address() const; void setAddressType(AddressType addrType); AddressType addressType() const; bool hasEmptyFields() const; void clear(); virtual void setEnabled(bool bEnabled); protected: - virtual bool eventFilter(QObject * o,QEvent *e); - virtual void resizeEvent(QResizeEvent *e); - virtual QSize sizeHint(); + virtual bool eventFilter(TQObject * o,TQEvent *e); + virtual void resizeEvent(TQResizeEvent *e); + virtual TQSize tqsizeHint(); private: void recreateChildren(); }; diff --git a/src/kvirc/ui/kvi_irctoolbar.cpp b/src/kvirc/ui/kvi_irctoolbar.cpp index a7e45f3..b2af2cb 100644 --- a/src/kvirc/ui/kvi_irctoolbar.cpp +++ b/src/kvirc/ui/kvi_irctoolbar.cpp @@ -41,43 +41,43 @@ #include "kvi_irccontext.h" #include "kvi_lagmeter.h" -#include <qstyle.h> -#include <qpainter.h> +#include <tqstyle.h> +#include <tqpainter.h> #include "kvi_tal_popupmenu.h" -#include <qlayout.h> +#include <tqlayout.h> #ifdef COMPILE_USE_QT4 - #include <qevent.h> + #include <tqevent.h> #endif #ifdef COMPILE_PSEUDO_TRANSPARENCY - extern QPixmap * g_pShadedChildGlobalDesktopBackground; + extern TQPixmap * g_pShadedChildGlobalDesktopBackground; #endif -static QPixmap * g_pIccMemBuffer = 0; +static TQPixmap * g_pIccMemBuffer = 0; static KviPointerList<KviToolBarGraphicalApplet> * g_pToolBarGraphicalAppletList = 0; -KviToolBarGraphicalApplet::KviToolBarGraphicalApplet(QWidget * par,const char * name) -: QToolButton(par,name) +KviToolBarGraphicalApplet::KviToolBarGraphicalApplet(TQWidget * par,const char * name) +: TQToolButton(par,name) { if(!g_pToolBarGraphicalAppletList) { g_pToolBarGraphicalAppletList = new KviPointerList<KviToolBarGraphicalApplet>(); g_pToolBarGraphicalAppletList->setAutoDelete(false); - g_pIccMemBuffer = new QPixmap(1,1); + g_pIccMemBuffer = new TQPixmap(1,1); } g_pToolBarGraphicalAppletList->append(this); #ifdef COMPILE_USE_QT4 setAutoFillBackground(false); #else - setBackgroundMode(QWidget::NoBackground); + setBackgroundMode(TQWidget::NoBackground); #endif setMouseTracking(true); m_bResizeMode = false; - m_sizeHint = QSize(180,32); + m_tqsizeHint = TQSize(180,32); m_bSizeLoaded = false; } @@ -95,16 +95,16 @@ void KviToolBarGraphicalApplet::saveAppletWidth(unsigned int uWidth) void KviToolBarGraphicalApplet::setupSizeHint() { - m_sizeHint = QSize(loadAppletWidth(),22); + m_tqsizeHint = TQSize(loadAppletWidth(),22); m_bSizeLoaded = true; } -QSize KviToolBarGraphicalApplet::sizeHint() const +TQSize KviToolBarGraphicalApplet::tqsizeHint() const { // forget constness :( KviToolBarGraphicalApplet * that = (KviToolBarGraphicalApplet *)this; if(!m_bSizeLoaded)that->setupSizeHint(); - return m_sizeHint; + return m_tqsizeHint; } /* @@ -118,7 +118,7 @@ toolbar.define(default) */ -void KviToolBarGraphicalApplet::mouseMoveEvent(QMouseEvent * e) +void KviToolBarGraphicalApplet::mouseMoveEvent(TQMouseEvent * e) { if(e->state() & Qt::LeftButton) { @@ -127,19 +127,19 @@ void KviToolBarGraphicalApplet::mouseMoveEvent(QMouseEvent * e) int w = e->pos().x(); if(w < 32)w = 32; if(w > 480)w = 480; - m_sizeHint = QSize(w,22); + m_tqsizeHint = TQSize(w,22); resize(w,height()); - g_pApp->postEvent(parentWidget(),new QEvent(QEvent::LayoutHint)); + g_pApp->postEvent(tqparentWidget(),new TQEvent(TQEvent::LayoutHint)); } } else { if(e->pos().x() > width() - 4) - setCursor(Qt::sizeHorCursor); + setCursor(TQt::sizeHorCursor); else - setCursor(Qt::arrowCursor); + setCursor(TQt::arrowCursor); } } -void KviToolBarGraphicalApplet::mousePressEvent(QMouseEvent * e) +void KviToolBarGraphicalApplet::mousePressEvent(TQMouseEvent * e) { if(e->button() & Qt::LeftButton) { @@ -147,7 +147,7 @@ void KviToolBarGraphicalApplet::mousePressEvent(QMouseEvent * e) } } -void KviToolBarGraphicalApplet::mouseReleaseEvent(QMouseEvent * e) +void KviToolBarGraphicalApplet::mouseReleaseEvent(TQMouseEvent * e) { m_bResizeMode = false; } @@ -155,7 +155,7 @@ void KviToolBarGraphicalApplet::mouseReleaseEvent(QMouseEvent * e) KviToolBarGraphicalApplet::~KviToolBarGraphicalApplet() { - saveAppletWidth(m_sizeHint.width()); + saveAppletWidth(m_tqsizeHint.width()); g_pToolBarGraphicalAppletList->removeRef(this); if(g_pToolBarGraphicalAppletList->isEmpty()) { @@ -181,22 +181,22 @@ void KviToolBarGraphicalApplet::resizeMemBuffer() g_pIccMemBuffer->resize(uMaxW,uMaxH); } -void KviToolBarGraphicalApplet::paintEvent(QPaintEvent *e) +void KviToolBarGraphicalApplet::paintEvent(TQPaintEvent *e) { if(!isVisible())return; - QPainter pa(g_pIccMemBuffer); + TQPainter pa(g_pIccMemBuffer); #ifdef COMPILE_PSEUDO_TRANSPARENCY if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = mapToGlobal(QPoint(0,0)); + TQPoint pnt = mapToGlobal(TQPoint(0,0)); pa.drawTiledPixmap(e->rect().left(),e->rect().top(),e->rect().width(),e->rect().height(),*g_pShadedChildGlobalDesktopBackground,pnt.x(),pnt.y()); } else { #endif if(KVI_OPTION_PIXMAP(KviOption_pixmapIrcToolBarAppletBackground).pixmap()) { - QPoint pnt = mapToGlobal(QPoint(0,0)); + TQPoint pnt = mapToGlobal(TQPoint(0,0)); pa.drawTiledPixmap(e->rect().left(),e->rect().top(),e->rect().width(),e->rect().height(),*(KVI_OPTION_PIXMAP(KviOption_pixmapIrcToolBarAppletBackground).pixmap()),pnt.x(),pnt.y()); } else { pa.fillRect(e->rect().left(),e->rect().top(),e->rect().width(),e->rect().height(),KVI_OPTION_COLOR(KviOption_colorIrcToolBarAppletBackground)); @@ -208,27 +208,27 @@ void KviToolBarGraphicalApplet::paintEvent(QPaintEvent *e) drawContents(&pa); //Need to draw the sunken rect around the view now... - pa.setPen(colorGroup().dark()); + pa.setPen(tqcolorGroup().dark()); pa.drawLine(0,0,width(),0); pa.drawLine(0,0,0,width()); - pa.setPen(colorGroup().light()); + pa.setPen(tqcolorGroup().light()); pa.drawLine(1,height() - 1,width() - 1,height() - 1); pa.drawLine(width() - 1,1,width() - 1,height()); #ifdef COMPILE_USE_QT4 - QPainter qt4SucksBecauseItNeedsAnAdditionalQPainter(this); - qt4SucksBecauseItNeedsAnAdditionalQPainter.drawPixmap(e->rect().left(),e->rect().top(),e->rect().width(),e->rect().height(),*g_pIccMemBuffer,e->rect().left(),e->rect().top(),e->rect().width(),e->rect().height()); + TQPainter qt4SucksBecauseItNeedsAnAdditionalTQPainter(this); + qt4SucksBecauseItNeedsAnAdditionalTQPainter.drawPixmap(e->rect().left(),e->rect().top(),e->rect().width(),e->rect().height(),*g_pIccMemBuffer,e->rect().left(),e->rect().top(),e->rect().width(),e->rect().height()); #else - bitBlt(this,e->rect().left(),e->rect().top(),g_pIccMemBuffer,e->rect().left(),e->rect().top(),e->rect().width(),e->rect().height(),Qt::CopyROP); + bitBlt(this,e->rect().left(),e->rect().top(),g_pIccMemBuffer,e->rect().left(),e->rect().top(),e->rect().width(),e->rect().height(),TQt::CopyROP); #endif } -void KviToolBarGraphicalApplet::drawContents(QPainter *) +void KviToolBarGraphicalApplet::drawContents(TQPainter *) { // nothing here } -void KviToolBarGraphicalApplet::resizeEvent(QResizeEvent *e) +void KviToolBarGraphicalApplet::resizeEvent(TQResizeEvent *e) { unsigned int uBufferW = g_pIccMemBuffer->width(); unsigned int uBufferH = g_pIccMemBuffer->height(); @@ -253,11 +253,11 @@ void KviToolBarGraphicalApplet::resizeEvent(QResizeEvent *e) // ////////////////////////////////////////////////////////////////////////////// -KviIrcContextDisplay::KviIrcContextDisplay(QWidget * par,const char * name) +KviIrcContextDisplay::KviIrcContextDisplay(TQWidget * par,const char * name) : KviToolBarGraphicalApplet(par,name) { KviDynamicToolTip * tip = new KviDynamicToolTip(this); - connect(tip,SIGNAL(tipRequest(KviDynamicToolTip *,const QPoint &)),this,SLOT(tipRequest(KviDynamicToolTip *,const QPoint &))); + connect(tip,TQT_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQT_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); } @@ -265,15 +265,15 @@ KviIrcContextDisplay::~KviIrcContextDisplay() { } -void KviIrcContextDisplay::tipRequest(KviDynamicToolTip * tip,const QPoint &) +void KviIrcContextDisplay::tipRequest(KviDynamicToolTip * tip,const TQPoint &) { - QString txt; + TQString txt; KviConsole * c = g_pActiveWindow->console(); - static QString b = "<b>"; - static QString nb = "</b>"; - static QString br = "<br>"; + static TQString b = "<b>"; + static TQString nb = "</b>"; + static TQString br = "<br>"; if(c) { @@ -297,14 +297,14 @@ void KviIrcContextDisplay::tipRequest(KviDynamicToolTip * tip,const QPoint &) txt += br; } - QString szNum; + TQString szNum; szNum.setNum(c->ircContextId()); - QString szIrcContext = QChar('('); + TQString szIrcContext = TQChar('('); szIrcContext += __tr2qs("IRC Context"); - szIrcContext += QChar(' '); + szIrcContext += TQChar(' '); szIrcContext += szNum; - szIrcContext += QChar(')'); + szIrcContext += TQChar(')'); txt += szIrcContext; if(ic && ic->lagMeter() && (KVI_OPTION_BOOL(KviOption_boolShowLagOnContextDisplay))) @@ -316,7 +316,7 @@ void KviIrcContextDisplay::tipRequest(KviDynamicToolTip * tip,const QPoint &) int llls = lll / 1000; int llld = (lll % 1000) / 100; int lllc = (lll % 100) / 10; - KviQString::appendFormatted(txt,__tr2qs("Lag: %d.%d%d"),llls,llld,lllc); + KviTQString::appendFormatted(txt,__tr2qs("Lag: %d.%d%d"),llls,llld,lllc); } else { txt += __tr2qs("Lag: ?.??"); } @@ -332,15 +332,15 @@ void KviIrcContextDisplay::tipRequest(KviDynamicToolTip * tip,const QPoint &) /* -QSize KviIrcContextDisplay::sizeHint() const +TQSize KviIrcContextDisplay::tqsizeHint() const { - return QSize(160,22); + return TQSize(160,22); } */ #define KVI_APPLETIRCCONTEXTINDICATORWIDTH 12 -void KviIrcContextDisplay::drawContents(QPainter * p) +void KviIrcContextDisplay::drawContents(TQPainter * p) { // The context indicator KviWindow * wnd = g_pActiveWindow; @@ -348,8 +348,8 @@ void KviIrcContextDisplay::drawContents(QPainter * p) if(c) { - QString serv,nick; - QString tmp; + TQString serv,nick; + TQString tmp; if(!c->connection()) { serv = __tr2qs("Not connected"); @@ -360,22 +360,22 @@ void KviIrcContextDisplay::drawContents(QPainter * p) nick = ic->currentNickName(); if(!ic->userInfo()->userMode().isEmpty()) { - static QString spp(" (+"); + static TQString spp(" (+"); nick += spp; nick += ic->userInfo()->userMode(); if(ic->userInfo()->isAway()) { - nick += QChar(' '); + nick += TQChar(' '); nick += __tr2qs("away"); } - nick += QChar(')'); + nick += TQChar(')'); } else { if(ic->userInfo()->isAway()) { - static QString ugly(" ("); + static TQString ugly(" ("); nick += ugly; nick += __tr2qs("away"); - nick += QChar(')'); + nick += TQChar(')'); } } serv = ic->currentServerName(); @@ -388,7 +388,7 @@ void KviIrcContextDisplay::drawContents(QPainter * p) int llls = lll / 1000; int llld = (lll % 1000) / 100; int lllc = (lll % 100) / 10; - KviQString::appendFormatted(nick,__tr2qs("Lag: %d.%d%d"),llls,llld,lllc); + KviTQString::appendFormatted(nick,__tr2qs("Lag: %d.%d%d"),llls,llld,lllc); } else { nick += __tr2qs("Lag: ?.??"); } @@ -404,10 +404,10 @@ void KviIrcContextDisplay::drawContents(QPainter * p) if(height() < 30) { - static QString xxx(" ["); + static TQString xxx(" ["); serv += xxx; serv += nick; - serv += QChar(']'); + serv += TQChar(']'); p->drawText(KVI_APPLETIRCCONTEXTINDICATORWIDTH + 4,16,serv,serv.length()); } else { p->drawText(KVI_APPLETIRCCONTEXTINDICATORWIDTH + 4,16,serv,serv.length()); @@ -416,8 +416,8 @@ void KviIrcContextDisplay::drawContents(QPainter * p) p->setClipping(false); - QColor base = colorGroup().background(); - QColor cntx = KVI_OPTION_ICCOLOR(c->ircContextId() % KVI_NUM_ICCOLOR_OPTIONS); + TQColor base = tqcolorGroup().background(); + TQColor cntx = KVI_OPTION_ICCOLOR(c->ircContextId() % KVI_NUM_ICCOLOR_OPTIONS); base.setRgb((base.red() + cntx.red()) >> 1,(base.green() + cntx.green()) >> 1, (base.blue() + cntx.blue()) >> 1); diff --git a/src/kvirc/ui/kvi_irctoolbar.h b/src/kvirc/ui/kvi_irctoolbar.h index a903065..dd6c93e 100644 --- a/src/kvirc/ui/kvi_irctoolbar.h +++ b/src/kvirc/ui/kvi_irctoolbar.h @@ -30,10 +30,10 @@ #include "kvi_console.h" #include "kvi_pointerlist.h" -#include <qwidget.h> -#include <qtoolbutton.h> +#include <tqwidget.h> +#include <tqtoolbutton.h> #include "kvi_tal_widgetstack.h" -#include <qlabel.h> +#include <tqlabel.h> class KviTalPopupMenu; @@ -45,16 +45,17 @@ class KviTalPopupMenu; // Can be a child of any AppletContainer // -class KVIRC_API KviToolBarGraphicalApplet : public QToolButton +class KVIRC_API KviToolBarGraphicalApplet : public TQToolButton { Q_OBJECT + TQ_OBJECT public: - KviToolBarGraphicalApplet(QWidget * par,const char * name = 0); + KviToolBarGraphicalApplet(TQWidget * par,const char * name = 0); ~KviToolBarGraphicalApplet(); private: bool m_bResizeMode; bool m_bSizeLoaded; - QSize m_sizeHint; + TQSize m_tqsizeHint; private: void resizeMemBuffer(); protected: @@ -62,14 +63,14 @@ protected: virtual unsigned int loadAppletWidth(); virtual void saveAppletWidth(unsigned int uWidth); - virtual QSize sizeHint() const; - virtual void mouseMoveEvent(QMouseEvent *e); - virtual void mousePressEvent(QMouseEvent *e); - virtual void mouseReleaseEvent(QMouseEvent *e); - - virtual void paintEvent(QPaintEvent *e); - virtual void drawContents(QPainter * p); - virtual void resizeEvent(QResizeEvent *e); + virtual TQSize tqsizeHint() const; + virtual void mouseMoveEvent(TQMouseEvent *e); + virtual void mousePressEvent(TQMouseEvent *e); + virtual void mouseReleaseEvent(TQMouseEvent *e); + + virtual void paintEvent(TQPaintEvent *e); + virtual void drawContents(TQPainter * p); + virtual void resizeEvent(TQResizeEvent *e); }; @@ -78,13 +79,14 @@ class KviDynamicToolTip; class KVIRC_API KviIrcContextDisplay : public KviToolBarGraphicalApplet { Q_OBJECT + TQ_OBJECT public: - KviIrcContextDisplay(QWidget * par,const char * name = 0); + KviIrcContextDisplay(TQWidget * par,const char * name = 0); ~KviIrcContextDisplay(); protected: - virtual void drawContents(QPainter * p); + virtual void drawContents(TQPainter * p); protected slots: - void tipRequest(KviDynamicToolTip * tip,const QPoint &); + void tipRequest(KviDynamicToolTip * tip,const TQPoint &); }; diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp index e09edee..330ae09 100644 --- a/src/kvirc/ui/kvi_ircview.cpp +++ b/src/kvirc/ui/kvi_ircview.cpp @@ -61,7 +61,7 @@ // 25 Sep 2001 // This stuff is going to be ported to Windoze -// A conditionally compiled code will use only Qt calls...let's see :) +// A conditionally compiled code will use only TQt calls...let's see :) // @@ -108,47 +108,43 @@ #include "kvi_qcstring.h" // FIXME: #warning "There should be an option to preserve control codes in copied text (clipboard) (mIrc = CTRL+Copy->with colors)" -#include <qbitmap.h> -#include <qpainter.h> -#include <qregexp.h> -#include <qfile.h> -#include <qtoolbutton.h> -#include <qfontmetrics.h> // needed -#include <qapplication.h> +#include <tqbitmap.h> +#include <tqpainter.h> +#include <tqregexp.h> +#include <tqfile.h> +#include <tqtoolbutton.h> +#include <tqfontmetrics.h> // needed +#include <tqapplication.h> #include "kvi_tal_popupmenu.h" -#include <qmessagebox.h> -#include <qtextcodec.h> -#include <qdatetime.h> -#include <qevent.h> +#include <tqmessagebox.h> +#include <tqtextcodec.h> +#include <tqdatetime.h> +#include <tqevent.h> -//#include <qcolor.h> // needed +//#include <tqcolor.h> // needed // FIXME: #warning "There are problems with the selection and wrapped lines: you can select something on the first line and get the second highlighted" // FIXME: #warning "This hack is temporary...later remove it" -#if QT_VERSION >= 300 - #ifndef QT_CLEAN_NAMESPACE - #define QT_CLEAN_NAMESPACE - #include <qcursor.h> - #undef QT_CLEAN_NAMESPACE - #else - #include <qcursor.h> - #endif +#ifndef TQT_CLEAN_NAMESPACE + #define TQT_CLEAN_NAMESPACE + #include <tqcursor.h> + #undef TQT_CLEAN_NAMESPACE #else - #include <qcursor.h> + #include <tqcursor.h> #endif -#include <qclipboard.h> -#include <qdatetime.h> -#include <qmessagebox.h> -#include <qscrollbar.h> -#include <qfontdialog.h> +#include <tqclipboard.h> +#include <tqdatetime.h> +#include <tqmessagebox.h> +#include <tqscrollbar.h> +#include <tqfontdialog.h> #include <time.h> #ifdef COMPILE_USE_QT4 - #include <q3mimefactory.h> - #define QMimeSourceFactory Q3MimeSourceFactory + #include <tq3mimefactory.h> + #define TQMimeSourceFactory Q3MimeSourceFactory #endif @@ -169,7 +165,7 @@ #define KVI_DEF_BACK 200 -// FIXME: #warning "The scrollbar should NOT have a fixed size : the KDE styles can configure the size (sizeHint() ?)" +// FIXME: #warning "The scrollbar should NOT have a fixed size : the KDE styles can configure the size (tqsizeHint() ?)" // // FIXME: PgUp and PgDn scrolls a fixed number of lines! @@ -189,7 +185,7 @@ #ifdef COMPILE_PSEUDO_TRANSPARENCY - extern QPixmap * g_pShadedChildGlobalDesktopBackground; + extern TQPixmap * g_pShadedChildGlobalDesktopBackground; #endif @@ -207,7 +203,7 @@ #define KVI_IRCVIEW_HORIZONTAL_BORDER 4 #define KVI_IRCVIEW_VERTICAL_BORDER 4 // A little bit more than the scroll-bar... -// Qt+X have strange interactions that I can not understand when I try to move the splitter +// TQt+X have strange interactions that I can not understand when I try to move the splitter // to the maximum on the left , Maybe the cache pixmap size becomes negative ? (I don't think so) // Anyway , when the scroll bar position becomes negative (or the IrcView has smaller width than // the scroll bar) X aborts with a funny @@ -238,25 +234,25 @@ #define KVI_IRCVIEW_ESCAPE_TAG_GENERICESCAPE '[' // FIXME: Get rid of this!!!!!!!!! -#define WSTRINGCONFIG_SAFE_TO_MEMCPY_QCHAR +#define WSTRINGCONFIG_SAFE_TO_MEMCPY_TQCHAR #define _WSTRING_WMEMCPY(_dst,_src,_len) kvi_fastmoveodd((void *)(_dst),(const void *)(_src),sizeof(kvi_wchar_t) * (_len)) -void kvi_appendWCharToQStringWithLength(QString * qstrptr,const kvi_wchar_t * ptr,kvi_wslen_t len) +void kvi_appendWCharToTQStringWithLength(TQString * qstrptr,const kvi_wchar_t * ptr,kvi_wslen_t len) { kvi_wslen_t oldLen = qstrptr->length(); qstrptr->setLength(oldLen + len); - #ifdef WSTRINGCONFIG_SAFE_TO_MEMCPY_QCHAR - _WSTRING_WMEMCPY(qstrptr->unicode() + oldLen,ptr,len); - #else // !WSTRINGCONFIG_SAFE_TO_MEMCPY_QCHAR - QChar * c = (qstrptr->unicode() + oldLen); + #ifdef WSTRINGCONFIG_SAFE_TO_MEMCPY_TQCHAR + _WSTRING_WMEMCPY(qstrptr->tqunicode() + oldLen,ptr,len); + #else // !WSTRINGCONFIG_SAFE_TO_MEMCPY_TQCHAR + TQChar * c = (qstrptr->tqunicode() + oldLen); while(*ptr) { - c->unicode() = *ptr; + c->tqunicode() = *ptr; ptr++; c++; } - #endif // !WSTRINGCONFIG_SAFE_TO_MEMCPY_QCHAR + #endif // !WSTRINGCONFIG_SAFE_TO_MEMCPY_TQCHAR } @@ -285,16 +281,16 @@ void kvi_appendWCharToQStringWithLength(QString * qstrptr,const kvi_wchar_t * pt // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -KviIrcView::KviIrcView(QWidget *parent,KviFrame *pFrm,KviWindow *pWnd) -: QWidget(parent,"irc_view") +KviIrcView::KviIrcView(TQWidget *tqparent,KviFrame *pFrm,KviWindow *pWnd) +: TQWidget(tqparent,"irc_view") { // Ok...here we go // initialize the initializable #ifdef COMPILE_USE_QT4 - setAttribute(Qt::WA_NoSystemBackground); // This disables automatic qt double buffering - setAttribute(Qt::WA_OpaquePaintEvent); - //setAttribute(Qt::WA_PaintOnScreen); // disable qt backing store (that would force us to trigger repaint() instead of the 10 times faster paintEvent(0)) + setAttribute(TQt::WA_NoSystemBackground); // This disables automatic qt double buffering + setAttribute(TQt::WA_OpaquePaintEvent); + //setAttribute(TQt::WA_PaintOnScreen); // disable qt backing store (that would force us to trigger tqrepaint() instead of the 10 times faster paintEvent(0)) #endif m_iFlushTimer = 0; @@ -350,7 +346,7 @@ KviIrcView::KviIrcView(QWidget *parent,KviFrame *pFrm,KviWindow *pWnd) m_pMessagesStoppedWhileSelecting = new KviPointerList<KviIrcViewLine>; m_pMessagesStoppedWhileSelecting->setAutoDelete(false); - // say qt to avoid erasing on repaint + // say qt to avoid erasing on tqrepaint #ifdef COMPILE_USE_QT4 setAutoFillBackground(false); #else @@ -363,9 +359,9 @@ KviIrcView::KviIrcView(QWidget *parent,KviFrame *pFrm,KviWindow *pWnd) // Create the scroll bar #ifdef COMPILE_USE_QT4 - m_pScrollBar = new QScrollBar(0,0,1,10,0,Qt::Vertical,this,"irc_view_scrollbar"); + m_pScrollBar = new TQScrollBar(0,0,1,10,0,Qt::Vertical,this,"irc_view_scrollbar"); #else - m_pScrollBar = new QScrollBar(0,0,1,10,0,QScrollBar::Vertical,this,"irc_view_scrollbar"); + m_pScrollBar = new TQScrollBar(0,0,1,10,0,Qt::Vertical,this,"irc_view_scrollbar"); #endif m_pScrollBar->setTracking(true); m_pScrollBar->show(); @@ -375,20 +371,20 @@ KviIrcView::KviIrcView(QWidget *parent,KviFrame *pFrm,KviWindow *pWnd) m_pToolsButton = new KviStyledToolButton(this,"btntools"); #ifdef COMPILE_USE_QT4 - QIcon is1(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_POPUPMENU))); + TQIcon is1(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_POPUPMENU))); m_pToolsButton->setAutoRaise(true); #else - QIconSet is1(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_POPUPMENU)),QIconSet::Small); + TQIconSet is1(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_POPUPMENU)),TQIconSet::Small); #endif m_pToolsButton->setIconSet(is1); KviTalToolTip::add(m_pToolsButton,__tr2qs("Search tools")); m_pToolsButton->setFocusProxy(this); - connect(m_pToolsButton,SIGNAL(clicked()),this,SLOT(showToolsPopup())); + connect(m_pToolsButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(showToolsPopup())); m_pToolsButton->show(); - connect(m_pScrollBar,SIGNAL(valueChanged(int)),this,SLOT(scrollBarPositionChanged(int))); + connect(m_pScrollBar,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(scrollBarPositionChanged(int))); m_iLastScrollBarValue = 0; // set the minimum width @@ -454,7 +450,7 @@ KviIrcView::~KviIrcView() // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -void KviIrcView::setFont(const QFont &f) +void KviIrcView::setFont(const TQFont &f) { if(m_pFm) { @@ -468,7 +464,7 @@ void KviIrcView::setFont(const QFont &f) l->iMaxLineWidth = -1; l = l->pNext; } - QWidget::setFont(f); + TQWidget::setFont(f); update(); } @@ -496,27 +492,27 @@ void KviIrcView::enableDnd(bool bEnable) m_bAcceptDrops = bEnable; } -void KviIrcView::dragEnterEvent(QDragEnterEvent *e) +void KviIrcView::dragEnterEvent(TQDragEnterEvent *e) { if(!m_bAcceptDrops)return; e->accept(KviUriDrag::canDecode(e)); emit dndEntered(); } -void KviIrcView::dropEvent(QDropEvent *e) +void KviIrcView::dropEvent(TQDropEvent *e) { if(!m_bAcceptDrops)return; - QStringList list; + TQStringList list; if(KviUriDrag::decodeLocalFiles(e,list)) { if(!list.isEmpty()) { - QStringList::ConstIterator it = list.begin(); //kewl ! :) + TQStringList::ConstIterator it = list.begin(); //kewl ! :) for( ; it != list.end(); ++it ) { - QString tmp = *it; //wow :) + TQString tmp = *it; //wow :) #ifndef COMPILE_ON_WINDOWS - if(tmp[0] != '/')tmp.prepend("/"); //HACK HACK HACK for Qt bug (?!?) + if(tmp[0] != '/')tmp.prepend("/"); //HACK HACK HACK for TQt bug (?!?) #endif emit fileDropped(tmp); } @@ -535,8 +531,8 @@ void KviIrcView::stopLogging() { if(m_pLogFile) { - QString szLogEnd; - szLogEnd.sprintf(__tr2qs("### Log session terminated at %s ###"),QDateTime::currentDateTime().toString().utf8().data()); + TQString szLogEnd; + szLogEnd.sprintf(__tr2qs("### Log session terminated at %s ###"),TQDateTime::tqcurrentDateTime().toString().utf8().data()); add2Log(szLogEnd); m_pLogFile->close(); @@ -545,12 +541,12 @@ void KviIrcView::stopLogging() { if(m_pLogFile->open(IO_ReadOnly)) { - QByteArray bytes; + TQByteArray bytes; bytes=m_pLogFile->readAll(); m_pLogFile->close(); - QFileInfo fi(*m_pLogFile); - QString szFname=fi.dirPath(true)+QString("/")+fi.baseName(true); - gzFile file=gzopen(QTextCodec::codecForLocale()->fromUnicode(szFname).data(),"ab9"); + TQFileInfo fi(*m_pLogFile); + TQString szFname=fi.dirPath(true)+TQString("/")+fi.baseName(true); + gzFile file=gzopen(TQTextCodec::codecForLocale()->fromUnicode(szFname).data(),"ab9"); if(file) { gzwrite(file,bytes.data(),bytes.size()); @@ -572,12 +568,12 @@ void KviIrcView::getLogFileName(KviStr &buffer) if(m_pLogFile)buffer.append(m_pLogFile->name()); } -void KviIrcView::getLogFileName(QString &buffer) +void KviIrcView::getLogFileName(TQString &buffer) { if(m_pLogFile) buffer=m_pLogFile->name(); } -void KviIrcView::getTextBuffer(QString &buffer) +void KviIrcView::getTextBuffer(TQString &buffer) { // FIXME: #warning "This does not merge the KviChannel::m_pMessageView buffer!" buffer = ""; @@ -598,12 +594,12 @@ void KviIrcView::flushLog() m_pLogFile->close(); if(m_pLogFile->open(IO_ReadOnly)) { - QByteArray bytes; + TQByteArray bytes; bytes=m_pLogFile->readAll(); m_pLogFile->close(); - QFileInfo fi(*m_pLogFile); - QString szFname=fi.dirPath(true)+QString("/")+fi.baseName(true); - gzFile file=gzopen(QTextCodec::codecForLocale()->fromUnicode(szFname).data(),"ab9"); + TQFileInfo fi(*m_pLogFile); + TQString szFname=fi.dirPath(true)+TQString("/")+fi.baseName(true); + gzFile file=gzopen(TQTextCodec::codecForLocale()->fromUnicode(szFname).data(),"ab9"); if(file) { gzwrite(file,bytes.data(),bytes.size()); @@ -621,7 +617,7 @@ void KviIrcView::flushLog() else if(m_pMasterView)m_pMasterView->flushLog(); } -const QString & KviIrcView::lastMessageText() +const TQString & KviIrcView::lastMessageText() { KviIrcViewLine * pCur=m_pLastLine; while(pCur) @@ -640,12 +636,12 @@ const QString & KviIrcView::lastMessageText() } pCur=pCur->pPrev; } - return KviQString::empty; + return KviTQString::empty; } -const QString & KviIrcView::lastLineOfText() +const TQString & KviIrcView::lastLineOfText() { - if(!m_pLastLine)return KviQString::empty; + if(!m_pLastLine)return KviTQString::empty; return m_pLastLine->szText; } @@ -664,9 +660,9 @@ const QString & KviIrcView::lastLineOfText() void KviIrcView::setMasterView(KviIrcView * v) { - if(m_pMasterView)disconnect(this,SLOT(masterDead())); + if(m_pMasterView)disconnect(this,TQT_SLOT(masterDead())); m_pMasterView = v; - if(m_pMasterView)connect(m_pMasterView,SIGNAL(destroyed()),this,SLOT(masterDead())); + if(m_pMasterView)connect(m_pMasterView,TQT_SIGNAL(destroyed()),this,TQT_SLOT(masterDead())); } void KviIrcView::masterDead() @@ -674,10 +670,10 @@ void KviIrcView::masterDead() m_pMasterView = 0; } -bool KviIrcView::startLogging(const QString& fname,bool bPrependCurBuffer) +bool KviIrcView::startLogging(const TQString& fname,bool bPrependCurBuffer) { stopLogging(); - QString szFname(fname); + TQString szFname(fname); if(fname.isEmpty()) { @@ -690,7 +686,7 @@ bool KviIrcView::startLogging(const QString& fname,bool bPrependCurBuffer) szFname+=".tmp"; #endif - m_pLogFile = new QFile(szFname); + m_pLogFile = new TQFile(szFname); if(m_pLogFile->exists()) { @@ -709,13 +705,13 @@ bool KviIrcView::startLogging(const QString& fname,bool bPrependCurBuffer) } } - QString szLogStart; - szLogStart.sprintf(__tr2qs("### Log session started at %s ###"),QDateTime::currentDateTime().toString().utf8().data()); + TQString szLogStart; + szLogStart.sprintf(__tr2qs("### Log session started at %s ###"),TQDateTime::tqcurrentDateTime().toString().utf8().data()); add2Log(szLogStart); if(bPrependCurBuffer) { add2Log(__tr2qs("### Existing data buffer:")); - QString buffer; + TQString buffer; getTextBuffer(buffer); add2Log(buffer); add2Log(__tr2qs("### End of existing data buffer.")); @@ -725,10 +721,10 @@ bool KviIrcView::startLogging(const QString& fname,bool bPrependCurBuffer) return true; } -void KviIrcView::add2Log(const QString &szBuffer,int iMsgType) +void KviIrcView::add2Log(const TQString &szBuffer,int iMsgType) { - QString szToWrite=QString("%1 %2\n").arg(iMsgType).arg(szBuffer); - KviQCString szTmp = KviQString::toUtf8(szToWrite); + TQString szToWrite=TQString("%1 %2\n").tqarg(iMsgType).tqarg(szBuffer); + KviTQCString szTmp = KviTQString::toUtf8(szToWrite); if(m_pLogFile->writeBlock(szTmp.data(),szTmp.length())==-1) debug("WARNING : Can not write to the log file."); } @@ -762,11 +758,11 @@ void KviIrcView::clearBuffer() bool KviIrcView::saveBuffer(const char *filename) { - QFile f(QString::fromUtf8(filename)); + TQFile f(TQString::fromUtf8(filename)); if(!f.open(IO_WriteOnly|IO_Truncate))return false; - QString tmp; + TQString tmp; getTextBuffer(tmp); - KviQCString tmpx = KviQString::toUtf8(tmp); + KviTQCString tmpx = KviTQString::toUtf8(tmp); f.writeBlock(tmpx.data(),tmpx.length()); f.close(); return true; @@ -777,14 +773,14 @@ void KviIrcView::nextLine(){ m_pScrollBar->addLine(); } void KviIrcView::prevPage(){ m_pScrollBar->subtractPage(); } void KviIrcView::nextPage(){ m_pScrollBar->addPage(); } -void KviIrcView::setPrivateBackgroundPixmap(const QPixmap &pixmap,bool bRepaint) +void KviIrcView::setPrivateBackgroundPixmap(const TQPixmap &pixmap,bool bRepaint) { if(m_pPrivateBackgroundPixmap) { delete m_pPrivateBackgroundPixmap; m_pPrivateBackgroundPixmap=0; } - if(!pixmap.isNull())m_pPrivateBackgroundPixmap = new QPixmap(pixmap); + if(!pixmap.isNull())m_pPrivateBackgroundPixmap = new TQPixmap(pixmap); if(bRepaint) update(); @@ -807,7 +803,7 @@ void KviIrcView::clearLineMark(bool bRepaint) void KviIrcView::checkLogDate() { - QDate::currentDate(); + TQDate::tqcurrentDate(); } void KviIrcView::clearUnreaded() @@ -904,31 +900,31 @@ void KviIrcView::scrollBarPositionChanged(int newValue) } } if(!m_bSkipScrollBarRepaint) - repaint(); + tqrepaint(); //update(); // if(!m_bSkipScrollBarRepaint)postUpdateEvent(); } -bool KviIrcView::event(QEvent *e) +bool KviIrcView::event(TQEvent *e) { - if(e->type() == QEvent::User) + if(e->type() == TQEvent::User) { __range_valid(m_bPostedPaintEventPending); if(m_iUnprocessedPaintEventRequests) - repaint(); + tqrepaint(); // else we just had a pointEvent that did the job m_bPostedPaintEventPending = false; return true; } - return QWidget::event(e); + return TQWidget::event(e); } -void KviIrcView::wheelEvent(QWheelEvent *e) +void KviIrcView::wheelEvent(TQWheelEvent *e) { #ifdef COMPILE_USE_QT4 static bool bHere = false; if(bHere)return; - bHere = true; // Qt4 tends to jump into infinite recursion here + bHere = true; // TQt4 tends to jump into infinite recursion here #endif g_pApp->sendEvent(m_pScrollBar,e); #ifdef COMPILE_USE_QT4 @@ -939,12 +935,12 @@ void KviIrcView::wheelEvent(QWheelEvent *e) void KviIrcView::postUpdateEvent() { - // This will post a QEvent with a full repaint request + // This will post a TQEvent with a full tqrepaint request if(!m_bPostedPaintEventPending) { m_bPostedPaintEventPending = true; - QEvent *e = new QEvent(QEvent::User); - g_pApp->postEvent(this,e); // queue a repaint + TQEvent *e = new TQEvent(TQEvent::User); + g_pApp->postEvent(this,e); // queue a tqrepaint } m_iUnprocessedPaintEventRequests++; // paintEvent() will set it to 0 @@ -960,7 +956,7 @@ void KviIrcView::postUpdateEvent() fastScroll(3); #endif else - repaint(); + tqrepaint(); } } @@ -1097,7 +1093,7 @@ void KviIrcView::removeHeadLine(bool bRepaint) m_pLastLine = 0; } if(bRepaint) - repaint(); + tqrepaint(); } void KviIrcView::splitMessagesTo(KviIrcView *v) @@ -1154,12 +1150,12 @@ void KviIrcView::splitMessagesTo(KviIrcView *v) m_pScrollBar->setRange(0,m_iNumLines); m_pScrollBar->setValue(m_iNumLines); - repaint(); + tqrepaint(); v->m_iLastScrollBarValue = v->m_iNumLines; v->m_pScrollBar->setRange(0,v->m_iNumLines); v->m_pScrollBar->setValue(v->m_iNumLines); - v->repaint(); + v->tqrepaint(); } @@ -1187,7 +1183,7 @@ void KviIrcView::appendMessagesFrom(KviIrcView *v) m_pScrollBar->setRange(0,m_iNumLines); m_pScrollBar->setValue(m_iNumLines); - repaint(); + tqrepaint(); } void KviIrcView::joinMessagesFrom(KviIrcView *v) @@ -1247,7 +1243,7 @@ void KviIrcView::joinMessagesFrom(KviIrcView *v) m_pScrollBar->setRange(0,m_iNumLines); m_pScrollBar->setValue(m_iNumLines); - repaint(); + tqrepaint(); } void KviIrcView::appendText(int iMsgType,const kvi_wchar_t *data_ptr,int iFlags) @@ -1266,9 +1262,9 @@ void KviIrcView::appendText(int iMsgType,const kvi_wchar_t *data_ptr,int iFlags) if(!KVI_OPTION_BOOL(KviOption_boolStripControlCodesInLogs)) { - QString szBuffer; - kvi_appendWCharToQStringWithLength(&szBuffer,data_ptr,kvi_wstrlen(data_ptr)); - szBuffer.prepend(QDateTime::currentDateTime().toString("[h:mm:ss] ")); + TQString szBuffer; + kvi_appendWCharToTQStringWithLength(&szBuffer,data_ptr,kvi_wstrlen(data_ptr)); + szBuffer.prepend(TQDateTime::tqcurrentDateTime().toString("[h:mm:ss] ")); if(m_pLogFile && KVI_OPTION_MSGTYPE(iMsgType).logEnabled()) { add2Log(szBuffer,iMsgType); @@ -1303,15 +1299,15 @@ void KviIrcView::appendText(int iMsgType,const kvi_wchar_t *data_ptr,int iFlags) } -void KviIrcView::getLinkEscapeCommand(QString &buffer,const QString &szPayload,const QString &escape_label) +void KviIrcView::getLinkEscapeCommand(TQString &buffer,const TQString &szPayload,const TQString &escape_label) { if(szPayload.isEmpty())return; - int idx = szPayload.find(escape_label); + int idx = szPayload.tqfind(escape_label); if(idx == -1)return; idx += escape_label.length(); - int idx2 = szPayload.find("[!",idx); + int idx2 = szPayload.tqfind("[!",idx); int len = idx2 == -1 ? szPayload.length() - idx : idx2 - idx; buffer = szPayload.mid(idx,len); @@ -1922,12 +1918,12 @@ const kvi_wchar_t * KviIrcView::getTextLine(int iMsgType, line_ptr->pChunks[0].iTextStart = 0; line_ptr->pChunks[0].colors.back = KVI_OPTION_MSGTYPE(iMsgType).back(); line_ptr->pChunks[0].colors.fore = KVI_OPTION_MSGTYPE(iMsgType).fore(); - line_ptr->pChunks[0].customFore=QColor(); + line_ptr->pChunks[0].customFore=TQColor(); if(bEnableTimeStamp && KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp)) { - QString szTimestamp; - szTimestamp=QDateTime::currentDateTime ( + TQString szTimestamp; + szTimestamp=TQDateTime::tqcurrentDateTime ( KVI_OPTION_BOOL(KviOption_boolIrcViewTimestampUTC) ? Qt::UTC : Qt::LocalTime ).toString( KVI_OPTION_STRING(KviOption_stringIrcViewTimestampFormat) ); szTimestamp.append(' '); @@ -1954,7 +1950,7 @@ const kvi_wchar_t * KviIrcView::getTextLine(int iMsgType, line_ptr->pChunks[2].iTextLen = 1; line_ptr->pChunks[2].colors.back = KVI_OPTION_MSGTYPE(iMsgType).back(); line_ptr->pChunks[2].colors.fore = KVI_OPTION_MSGTYPE(iMsgType).fore(); - line_ptr->pChunks[2].customFore=QColor(); + line_ptr->pChunks[2].customFore=TQColor(); iCurChunk+=2; } else { // only one chunk @@ -1968,8 +1964,8 @@ const kvi_wchar_t * KviIrcView::getTextLine(int iMsgType, iTextIdx = iTimeStampLength; // the rest of the string will begin 11 chars later // throw away const: we WANT to set the chars :D - register QChar * data_ptr_aux = (QChar *)line_ptr->szText.unicode(); - register QChar * stamp_ptr_aux = (QChar *)szTimestamp.unicode(); + register TQChar * data_ptr_aux = (TQChar *)line_ptr->szText.tqunicode(); + register TQChar * stamp_ptr_aux = (TQChar *)szTimestamp.tqunicode(); for(int i=0;i<iTimeStampLength;i++) *data_ptr_aux++ = *stamp_ptr_aux++; @@ -1988,12 +1984,12 @@ const kvi_wchar_t * KviIrcView::getTextLine(int iMsgType, #define APPEND_LAST_TEXT_BLOCK(__data_ptr,__data_len) \ blockLen = (__data_len); \ line_ptr->pChunks[iCurChunk].iTextLen += blockLen; \ - kvi_appendWCharToQStringWithLength(&(line_ptr->szText),__data_ptr,__data_len); \ + kvi_appendWCharToTQStringWithLength(&(line_ptr->szText),__data_ptr,__data_len); \ iTextIdx+=blockLen; #define APPEND_LAST_TEXT_BLOCK_HIDDEN_FROM_NOW(__data_ptr,__data_len) \ blockLen = (__data_len); \ - kvi_appendWCharToQStringWithLength(&(line_ptr->szText),__data_ptr,__data_len); \ + kvi_appendWCharToTQStringWithLength(&(line_ptr->szText),__data_ptr,__data_len); \ iTextIdx+=blockLen; @@ -2007,7 +2003,7 @@ const kvi_wchar_t * KviIrcView::getTextLine(int iMsgType, line_ptr->pChunks[iCurChunk].type = _chunk_type; \ line_ptr->pChunks[iCurChunk].iTextStart = iTextIdx; \ line_ptr->pChunks[iCurChunk].iTextLen = 0; \ - line_ptr->pChunks[iCurChunk].customFore=iCurChunk ? line_ptr->pChunks[iCurChunk-1].customFore : QColor(); + line_ptr->pChunks[iCurChunk].customFore=iCurChunk ? line_ptr->pChunks[iCurChunk-1].customFore : TQColor(); // EOF Macros @@ -2132,7 +2128,7 @@ highlighting_check_loop: // yet more optimized if(*((unsigned short *)p) < 0xff) if(void * jmp_address = char_to_check_jump_table[*((unsigned short *)p)])goto *jmp_address; - // goto *(char_to_check_jump_table[*((unsigned char *)p)]); <--- replace 0 with ¬hing_found + // goto *(char_to_check_jump_table[*((unsigned char *)p)]); <--- tqreplace 0 with ¬hing_found //nothing_found: p++; goto highlighting_check_loop; @@ -2281,7 +2277,7 @@ found_command_escape: { if(line_ptr->pChunks[iCurChunk].szPayload[1]=='c' && ((KviChannel*)m_pKviWindow)->userListView()) { - KviUserListEntry *e = ((KviChannel*)m_pKviWindow)->userListView()->findEntry(QString((QChar*)next_cr,term_cr-next_cr)); + KviUserListEntry *e = ((KviChannel*)m_pKviWindow)->userListView()->findEntry(TQString((TQChar*)next_cr,term_cr-next_cr)); if(e) { line_ptr->pChunks[iCurChunk].colors.fore = KVI_COLOR_CUSTOM; e->color(line_ptr->pChunks[iCurChunk].customFore); @@ -2289,9 +2285,9 @@ found_command_escape: } } } - else if(m_pKviWindow->type()==KVI_WINDOW_TYPE_QUERY && m_pKviWindow && line_ptr->pChunks[iCurChunk].szPayload[1]=='c') + else if(m_pKviWindow->type()==KVI_WINDOW_TYPE_TQUERY && m_pKviWindow && line_ptr->pChunks[iCurChunk].szPayload[1]=='c') { - QString m_szNick = QString((QChar*)next_cr,term_cr-next_cr); + TQString m_szNick = TQString((TQChar*)next_cr,term_cr-next_cr); if(m_szNick==m_pKviWindow->connection()->currentNickName()) { line_ptr->pChunks[iCurChunk].colors.fore = KVI_COLOR_OWN; bColorSetted=true; @@ -2340,7 +2336,7 @@ found_icon_escape: // throw away constness! *((kvi_wchar_t *)p) = 0; // FIXME: this has to be changed! : lookupTextIcon must use wide characters! - QString tmpQ; + TQString tmpQ; tmpQ.setUnicodeCodes(icon_name,datalen); KviTextIcon * icon = g_pTextIconManager->lookupTextIcon(tmpQ); // throw away constness! @@ -2560,7 +2556,7 @@ got_url: if(m_pKviWindow) { - QString tmp; + TQString tmp; tmp.setUnicodeCodes(data_ptr,p-data_ptr); KVS_TRIGGER_EVENT_1(KviEvent_OnUrl,m_pKviWindow,tmp); } @@ -2590,10 +2586,10 @@ check_emoticon_char: case KVI_OUT_CHANPRIVMSG: case KVI_OUT_ACTION: case KVI_OUT_OWNPRIVMSG: - case KVI_OUT_QUERYPRIVMSG: - case KVI_OUT_QUERYPRIVMSGCRYPTED: - case KVI_OUT_QUERYNOTICE: - case KVI_OUT_QUERYNOTICECRYPTED: + case KVI_OUT_TQUERYPRIVMSG: + case KVI_OUT_TQUERYPRIVMSGCRYPTED: + case KVI_OUT_TQUERYNOTICE: + case KVI_OUT_TQUERYNOTICECRYPTED: case KVI_OUT_CHANPRIVMSGCRYPTED: case KVI_OUT_CHANNELNOTICE: case KVI_OUT_CHANNELNOTICECRYPTED: @@ -2602,7 +2598,7 @@ check_emoticon_char: case KVI_OUT_DCCCHATMSG: { // Pragma: 31.05.2002 : I had to kill the 8 prefix - // It happens really too often to have an 8 followed by a parenthesis + // It happens really too often to have an 8 followed by a tqparenthesis // that is not an emoticon // *begin can be one of ':' , ';' , '=' @@ -2641,7 +2637,7 @@ check_emoticon_char: // We lookup simplified versions of the emoticons... // FIXME: this sould become UNICODE!!! - QString lookupstring; + TQString lookupstring; kvi_wchar_t ng[3]; ng[0] = *begin; ng[1] = *item; @@ -2717,13 +2713,13 @@ void KviIrcView::fastScroll(int lines) if(!m_pFm) { // We must get the metrics from a real paint event :/ - // must do a full repaint to get them... - repaint(); + // must do a full tqrepaint to get them... + tqrepaint(); return; } // Ok...the current line is the last one here - // It is the only one that needs to be repainted + // It is the only one that needs to be tqrepainted int widgetWidth = width()-m_pScrollBar->width(); if(widgetWidth < KVI_IRCVIEW_PIXMAP_SEPARATOR_AND_DOUBLEBORDER_WIDTH+10)return; //can't show stuff here int widgetHeight = height(); @@ -2751,14 +2747,14 @@ void KviIrcView::fastScroll(int lines) } #ifdef COMPILE_USE_QT4 - scroll(0,-(heightToPaint-1),QRect(1,1,widgetWidth-2,widgetHeight-2)); + scroll(0,-(heightToPaint-1),TQRect(1,1,widgetWidth-2,widgetHeight-2)); #else bitBlt(this,1,1,this,1,heightToPaint,widgetWidth -2,widgetHeight - (heightToPaint + KVI_IRCVIEW_VERTICAL_BORDER)); - QRect r(0,widgetHeight - (heightToPaint + KVI_IRCVIEW_VERTICAL_BORDER), + TQRect r(0,widgetHeight - (heightToPaint + KVI_IRCVIEW_VERTICAL_BORDER), widgetWidth,heightToPaint + KVI_IRCVIEW_VERTICAL_BORDER); - QPaintEvent * e = new QPaintEvent(r); + TQPaintEvent * e = new TQPaintEvent(r); paintEvent(e); delete e; #endif @@ -2782,7 +2778,7 @@ void KviIrcView::fastScroll(int lines) // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -void KviIrcView::paintEvent(QPaintEvent *p) +void KviIrcView::paintEvent(TQPaintEvent *p) { // // THIS FUNCTION IS A MONSTER @@ -2792,7 +2788,7 @@ void KviIrcView::paintEvent(QPaintEvent *p) int widgetWidth = width() - scrollbarWidth; if(!isVisible() || (widgetWidth < 20)) { - m_iUnprocessedPaintEventRequests = 0; // assume a full repaint when this widget is shown... + m_iUnprocessedPaintEventRequests = 0; // assume a full tqrepaint when this widget is shown... return; //can't show stuff here } @@ -2804,22 +2800,22 @@ void KviIrcView::paintEvent(QPaintEvent *p) (m_pKviWindow->mdiParent() != g_pFrame->mdiManager()->topChild()) && (m_pKviWindow->mdiParent())) { - m_iUnprocessedPaintEventRequests = 0; // assume a full repaint when this widget is shown... + m_iUnprocessedPaintEventRequests = 0; // assume a full tqrepaint when this widget is shown... return; // totally hidden behind other windows } int widgetHeight = height(); - static QRect r; // static: avoid calling constructor and destructor every time... + static TQRect r; // static: avoid calling constructor and destructor every time... if(p) { r=p->rect(); // app triggered , or self triggered from fastScroll (in that case m_iUnprocessedPaintEventRequests is set to 0 there) if(r == rect()) - m_iUnprocessedPaintEventRequests = 0; // only full repaints reset + m_iUnprocessedPaintEventRequests = 0; // only full tqrepaints reset } else { // A self triggered event - m_iUnprocessedPaintEventRequests = 0; // only full repaints reset + m_iUnprocessedPaintEventRequests = 0; // only full tqrepaints reset r = rect(); } @@ -2831,32 +2827,32 @@ void KviIrcView::paintEvent(QPaintEvent *p) if(rectWidth > widgetWidth)rectWidth = widgetWidth; #ifdef COMPILE_USE_QT4 - QPainter pa(this); // we use qt4 double buffering + TQPainter pa(this); // we use qt4 double buffering #else KviDoubleBuffer doublebuffer(width(),height()); - QPixmap * pDoubleBufferPixmap = doublebuffer.pixmap(); + TQPixmap * pDoubleBufferPixmap = doublebuffer.pixmap(); - QPainter pa(pDoubleBufferPixmap); + TQPainter pa(pDoubleBufferPixmap); #endif SET_ANTI_ALIASING(pa); pa.setFont(font()); if(!m_pFm) { - // note that QFontMetrics(pa.font()) may be not the same as QFontMetrics(font()) - // because the painter might effectively use an approximation of the QFont specified + // note that TQFontMetrics(pa.font()) may be not the same as TQFontMetrics(font()) + // because the painter might effectively use an approximation of the TQFont specified // by font(). - recalcFontVariables(QFontMetrics(pa.font()),pa.fontInfo()); + recalcFontVariables(TQFontMetrics(pa.font()),pa.fontInfo()); } #ifdef COMPILE_PSEUDO_TRANSPARENCY if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = mapToGlobal(QPoint(rectLeft,rectTop)); + TQPoint pnt = mapToGlobal(TQPoint(rectLeft,rectTop)); pa.drawTiledPixmap(rectLeft,rectTop,rectWidth,rectHeight,*g_pShadedChildGlobalDesktopBackground,pnt.x(),pnt.y()); } else { #endif - QPixmap * pix = m_pPrivateBackgroundPixmap; + TQPixmap * pix = m_pPrivateBackgroundPixmap; if(!pix) pix = KVI_OPTION_PIXMAP(KviOption_pixmapIrcViewBackground).pixmap(); @@ -2924,7 +2920,7 @@ void KviIrcView::paintEvent(QPaintEvent *p) //Calculate the position of the image //imageYPos = curBottomCoord - (pixmapHeight(16) + ((m_iFontLineSpacing - 16)/2) ); int imageYPos = curBottomCoord - m_iRelativePixmapY; - //Set the mask if needed + //Set the tqmask if needed int iPixId = KVI_OPTION_MSGTYPE(pCurTextLine->iMsgType).pixId(); if(iPixId > 0) pa.drawPixmap(KVI_IRCVIEW_HORIZONTAL_BORDER,imageYPos,*(g_pIconManager->getSmallIcon(iPixId))); @@ -3124,7 +3120,7 @@ void KviIrcView::paintEvent(QPaintEvent *p) } #define DRAW_SELECTED_TEXT(_text_str,_text_idx,_text_len,_text_width) \ - SET_PEN(KVI_OPTION_MSGTYPE(KVI_OUT_SELECT).fore(),block->pChunk ? block->pChunk->customFore : QColor()); \ + SET_PEN(KVI_OPTION_MSGTYPE(KVI_OUT_SELECT).fore(),block->pChunk ? block->pChunk->customFore : TQColor()); \ { \ int theWdth = _text_width; \ if(theWdth < 0) \ @@ -3136,7 +3132,7 @@ void KviIrcView::paintEvent(QPaintEvent *p) curLeftCoord += _text_width; #define DRAW_NORMAL_TEXT(_text_str,_text_idx,_text_len,_text_width) \ - SET_PEN(curFore,block->pChunk ? block->pChunk->customFore : QColor()); \ + SET_PEN(curFore,block->pChunk ? block->pChunk->customFore : TQColor()); \ if(curBack != KVI_TRANSPARENT){ \ int theWdth = _text_width; \ if(theWdth < 0) \ @@ -3176,20 +3172,20 @@ void KviIrcView::paintEvent(QPaintEvent *p) case KVI_TEXT_UNDERLINE: case KVI_TEXT_REVERSE: case KVI_TEXT_RESET: - m_szLastSelectionLine.append(QChar(block->pChunk->type)); + m_szLastSelectionLine.append(TQChar(block->pChunk->type)); break; case KVI_TEXT_COLOR: - m_szLastSelectionLine.append(QChar(block->pChunk->type)); + m_szLastSelectionLine.append(TQChar(block->pChunk->type)); if((block->pChunk->colors.fore != KVI_NOCHANGE) && (block->pChunk->colors.fore != KVI_TRANSPARENT)) { - if(curFore > 9)m_szLastSelectionLine.append(QChar('1')); - m_szLastSelectionLine.append(QChar((curFore%10)+'0')); + if(curFore > 9)m_szLastSelectionLine.append(TQChar('1')); + m_szLastSelectionLine.append(TQChar((curFore%10)+'0')); } if((block->pChunk->colors.back != KVI_NOCHANGE) && (block->pChunk->colors.back != KVI_TRANSPARENT) ) { - m_szLastSelectionLine.append(QChar(',')); - if(curBack > 9)m_szLastSelectionLine.append(QChar('1')); - m_szLastSelectionLine.append(QChar((curBack%10)+'0')); + m_szLastSelectionLine.append(TQChar(',')); + if(curBack > 9)m_szLastSelectionLine.append(TQChar('1')); + m_szLastSelectionLine.append(TQChar((curBack%10)+'0')); } break; } @@ -3234,8 +3230,8 @@ void KviIrcView::paintEvent(QPaintEvent *p) if(theWdth < 0)theWdth=width()-(curLeftCoord+KVI_IRCVIEW_HORIZONTAL_BORDER+scrollbarWidth); pa.fillRect(curLeftCoord,curBottomCoord - m_iFontLineSpacing + m_iFontDescent,theWdth,m_iFontLineSpacing,KVI_OPTION_MIRCCOLOR(KVI_OPTION_MSGTYPE(KVI_OUT_SELECT).back())); kvi_wslen_t the_len = kvi_wstrlen(block->pChunk->szPayload); - m_szLastSelectionLine.append(QChar(block->pChunk->type)); - QString tmp; + m_szLastSelectionLine.append(TQChar(block->pChunk->type)); + TQString tmp; tmp.setUnicodeCodes(block->pChunk->szPayload,the_len); m_szLastSelectionLine.append(tmp); goto no_selection_paint; @@ -3267,14 +3263,14 @@ no_selection_paint: int wdth = block->block_width; if(wdth < 0)wdth = widgetWidth - (curLeftCoord + KVI_IRCVIEW_HORIZONTAL_BORDER); int imageYPos = curBottomCoord - m_iRelativePixmapY; - //Set the mask if needed + //Set the tqmask if needed if(curBack != KVI_TRANSPARENT && curBack < 16) { pa.fillRect(curLeftCoord,curBottomCoord - m_iFontLineSpacing + m_iFontDescent,wdth,m_iFontLineSpacing,KVI_OPTION_MIRCCOLOR((unsigned char)curBack)); } - QString tmpQ; + TQString tmpQ; tmpQ.setUnicodeCodes(block->pChunk->szSmileId,kvi_wstrlen(block->pChunk->szSmileId)); - QPixmap * daIcon =0; + TQPixmap * daIcon =0; KviTextIcon* pIcon = g_pTextIconManager->lookupTextIcon(tmpQ); if(pIcon) { @@ -3301,7 +3297,7 @@ no_selection_paint: // FIXME: We could avoid this XSetForeground if the curFore was not changed.... - SET_PEN(curFore,block->pChunk ? block->pChunk->customFore : QColor()); + SET_PEN(curFore,block->pChunk ? block->pChunk->customFore : TQColor()); if(curBack != KVI_TRANSPARENT && curBack < 16 ) { @@ -3310,7 +3306,7 @@ no_selection_paint: if(curLink) { - SET_PEN(KVI_OPTION_MSGTYPE(KVI_OUT_LINK).fore(),block->pChunk ? block->pChunk->customFore : QColor()); + SET_PEN(KVI_OPTION_MSGTYPE(KVI_OUT_LINK).fore(),block->pChunk ? block->pChunk->customFore : TQColor()); pa.drawText(curLeftCoord,curBottomCoord,pCurTextLine->szText,block->block_start,block->block_len); pa.drawText(curLeftCoord+1,curBottomCoord,pCurTextLine->szText,block->block_start,block->block_len); pa.drawLine(curLeftCoord,curBottomCoord+2,curLeftCoord+wdth,curBottomCoord+2); @@ -3337,13 +3333,13 @@ no_selection_paint: // paint the cursor line int iH = lineWrapsHeight + m_iFontLineSpacing; #ifdef COMPILE_USE_QT4 - pa.setCompositionMode(QPainter::CompositionMode_SourceOut); + pa.setCompositionMode(TQPainter::CompositionMode_SourceOut); #else pa.setRasterOp(NotROP); #endif - pa.fillRect(0,curBottomCoord - iH,widgetWidth,iH + (m_iFontDescent << 1),Qt::black); + pa.fillRect(0,curBottomCoord - iH,widgetWidth,iH + (m_iFontDescent << 1),TQt::black); #ifdef COMPILE_USE_QT4 - pa.setCompositionMode(QPainter::CompositionMode_SourceOver); + pa.setCompositionMode(TQPainter::CompositionMode_SourceOver); #else pa.setRasterOp(CopyROP); #endif @@ -3369,9 +3365,9 @@ no_selection_paint: bLineMarkPainted = true; //pa.setRasterOp(NotROP); #ifdef COMPILE_USE_QT4 - pa.setPen(QPen(KVI_OPTION_COLOR(KviOption_colorIrcViewMarkLine),1,Qt::DotLine)); + pa.setPen(TQPen(KVI_OPTION_COLOR(KviOption_colorIrcViewMarkLine),1,TQt::DotLine)); #else - pa.setPen(QPen(KVI_OPTION_COLOR(KviOption_colorIrcViewMarkLine),1,QPen::DotLine)); + pa.setPen(TQPen(KVI_OPTION_COLOR(KviOption_colorIrcViewMarkLine),1,TQPen::DotLine)); #endif pa.drawLine(0,curBottomCoord,widgetWidth,curBottomCoord); //pa.setRasterOp(CopyROP); @@ -3413,11 +3409,11 @@ no_selection_paint: { // need to mark it! //pa.setRasterOp(NotROP); - //pa.setPen(Qt::black); + //pa.setPen(TQt::black); #ifdef COMPILE_USE_QT4 - pa.setPen(QPen(KVI_OPTION_COLOR(KviOption_colorIrcViewMarkLine),1,Qt::DotLine)); + pa.setPen(TQPen(KVI_OPTION_COLOR(KviOption_colorIrcViewMarkLine),1,TQt::DotLine)); #else - pa.setPen(QPen(KVI_OPTION_COLOR(KviOption_colorIrcViewMarkLine),1,QPen::DotLine)); + pa.setPen(TQPen(KVI_OPTION_COLOR(KviOption_colorIrcViewMarkLine),1,TQPen::DotLine)); #endif int x = widgetWidth - 8; int y = KVI_IRCVIEW_VERTICAL_BORDER; @@ -3432,19 +3428,19 @@ no_selection_paint: } //Need to draw the sunken rect around the view now... - pa.setPen(colorGroup().dark()); + pa.setPen(tqcolorGroup().dark()); pa.drawLine(0,0,widgetWidth,0); pa.drawLine(0,0,0,widgetHeight); - pa.setPen(colorGroup().light()); + pa.setPen(tqcolorGroup().light()); widgetWidth--; pa.drawLine(1,widgetHeight-1,widgetWidth,widgetHeight-1); pa.drawLine(widgetWidth,1,widgetWidth,widgetHeight); // COPY TO THE DISPLAY #ifndef COMPILE_USE_QT4 - bitBlt(this,rectLeft,rectTop,pDoubleBufferPixmap,rectLeft,rectTop,rectWidth,rectHeight,Qt::CopyROP); + bitBlt(this,rectLeft,rectTop,pDoubleBufferPixmap,rectLeft,rectTop,rectWidth,rectHeight,TQt::CopyROP); #endif -// else we use the Qt4 native double buffering +// else we use the TQt4 native double buffering } /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -3453,7 +3449,7 @@ no_selection_paint: // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -#define IRCVIEW_WCHARWIDTH(__c) (((__c).unicode() < 0xff) ? m_iFontCharacterWidth[(__c).unicode()] : m_pFm->width(__c)) +#define IRCVIEW_WCHARWIDTH(__c) (((__c).tqunicode() < 0xff) ? m_iFontCharacterWidth[(__c).tqunicode()] : m_pFm->width(__c)) void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth) { @@ -3480,12 +3476,12 @@ void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth) int maxBlockLen = ptr->pChunks->iTextLen; // ptr->pChunks[0].iTextLen - const QChar * unicode = ptr->szText.unicode(); + const TQChar * tqunicode = ptr->szText.tqunicode(); for(;;) { //Calculate the block_width - register const QChar * p = unicode + ptr->pBlocks[ptr->iBlockCount].block_start; + register const TQChar * p = tqunicode + ptr->pBlocks[ptr->iBlockCount].block_start; int curBlockLen = 0; int curBlockWidth = 0; @@ -3550,7 +3546,7 @@ void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth) ptr->pBlocks[ptr->iBlockCount].block_width = 0; ptr->iBlockCount++; ptr->pBlocks = (KviIrcViewWrappedBlock *)kvi_realloc(ptr->pBlocks,(ptr->iBlockCount + 1) * sizeof(KviIrcViewWrappedBlock)); - ptr->pBlocks[ptr->iBlockCount].block_start = p - unicode; + ptr->pBlocks[ptr->iBlockCount].block_start = p - tqunicode; ptr->pBlocks[ptr->iBlockCount].block_len = 0; ptr->pBlocks[ptr->iBlockCount].block_width = 0; ptr->pBlocks[ptr->iBlockCount].pChunk = &(ptr->pChunks[curAttrBlock]); @@ -3583,7 +3579,7 @@ void KviIrcView::calculateLineWraps(KviIrcViewLine *ptr,int maxWidth) maxBlockLen-=curBlockLen; ptr->iBlockCount++; ptr->pBlocks = (KviIrcViewWrappedBlock *)kvi_realloc(ptr->pBlocks,(ptr->iBlockCount + 1) * sizeof(KviIrcViewWrappedBlock)); - ptr->pBlocks[ptr->iBlockCount].block_start = p - unicode; + ptr->pBlocks[ptr->iBlockCount].block_start = p - tqunicode; ptr->pBlocks[ptr->iBlockCount].block_len = 0; ptr->pBlocks[ptr->iBlockCount].block_width = 0; ptr->pBlocks[ptr->iBlockCount].pChunk = 0; @@ -3636,8 +3632,8 @@ bool KviIrcView::checkSelectionBlock(KviIrcViewLine * line,int left,int bottom,i // // Yahoo!!!! // - const QChar * unicode = line->szText.unicode(); - register const QChar * p = unicode + line->pBlocks[bufIndex].block_start; + const TQChar * tqunicode = line->szText.tqunicode(); + register const TQChar * p = tqunicode + line->pBlocks[bufIndex].block_start; int top = bottom-m_iFontLineSpacing; int right = ((line->pBlocks[bufIndex].block_width >= 0) ? \ @@ -3824,11 +3820,11 @@ bool KviIrcView::checkSelectionBlock(KviIrcViewLine * line,int left,int bottom,i //============ recalcFontVariables ==============// -void KviIrcView::recalcFontVariables(const QFontMetrics &fm,const QFontInfo &fi) +void KviIrcView::recalcFontVariables(const TQFontMetrics &fm,const TQFontInfo &fi) { // FIXME: #warning "OPTIMIZE THIS: GLOBAL VARIABLES" if(m_pFm)delete m_pFm; - m_pFm = new QFontMetrics(fm); + m_pFm = new TQFontMetrics(fm); m_iFontLineSpacing = m_pFm->lineSpacing(); if(m_iFontLineSpacing < KVI_IRCVIEW_PIXMAP_SIZE && KVI_OPTION_BOOL(KviOption_boolIrcViewShowImages)) { @@ -3839,7 +3835,7 @@ void KviIrcView::recalcFontVariables(const QFontMetrics &fm,const QFontInfo &fi) // cache the first 256 characters for(unsigned short i=0;i<256;i++) { - m_iFontCharacterWidth[i]=m_pFm->width(QChar(i)); + m_iFontCharacterWidth[i]=m_pFm->width(TQChar(i)); } if(m_iFontLineWidth==0)m_iFontLineWidth=1; m_iWrapMargin = m_pFm->width("wwww"); @@ -3860,9 +3856,9 @@ void KviIrcView::recalcFontVariables(const QFontMetrics &fm,const QFontInfo &fi) //================ resizeEvent ===============// -void KviIrcView::resizeEvent(QResizeEvent *) +void KviIrcView::resizeEvent(TQResizeEvent *) { - int iScr = m_pScrollBar->sizeHint().width(); + int iScr = m_pScrollBar->tqsizeHint().width(); int iLeft = width()-iScr; m_pToolsButton->setGeometry(iLeft,0,iScr,iScr); m_pScrollBar->setGeometry(iLeft,iScr,iScr,height() - iScr); @@ -3877,9 +3873,9 @@ void KviIrcView::resizeEvent(QResizeEvent *) } } -QSize KviIrcView::sizeHint() const +TQSize KviIrcView::tqsizeHint() const { - QSize ret(KVI_IRCVIEW_SIZEHINT_WIDTH,KVI_IRCVIEW_SIZEHINT_HEIGHT); + TQSize ret(KVI_IRCVIEW_SIZEHINT_WIDTH,KVI_IRCVIEW_SIZEHINT_HEIGHT); return ret; } @@ -3891,34 +3887,34 @@ void KviIrcView::showToolsPopup() m_pToolsPopup->clear(); if(m_pToolWidget) - m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SEARCH)),__tr2qs("Hide Find Window"),this,SLOT(toggleToolWidget())); + m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SEARCH)),__tr2qs("Hide Find Window"),this,TQT_SLOT(toggleToolWidget())); else - m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SEARCH)),__tr2qs("Show Find Window"),this,SLOT(toggleToolWidget())); + m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SEARCH)),__tr2qs("Show Find Window"),this,TQT_SLOT(toggleToolWidget())); m_pToolsPopup->insertSeparator(); - m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PLUS)),__tr2qs("Zoom In"),this,SLOT(increaseFontSize())); - m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINUS)),__tr2qs("Zoom Out"),this,SLOT(decreaseFontSize())); - m_pToolsPopup->insertItem(__tr2qs("Choose Temporary Font..."),this,SLOT(chooseFont())); - m_pToolsPopup->insertItem(__tr2qs("Choose Temporary Background..."),this,SLOT(chooseBackground())); - int id = m_pToolsPopup->insertItem(__tr2qs("Reset Temporary Background"),this,SLOT(resetBackground())); + m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PLUS)),__tr2qs("Zoom In"),this,TQT_SLOT(increaseFontSize())); + m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINUS)),__tr2qs("Zoom Out"),this,TQT_SLOT(decreaseFontSize())); + m_pToolsPopup->insertItem(__tr2qs("Choose Temporary Font..."),this,TQT_SLOT(chooseFont())); + m_pToolsPopup->insertItem(__tr2qs("Choose Temporary Background..."),this,TQT_SLOT(chooseBackground())); + int id = m_pToolsPopup->insertItem(__tr2qs("Reset Temporary Background"),this,TQT_SLOT(resetBackground())); m_pToolsPopup->setItemEnabled(id,m_pPrivateBackgroundPixmap != 0); m_pToolsPopup->insertSeparator(); - m_pToolsPopup->insertItem(__tr2qs("Clear Buffer"),this,SLOT(clearBuffer())); + m_pToolsPopup->insertItem(__tr2qs("Clear Buffer"),this,TQT_SLOT(clearBuffer())); - QSize s = m_pToolsPopup->sizeHint(); + TQSize s = m_pToolsPopup->tqsizeHint(); - m_pToolsPopup->popup(m_pToolsButton->mapToGlobal(QPoint(m_pToolsButton->width() - s.width(),m_pToolsButton->height()))); + m_pToolsPopup->popup(m_pToolsButton->mapToGlobal(TQPoint(m_pToolsButton->width() - s.width(),m_pToolsButton->height()))); } void KviIrcView::increaseFontSize() { - QFont f = font(); + TQFont f = font(); f.setPointSize(f.pointSize() + 1); setFont(f); } void KviIrcView::decreaseFontSize() { - QFont f = font(); + TQFont f = font(); int p = f.pointSize(); if(p > 2)p--; f.setPointSize(p); @@ -3928,20 +3924,20 @@ void KviIrcView::decreaseFontSize() void KviIrcView::chooseFont() { bool bOk; - QFont f = QFontDialog::getFont(&bOk,font(),this); + TQFont f = TQFontDialog::getFont(&bOk,font(),this); if(!bOk)return; setFont(f); } void KviIrcView::chooseBackground() { - QString f; + TQString f; if(!KviFileDialog::askForOpenFileName(f,__tr2qs("Choose the background image...")))return; if(f.isEmpty())return; - QPixmap p(f); + TQPixmap p(f); if(p.isNull()) { - QMessageBox::information(this,__tr2qs("Invalid image"),__tr2qs("Failed to load the selected image"),__tr2qs("Ok")); + TQMessageBox::information(this,__tr2qs("Invalid image"),__tr2qs("Failed to load the selected image"),__tr2qs("Ok")); return; } setPrivateBackgroundPixmap(p); @@ -3959,11 +3955,11 @@ void KviIrcView::toggleToolWidget() delete m_pToolWidget; m_pToolWidget = 0; m_pCursorLine = 0; - repaint(); + tqrepaint(); } else { m_pToolWidget = new KviIrcViewToolWidget(this); - int w = m_pToolWidget->sizeHint().width(); + int w = m_pToolWidget->tqsizeHint().width(); m_pToolWidget->move(width() - (w + 40),10); m_pToolWidget->show(); } @@ -3972,7 +3968,7 @@ void KviIrcView::toggleToolWidget() /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // -// The IrcView : find +// The IrcView : tqfind // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -3983,7 +3979,7 @@ void KviIrcView::setCursorLine(KviIrcViewLine * l) if(m_pCursorLine == m_pCurLine) { - repaint(); + tqrepaint(); return; } @@ -4004,7 +4000,7 @@ void KviIrcView::setCursorLine(KviIrcViewLine * l) m_iLastScrollBarValue = sc; m_pScrollBar->setValue(sc); } else { - repaint(); + tqrepaint(); } } else { // The cursor line is over the current line @@ -4038,12 +4034,12 @@ void KviIrcView::setCursorLine(KviIrcViewLine * l) m_iLastScrollBarValue = sc; m_pScrollBar->setValue(sc); } else { - repaint(); + tqrepaint(); } } } -void KviIrcView::findNext(const QString& szText,bool bCaseS,bool bRegExp,bool bExtended) +void KviIrcView::findNext(const TQString& szText,bool bCaseS,bool bRegExp,bool bExtended) { KviIrcViewLine * l = m_pCursorLine; if(!l)l = m_pCurLine; @@ -4063,15 +4059,11 @@ void KviIrcView::findNext(const QString& szText,bool bCaseS,bool bRegExp,bool bE if(bRegExp) { - QRegExp re(szText,bCaseS,!bExtended); -#if QT_VERSION >= 300 + TQRegExp re(szText,bCaseS,!bExtended); idx = re.search(l->szText,0); -#else - idx = re.find(l->szText,0); -#endif } else { - QString tmp = l->szText; - idx = tmp.find(szText,0,bCaseS); + TQString tmp = l->szText; + idx = tmp.tqfind(szText,0,bCaseS); } if(idx != -1) @@ -4079,8 +4071,8 @@ void KviIrcView::findNext(const QString& szText,bool bCaseS,bool bRegExp,bool bE setCursorLine(l); if(m_pToolWidget) { - QString tmp; - KviQString::sprintf(tmp,__tr2qs("Pos %d"),idx); + TQString tmp; + KviTQString::sprintf(tmp,__tr2qs("Pos %d"),idx); m_pToolWidget->setFindResult(tmp); } return; @@ -4094,12 +4086,12 @@ do_pNext: } while(l != start); } m_pCursorLine = 0; - repaint(); + tqrepaint(); if(m_pToolWidget)m_pToolWidget->setFindResult(__tr2qs("Not found")); } -void KviIrcView::findPrev(const QString& szText,bool bCaseS,bool bRegExp,bool bExtended) +void KviIrcView::findPrev(const TQString& szText,bool bCaseS,bool bRegExp,bool bExtended) { KviIrcViewLine * l = m_pCursorLine; if(!l)l = m_pCurLine; @@ -4120,15 +4112,11 @@ void KviIrcView::findPrev(const QString& szText,bool bCaseS,bool bRegExp,bool bE if(bRegExp) { - QRegExp re(szText,bCaseS,!bExtended); -#if QT_VERSION >= 300 + TQRegExp re(szText,bCaseS,!bExtended); idx = re.search(l->szText,0); -#else - idx = re.find(l->szText,0); -#endif } else { - QString tmp = l->szText; - idx = tmp.find(szText,0,bCaseS);; + TQString tmp = l->szText; + idx = tmp.tqfind(szText,0,bCaseS);; } if(idx != -1) @@ -4136,8 +4124,8 @@ void KviIrcView::findPrev(const QString& szText,bool bCaseS,bool bRegExp,bool bE setCursorLine(l); if(m_pToolWidget) { - QString tmp; - KviQString::sprintf(tmp,__tr2qs("Pos %d"),idx); + TQString tmp; + KviTQString::sprintf(tmp,__tr2qs("Pos %d"),idx); m_pToolWidget->setFindResult(tmp); } return; @@ -4152,7 +4140,7 @@ do_pPrev: } m_pCursorLine = 0; - repaint(); + tqrepaint(); if(m_pToolWidget)m_pToolWidget->setFindResult(__tr2qs("Not found")); } @@ -4181,7 +4169,7 @@ KviIrcViewLine * KviIrcView::getVisibleLineAt(int xPos,int yPos) return 0; } -KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,QRect * pRect,QString * linkCmd,QString * linkText) +KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,TQRect * pRect,TQString * linkCmd,TQString * linkText) { KviIrcViewLine * l = m_pCurLine; int iTop = height() + m_iFontDescent - KVI_IRCVIEW_VERTICAL_BORDER; @@ -4282,7 +4270,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,QRect * } if(pRect) { - *pRect = QRect(iLeftBorder, + *pRect = TQRect(iLeftBorder, bHadWordWraps ? iLastEscapeBlockTop : iTop, iRightBorder, ((uLineWraps + 1) * m_iFontLineSpacing) + m_iFontDescent); @@ -4295,7 +4283,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,QRect * } if(linkText) { - QString szLink; + TQString szLink; int iEndOfLInk = iLastEscapeBlock; while(1) { @@ -4308,18 +4296,18 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,QRect * case KVI_TEXT_UNDERLINE: case KVI_TEXT_REVERSE: case KVI_TEXT_RESET: - szLink.append(QChar(l->pBlocks[iEndOfLInk].pChunk->type)); + szLink.append(TQChar(l->pBlocks[iEndOfLInk].pChunk->type)); break; case KVI_TEXT_COLOR: - szLink.append(QChar(KVI_TEXT_COLOR)); + szLink.append(TQChar(KVI_TEXT_COLOR)); if(l->pBlocks[iEndOfLInk].pChunk->colors.fore != KVI_NOCHANGE) { - szLink.append(QString("%1").arg((int)(l->pBlocks[iEndOfLInk].pChunk->colors.fore))); + szLink.append(TQString("%1").tqarg((int)(l->pBlocks[iEndOfLInk].pChunk->colors.fore))); } if(l->pBlocks[iEndOfLInk].pChunk->colors.back != KVI_NOCHANGE) { - szLink.append(QChar(',')); - szLink.append(QString("%1").arg((int)(l->pBlocks[iEndOfLInk].pChunk->colors.back))); + szLink.append(TQChar(',')); + szLink.append(TQString("%1").tqarg((int)(l->pBlocks[iEndOfLInk].pChunk->colors.back))); } break; } @@ -4346,7 +4334,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,QRect * { if(pRect) { - *pRect = QRect(iLastLeft, + *pRect = TQRect(iLastLeft, bHadWordWraps ? firstRowTop : iTop, iBlockWidth, ((l->uLineWraps + 1) * m_iFontLineSpacing) + m_iFontDescent); @@ -4354,7 +4342,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,QRect * if(linkCmd) { *linkCmd = "[!txt]"; - QString tmp; + TQString tmp; tmp.setUnicodeCodes(l->pBlocks[i].pChunk->szPayload,kvi_wstrlen(l->pBlocks[i].pChunk->szPayload)); linkCmd->append(tmp); linkCmd->stripWhiteSpace(); @@ -4441,7 +4429,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,QRect * These links are used internally in KVIrc , but you can use them too.[br] The <escape_command> is a single letter this time: it defines the type of the link.[br] Currently KVIrc uses six types of builtin links : 'n' for nickname links, 'u' for url links, - 'c' for channel links, 'h' for hostname links, 'm' for mask links and 's' for server links.[br] + 'c' for channel links, 'h' for hostname links, 'm' for tqmask links and 's' for server links.[br] Theoretically you can also use your own link types: just use any other letter or digit (you can't use ']' and <cr>), but probably you will prefer a completely user defined link in that case anyway.[br] Once the user interacts with the link , kvirc executes the predefined events:[br] @@ -4459,11 +4447,11 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,QRect * // FIXME: #warning "Finish the doc above!! Maybe some examples ?!" -void KviIrcView::mouseDoubleClickEvent(QMouseEvent *e) +void KviIrcView::mouseDoubleClickEvent(TQMouseEvent *e) { - QString cmd; - QString linkCmd; - QString linkText; + TQString cmd; + TQString linkCmd; + TQString linkText; if(m_iMouseTimer) { @@ -4481,7 +4469,7 @@ void KviIrcView::mouseDoubleClickEvent(QMouseEvent *e) return; } - QString szCmd(linkCmd); + TQString szCmd(linkCmd); szCmd.remove(0,1); KviKvsVariantList * pParams = new KviKvsVariantList(); @@ -4491,7 +4479,7 @@ void KviIrcView::mouseDoubleClickEvent(QMouseEvent *e) pParams->append(szCmd); - switch(linkCmd[0].unicode()) + switch(linkCmd[0].tqunicode()) { case 'n': { @@ -4504,8 +4492,8 @@ void KviIrcView::mouseDoubleClickEvent(QMouseEvent *e) KVS_TRIGGER_EVENT(KviEvent_OnChannelNickDefaultActionRequest,m_pKviWindow,pParams); } else bTrigger = true; break; - case KVI_WINDOW_TYPE_QUERY: - if(KviQString::equalCI(((KviQuery *)m_pKviWindow)->windowName(),linkText)) + case KVI_WINDOW_TYPE_TQUERY: + if(KviTQString::equalCI(((KviQuery *)m_pKviWindow)->windowName(),linkText)) { KVS_TRIGGER_EVENT(KviEvent_OnQueryNickDefaultActionRequest,m_pKviWindow,pParams); } else bTrigger = true; @@ -4528,17 +4516,17 @@ void KviIrcView::mouseDoubleClickEvent(QMouseEvent *e) { if(((KviChannel *)m_pKviWindow)->isMeOp()) { - QChar plmn = linkCmd[1]; - if((plmn.unicode() == '+') || (plmn.unicode() == '-')) + TQChar plmn = linkCmd[1]; + if((plmn.tqunicode() == '+') || (plmn.tqunicode() == '-')) { - QString target(m_pKviWindow->windowName()); - target.replace("\\","\\\\"); - target.replace("\"","\\\""); - target.replace(";","\\;"); - target.replace("$","\\$"); - target.replace("%","\\%"); - QChar flag = linkCmd[2]; - switch(flag.unicode()) + TQString target(m_pKviWindow->windowName()); + target.tqreplace("\\","\\\\"); + target.tqreplace("\"","\\\""); + target.tqreplace(";","\\;"); + target.tqreplace("$","\\$"); + target.tqreplace("%","\\%"); + TQChar flag = linkCmd[2]; + switch(flag.tqunicode()) { case 'o': case 'v': @@ -4549,10 +4537,10 @@ void KviIrcView::mouseDoubleClickEvent(QMouseEvent *e) case 'I': case 'e': case 'k': - KviQString::sprintf(cmd,"mode %Q %c%c $0",&target,plmn.latin1(),flag.latin1()); + KviTQString::sprintf(cmd,"mode %Q %c%c $0",&target,plmn.latin1(),flag.latin1()); break; default: - KviQString::sprintf(cmd,"mode %Q %c%c",&target,plmn.latin1(),flag.latin1()); + KviTQString::sprintf(cmd,"mode %Q %c%c",&target,plmn.latin1(),flag.latin1()); break; } } @@ -4565,14 +4553,14 @@ void KviIrcView::mouseDoubleClickEvent(QMouseEvent *e) break; case 'u': { - QString urlText; + TQString urlText; if(!szCmd.isEmpty()) urlText=szCmd; else urlText=linkText; if( - !KviQString::cmpCIN(urlText,"irc://",6) || - !KviQString::cmpCIN(urlText,"irc6://",7) || - !KviQString::cmpCIN(urlText,"ircs://",7) || - !KviQString::cmpCIN(urlText,"ircs6://",8) + !KviTQString::cmpCIN(urlText,"irc://",6) || + !KviTQString::cmpCIN(urlText,"irc6://",7) || + !KviTQString::cmpCIN(urlText,"ircs://",7) || + !KviTQString::cmpCIN(urlText,"ircs6://",8) ) { KviIrcUrl::run(urlText,KviIrcUrl::TryCurrentContext | KviIrcUrl::DoNotPartChans, console()); @@ -4585,7 +4573,7 @@ void KviIrcView::mouseDoubleClickEvent(QMouseEvent *e) { if(console() && console()->connection()) { - QString szChan=linkText; + TQString szChan=linkText; if(szCmd.length()>0) szChan=szCmd; if(KviChannel * c = console()->connection()->findChannel(szChan)) { @@ -4593,7 +4581,7 @@ void KviIrcView::mouseDoubleClickEvent(QMouseEvent *e) c->raise(); c->setFocus(); } else { - cmd = QString("join %1").arg(szChan); + cmd = TQString("join %1").tqarg(szChan); } } } @@ -4618,7 +4606,7 @@ void KviIrcView::mouseDoubleClickEvent(QMouseEvent *e) delete pParams; } -void KviIrcView::mousePressEvent(QMouseEvent *e) +void KviIrcView::mousePressEvent(TQMouseEvent *e) { if(m_pKviWindow->input()) m_pKviWindow->input()->setFocus(); @@ -4631,7 +4619,7 @@ void KviIrcView::mousePressEvent(QMouseEvent *e) if(m_pToolWidget) { m_pCursorLine = getVisibleLineAt(e->pos().x(),e->pos().y()); - repaint(); + tqrepaint(); } m_mousePressPos = e->pos(); @@ -4639,7 +4627,7 @@ void KviIrcView::mousePressEvent(QMouseEvent *e) m_bMouseIsDown = true; - m_bShiftPressed = (e->state() & Qt::ShiftButton); + m_bShiftPressed = (e->state() & TQt::ShiftButton); calculateSelectionBounds(); } @@ -4653,21 +4641,21 @@ void KviIrcView::mousePressEvent(QMouseEvent *e) delete m_pLastEvent; m_pLastEvent = 0; } else { - m_iMouseTimer = startTimer(QApplication::doubleClickInterval()); - m_pLastEvent = new QMouseEvent(*e); + m_iMouseTimer = startTimer(TQApplication::doubleClickInterval()); + m_pLastEvent = new TQMouseEvent(*e); } } else { mouseRealPressEvent(e); } } -void KviIrcView::mouseRealPressEvent(QMouseEvent *e) +void KviIrcView::mouseRealPressEvent(TQMouseEvent *e) { - QString linkCmd; - QString linkText; + TQString linkCmd; + TQString linkText; getLinkUnderMouse(e->pos().x(),e->pos().y(),0,&linkCmd,&linkText); - QString szCmd(linkCmd); + TQString szCmd(linkCmd); szCmd.remove(0,1); KviKvsVariantList * pParams = new KviKvsVariantList(); @@ -4677,11 +4665,11 @@ void KviIrcView::mouseRealPressEvent(QMouseEvent *e) pParams->append(szCmd); - if(!(e->state() & Qt::ControlButton))//(e->button() & Qt::RightButton) && ( + if(!(e->state() & TQt::ControlButton))//(e->button() & Qt::RightButton) && ( { if(!linkCmd.isEmpty()) { - switch(linkCmd[0].unicode()) + switch(linkCmd[0].tqunicode()) { case 'n': { @@ -4699,7 +4687,7 @@ void KviIrcView::mouseRealPressEvent(QMouseEvent *e) { if(m_pKviWindow->inherits("KviChannel")) { KviChannel *c = (KviChannel*)m_pKviWindow; - QString nick; + TQString nick; if(pParams->firstAsString(nick)) c->userListView()->select(nick); } @@ -4707,8 +4695,8 @@ void KviIrcView::mouseRealPressEvent(QMouseEvent *e) } } else bTrigger = true; break; - case KVI_WINDOW_TYPE_QUERY: - if(KviQString::equalCI(((KviQuery *)m_pKviWindow)->windowName(),linkText)) + case KVI_WINDOW_TYPE_TQUERY: + if(KviTQString::equalCI(((KviQuery *)m_pKviWindow)->windowName(),linkText)) { if(e->button() & Qt::RightButton) KVS_TRIGGER_EVENT(KviEvent_OnQueryNickPopupRequest,m_pKviWindow,pParams); @@ -4760,7 +4748,7 @@ void KviIrcView::mouseRealPressEvent(QMouseEvent *e) { if(e->button() & Qt::RightButton) { - QString tmp; + TQString tmp; getLinkEscapeCommand(tmp,linkCmd,"[!rbt]"); if(!tmp.isEmpty()) { @@ -4772,10 +4760,10 @@ void KviIrcView::mouseRealPressEvent(QMouseEvent *e) } } else if(e->button() & Qt::RightButton) emit rightClicked(); - } else if((e->button() & Qt::MidButton) || ((e->button() & Qt::RightButton) && (e->state() & Qt::ControlButton))) + } else if((e->button() & Qt::MidButton) || ((e->button() & Qt::RightButton) && (e->state() & TQt::ControlButton))) { - QString tmp; - getLinkEscapeCommand(tmp,linkCmd,QString("[!mbt]")); + TQString tmp; + getLinkEscapeCommand(tmp,linkCmd,TQString("[!mbt]")); if(!tmp.isEmpty()) { KviKvsScript::run(tmp,m_pKviWindow,pParams); @@ -4788,19 +4776,19 @@ void KviIrcView::mouseRealPressEvent(QMouseEvent *e) //================ mouseReleaseEvent ===============// -void KviIrcView::mouseReleaseEvent(QMouseEvent *) +void KviIrcView::mouseReleaseEvent(TQMouseEvent *) { if(m_iSelectTimer) { killTimer(m_iSelectTimer); m_iSelectTimer = 0; - QClipboard * c = QApplication::clipboard(); + TQClipboard * c = TQApplication::tqclipboard(); if(c) { // copy to both! - c->setText(m_szLastSelection,QClipboard::Clipboard); + c->setText(m_szLastSelection,TQClipboard::Clipboard); if(c->supportsSelection()) - c->setText(m_szLastSelection,QClipboard::Selection); + c->setText(m_szLastSelection,TQClipboard::Selection); } } @@ -4814,13 +4802,13 @@ void KviIrcView::mouseReleaseEvent(QMouseEvent *) m_pMessagesStoppedWhileSelecting->removeFirst(); appendLine(l,false); } - repaint(); + tqrepaint(); } } // FIXME: #warning "The tooltip timeout should be small, because the view scrolls!" -void KviIrcView::mouseMoveEvent(QMouseEvent *e) +void KviIrcView::mouseMoveEvent(TQMouseEvent *e) { // debug("Pos : %d,%d",e->pos().x(),e->pos().y()); if(m_bMouseIsDown && (e->state() & Qt::LeftButton)) // m_bMouseIsDown MUST BE true...(otherwise the mouse entered the window with the button pressed ?) @@ -4846,7 +4834,7 @@ void KviIrcView::mouseMoveEvent(QMouseEvent *e) int yPos = e->pos().y(); int rectTop; int rectHeight; - QRect rctLink; + TQRect rctLink; KviIrcViewWrappedBlock * newLinkUnderMouse = getLinkUnderMouse(e->pos().x(),yPos,&rctLink); rectTop = rctLink.y(); @@ -4859,7 +4847,7 @@ void KviIrcView::mouseMoveEvent(QMouseEvent *e) m_pLastLinkUnderMouse = newLinkUnderMouse; if(m_pLastLinkUnderMouse) { - setCursor(Qt::PointingHandCursor); + setCursor(TQt::PointingHandCursor); if(rectTop < 0)rectTop = 0; if((rectTop + rectHeight) > height())rectHeight = height() - rectTop; @@ -4869,22 +4857,22 @@ void KviIrcView::mouseMoveEvent(QMouseEvent *e) int top = (rectTop < m_iLastLinkRectTop) ? rectTop : m_iLastLinkRectTop; int lastBottom = m_iLastLinkRectTop + m_iLastLinkRectHeight; int thisBottom = rectTop + rectHeight; - QRect r(0,top,width(),((lastBottom > thisBottom) ? lastBottom : thisBottom) - top); - repaint(r); + TQRect r(0,top,width(),((lastBottom > thisBottom) ? lastBottom : thisBottom) - top); + tqrepaint(r); } else { // no prev link - QRect r(0,rectTop,width(),rectHeight); - repaint(r); + TQRect r(0,rectTop,width(),rectHeight); + tqrepaint(r); } m_iLastLinkRectTop = rectTop; m_iLastLinkRectHeight = rectHeight; } else { - setCursor(Qt::ArrowCursor); + setCursor(TQt::ArrowCursor); if(m_iLastLinkRectHeight > -1) { // There was a previous bottom rect - QRect r(0,m_iLastLinkRectTop,width(),m_iLastLinkRectHeight); - repaint(r); + TQRect r(0,m_iLastLinkRectTop,width(),m_iLastLinkRectHeight); + tqrepaint(r); m_iLastLinkRectTop = -1; m_iLastLinkRectHeight = -1; } @@ -4899,16 +4887,16 @@ KviConsole * KviIrcView::console() return m_pKviWindow->console(); } -void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkText) +void KviIrcView::doLinkToolTip(const TQRect &rct,TQString &linkCmd,TQString &linkText) { if(linkCmd.isEmpty())return; - QString szCmd(linkCmd); + TQString szCmd(linkCmd); szCmd.remove(0,1); - QString tip; + TQString tip; - switch(linkCmd[0].unicode()) + switch(linkCmd[0].tqunicode()) { case 'u': // url link { @@ -4922,7 +4910,7 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe tip += linkText; } tip+="</nowrap></font></u></td></tr><tr><td>"; - QMimeSourceFactory::defaultFactory()->setPixmap("url_icon",*(g_pIconManager->getSmallIcon(KVI_SMALLICON_URL))); + TQMimeSourceFactory::defaultFactory()->setPixmap("url_icon",*(g_pIconManager->getSmallIcon(KVI_SMALLICON_URL))); tip += __tr2qs("Double-click to open this link"); tip += "</td></tr></table>"; } @@ -4939,11 +4927,11 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe tip += linkText; } tip+="</nowrap></font></u></td></tr><tr><td>"; - QMimeSourceFactory::defaultFactory()->setPixmap("host_icon",*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER))); + TQMimeSourceFactory::defaultFactory()->setPixmap("host_icon",*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER))); - if(linkText.find('*') != -1) + if(linkText.tqfind('*') != -1) { - if(linkText.length() > 1)tip += __tr2qs("Unable to look it up hostname: Hostname appears to be masked"); + if(linkText.length() > 1)tip += __tr2qs("Unable to look it up hostname: Hostname appears to be tqmasked"); else tip += __tr2qs("Unable to look it up hostname: Unknown host"); } else { tip += __tr2qs("Double-click to look up this hostname<br>Right-click to view other options"); @@ -4957,7 +4945,7 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe tip = "<table width=\"100%\">" \ "<tr><td valign=\"center\"><img src=\"server_icon\"> <u><font color=\"blue\"><nowrap>"; - QMimeSourceFactory::defaultFactory()->setPixmap("server_icon",*(g_pIconManager->getSmallIcon(KVI_SMALLICON_IRC))); + TQMimeSourceFactory::defaultFactory()->setPixmap("server_icon",*(g_pIconManager->getSmallIcon(KVI_SMALLICON_IRC))); if(linkText.length() > 50) { tip += linkText.left(47); @@ -4967,7 +4955,7 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe } tip+="</nowrap></font></u></td></tr><tr><td>"; - if(linkText.find('*') != -1) + if(linkText.tqfind('*') != -1) { if(linkText.length() > 1)tip += __tr2qs("Server appears to be a network hub<br>"); else tip += __tr2qs("Unknown server<br>"); // might happen... @@ -4983,12 +4971,12 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe { if(((KviChannel *)m_pKviWindow)->isMeOp()) { - QChar plmn = linkCmd[1]; - if((plmn.unicode() == '+') || (plmn.unicode() == '-')) + TQChar plmn = linkCmd[1]; + if((plmn.tqunicode() == '+') || (plmn.tqunicode() == '-')) { tip = __tr2qs("Double-click to set<br>"); - QChar flag = linkCmd[2]; - switch(flag.unicode()) + TQChar flag = linkCmd[2]; + switch(flag.tqunicode()) { case 'o': case 'v': @@ -4999,10 +4987,10 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe case 'I': case 'e': case 'k': - KviQString::appendFormatted(tip,QString("<b>mode %Q %c%c %Q</b>"),&(m_pKviWindow->windowName()),plmn.latin1(),flag.latin1(),&linkText); + KviTQString::appendFormatted(tip,TQString("<b>mode %Q %c%c %Q</b>"),&(m_pKviWindow->windowName()),plmn.latin1(),flag.latin1(),&linkText); break; default: - KviQString::appendFormatted(tip,QString("<b>mode %Q %c%c</b>"),&(m_pKviWindow->windowName()),plmn.latin1(),flag.latin1()); + KviTQString::appendFormatted(tip,TQString("<b>mode %Q %c%c</b>"),&(m_pKviWindow->windowName()),plmn.latin1(),flag.latin1()); break; } } @@ -5019,14 +5007,14 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe { if(console()->connection()) { - KviIrcUserEntry * e = console()->connection()->userDataBase()->find(linkText); + KviIrcUserEntry * e = console()->connection()->userDataBase()->tqfind(linkText); if(e) { - QString buffer; + TQString buffer; console()->getUserTipText(linkText,e,buffer); tip = buffer; - } else KviQString::sprintf(tip,__tr2qs("Nothing known about %Q"),&linkText); - } else KviQString::sprintf(tip,__tr2qs("Nothing known about %Q (no connection)"),&linkText); + } else KviTQString::sprintf(tip,__tr2qs("Nothing known about %Q"),&linkText); + } else KviTQString::sprintf(tip,__tr2qs("Nothing known about %Q (no connection)"),&linkText); } } break; @@ -5034,30 +5022,30 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe { if(console() && console()->connection()) { - QString szChan = linkText; - QString buf; + TQString szChan = linkText; + TQString buf; tip = "<img src=\"chan_icon\"> "; - QMimeSourceFactory::defaultFactory()->setPixmap("chan_icon",*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL))); + TQMimeSourceFactory::defaultFactory()->setPixmap("chan_icon",*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL))); if(szCmd.length()>0) szChan=szCmd; KviChannel * c = console()->connection()->findChannel(szChan); - QString szUrl; + TQString szUrl; if(c) { - QString chanMode; + TQString chanMode; c->getChannelModeString(chanMode); - QString topic = KviMircCntrl::stripControlBytes(c->topicWidget()->topic()); - topic.replace("<","<"); - topic.replace(">",">"); + TQString topic = KviMircCntrl::stripControlBytes(c->topicWidget()->topic()); + topic.tqreplace("<","<"); + topic.tqreplace(">",">"); KviIrcUrl::join(szUrl,console()->connection()->target()->server()); szUrl.append(szChan); - KviQString::sprintf(buf,__tr2qs("<b>%Q</b> (<u><font color=\"blue\"><nowrap>" + KviTQString::sprintf(buf,__tr2qs("<b>%Q</b> (<u><font color=\"blue\"><nowrap>" "%Q</nowrap></font></u>): <br><nowrap>+%Q (%u users)<hr>%Q</nowrap>"),&szChan,&szUrl,&chanMode, c->count(),&topic); } else { KviIrcUrl::join(szUrl,console()->connection()->target()->server()); szUrl.append(szChan); - KviQString::sprintf(buf,__tr2qs("<b>%Q</b> (<u><font color=\"blue\"><nowrap>" + KviTQString::sprintf(buf,__tr2qs("<b>%Q</b> (<u><font color=\"blue\"><nowrap>" "%Q</nowrap></font></u>)<hr>Double-click to join %Q<br>Right click to view other options"),&szChan,&szUrl,&szChan); } @@ -5067,7 +5055,7 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe break; default: { - QString dbl,rbt,txt,mbt; + TQString dbl,rbt,txt,mbt; getLinkEscapeCommand(dbl,linkCmd,"[!dbl]"); getLinkEscapeCommand(rbt,linkCmd,"[!rbt]"); getLinkEscapeCommand(txt,linkCmd,"[!txt]"); @@ -5077,17 +5065,17 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe if(tip.isEmpty() && (!dbl.isEmpty())) { if(!tip.isEmpty())tip.append("<hr>"); - KviQString::appendFormatted(tip,__tr2qs("<b>Double-click:</b><br>%Q"),&dbl); + KviTQString::appendFormatted(tip,__tr2qs("<b>Double-click:</b><br>%Q"),&dbl); } if(tip.isEmpty() && (!mbt.isEmpty())) { if(!tip.isEmpty())tip.append("<hr>"); - KviQString::appendFormatted(tip,__tr2qs("<b>Middle-click:</b><br>%Q"),&mbt); + KviTQString::appendFormatted(tip,__tr2qs("<b>Middle-click:</b><br>%Q"),&mbt); } if(tip.isEmpty() && (!rbt.isEmpty())) { if(!tip.isEmpty())tip.append("<hr>"); - KviQString::appendFormatted(tip,__tr2qs("<b>Right-click:</b><br>%Q"),&rbt); + KviTQString::appendFormatted(tip,__tr2qs("<b>Right-click:</b><br>%Q"),&rbt); } } break; @@ -5097,7 +5085,7 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe m_pToolTip->doTip(rct,tip); } -void KviIrcView::leaveEvent ( QEvent * ) +void KviIrcView::leaveEvent ( TQEvent * ) { if(m_pLastLinkUnderMouse) { @@ -5105,14 +5093,14 @@ void KviIrcView::leaveEvent ( QEvent * ) update(); } } -void KviIrcView::timerEvent(QTimerEvent *e) +void KviIrcView::timerEvent(TQTimerEvent *e) { - m_mouseCurrentPos = mapFromGlobal(QCursor::pos()); + m_mouseCurrentPos = mapFromGlobal(TQCursor::pos()); if(e->timerId() == m_iSelectTimer) { calculateSelectionBounds(); - repaint(); + tqrepaint(); } if(e->timerId() == m_iMouseTimer) { @@ -5128,15 +5116,15 @@ void KviIrcView::timerEvent(QTimerEvent *e) } } -void KviIrcView::keyPressEvent(QKeyEvent *e) +void KviIrcView::keyPressEvent(TQKeyEvent *e) { switch(e->key()) { - case Qt::Key_PageUp: + case TQt::Key_PageUp: prevPage(); e->accept(); break; - case Qt::Key_PageDown: + case TQt::Key_PageDown: nextPage(); e->accept(); break; @@ -5145,12 +5133,12 @@ void KviIrcView::keyPressEvent(QKeyEvent *e) } } -void KviIrcView::maybeTip(const QPoint &pnt) +void KviIrcView::maybeTip(const TQPoint &pnt) { - QString linkCmd; - QString linkText; + TQString linkCmd; + TQString linkText; - QRect rctLink; + TQRect rctLink; KviIrcViewWrappedBlock * linkUnderMouse = getLinkUnderMouse(pnt.x(),pnt.y(),&rctLink,&linkCmd,&linkText); diff --git a/src/kvirc/ui/kvi_ircview.h b/src/kvirc/ui/kvi_ircview.h index 62ee3e7..e462a73 100644 --- a/src/kvirc/ui/kvi_ircview.h +++ b/src/kvirc/ui/kvi_ircview.h @@ -28,14 +28,14 @@ #include "kvi_string.h" #include "kvi_pointerlist.h" -#include <qwidget.h> -#include <qpixmap.h> // needed - -class QScrollBar; -class QLineEdit; -class QFile; -class QToolButton; -class QFontMetrics; +#include <tqwidget.h> +#include <tqpixmap.h> // needed + +class TQScrollBar; +class TQLineEdit; +class TQFile; +class TQToolButton; +class TQFontMetrics; class KviTalPopupMenu; class KviWindow; @@ -51,30 +51,31 @@ typedef struct _KviIrcViewWrappedBlockSelectionInfoTag KviIrcViewWrappedBlockSel #define KVI_IRCVIEW_INVALID_LINE_MARK_INDEX 0xffffffff -class KVIRC_API KviIrcView : public QWidget +class KVIRC_API KviIrcView : public TQWidget { Q_OBJECT - Q_PROPERTY(int TransparencyCapable READ dummyRead) - // we cannot #ifdef due to a bug in moc - Q_PROPERTY(bool usePaintOnScreen READ getPaintOnScreen WRITE setPaintOnScreen) + TQ_OBJECT + TQ_PROPERTY(int TransparencyCapable READ dummyRead) + // we cannot #ifdef due to a bug in tqmoc + TQ_PROPERTY(bool usePaintOnScreen READ getPaintOnScreen WRITE setPaintOnScreen) public: friend class KviIrcViewToolTip; friend class KviIrcViewToolWidget; public: - KviIrcView(QWidget *parent,KviFrame *pFrm,KviWindow *pWnd); + KviIrcView(TQWidget *tqparent,KviFrame *pFrm,KviWindow *pWnd); ~KviIrcView(); public: int dummyRead() const { return 0; }; #ifdef COMPILE_USE_QT4 - bool getPaintOnScreen() const { return testAttribute(Qt::WA_PaintOnScreen);}; - void setPaintOnScreen(bool bFlag){setAttribute(Qt::WA_PaintOnScreen,bFlag);} ; + bool getPaintOnScreen() const { return testAttribute(TQt::WA_PaintOnScreen);}; + void setPaintOnScreen(bool bFlag){setAttribute(TQt::WA_PaintOnScreen,bFlag);} ; #else - // hack to fix moc bug on win qt4 + // hack to fix tqmoc bug on win qt4 bool getPaintOnScreen() const { return 0;}; void setPaintOnScreen(bool bFlag){} ; #endif private: -// QDate m_lastLogDay; +// TQDate m_lastLogDay; int m_iFlushTimer; KviIrcViewLine * m_pFirstLine; KviIrcViewLine * m_pCurLine; // Bottom line in the view @@ -92,9 +93,9 @@ private: unsigned int m_uNextLineIndex; - QPixmap * m_pPrivateBackgroundPixmap; - QScrollBar * m_pScrollBar; - QToolButton * m_pToolsButton; + TQPixmap * m_pPrivateBackgroundPixmap; + TQScrollBar * m_pScrollBar; + TQToolButton * m_pToolsButton; KviTalPopupMenu * m_pToolsPopup; KviIrcViewToolWidget * m_pToolWidget; @@ -113,8 +114,8 @@ private: int m_iIconWidth; int m_iIconSideSpacing; - QPoint m_mousePressPos; - QPoint m_mouseCurrentPos; + TQPoint m_mousePressPos; + TQPoint m_mouseCurrentPos; // Selection int m_iSelectionBegin; @@ -131,20 +132,20 @@ private: int m_iSelectTimer; int m_iMouseTimer; //int m_iTipTimer; - QString m_szLastSelection; - QString m_szLastSelectionLine; + TQString m_szLastSelection; + TQString m_szLastSelectionLine; KviWindow * m_pKviWindow; KviIrcViewWrappedBlockSelectionInfo * m_pWrappedBlockSelectionInfo; - QFile * m_pLogFile; + TQFile * m_pLogFile; KviFrame * m_pFrm; bool m_bAcceptDrops; int m_iUnprocessedPaintEventRequests; bool m_bPostedPaintEventPending; KviPointerList<KviIrcViewLine> * m_pMessagesStoppedWhileSelecting; KviIrcView * m_pMasterView; - QFontMetrics * m_pFm; // assume this valid only inside a paint event (may be 0 in other circumstances) + TQFontMetrics * m_pFm; // assume this valid only inside a paint event (may be 0 in other circumstances) - QMouseEvent * m_pLastEvent; + TQMouseEvent * m_pLastEvent; KviIrcViewToolTip * m_pToolTip; bool m_bHaveUnreadedHighlightedMessages; @@ -162,28 +163,28 @@ public: bool hasLineMark(){ return m_uLineMarkLineIndex != KVI_IRCVIEW_INVALID_LINE_MARK_INDEX; }; void removeHeadLine(bool bRepaint=false); void emptyBuffer(bool bRepaint=true); - void getTextBuffer(QString &buffer); + void getTextBuffer(TQString &buffer); void setMaxBufferSize(int maxBufSize,bool bRepaint=true); int maxBufferSize(){ return m_iMaxLines; }; //Never used ? bool saveBuffer(const char *filename); - void findNext(const QString& szText,bool bCaseS = false,bool bRegExp = false,bool bExtended = false); - void findPrev(const QString& szText,bool bCaseS = false,bool bRegExp = false,bool bExtended = false); - KviWindow * parentKviWindow(){ return m_pKviWindow; }; + void findNext(const TQString& szText,bool bCaseS = false,bool bRegExp = false,bool bExtended = false); + void findPrev(const TQString& szText,bool bCaseS = false,bool bRegExp = false,bool bExtended = false); + KviWindow * tqparentKviWindow(){ return m_pKviWindow; }; KviConsole * console(); // A null pixmap passed here unsets the private backgrdound. - void setPrivateBackgroundPixmap(const QPixmap &pixmap,bool bRepaint=true); + void setPrivateBackgroundPixmap(const TQPixmap &pixmap,bool bRepaint=true); bool hasPrivateBackgroundPixmap(){ return (m_pPrivateBackgroundPixmap != 0); }; //============================================================================================== // Logging // Stops previous logging session too... - bool startLogging(const QString& fname = QString::null,bool bPrependCurBuffer = false); + bool startLogging(const TQString& fname = TQString(),bool bPrependCurBuffer = false); void stopLogging(); bool isLogging(){ return (m_pLogFile != 0); }; void getLogFileName(KviStr &buffer); - void getLogFileName(QString &buffer); + void getLogFileName(TQString &buffer); //void add2Log(const char *buffer,int buf_len=-1); - void add2Log(const QString &szBuffer,int iMsgType=0); + void add2Log(const TQString &szBuffer,int iMsgType=0); //============================================================================================== // Channel view splitting @@ -196,10 +197,10 @@ public: void nextLine(); void nextPage(); void prevPage(); - virtual QSize sizeHint() const; - const QString & lastLineOfText(); - const QString & lastMessageText(); - virtual void setFont(const QFont &f); + virtual TQSize tqsizeHint() const; + const TQString & lastLineOfText(); + const TQString & lastMessageText(); + virtual void setFont(const TQFont &f); public slots: void flushLog(); void showToolsPopup(); @@ -217,33 +218,33 @@ signals: private: void setCursorLine(KviIrcViewLine * l); KviIrcViewLine * getVisibleLineAt(int xPos,int yPos); - void getLinkEscapeCommand(QString &buffer,const QString &escape_cmd,const QString &escape_label); + void getLinkEscapeCommand(TQString &buffer,const TQString &escape_cmd,const TQString &escape_label); void appendLine(KviIrcViewLine *ptr,bool bRepaint); void postUpdateEvent(); void fastScroll(int lines = 1); const kvi_wchar_t * getTextLine(int msg_type,const kvi_wchar_t * data_ptr,KviIrcViewLine *line_ptr,bool bEnableTimeStamp = true); void calculateLineWraps(KviIrcViewLine *ptr,int maxWidth); - void recalcFontVariables(const QFontMetrics &fm,const QFontInfo &fi); + void recalcFontVariables(const TQFontMetrics &fm,const TQFontInfo &fi); bool checkSelectionBlock(KviIrcViewLine * line,int left,int bottom,int bufIndex); void calculateSelectionBounds(); - KviIrcViewWrappedBlock * getLinkUnderMouse(int xPos,int yPos,QRect * pRect = 0,QString * linkCmd = 0,QString * linkText = 0); - void doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkText); + KviIrcViewWrappedBlock * getLinkUnderMouse(int xPos,int yPos,TQRect * pRect = 0,TQString * linkCmd = 0,TQString * linkText = 0); + void doLinkToolTip(const TQRect &rct,TQString &linkCmd,TQString &linkText); protected: - virtual void paintEvent(QPaintEvent *); - virtual void resizeEvent(QResizeEvent *); - virtual void mousePressEvent(QMouseEvent *e); - virtual void mouseRealPressEvent(QMouseEvent *e); - virtual void mouseReleaseEvent(QMouseEvent *); - virtual void mouseDoubleClickEvent(QMouseEvent *e); - virtual void mouseMoveEvent(QMouseEvent *e); - virtual void timerEvent(QTimerEvent *e); - virtual void dragEnterEvent(QDragEnterEvent *e); - virtual void dropEvent(QDropEvent *e); - virtual bool event(QEvent *e); - virtual void wheelEvent(QWheelEvent *e); - virtual void keyPressEvent(QKeyEvent *e); - void maybeTip(const QPoint &pnt); - virtual void leaveEvent ( QEvent * ); + virtual void paintEvent(TQPaintEvent *); + virtual void resizeEvent(TQResizeEvent *); + virtual void mousePressEvent(TQMouseEvent *e); + virtual void mouseRealPressEvent(TQMouseEvent *e); + virtual void mouseReleaseEvent(TQMouseEvent *); + virtual void mouseDoubleClickEvent(TQMouseEvent *e); + virtual void mouseMoveEvent(TQMouseEvent *e); + virtual void timerEvent(TQTimerEvent *e); + virtual void dragEnterEvent(TQDragEnterEvent *e); + virtual void dropEvent(TQDropEvent *e); + virtual bool event(TQEvent *e); + virtual void wheelEvent(TQWheelEvent *e); + virtual void keyPressEvent(TQKeyEvent *e); + void maybeTip(const TQPoint &pnt); + virtual void leaveEvent ( TQEvent * ); protected slots: virtual void scrollBarPositionChanged(int newValue); void masterDead(); diff --git a/src/kvirc/ui/kvi_ircviewprivate.h b/src/kvirc/ui/kvi_ircviewprivate.h index 0a2dea2..790976b 100644 --- a/src/kvirc/ui/kvi_ircviewprivate.h +++ b/src/kvirc/ui/kvi_ircviewprivate.h @@ -25,7 +25,7 @@ //========================================================================================================= #include "kvi_settings.h" -#include <qstring.h> +#include <tqstring.h> //========================================================================================================= // Internal data structures @@ -83,8 +83,8 @@ typedef struct _KviIrcViewLineChunk unsigned char back; // optional background color for KVI_TEXT_COLOR attribute unsigned char fore; // optional foreground color for KVI_TEXT_COLOR attribute (used also for KVI_TEXT_ESCAPE!!!) } _KVI_PACKED colors; // anonymous -// QColor customBack; - QColor customFore; +// TQColor customBack; + TQColor customFore; } /*_KVI_PACKED*/ KviIrcViewLineChunk; // @@ -104,7 +104,7 @@ typedef struct _KviIrcViewLine { // this is a text line in the IrcView's memory unsigned int uIndex; // index of the text line (needed for find and splitting) - QString szText; // data string without color codes nor escapes... + TQString szText; // data string without color codes nor escapes... int iMsgType; // type of the line (defines icon and colors) // At line instert time the szData text is splitted in parts which @@ -148,7 +148,7 @@ typedef struct _KviIrcViewWrappedBlockSelectionInfoTag #endif //!COMPILE_ON_WINDOWS //========================================================================================================= -// Screen layout +// Screen tqlayout //========================================================================================================= //FIRST LINE (prev_line = 0) <---m_pFirstLine diff --git a/src/kvirc/ui/kvi_ircviewtools.cpp b/src/kvirc/ui/kvi_ircviewtools.cpp index ea47310..c6f4138 100644 --- a/src/kvirc/ui/kvi_ircviewtools.cpp +++ b/src/kvirc/ui/kvi_ircviewtools.cpp @@ -36,21 +36,21 @@ #include "kvi_app.h" #include "kvi_memmove.h" -#include <qtoolbutton.h> -#include <qtabwidget.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qcheckbox.h> -#include <qpushbutton.h> +#include <tqtoolbutton.h> +#include <tqtabwidget.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqcheckbox.h> +#include <tqpushbutton.h> #ifdef COMPILE_USE_QT4 - #include <q3header.h> + #include <tq3header.h> #else - #include <qheader.h> + #include <tqheader.h> #endif -#include <qlineedit.h> -#include <qcursor.h> +#include <tqlineedit.h> +#include <tqcursor.h> #include "kvi_accel.h" -#include <qevent.h> +#include <tqevent.h> /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // @@ -60,7 +60,7 @@ KviIrcMessageCheckListItem::KviIrcMessageCheckListItem(KviTalListView * par,KviIrcViewToolWidget * w,int id) -: KviTalCheckListItem(par,QString::null,KviTalCheckListItem::CheckBox) +: KviTalCheckListItem(par,TQString(),KviTalCheckListItem::CheckBox) { m_iId = id; m_pToolWidget = 0; @@ -83,37 +83,37 @@ void KviIrcMessageCheckListItem::stateChange(bool bOn) KviIrcViewToolWidget::KviIrcViewToolWidget(KviIrcView * par) -: QFrame(par) +: TQFrame(par) { m_pIrcView = par; - setFrameStyle(QFrame::StyledPanel | QFrame::Raised); + setFrameStyle(TQFrame::StyledPanel | TQFrame::Raised); - QGridLayout * gl = new QGridLayout(this,2,2,4,2); + TQGridLayout * gl = new TQGridLayout(this,2,2,4,2); - QLabel * l = new QLabel(__tr2qs("<b><font color=\"#EAEAEA\" size=\"-1\">Find Text</font></b>"),this); + TQLabel * l = new TQLabel(__tr2qs("<b><font color=\"#EAEAEA\" size=\"-1\">Find Text</font></b>"),this); l->setMaximumHeight(14); - l->setBackgroundColor(Qt::black); + l->setBackgroundColor(TQt::black); gl->addWidget(l,0,0); - QToolButton *tb = new QToolButton(Qt::DownArrow,this,"down_arrow"); + TQToolButton *tb = new TQToolButton(TQt::DownArrow,this,"down_arrow"); tb->setFixedSize(14,14); tb->setAutoRepeat(false); - connect(tb,SIGNAL(clicked()),m_pIrcView,SLOT(toggleToolWidget())); + connect(tb,TQT_SIGNAL(clicked()),m_pIrcView,TQT_SLOT(toggleToolWidget())); gl->addWidget(tb,0,1); - QTabWidget * tw = new QTabWidget(this); + TQTabWidget * tw = new TQTabWidget(this); // Find tab - QWidget * w = new QWidget(tw); + TQWidget * w = new TQWidget(tw); - QGridLayout * g = new QGridLayout(w,6,2,2,1); + TQGridLayout * g = new TQGridLayout(w,6,2,2,1); - m_pStringToFind = new QLineEdit(w); + m_pStringToFind = new TQLineEdit(w); g->addMultiCellWidget(m_pStringToFind,0,0,0,2); - connect(m_pStringToFind,SIGNAL(returnPressed()),this,SLOT(findNext())); + connect(m_pStringToFind,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(findNext())); m_pRegExp = new KviStyledCheckBox(__tr2qs("&Regular expression"),w); g->addMultiCellWidget(m_pRegExp,1,1,0,2); @@ -121,37 +121,37 @@ KviIrcViewToolWidget::KviIrcViewToolWidget(KviIrcView * par) m_pExtendedRegExp = new KviStyledCheckBox(__tr2qs("E&xtended regexp."),w); g->addMultiCellWidget(m_pExtendedRegExp,2,2,0,2); m_pExtendedRegExp->setEnabled(false); - connect(m_pRegExp,SIGNAL(toggled(bool)),m_pExtendedRegExp,SLOT(setEnabled(bool))); + connect(m_pRegExp,TQT_SIGNAL(toggled(bool)),m_pExtendedRegExp,TQT_SLOT(setEnabled(bool))); m_pCaseSensitive = new KviStyledCheckBox(__tr2qs("C&ase sensitive"),w); g->addMultiCellWidget(m_pCaseSensitive,3,3,0,2); - QPushButton * pb = new QPushButton(__tr2qs("Find &Prev."),w); - connect(pb,SIGNAL(clicked()),this,SLOT(findPrev())); + TQPushButton * pb = new TQPushButton(__tr2qs("Find &Prev."),w); + connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(findPrev())); g->addWidget(pb,4,0); - pb = new QPushButton(__tr2qs("&Find Next"),w); + pb = new TQPushButton(__tr2qs("&Find Next"),w); pb->setDefault(true); - connect(pb,SIGNAL(clicked()),this,SLOT(findNext())); + connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(findNext())); g->addMultiCellWidget(pb,4,4,1,2); - m_pFindResult = new QLabel(w); - m_pFindResult->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel); + m_pFindResult = new TQLabel(w); + m_pFindResult->setFrameStyle(TQFrame::Sunken | TQFrame::StyledPanel); g->addMultiCellWidget(m_pFindResult,5,5,0,2); - //g->setResizeMode(QGridLayout::Fixed); + //g->setResizeMode(TQGridLayout::Fixed); tw->addTab(w,__tr2qs("Find")); // Filter tab - QWidget * w1 = new QWidget(tw); + TQWidget * w1 = new TQWidget(tw); - g = new QGridLayout(w1,5,2,2,1); + g = new TQGridLayout(w1,5,2,2,1); m_pFilterView = new KviTalListView(w1); m_pFilterView->addColumn(__tr2qs("Type")); m_pFilterView->header()->hide(); - m_pFilterView->setMinimumSize(QSize(10,10)); + m_pFilterView->setMinimumSize(TQSize(10,10)); g->addMultiCellWidget(m_pFilterView,0,4,0,0); @@ -163,31 +163,31 @@ KviIrcViewToolWidget::KviIrcViewToolWidget(KviIrcView * par) m_pFilterItems[i] = new KviIrcMessageCheckListItem(m_pFilterView,this,i); } - pb = new QPushButton(__tr2qs("Set &All"),w1); - connect(pb,SIGNAL(clicked()),this,SLOT(filterEnableAll())); + pb = new TQPushButton(__tr2qs("Set &All"),w1); + connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(filterEnableAll())); g->addWidget(pb,0,1); - pb = new QPushButton(__tr2qs("Set &None"),w1); - connect(pb,SIGNAL(clicked()),this,SLOT(filterEnableNone())); + pb = new TQPushButton(__tr2qs("Set &None"),w1); + connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(filterEnableNone())); g->addWidget(pb,1,1); - pb = new QPushButton(__tr2qs("&Load From..."),w1); - connect(pb,SIGNAL(clicked()),this,SLOT(filterLoad())); + pb = new TQPushButton(__tr2qs("&Load From..."),w1); + connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(filterLoad())); g->addWidget(pb,2,1); - pb = new QPushButton(__tr2qs("&Save As..."),w1); - connect(pb,SIGNAL(clicked()),this,SLOT(filterSave())); + pb = new TQPushButton(__tr2qs("&Save As..."),w1); + connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(filterSave())); g->addWidget(pb,3,1); tw->addTab(w1,__tr2qs("Filter")); gl->addMultiCellWidget(tw,1,1,0,1); - gl->setResizeMode(QGridLayout::Fixed); + gl->setResizeMode(TQGridLayout::Fixed); m_pStringToFind->setFocus(); tw->showPage(w); KviAccel *a = new KviAccel( this ); - a->connectItem( a->insertItem(Qt::Key_Escape), this,SLOT(close()) ); + a->connectItem( a->insertItem(TQt::Key_Escape), this,TQT_SLOT(close()) ); } KviIrcViewToolWidget::~KviIrcViewToolWidget() @@ -217,23 +217,23 @@ void KviIrcViewToolWidget::filterEnableNone() forceRepaint(); } -void KviIrcViewToolWidget::hideEvent ( QHideEvent * ){ +void KviIrcViewToolWidget::hideEvent ( TQHideEvent * ){ m_pIrcView->toggleToolWidget(); } -void KviIrcViewToolWidget::closeEvent ( QCloseEvent * e ){ +void KviIrcViewToolWidget::closeEvent ( TQCloseEvent * e ){ m_pIrcView->toggleToolWidget(); } void KviIrcViewToolWidget::filterLoad() { - QString szFile; - QString szInit; + TQString szFile; + TQString szInit; g_pApp->getLocalKvircDirectory(szInit,KviApp::Filters); if(KviFileDialog::askForOpenFileName(szFile,__tr2qs("Select a Filter File"),szInit)) { - QFile f(szFile); + TQFile f(szFile); if(f.open(IO_ReadOnly)) { char buffer[KVI_NUM_MSGTYPE_OPTIONS]; @@ -255,12 +255,12 @@ void KviIrcViewToolWidget::filterLoad() void KviIrcViewToolWidget::filterSave() { - QString szFile; - QString szInit; + TQString szFile; + TQString szInit; g_pApp->getLocalKvircDirectory(szInit,KviApp::Filters,"filter.kvf"); if(KviFileDialog::askForSaveFileName(szFile,__tr2qs("Select a Name for the Filter File"),szInit,0,false,true)) { - QFile f(szFile); + TQFile f(szFile); if(f.open(IO_WriteOnly)) { char buffer[KVI_NUM_MSGTYPE_OPTIONS]; @@ -278,14 +278,14 @@ void KviIrcViewToolWidget::filterSave() void KviIrcViewToolWidget::forceRepaint() { #if defined(COMPILE_USE_QT4) && defined(COMPILE_ON_WINDOWS) - m_pIrcView->repaint(); + m_pIrcView->tqrepaint(); #else m_pIrcView->paintEvent(0); #endif } -void KviIrcViewToolWidget::setFindResult(const QString & text) +void KviIrcViewToolWidget::setFindResult(const TQString & text) { m_pFindResult->setText(text); } @@ -303,14 +303,14 @@ void KviIrcViewToolWidget::findNext() } -void KviIrcViewToolWidget::mousePressEvent(QMouseEvent *e) +void KviIrcViewToolWidget::mousePressEvent(TQMouseEvent *e) { m_pressPoint = e->pos(); } -void KviIrcViewToolWidget::mouseMoveEvent(QMouseEvent *) +void KviIrcViewToolWidget::mouseMoveEvent(TQMouseEvent *) { - QPoint p=m_pIrcView->mapFromGlobal(QCursor::pos()); + TQPoint p=m_pIrcView->mapFromGlobal(TQCursor::pos()); p-=m_pressPoint; if(p.x() < 1)p.setX(1); else { @@ -341,7 +341,7 @@ KviIrcViewToolTip::~KviIrcViewToolTip() { } -void KviIrcViewToolTip::maybeTip(const QPoint &pnt) +void KviIrcViewToolTip::maybeTip(const TQPoint &pnt) { m_pView->maybeTip(pnt); } diff --git a/src/kvirc/ui/kvi_ircviewtools.h b/src/kvirc/ui/kvi_ircviewtools.h index 248c180..8cf5781 100644 --- a/src/kvirc/ui/kvi_ircviewtools.h +++ b/src/kvirc/ui/kvi_ircviewtools.h @@ -27,14 +27,14 @@ #include "kvi_settings.h" #include "kvi_tal_tooltip.h" -#include <qframe.h> +#include <tqframe.h> #include "kvi_tal_listview.h" -#include <qstring.h> +#include <tqstring.h> -class QLabel; +class TQLabel; //class KviStyledCheckBox; #include "kvi_styled_controls.h" -class QLineEdit; +class TQLineEdit; class KviIrcView; @@ -46,9 +46,9 @@ public: protected: KviIrcView * m_pView; protected: - virtual void maybeTip(const QPoint &pnt); + virtual void maybeTip(const TQPoint &pnt); public: - void doTip(const QRect &rct,const QString &str){ tip(rct,str); }; + void doTip(const TQRect &rct,const TQString &str){ tip(rct,str); }; }; //========================================================================================================= @@ -76,30 +76,31 @@ public: class KviIrcView; -class KviIrcViewToolWidget : public QFrame +class KviIrcViewToolWidget : public TQFrame { friend class KviIrcView; Q_OBJECT + TQ_OBJECT protected: KviIrcViewToolWidget(KviIrcView * par); ~KviIrcViewToolWidget(); protected: KviIrcView * m_pIrcView; - QLineEdit * m_pStringToFind; - QPoint m_pressPoint; + TQLineEdit * m_pStringToFind; + TQPoint m_pressPoint; KviStyledCheckBox * m_pCaseSensitive; KviStyledCheckBox * m_pRegExp; KviStyledCheckBox * m_pExtendedRegExp; - QLabel * m_pFindResult; + TQLabel * m_pFindResult; KviTalListView * m_pFilterView; KviIrcMessageCheckListItem ** m_pFilterItems; public: - void setFindResult(const QString & text); + void setFindResult(const TQString & text); inline bool messageEnabled(int msg_type){ return m_pFilterItems[msg_type]->isOn(); } void forceRepaint(); protected slots: @@ -110,10 +111,10 @@ protected slots: void filterSave(); void filterLoad(); protected: - virtual void hideEvent( QHideEvent * ); - virtual void closeEvent( QCloseEvent * e ); - virtual void mouseMoveEvent(QMouseEvent *); - virtual void mousePressEvent(QMouseEvent *); + virtual void hideEvent( TQHideEvent * ); + virtual void closeEvent( TQCloseEvent * e ); + virtual void mouseMoveEvent(TQMouseEvent *); + virtual void mousePressEvent(TQMouseEvent *); }; #endif //!_KVI_IRCVIEWTOOLS_H_ diff --git a/src/kvirc/ui/kvi_listview.cpp b/src/kvirc/ui/kvi_listview.cpp index e9c4b23..7665287 100644 --- a/src/kvirc/ui/kvi_listview.cpp +++ b/src/kvirc/ui/kvi_listview.cpp @@ -27,16 +27,16 @@ #include "kvi_listview.h" -#include <qpainter.h> -#include <qpixmap.h> +#include <tqpainter.h> +#include <tqpixmap.h> #include "kvi_doublebuffer.h" -KviListView::KviListView( QWidget * parent, const char * name) -:KviTalListView(parent) +KviListView::KviListView( TQWidget * tqparent, const char * name) +:KviTalListView(tqparent) { m_pBackgroundOverlayPixmap=0; - m_iBackgroundOverlayAlignment=Qt::AlignAuto; + m_iBackgroundOverlayAlignment=TQt::AlignAuto; } KviListView::~KviListView() @@ -45,22 +45,22 @@ KviListView::~KviListView() delete m_pBackgroundOverlayPixmap; } -void KviListView::setBackgroundOverlayPixmap(QPixmap * pix,int iAlignmentFlags) +void KviListView::setBackgroundOverlayPixmap(TQPixmap * pix,int iAlignmentFlags) { setStaticBackground(TRUE); #ifdef COMPILE_USE_QT4 viewport()->setAutoFillBackground(false); #else - viewport()->setBackgroundMode(QWidget::NoBackground); + viewport()->setBackgroundMode(TQWidget::NoBackground); #endif - m_pBackgroundOverlayPixmap=new QPixmap(*pix); - m_iBackgroundOverlayAlignment= Qt::AlignRight | Qt::AlignBottom; - repaintContents(); + m_pBackgroundOverlayPixmap=new TQPixmap(*pix); + m_iBackgroundOverlayAlignment= TQt::AlignRight | TQt::AlignBottom; + tqrepaintContents(); } -void KviListView::drawContentsOffset(QPainter * p,int ox,int oy,int cx,int cy,int cw,int ch) +void KviListView::drawContentsOffset(TQPainter * p,int ox,int oy,int cx,int cy,int cw,int ch) { if(!m_pBackgroundOverlayPixmap) { @@ -73,36 +73,36 @@ void KviListView::drawContentsOffset(QPainter * p,int ox,int oy,int cx,int cy,in KviDoubleBuffer pix(viewport()->width(),viewport()->height()); - QPixmap * pMemPixmap = pix.pixmap(); + TQPixmap * pMemPixmap = pix.pixmap(); - QPainter pa(pMemPixmap); + TQPainter pa(pMemPixmap); int xx = cx - ox; int yy = cy - oy; - pa.fillRect(QRect(xx,yy,cw,ch),viewport()->backgroundColor()); + pa.fillRect(TQRect(xx,yy,cw,ch),viewport()->backgroundColor()); //KviTalListView::paintEmptyArea(&pa,); // compute the pixmap position int x,y; - if(m_iBackgroundOverlayAlignment == Qt::AlignAuto) + if(m_iBackgroundOverlayAlignment == TQt::AlignAuto) x=y=0; else { - if(m_iBackgroundOverlayAlignment & Qt::AlignLeft) + if(m_iBackgroundOverlayAlignment & TQt::AlignLeft) x=0; - else if ( m_iBackgroundOverlayAlignment & Qt::AlignRight ) + else if ( m_iBackgroundOverlayAlignment & TQt::AlignRight ) x=viewport()->width() - m_pBackgroundOverlayPixmap->width(); - else if( m_iBackgroundOverlayAlignment & Qt::AlignHCenter ) + else if( m_iBackgroundOverlayAlignment & TQt::AlignHCenter ) x=(viewport()->width() - m_pBackgroundOverlayPixmap->width())/2; else x=0; - if( m_iBackgroundOverlayAlignment & Qt::AlignTop ) + if( m_iBackgroundOverlayAlignment & TQt::AlignTop ) y=0; - else if ( m_iBackgroundOverlayAlignment & Qt::AlignBottom ) + else if ( m_iBackgroundOverlayAlignment & TQt::AlignBottom ) y=viewport()->height() - m_pBackgroundOverlayPixmap->height(); - else if ( m_iBackgroundOverlayAlignment & Qt::AlignVCenter ) + else if ( m_iBackgroundOverlayAlignment & TQt::AlignVCenter ) y=(viewport()->height() - m_pBackgroundOverlayPixmap->height())/2; else y=0; @@ -110,16 +110,16 @@ void KviListView::drawContentsOffset(QPainter * p,int ox,int oy,int cx,int cy,in pa.drawPixmap(xx,yy,*m_pBackgroundOverlayPixmap,xx-x,yy-y,cw,ch); - // Qt's auto double buffering is buggy and can't be disabled... too bad :/ + // TQt's auto double buffering is buggy and can't be disabled... too bad :/ // - // The Qt source for the listview painting is also totally unreadable - // (maybe that's why they have thrown this cool widget away in Qt4: unmantainable) + // The TQt source for the listview painting is also totally unreadable + // (maybe that's why they have thrown this cool widget away in TQt4: unmantainable) // // Anyway, I've noticed that when double buffering is choosen (and - // Qt seems to have a really complex logic to choose when to enable it + // TQt seems to have a really complex logic to choose when to enable it // and when not) then the painter passed to paintCell() of the // list view items is NOT this painter. It's the internal painter - // of the QSharedDoubleBuffer private Qt class. It's screwed + // of the TQSharedDoubleBuffer private TQt class. It's screwed // because of the multiple coordinate translations. With this // widget we screw it even more just because our paintEmptyArea() // does nothing and we do double buffering ourselves. @@ -133,7 +133,7 @@ void KviListView::drawContentsOffset(QPainter * p,int ox,int oy,int cx,int cy,in } -void KviListView::paintEmptyArea(QPainter * p,const QRect & rect) +void KviListView::paintEmptyArea(TQPainter * p,const TQRect & rect) { if(!m_pBackgroundOverlayPixmap) { @@ -146,35 +146,35 @@ void KviListView::paintEmptyArea(QPainter * p,const QRect & rect) /* KviDoubleBuffer pix(rect.right()+1,rect.bottom()+1); - QPixmap * pMemPixmap = pix.pixmap(); + TQPixmap * pMemPixmap = pix.pixmap(); - QPainter pa(pMemPixmap); + TQPainter pa(pMemPixmap); pa.fillRect(rect,viewport()->backgroundColor()); KviTalListView::paintEmptyArea(&pa,rect); - QPoint realTopLeft = p->xForm(rect.topLeft()); + TQPoint realTopLeft = p->xForm(rect.topLeft()); // compute the pixmap position int x,y; - if(m_iBackgroundOverlayAlignment == Qt::AlignAuto) + if(m_iBackgroundOverlayAlignment == TQt::AlignAuto) x=y=0; else { - if(m_iBackgroundOverlayAlignment & Qt::AlignLeft) + if(m_iBackgroundOverlayAlignment & TQt::AlignLeft) x=0; - else if ( m_iBackgroundOverlayAlignment & Qt::AlignRight ) + else if ( m_iBackgroundOverlayAlignment & TQt::AlignRight ) x=viewport()->width() - m_pBackgroundOverlayPixmap->width(); - else if( m_iBackgroundOverlayAlignment & Qt::AlignHCenter ) + else if( m_iBackgroundOverlayAlignment & TQt::AlignHCenter ) x=(viewport()->width() - m_pBackgroundOverlayPixmap->width())/2; else x=0; - if( m_iBackgroundOverlayAlignment & Qt::AlignTop ) + if( m_iBackgroundOverlayAlignment & TQt::AlignTop ) y=0; - else if ( m_iBackgroundOverlayAlignment & Qt::AlignBottom ) + else if ( m_iBackgroundOverlayAlignment & TQt::AlignBottom ) y=viewport()->height() - m_pBackgroundOverlayPixmap->height(); - else if ( m_iBackgroundOverlayAlignment & Qt::AlignVCenter ) + else if ( m_iBackgroundOverlayAlignment & TQt::AlignVCenter ) y=(viewport()->height() - m_pBackgroundOverlayPixmap->height())/2; else y=0; @@ -186,27 +186,27 @@ void KviListView::paintEmptyArea(QPainter * p,const QRect & rect) */ } -void KviListView::resizeEvent(QResizeEvent * e) +void KviListView::resizeEvent(TQResizeEvent * e) { KviTalListView::resizeEvent(e); if(m_pBackgroundOverlayPixmap) - repaintContents(); // force a full repaint (otherwise qt does not honor static background here) + tqrepaintContents(); // force a full tqrepaint (otherwise qt does not honor static background here) } #ifdef COMPILE_ON_WINDOWS -void KviListView::focusInEvent(QFocusEvent * e) +void KviListView::focusInEvent(TQFocusEvent * e) { KviTalListView::focusInEvent(e); if(m_pBackgroundOverlayPixmap) - repaintContents(); + tqrepaintContents(); } -void KviListView::focusOutEvent(QFocusEvent * e) +void KviListView::focusOutEvent(TQFocusEvent * e) { KviTalListView::focusOutEvent(e); if(m_pBackgroundOverlayPixmap) - repaintContents(); + tqrepaintContents(); } #endif diff --git a/src/kvirc/ui/kvi_listview.h b/src/kvirc/ui/kvi_listview.h index 8d39529..6f86d80 100644 --- a/src/kvirc/ui/kvi_listview.h +++ b/src/kvirc/ui/kvi_listview.h @@ -30,28 +30,29 @@ #include "kvi_tal_listview.h" -class QPainter; +class TQPainter; class KVIRC_API KviListView : public KviTalListView { Q_OBJECT + TQ_OBJECT public: - KviListView( QWidget * parent = 0, const char * name = 0); + KviListView( TQWidget * tqparent = 0, const char * name = 0); ~KviListView(); protected: - QPixmap * m_pBackgroundOverlayPixmap; + TQPixmap * m_pBackgroundOverlayPixmap; int m_iBackgroundOverlayAlignment; public: - virtual void setBackgroundOverlayPixmap(QPixmap* pix,int iAlignmentFlags = Qt::AlignAuto); + virtual void setBackgroundOverlayPixmap(TQPixmap* pix,int iAlignmentFlags = TQt::AlignAuto); public: void publicUpdateContents(){ updateContents(); }; // <-- unscrewContents(); :D protected: - virtual void paintEmptyArea(QPainter * p, const QRect & rect ); - virtual void drawContentsOffset(QPainter * p,int ox,int oy,int cx,int cy,int cw,int ch); - virtual void resizeEvent(QResizeEvent * e); + virtual void paintEmptyArea(TQPainter * p, const TQRect & rect ); + virtual void drawContentsOffset(TQPainter * p,int ox,int oy,int cx,int cy,int cw,int ch); + virtual void resizeEvent(TQResizeEvent * e); #ifdef COMPILE_ON_WINDOWS - virtual void focusInEvent(QFocusEvent * e); - virtual void focusOutEvent(QFocusEvent * e); + virtual void focusInEvent(TQFocusEvent * e); + virtual void focusOutEvent(TQFocusEvent * e); #endif }; diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/kvi_maskeditor.cpp index 744df1c..6a78a70 100644 --- a/src/kvirc/ui/kvi_maskeditor.cpp +++ b/src/kvirc/ui/kvi_maskeditor.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : kvi_maskeditor.cpp +// File : kvi_tqmaskeditor.cpp // Creation date : Tue Aug 30 2000 12:24:59 by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -32,17 +32,17 @@ #include "kvi_toolwindows_container.h" #include "kvi_channel.h" -#include <qlayout.h> -#include <qlabel.h> -#include <qvalidator.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqvalidator.h> -KviMaskItem::KviMaskItem(KviTalListView* parent,KviMaskEntry* entry) -:KviTalListViewItem(parent), m_Mask(*entry) +KviMaskItem::KviMaskItem(KviTalListView* tqparent,KviMaskEntry* entry) +:KviTalListViewItem(tqparent), m_Mask(*entry) { - QDateTime date; - date.setTime_t(mask()->uSetAt); - setText(0,mask()->szMask); - setText(1,mask()->szSetBy); + TQDateTime date; + date.setTime_t(tqmask()->uSetAt); + setText(0,tqmask()->szMask); + setText(1,tqmask()->szSetBy); setText(2,date.toString()); } @@ -52,20 +52,20 @@ KviMaskItem::~KviMaskItem() #ifdef COMPILE_USE_QT4 int KviMaskItem::compare ( KviTalListViewItem * i, int col, bool ascending ) const #else -int KviMaskItem::compare ( QListViewItem * i, int col, bool ascending ) const +int KviMaskItem::compare ( TQListViewItem * i, int col, bool ascending ) const #endif { if(col==2) { - if( ((KviMaskItem*)i)->mask()->uSetAt > m_Mask.uSetAt ) return -1; - if( ((KviMaskItem*)i)->mask()->uSetAt == m_Mask.uSetAt ) return 0; - if( ((KviMaskItem*)i)->mask()->uSetAt < m_Mask.uSetAt ) return 1; + if( ((KviMaskItem*)i)->tqmask()->uSetAt > m_Mask.uSetAt ) return -1; + if( ((KviMaskItem*)i)->tqmask()->uSetAt == m_Mask.uSetAt ) return 0; + if( ((KviMaskItem*)i)->tqmask()->uSetAt < m_Mask.uSetAt ) return 1; } return KviTalListViewItem::compare(i,col,ascending); } -KviMaskInputDialog::KviMaskInputDialog(const QString &szMask,KviMaskEditor* pEditor,KviChannel * pChannel) -:QDialog(pEditor) +KviMaskInputDialog::KviMaskInputDialog(const TQString &szMask,KviMaskEditor* pEditor,KviChannel * pChannel) +:TQDialog(pEditor) { m_pChannel=pChannel; m_pEditor=pEditor; @@ -74,26 +74,26 @@ KviMaskInputDialog::KviMaskInputDialog(const QString &szMask,KviMaskEditor* pEdi setCaption(__tr2qs("Mask editor - KVirc")); - QGridLayout * g = new QGridLayout(this,2,3,5,5); + TQGridLayout * g = new TQGridLayout(this,2,3,5,5); - QLabel * tl = new QLabel(__tr2qs("New mask must match an *!*@* expression"),this); + TQLabel * tl = new TQLabel(__tr2qs("New tqmask must match an *!*@* expression"),this); g->addMultiCellWidget(tl,0,0,0,3); - m_pEdit=new QLineEdit(szMask,this); + m_pEdit=new TQLineEdit(szMask,this); g->addMultiCellWidget(m_pEdit,1,1,0,3); - m_pOkButton= new QPushButton(__tr2qs("Ok"),this); - connect(m_pOkButton,SIGNAL(clicked()), this, SLOT(accept())); + m_pOkButton= new TQPushButton(__tr2qs("Ok"),this); + connect(m_pOkButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); g->addWidget(m_pOkButton,2,1); m_pOkButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); - m_pChancelButton= new QPushButton(__tr2qs("Cancel"),this); - connect(m_pChancelButton,SIGNAL(clicked()), this, SLOT(reject())); + m_pChancelButton= new TQPushButton(__tr2qs("Cancel"),this); + connect(m_pChancelButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); g->addWidget(m_pChancelButton,2,2); m_pChancelButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD))); - QRegExp rx( "*!*@*", false,true ); - QValidator* validator = new QRegExpValidator( rx, this ); + TQRegExp rx( "*!*@*", false,true ); + TQValidator* validator = new TQRegExpValidator( rx, TQT_TQOBJECT(this) ); m_pEdit->setValidator( validator ); } @@ -120,15 +120,15 @@ void KviMaskInputDialog::accept() m_pChannel->connection()->encodeText(m_pEdit->text()).data() ); } - QDialog::accept(); + TQDialog::accept(); } -KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPointerList<KviMaskEntry> * maskList,char flag,const char * nam) +KviMaskEditor::KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviPointerList<KviMaskEntry> * tqmaskList,char flag,const char * nam) : KviWindowToolWidget(par,button) { bool isEnabled=1; - QObject * w = parent(); + TQObject * w = tqparent(); while(w) { if(w->inherits("KviChannel")) @@ -137,20 +137,20 @@ KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPo if(!( chan->isMeHalfOp() || chan->isMeOp() || chan->isMeChanOwner() || chan->isMeChanAdmin() || chan->connection()->userInfo()->hasUserMode('o') || chan->connection()->userInfo()->hasUserMode('O') ) ) isEnabled=0; break; } - w = w->parent(); + w = w->tqparent(); } #ifdef COMPILE_USE_QT4 - setFocusPolicy(Qt::ClickFocus); + setFocusPolicy(TTQ_ClickFocus); #else - setFocusPolicy(QWidget::ClickFocus); + setFocusPolicy(TQ_ClickFocus); #endif - QGridLayout *g = new QGridLayout(this,4,2,2,2); + TQGridLayout *g = new TQGridLayout(this,4,2,2,2); m_cFlag = flag; - QString txt; + TQString txt; switch(flag) { case 'b': @@ -171,32 +171,32 @@ KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPo break; } - QLabel * l = new QLabel("",this); + TQLabel * l = new TQLabel("",this); l->setPixmap(*(g_pIconManager->getSmallIcon(m_iIconId))); g->addWidget(l,0,0); - l = new QLabel(txt,this); + l = new TQLabel(txt,this); g->addWidget(l,0,1); KviTalHBox * hb = new KviTalHBox(this); g->addMultiCellWidget(hb,1,1,0,1); - new QLabel(__tr2qs("Filter:"),hb); - m_pSearch = new QLineEdit(hb); - connect(m_pSearch,SIGNAL(textChanged ( const QString & ) ),this,SLOT(searchTextChanged ( const QString & ))); + new TQLabel(__tr2qs("Filter:"),hb); + m_pSearch = new TQLineEdit(hb); + connect(m_pSearch,TQT_SIGNAL(textChanged ( const TQString & ) ),this,TQT_SLOT(searchTextChanged ( const TQString & ))); - l = new QLabel(__tr2qs("Use doubleclick to edit item"),this); + l = new TQLabel(__tr2qs("Use doubleclick to edit item"),this); g->addWidget(l,1,1); g->addMultiCellWidget(l,2,2,0,1); m_pMaskBox = new KviTalListView(this); #ifdef COMPILE_USE_QT4 - m_pMaskBox->setFocusPolicy(Qt::ClickFocus); + m_pMaskBox->setFocusPolicy(TTQ_ClickFocus); #else - m_pMaskBox->setFocusPolicy(QWidget::ClickFocus); + m_pMaskBox->setFocusPolicy(TQ_ClickFocus); #endif m_pMaskBox->setFocusProxy(this); - m_pMaskBox->setFrameStyle(QFrame::StyledPanel|QFrame::Sunken); + m_pMaskBox->setFrameStyle(TQFrame::StyledPanel|TQFrame::Sunken); m_pMaskBox->addColumn(__tr2qs("Mask")); m_pMaskBox->addColumn(__tr2qs("Set by")); m_pMaskBox->addColumn(__tr2qs("Set at")); @@ -204,36 +204,36 @@ KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPo m_pMaskBox->setAllColumnsShowFocus(true); m_pMaskBox->setShowSortIndicator(true); m_pMaskBox->setSorting(2,false); - connect(m_pMaskBox,SIGNAL(doubleClicked ( KviTalListViewItem * )),this,SLOT(listViewDoubleClicked( KviTalListViewItem * ))); + connect(m_pMaskBox,TQT_SIGNAL(doubleClicked ( KviTalListViewItem * )),this,TQT_SLOT(listViewDoubleClicked( KviTalListViewItem * ))); g->addMultiCellWidget(m_pMaskBox,3,3,0,1); - m_pRemoveMask = new QPushButton(__tr2qs("Re&move"),this); + m_pRemoveMask = new TQPushButton(__tr2qs("Re&move"),this); m_pRemoveMask->setEnabled(isEnabled); #ifdef COMPILE_USE_QT4 - m_pRemoveMask->setFocusPolicy(Qt::ClickFocus); + m_pRemoveMask->setFocusPolicy(TTQ_ClickFocus); #else - m_pRemoveMask->setFocusPolicy(QWidget::ClickFocus); + m_pRemoveMask->setFocusPolicy(TQ_ClickFocus); #endif m_pRemoveMask->setFocusProxy(this); g->addWidget(m_pRemoveMask,4,1); - connect(m_pRemoveMask,SIGNAL(clicked()),this,SLOT(removeClicked())); + connect(m_pRemoveMask,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeClicked())); m_pRemoveMask->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DELETEITEM))); - m_pAddButton = new QPushButton(__tr2qs("Add"),this); + m_pAddButton = new TQPushButton(__tr2qs("Add"),this); m_pAddButton->setEnabled(isEnabled); #ifdef COMPILE_USE_QT4 - m_pAddButton->setFocusPolicy(Qt::ClickFocus); + m_pAddButton->setFocusPolicy(TTQ_ClickFocus); #else - m_pAddButton->setFocusPolicy(QWidget::ClickFocus); + m_pAddButton->setFocusPolicy(TQ_ClickFocus); #endif m_pAddButton->setFocusProxy(this); g->addWidget(m_pAddButton,4,0); - connect(m_pAddButton,SIGNAL(clicked()),this,SLOT(addClicked())); + connect(m_pAddButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked())); m_pAddButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM))); g->setColStretch(3,1); - for(KviMaskEntry * e = maskList->first();e;e = maskList->next()) addMask(e); + for(KviMaskEntry * e = tqmaskList->first();e;e = tqmaskList->next()) addMask(e); registerSelf(); } @@ -242,7 +242,7 @@ KviMaskEditor::~KviMaskEditor() } -void KviMaskEditor::searchTextChanged ( const QString & text) +void KviMaskEditor::searchTextChanged ( const TQString & text) { KviTalListViewItem *pItem=m_pMaskBox->firstChild(); KviMaskItem *pMaskItem; @@ -254,7 +254,7 @@ void KviMaskEditor::searchTextChanged ( const QString & text) { pMaskItem->setVisible(true); } else { - if(pMaskItem->mask()->szMask.contains(text)) + if(pMaskItem->tqmask()->szMask.tqcontains(text)) pMaskItem->setVisible(true); else pMaskItem->setVisible(false); @@ -273,9 +273,9 @@ void KviMaskEditor::removeClicked() if(it->isSelected()) { KviMaskEntry * e = new KviMaskEntry; - e->szMask = it->mask()->szMask; - e->szSetBy = it->mask()->szSetBy; - e->uSetAt = it->mask()->uSetAt; + e->szMask = it->tqmask()->szMask; + e->szSetBy = it->tqmask()->szSetBy; + e->uSetAt = it->tqmask()->uSetAt; l->append(e); } it = (KviMaskItem *)(it->nextSibling()); @@ -286,7 +286,7 @@ void KviMaskEditor::removeClicked() void KviMaskEditor::addClicked() { - QObject * w = parent(); + TQObject * w = tqparent(); while(w) { if(w->inherits("KviChannel")) @@ -299,7 +299,7 @@ void KviMaskEditor::addClicked() } break; } - w = w->parent(); + w = w->tqparent(); } } @@ -316,7 +316,7 @@ void KviMaskEditor::removeMask(KviMaskEntry *e) KviMaskItem * it =(KviMaskItem *)(m_pMaskBox->firstChild()); while(it) { - if(KviQString::equalCI(it->mask()->szMask,e->szMask)) + if(KviTQString::equalCI(it->tqmask()->szMask,e->szMask)) { delete it; return; @@ -329,7 +329,7 @@ void KviMaskEditor::listViewDoubleClicked( KviTalListViewItem * pItem) { if(pItem) { - QObject * w = parent(); + TQObject * w = tqparent(); while(w) { if(w->inherits("KviChannel")) @@ -342,7 +342,7 @@ void KviMaskEditor::listViewDoubleClicked( KviTalListViewItem * pItem) } break; } - w = w->parent(); + w = w->tqparent(); } } } diff --git a/src/kvirc/ui/kvi_maskeditor.h b/src/kvirc/ui/kvi_maskeditor.h index de28137..9c6c77b 100644 --- a/src/kvirc/ui/kvi_maskeditor.h +++ b/src/kvirc/ui/kvi_maskeditor.h @@ -2,7 +2,7 @@ #define _KVI_MASKEDITOR_H_ // -// File : kvi_maskeditor.h +// File : kvi_tqmaskeditor.h // Creation date : Tue Aug 30 2000 12:20:10 by Szymon Stefanek // // This file is part of the KVirc irc client distribution @@ -24,11 +24,11 @@ // #include "kvi_settings.h" -#include <qdialog.h> -#include <qlineedit.h> -#include <qwidget.h> +#include <tqdialog.h> +#include <tqlineedit.h> +#include <tqwidget.h> #include "kvi_tal_listview.h" -#include <qpushbutton.h> +#include <tqpushbutton.h> #include "kvi_pointerlist.h" #include "kvi_string.h" @@ -39,39 +39,40 @@ class KviChannel; typedef struct _KviMaskEntry { - QString szMask; - QString szSetBy; + TQString szMask; + TQString szSetBy; unsigned int uSetAt; } KviMaskEntry; class KviMaskItem: public KviTalListViewItem { public: - KviMaskItem(KviTalListView* parent,KviMaskEntry* entry); + KviMaskItem(KviTalListView* tqparent,KviMaskEntry* entry); ~KviMaskItem(); - KviMaskEntry* mask() { return &m_Mask; }; + KviMaskEntry* tqmask() { return &m_Mask; }; #ifdef COMPILE_USE_QT4 virtual int compare ( KviTalListViewItem * i, int col, bool ascending ) const; #else - virtual int compare ( QListViewItem * i, int col, bool ascending ) const; + virtual int compare ( TQListViewItem * i, int col, bool ascending ) const; #endif protected: KviMaskEntry m_Mask; }; -class KviMaskInputDialog : public QDialog +class KviMaskInputDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: - KviMaskInputDialog(const QString &szMask,KviMaskEditor* pEditor,KviChannel * pChannel); + KviMaskInputDialog(const TQString &szMask,KviMaskEditor* pEditor,KviChannel * pChannel); ~KviMaskInputDialog(); protected: - QLineEdit * m_pEdit; - QPushButton * m_pOkButton; - QPushButton * m_pChancelButton; - QString m_szOldMask; + TQLineEdit * m_pEdit; + TQPushButton * m_pOkButton; + TQPushButton * m_pChancelButton; + TQString m_szOldMask; KviChannel * m_pChannel; KviMaskEditor * m_pEditor; protected slots: @@ -81,15 +82,16 @@ protected slots: class KVIRC_API KviMaskEditor : public KviWindowToolWidget { Q_OBJECT + TQ_OBJECT public: - KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPointerList<KviMaskEntry> * maskList, + KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviPointerList<KviMaskEntry> * tqmaskList, char flag,const char * nam); ~KviMaskEditor(); protected: KviTalListView * m_pMaskBox; - QPushButton * m_pRemoveMask; - QPushButton * m_pAddButton; - QLineEdit * m_pSearch; + TQPushButton * m_pRemoveMask; + TQPushButton * m_pAddButton; + TQLineEdit * m_pSearch; char m_cFlag; int m_iIconId; public: @@ -100,7 +102,7 @@ protected slots: void removeClicked(); void addClicked(); void listViewDoubleClicked( KviTalListViewItem * ); - void searchTextChanged ( const QString & ); + void searchTextChanged ( const TQString & ); signals: void removeMasks(KviMaskEditor *,KviPointerList<KviMaskEntry> *); }; diff --git a/src/kvirc/ui/kvi_mdicaption.cpp b/src/kvirc/ui/kvi_mdicaption.cpp index ba4aea4..08f3af2 100644 --- a/src/kvirc/ui/kvi_mdicaption.cpp +++ b/src/kvirc/ui/kvi_mdicaption.cpp @@ -36,27 +36,27 @@ #include "kvi_window.h" #include "kvi_mdicaption.h" -#include <qcursor.h> -#include <qnamespace.h> -#include <qapplication.h> -#include <qfontmetrics.h> +#include <tqcursor.h> +#include <tqnamespace.h> +#include <tqapplication.h> +#include <tqfontmetrics.h> #include "kvi_pointerlist.h" -#include <qpixmap.h> -#include <qstyle.h> -#include <qpainter.h> +#include <tqpixmap.h> +#include <tqstyle.h> +#include <tqpainter.h> #include "kvi_tal_popupmenu.h" #ifdef COMPILE_USE_QT4 - #include <q3simplerichtext.h> - #define QSimpleRichText Q3SimpleRichText - #include <qstyleoption.h> + #include <tq3simplerichtext.h> + #define TQSimpleRichText Q3SimpleRichText + #include <tqstyleoption.h> #else - #include <qsimplerichtext.h> + #include <tqsimplerichtext.h> #endif -#include <qdrawutil.h> -#include <qevent.h> +#include <tqdrawutil.h> +#include <tqevent.h> -KviMdiCaptionButton::KviMdiCaptionButton(const QPixmap &pix,QWidget * parent,const char * name) -: QToolButton(parent,name) +KviMdiCaptionButton::KviMdiCaptionButton(const TQPixmap &pix,TQWidget * tqparent,const char * name) +: TQToolButton(tqparent,name) { setPixmap(pix); //setAutoRaise(true); @@ -69,23 +69,23 @@ KviMdiCaptionButton::~KviMdiCaptionButton() #ifdef COMPILE_USE_QT4 -void KviMdiCaptionButton::paintEvent(QPaintEvent *e) +void KviMdiCaptionButton::paintEvent(TQPaintEvent *e) { - QPainter painter(this); + TQPainter painter(this); drawButton(&painter); } #endif -void KviMdiCaptionButton::drawButton(QPainter *p) +void KviMdiCaptionButton::drawButton(TQPainter *p) { #ifdef COMPILE_USE_QT4 - QBrush b(parentWidget()->palette().window()); + TQBrush b(tqparentWidget()->palette().window()); #else - QBrush b(parentWidget()->colorGroup().background()); + TQBrush b(tqparentWidget()->tqcolorGroup().background()); #endif if(isDown()) - qDrawShadePanel(p,0,0,width(),height(),colorGroup(),true,1,&b); + qDrawShadePanel(p,0,0,width(),height(),tqcolorGroup(),true,1,&b); else p->fillRect(0,0,width(),height(),b); @@ -104,19 +104,19 @@ void KviMdiCaptionButton::drawButton(QPainter *p) -KviMdiCaption::KviMdiCaption(KviMdiChild * parent,const char * name) -: QWidget(parent,name) +KviMdiCaption::KviMdiCaption(KviMdiChild * tqparent,const char * name) +: TQWidget(tqparent,name) { m_pMaximizeButton = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXIMIZE)),this,"maximize_button"); - connect(m_pMaximizeButton,SIGNAL(clicked()),parent,SLOT(maximize())); + connect(m_pMaximizeButton,TQT_SIGNAL(clicked()),tqparent,TQT_SLOT(maximize())); m_pMinimizeButton = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)),this,"minimize_button"); - connect(m_pMinimizeButton,SIGNAL(clicked()),parent,SLOT(minimize())); + connect(m_pMinimizeButton,TQT_SIGNAL(clicked()),tqparent,TQT_SLOT(minimize())); m_pCloseButton = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)),this,"close_button"); - connect(m_pCloseButton,SIGNAL(clicked()),parent,SLOT(closeRequest())); + connect(m_pCloseButton,TQT_SIGNAL(clicked()),tqparent,TQT_SLOT(closeRequest())); m_pSystemButton = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DEFAULTICON)),this,"icon_button"); - connect(m_pSystemButton,SIGNAL(clicked()),parent,SLOT(systemPopupSlot())); + connect(m_pSystemButton,TQT_SIGNAL(clicked()),tqparent,TQT_SLOT(systemPopupSlot())); - m_lastMousePos = QPoint(-1,-1); + m_lastMousePos = TQPoint(-1,-1); m_bMouseGrabbed = true; m_bActive = false; calcLineSpacing(); @@ -138,7 +138,7 @@ void KviMdiCaption::reloadImages() void KviMdiCaption::calcLineSpacing() { - QFontMetrics fm(font()); + TQFontMetrics fm(font()); m_iLineSpacing = fm.lineSpacing() + 3; if(m_iLineSpacing < 20)m_iLineSpacing = 20; } @@ -152,7 +152,7 @@ void KviMdiCaption::setActive(bool bActive) { m_bActive = bActive; - QPalette pal(Qt::white,m_bActive ? KVI_OPTION_COLOR(KviOption_colorMdiCaptionActive) : KVI_OPTION_COLOR(KviOption_colorMdiCaptionInactive)); + TQPalette pal(TQt::white,m_bActive ? KVI_OPTION_COLOR(KviOption_colorMdiCaptionActive) : KVI_OPTION_COLOR(KviOption_colorMdiCaptionInactive)); setPalette(pal); //update(); m_pSystemButton->update(); @@ -161,33 +161,33 @@ void KviMdiCaption::setActive(bool bActive) m_pMaximizeButton->update(); } -void KviMdiCaption::fontChange(const QFont &old) +void KviMdiCaption::fontChange(const TQFont &old) { calcLineSpacing(); - QWidget::fontChange(old); - ((KviMdiChild *)parent())->resizeEvent(0); + TQWidget::fontChange(old); + ((KviMdiChild *)tqparent())->resizeEvent(0); } -void KviMdiCaption::mousePressEvent(QMouseEvent *e) +void KviMdiCaption::mousePressEvent(TQMouseEvent *e) { m_bMouseGrabbed = true; - m_lastMousePos = QCursor::pos(); + m_lastMousePos = TQCursor::pos(); #ifdef COMPILE_USE_QT4 - setCursor(Qt::SizeAllCursor); + setCursor(TQt::SizeAllCursor); #else - setCursor(QCursor::sizeAllCursor); + setCursor(TQCursor::sizeAllCursor); #endif - ((KviMdiChild *)parent())->activate(true); + ((KviMdiChild *)tqparent())->activate(true); } -void KviMdiCaption::mouseMoveEvent(QMouseEvent *) +void KviMdiCaption::mouseMoveEvent(TQMouseEvent *) { if(m_bMouseGrabbed) { - QPoint p = QCursor::pos(); + TQPoint p = TQCursor::pos(); int dx = m_lastMousePos.x() - p.x(); int dy = m_lastMousePos.y() - p.y(); - KviMdiChild * c = (KviMdiChild *)parent(); + KviMdiChild * c = (KviMdiChild *)tqparent(); int nx = c->manager()->childX(c) - dx; int ny = c->manager()->childY(c) - dy; @@ -207,8 +207,8 @@ void KviMdiCaption::mouseMoveEvent(QMouseEvent *) ny = 0; } - QCursor::setPos(cx,cy); - m_lastMousePos = QPoint(cx,cy); + TQCursor::setPos(cx,cy); + m_lastMousePos = TQPoint(cx,cy); } else { m_lastMousePos = p; } @@ -218,41 +218,41 @@ void KviMdiCaption::mouseMoveEvent(QMouseEvent *) } } -void KviMdiCaption::mouseDoubleClickEvent(QMouseEvent *e) +void KviMdiCaption::mouseDoubleClickEvent(TQMouseEvent *e) { - ((KviMdiChild *)parent())->maximize(); + ((KviMdiChild *)tqparent())->maximize(); } -void KviMdiCaption::paintEvent(QPaintEvent * e) +void KviMdiCaption::paintEvent(TQPaintEvent * e) { - QRect r = e->rect(); - QPainter p(this); + TQRect r = e->rect(); + TQPainter p(this); p.fillRect(r,m_bActive ? KVI_OPTION_COLOR(KviOption_colorMdiCaptionActive) : KVI_OPTION_COLOR(KviOption_colorMdiCaptionInactive)); - QSimpleRichText rt(m_bActive ? ((KviMdiChild *)parent())->xmlActiveCaption() : ((KviMdiChild *)parent())->xmlInactiveCaption(),font()); - rt.draw(&p,height() + 2,-1,rect(),colorGroup()); + TQSimpleRichText rt(m_bActive ? ((KviMdiChild *)tqparent())->xmlActiveCaption() : ((KviMdiChild *)tqparent())->xmlInactiveCaption(),font()); + rt.draw(&p,height() + 2,-1,rect(),tqcolorGroup()); } -void KviMdiCaption::mouseReleaseEvent(QMouseEvent *) +void KviMdiCaption::mouseReleaseEvent(TQMouseEvent *) { m_bMouseGrabbed = false; #ifdef COMPILE_USE_QT4 - setCursor(Qt::arrowCursor); + setCursor(TQt::arrowCursor); #else - setCursor(QCursor::arrowCursor); + setCursor(TQCursor::arrowCursor); #endif // releaseMouse(); } -void KviMdiCaption::setFocusProxy(QWidget * w) +void KviMdiCaption::setFocusProxy(TQWidget * w) { - QWidget::setFocusProxy(w); + TQWidget::setFocusProxy(w); m_pSystemButton->setFocusProxy(w); m_pMinimizeButton->setFocusProxy(w); m_pMaximizeButton->setFocusProxy(w); m_pCloseButton->setFocusProxy(w); } -void KviMdiCaption::resizeEvent(QResizeEvent * e) +void KviMdiCaption::resizeEvent(TQResizeEvent * e) { int s = height() - 2; m_pSystemButton->setGeometry(1,1,s,s); @@ -266,7 +266,7 @@ void KviMdiCaption::resizeEvent(QResizeEvent * e) -KviMenuBarToolButton::KviMenuBarToolButton(QWidget * par,const QPixmap &img, const char * name) +KviMenuBarToolButton::KviMenuBarToolButton(TQWidget * par,const TQPixmap &img, const char * name) : KviStyledToolButton(par) { setProperty("name","name"); @@ -278,8 +278,8 @@ KviMenuBarToolButton::~KviMenuBarToolButton() { } -QSize KviMenuBarToolButton::sizeHint() const +TQSize KviMenuBarToolButton::tqsizeHint() const { - return QSize(20,20); + return TQSize(20,20); } diff --git a/src/kvirc/ui/kvi_mdicaption.h b/src/kvirc/ui/kvi_mdicaption.h index 6bec405..d070e19 100644 --- a/src/kvirc/ui/kvi_mdicaption.h +++ b/src/kvirc/ui/kvi_mdicaption.h @@ -26,24 +26,25 @@ #include "kvi_settings.h" -#include <qtoolbutton.h> -#include <qlabel.h> +#include <tqtoolbutton.h> +#include <tqlabel.h> #include "kvi_styled_controls.h" class KviMdiManager; class KviMdiChild; -class KVIRC_API KviMdiCaptionButton : public QToolButton +class KVIRC_API KviMdiCaptionButton : public TQToolButton { Q_OBJECT + TQ_OBJECT public: - KviMdiCaptionButton(const QPixmap &pix,QWidget * parent,const char * name); + KviMdiCaptionButton(const TQPixmap &pix,TQWidget * tqparent,const char * name); ~KviMdiCaptionButton(); protected: - virtual void drawButton(QPainter * p); + virtual void drawButton(TQPainter * p); #ifdef COMPILE_USE_QT4 - virtual void paintEvent(QPaintEvent *e); + virtual void paintEvent(TQPaintEvent *e); #endif }; @@ -51,23 +52,25 @@ protected: class KviMenuBarToolButton : public KviStyledToolButton { Q_OBJECT + TQ_OBJECT public: - KviMenuBarToolButton(QWidget * par,const QPixmap &img, const char * name); + KviMenuBarToolButton(TQWidget * par,const TQPixmap &img, const char * name); ~KviMenuBarToolButton(); public: - virtual QSize sizeHint() const; + virtual TQSize tqsizeHint() const; }; -class KVIRC_API KviMdiCaption : public QWidget +class KVIRC_API KviMdiCaption : public TQWidget { friend class KviMdiChild; Q_OBJECT + TQ_OBJECT public: - KviMdiCaption(KviMdiChild * parent,const char * name); + KviMdiCaption(KviMdiChild * tqparent,const char * name); ~KviMdiCaption(); protected: - QPoint m_lastMousePos; + TQPoint m_lastMousePos; bool m_bMouseGrabbed; int m_iLineSpacing; bool m_bActive; @@ -75,25 +78,25 @@ protected: KviMdiCaptionButton * m_pMinimizeButton; KviMdiCaptionButton * m_pMaximizeButton; KviMdiCaptionButton * m_pCloseButton; - QPixmap m_pixSystemIcon; + TQPixmap m_pixSystemIcon; public: int heightHint(); void setActive(bool bActive); bool active(){ return m_bActive; }; - void setSystemIcon(const QPixmap &pix){ m_pSystemButton->setPixmap(pix); m_pixSystemIcon = pix; }; - const QPixmap * systemIcon(){ return &m_pixSystemIcon; }; + void setSystemIcon(const TQPixmap &pix){ m_pSystemButton->setPixmap(pix); m_pixSystemIcon = pix; }; + const TQPixmap * systemIcon(){ return &m_pixSystemIcon; }; void enableClose(bool bEnable){ m_pCloseButton->setEnabled(bEnable); }; bool closeEnabled(){ return m_pCloseButton->isEnabled(); }; - virtual void setFocusProxy(QWidget * w); + virtual void setFocusProxy(TQWidget * w); protected: void calcLineSpacing(); - virtual void fontChange(const QFont &old); - virtual void mousePressEvent(QMouseEvent *e); - virtual void mouseDoubleClickEvent(QMouseEvent *e); - virtual void mouseMoveEvent(QMouseEvent *e); - virtual void mouseReleaseEvent(QMouseEvent *e); - virtual void paintEvent(QPaintEvent * e); - virtual void resizeEvent(QResizeEvent * e); + virtual void fontChange(const TQFont &old); + virtual void mousePressEvent(TQMouseEvent *e); + virtual void mouseDoubleClickEvent(TQMouseEvent *e); + virtual void mouseMoveEvent(TQMouseEvent *e); + virtual void mouseReleaseEvent(TQMouseEvent *e); + virtual void paintEvent(TQPaintEvent * e); + virtual void resizeEvent(TQResizeEvent * e); void reloadImages(); }; diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp index 9b92c56..b559be8 100644 --- a/src/kvirc/ui/kvi_mdichild.cpp +++ b/src/kvirc/ui/kvi_mdichild.cpp @@ -35,29 +35,29 @@ #include "kvi_window.h" #include "kvi_mdicaption.h" -#include <qcursor.h> -#include <qnamespace.h> -#include <qapplication.h> -#include <qfontmetrics.h> +#include <tqcursor.h> +#include <tqnamespace.h> +#include <tqapplication.h> +#include <tqfontmetrics.h> #include "kvi_pointerlist.h" -#include <qpixmap.h> -#include <qstyle.h> -#include <qpainter.h> +#include <tqpixmap.h> +#include <tqstyle.h> +#include <tqpainter.h> #include "kvi_tal_popupmenu.h" #ifndef COMPILE_USE_QT4 - #include <qobjectlist.h> + #include <tqobjectlist.h> #endif -#include <qevent.h> +#include <tqevent.h> #ifdef Q_OS_MACX #include "kvi_app.h" //Needed for g_pApp #ifdef COMPILE_USE_QT4 - #include <QDesktopWidget> + #include <TQDesktopWidget> #endif #endif #ifdef COMPILE_PSEUDO_TRANSPARENCY - extern QPixmap * g_pShadedChildGlobalDesktopBackground; + extern TQPixmap * g_pShadedChildGlobalDesktopBackground; #endif @@ -73,9 +73,9 @@ KviMdiChild::KviMdiChild(KviMdiManager * par,const char * name) -: QFrame(par->viewport(),name ? name : "mdi_child") +: TQFrame(par->viewport(),name ? name : "mdi_child") { - setFrameStyle(QFrame::StyledPanel | QFrame::Raised); + setFrameStyle(TQFrame::StyledPanel | TQFrame::Raised); setFrameShape(NoFrame); m_pManager = par; @@ -87,7 +87,7 @@ KviMdiChild::KviMdiChild(KviMdiManager * par,const char * name) m_pClient = 0; m_state = Normal; - m_restoredGeometry = QRect(10,10,100,100); + m_restoredGeometry = TQRect(10,10,100,100); setMouseTracking(true); setMinimumSize(KVI_MDICHILD_MIN_WIDTH,KVI_MDICHILD_MIN_HEIGHT); @@ -108,29 +108,29 @@ void KviMdiChild::reloadImages() m_pCaption->reloadImages(); } -QRect KviMdiChild::restoredGeometry() +TQRect KviMdiChild::restoredGeometry() { if(m_state == Maximized)return m_restoredGeometry; - else return QRect(x(),y(),width(),height()); -// else return geometry(); + else return TQRect(x(),y(),width(),height()); +// else return tqgeometry(); } #ifdef COMPILE_USE_QT4 -void KviMdiChild::setBackgroundRole(QPalette::ColorRole) +void KviMdiChild::setBackgroundRole(TQPalette::ColorRole) { // hack - QFrame::setBackgroundRole(QPalette::Window); + TQFrame::setBackgroundRole(TQPalette::Window); } #else -void KviMdiChild::setBackgroundMode(QWidget::BackgroundMode) +void KviMdiChild::setBackgroundMode(TQWidget::BackgroundMode) { // hack - QFrame::setBackgroundMode(QWidget::PaletteBackground); + TQFrame::setBackgroundMode(TQWidget::PaletteBackground); } #endif -void KviMdiChild::setIcon(const QPixmap &pix) +void KviMdiChild::setIcon(const TQPixmap &pix) { m_pCaption->setSystemIcon(pix); @@ -140,7 +140,7 @@ void KviMdiChild::setIcon(const QPixmap &pix) } } -const QPixmap * KviMdiChild::icon() +const TQPixmap * KviMdiChild::icon() { return m_pCaption->systemIcon(); } @@ -160,7 +160,7 @@ bool KviMdiChild::closeEnabled() return m_pCaption->closeEnabled(); } -void KviMdiChild::setCaption(const QString & plain,const QString & xmlActive,const QString & xmlInactive) +void KviMdiChild::setCaption(const TQString & plain,const TQString & xmlActive,const TQString & xmlInactive) { m_szPlainCaption = plain; m_szXmlActiveCaption = xmlActive; @@ -172,7 +172,7 @@ void KviMdiChild::setCaption(const QString & plain,const QString & xmlActive,con void KviMdiChild::maximize() { if(m_state == Minimized)restore(); // restore first - if(m_state == Normal)m_restoredGeometry = geometry(); + if(m_state == Normal)m_restoredGeometry = tqgeometry(); m_state = Maximized; manager()->maximizeChild(this); } @@ -225,7 +225,7 @@ void KviMdiChild::minimize() m_pManager->childMinimized(this,true); break; case Normal: - m_restoredGeometry = geometry(); + m_restoredGeometry = tqgeometry(); hide(); m_state = Minimized; m_pManager->childMinimized(this,false); @@ -246,17 +246,17 @@ void KviMdiChild::closeRequest() void KviMdiChild::systemPopupAboutToShow() { m_pSystemPopup->clear(); - if(m_state != Maximized)m_pSystemPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXIMIZE)),__tr("&Maximize"),this,SLOT(maximize())); - if(m_state != Minimized)m_pSystemPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)),__tr("M&inimize"),this,SLOT(minimize())); - if(m_state != Normal)m_pSystemPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RESTORE)),__tr("&Restore"),this,SLOT(restore())); + if(m_state != Maximized)m_pSystemPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXIMIZE)),__tr("&Maximize"),this,TQT_SLOT(maximize())); + if(m_state != Minimized)m_pSystemPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)),__tr("M&inimize"),this,TQT_SLOT(minimize())); + if(m_state != Normal)m_pSystemPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RESTORE)),__tr("&Restore"),this,TQT_SLOT(restore())); if(closeEnabled()) { m_pSystemPopup->insertSeparator(); - m_pSystemPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)),__tr("&Close"),this,SLOT(closeRequest())); + m_pSystemPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)),__tr("&Close"),this,TQT_SLOT(closeRequest())); } } */ -void KviMdiChild::moveEvent(QMoveEvent *e) +void KviMdiChild::moveEvent(TQMoveEvent *e) { #ifdef COMPILE_PSEUDO_TRANSPARENCY if(m_pClient && g_pShadedChildGlobalDesktopBackground) @@ -267,20 +267,20 @@ void KviMdiChild::moveEvent(QMoveEvent *e) } } #endif - QFrame::moveEvent(e); + TQFrame::moveEvent(e); } void KviMdiChild::systemPopupSlot() { - if(sender()->inherits("QToolButton")) + if(sender()->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING)) { - emit systemPopupRequest(((QToolButton *)sender())->mapToGlobal(QPoint(0,((QToolButton *)sender())->height()))); + emit systemPopupRequest(((TQToolButton *)sender())->mapToGlobal(TQPoint(0,((TQToolButton *)sender())->height()))); } else { - emit systemPopupRequest(m_pCaption->mapToGlobal(QPoint(5,5))); + emit systemPopupRequest(m_pCaption->mapToGlobal(TQPoint(5,5))); } } -void KviMdiChild::resizeEvent(QResizeEvent *e) +void KviMdiChild::resizeEvent(TQResizeEvent *e) { int s = m_pCaption->heightHint(); m_pCaption->setGeometry(KVI_MDICHILD_BORDER,KVI_MDICHILD_BORDER, @@ -292,10 +292,10 @@ void KviMdiChild::resizeEvent(QResizeEvent *e) m_pClient->setGeometry(KVI_MDICHILD_BORDER,yPos, width() - (KVI_MDICHILD_BORDER << 1),height() - (yPos + KVI_MDICHILD_BORDER)); } - QFrame::resizeEvent(e); + TQFrame::resizeEvent(e); } -void KviMdiChild::mousePressEvent(QMouseEvent *e) +void KviMdiChild::mousePressEvent(TQMouseEvent *e) { if(m_state == Maximized)return; m_iResizeCorner=getResizeCorner(e->pos().x(),e->pos().y()); @@ -306,7 +306,7 @@ void KviMdiChild::mousePressEvent(QMouseEvent *e) } } -void KviMdiChild::mouseReleaseEvent(QMouseEvent *) +void KviMdiChild::mouseReleaseEvent(TQMouseEvent *) { m_iResizeCorner=KVI_MDI_NORESIZE; m_iLastCursorCorner=KVI_MDI_NORESIZE; @@ -317,36 +317,36 @@ void KviMdiChild::mouseReleaseEvent(QMouseEvent *) releaseMouse(); } - //if(QApplication::overrideCursor())QApplication::restoreOverrideCursor(); + //if(TQApplication::overrideCursor())TQApplication::restoreOverrideCursor(); } -QCursor KviMdiChild::getResizeCursor(int resizeCorner) +TQCursor KviMdiChild::getResizeCursor(int resizeCorner) { switch (resizeCorner) { case KVI_MDI_RESIZE_LEFT: case KVI_MDI_RESIZE_RIGHT: - return Qt::sizeHorCursor; + return TQt::sizeHorCursor; break; case KVI_MDI_RESIZE_TOP: case KVI_MDI_RESIZE_BOTTOM: - return Qt::sizeVerCursor; + return TQt::sizeVerCursor; break; case KVI_MDI_RESIZE_TOPLEFT: case KVI_MDI_RESIZE_BOTTOMRIGHT: - return Qt::sizeFDiagCursor; + return TQt::sizeFDiagCursor; break; case KVI_MDI_RESIZE_BOTTOMLEFT: case KVI_MDI_RESIZE_TOPRIGHT: - return Qt::sizeBDiagCursor; + return TQt::sizeBDiagCursor; break; default: - return Qt::arrowCursor; + return TQt::arrowCursor; break; } } -void KviMdiChild::mouseMoveEvent(QMouseEvent *e) +void KviMdiChild::mouseMoveEvent(TQMouseEvent *e) { if(e->state() & Qt::LeftButton) { @@ -364,29 +364,29 @@ void KviMdiChild::setResizeCursor(int resizeCorner) if(resizeCorner == KVI_MDI_NORESIZE) { setCursor(getResizeCursor(resizeCorner)); - //if(QApplication::overrideCursor())QApplication::restoreOverrideCursor(); + //if(TQApplication::overrideCursor())TQApplication::restoreOverrideCursor(); } else { if(m_state != Maximized) { setCursor(getResizeCursor(resizeCorner)); - //QApplication::setOverrideCursor(getResizeCursor(resizeCorner),true); + //TQApplication::setOverrideCursor(getResizeCursor(resizeCorner),true); } } } -void KviMdiChild::leaveEvent(QEvent *) +void KviMdiChild::leaveEvent(TQEvent *) { if(!m_bResizeMode) { m_iResizeCorner=KVI_MDI_NORESIZE; m_iLastCursorCorner=KVI_MDI_NORESIZE; - //if(QApplication::overrideCursor())QApplication::restoreOverrideCursor(); + //if(TQApplication::overrideCursor())TQApplication::restoreOverrideCursor(); } else { if(m_iResizeCorner != KVI_MDI_NORESIZE)resizeWindowOpaque(m_iResizeCorner); } } -void KviMdiChild::calculateResizeRect(int resizeCorner,QPoint mousePos,QRect &resizeRect,int minWidth,int minHeight) +void KviMdiChild::calculateResizeRect(int resizeCorner,TQPoint mousePos,TQRect &resizeRect,int minWidth,int minHeight) { switch(resizeCorner) { @@ -442,8 +442,8 @@ void KviMdiChild::calculateResizeRect(int resizeCorner,QPoint mousePos,QRect &re void KviMdiChild::calculateMinimumSize(int &minWidth,int &minHeight) { if(m_pClient){ - minWidth = m_pClient->minimumSize().width() + (KVI_MDICHILD_BORDER << 1); - minHeight = m_pClient->minimumSize().height()+ (KVI_MDICHILD_BORDER << 1)+ + minWidth = m_pClient->tqminimumSize().width() + (KVI_MDICHILD_BORDER << 1); + minHeight = m_pClient->tqminimumSize().height()+ (KVI_MDICHILD_BORDER << 1)+ m_pCaption->heightHint() + KVI_MDICHILD_SPACING; } if(minWidth<KVI_MDICHILD_MIN_WIDTH)minWidth=KVI_MDICHILD_MIN_WIDTH; @@ -454,9 +454,9 @@ void KviMdiChild::resizeWindowOpaque(int resizeCorner) { int minWidth=0; int minHeight=0; - QRect resizeRect(m_pManager->childX(this),m_pManager->childY(this),width(),height()); + TQRect resizeRect(m_pManager->childX(this),m_pManager->childY(this),width(),height()); calculateMinimumSize(minWidth,minHeight); - QPoint mousePos = m_pManager->viewportToContents(m_pManager->viewport()->mapFromGlobal(QCursor::pos())); + TQPoint mousePos = m_pManager->viewportToContents(m_pManager->viewport()->mapFromGlobal(TQCursor::pos())); calculateResizeRect(resizeCorner,mousePos,resizeRect,minWidth,minHeight); m_pManager->moveChild(this,resizeRect.x(),resizeRect.y()); resize(resizeRect.width(),resizeRect.height()); @@ -480,7 +480,7 @@ int KviMdiChild::getResizeCorner(int ax,int ay) return ret; } -void KviMdiChild::setClient(QWidget *w) +void KviMdiChild::setClient(TQWidget *w) { __range_valid(m_pClient==0); __range_valid(w!=0); @@ -490,10 +490,10 @@ void KviMdiChild::setClient(QWidget *w) int clientYPos=m_pCaption->heightHint()+KVI_MDICHILD_SPACING+KVI_MDICHILD_BORDER; resize(w->width()+(KVI_MDICHILD_BORDER << 1),w->height()+KVI_MDICHILD_BORDER+clientYPos); - //Reparent if needed - if(w->parent()!=this){ + //Retqparent if needed + if(TQT_BASE_OBJECT(w->tqparent())!=TQT_BASE_OBJECT(this)){ //reparent to this widget , no flags , point , show it - QPoint pnt2(KVI_MDICHILD_BORDER,clientYPos); + TQPoint pnt2(KVI_MDICHILD_BORDER,clientYPos); w->reparent(this,pnt2,true); } else w->move(KVI_MDICHILD_BORDER,clientYPos); @@ -508,10 +508,10 @@ void KviMdiChild::setClient(QWidget *w) */ //linkChildren(w); - if(m_pClient->minimumSize().width() > KVI_MDICHILD_MIN_WIDTH && - m_pClient->minimumSize().height() > KVI_MDICHILD_MIN_HEIGHT){ - setMinimumWidth(m_pClient->minimumSize().width() + (KVI_MDICHILD_BORDER << 1)); - setMinimumHeight(m_pClient->minimumSize().height()+ (KVI_MDICHILD_BORDER << 1) + + if(m_pClient->tqminimumSize().width() > KVI_MDICHILD_MIN_WIDTH && + m_pClient->tqminimumSize().height() > KVI_MDICHILD_MIN_HEIGHT){ + setMinimumWidth(m_pClient->tqminimumSize().width() + (KVI_MDICHILD_BORDER << 1)); + setMinimumHeight(m_pClient->tqminimumSize().height()+ (KVI_MDICHILD_BORDER << 1) + m_pCaption->heightHint() + KVI_MDICHILD_SPACING); } @@ -529,9 +529,9 @@ void KviMdiChild::unsetClient() //Kewl...the reparent function has a small prob now.. //the new toplelvel widgets gets not reenabled for dnd #ifndef Q_OS_MACX - m_pClient->reparent(0,m_pClient->mapToGlobal(QPoint(0,0)),true); + m_pClient->reparent(0,m_pClient->mapToGlobal(TQPoint(0,0)),true); #else - QRect r = g_pApp->desktop()->availableGeometry(m_pClient); + TQRect r = g_pApp->desktop()->availableGeometry(m_pClient); r.moveBy(0, 22); m_pClient->reparent(0,r.topLeft(),true); #endif @@ -549,28 +549,28 @@ void KviMdiChild::activate(bool bSetFocus) else if(bSetFocus)setFocus(); } -void KviMdiChild::focusInEvent(QFocusEvent *) +void KviMdiChild::focusInEvent(TQFocusEvent *) { // We gained focus by click , tab or from the caption label // Bring this child to top m_pCaption->setActive(true); m_pManager->setTopChild(this,false); //Do not focus by now... - /*The client is our focusProxy ! it should be focused by Qt !*/ + /*The client is our focusProxy ! it should be focused by TQt !*/ #ifdef _KVI_DEBUG_CLASS_NAME_ __range_valid(focusProxy() == m_pClient); #endif } -QSize KviMdiChild::sizeHint() +TQSize KviMdiChild::tqsizeHint() { if(m_pClient) { - QSize s = m_pClient->sizeHint(); - QSize ret(s.width() + (KVI_MDICHILD_BORDER << 1), + TQSize s = m_pClient->tqsizeHint(); + TQSize ret(s.width() + (KVI_MDICHILD_BORDER << 1), s.height() + (KVI_MDICHILD_BORDER << 1) + KVI_MDICHILD_SPACING + m_pCaption->heightHint()); return ret; } - return QFrame::sizeHint(); + return TQFrame::tqsizeHint(); } diff --git a/src/kvirc/ui/kvi_mdichild.h b/src/kvirc/ui/kvi_mdichild.h index 7915a3b..feac48b 100644 --- a/src/kvirc/ui/kvi_mdichild.h +++ b/src/kvirc/ui/kvi_mdichild.h @@ -27,24 +27,25 @@ #include "kvi_settings.h" #include "kvi_string.h" -#include <qframe.h> -#include <qtoolbutton.h> -#include <qlabel.h> +#include <tqframe.h> +#include <tqtoolbutton.h> +#include <tqlabel.h> class KviMdiManager; class KviMdiChild; class KviMdiCaption; -class QCursor; +class TQCursor; -class KVIRC_API KviMdiChild : public QFrame +class KVIRC_API KviMdiChild : public TQFrame { friend class KviMdiManager; friend class KviMdiCaption; Q_OBJECT + TQ_OBJECT public: KviMdiChild(KviMdiManager* par,const char * name = 0); ~KviMdiChild(); @@ -57,28 +58,28 @@ private: int m_iResizeCorner; int m_iLastCursorCorner; bool m_bResizeMode; - QWidget * m_pClient; + TQWidget * m_pClient; MdiChildState m_state; - QRect m_restoredGeometry; + TQRect m_restoredGeometry; - QString m_szXmlActiveCaption; - QString m_szXmlInactiveCaption; - QString m_szPlainCaption; + TQString m_szXmlActiveCaption; + TQString m_szXmlInactiveCaption; + TQString m_szPlainCaption; public: - QRect restoredGeometry(); - void setRestoredGeometry(const QRect &r){ m_restoredGeometry = r; }; - void setClient(QWidget * w); - QWidget * client(){ return m_pClient; }; + TQRect restoredGeometry(); + void setRestoredGeometry(const TQRect &r){ m_restoredGeometry = r; }; + void setClient(TQWidget * w); + TQWidget * client(){ return m_pClient; }; void unsetClient(); KviMdiCaption * captionLabel(){ return m_pCaption; }; MdiChildState state(){ return m_state; }; - const QString & plainCaption(){ return m_szPlainCaption; }; - const QString & xmlActiveCaption(){ return m_szXmlActiveCaption; }; - const QString & xmlInactiveCaption(){ return m_szXmlInactiveCaption; }; - void setCaption(const QString & plain,const QString & xmlActive,const QString & xmlInactive); - virtual QSize sizeHint(); - void setIcon(const QPixmap &pix); - const QPixmap * icon(); + const TQString & plainCaption(){ return m_szPlainCaption; }; + const TQString & xmlActiveCaption(){ return m_szXmlActiveCaption; }; + const TQString & xmlInactiveCaption(){ return m_szXmlInactiveCaption; }; + void setCaption(const TQString & plain,const TQString & xmlActive,const TQString & xmlInactive); + virtual TQSize tqsizeHint(); + void setIcon(const TQPixmap &pix); + const TQPixmap * icon(); void enableClose(bool bEnable); bool closeEnabled(); KviMdiManager * manager(){ return m_pManager; }; @@ -91,31 +92,31 @@ public slots: void systemPopupSlot(); void closeRequest(); signals: - void systemPopupRequest(const QPoint & pnt); + void systemPopupRequest(const TQPoint & pnt); protected: #ifdef COMPILE_USE_QT4 - virtual void setBackgroundRole(QPalette::ColorRole); + virtual void setBackgroundRole(TQPalette::ColorRole); #else - virtual void setBackgroundMode(QWidget::BackgroundMode bgmd); + virtual void setBackgroundMode(TQWidget::BackgroundMode bgmd); #endif - virtual void resizeEvent(QResizeEvent *e); - virtual void mousePressEvent(QMouseEvent *e); - virtual void mouseMoveEvent(QMouseEvent *e); - virtual void mouseReleaseEvent(QMouseEvent *e); - virtual void leaveEvent(QEvent *e); - virtual void focusInEvent(QFocusEvent *); - virtual void moveEvent(QMoveEvent *e); -// bool eventFilter(QObject *o,QEvent *e); - void emitSystemPopupRequest(const QPoint & pnt){ emit systemPopupRequest(pnt); }; + virtual void resizeEvent(TQResizeEvent *e); + virtual void mousePressEvent(TQMouseEvent *e); + virtual void mouseMoveEvent(TQMouseEvent *e); + virtual void mouseReleaseEvent(TQMouseEvent *e); + virtual void leaveEvent(TQEvent *e); + virtual void focusInEvent(TQFocusEvent *); + virtual void moveEvent(TQMoveEvent *e); +// bool eventFilter(TQObject *o,TQEvent *e); + void emitSystemPopupRequest(const TQPoint & pnt){ emit systemPopupRequest(pnt); }; private: -// void linkChildren(QWidget *w); -// void unlinkChildren(QWidget *w); - QCursor getResizeCursor(int resizeCorner); +// void linkChildren(TQWidget *w); +// void unlinkChildren(TQWidget *w); + TQCursor getResizeCursor(int resizeCorner); void resizeWindowOpaque(int resizeCorner); int getResizeCorner(int ax,int ay); void calculateMinimumSize(int &minWidth,int &minHeight); void setResizeCursor(int resizeCorner); - void calculateResizeRect(int resizeCorner,QPoint mousePos,QRect &resizeRect,int minWidth,int minHeight); + void calculateResizeRect(int resizeCorner,TQPoint mousePos,TQRect &resizeRect,int minWidth,int minHeight); }; diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp index feddca1..9dcafaf 100644 --- a/src/kvirc/ui/kvi_mdimanager.cpp +++ b/src/kvirc/ui/kvi_mdimanager.cpp @@ -37,28 +37,28 @@ #include "kvi_app.h" #include "kvi_tal_popupmenu.h" -#include <qmenubar.h> -#include <qlayout.h> -#include <qpainter.h> +#include <tqmenubar.h> +#include <tqlayout.h> +#include <tqpainter.h> #include <math.h> -#include <qcursor.h> -#include <qdrawutil.h> -#include <qevent.h> +#include <tqcursor.h> +#include <tqdrawutil.h> +#include <tqevent.h> #ifdef COMPILE_USE_QT4 #include "kvi_tal_hbox.h" #endif #ifdef COMPILE_PSEUDO_TRANSPARENCY - #include <qpixmap.h> - extern QPixmap * g_pShadedParentGlobalDesktopBackground; + #include <tqpixmap.h> + extern TQPixmap * g_pShadedParentGlobalDesktopBackground; #endif -KviMdiManager::KviMdiManager(QWidget * parent,KviFrame * pFrm,const char * name) -: KviTalScrollView(parent) +KviMdiManager::KviMdiManager(TQWidget * tqparent,KviFrame * pFrm,const char * name) +: KviTalScrollView(tqparent) { setFrameShape(NoFrame); m_pZ = new KviPointerList<KviMdiChild>; @@ -79,28 +79,28 @@ KviMdiManager::KviMdiManager(QWidget * parent,KviFrame * pFrm,const char * name) #endif m_pWindowPopup = new KviTalPopupMenu(this); - connect(m_pWindowPopup,SIGNAL(activated(int)),this,SLOT(menuActivated(int))); - connect(m_pWindowPopup,SIGNAL(aboutToShow()),this,SLOT(fillWindowPopup())); + connect(m_pWindowPopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(menuActivated(int))); + connect(m_pWindowPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(fillWindowPopup())); m_pTileMethodPopup = new KviTalPopupMenu(this); - connect(m_pTileMethodPopup,SIGNAL(activated(int)),this,SLOT(tileMethodMenuActivated(int))); + connect(m_pTileMethodPopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(tileMethodMenuActivated(int))); #ifdef COMPILE_USE_QT4 viewport()->setAutoFillBackground(false); #else - viewport()->setBackgroundMode(QWidget::NoBackground); + viewport()->setBackgroundMode(TQWidget::NoBackground); #endif setStaticBackground(true); resizeContents(width(),height()); #ifdef COMPILE_USE_QT4 - setFocusPolicy(Qt::NoFocus); - viewport()->setFocusPolicy(Qt::NoFocus); + setFocusPolicy(TTQ_NoFocus); + viewport()->setFocusPolicy(TTQ_NoFocus); #else - setFocusPolicy(QWidget::NoFocus); - viewport()->setFocusPolicy(QWidget::NoFocus); + setFocusPolicy(TQ_NoFocus); + viewport()->setFocusPolicy(TQ_NoFocus); #endif - connect(g_pApp,SIGNAL(reloadImages()),this,SLOT(reloadImages())); + connect(g_pApp,TQT_SIGNAL(reloadImages()),this,TQT_SLOT(reloadImages())); } KviMdiManager::~KviMdiManager() @@ -119,20 +119,20 @@ void KviMdiManager::reloadImages() bool KviMdiManager::focusNextPrevChild(bool bNext) { //bug("FFFFFF"); - // this is a QScrollView bug... it doesn't pass this + // this is a TQScrollView bug... it doesn't pass this // event to the toplevel window return m_pFrm->focusNextPrevChild(bNext); } -void KviMdiManager::drawContents(QPainter *p,int x,int y,int w,int h) +void KviMdiManager::drawContents(TQPainter *p,int x,int y,int w,int h) { //debug("MY DRAW CONTENTS (%d,%d,%d,%d)",x,y,w,h); - QRect r(x,y,w,h); + TQRect r(x,y,w,h); #ifdef COMPILE_PSEUDO_TRANSPARENCY if(g_pShadedParentGlobalDesktopBackground) { - QPoint pnt = viewport()->mapToGlobal(contentsToViewport(r.topLeft())); + TQPoint pnt = viewport()->mapToGlobal(contentsToViewport(r.topLeft())); p->drawTiledPixmap(r,*(g_pShadedParentGlobalDesktopBackground),pnt); return; } @@ -146,7 +146,7 @@ void KviMdiManager::drawContents(QPainter *p,int x,int y,int w,int h) } } -void KviMdiManager::manageChild(KviMdiChild * lpC,bool bCascade,QRect *setGeom) +void KviMdiManager::manageChild(KviMdiChild * lpC,bool bCascade,TQRect *setGeom) { __range_valid(lpC); @@ -154,11 +154,11 @@ void KviMdiManager::manageChild(KviMdiChild * lpC,bool bCascade,QRect *setGeom) if(bCascade) { - QPoint p = getCascadePoint(m_pZ->count()-1); + TQPoint p = getCascadePoint(m_pZ->count()-1); addChild(lpC,p.x(),p.y()); } else { // FIXME: is this right ? - QPoint p = lpC->pos(); + TQPoint p = lpC->pos(); if(p.x() < 0)p.setX(0); if(p.y() < 0)p.setY(0); addChild(lpC,p.x(),p.y()); @@ -199,7 +199,7 @@ void KviMdiManager::setTopChild(KviMdiChild *lpC,bool bSetFocus) return; // no such child ? } - // disable the labels of all the other children + // disable the labels of all the other tqchildren //for(KviMdiChild *pC=m_pZ->first();pC;pC=m_pZ->next()) //{ // pC->captionLabel()->setActive(false); @@ -225,7 +225,7 @@ void KviMdiManager::setTopChild(KviMdiChild *lpC,bool bSetFocus) { lpC->setFocus(); /* - if(topLevelWidget()->isActiveWindow()) + if(tqtopLevelWidget()->isActiveWindow()) { } @@ -234,7 +234,7 @@ void KviMdiManager::setTopChild(KviMdiChild *lpC,bool bSetFocus) } } -void KviMdiManager::focusInEvent(QFocusEvent *) +void KviMdiManager::focusInEvent(TQFocusEvent *) { focusTopChild(); } @@ -278,14 +278,14 @@ KviMdiChild * KviMdiManager::highestChildExcluding(KviMdiChild * pChild) return c; } -QPoint KviMdiManager::getCascadePoint(int indexOfWindow) +TQPoint KviMdiManager::getCascadePoint(int indexOfWindow) { - QPoint pnt(0,0); + TQPoint pnt(0,0); if(indexOfWindow==0)return pnt; KviMdiChild *lpC=m_pZ->first(); int step=(lpC ? (lpC->captionLabel()->heightHint()+KVI_MDICHILD_BORDER) : 20); - int availableHeight=viewport()->height()-(lpC ? lpC->minimumSize().height() : KVI_MDICHILD_MIN_HEIGHT); - int availableWidth=viewport()->width()-(lpC ? lpC->minimumSize().width() : KVI_MDICHILD_MIN_WIDTH); + int availableHeight=viewport()->height()-(lpC ? lpC->tqminimumSize().height() : KVI_MDICHILD_MIN_HEIGHT); + int availableWidth=viewport()->width()-(lpC ? lpC->tqminimumSize().width() : KVI_MDICHILD_MIN_WIDTH); int ax=0; int ay=0; for(int i=0;i<indexOfWindow;i++) @@ -300,7 +300,7 @@ QPoint KviMdiManager::getCascadePoint(int indexOfWindow) return pnt; } -void KviMdiManager::mousePressEvent(QMouseEvent *e) +void KviMdiManager::mousePressEvent(TQMouseEvent *e) { //Popup the window menu if(e->button() & Qt::RightButton)m_pWindowPopup->popup(mapToGlobal(e->pos())); @@ -313,8 +313,8 @@ void KviMdiManager::childMoved(KviMdiChild *) void KviMdiManager::maximizeChild(KviMdiChild * lpC) { - // the children must be moved once by the means of QScrollView::moveChild() - // so the QScrollView internal structures get updated with the negative + // the tqchildren must be moved once by the means of TQScrollView::moveChild() + // so the TQScrollView internal structures get updated with the negative // position of the widget, otherwise, when restoring with moveChild() // it will refuse to move it back to the original position resizeContents(visibleWidth(),visibleHeight()); @@ -338,14 +338,14 @@ void KviMdiManager::maximizeChild(KviMdiChild * lpC) lpC->setFocus(); } - // fixme: we could hide all the other children now! + // fixme: we could hide all the other tqchildren now! } -void KviMdiManager::resizeEvent(QResizeEvent *e) +void KviMdiManager::resizeEvent(TQResizeEvent *e) { - //If we have a maximized children at the top , adjust its size + //If we have a maximized tqchildren at the top , adjust its size KviTalScrollView::resizeEvent(e); KviMdiChild *lpC=m_pZ->last(); if(lpC) @@ -378,7 +378,7 @@ void KviMdiManager::childMaximized(KviMdiChild * lpC) void KviMdiManager::childMinimized(KviMdiChild * lpC,bool bWasMaximized) { __range_valid(lpC); - if(m_pZ->findRef(lpC) == -1)return; + if(m_pZ->tqfindRef(lpC) == -1)return; if(m_pZ->count() > 1) { m_pZ->setAutoDelete(false); @@ -431,7 +431,7 @@ void KviMdiManager::focusTopChild() if(!lpC->isVisible())return; // if(lpC->state()==KviMdiChild::Minimized)return; // debug("Focusing top child %s",lpC->name()); - //disable the labels of all the other children + //disable the labels of all the other tqchildren for(KviMdiChild *pC=m_pZ->first();pC;pC=m_pZ->next()) { if(pC != lpC) @@ -506,23 +506,23 @@ void KviMdiManager::updateSDIMode() #ifndef Q_OS_MACX KviMenuBar * b = m_pFrm->mainMenuBar(); - const QPixmap * pix = lpC ? lpC->icon() : 0; + const TQPixmap * pix = lpC ? lpC->icon() : 0; if(!pix)pix = g_pIconManager->getSmallIcon(KVI_SMALLICON_NONE); else if(pix->isNull())pix = g_pIconManager->getSmallIcon(KVI_SMALLICON_NONE); if(!m_pSdiIconButton) { m_pSdiIconButton = new KviMenuBarToolButton(b,*pix,"nonne"); - connect(m_pSdiIconButton,SIGNAL(clicked()),this,SLOT(activeChildSystemPopup())); + connect(m_pSdiIconButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(activeChildSystemPopup())); #ifdef COMPILE_USE_QT4 - // This is an obscure, undocumented and internal function in QT4 QMenuBar + // This is an obscure, undocumented and internal function in QT4 TQMenuBar // I won't be surprised if this disappears.... - b->setCornerWidget(m_pSdiIconButton,Qt::TopLeftCorner); + b->setCornerWidget(m_pSdiIconButton,TQt::TopLeftCorner); m_pSdiIconButton->show(); #else m_iSdiIconItemId = b->insertItem(m_pSdiIconButton,-1,0); #endif - connect(m_pSdiIconButton,SIGNAL(destroyed()),this,SLOT(sdiIconButtonDestroyed())); + connect(m_pSdiIconButton,TQT_SIGNAL(destroyed()),this,TQT_SLOT(sdiIconButtonDestroyed())); } else { m_pSdiIconButton->setPixmap(*pix); } @@ -533,12 +533,12 @@ void KviMdiManager::activeChildSystemPopup() { KviMdiChild * lpC = m_pZ->last(); if(!lpC)return; - QPoint pnt; + TQPoint pnt; if(m_pSdiIconButton) { - pnt = m_pSdiIconButton->mapToGlobal(QPoint(0,m_pSdiIconButton->height())); + pnt = m_pSdiIconButton->mapToGlobal(TQPoint(0,m_pSdiIconButton->height())); } else { - pnt = QCursor::pos(); + pnt = TQCursor::pos(); } lpC->emitSystemPopupRequest(pnt); } @@ -555,7 +555,7 @@ void KviMdiManager::enterSDIMode(KviMdiChild *lpC) { KviMenuBar * b = m_pFrm->mainMenuBar(); - QWidget * pButtonParent; + TQWidget * pButtonParent; #ifdef COMPILE_USE_QT4 m_pSdiControls = new KviTalHBox(b); @@ -567,31 +567,31 @@ void KviMdiManager::enterSDIMode(KviMdiChild *lpC) pButtonParent = b; #endif m_pSdiMinimizeButton = new KviMenuBarToolButton(pButtonParent,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)),"btnminimize"); - connect(m_pSdiMinimizeButton,SIGNAL(clicked()),this,SLOT(minimizeActiveChild())); + connect(m_pSdiMinimizeButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(minimizeActiveChild())); #ifndef COMPILE_USE_QT4 m_iSdiMinimizeItemId = b->insertItem(m_pSdiMinimizeButton,-1,b->count()); #endif - connect(m_pSdiMinimizeButton,SIGNAL(destroyed()),this,SLOT(sdiMinimizeButtonDestroyed())); + connect(m_pSdiMinimizeButton,TQT_SIGNAL(destroyed()),this,TQT_SLOT(sdiMinimizeButtonDestroyed())); m_pSdiRestoreButton = new KviMenuBarToolButton(pButtonParent,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RESTORE)),"btnrestore"); - connect(m_pSdiRestoreButton,SIGNAL(clicked()),this,SLOT(restoreActiveChild())); + connect(m_pSdiRestoreButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(restoreActiveChild())); #ifndef COMPILE_USE_QT4 m_iSdiRestoreItemId = b->insertItem(m_pSdiRestoreButton,-1,b->count()); #endif - connect(m_pSdiRestoreButton,SIGNAL(destroyed()),this,SLOT(sdiRestoreButtonDestroyed())); + connect(m_pSdiRestoreButton,TQT_SIGNAL(destroyed()),this,TQT_SLOT(sdiRestoreButtonDestroyed())); m_pSdiCloseButton = new KviMenuBarToolButton(pButtonParent,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)),"btnclose"); - connect(m_pSdiCloseButton,SIGNAL(clicked()),this,SLOT(closeActiveChild())); + connect(m_pSdiCloseButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(closeActiveChild())); #ifndef COMPILE_USE_QT4 m_iSdiCloseItemId = b->insertItem(m_pSdiCloseButton,-1,b->count()); #endif - connect(m_pSdiCloseButton,SIGNAL(destroyed()),this,SLOT(sdiCloseButtonDestroyed())); + connect(m_pSdiCloseButton,TQT_SIGNAL(destroyed()),this,TQT_SLOT(sdiCloseButtonDestroyed())); #ifdef COMPILE_USE_QT4 - // This is an obscure, undocumented and internal function in QT4 QMenuBar + // This is an obscure, undocumented and internal function in QT4 TQMenuBar // I won't be surprised if this disappears.... - b->setCornerWidget(m_pSdiControls,Qt::TopRightCorner); - // The show below SHOULD force a re-layout of the menubar.. + b->setCornerWidget(m_pSdiControls,TQt::TopRightCorner); + // The show below SHOULD force a re-tqlayout of the menubar.. // but it doesn't work when the KviFrame is still hidden (at startup) // We handle this BUG in showEvent() m_pSdiControls->show(); @@ -608,15 +608,15 @@ void KviMdiManager::enterSDIMode(KviMdiChild *lpC) updateSDIMode(); } -void KviMdiManager::relayoutMenuButtons() +void KviMdiManager::retqlayoutMenuButtons() { #ifdef COMPILE_USE_QT4 - // force a re-layout of the menubar in Qt4 (see the note in enterSDIMode()) + // force a re-tqlayout of the menubar in TQt4 (see the note in enterSDIMode()) // by resetting the corner widget if(m_pSdiControls) { - m_pFrm->mainMenuBar()->setCornerWidget(0,Qt::TopRightCorner); - m_pFrm->mainMenuBar()->setCornerWidget(m_pSdiControls,Qt::TopRightCorner); + m_pFrm->mainMenuBar()->setCornerWidget(0,TQt::TopRightCorner); + m_pFrm->mainMenuBar()->setCornerWidget(m_pSdiControls,TQt::TopRightCorner); } // also force an activation of the top MdiChild since it probably didn't get it yet KviMdiChild * c = topChild(); @@ -662,7 +662,7 @@ void KviMdiManager::leaveSDIMode() } if(m_pSdiIconButton) { - m_pSdiIconButton->hide(); // this will force a QMenuBar relayout + m_pSdiIconButton->hide(); // this will force a TQMenuBar retqlayout delete m_pSdiIconButton; m_pSdiIconButton = 0; } @@ -693,31 +693,31 @@ void KviMdiManager::fillWindowPopup() { m_pWindowPopup->clear(); - m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CASCADEWINDOWS)),(__tr2qs("&Cascade Windows")),this,SLOT(cascadeWindows())); - m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CASCADEWINDOWS)),(__tr2qs("Cascade &Maximized")),this,SLOT(cascadeMaximized())); + m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CASCADEWINDOWS)),(__tr2qs("&Cascade Windows")),this,TQT_SLOT(cascadeWindows())); + m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CASCADEWINDOWS)),(__tr2qs("Cascade &Maximized")),this,TQT_SLOT(cascadeMaximized())); m_pWindowPopup->insertSeparator(); - m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("&Tile Windows")),this,SLOT(tile())); + m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("&Tile Windows")),this,TQT_SLOT(tile())); m_pTileMethodPopup->clear(); - int id = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_AUTOTILEWINDOWS)),(__tr2qs("&Auto Tile")),this,SLOT(toggleAutoTile())); + int id = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_AUTOTILEWINDOWS)),(__tr2qs("&Auto Tile")),this,TQT_SLOT(toggleAutoTile())); m_pTileMethodPopup->setItemChecked(id,KVI_OPTION_BOOL(KviOption_boolAutoTileWindows)); m_pTileMethodPopup->setItemParameter(id,-1); m_pTileMethodPopup->insertSeparator(); int ids[KVI_NUM_TILE_METHODS]; ids[KVI_TILE_METHOD_ANODINE] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Anodine's Full Grid"))); m_pTileMethodPopup->setItemParameter(ids[KVI_TILE_METHOD_ANODINE],KVI_TILE_METHOD_ANODINE); - ids[KVI_TILE_METHOD_PRAGMA4HOR] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma's Horizontal 4-Grid"))); + ids[KVI_TILE_METHOD_PRAGMA4HOR] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma'sQt::Horizontal 4-Grid"))); m_pTileMethodPopup->setItemParameter(ids[KVI_TILE_METHOD_PRAGMA4HOR],KVI_TILE_METHOD_PRAGMA4HOR); - ids[KVI_TILE_METHOD_PRAGMA4VER] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma's Vertical 4-Grid"))); + ids[KVI_TILE_METHOD_PRAGMA4VER] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma'sQt::Vertical 4-Grid"))); m_pTileMethodPopup->setItemParameter(ids[KVI_TILE_METHOD_PRAGMA4VER],KVI_TILE_METHOD_PRAGMA4VER); - ids[KVI_TILE_METHOD_PRAGMA6HOR] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma's Horizontal 6-Grid"))); + ids[KVI_TILE_METHOD_PRAGMA6HOR] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma'sQt::Horizontal 6-Grid"))); m_pTileMethodPopup->setItemParameter(ids[KVI_TILE_METHOD_PRAGMA6HOR],KVI_TILE_METHOD_PRAGMA6HOR); - ids[KVI_TILE_METHOD_PRAGMA6VER] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma's Vertical 6-Grid"))); + ids[KVI_TILE_METHOD_PRAGMA6VER] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma'sQt::Vertical 6-Grid"))); m_pTileMethodPopup->setItemParameter(ids[KVI_TILE_METHOD_PRAGMA6VER],KVI_TILE_METHOD_PRAGMA6VER); - ids[KVI_TILE_METHOD_PRAGMA9HOR] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma's Horizontal 9-Grid"))); + ids[KVI_TILE_METHOD_PRAGMA9HOR] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma'sQt::Horizontal 9-Grid"))); m_pTileMethodPopup->setItemParameter(ids[KVI_TILE_METHOD_PRAGMA9HOR],KVI_TILE_METHOD_PRAGMA9HOR); - ids[KVI_TILE_METHOD_PRAGMA9VER] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma's Vertical 9-Grid"))); + ids[KVI_TILE_METHOD_PRAGMA9VER] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma'sQt::Vertical 9-Grid"))); m_pTileMethodPopup->setItemParameter(ids[KVI_TILE_METHOD_PRAGMA9VER],KVI_TILE_METHOD_PRAGMA9VER); if(KVI_OPTION_UINT(KviOption_uintTileMethod) >= KVI_NUM_TILE_METHODS)KVI_OPTION_UINT(KviOption_uintTileMethod) = KVI_TILE_METHOD_PRAGMA9HOR; @@ -726,17 +726,17 @@ void KviMdiManager::fillWindowPopup() m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Tile Met&hod")),m_pTileMethodPopup); m_pWindowPopup->insertSeparator(); - m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXVERTICAL)),(__tr2qs("Expand &Vertically")),this,SLOT(expandVertical())); - m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXHORIZONTAL)),(__tr2qs("Expand &Horizontally")),this,SLOT(expandHorizontal())); + m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXVERTICAL)),(__tr2qs("Expand &Vertically")),this,TQT_SLOT(expandVertical())); + m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXHORIZONTAL)),(__tr2qs("Expand &Horizontally")),this,TQT_SLOT(expandHorizontal())); m_pWindowPopup->insertSeparator(); - m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)),(__tr2qs("Mi&nimize All")),this,SLOT(minimizeAll())); -// m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RESTORE)),(__tr2qs("&Restore all")),this,SLOT(restoreAll())); + m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)),(__tr2qs("Mi&nimize All")),this,TQT_SLOT(minimizeAll())); +// m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RESTORE)),(__tr2qs("&Restore all")),this,TQT_SLOT(restoreAll())); // m_pWindowPopup->insertSeparator(); int i=100; - QString szItem; - QString szCaption; + TQString szItem; + TQString szCaption; for(KviMdiChild *lpC=m_pZ->first();lpC;lpC=m_pZ->next()) { szItem.setNum(((uint)i)-99); @@ -745,7 +745,7 @@ void KviMdiManager::fillWindowPopup() szCaption = lpC->plainCaption(); if(szCaption.length() > 30) { - QString trail = szCaption.right(12); + TQString trail = szCaption.right(12); szCaption.truncate(12); szCaption+="..."; szCaption+=trail; @@ -757,7 +757,7 @@ void KviMdiManager::fillWindowPopup() szItem+=szCaption; szItem+=")"; } else szItem+=szCaption; - const QPixmap * pix = lpC->icon(); + const TQPixmap * pix = lpC->icon(); if(pix && !(pix->isNull()))m_pWindowPopup->insertItem(*pix,szItem,i); else m_pWindowPopup->insertItem(szItem,i); m_pWindowPopup->setItemChecked(i,((uint)i)==(m_pZ->count()+99)); @@ -812,9 +812,9 @@ void KviMdiManager::cascadeWindows() KviMdiChild *lpC=list.first(); if(lpC->state() != KviMdiChild::Minimized) { - QPoint p = getCascadePoint(idx); + TQPoint p = getCascadePoint(idx); moveChild(lpC,p.x(),p.y()); - lpC->resize(lpC->sizeHint()); + lpC->resize(lpC->tqsizeHint()); idx++; } list.removeFirst(); @@ -841,11 +841,11 @@ void KviMdiManager::cascadeMaximized() KviMdiChild *lpC=list.first(); if(lpC->state() != KviMdiChild::Minimized) { - QPoint pnt(getCascadePoint(idx)); + TQPoint pnt(getCascadePoint(idx)); moveChild(lpC,pnt.x(),pnt.y()); - QSize curSize(viewport()->width() - pnt.x(),viewport()->height() - pnt.y()); - if((lpC->minimumSize().width() > curSize.width()) || - (lpC->minimumSize().height() > curSize.height()))lpC->resize(lpC->minimumSize()); + TQSize curSize(viewport()->width() - pnt.x(),viewport()->height() - pnt.y()); + if((lpC->tqminimumSize().width() > curSize.width()) || + (lpC->tqminimumSize().height() > curSize.height()))lpC->resize(lpC->tqminimumSize()); else lpC->resize(curSize); idx++; } @@ -930,7 +930,7 @@ void KviMdiManager::restoreAll() while(!list.isEmpty()) { KviMdiChild *lpC=list.first(); - if(lpC->state() != KviMdiChild::Normal && (!(lpC->plainCaption()).contains("CONSOLE") )) + if(lpC->state() != KviMdiChild::Normal && (!(lpC->plainCaption()).tqcontains("CONSOLE") )) lpC->restore(); list.removeFirst(); } @@ -1007,13 +1007,13 @@ void KviMdiManager::tileAllInternal(int maxWnds,bool bHorizontal) int numToHandle=((numVisible > maxWnds) ? maxWnds : numVisible); int xQuantum=viewport()->width()/pColstable[numToHandle-1]; - if(xQuantum < ((lpTop->minimumSize().width() > KVI_MDICHILD_MIN_WIDTH) ? lpTop->minimumSize().width() : KVI_MDICHILD_MIN_WIDTH)){ + if(xQuantum < ((lpTop->tqminimumSize().width() > KVI_MDICHILD_MIN_WIDTH) ? lpTop->tqminimumSize().width() : KVI_MDICHILD_MIN_WIDTH)){ if(pColrecall[numToHandle-1]==0)debug("Tile : Not enouh space"); else tileAllInternal(pColrecall[numToHandle-1],bHorizontal); return; } int yQuantum=viewport()->height()/pRowstable[numToHandle-1]; - if(yQuantum < ((lpTop->minimumSize().height() > KVI_MDICHILD_MIN_HEIGHT) ? lpTop->minimumSize().height() : KVI_MDICHILD_MIN_HEIGHT)){ + if(yQuantum < ((lpTop->tqminimumSize().height() > KVI_MDICHILD_MIN_HEIGHT) ? lpTop->tqminimumSize().height() : KVI_MDICHILD_MIN_HEIGHT)){ if(pRowrecall[numToHandle-1]==0)debug("Tile : Not enough space"); else tileAllInternal(pRowrecall[numToHandle-1],bHorizontal); return; @@ -1073,7 +1073,7 @@ void KviMdiManager::tileAnodine() int numVisible=getVisibleChildCount(); // count visible windows if(numVisible<1)return; int numCols=int(sqrt((double)numVisible)); // set columns to square root of visible count - // create an array to form grid layout + // create an array to form grid tqlayout int *numRows=new int[numCols]; int numCurCol=0; while(numCurCol<numCols) diff --git a/src/kvirc/ui/kvi_mdimanager.h b/src/kvirc/ui/kvi_mdimanager.h index 17202fa..cd5e84d 100644 --- a/src/kvirc/ui/kvi_mdimanager.h +++ b/src/kvirc/ui/kvi_mdimanager.h @@ -28,10 +28,10 @@ #include "kvi_settings.h" #include "kvi_pointerlist.h" -#include <qwidget.h> -#include <qframe.h> -#include <qpixmap.h> -#include <qtoolbutton.h> +#include <tqwidget.h> +#include <tqframe.h> +#include <tqpixmap.h> +#include <tqtoolbutton.h> #include "kvi_tal_scrollview.h" @@ -59,13 +59,14 @@ class KVIRC_API KviMdiManager : public KviTalScrollView friend class KviMdiChild; friend class KviMdiCaption; Q_OBJECT + TQ_OBJECT public: - KviMdiManager(QWidget * parent,KviFrame * pFrm,const char * name); + KviMdiManager(TQWidget * tqparent,KviFrame * pFrm,const char * name); ~KviMdiManager(); public: KviMdiChild * topChild(){ return m_pZ->last(); }; KviMdiChild * highestChildExcluding(KviMdiChild * pChild); - void manageChild(KviMdiChild * lpC,bool bCascade = true,QRect * setGeom = 0); + void manageChild(KviMdiChild * lpC,bool bCascade = true,TQRect * setGeom = 0); void setTopChild(KviMdiChild *lpC,bool bSetFocus); void showAndActivate(KviMdiChild * lpC); KviTalPopupMenu * windowPopup(){ return m_pWindowPopup; }; @@ -99,13 +100,13 @@ protected: void childRestored(KviMdiChild *lpC,bool bWasMaximized); void childMoved(KviMdiChild * lpC); void maximizeChild(KviMdiChild * lpC); - virtual void focusInEvent(QFocusEvent *e); - virtual void mousePressEvent(QMouseEvent *e); - virtual void resizeEvent(QResizeEvent *e); - virtual void drawContents(QPainter * p,int x,int y,int w,int h); + virtual void focusInEvent(TQFocusEvent *e); + virtual void mousePressEvent(TQMouseEvent *e); + virtual void resizeEvent(TQResizeEvent *e); + virtual void drawContents(TQPainter * p,int x,int y,int w,int h); virtual bool focusNextPrevChild(bool pNext); public slots: - void relayoutMenuButtons(); + void retqlayoutMenuButtons(); void cascadeWindows(); void cascadeMaximized(); void expandVertical(); @@ -132,7 +133,7 @@ protected slots: private: void ensureNoMaximized(); void tileAllInternal(int maxWnds,bool bHorizontal); - QPoint getCascadePoint(int indexOfWindow); + TQPoint getCascadePoint(int indexOfWindow); void enterSDIMode(KviMdiChild *lpC); void leaveSDIMode(); void updateSDIMode(); diff --git a/src/kvirc/ui/kvi_menubar.cpp b/src/kvirc/ui/kvi_menubar.cpp index a382f73..6401ed8 100644 --- a/src/kvirc/ui/kvi_menubar.cpp +++ b/src/kvirc/ui/kvi_menubar.cpp @@ -51,39 +51,39 @@ KviMenuBar::KviMenuBar(KviFrame * par,const char * name) m_pDefaultItemId = 0; KviTalPopupMenu * pop = new KviTalPopupMenu(this,"KVIrc"); - connect(pop,SIGNAL(aboutToShow()),this,SLOT(setupMainPopup())); + connect(pop,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(setupMainPopup())); #ifndef Q_OS_MACX addDefaultItem("&KVIrc",pop); #else - // Qt/Mac creates already a "KVirc" menu item on its own, and we don't like double entries ;-) + // TQt/Mac creates already a "KVirc" menu item on its own, and we don't like double entries ;-) addDefaultItem("&IRC",pop); #endif //Q_OS_MACX m_pRecentServersPopup = new KviTalPopupMenu(this,"recentservers"); - connect(m_pRecentServersPopup,SIGNAL(aboutToShow()),this,SLOT(setupRecentServersPopup())); - connect(m_pRecentServersPopup,SIGNAL(activated(int)),this,SLOT(newConnectionToServer(int))); + connect(m_pRecentServersPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(setupRecentServersPopup())); + connect(m_pRecentServersPopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(newConnectionToServer(int))); m_pScriptItemList = 0; pop = new KviTalPopupMenu(this,"scripting"); - connect(pop,SIGNAL(aboutToShow()),this,SLOT(setupScriptingPopup())); + connect(pop,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(setupScriptingPopup())); addDefaultItem(__tr2qs("Scri&pting"),pop); pop = new KviTalPopupMenu(this,"tools"); - connect(pop,SIGNAL(aboutToShow()),this,SLOT(setupToolsPopup())); - connect(pop,SIGNAL(activated(int)),this,SLOT(toolsPopupSelected(int))); + connect(pop,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(setupToolsPopup())); + connect(pop,TQT_SIGNAL(activated(int)),this,TQT_SLOT(toolsPopupSelected(int))); addDefaultItem(__tr2qs("&Tools"),pop); m_pToolbarsPopup = new KviTalPopupMenu(this,"toolbars"); - connect(m_pToolbarsPopup,SIGNAL(aboutToShow()),this,SLOT(setupToolbarsPopup())); + connect(m_pToolbarsPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(setupToolbarsPopup())); pop = new KviTalPopupMenu(this,"settings"); - connect(pop,SIGNAL(aboutToShow()),this,SLOT(setupSettingsPopup())); + connect(pop,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(setupSettingsPopup())); addDefaultItem(__tr2qs("&Settings"),pop); addDefaultItem(__tr2qs("&Window"),par->mdiManager()->windowPopup()); pop = new KviTalPopupMenu(this,"help"); - connect(pop,SIGNAL(aboutToShow()),this,SLOT(setupHelpPopup())); + connect(pop,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(setupHelpPopup())); addDefaultItem(__tr2qs("&Help"),pop); } @@ -93,17 +93,17 @@ KviMenuBar::~KviMenuBar() if(m_pDefaultItemId)kvi_free(m_pDefaultItemId); } -void KviMenuBar::showEvent(QShowEvent *e) +void KviMenuBar::showEvent(TQShowEvent *e) { #ifdef COMPILE_USE_QT4 debug("menubar show"); - // force a re-layout of the menubar in Qt4 (see the note in enterSDIMode()) + // force a re-tqlayout of the menubar in TQt4 (see the note in enterSDIMode()) // by resetting the corner widget - m_pFrm->mdiManager()->relayoutMenuButtons(); + m_pFrm->mdiManager()->retqlayoutMenuButtons(); #endif } -void KviMenuBar::addDefaultItem(const QString &text,KviTalPopupMenu * pop) +void KviMenuBar::addDefaultItem(const TQString &text,KviTalPopupMenu * pop) { m_iNumDefaultItems++; m_pDefaultItemId = (int *)kvi_realloc((void *)m_pDefaultItemId,sizeof(int) * m_iNumDefaultItems); @@ -116,52 +116,52 @@ void KviMenuBar::setupHelpPopup() help->clear(); // FIXME: Convert these to actions! - int id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HELP)),__tr2qs("&Help Browser (Panel)"),m_pFrm,SLOT(executeInternalCommand(int))); + int id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HELP)),__tr2qs("&Help Browser (Panel)"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_HELP_NEWSTATICWINDOW); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MDIHELP)),__tr2qs("Help Browser (&Window)"),m_pFrm,SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MDIHELP)),__tr2qs("Help Browser (&Window)"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_HELP_NEWMDIWINDOW); help->insertSeparator(); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_IDEA)),__tr2qs("&Tip of the Day"),m_pFrm,SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_IDEA)),__tr2qs("&Tip of the Day"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_TIP_OPEN); help->insertSeparator(); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC)),__tr2qs("About &KVIrc"),m_pFrm,SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC)),__tr2qs("About &KVIrc"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_ABOUT_ABOUTKVIRC); help->insertSeparator(); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HOMEPAGE)),__tr2qs("KVIrc Home&page"),m_pFrm,SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HOMEPAGE)),__tr2qs("KVIrc Home&page"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_KVIRC_HOMEPAGE); if(kvi_strEqualCIN(KviLocale::localeName(),"ru",2)) { - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HOMEPAGE)),__tr2qs("KVIrc Russian Home&page"),m_pFrm,SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HOMEPAGE)),__tr2qs("KVIrc Russian Home&page"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_KVIRC_HOMEPAGE_RU); } if(kvi_strEqualCIN(KviLocale::localeName(),"fr",2)) { - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HOMEPAGE)),__tr2qs("KVIrc French Home&page"),m_pFrm,SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HOMEPAGE)),__tr2qs("KVIrc French Home&page"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_KVIRC_HOMEPAGE_FR); } help->insertSeparator(); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MESSAGE)),__tr2qs("Subscribe to the Mailing List"),m_pFrm,SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MESSAGE)),__tr2qs("Subscribe to the Mailing List"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_MAILINGLIST); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_BOMB)),__tr2qs("Report a Bug / Propose Improvements"),m_pFrm,SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_BOMB)),__tr2qs("Report a Bug / Propose Improvements"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_BUGTRACK); help->insertSeparator(); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc International Channel on Freenode"),m_pFrm,SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc International Channel on Freenode"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_ON_FREENODE); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc International Channel on IRCNet"),m_pFrm,SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc International Channel on IRCNet"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_ON_IRCNET); if(kvi_strEqualCIN(KviLocale::localeName(),"it",2)) { // join #kvirc.net on azzurra - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc Italian Channel on AzzurraNet"),m_pFrm,SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc Italian Channel on AzzurraNet"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_IT_ON_AZZURRA); } if(kvi_strEqualCIN(KviLocale::localeName(),"fr",2)) { // join #kvirc-fr on freenode - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc French Channel on Freenode"),m_pFrm,SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc French Channel on Freenode"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_FR_ON_FREENODE); // join #kvirc on europnet - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc French Channel on EuropNet"),m_pFrm,SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc French Channel on EuropNet"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_FR_ON_EUROPNET); } // add your localized #kvirc channels here... @@ -176,7 +176,7 @@ void KviMenuBar::setupSettingsPopup() opt->insertItem(__tr2qs("Toolbars"),m_pToolbarsPopup); - int id = opt->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_STATUSBAR)),__tr2qs("Show StatusBar"),m_pFrm,SLOT(toggleStatusBar())); + int id = opt->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_STATUSBAR)),__tr2qs("Show StatusBar"),m_pFrm,TQT_SLOT(toggleStatusBar())); opt->setItemChecked(id,m_pFrm->mainStatusBar()); @@ -191,7 +191,7 @@ void KviMenuBar::setupSettingsPopup() ACTION_POPUP_ITEM(KVI_COREACTION_EDITREGUSERS,opt) opt->insertSeparator(); - opt->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FLOPPY)),__tr2qs("&Save Configuration"),g_pApp,SLOT(saveConfiguration())); + opt->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FLOPPY)),__tr2qs("&Save Configuration"),g_pApp,TQT_SLOT(saveConfiguration())); } void KviMenuBar::setupScriptingPopup() @@ -210,7 +210,7 @@ void KviMenuBar::setupScriptingPopup() ACTION_POPUP_ITEM(KVI_COREACTION_EXECUTEKVS,script) script->insertSeparator(); - script->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TEXTEXCLAMATIVE)),__tr2qs("Restore &Default Script"),g_pApp,SLOT(restoreDefaultScript())); + script->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TEXTEXCLAMATIVE)),__tr2qs("Restore &Default Script"),g_pApp,TQT_SLOT(restoreDefaultScript())); } void KviMenuBar::setupMainPopup() @@ -222,8 +222,8 @@ void KviMenuBar::setupMainPopup() if(m_pFrm->activeContext()) if(m_pFrm->activeContext()->state()==KviIrcContext::Connected) { - int id = main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs("Disconnect"),m_pFrm,SLOT(executeInternalCommand(int))); - main->setItemParameter(id,KVI_INTERNALCOMMAND_QUIT); + int id = main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUIT)),__tr2qs("Disconnect"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); + main->setItemParameter(id,KVI_INTERNALCOMMAND_TQUIT); } main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),__tr2qs("New &Connection To"),m_pRecentServersPopup); @@ -231,18 +231,18 @@ void KviMenuBar::setupMainPopup() if(m_pFrm->dockExtension()) { - int id = main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DOCKWIDGET)),__tr2qs("Hide &Dock Icon"),m_pFrm,SLOT(executeInternalCommand(int))); + int id = main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DOCKWIDGET)),__tr2qs("Hide &Dock Icon"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); main->setItemParameter(id,KVI_INTERNALCOMMAND_DOCKWIDGET_HIDE); } else { - int id = main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DOCKWIDGET)),__tr2qs("Show &Dock Icon"),m_pFrm,SLOT(executeInternalCommand(int))); + int id = main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DOCKWIDGET)),__tr2qs("Show &Dock Icon"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); main->setItemParameter(id,KVI_INTERNALCOMMAND_DOCKWIDGET_SHOW); } -// Qt/Mac creates a Quit item on its own +// TQt/Mac creates a Quit item on its own #ifndef Q_OS_MACX main->insertSeparator(); - main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITAPP)),__tr2qs("&Quit"),g_pApp,SLOT(quit())); + main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TQUITAPP)),__tr2qs("&Quit"),g_pApp,TQT_SLOT(quit())); #endif //Q_OS_MACX } @@ -257,7 +257,7 @@ void KviMenuBar::setupRecentServersPopup() void KviMenuBar::newConnectionToServer(int id) { - QString text = m_pRecentServersPopup->text(id); + TQString text = m_pRecentServersPopup->text(id); if(!text.isEmpty()) { // the gentoo qt 3.3.4-r2 is broken @@ -266,7 +266,7 @@ void KviMenuBar::newConnectionToServer(int id) { KviKvsScript::run("options.edit KviServerOptionsWidget",m_pFrm->firstConsole()); } else { - text.replace(QString("&"),QString("")); + text.tqreplace(TQString("&"),TQString("")); KviStr szCommand; if(KviIrcUrl::parse(text.utf8().data(),szCommand,KVI_IRCURL_CONTEXT_NEW)) KviKvsScript::run(szCommand.ptr(),m_pFrm->firstConsole()); @@ -302,10 +302,10 @@ void KviMenuBar::setupToolsPopup() ACTION_POPUP_ITEM(KVI_COREACTION_SCREENSHOT,m) // moved the old tools here - m->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ICONMANAGER)),__tr2qs("Show &Icon Table"),g_pIconManager,SLOT(showIconWidget())); + m->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ICONMANAGER)),__tr2qs("Show &Icon Table"),g_pIconManager,TQT_SLOT(showIconWidget())); #ifdef COMPILE_KDE_SUPPORT int id; - id = m->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),__tr2qs("Open &Terminal"),m_pFrm,SLOT(executeInternalCommand(int))); + id = m->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),__tr2qs("Open &Terminal"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); m->setItemParameter(id,KVI_INTERNALCOMMAND_TERM_OPEN); #endif @@ -351,12 +351,12 @@ int KviMenuBar::getDefaultItemRealIndex(int iDefaultIndex) return indexOf(m_pDefaultItemId[iDefaultIndex]); } -KviScriptMenuBarItem * KviMenuBar::findMenu(const QString &text) +KviScriptMenuBarItem * KviMenuBar::findMenu(const TQString &text) { if(!m_pScriptItemList)return 0; for(KviScriptMenuBarItem * i = m_pScriptItemList->first();i;i = m_pScriptItemList->next()) { - if(KviQString::equalCI(i->szText,text))return i; + if(KviTQString::equalCI(i->szText,text))return i; } return 0; } @@ -371,12 +371,12 @@ KviScriptMenuBarItem * KviMenuBar::findMenu(KviKvsPopupMenu * p) return 0; } -bool KviMenuBar::removeMenu(const QString &text) +bool KviMenuBar::removeMenu(const TQString &text) { KviScriptMenuBarItem * i = findMenu(text); if(i) { - disconnect(i->pPopup,SIGNAL(destroyed()),this,SLOT(menuDestroyed())); + disconnect(i->pPopup,TQT_SIGNAL(destroyed()),this,TQT_SLOT(menuDestroyed())); removeItem(i->id); m_pScriptItemList->removeRef(i); return true; @@ -394,7 +394,7 @@ void KviMenuBar::menuDestroyed() } } -void KviMenuBar::addMenu(const QString &text,KviKvsPopupMenu * p,int index) +void KviMenuBar::addMenu(const TQString &text,KviKvsPopupMenu * p,int index) { if(!m_pScriptItemList) { @@ -408,7 +408,7 @@ void KviMenuBar::addMenu(const QString &text,KviKvsPopupMenu * p,int index) it->szPopupName = p->name(); it->pPopup = p; it->id = insertItem(text,p,-1,index); - connect(p,SIGNAL(destroyed()),this,SLOT(menuDestroyed())); + connect(p,TQT_SIGNAL(destroyed()),this,TQT_SLOT(menuDestroyed())); m_pScriptItemList->append(it); } diff --git a/src/kvirc/ui/kvi_menubar.h b/src/kvirc/ui/kvi_menubar.h index 3095913..ba723ea 100644 --- a/src/kvirc/ui/kvi_menubar.h +++ b/src/kvirc/ui/kvi_menubar.h @@ -48,6 +48,7 @@ typedef struct _KviScriptMenuBarItem class KVIRC_API KviMenuBar : public KviTalMenuBar { Q_OBJECT + TQ_OBJECT public: KviMenuBar(KviFrame * par,const char * name); ~KviMenuBar(); @@ -59,14 +60,14 @@ protected: int m_iNumDefaultItems; int * m_pDefaultItemId; protected: - KviScriptMenuBarItem * findMenu(const QString &text); + KviScriptMenuBarItem * findMenu(const TQString &text); KviScriptMenuBarItem * findMenu(KviKvsPopupMenu * p); - void addDefaultItem(const QString &text,KviTalPopupMenu * pop); - virtual void showEvent(QShowEvent *e); + void addDefaultItem(const TQString &text,KviTalPopupMenu * pop); + virtual void showEvent(TQShowEvent *e); public: int getDefaultItemRealIndex(int iDefaultIndex); - void addMenu(const QString &text,KviKvsPopupMenu * p,int index); - bool removeMenu(const QString &text); + void addMenu(const TQString &text,KviKvsPopupMenu * p,int index); + bool removeMenu(const TQString &text); protected slots: void menuDestroyed(); void setupMainPopup(); diff --git a/src/kvirc/ui/kvi_modeeditor.cpp b/src/kvirc/ui/kvi_modeeditor.cpp index f72d0a2..11f781b 100644 --- a/src/kvirc/ui/kvi_modeeditor.cpp +++ b/src/kvirc/ui/kvi_modeeditor.cpp @@ -33,8 +33,8 @@ #include "kvi_toolwindows_container.h" #include "kvi_tal_scrollview.h" -#include <qlayout.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqlabel.h> ////////////////////////////////////////////////////////////////////// @@ -46,7 +46,7 @@ // FIXME: This widget should use a KviTalScrollView! -KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const char * nam,KviConsole * c,const char * mode,const char * key,const char * limit) +KviModeEditor::KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,const char * nam,KviConsole * c,const char * mode,const char * key,const char * limit) : KviWindowToolWidget(par,button) { m_szMode = mode; @@ -54,7 +54,7 @@ KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const m_szLimit = limit; bool isEnabled=1; - QObject * w = parent(); + TQObject * w = tqparent(); while(w) { if(w->inherits("KviChannel")) @@ -63,80 +63,80 @@ KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const if(!( chan->isMeHalfOp() || chan->isMeOp() || chan->isMeChanOwner() || chan->isMeChanAdmin() || chan->connection()->userInfo()->hasUserMode('o') || chan->connection()->userInfo()->hasUserMode('O') ) ) isEnabled=0; break; } - w = w->parent(); + w = w->tqparent(); } - QGridLayout *pMasterLayout = new QGridLayout(this,2,1,2,2); + TQGridLayout *pMasterLayout = new TQGridLayout(this,2,1,2,2); #ifdef COMPILE_USE_QT4 - setFocusPolicy(Qt::ClickFocus); + setFocusPolicy(TTQ_ClickFocus); #else - setFocusPolicy(QWidget::ClickFocus); + setFocusPolicy(TQ_ClickFocus); #endif KviTalScrollView *pScrollView = new KviTalScrollView(this); #ifdef COMPILE_USE_QT4 - pScrollView->viewport()->setBackgroundRole(QPalette::Background); + pScrollView->viewport()->setBackgroundRole(TQPalette::Background); #else - pScrollView->viewport()->setBackgroundMode(QWidget::PaletteBackground); + pScrollView->viewport()->setBackgroundMode(TQWidget::PaletteBackground); #endif pMasterLayout->addWidget(pScrollView,0,0); pMasterLayout->setRowStretch(1,1); - QPushButton * b; - if(isEnabled) b = new QPushButton(__tr2qs("&Apply"),this); - else b = new QPushButton(__tr2qs("Close"),this); + TQPushButton * b; + if(isEnabled) b = new TQPushButton(__tr2qs("&Apply"),this); + else b = new TQPushButton(__tr2qs("Close"),this); pMasterLayout->addWidget(b,1,0); - connect(b,SIGNAL(clicked()),this,SLOT(commit())); + connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(commit())); - QWidget * pBackground = new QWidget(pScrollView->viewport()); + TQWidget * pBackground = new TQWidget(pScrollView->viewport()); - QGridLayout *g = new QGridLayout(pBackground,20,3,2,2); + TQGridLayout *g = new TQGridLayout(pBackground,20,3,2,2); - QLabel * l = new QLabel("",pBackground); + TQLabel * l = new TQLabel("",pBackground); l->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MODE))); g->addWidget(l,0,0); - l = new QLabel(__tr2qs("Channel Modes"),pBackground); + l = new TQLabel(__tr2qs("Channel Modes"),pBackground); g->addMultiCellWidget(l,0,0,1,2); - QFrame * f = new QFrame(pBackground); - f->setFrameStyle(QFrame::HLine | QFrame::Sunken); + TQFrame * f = new TQFrame(pBackground); + f->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); g->addMultiCellWidget(f,1,1,0,2); int i = 1; - QString tmp; + TQString tmp; m_pCheckBoxes = new KviPointerList<KviStyledCheckBox>; m_pCheckBoxes->setAutoDelete(false); // first che basic checkable modes pstnmi - QString szModes = "pstnmi"; + TQString szModes = "pstnmi"; while(!szModes.isEmpty()) { - QChar ccc = szModes[0]; + TQChar ccc = szModes[0]; szModes.remove(0,1); - KviQString::sprintf(tmp,"%c: %Q",ccc.unicode(),&(c->connection()->serverInfo()->getChannelModeDescription(ccc))); + KviTQString::sprintf(tmp,"%c: %Q",ccc.tqunicode(),&(c->connection()->serverInfo()->getChannelModeDescription(ccc))); KviStyledCheckBox * cb = new KviStyledCheckBox(tmp,pBackground); cb->setEnabled(isEnabled); m_pCheckBoxes->append(cb); - cb->setChecked(m_szMode.contains((char)ccc.unicode())); + cb->setChecked(m_szMode.tqcontains((char)ccc.tqunicode())); i++; g->addMultiCellWidget(cb,i,i,0,2); } - KviQString::sprintf(tmp,"l: %Q",&(c->connection()->serverInfo()->getChannelModeDescription('l'))); + KviTQString::sprintf(tmp,"l: %Q",&(c->connection()->serverInfo()->getChannelModeDescription('l'))); m_pLimitBox = new KviStyledCheckBox(tmp,pBackground); m_pLimitBox->setEnabled(isEnabled); i++; g->addMultiCellWidget(m_pLimitBox,i,i,0,2); - connect(m_pLimitBox,SIGNAL(toggled(bool)),this,SLOT(limitBoxToggled(bool))); - m_pLimitEdit = new QLineEdit(pBackground); + connect(m_pLimitBox,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(limitBoxToggled(bool))); + m_pLimitEdit = new TQLineEdit(pBackground); m_pLimitEdit->setEnabled(isEnabled); i++; g->addMultiCellWidget(m_pLimitEdit,i,i,1,2); @@ -149,13 +149,13 @@ KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const m_pLimitEdit->setEnabled(false); } - KviQString::sprintf(tmp,"k: %Q",&(c->connection()->serverInfo()->getChannelModeDescription('k'))); + KviTQString::sprintf(tmp,"k: %Q",&(c->connection()->serverInfo()->getChannelModeDescription('k'))); m_pKeyBox = new KviStyledCheckBox(tmp,pBackground); m_pKeyBox->setEnabled(isEnabled); i++; g->addMultiCellWidget(m_pKeyBox,i,i,0,2); - connect(m_pKeyBox,SIGNAL(toggled(bool)),this,SLOT(keyBoxToggled(bool))); - m_pKeyEdit = new QLineEdit(pBackground); + connect(m_pKeyBox,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(keyBoxToggled(bool))); + m_pKeyEdit = new TQLineEdit(pBackground); m_pKeyEdit->setEnabled(isEnabled); i++; g->addMultiCellWidget(m_pKeyEdit,i,i,1,2); @@ -174,30 +174,30 @@ KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const szModes = c->connection()->serverInfo()->supportedChannelModes(); } - int idx = szModes.findRev(','); + int idx = szModes.tqfindRev(','); if(idx != -1)szModes.remove(0,idx+1); - szModes.replace("p",""); - szModes.replace("s",""); - szModes.replace("t",""); - szModes.replace("n",""); - szModes.replace("m",""); - szModes.replace("i",""); - szModes.replace(",",""); - szModes.replace("b",""); - szModes.replace("k",""); - szModes.replace("l",""); + szModes.tqreplace("p",""); + szModes.tqreplace("s",""); + szModes.tqreplace("t",""); + szModes.tqreplace("n",""); + szModes.tqreplace("m",""); + szModes.tqreplace("i",""); + szModes.tqreplace(",",""); + szModes.tqreplace("b",""); + szModes.tqreplace("k",""); + szModes.tqreplace("l",""); while(!szModes.isEmpty()) { - QChar ccc = szModes[0]; + TQChar ccc = szModes[0]; szModes.remove(0,1); - KviQString::sprintf(tmp,"%c: %Q",(char)ccc.unicode(),&(c->connection()->serverInfo()->getChannelModeDescription(ccc))); + KviTQString::sprintf(tmp,"%c: %Q",(char)ccc.tqunicode(),&(c->connection()->serverInfo()->getChannelModeDescription(ccc))); KviStyledCheckBox * cb = new KviStyledCheckBox(tmp,pBackground); cb->setEnabled(isEnabled); m_pCheckBoxes->append(cb); - cb->setChecked(m_szMode.contains((char)ccc.unicode())); + cb->setChecked(m_szMode.tqcontains((char)ccc.tqunicode())); i++; g->addMultiCellWidget(cb,i,i,0,2); } @@ -310,16 +310,16 @@ void KviModeEditor::commit() for(KviStyledCheckBox * cb = m_pCheckBoxes->first();cb;cb = m_pCheckBoxes->next()) { - QString sz = cb->text(); - sz.replace("&",""); + TQString sz = cb->text(); + sz.tqreplace("&",""); if(sz.length() > 0) { - QChar ccc = sz[0]; + TQChar ccc = sz[0]; if(cb->isChecked()) { - if(!m_szMode.contains((char)ccc.unicode()))szPlusModes.append((char)ccc.unicode()); + if(!m_szMode.tqcontains((char)ccc.tqunicode()))szPlusModes.append((char)ccc.tqunicode()); } else { - if(m_szMode.contains((char)ccc.unicode()))szMinusModes.append((char)ccc.unicode()); + if(m_szMode.tqcontains((char)ccc.tqunicode()))szMinusModes.append((char)ccc.tqunicode()); } } } diff --git a/src/kvirc/ui/kvi_modeeditor.h b/src/kvirc/ui/kvi_modeeditor.h index 06512d9..7205707 100644 --- a/src/kvirc/ui/kvi_modeeditor.h +++ b/src/kvirc/ui/kvi_modeeditor.h @@ -25,11 +25,11 @@ #include "kvi_settings.h" -#include <qwidget.h> -#include <qpushbutton.h> -#include <qcheckbox.h> -#include <qlineedit.h> -#include <qlabel.h> +#include <tqwidget.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> +#include <tqlineedit.h> +#include <tqlabel.h> #include "kvi_string.h" #include "kvi_pointerlist.h" @@ -46,8 +46,9 @@ class KviConsole; class KVIRC_API KviModeEditor : public KviWindowToolWidget { Q_OBJECT + TQ_OBJECT public: - KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const char * nam,KviConsole * c,const char * mode,const char * key,const char * limit); + KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,const char * nam,KviConsole * c,const char * mode,const char * key,const char * limit); ~KviModeEditor(); protected: // fields KviStr m_szMode; @@ -55,9 +56,9 @@ protected: // fields KviStr m_szLimit; KviPointerList<KviStyledCheckBox> * m_pCheckBoxes; KviStyledCheckBox * m_pLimitBox; - QLineEdit * m_pLimitEdit; + TQLineEdit * m_pLimitEdit; KviStyledCheckBox * m_pKeyBox; - QLineEdit * m_pKeyEdit; + TQLineEdit * m_pKeyEdit; signals: void setMode(const char *); void done(); diff --git a/src/kvirc/ui/kvi_modew.cpp b/src/kvirc/ui/kvi_modew.cpp index a0cf85e..8725933 100755 --- a/src/kvirc/ui/kvi_modew.cpp +++ b/src/kvirc/ui/kvi_modew.cpp @@ -29,13 +29,13 @@ #include "kvi_ircconnectionuserinfo.h" #include "kvi_qcstring.h" -#include <qframe.h> -#include <qlineedit.h> +#include <tqframe.h> +#include <tqlineedit.h> #include "kvi_tal_hbox.h" -#include <qevent.h> +#include <tqevent.h> -KviModeWidget::KviModeWidget(QWidget * par,KviChannel* chan,const char * name) -:QFrame(par,name) +KviModeWidget::KviModeWidget(TQWidget * par,KviChannel* chan,const char * name) +:TQFrame(par,name) { m_pChannel=chan; m_pLabel=0; @@ -43,7 +43,7 @@ KviModeWidget::KviModeWidget(QWidget * par,KviChannel* chan,const char * name) #ifdef COMPILE_USE_QT4 setAutoFillBackground(false); #else - setBackgroundMode(QWidget::NoBackground); + setBackgroundMode(TQWidget::NoBackground); #endif reset(); } @@ -63,8 +63,8 @@ void KviModeWidget::reset() m_pLabel=new KviThemedLabel(this,0); refreshModes(); m_pLabel->show(); - connect(m_pLabel,SIGNAL(doubleClicked()),this,SLOT(labelDoubleClick())); - QResizeEvent* ev=new QResizeEvent(size(),size()); + connect(m_pLabel,TQT_SIGNAL(doubleClicked()),this,TQT_SLOT(labelDoubleClick())); + TQResizeEvent* ev=new TQResizeEvent(size(),size()); resizeEvent(ev); delete ev; if(m_pChannel->input()) @@ -73,11 +73,11 @@ void KviModeWidget::reset() void KviModeWidget::refreshModes() { - QString szMode=m_pChannel->channelMode(); + TQString szMode=m_pChannel->channelMode(); if(!m_pChannel->channelKey().isEmpty()) - szMode+=QString(" k:%1").arg(m_pChannel->channelKey()); + szMode+=TQString(" k:%1").tqarg(m_pChannel->channelKey()); if(!m_pChannel->channelLimit().isEmpty()) - szMode+=QString(" l:%1").arg(m_pChannel->channelLimit().ptr()); + szMode+=TQString(" l:%1").tqarg(m_pChannel->channelLimit().ptr()); if(m_pLabel) m_pLabel->setText(szMode); } @@ -88,9 +88,9 @@ void KviModeWidget::applyOptions() m_pLabel->applyOptions(); } -void KviModeWidget::resizeEvent(QResizeEvent *e) +void KviModeWidget::resizeEvent(TQResizeEvent *e) { - if(e)QFrame::resizeEvent(e); + if(e)TQFrame::resizeEvent(e); if(m_pLabel) { m_pLabel->setGeometry(0,0,width(),height()); @@ -107,66 +107,66 @@ void KviModeWidget::labelDoubleClick() { delete m_pLabel; m_pLabel=0; - m_pLineEdit = new QLineEdit(this,0); + m_pLineEdit = new TQLineEdit(this,0); m_pLineEdit->setText(m_pChannel->channelMode()); m_pLineEdit->show(); m_pLineEdit->setFocus(); - resizeEvent(new QResizeEvent(size(),size())); + resizeEvent(new TQResizeEvent(size(),size())); m_pLineEdit->installEventFilter( this ); - connect(m_pLineEdit,SIGNAL(textChanged ( const QString & ) ),this,SLOT(editorTextChanged( const QString & ))); + connect(m_pLineEdit,TQT_SIGNAL(textChanged ( const TQString & ) ),this,TQT_SLOT(editorTextChanged( const TQString & ))); } } -bool KviModeWidget::eventFilter( QObject *obj, QEvent *ev ) +bool KviModeWidget::eventFilter( TQObject *obj, TQEvent *ev ) { - if( (obj==m_pLineEdit) && ( ev->type() == QEvent::KeyPress ) ) + if( (TQT_BASE_OBJECT(obj)==TQT_BASE_OBJECT(m_pLineEdit)) && ( ev->type() == TQEvent::KeyPress ) ) { - QKeyEvent *keyEvent = (QKeyEvent*)ev; + TQKeyEvent *keyEvent = (TQKeyEvent*)ev; switch(keyEvent->key()) { - case Qt::Key_Return: - case Qt::Key_Enter: + case TQt::Key_Return: + case TQt::Key_Enter: editorReturnPressed(); return TRUE; - case Qt::Key_Escape: + case TQt::Key_Escape: reset(); return TRUE; } } - return QFrame::eventFilter( obj, ev ); + return TQFrame::eventFilter( obj, ev ); } void KviModeWidget::editorReturnPressed() { - QString szCurModes=m_pChannel->channelMode(); - QString szNewModes=m_pLineEdit->text(); - QString szMinusModes; + TQString szCurModes=m_pChannel->channelMode(); + TQString szNewModes=m_pLineEdit->text(); + TQString szMinusModes; for(int i=0; i<szCurModes.length(); i++) { - if(szNewModes.contains(szCurModes[i])) + if(szNewModes.tqcontains(szCurModes[i])) szNewModes.remove(szCurModes[i]); else szMinusModes+=szCurModes[i]; } - QString mode; - if(!szMinusModes.isEmpty()) mode+=QString("-"+szMinusModes); - if(!szNewModes.isEmpty()) mode+=QString("+"+szNewModes); + TQString mode; + if(!szMinusModes.isEmpty()) mode+=TQString("-"+szMinusModes); + if(!szNewModes.isEmpty()) mode+=TQString("+"+szNewModes); if(!mode.isEmpty()) { - KviQCString chan = m_pChannel->connection()->encodeText(m_pChannel->name()); + KviTQCString chan = m_pChannel->connection()->encodeText(m_pChannel->name()); m_pChannel->connection()->sendFmtData("MODE %s %s",chan.data(),mode.utf8().data()); } reset(); } -void KviModeWidget::editorTextChanged( const QString & text) +void KviModeWidget::editorTextChanged( const TQString & text) { int i = 0; - QString szText=text; + TQString szText=text; for(i=0;i<szText.length();i++) { - if( !m_pChannel->connection()->serverInfo()->supportedPlainModes().contains(szText[i]) || - szText.find(szText[i])<i ) + if( !m_pChannel->connection()->serverInfo()->supportedPlainModes().tqcontains(szText[i]) || + szText.tqfind(szText[i])<i ) szText.remove(i,1); } m_pLineEdit->setText(szText); diff --git a/src/kvirc/ui/kvi_modew.h b/src/kvirc/ui/kvi_modew.h index 7efbc96..5799535 100755 --- a/src/kvirc/ui/kvi_modew.h +++ b/src/kvirc/ui/kvi_modew.h @@ -27,16 +27,17 @@ #include "kvi_themedlabel.h" #include "kvi_channel.h" -#include <qframe.h> -#include <qlineedit.h> +#include <tqframe.h> +#include <tqlineedit.h> #include "kvi_tal_hbox.h" -class KVIRC_API KviModeWidget : public QFrame +class KVIRC_API KviModeWidget : public TQFrame { Q_OBJECT + TQ_OBJECT public: - KviModeWidget(QWidget * par,KviChannel* chan,const char * name=0); + KviModeWidget(TQWidget * par,KviChannel* chan,const char * name=0); ~KviModeWidget(); void reset(); void refreshModes(); @@ -44,14 +45,14 @@ public: private: KviChannel * m_pChannel; KviThemedLabel * m_pLabel; - QLineEdit * m_pLineEdit; + TQLineEdit * m_pLineEdit; protected: - void resizeEvent(QResizeEvent *e); - bool eventFilter( QObject *obj, QEvent *ev ); + void resizeEvent(TQResizeEvent *e); + bool eventFilter( TQObject *obj, TQEvent *ev ); public slots: void labelDoubleClick(); void editorReturnPressed(); - void editorTextChanged( const QString & ); + void editorTextChanged( const TQString & ); }; #endif //_KVI_MODEW_H_ diff --git a/src/kvirc/ui/kvi_msgbox.cpp b/src/kvirc/ui/kvi_msgbox.cpp index 81cea10..5d02fab 100644 --- a/src/kvirc/ui/kvi_msgbox.cpp +++ b/src/kvirc/ui/kvi_msgbox.cpp @@ -27,7 +27,7 @@ #ifdef COMPILE_KDE_SUPPORT #include <kmessagebox.h> #else - #include <qmessagebox.h> + #include <tqmessagebox.h> #endif //!COMPILE_WITH_KDE #include "kvi_malloc.h" @@ -38,48 +38,48 @@ namespace KviMessageBox { - void warning(const QString &fmt,...) + void warning(const TQString &fmt,...) { kvi_va_list list; kvi_va_start_by_reference(list,fmt); - QString s; - KviQString::vsprintf(s,fmt,list); + TQString s; + KviTQString::vsprintf(s,fmt,list); kvi_va_end(list); #ifdef COMPILE_KDE_SUPPORT KMessageBox::error(0,s,"KVIrc"); #else - QMessageBox::warning(0,"KVIrc",s); + TQMessageBox::warning(0,"KVIrc",s); #endif } - void information(const QString &fmt,...) + void information(const TQString &fmt,...) { kvi_va_list list; kvi_va_start_by_reference(list,fmt); - QString s; - KviQString::vsprintf(s,fmt,list); + TQString s; + KviTQString::vsprintf(s,fmt,list); kvi_va_end(list); #ifdef COMPILE_KDE_SUPPORT KMessageBox::information(0,s,"KVIrc"); #else - QMessageBox::information(0,"KVIrc",s); + TQMessageBox::information(0,"KVIrc",s); #endif } - bool yesNo(const QString &caption,const QString &fmt,...) + bool yesNo(const TQString &caption,const TQString &fmt,...) { kvi_va_list list; kvi_va_start_by_reference(list,fmt); - QString s; - KviQString::vsprintf(s,fmt,list); + TQString s; + KviTQString::vsprintf(s,fmt,list); kvi_va_end(list); bool bRet; #ifdef COMPILE_KDE_SUPPORT bRet = (KMessageBox::questionYesNo(0,s,caption) == KMessageBox::Yes); #else - bRet = (QMessageBox::information(0,caption,s, - QMessageBox::Yes | QMessageBox::Default, - QMessageBox::No | QMessageBox::Escape) == QMessageBox::Yes); + bRet = (TQMessageBox::information(0,caption,s, + TQMessageBox::Yes | TQMessageBox::Default, + TQMessageBox::No | TQMessageBox::Escape) == TQMessageBox::Yes); #endif return bRet; } diff --git a/src/kvirc/ui/kvi_msgbox.h b/src/kvirc/ui/kvi_msgbox.h index 71b22a2..ddc338a 100644 --- a/src/kvirc/ui/kvi_msgbox.h +++ b/src/kvirc/ui/kvi_msgbox.h @@ -45,9 +45,9 @@ class KviMessageBox : public KviTalMessageBox namespace KviMessageBox { - KVIRC_API void warning(const QString &fmt,...); - KVIRC_API void information(const QString &fmt,...); - KVIRC_API bool yesNo(const QString &caption,const QString &fmt,...); + KVIRC_API void warning(const TQString &fmt,...); + KVIRC_API void information(const TQString &fmt,...); + KVIRC_API bool yesNo(const TQString &caption,const TQString &fmt,...); }; #endif //!_KVI_MSGBOX_H_ diff --git a/src/kvirc/ui/kvi_optionswidget.cpp b/src/kvirc/ui/kvi_optionswidget.cpp index 546d4b1..28d986f 100644 --- a/src/kvirc/ui/kvi_optionswidget.cpp +++ b/src/kvirc/ui/kvi_optionswidget.cpp @@ -38,11 +38,11 @@ #define KVI_OPTIONSWIDGET_GRIDLAYOUT_BORDER 4 #define KVI_OPTIONSWIDGET_GRIDLAYOUT_SPACE 6 -QString KviOptionsWidget::m_szBasicTipStart; // empty decl -QString KviOptionsWidget::m_szBasicTipEnd; +TQString KviOptionsWidget::m_szBasicTipStart; // empty decl +TQString KviOptionsWidget::m_szBasicTipEnd; -KviOptionsWidget::KviOptionsWidget(QWidget * parent,const char * name,bool bSunken) -: QFrame(parent,name), KviSelectorInterface() +KviOptionsWidget::KviOptionsWidget(TQWidget * tqparent,const char * name,bool bSunken) +: TQFrame(tqparent,name), KviSelectorInterface() { if(m_szBasicTipStart.isEmpty()) { @@ -53,8 +53,8 @@ KviOptionsWidget::KviOptionsWidget(QWidget * parent,const char * name,bool bSunk } // FIXME: The bSunken value is ignored! - //if(bSunken)setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); - //setFrameStyle(QFrame::StyledPanel | QFrame::Plain); + //if(bSunken)setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); + //setFrameStyle(TQFrame::StyledPanel | TQFrame::Plain); m_pLayout = 0; m_pTabWidget = 0; m_iResetFlags = 0; @@ -68,19 +68,19 @@ KviOptionsWidget::~KviOptionsWidget() delete m_pSelectorInterfaceList; } -void KviOptionsWidget::mergeTip(QWidget * w,const QString &tip) +void KviOptionsWidget::mergeTip(TQWidget * w,const TQString &tip) { - static QString begin = "<table width=\"100%\" align=\"center\"><tr><td bgcolor=\"#fefef0\">"; - static QString mid = "</td></tr><tr><td>"; - static QString end = "</td></tr></table>"; + static TQString begin = "<table width=\"100%\" align=\"center\"><tr><td bgcolor=\"#fefef0\">"; + static TQString mid = "</td></tr><tr><td>"; + static TQString end = "</td></tr></table>"; #ifdef COMPILE_USE_QT4 - QString s = w->toolTip(); + TQString s = w->toolTip(); #else - QString s = KviTalToolTip::textFor(w); + TQString s = KviTalToolTip::textFor(w); #endif if(s.isEmpty())KviTalToolTip::add(w,tip); else { - QString tmp = begin; + TQString tmp = begin; tmp += tip; tmp += mid; tmp += s; @@ -92,36 +92,36 @@ void KviOptionsWidget::mergeTip(QWidget * w,const QString &tip) void KviOptionsWidget::createLayout(int rows,int cols) { if(m_pLayout)delete m_pLayout; - m_pLayout = new QGridLayout(this,rows,cols,KVI_OPTIONSWIDGET_GRIDLAYOUT_BORDER,KVI_OPTIONSWIDGET_GRIDLAYOUT_SPACE); + m_pLayout = new TQGridLayout(this,rows,cols,KVI_OPTIONSWIDGET_GRIDLAYOUT_BORDER,KVI_OPTIONSWIDGET_GRIDLAYOUT_SPACE); } void KviOptionsWidget::createTabbedPage() { createLayout(1,1); - layout()->setMargin(0); - layout()->setSpacing(0); - m_pTabWidget = new QTabWidget(this); + tqlayout()->setMargin(0); + tqlayout()->setSpacing(0); + m_pTabWidget = new TQTabWidget(this); addWidgetToLayout(m_pTabWidget,0,0,0,0); } -void KviOptionsWidget::addOptionsWidget(const QString &szText,const QIconSet &iconSet,KviOptionsWidget * pWidget) +void KviOptionsWidget::addOptionsWidget(const TQString &szText,const TQIconSet &iconSet,KviOptionsWidget * pWidget) { - if(pWidget->layout()) - pWidget->layout()->setMargin(10); + if(pWidget->tqlayout()) + pWidget->tqlayout()->setMargin(10); m_pTabWidget->addTab(pWidget,iconSet,szText); m_pSelectorInterfaceList->append(pWidget); } -void KviOptionsWidget::addWidgetToLayout(QWidget * w,int x1,int y1,int x2,int y2) +void KviOptionsWidget::addWidgetToLayout(TQWidget * w,int x1,int y1,int x2,int y2) { - if((x1 == x2) && (y1 == y2))layout()->addWidget(w,y1,x1); - else layout()->addMultiCellWidget(w,y1,y2,x1,x2); + if((x1 == x2) && (y1 == y2))tqlayout()->addWidget(w,y1,x1); + else tqlayout()->addMultiCellWidget(w,y1,y2,x1,x2); } /////////////////////////////////////////////////////////////////////////////////////////////////// -KviDirectorySelector * KviOptionsWidget::addDirectorySelector(int x1,int y1,int x2,int y2,const QString & txt,QString *pOption,bool bEnabled) +KviDirectorySelector * KviOptionsWidget::addDirectorySelector(int x1,int y1,int x2,int y2,const TQString & txt,TQString *pOption,bool bEnabled) { KviDirectorySelector * d = new KviDirectorySelector(this,txt,pOption,bEnabled); addWidgetToLayout(d,x1,y1,x2,y2); @@ -129,7 +129,7 @@ KviDirectorySelector * KviOptionsWidget::addDirectorySelector(int x1,int y1,int return d; } -KviDirectorySelector * KviOptionsWidget::addDirectorySelector(QWidget * pParent,const QString & txt,QString *pOption,bool bEnabled) +KviDirectorySelector * KviOptionsWidget::addDirectorySelector(TQWidget * pParent,const TQString & txt,TQString *pOption,bool bEnabled) { KviDirectorySelector * d = new KviDirectorySelector(pParent,txt,pOption,bEnabled); //addWidgetToLayout(d,x1,y1,x2,y2); @@ -137,12 +137,12 @@ KviDirectorySelector * KviOptionsWidget::addDirectorySelector(QWidget * pParent, return d; } -KviDirectorySelector * KviOptionsWidget::addDirectorySelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled) +KviDirectorySelector * KviOptionsWidget::addDirectorySelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_stringOptionsTable[optId].flags & KviOption_resetMask); KviDirectorySelector * d = addDirectorySelector(x1,y1,x2,y2,txt,&(KVI_OPTION_STRING(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_stringOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -150,12 +150,12 @@ KviDirectorySelector * KviOptionsWidget::addDirectorySelector(int x1,int y1,int return d; } -KviDirectorySelector * KviOptionsWidget::addDirectorySelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled) +KviDirectorySelector * KviOptionsWidget::addDirectorySelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_stringOptionsTable[optId].flags & KviOption_resetMask); KviDirectorySelector * d = addDirectorySelector(pParent,txt,&(KVI_OPTION_STRING(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_stringOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -167,7 +167,7 @@ KviDirectorySelector * KviOptionsWidget::addDirectorySelector(QWidget * pParent, /////////////////////////////////////////////////////////////////////////////////////////////////// -KviFileSelector * KviOptionsWidget::addFileSelector(int x1,int y1,int x2,int y2,const QString & txt,QString *pOption,bool bEnabled) +KviFileSelector * KviOptionsWidget::addFileSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQString *pOption,bool bEnabled) { KviFileSelector * d = new KviFileSelector(this,txt,pOption,bEnabled); addWidgetToLayout(d,x1,y1,x2,y2); @@ -175,19 +175,19 @@ KviFileSelector * KviOptionsWidget::addFileSelector(int x1,int y1,int x2,int y2, return d; } -KviFileSelector * KviOptionsWidget::addFileSelector(QWidget * pParent,const QString & txt,QString *pOption,bool bEnabled) +KviFileSelector * KviOptionsWidget::addFileSelector(TQWidget * pParent,const TQString & txt,TQString *pOption,bool bEnabled) { KviFileSelector * d = new KviFileSelector(pParent,txt,pOption,bEnabled); m_pSelectorInterfaceList->append(d); return d; } -KviFileSelector * KviOptionsWidget::addFileSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled) +KviFileSelector * KviOptionsWidget::addFileSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_stringOptionsTable[optId].flags & KviOption_resetMask); KviFileSelector * d = addFileSelector(x1,y1,x2,y2,txt,&(KVI_OPTION_STRING(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_stringOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -195,12 +195,12 @@ KviFileSelector * KviOptionsWidget::addFileSelector(int x1,int y1,int x2,int y2, return d; } -KviFileSelector * KviOptionsWidget::addFileSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled) +KviFileSelector * KviOptionsWidget::addFileSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_stringOptionsTable[optId].flags & KviOption_resetMask); KviFileSelector * d = addFileSelector(pParent,txt,&(KVI_OPTION_STRING(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_stringOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -211,7 +211,7 @@ KviFileSelector * KviOptionsWidget::addFileSelector(QWidget * pParent,const QStr /////////////////////////////////////////////////////////////////////////////////////////////////// -KviSoundSelector * KviOptionsWidget::addSoundSelector(int x1,int y1,int x2,int y2,const QString & txt,QString *pOption,bool bEnabled) +KviSoundSelector * KviOptionsWidget::addSoundSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQString *pOption,bool bEnabled) { KviSoundSelector * d = new KviSoundSelector(this,txt,pOption,bEnabled); addWidgetToLayout(d,x1,y1,x2,y2); @@ -219,19 +219,19 @@ KviSoundSelector * KviOptionsWidget::addSoundSelector(int x1,int y1,int x2,int y return d; } -KviSoundSelector * KviOptionsWidget::addSoundSelector(QWidget * pParent,const QString & txt,QString *pOption,bool bEnabled) +KviSoundSelector * KviOptionsWidget::addSoundSelector(TQWidget * pParent,const TQString & txt,TQString *pOption,bool bEnabled) { KviSoundSelector * d = new KviSoundSelector(pParent,txt,pOption,bEnabled); m_pSelectorInterfaceList->append(d); return d; } -KviSoundSelector * KviOptionsWidget::addSoundSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled) +KviSoundSelector * KviOptionsWidget::addSoundSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_stringOptionsTable[optId].flags & KviOption_resetMask); KviSoundSelector * d = addSoundSelector(x1,y1,x2,y2,txt,&(KVI_OPTION_STRING(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_stringOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -239,12 +239,12 @@ KviSoundSelector * KviOptionsWidget::addSoundSelector(int x1,int y1,int x2,int y return d; } -KviSoundSelector * KviOptionsWidget::addSoundSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled) +KviSoundSelector * KviOptionsWidget::addSoundSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_stringOptionsTable[optId].flags & KviOption_resetMask); KviSoundSelector * d = addSoundSelector(pParent,txt,&(KVI_OPTION_STRING(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_stringOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -255,7 +255,7 @@ KviSoundSelector * KviOptionsWidget::addSoundSelector(QWidget * pParent,const QS /////////////////////////////////////////////////////////////////////////////////////////////////// -KviBoolSelector * KviOptionsWidget::addBoolSelector(int x1,int y1,int x2,int y2,const QString & txt,bool *pOption,bool bEnabled) +KviBoolSelector * KviOptionsWidget::addBoolSelector(int x1,int y1,int x2,int y2,const TQString & txt,bool *pOption,bool bEnabled) { KviBoolSelector * b = new KviBoolSelector(this,txt,pOption,bEnabled); addWidgetToLayout(b,x1,y1,x2,y2); @@ -263,29 +263,29 @@ KviBoolSelector * KviOptionsWidget::addBoolSelector(int x1,int y1,int x2,int y2, return b; } -KviBoolSelector * KviOptionsWidget::addBoolSelector(QWidget * pParent,const QString & txt,bool *pOption,bool bEnabled) +KviBoolSelector * KviOptionsWidget::addBoolSelector(TQWidget * pParent,const TQString & txt,bool *pOption,bool bEnabled) { KviBoolSelector * b = new KviBoolSelector(pParent,txt,pOption,bEnabled); m_pSelectorInterfaceList->append(b); return b; } -KviBoolSelector * KviOptionsWidget::addBoolSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled) +KviBoolSelector * KviOptionsWidget::addBoolSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_boolOptionsTable[optId].flags & KviOption_resetMask); KviBoolSelector * d = addBoolSelector(x1,y1,x2,y2,txt,&(KVI_OPTION_BOOL(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_boolOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); return d; } -KviBoolSelector * KviOptionsWidget::addBoolSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled) +KviBoolSelector * KviOptionsWidget::addBoolSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_boolOptionsTable[optId].flags & KviOption_resetMask); KviBoolSelector * d = addBoolSelector(pParent,txt,&(KVI_OPTION_BOOL(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_boolOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -295,7 +295,7 @@ KviBoolSelector * KviOptionsWidget::addBoolSelector(QWidget * pParent,const QStr /////////////////////////////////////////////////////////////////////////////////////////////////// -KviPixmapSelector * KviOptionsWidget::addPixmapSelector(int x1,int y1,int x2,int y2,const QString & txt,KviPixmap *pOption,bool bEnabled) +KviPixmapSelector * KviOptionsWidget::addPixmapSelector(int x1,int y1,int x2,int y2,const TQString & txt,KviPixmap *pOption,bool bEnabled) { KviPixmapSelector * b = new KviPixmapSelector(this,txt,pOption,bEnabled); addWidgetToLayout(b,x1,y1,x2,y2); @@ -303,11 +303,11 @@ KviPixmapSelector * KviOptionsWidget::addPixmapSelector(int x1,int y1,int x2,int return b; } -KviPixmapSelector * KviOptionsWidget::addPixmapSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled) +KviPixmapSelector * KviOptionsWidget::addPixmapSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_pixmapOptionsTable[optId].flags & KviOption_resetMask); KviPixmapSelector * d = addPixmapSelector(x1,y1,x2,y2,txt,&(KVI_OPTION_PIXMAP(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_pixmapOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -317,7 +317,7 @@ KviPixmapSelector * KviOptionsWidget::addPixmapSelector(int x1,int y1,int x2,int /////////////////////////////////////////////////////////////////////////////////////////////////// -KviUIntSelector * KviOptionsWidget::addUIntSelector(int x1,int y1,int x2,int y2,const QString & txt, +KviUIntSelector * KviOptionsWidget::addUIntSelector(int x1,int y1,int x2,int y2,const TQString & txt, unsigned int * pOption,unsigned int uLowBound, unsigned int uHighBound,unsigned int uDefault,bool bEnabled) { @@ -327,7 +327,7 @@ KviUIntSelector * KviOptionsWidget::addUIntSelector(int x1,int y1,int x2,int y2, return u; } -KviUIntSelector * KviOptionsWidget::addUIntSelector(QWidget * pParent,const QString & txt, +KviUIntSelector * KviOptionsWidget::addUIntSelector(TQWidget * pParent,const TQString & txt, unsigned int * pOption,unsigned int uLowBound, unsigned int uHighBound,unsigned int uDefault,bool bEnabled) { @@ -336,26 +336,26 @@ KviUIntSelector * KviOptionsWidget::addUIntSelector(QWidget * pParent,const QStr return u; } -KviUIntSelector * KviOptionsWidget::addUIntSelector(int x1,int y1,int x2,int y2,const QString & txt, +KviUIntSelector * KviOptionsWidget::addUIntSelector(int x1,int y1,int x2,int y2,const TQString & txt, int optId,unsigned int uLowBound, unsigned int uHighBound,unsigned int uDefault,bool bEnabled) { m_iResetFlags |= (g_uintOptionsTable[optId].flags & KviOption_resetMask); KviUIntSelector * d = addUIntSelector(x1,y1,x2,y2,txt,&(KVI_OPTION_UINT(optId)),uLowBound,uHighBound,uDefault,bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_uintOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); return d; } -KviUIntSelector * KviOptionsWidget::addUIntSelector(QWidget * pParent,const QString & txt, +KviUIntSelector * KviOptionsWidget::addUIntSelector(TQWidget * pParent,const TQString & txt, int optId,unsigned int uLowBound, unsigned int uHighBound,unsigned int uDefault,bool bEnabled) { m_iResetFlags |= (g_uintOptionsTable[optId].flags & KviOption_resetMask); KviUIntSelector * d = addUIntSelector(pParent,txt,&(KVI_OPTION_UINT(optId)),uLowBound,uHighBound,uDefault,bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_uintOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -364,7 +364,7 @@ KviUIntSelector * KviOptionsWidget::addUIntSelector(QWidget * pParent,const QStr //////////////////////////////////////////////////////////////////////////////////////////////// -KviUIntSelector * KviOptionsWidget::addUShortIntSelector(int x1,int y1,int x2,int y2,const QString & txt, +KviUIntSelector * KviOptionsWidget::addUShortIntSelector(int x1,int y1,int x2,int y2,const TQString & txt, unsigned short int * pOption,unsigned int uLowBound, unsigned int uHighBound,unsigned int uDefault,bool bEnabled) { @@ -377,7 +377,7 @@ KviUIntSelector * KviOptionsWidget::addUShortIntSelector(int x1,int y1,int x2,in //////////////////////////////////////////////////////////////////////////////////////////////// -KviStringSelector * KviOptionsWidget::addStringSelector(int x1,int y1,int x2,int y2,const QString & txt,QString *pOption,bool bEnabled) +KviStringSelector * KviOptionsWidget::addStringSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQString *pOption,bool bEnabled) { KviStringSelector * d = new KviStringSelector(this,txt,pOption,bEnabled); addWidgetToLayout(d,x1,y1,x2,y2); @@ -385,29 +385,29 @@ KviStringSelector * KviOptionsWidget::addStringSelector(int x1,int y1,int x2,int return d; } -KviStringSelector * KviOptionsWidget::addStringSelector(QWidget * pParent,const QString & txt,QString *pOption,bool bEnabled) +KviStringSelector * KviOptionsWidget::addStringSelector(TQWidget * pParent,const TQString & txt,TQString *pOption,bool bEnabled) { KviStringSelector * d = new KviStringSelector(pParent,txt,pOption,bEnabled); m_pSelectorInterfaceList->append(d); return d; } -KviStringSelector * KviOptionsWidget::addStringSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled) +KviStringSelector * KviOptionsWidget::addStringSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_stringOptionsTable[optId].flags & KviOption_resetMask); KviStringSelector * d = addStringSelector(x1,y1,x2,y2,txt,&(KVI_OPTION_STRING(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_stringOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); return d; } -KviStringSelector * KviOptionsWidget::addStringSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled) +KviStringSelector * KviOptionsWidget::addStringSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_stringOptionsTable[optId].flags & KviOption_resetMask); KviStringSelector * d = addStringSelector(pParent,txt,&(KVI_OPTION_STRING(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_stringOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -417,7 +417,7 @@ KviStringSelector * KviOptionsWidget::addStringSelector(QWidget * pParent,const //////////////////////////////////////////////////////////////////////////////////////////////// -KviPasswordSelector * KviOptionsWidget::addPasswordSelector(int x1,int y1,int x2,int y2,const QString & txt,QString *pOption,bool bEnabled) +KviPasswordSelector * KviOptionsWidget::addPasswordSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQString *pOption,bool bEnabled) { KviPasswordSelector * d = new KviPasswordSelector(this,txt,pOption,bEnabled); addWidgetToLayout(d,x1,y1,x2,y2); @@ -425,29 +425,29 @@ KviPasswordSelector * KviOptionsWidget::addPasswordSelector(int x1,int y1,int x2 return d; } -KviPasswordSelector * KviOptionsWidget::addPasswordSelector(QWidget * pParent,const QString & txt,QString *pOption,bool bEnabled) +KviPasswordSelector * KviOptionsWidget::addPasswordSelector(TQWidget * pParent,const TQString & txt,TQString *pOption,bool bEnabled) { KviPasswordSelector * d = new KviPasswordSelector(pParent,txt,pOption,bEnabled); m_pSelectorInterfaceList->append(d); return d; } -KviPasswordSelector * KviOptionsWidget::addPasswordSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled) +KviPasswordSelector * KviOptionsWidget::addPasswordSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_stringOptionsTable[optId].flags & KviOption_resetMask); KviPasswordSelector * d = addPasswordSelector(x1,y1,x2,y2,txt,&(KVI_OPTION_STRING(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_stringOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); return d; } -KviPasswordSelector * KviOptionsWidget::addPasswordSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled) +KviPasswordSelector * KviOptionsWidget::addPasswordSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_stringOptionsTable[optId].flags & KviOption_resetMask); KviPasswordSelector * d = addPasswordSelector(pParent,txt,&(KVI_OPTION_STRING(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_stringOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -457,7 +457,7 @@ KviPasswordSelector * KviOptionsWidget::addPasswordSelector(QWidget * pParent,co //////////////////////////////////////////////////////////////////////////////////////////////// -KviStringListSelector * KviOptionsWidget::addStringListSelector(int x1,int y1,int x2,int y2,const QString & txt,QStringList * pOption,bool bEnabled) +KviStringListSelector * KviOptionsWidget::addStringListSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQStringList * pOption,bool bEnabled) { KviStringListSelector * d = new KviStringListSelector(this,txt,pOption,bEnabled); addWidgetToLayout(d,x1,y1,x2,y2); @@ -465,11 +465,11 @@ KviStringListSelector * KviOptionsWidget::addStringListSelector(int x1,int y1,in return d; } -KviStringListSelector * KviOptionsWidget::addStringListSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled) +KviStringListSelector * KviOptionsWidget::addStringListSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_stringlistOptionsTable[optId].flags & KviOption_resetMask); KviStringListSelector * d = addStringListSelector(x1,y1,x2,y2,txt,&(KVI_OPTION_STRINGLIST(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_stringlistOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -479,7 +479,7 @@ KviStringListSelector * KviOptionsWidget::addStringListSelector(int x1,int y1,in //////////////////////////////////////////////////////////////////////////////////////////////// -KviColorSelector * KviOptionsWidget::addColorSelector(int x1,int y1,int x2,int y2,const QString & txt,QColor * pOption,bool bEnabled) +KviColorSelector * KviOptionsWidget::addColorSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQColor * pOption,bool bEnabled) { KviColorSelector * s = new KviColorSelector(this,txt,pOption,bEnabled); addWidgetToLayout(s,x1,y1,x2,y2); @@ -487,29 +487,29 @@ KviColorSelector * KviOptionsWidget::addColorSelector(int x1,int y1,int x2,int y return s; } -KviColorSelector * KviOptionsWidget::addColorSelector(QWidget * pParent,const QString & txt,QColor * pOption,bool bEnabled) +KviColorSelector * KviOptionsWidget::addColorSelector(TQWidget * pParent,const TQString & txt,TQColor * pOption,bool bEnabled) { KviColorSelector * s = new KviColorSelector(pParent,txt,pOption,bEnabled); m_pSelectorInterfaceList->append(s); return s; } -KviColorSelector * KviOptionsWidget::addColorSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled) +KviColorSelector * KviOptionsWidget::addColorSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_colorOptionsTable[optId].flags & KviOption_resetMask); KviColorSelector * d = addColorSelector(x1,y1,x2,y2,txt,&(KVI_OPTION_COLOR(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_colorOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); return d; } -KviColorSelector * KviOptionsWidget::addColorSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled) +KviColorSelector * KviOptionsWidget::addColorSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_colorOptionsTable[optId].flags & KviOption_resetMask); KviColorSelector * d = addColorSelector(pParent,txt,&(KVI_OPTION_COLOR(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_colorOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -519,7 +519,7 @@ KviColorSelector * KviOptionsWidget::addColorSelector(QWidget * pParent,const QS ///////////////////////////////////////////////////////////////////////////////////////////////// -KviMircTextColorSelector * KviOptionsWidget::addMircTextColorSelector(int x1,int y1,int x2,int y2,const QString & txt,unsigned int *uFore,unsigned int *uBack,bool bEnabled) +KviMircTextColorSelector * KviOptionsWidget::addMircTextColorSelector(int x1,int y1,int x2,int y2,const TQString & txt,unsigned int *uFore,unsigned int *uBack,bool bEnabled) { KviMircTextColorSelector * s = new KviMircTextColorSelector(this,txt,uFore,uBack,bEnabled); addWidgetToLayout(s,x1,y1,x2,y2); @@ -527,31 +527,31 @@ KviMircTextColorSelector * KviOptionsWidget::addMircTextColorSelector(int x1,int return s; } -KviMircTextColorSelector * KviOptionsWidget::addMircTextColorSelector(QWidget * pParent,const QString & txt,unsigned int *uFore,unsigned int *uBack,bool bEnabled) +KviMircTextColorSelector * KviOptionsWidget::addMircTextColorSelector(TQWidget * pParent,const TQString & txt,unsigned int *uFore,unsigned int *uBack,bool bEnabled) { KviMircTextColorSelector * s = new KviMircTextColorSelector(pParent,txt,uFore,uBack,bEnabled); m_pSelectorInterfaceList->append(s); return s; } -KviMircTextColorSelector * KviOptionsWidget::addMircTextColorSelector(int x1,int y1,int x2,int y2,const QString & txt,int optForeId,int optBackId,bool bEnabled) +KviMircTextColorSelector * KviOptionsWidget::addMircTextColorSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optForeId,int optBackId,bool bEnabled) { m_iResetFlags |= (g_uintOptionsTable[optForeId].flags & KviOption_resetMask); m_iResetFlags |= (g_uintOptionsTable[optBackId].flags & KviOption_resetMask); KviMircTextColorSelector * d = addMircTextColorSelector(x1,y1,x2,y2,txt,&(KVI_OPTION_UINT(optForeId)),&(KVI_OPTION_UINT(optBackId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_uintOptionsTable[optForeId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); return d; } -KviMircTextColorSelector * KviOptionsWidget::addMircTextColorSelector(QWidget * pParent,const QString & txt,int optForeId,int optBackId,bool bEnabled) +KviMircTextColorSelector * KviOptionsWidget::addMircTextColorSelector(TQWidget * pParent,const TQString & txt,int optForeId,int optBackId,bool bEnabled) { m_iResetFlags |= (g_uintOptionsTable[optForeId].flags & KviOption_resetMask); m_iResetFlags |= (g_uintOptionsTable[optBackId].flags & KviOption_resetMask); KviMircTextColorSelector * d = addMircTextColorSelector(pParent,txt,&(KVI_OPTION_UINT(optForeId)),&(KVI_OPTION_UINT(optBackId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_uintOptionsTable[optForeId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -562,7 +562,7 @@ KviMircTextColorSelector * KviOptionsWidget::addMircTextColorSelector(QWidget * //////////////////////////////////////////////////////////////////////////////////////////////// -KviFontSelector * KviOptionsWidget::addFontSelector(int x1,int y1,int x2,int y2,const QString & txt,QFont * pOption,bool bEnabled) +KviFontSelector * KviOptionsWidget::addFontSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQFont * pOption,bool bEnabled) { KviFontSelector * f = new KviFontSelector(this,txt,pOption,bEnabled); addWidgetToLayout(f,x1,y1,x2,y2); @@ -570,29 +570,29 @@ KviFontSelector * KviOptionsWidget::addFontSelector(int x1,int y1,int x2,int y2, return f; } -KviFontSelector * KviOptionsWidget::addFontSelector(QWidget * pParent,const QString & txt,QFont * pOption,bool bEnabled) +KviFontSelector * KviOptionsWidget::addFontSelector(TQWidget * pParent,const TQString & txt,TQFont * pOption,bool bEnabled) { KviFontSelector * f = new KviFontSelector(pParent,txt,pOption,bEnabled); m_pSelectorInterfaceList->append(f); return f; } -KviFontSelector * KviOptionsWidget::addFontSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled) +KviFontSelector * KviOptionsWidget::addFontSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_fontOptionsTable[optId].flags & KviOption_resetMask); KviFontSelector * d = addFontSelector(x1,y1,x2,y2,txt,&(KVI_OPTION_FONT(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_fontOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); return d; } -KviFontSelector * KviOptionsWidget::addFontSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled) +KviFontSelector * KviOptionsWidget::addFontSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled) { m_iResetFlags |= (g_fontOptionsTable[optId].flags & KviOption_resetMask); KviFontSelector * d = addFontSelector(pParent,txt,&(KVI_OPTION_FONT(optId)),bEnabled); - QString tmp = m_szBasicTipStart; + TQString tmp = m_szBasicTipStart; tmp += g_fontOptionsTable[optId].name; tmp += m_szBasicTipEnd; KviTalToolTip::add(d,tmp); @@ -602,9 +602,9 @@ KviFontSelector * KviOptionsWidget::addFontSelector(QWidget * pParent,const QStr //#define DECLARE_COMMIT_FUNCTION(__fnc,__class,__classString) // void KviOptionsWidget::__fnc() // { -// QObjectList * l = queryList(__classString); +// TQObjectList * l = queryList(__classString); // if(!l)return; -// QObjectListIt it(*l); +// TQObjectListIt it(*l); // while(it.current()) // { // ((__class *)it.current())->commit(); @@ -620,14 +620,14 @@ KviFontSelector * KviOptionsWidget::addFontSelector(QWidget * pParent,const QStr void KviOptionsWidget::addRowSpacer(int x1,int y1,int x2,int y2) { - QWidget * w = new QWidget(this); + TQWidget * w = new TQWidget(this); addWidgetToLayout(w,x1,y1,x2,y2); - layout()->setRowStretch(y1,1); + tqlayout()->setRowStretch(y1,1); } -QLabel * KviOptionsWidget::addLabel(int x1,int y1,int x2,int y2,const QString & text,bool bEnabled) +TQLabel * KviOptionsWidget::addLabel(int x1,int y1,int x2,int y2,const TQString & text,bool bEnabled) { - QLabel * l = new QLabel(text,this); + TQLabel * l = new TQLabel(text,this); #ifdef COMPILE_USE_QT4 l->setWordWrap(true); #endif @@ -636,9 +636,9 @@ QLabel * KviOptionsWidget::addLabel(int x1,int y1,int x2,int y2,const QString & return l; } -QLabel * KviOptionsWidget::addLabel(QWidget * pParent,const QString & text,bool bEnabled) +TQLabel * KviOptionsWidget::addLabel(TQWidget * pParent,const TQString & text,bool bEnabled) { - QLabel * l = new QLabel(text,pParent); + TQLabel * l = new TQLabel(text,pParent); #ifdef COMPILE_USE_QT4 l->setWordWrap(true); #endif @@ -646,26 +646,26 @@ QLabel * KviOptionsWidget::addLabel(QWidget * pParent,const QString & text,bool return l; } -QLineEdit * KviOptionsWidget::addLineEdit(int x1,int y1,int x2,int y2,bool bEnabled) +TQLineEdit * KviOptionsWidget::addLineEdit(int x1,int y1,int x2,int y2,bool bEnabled) { - QLineEdit * l = new QLineEdit(this); + TQLineEdit * l = new TQLineEdit(this); l->setEnabled(bEnabled); addWidgetToLayout(l,x1,y1,x2,y2); return l; } -QFrame * KviOptionsWidget::addSeparator(int x1,int y1,int x2,int y2) +TQFrame * KviOptionsWidget::addSeparator(int x1,int y1,int x2,int y2) { - QFrame * f = new QFrame(this); - f->setFrameStyle(QFrame::HLine | QFrame::Sunken); + TQFrame * f = new TQFrame(this); + f->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); addWidgetToLayout(f,x1,y1,x2,y2); return f; } #ifdef COMPILE_USE_QT4 -KviTalGroupBox * KviOptionsWidget::addGroupBox(int x1,int y1,int x2,int y2,int nStrips,Qt::Orientation o,const QString &txt,bool bEnabled) +KviTalGroupBox * KviOptionsWidget::addGroupBox(int x1,int y1,int x2,int y2,int nStrips,Qt::Orientation o,const TQString &txt,bool bEnabled) #else -KviTalGroupBox * KviOptionsWidget::addGroupBox(int x1,int y1,int x2,int y2,int nStrips,KviTalGroupBox::Orientation o,const QString &txt,bool bEnabled) +KviTalGroupBox * KviOptionsWidget::addGroupBox(int x1,int y1,int x2,int y2,int nStrips,KviTalGroupBox::Orientation o,const TQString &txt,bool bEnabled) #endif { KviTalGroupBox * g = new KviTalGroupBox(nStrips,o,txt,this); @@ -676,12 +676,12 @@ KviTalGroupBox * KviOptionsWidget::addGroupBox(int x1,int y1,int x2,int y2,int n void KviOptionsWidget::addAdvancedButton(int x1,int y1,int x2,int y2) { - QWidget * w = topLevelWidget(); + TQWidget * w = tqtopLevelWidget(); if(!w)return; if(!w->inherits("KviGeneralOptionsDialog"))return; - QPushButton * b = new QPushButton(__tr2qs("Advanced..."),this); - connect(b,SIGNAL(clicked()),this,SLOT(switchToAdvancedPage())); + TQPushButton * b = new TQPushButton(__tr2qs("Advanced..."),this); + connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(switchToAdvancedPage())); addWidgetToLayout(b,x1,y1,x2,y2); } diff --git a/src/kvirc/ui/kvi_optionswidget.h b/src/kvirc/ui/kvi_optionswidget.h index 8466093..463cc82 100644 --- a/src/kvirc/ui/kvi_optionswidget.h +++ b/src/kvirc/ui/kvi_optionswidget.h @@ -27,122 +27,123 @@ #include "kvi_settings.h" -#include <qframe.h> -#include <qlayout.h> +#include <tqframe.h> +#include <tqlayout.h> #include "kvi_pointerlist.h" -#include <qlineedit.h> +#include <tqlineedit.h> #include <kvi_tal_groupbox.h> -#include <qtabwidget.h> +#include <tqtabwidget.h> #include "kvi_tal_groupbox.h" #include "kvi_selectors.h" -class KVIRC_API KviOptionsWidget : public QFrame, public KviSelectorInterface +class KVIRC_API KviOptionsWidget : public TQFrame, public KviSelectorInterface { Q_OBJECT + TQ_OBJECT public: - KviOptionsWidget(QWidget * parent,const char * name = 0,bool bSunken = true); + KviOptionsWidget(TQWidget * tqparent,const char * name = 0,bool bSunken = true); ~KviOptionsWidget(); private: - QGridLayout * m_pLayout; - QTabWidget * m_pTabWidget; + TQGridLayout * m_pLayout; + TQTabWidget * m_pTabWidget; int m_iResetFlags; int m_iSelectors; KviPointerList<KviSelectorInterface> * m_pSelectorInterfaceList; - static QString m_szBasicTipStart; - static QString m_szBasicTipEnd; + static TQString m_szBasicTipStart; + static TQString m_szBasicTipEnd; public: void mergeResetFlag(int flag){ m_iResetFlags |= flag; }; void createLayout(int rows,int columns); - QGridLayout * layout(){ return m_pLayout; }; + TQGridLayout * tqlayout(){ return m_pLayout; }; protected: void commitSelectors(); void commitOptionsReset(); public: - void mergeTip(QWidget * w,const QString &tip); + void mergeTip(TQWidget * w,const TQString &tip); // tabbed page paradigm void createTabbedPage(); - void addOptionsWidget(const QString &szText,const QIconSet &iconSet,KviOptionsWidget * pWidget); - QTabWidget * tabWidget(){ return m_pTabWidget; }; + void addOptionsWidget(const TQString &szText,const TQIconSet &iconSet,KviOptionsWidget * pWidget); + TQTabWidget * tabWidget(){ return m_pTabWidget; }; // non tabbed page paradigm - KviBoolSelector * addBoolSelector(int x1,int y1,int x2,int y2,const QString & txt,bool * pOption,bool bEnabled = true); - KviBoolSelector * addBoolSelector(QWidget * pParent,const QString & txt,bool * pOption,bool bEnabled = true); - KviBoolSelector * addBoolSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true); - KviBoolSelector * addBoolSelector(QWidget * pParnt,const QString & txt,int optId,bool bEnabled = true); - - KviColorSelector * addColorSelector(int x1,int y1,int x2,int y2,const QString & txt,QColor * pOption,bool bEnabled = true); - KviColorSelector * addColorSelector(QWidget * pParent,const QString & txt,QColor * pOption,bool bEnabled = true); - KviColorSelector * addColorSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true); - KviColorSelector * addColorSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled = true); - - KviMircTextColorSelector * addMircTextColorSelector(int x1,int y1,int x2,int y2,const QString & txt,unsigned int *uFore,unsigned int *uBack,bool bEnabled = true); - KviMircTextColorSelector * addMircTextColorSelector(QWidget * pParent,const QString & txt,unsigned int *uFore,unsigned int *uBack,bool bEnabled = true); - KviMircTextColorSelector * addMircTextColorSelector(int x1,int y1,int x2,int y2,const QString & txt,int optForeId,int optBackId,bool bEnabled = true); - KviMircTextColorSelector * addMircTextColorSelector(QWidget * pParent,const QString & txt,int optForeId,int optBackId,bool bEnabled = true); - - KviDirectorySelector * addDirectorySelector(int x1,int y1,int x2,int y2,const QString & txt,QString * pOption,bool bEnabled = true); - KviDirectorySelector * addDirectorySelector(QWidget * pParent,const QString & txt,QString * pOption,bool bEnabled = true); - KviDirectorySelector * addDirectorySelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true); - KviDirectorySelector * addDirectorySelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled = true); - - KviFileSelector * addFileSelector(int x1,int y1,int x2,int y2,const QString & txt,QString * pOption,bool bEnabled = true); - KviFileSelector * addFileSelector(QWidget * pParent,const QString & txt,QString * pOption,bool bEnabled = true); - KviFileSelector * addFileSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true); - KviFileSelector * addFileSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled = true); - - KviSoundSelector * addSoundSelector(int x1,int y1,int x2,int y2,const QString & txt,QString * pOption,bool bEnabled = true); - KviSoundSelector * addSoundSelector(QWidget * pParent,const QString & txt,QString * pOption,bool bEnabled = true); - KviSoundSelector * addSoundSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true); - KviSoundSelector * addSoundSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled = true); - - - KviFontSelector * addFontSelector(int x1,int y1,int x2,int y2,const QString & txt,QFont * pOption,bool bEnabled = true); - KviFontSelector * addFontSelector(QWidget * pParent,const QString & txt,QFont * pOption,bool bEnabled = true); - KviFontSelector * addFontSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true); - KviFontSelector * addFontSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled = true); - - KviPasswordSelector * addPasswordSelector(int x1,int y1,int x2,int y2,const QString & txt,QString * pOption,bool bEnabled = true); - KviPasswordSelector * addPasswordSelector(QWidget * pParent,const QString & txt,QString * pOption,bool bEnabled = true); - KviPasswordSelector * addPasswordSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true); - KviPasswordSelector * addPasswordSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled = true); + KviBoolSelector * addBoolSelector(int x1,int y1,int x2,int y2,const TQString & txt,bool * pOption,bool bEnabled = true); + KviBoolSelector * addBoolSelector(TQWidget * pParent,const TQString & txt,bool * pOption,bool bEnabled = true); + KviBoolSelector * addBoolSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true); + KviBoolSelector * addBoolSelector(TQWidget * pParnt,const TQString & txt,int optId,bool bEnabled = true); + + KviColorSelector * addColorSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQColor * pOption,bool bEnabled = true); + KviColorSelector * addColorSelector(TQWidget * pParent,const TQString & txt,TQColor * pOption,bool bEnabled = true); + KviColorSelector * addColorSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true); + KviColorSelector * addColorSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled = true); + + KviMircTextColorSelector * addMircTextColorSelector(int x1,int y1,int x2,int y2,const TQString & txt,unsigned int *uFore,unsigned int *uBack,bool bEnabled = true); + KviMircTextColorSelector * addMircTextColorSelector(TQWidget * pParent,const TQString & txt,unsigned int *uFore,unsigned int *uBack,bool bEnabled = true); + KviMircTextColorSelector * addMircTextColorSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optForeId,int optBackId,bool bEnabled = true); + KviMircTextColorSelector * addMircTextColorSelector(TQWidget * pParent,const TQString & txt,int optForeId,int optBackId,bool bEnabled = true); + + KviDirectorySelector * addDirectorySelector(int x1,int y1,int x2,int y2,const TQString & txt,TQString * pOption,bool bEnabled = true); + KviDirectorySelector * addDirectorySelector(TQWidget * pParent,const TQString & txt,TQString * pOption,bool bEnabled = true); + KviDirectorySelector * addDirectorySelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true); + KviDirectorySelector * addDirectorySelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled = true); + + KviFileSelector * addFileSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQString * pOption,bool bEnabled = true); + KviFileSelector * addFileSelector(TQWidget * pParent,const TQString & txt,TQString * pOption,bool bEnabled = true); + KviFileSelector * addFileSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true); + KviFileSelector * addFileSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled = true); + + KviSoundSelector * addSoundSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQString * pOption,bool bEnabled = true); + KviSoundSelector * addSoundSelector(TQWidget * pParent,const TQString & txt,TQString * pOption,bool bEnabled = true); + KviSoundSelector * addSoundSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true); + KviSoundSelector * addSoundSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled = true); + + + KviFontSelector * addFontSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQFont * pOption,bool bEnabled = true); + KviFontSelector * addFontSelector(TQWidget * pParent,const TQString & txt,TQFont * pOption,bool bEnabled = true); + KviFontSelector * addFontSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true); + KviFontSelector * addFontSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled = true); + + KviPasswordSelector * addPasswordSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQString * pOption,bool bEnabled = true); + KviPasswordSelector * addPasswordSelector(TQWidget * pParent,const TQString & txt,TQString * pOption,bool bEnabled = true); + KviPasswordSelector * addPasswordSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true); + KviPasswordSelector * addPasswordSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled = true); - KviPixmapSelector * addPixmapSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true); - KviPixmapSelector * addPixmapSelector(int x1,int y1,int x2,int y2,const QString & txt,KviPixmap * pOption,bool bEnabled = true); + KviPixmapSelector * addPixmapSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true); + KviPixmapSelector * addPixmapSelector(int x1,int y1,int x2,int y2,const TQString & txt,KviPixmap * pOption,bool bEnabled = true); - KviStringListSelector * addStringListSelector(int x1,int y1,int x2,int y2,const QString & txt,QStringList * pOption,bool bEnabled = true); - KviStringListSelector * addStringListSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true); + KviStringListSelector * addStringListSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQStringList * pOption,bool bEnabled = true); + KviStringListSelector * addStringListSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true); - KviStringSelector * addStringSelector(int x1,int y1,int x2,int y2,const QString & txt,QString * pOption,bool bEnabled = true); - KviStringSelector * addStringSelector(QWidget * pParent,const QString & txt,QString * pOption,bool bEnabled = true); - KviStringSelector * addStringSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true); - KviStringSelector * addStringSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled = true); + KviStringSelector * addStringSelector(int x1,int y1,int x2,int y2,const TQString & txt,TQString * pOption,bool bEnabled = true); + KviStringSelector * addStringSelector(TQWidget * pParent,const TQString & txt,TQString * pOption,bool bEnabled = true); + KviStringSelector * addStringSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId,bool bEnabled = true); + KviStringSelector * addStringSelector(TQWidget * pParent,const TQString & txt,int optId,bool bEnabled = true); - KviUIntSelector * addUIntSelector(int x1,int y1,int x2,int y2,const QString & txt,unsigned int * pOption, + KviUIntSelector * addUIntSelector(int x1,int y1,int x2,int y2,const TQString & txt,unsigned int * pOption, unsigned int uLowBound,unsigned int uHighBound,unsigned int uDefault,bool bEnabled = true); - KviUIntSelector * addUIntSelector(QWidget * pParent,const QString & txt,unsigned int * pOption, + KviUIntSelector * addUIntSelector(TQWidget * pParent,const TQString & txt,unsigned int * pOption, unsigned int uLowBound,unsigned int uHighBound,unsigned int uDefault,bool bEnabled = true); - KviUIntSelector * addUIntSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId, + KviUIntSelector * addUIntSelector(int x1,int y1,int x2,int y2,const TQString & txt,int optId, unsigned int uLowBound,unsigned int uHighBound,unsigned int uDefault,bool bEnabled = true); - KviUIntSelector * addUIntSelector(QWidget * pParent,const QString & txt,int optId, + KviUIntSelector * addUIntSelector(TQWidget * pParent,const TQString & txt,int optId, unsigned int uLowBound,unsigned int uHighBound,unsigned int uDefault,bool bEnabled = true); - KviUIntSelector * addUShortIntSelector(int x1,int y1,int x2,int y2,const QString & txt,unsigned short int * pOption, + KviUIntSelector * addUShortIntSelector(int x1,int y1,int x2,int y2,const TQString & txt,unsigned short int * pOption, unsigned int uLowBound,unsigned int uHighBound,unsigned int uDefault,bool bEnabled = true); - QLabel * addLabel(int x1,int y1,int x2,int y2,const QString & text,bool bEnabled = true); - QLabel * addLabel(QWidget * pParent,const QString & text,bool bEnabled = true); - QLineEdit * addLineEdit(int x1,int y1,int x2,int y2,bool bEnabled = true); + TQLabel * addLabel(int x1,int y1,int x2,int y2,const TQString & text,bool bEnabled = true); + TQLabel * addLabel(TQWidget * pParent,const TQString & text,bool bEnabled = true); + TQLineEdit * addLineEdit(int x1,int y1,int x2,int y2,bool bEnabled = true); #ifdef COMPILE_USE_QT4 - KviTalGroupBox * addGroupBox(int x1,int y1,int x2,int y2,int nStrips,Qt::Orientation o,const QString &txt,bool bEnabled = true); + KviTalGroupBox * addGroupBox(int x1,int y1,int x2,int y2,int nStrips,Qt::Orientation o,const TQString &txt,bool bEnabled = true); #else - KviTalGroupBox * addGroupBox(int x1,int y1,int x2,int y2,int nStrips,KviTalGroupBox::Orientation o,const QString &txt,bool bEnabled = true); + KviTalGroupBox * addGroupBox(int x1,int y1,int x2,int y2,int nStrips,KviTalGroupBox::Orientation o,const TQString &txt,bool bEnabled = true); #endif - QFrame * addSeparator(int x1,int y1,int x2,int y2); + TQFrame * addSeparator(int x1,int y1,int x2,int y2); void addRowSpacer(int x1,int y1,int x2,int y2); - void addWidgetToLayout(QWidget * w,int x1,int y1,int x2,int y2); + void addWidgetToLayout(TQWidget * w,int x1,int y1,int x2,int y2); // this does NOT add the advanced button if this page is not inside a KviGeneralOptionsDialog // this is because nobody listens to the "switchToAdvancedPage" requests.... diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp index c32c33f..ed1801f 100644 --- a/src/kvirc/ui/kvi_query.cpp +++ b/src/kvirc/ui/kvi_query.cpp @@ -55,21 +55,21 @@ #include "kvi_kvs_eventtriggers.h" -#include <qpixmap.h> -#include <qsplitter.h> +#include <tqpixmap.h> +#include <tqsplitter.h> #include "kvi_tal_hbox.h" -#include <qtoolbutton.h> +#include <tqtoolbutton.h> #include "kvi_draganddrop.h" #include "kvi_valuelist.h" -KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const QString &nick) -: KviWindow(KVI_WINDOW_TYPE_QUERY,lpFrm,nick,lpConsole) +KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const TQString &nick) +: KviWindow(KVI_WINDOW_TYPE_TQUERY,lpFrm,nick,lpConsole) { m_iFlags = 0; connection()->registerQuery(this); - //m_pTopSplitter = new QSplitter(QSplitter::Horizontal,this,"top_splitter"); + //m_pTopSplitter = new TQSplitter(TQSplitter::Horizontal,this,"top_splitter"); m_pButtonBox = new KviTalHBox(this); m_pLabel = new KviThemedLabel(m_pButtonBox,"query_label"); m_pLabel->setAutoHeight(1); @@ -79,24 +79,24 @@ KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const QString &nick) // The button box on the right //KviTalHBox * box = new KviTalHBox(m_pTopSplitter,"button_box"); if(KVI_OPTION_BOOL(KviOption_boolShowExtendedInfoInQueryLabel)) - m_pButtonGrid= (QFrame*) new KviTalGrid(2,Qt::Horizontal,m_pButtonBox); + m_pButtonGrid= (TQFrame*) new KviTalGrid(2,Qt::Horizontal,m_pButtonBox); else - m_pButtonGrid= (QFrame*) new KviTalGrid(4,Qt::Horizontal,m_pButtonBox); + m_pButtonGrid= (TQFrame*) new KviTalGrid(4,Qt::Horizontal,m_pButtonBox); createTextEncodingButton(m_pButtonGrid); #ifdef COMPILE_USE_QT4 - m_pSplitter = new QSplitter(Qt::Horizontal,this,"main_splitter"); + m_pSplitter = new TQSplitter(Qt::Horizontal,this,"main_splitter"); #else - m_pSplitter = new QSplitter(QSplitter::Horizontal,this,"main_splitter"); + m_pSplitter = new TQSplitter(Qt::Horizontal,this,"main_splitter"); #endif m_pIrcView = new KviIrcView(m_pSplitter,lpFrm,this); - connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked())); + connect(m_pIrcView,TQT_SIGNAL(rightClicked()),this,TQT_SLOT(textViewRightClicked())); //m_pEditorsContainer= new KviToolWindowsContainer(m_pSplitter); m_pListViewButton = new KviWindowToolPageButton(KVI_SMALLICON_HIDELISTVIEW,KVI_SMALLICON_SHOWLISTVIEW,__tr2qs("Show User List"),buttonContainer(),true,"list_view_button"); - connect(m_pListViewButton,SIGNAL(clicked()),this,SLOT(toggleListView())); + connect(m_pListViewButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleListView())); #ifdef COMPILE_CRYPT_SUPPORT createCryptControllerButton(m_pButtonGrid); @@ -110,7 +110,7 @@ KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const QString &nick) // FIXME: #warning "Maybe tell the user all that we know about the remote end(s)....channels..." m_pIrcView->enableDnd(TRUE); - connect(m_pIrcView,SIGNAL(fileDropped(const char *)),this,SLOT(slotDndEvents(const char *))); + connect(m_pIrcView,TQT_SIGNAL(fileDropped(const char *)),this,TQT_SLOT(slotDndEvents(const char *))); updateCaption(); } @@ -118,7 +118,7 @@ KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const QString &nick) KviQuery::~KviQuery() { m_pUserListView->partAll(); - if(type() == KVI_WINDOW_TYPE_DEADQUERY) + if(type() == KVI_WINDOW_TYPE_DEADTQUERY) context()->unregisterDeadQuery(this); else connection()->unregisterQuery(this); @@ -126,7 +126,7 @@ KviQuery::~KviQuery() void KviQuery::updateLabelText() { - QString szText=getInfoLabelText(); + TQString szText=getInfoLabelText(); if(szText!=m_pLabel->text()) { m_pLabel->setText(szText); @@ -134,14 +134,14 @@ void KviQuery::updateLabelText() } } -QString KviQuery::getInfoLabelTipText() +TQString KviQuery::getInfoLabelTipText() { - QString txt; - KviIrcUserEntry * e = connection()->userDataBase()->find(m_szName); + TQString txt; + KviIrcUserEntry * e = connection()->userDataBase()->tqfind(m_szName); if(e) { - QString tmp; - QString szMask; + TQString tmp; + TQString szMask; if(e->hasUser()) szMask+=e->user(); else @@ -152,7 +152,7 @@ QString KviQuery::getInfoLabelTipText() else szMask+="*"; tmp+="\n"; - QString szChans; + TQString szChans; connection()->getCommonChannels(m_szName,szChans,0); if(console()->connection()) { @@ -167,13 +167,13 @@ QString KviQuery::getInfoLabelTipText() txt += "<tr><td>"; if(e->hasRealName()) - tmp=__tr2qs("%1 is %2 (%3)").arg(m_szName).arg(szMask).arg(KviMircCntrl::stripControlBytes(e->realName())); + tmp=__tr2qs("%1 is %2 (%3)").tqarg(m_szName).tqarg(szMask).tqarg(KviMircCntrl::stripControlBytes(e->realName())); else - tmp=__tr2qs("%1 is %2").arg(m_szName).arg(szMask); + tmp=__tr2qs("%1 is %2").tqarg(m_szName).tqarg(szMask); - tmp.replace('&',"&"); - tmp.replace('<',"<"); - tmp.replace('>',">"); + tmp.tqreplace('&',"&"); + tmp.tqreplace('<',"<"); + tmp.tqreplace('>',">"); txt += tmp; @@ -183,25 +183,25 @@ QString KviQuery::getInfoLabelTipText() { txt+="<tr><td>"; if(e->hasHops()) - txt+=__tr2qs("%1 is using irc server: %2 (%3 hops)").arg(m_szName).arg(e->server()).arg(e->hops()); + txt+=__tr2qs("%1 is using irc server: %2 (%3 hops)").tqarg(m_szName).tqarg(e->server()).tqarg(e->hops()); else - txt+=__tr2qs("%1 is using irc server: %2").arg(m_szName).arg(e->server()); + txt+=__tr2qs("%1 is using irc server: %2").tqarg(m_szName).tqarg(e->server()); txt+="</td></tr>"; } if(e->isAway()) { txt+="<tr><td>"; - txt+=__tr2qs("%1 is probably away").arg(m_szName); + txt+=__tr2qs("%1 is probably away").tqarg(m_szName); txt+="</td></tr>"; } txt+="<tr><td>"; - tmp=__tr2qs("Common channels with %1: %2").arg(m_szName).arg(szChans); + tmp=__tr2qs("Common channels with %1: %2").tqarg(m_szName).tqarg(szChans); - tmp.replace('&',"&"); - tmp.replace('<',"<"); - tmp.replace('>',">"); + tmp.tqreplace('&',"&"); + tmp.tqreplace('<',"<"); + tmp.tqreplace('>',">"); txt+=tmp; txt +="</td></tr>"; @@ -216,15 +216,15 @@ QString KviQuery::getInfoLabelTipText() return txt; } -QString KviQuery::getInfoLabelText() +TQString KviQuery::getInfoLabelText() { - QString tmp; + TQString tmp; if(KVI_OPTION_BOOL(KviOption_boolShowExtendedInfoInQueryLabel)) { - KviIrcUserEntry * e = connection()->userDataBase()->find(m_szName); + KviIrcUserEntry * e = connection()->userDataBase()->tqfind(m_szName); if(e) { - QString szMask; + TQString szMask; if(console()->connection()) { if(e->hasUser()) @@ -237,19 +237,19 @@ QString KviQuery::getInfoLabelText() else szMask+="*"; if(e->hasRealName()) - tmp=__tr2qs("Query with %1!%2 (%3)").arg(m_szName).arg(szMask).arg(KviMircCntrl::stripControlBytes(e->realName())); + tmp=__tr2qs("Query with %1!%2 (%3)").tqarg(m_szName).tqarg(szMask).tqarg(KviMircCntrl::stripControlBytes(e->realName())); else - tmp=__tr2qs("Query with %1!%2").arg(m_szName).arg(szMask); + tmp=__tr2qs("Query with %1!%2").tqarg(m_szName).tqarg(szMask); if(e->hasServer()) - tmp+=__tr2qs(", using server %1").arg(e->server()); + tmp+=__tr2qs(", using server %1").tqarg(e->server()); if(e->hasHops()) - tmp+=__tr2qs(" (%1 hops)").arg(e->hops()); + tmp+=__tr2qs(" (%1 hops)").tqarg(e->hops()); if(e->isAway()) tmp+=__tr2qs(", probably away"); tmp+="\n"; - QString szChans; + TQString szChans; connection()->getCommonChannels(m_szName,szChans,0); - tmp+=__tr2qs("Common channels: %2").arg(szChans); + tmp+=__tr2qs("Common channels: %2").tqarg(szChans); } else { tmp=__tr2qs("[Dead Query]"); } @@ -259,7 +259,7 @@ QString KviQuery::getInfoLabelText() } void KviQuery::slotDndEvents(const char *file) { - KVS_TRIGGER_EVENT_1(KviEvent_OnQueryFileDropped,this,QString(file)); + KVS_TRIGGER_EVENT_1(KviEvent_OnQueryFileDropped,this,TQString(file)); } void KviQuery::triggerCreationEvents() @@ -268,7 +268,7 @@ void KviQuery::triggerCreationEvents() KVS_TRIGGER_EVENT_0(KviEvent_OnQueryWindowCreated,this); } -void KviQuery::getBaseLogFileName(QString &buffer) +void KviQuery::getBaseLogFileName(TQString &buffer) { if(console()->connection()) { @@ -311,24 +311,24 @@ void KviQuery::loadProperties(KviConfig *cfg) showListView(cfg->readBoolEntry("UserListViewVisible",false)); } -void KviQuery::notifyTargetChange(const QString &oldNick,const QString &oldUser,const QString &oldHost,const QString &nick,const QString &user,const QString &host) +void KviQuery::notifyTargetChange(const TQString &oldNick,const TQString &oldUser,const TQString &oldHost,const TQString &nick,const TQString &user,const TQString &host) { - QString oldN = oldNick.isEmpty() ? QString("*") : oldNick; - QString oldU = oldUser.isEmpty() ? QString("*") : oldUser; - QString oldH = oldHost.isEmpty() ? QString("*") : oldHost; - output(KVI_OUT_QUERYTRACE, + TQString oldN = oldNick.isEmpty() ? TQString("*") : oldNick; + TQString oldU = oldUser.isEmpty() ? TQString("*") : oldUser; + TQString oldH = oldHost.isEmpty() ? TQString("*") : oldHost; + output(KVI_OUT_TQUERYTRACE, __tr2qs("The target of this query has changed from \r!n\r%Q\r [%Q@\r!h\r%Q\r] to \r!n\r%Q\r [%Q@\r!h\r%Q\r]"), &oldN,&oldU,&oldH,&nick,&user,&host); updateLabelText(); } -void KviQuery::userAction(const QString &nick,const QString &user,const QString &host,unsigned int uActionType) +void KviQuery::userAction(const TQString &nick,const TQString &user,const TQString &host,unsigned int uActionType) { int iTemperature = kvi_getUserActionTemperature(uActionType); if(KVI_OPTION_BOOL(KviOption_boolEnableQueryTracing)) { - QString oldUser,oldHost; + TQString oldUser,oldHost; if(!m_pUserListView->userActionVerifyMask(nick,user,host,iTemperature,oldUser,oldHost)) notifyTargetChange(nick,oldUser,oldHost,nick,user,host); } else { @@ -338,7 +338,7 @@ void KviQuery::userAction(const QString &nick,const QString &user,const QString } -void KviQuery::userAction(const QString &nick,unsigned int uActionType) +void KviQuery::userAction(const TQString &nick,unsigned int uActionType) { int iTemperature = kvi_getUserActionTemperature(uActionType); m_pUserListView->userAction(nick,iTemperature); @@ -350,7 +350,7 @@ void KviQuery::userAction(KviIrcMask *user,unsigned int uActionType) int iTemperature = kvi_getUserActionTemperature(uActionType); if(KVI_OPTION_BOOL(KviOption_boolEnableQueryTracing)) { - QString oldUser,oldHost; + TQString oldUser,oldHost; if(!m_pUserListView->userActionVerifyMask(user->nick(),user->user(),user->host(),iTemperature,oldUser,oldHost)) notifyTargetChange(user->nick(),oldUser,oldHost,user->nick(),user->user(),user->host()); } else { @@ -360,7 +360,7 @@ void KviQuery::userAction(KviIrcMask *user,unsigned int uActionType) } -KviUserListEntry * KviQuery::setTarget(const QString &nick,const QString &user,const QString &host) +KviUserListEntry * KviQuery::setTarget(const TQString &nick,const TQString &user,const TQString &host) { KviUserListEntry * e = m_pUserListView->join(nick,user,host); if((!e->globalData()->avatar()) && (!user.isEmpty()) && (user != "*")) @@ -371,7 +371,7 @@ KviUserListEntry * KviQuery::setTarget(const QString &nick,const QString &user,c if(KVI_OPTION_BOOL(KviOption_boolEnableQueryTracing)) { - QString szChans; + TQString szChans; int iChans = m_pConsole->connection()->getCommonChannels(nick,szChans); notifyCommonChannels(nick,user,host,iChans,szChans); } @@ -381,15 +381,15 @@ KviUserListEntry * KviQuery::setTarget(const QString &nick,const QString &user,c return e; } -void KviQuery::notifyCommonChannels(const QString &nick,const QString &user,const QString &host,int iChans,const QString &szChans) +void KviQuery::notifyCommonChannels(const TQString &nick,const TQString &user,const TQString &host,int iChans,const TQString &szChans) { - static QString star("*"); + static TQString star("*"); if(iChans > 0) { - output(KVI_OUT_QUERYTRACE,__tr2qs("Common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"), + output(KVI_OUT_TQUERYTRACE,__tr2qs("Common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]: %Q"), &nick,user.isEmpty() ? &star : &user,host.isEmpty() ? &star : &host,&szChans); } else { - output(KVI_OUT_QUERYTRACE,__tr2qs("No common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]"), + output(KVI_OUT_TQUERYTRACE,__tr2qs("No common channels for \r!n\r%Q\r [%Q@\r!h\r%Q\r]"), &nick,user.isEmpty() ? &star : &user,host.isEmpty() ? &star : &host); } updateLabelText(); @@ -400,11 +400,11 @@ void KviQuery::notifyCommonChannels(const QString &nick,const QString &user,cons /*void KviQuery::updateTargets() { - QString szName; + TQString szName; if(targetCount() > 0) { - KviPointerHashTableIterator<QString,KviUserListEntry> it(*(m_pUserListView->entryDict())); + KviPointerHashTableIterator<TQString,KviUserListEntry> it(*(m_pUserListView->entryDict())); if(it.current())szName = it.currentKey(); } @@ -417,15 +417,15 @@ void KviQuery::notifyCommonChannels(const QString &nick,const QString &user,cons void KviQuery::fillCaptionBuffers() { - static QString begin("<nobr><font color=\""); - static QString boldbegin("\"><b>"); - static QString endofbold("</b></font> <font color=\""); - static QString endoffont("\">"); - static QString end("</font></nobr>"); + static TQString begin("<nobr><font color=\""); + static TQString boldbegin("\"><b>"); + static TQString endofbold("</b></font> <font color=\""); + static TQString endoffont("\">"); + static TQString end("</font></nobr>"); if(!console()->connection()) { - QString dead = __tr2qs("[Dead query]"); + TQString dead = __tr2qs("[Dead query]"); m_szPlainTextCaption = windowName(); m_szPlainTextCaption += " : "; @@ -454,14 +454,14 @@ void KviQuery::fillCaptionBuffers() return; } - QString szNickOnServer = QChar('['); + TQString szNickOnServer = TQChar('['); szNickOnServer += connection()->currentNickName(); szNickOnServer += __tr2qs(" on "); szNickOnServer += connection()->currentServerName(); - szNickOnServer += QChar(']'); + szNickOnServer += TQChar(']'); m_szPlainTextCaption = windowName(); - m_szPlainTextCaption += QChar(' '); + m_szPlainTextCaption += TQChar(' '); m_szPlainTextCaption += szNickOnServer; m_szHtmlActiveCaption = begin; @@ -485,7 +485,7 @@ void KviQuery::fillCaptionBuffers() m_szHtmlInactiveCaption += end; } -bool KviQuery::nickChange(const QString &oldNick,const QString &newNick) +bool KviQuery::nickChange(const TQString &oldNick,const TQString &newNick) { bool bRet = m_pUserListView->nickChange(oldNick,newNick); if(!bRet)return false; // ugh!! ? @@ -514,7 +514,7 @@ void KviQuery::toggleListView() void KviQuery::setDeadQuery() { - m_iFlags |= KVI_QUERY_FLAG_DEAD; + m_iFlags |= KVI_TQUERY_FLAG_DEAD; m_pUserListView->enableUpdates(false); m_pUserListView->partAll(); @@ -522,7 +522,7 @@ void KviQuery::setDeadQuery() m_pUserListView->setUserDataBase(0); connection()->unregisterQuery(this); context()->registerDeadQuery(this); - setType(KVI_WINDOW_TYPE_DEADQUERY); + setType(KVI_WINDOW_TYPE_DEADTQUERY); updateIcon(); updateCaption(); @@ -531,9 +531,9 @@ void KviQuery::setDeadQuery() void KviQuery::setAliveQuery() { - m_iFlags &= ~KVI_QUERY_FLAG_DEAD; + m_iFlags &= ~KVI_TQUERY_FLAG_DEAD; m_pUserListView->setUserDataBase(connection()->userDataBase()); - setType(KVI_WINDOW_TYPE_QUERY); + setType(KVI_WINDOW_TYPE_TQUERY); context()->unregisterDeadQuery(this); connection()->registerQuery(this); // Update log file name @@ -547,31 +547,31 @@ void KviQuery::applyOptions() { m_pUserListView->applyOptions(); updateLabelText(); - // this applies options for IrcView and Input and forces the window to relayout + // this applies options for IrcView and Input and forces the window to retqlayout KviWindow::applyOptions(); } -QPixmap * KviQuery::myIconPtr() +TQPixmap * KviQuery::myIconPtr() { - return g_pIconManager->getSmallIcon(isDeadQuery() ? KVI_SMALLICON_DEADQUERY : KVI_SMALLICON_QUERY); + return g_pIconManager->getSmallIcon(isDeadQuery() ? KVI_SMALLICON_DEADTQUERY : KVI_SMALLICON_TQUERY); } -void KviQuery::resizeEvent(QResizeEvent *e) +void KviQuery::resizeEvent(TQResizeEvent *e) { int hght = m_pInput->heightHint(); - int hght2 = m_pButtonBox->sizeHint().height(); + int hght2 = m_pButtonBox->tqsizeHint().height(); m_pButtonBox->setGeometry(0,0,width(),hght2); m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2)); m_pInput->setGeometry(0,height() - hght,width(),hght); } -QSize KviQuery::sizeHint() const +TQSize KviQuery::tqsizeHint() const { - QSize ret(m_pSplitter->sizeHint().width(),m_pIrcView->sizeHint().height() + m_pInput->heightHint()); + TQSize ret(m_pSplitter->tqsizeHint().width(),m_pIrcView->tqsizeHint().height() + m_pInput->heightHint()); return ret; } -void KviQuery::ownMessage(const QString &buffer) +void KviQuery::ownMessage(const TQString &buffer) { if(!connection()) { @@ -579,8 +579,8 @@ void KviQuery::ownMessage(const QString &buffer) return; } - KviQCString szName = connection()->encodeText(windowName()); - KviQCString szData = encodeText(buffer); + KviTQCString szName = connection()->encodeText(windowName()); + KviTQCString szData = encodeText(buffer); const char * d = szData.data(); if(!d)return; @@ -599,20 +599,20 @@ void KviQuery::ownMessage(const QString &buffer) case KviCryptEngine::Encrypted: if(!connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),encrypted.ptr()))return; m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED, - QString::null,QString::null,QString::null,buffer,KviConsole::NoNotifications); + TQString(),TQString(),TQString(),buffer,KviConsole::NoNotifications); break; case KviCryptEngine::Encoded: { if(!connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),encrypted.ptr()))return; // ugly ,but we must redecode here - QString szRedecoded = decodeText(encrypted.ptr()); + TQString szRedecoded = decodeText(encrypted.ptr()); m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG, - QString::null,QString::null,QString::null,szRedecoded,KviConsole::NoNotifications); + TQString(),TQString(),TQString(),szRedecoded,KviConsole::NoNotifications); } break; default: // also case KviCryptEngine::EncryptError { - QString szEngineError = cryptSessionInfo()->pEngine->lastError(); + TQString szEngineError = cryptSessionInfo()->pEngine->lastError(); output(KVI_OUT_SYSTEMERROR, __tr2qs("The crypto engine was unable to encrypt the current message (%Q): %s, no data sent to the server"), &buffer,&szEngineError); @@ -623,9 +623,9 @@ void KviQuery::ownMessage(const QString &buffer) return; } else { d++; //eat the escape code - QString tmp = buffer.right(buffer.length() - 1); + TQString tmp = buffer.right(buffer.length() - 1); if(!connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),d))return; - m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString::null,QString::null,QString::null,tmp,KviConsole::NoNotifications); + m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,TQString(),TQString(),TQString(),tmp,KviConsole::NoNotifications); userAction(connection()->currentNickName(),KVI_USERACTION_PRIVMSG); return; } @@ -634,23 +634,23 @@ void KviQuery::ownMessage(const QString &buffer) #endif if(!connection()->sendFmtData("PRIVMSG %s :%s",szName.data(),d))return; - m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,QString::null,QString::null,QString::null,buffer,KviConsole::NoNotifications); + m_pConsole->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,TQString(),TQString(),TQString(),buffer,KviConsole::NoNotifications); userAction(connection()->currentNickName(),KVI_USERACTION_PRIVMSG); } -void KviQuery::ownAction(const QString &buffer) +void KviQuery::ownAction(const TQString &buffer) { if(!connection()) { outputNoFmt(KVI_OUT_SYSTEMWARNING,__tr2qs("This query has no active targets, no message sent")); } else { - KviQCString szBuffer = encodeText(buffer); + KviTQCString szBuffer = encodeText(buffer); if(!szBuffer.data())return; - KviQCString sz = connection()->encodeText(windowName()); + KviTQCString sz = connection()->encodeText(windowName()); if(sz.isEmpty())return; if(!connection()->sendFmtData("PRIVMSG %s :%cACTION %s%c", sz.data(),0x01,szBuffer.data(),0x01))return; - if(KVS_TRIGGER_EVENT_1_HALTED(KviEvent_OnMeAction,this,QString(szBuffer.data())))return; + if(KVS_TRIGGER_EVENT_1_HALTED(KviEvent_OnMeAction,this,TQString(szBuffer.data())))return; output(KVI_OUT_ACTION,"\r!nc\r%Q\r %Q",&(connection()->currentNickName()),&buffer); m_pUserListView->userAction(connection()->currentNickName(),KVI_USERACTION_ACTION); } diff --git a/src/kvirc/ui/kvi_query.h b/src/kvirc/ui/kvi_query.h index ba087ac..3b1a81b 100644 --- a/src/kvirc/ui/kvi_query.h +++ b/src/kvirc/ui/kvi_query.h @@ -1,5 +1,5 @@ -#ifndef _KVI_QUERY_H_ -#define _KVI_QUERY_H_ +#ifndef _KVI_TQUERY_H_ +#define _KVI_TQUERY_H_ //============================================================================= // // File : kvi_query.h @@ -36,56 +36,57 @@ class KviConsole; class KviConfig; -class QSplitter; +class TQSplitter; class KviWindowToolPageButton; -#define KVI_QUERY_FLAG_DEAD 1 +#define KVI_TQUERY_FLAG_DEAD 1 class KVIRC_API KviQuery : public KviWindow { Q_OBJECT + TQ_OBJECT public: - KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const QString &nick); + KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const TQString &nick); ~KviQuery(); protected: KviUserListView * m_pUserListView; KviWindowToolPageButton * m_pListViewButton; int m_iFlags; KviThemedLabel * m_pLabel; - QFrame * m_pButtonGrid; + TQFrame * m_pButtonGrid; protected: - virtual QPixmap * myIconPtr(); + virtual TQPixmap * myIconPtr(); virtual void fillCaptionBuffers(); - virtual void resizeEvent(QResizeEvent *e); + virtual void resizeEvent(TQResizeEvent *e); virtual void loadProperties(KviConfig * cfg); virtual void saveProperties(KviConfig * cfg); - virtual void getBaseLogFileName(QString &buffer); + virtual void getBaseLogFileName(TQString &buffer); virtual void triggerCreationEvents(); public: void setDeadQuery(); void setAliveQuery(); - bool isDeadQuery(){ return m_iFlags & KVI_QUERY_FLAG_DEAD; }; - virtual QSize sizeHint() const; - virtual const QString & target(){ return windowName(); }; + bool isDeadQuery(){ return m_iFlags & KVI_TQUERY_FLAG_DEAD; }; + virtual TQSize tqsizeHint() const; + virtual const TQString & target(){ return windowName(); }; virtual void applyOptions(); - KviUserListEntry * setTarget(const QString &nick,const QString &user,const QString &host); + KviUserListEntry * setTarget(const TQString &nick,const TQString &user,const TQString &host); void userAction(KviIrcMask *user,unsigned int uActionType); - void userAction(const QString &nick,unsigned int uActionType); - void userAction(const QString &nick,const QString &user,const QString &host,unsigned int uActionType); - bool nickChange(const QString &oldNick,const QString &newNick); - void ownMessage(const QString &buffer); - void ownAction(const QString &buffer); + void userAction(const TQString &nick,unsigned int uActionType); + void userAction(const TQString &nick,const TQString &user,const TQString &host,unsigned int uActionType); + bool nickChange(const TQString &oldNick,const TQString &newNick); + void ownMessage(const TQString &buffer); + void ownAction(const TQString &buffer); int selectedCount(){ return m_pUserListView->selectedCount(); }; - bool avatarChanged(const QString &nick){ return m_pUserListView->avatarChanged(nick); }; - void notifyCommonChannels(const QString &nick,const QString &user,const QString &host,int iChans,const QString &szChans); + bool avatarChanged(const TQString &nick){ return m_pUserListView->avatarChanged(nick); }; + void notifyCommonChannels(const TQString &nick,const TQString &user,const TQString &host,int iChans,const TQString &szChans); void showListView(bool bShow); void mergeQuery(KviQuery * q); void updateLabelText(); - QFrame * buttonContainer() { return (QFrame*)m_pButtonGrid; }; + TQFrame * buttonContainer() { return (TQFrame*)m_pButtonGrid; }; protected: - void notifyTargetChange(const QString &oldNick,const QString &oldUser,const QString &oldHost,const QString &nick,const QString &user,const QString &host); - QString getInfoLabelText(); - QString getInfoLabelTipText(); + void notifyTargetChange(const TQString &oldNick,const TQString &oldUser,const TQString &oldHost,const TQString &nick,const TQString &user,const TQString &host); + TQString getInfoLabelText(); + TQString getInfoLabelTipText(); protected slots: void textViewRightClicked(); void toggleListView(); diff --git a/src/kvirc/ui/kvi_scriptbutton.cpp b/src/kvirc/ui/kvi_scriptbutton.cpp index 7b4a8e7..d26c723 100644 --- a/src/kvirc/ui/kvi_scriptbutton.cpp +++ b/src/kvirc/ui/kvi_scriptbutton.cpp @@ -30,12 +30,12 @@ #include "kvi_kvs_script.h" -KviScriptUserButton::KviScriptUserButton(QWidget * par,const char * name) +KviScriptUserButton::KviScriptUserButton(TQWidget * par,const char * name) : KviStyledToolButton(par,name) { m_pScript = 0; // setAutoRaise(true); - connect(this,SIGNAL(clicked()),this,SLOT(btnClicked())); + connect(this,TQT_SIGNAL(clicked()),this,TQT_SLOT(btnClicked())); setAutoRaise(true); } @@ -60,7 +60,7 @@ void KviScriptUserButton::btnClicked() { KviWindow * pWnd = window(); if(!pWnd)return; // ops... - QPoint pos = mapToGlobal(QPoint(0,height())); + TQPoint pos = mapToGlobal(TQPoint(0,height())); KviKvsVariantList vList; vList.append((kvs_int_t)pos.x()); @@ -69,7 +69,7 @@ void KviScriptUserButton::btnClicked() } /* -KviIrcToolBarScriptButton::KviIrcToolBarScriptButton(QToolBar * p,const char * name) +KviIrcToolBarScriptButton::KviIrcToolBarScriptButton(TQToolBar * p,const char * name) : KviScriptUserButton(p,name) { setAutoRaise(true); @@ -85,7 +85,7 @@ KviWindow * KviIrcToolBarScriptButton::window() } */ -KviWindowScriptButton::KviWindowScriptButton(QWidget * p,KviWindow * wnd,const char * name) +KviWindowScriptButton::KviWindowScriptButton(TQWidget * p,KviWindow * wnd,const char * name) : KviScriptUserButton(p,name) { m_pWnd = wnd; diff --git a/src/kvirc/ui/kvi_scriptbutton.h b/src/kvirc/ui/kvi_scriptbutton.h index 79740c8..a973416 100644 --- a/src/kvirc/ui/kvi_scriptbutton.h +++ b/src/kvirc/ui/kvi_scriptbutton.h @@ -26,8 +26,8 @@ #include "kvi_string.h" #include "kvi_styled_controls.h" -#include <qtoolbutton.h> -#include <qtoolbar.h> +#include <tqtoolbutton.h> +#include <tqtoolbar.h> class KviKvsScript; class KviWindow; @@ -35,14 +35,15 @@ class KviWindow; class KVIRC_API KviScriptUserButton : public KviStyledToolButton { Q_OBJECT + TQ_OBJECT public: - KviScriptUserButton(QWidget * par,const char * name); + KviScriptUserButton(TQWidget * par,const char * name); ~KviScriptUserButton(); protected: KviKvsScript * m_pScript; public: void setButtonCode(KviKvsScript * pScript); - virtual void setButtonPixmap(const QPixmap & pix){ setIconSet(pix); }; + virtual void setButtonPixmap(const TQPixmap & pix){ setIconSet(pix); }; void setButtonText(const char * text){ setTextLabel(text); }; virtual KviWindow * window(); protected slots: @@ -53,8 +54,9 @@ protected slots: class KVIRC_API KviIrcToolBarScriptButton : public KviScriptUserButton { Q_OBJECT + TQ_OBJECT public: - KviIrcToolBarScriptButton(QToolBar * p,const char * name); + KviIrcToolBarScriptButton(TQToolBar * p,const char * name); ~KviIrcToolBarScriptButton(); protected: KviStr m_szCode; @@ -66,13 +68,14 @@ public: class KVIRC_API KviWindowScriptButton : public KviScriptUserButton { Q_OBJECT + TQ_OBJECT public: - KviWindowScriptButton(QWidget * p,KviWindow * wnd,const char * name); + KviWindowScriptButton(TQWidget * p,KviWindow * wnd,const char * name); ~KviWindowScriptButton(); protected: KviWindow * m_pWnd; public: - virtual void setButtonPixmap(const QPixmap & pix){ setIconSet(pix); setUsesBigPixmap(false); }; + virtual void setButtonPixmap(const TQPixmap & pix){ setIconSet(pix); setUsesBigPixmap(false); }; virtual KviWindow * window(){ return m_pWnd; }; }; diff --git a/src/kvirc/ui/kvi_scripteditor.cpp b/src/kvirc/ui/kvi_scripteditor.cpp index f94000d..7f55793 100644 --- a/src/kvirc/ui/kvi_scripteditor.cpp +++ b/src/kvirc/ui/kvi_scripteditor.cpp @@ -31,8 +31,8 @@ #include "kvi_modulemanager.h" -KviScriptEditor::KviScriptEditor(QWidget * par) -: QWidget(par) +KviScriptEditor::KviScriptEditor(TQWidget * par) +: TQWidget(par) { } @@ -43,22 +43,22 @@ KviScriptEditor::~KviScriptEditor() void KviScriptEditor::setText(const char * txt) { - setText(KviQCString(txt)); + setText(KviTQCString(txt)); } -void KviScriptEditor::setText(const KviQCString &txt) +void KviScriptEditor::setText(const KviTQCString &txt) { } -void KviScriptEditor::setText(const QString &txt) +void KviScriptEditor::setText(const TQString &txt) { - setText(KviQCString(txt.utf8())); + setText(KviTQCString(txt.utf8())); } -void KviScriptEditor::setFindText(const QString &text) +void KviScriptEditor::setFindText(const TQString &text) { } -void KviScriptEditor::setInfoText(const QString &text) +void KviScriptEditor::setInfoText(const TQString &text) { } @@ -66,11 +66,11 @@ void KviScriptEditor::setFindLineeditReadOnly(bool b) { } -void KviScriptEditor::getText(KviQCString &txt) +void KviScriptEditor::getText(KviTQCString &txt) { } -void KviScriptEditor::setCursorPosition(QPoint) +void KviScriptEditor::setCursorPosition(TQPoint) { } @@ -79,28 +79,28 @@ bool KviScriptEditor::isModified() return false; } -QPoint KviScriptEditor::getCursor() +TQPoint KviScriptEditor::getCursor() { - return QPoint(0,0); + return TQPoint(0,0); } -void KviScriptEditor::getText(QString &txt) +void KviScriptEditor::getText(TQString &txt) { - KviQCString tmp; + KviTQCString tmp; getText(tmp); - txt = QString::fromUtf8(tmp.data()); + txt = TQString::fromUtf8(tmp.data()); } -KviScriptEditor * KviScriptEditor::getDummyEditor(QWidget * par) +KviScriptEditor * KviScriptEditor::getDummyEditor(TQWidget * par) { return new KviScriptEditor(par); } -static KviScriptEditor * (*editorModuleCreateScriptEditor)(QWidget *); +static KviScriptEditor * (*editorModuleCreateScriptEditor)(TQWidget *); static void (*editorModuleDestroyScriptEditor)(KviScriptEditor *); -KviScriptEditor * KviScriptEditor::createInstance(QWidget * par) +KviScriptEditor * KviScriptEditor::createInstance(TQWidget * par) { KviModule * m = g_pModuleManager->getModule("editor"); // If the module can't be loaded...return a dummy widget @@ -108,7 +108,7 @@ KviScriptEditor * KviScriptEditor::createInstance(QWidget * par) if(!m)return KviScriptEditor::getDummyEditor(par); // dummy implementation - editorModuleCreateScriptEditor = (KviScriptEditor * (*)(QWidget *)) m->getSymbol("editor_module_createScriptEditor"); + editorModuleCreateScriptEditor = (KviScriptEditor * (*)(TQWidget *)) m->getSymbol("editor_module_createScriptEditor"); if(!editorModuleCreateScriptEditor)return KviScriptEditor::getDummyEditor(par); diff --git a/src/kvirc/ui/kvi_scripteditor.h b/src/kvirc/ui/kvi_scripteditor.h index e9f04c2..0039d24 100644 --- a/src/kvirc/ui/kvi_scripteditor.h +++ b/src/kvirc/ui/kvi_scripteditor.h @@ -24,8 +24,8 @@ // #include "kvi_settings.h" -#include <qwidget.h> -#include <qlineedit.h> +#include <tqwidget.h> +#include <tqlineedit.h> #include "kvi_qcstring.h" // @@ -39,29 +39,30 @@ // -class KVIRC_API KviScriptEditor : public QWidget +class KVIRC_API KviScriptEditor : public TQWidget { Q_OBJECT + TQ_OBJECT protected: - KviScriptEditor(QWidget * par); + KviScriptEditor(TQWidget * par); ~KviScriptEditor(); protected: - QLineEdit * m_pFindLineedit; + TQLineEdit * m_pFindLineedit; public: virtual void setText(const char * txt); - virtual void setText(const KviQCString &txt); - virtual void setText(const QString &txt); - virtual void getText(KviQCString &txt); - virtual void getText(QString &txt); - virtual void setInfoText(const QString &text); - virtual void setFindText(const QString &text); - virtual void setCursorPosition(QPoint); - virtual QPoint getCursor(); + virtual void setText(const KviTQCString &txt); + virtual void setText(const TQString &txt); + virtual void getText(KviTQCString &txt); + virtual void getText(TQString &txt); + virtual void setInfoText(const TQString &text); + virtual void setFindText(const TQString &text); + virtual void setCursorPosition(TQPoint); + virtual TQPoint getCursor(); virtual void setFindLineeditReadOnly(bool b); virtual bool isModified(); - static KviScriptEditor * getDummyEditor(QWidget * par); - static KviScriptEditor * createInstance(QWidget * par); + static KviScriptEditor * getDummyEditor(TQWidget * par); + static KviScriptEditor * createInstance(TQWidget * par); static void destroyInstance(KviScriptEditor * e); }; diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp index f8c9af9..17a9ddf 100644 --- a/src/kvirc/ui/kvi_selectors.cpp +++ b/src/kvirc/ui/kvi_selectors.cpp @@ -33,15 +33,15 @@ #include "kvi_filedialog.h" #include "kvi_kvs_script.h" -#include <qlabel.h> -#include <qpainter.h> -#include <qlayout.h> -#include <qcolordialog.h> -#include <qpalette.h> -#include <qfontdialog.h> +#include <tqlabel.h> +#include <tqpainter.h> +#include <tqlayout.h> +#include <tqcolordialog.h> +#include <tqpalette.h> +#include <tqfontdialog.h> #include "kvi_tal_popupmenu.h" -KviBoolSelector::KviBoolSelector(QWidget * par,const QString & txt,bool *pOption,bool bEnabled) +KviBoolSelector::KviBoolSelector(TQWidget * par,const TQString & txt,bool *pOption,bool bEnabled) : KviStyledCheckBox(txt,par), KviSelectorInterface() { setEnabled(bEnabled); @@ -59,14 +59,14 @@ void KviBoolSelector::commit() *m_pOption = isChecked(); } -KviUIntSelector::KviUIntSelector(QWidget * par,const QString & txt,unsigned int *pOption, +KviUIntSelector::KviUIntSelector(TQWidget * par,const TQString & txt,unsigned int *pOption, unsigned int uLowBound,unsigned int uHighBound,unsigned int uDefault,bool bEnabled,bool bShortInt) : KviTalHBox(par) , KviSelectorInterface() { - m_pLabel = new QLabel(txt,this); - //m_pLineEdit = new QLineEdit(this); + m_pLabel = new TQLabel(txt,this); + //m_pLineEdit = new TQLineEdit(this); //m_pLineEdit->setMaximumWidth(150); - m_pSpinBox = new QSpinBox(this); + m_pSpinBox = new TQSpinBox(this); m_bIsShortInt = bShortInt; @@ -89,12 +89,12 @@ KviUIntSelector::KviUIntSelector(QWidget * par,const QString & txt,unsigned int setStretchFactor(m_pLabel,1); } -void KviUIntSelector::setPrefix(const QString & txt) +void KviUIntSelector::setPrefix(const TQString & txt) { m_pSpinBox->setPrefix(txt); } -void KviUIntSelector::setSuffix(const QString & txt) +void KviUIntSelector::setSuffix(const TQString & txt) { m_pSpinBox->setSuffix(txt); } @@ -125,13 +125,13 @@ void KviUIntSelector::setEnabled(bool bEnabled) -KviStringSelector::KviStringSelector(QWidget * par,const QString & txt,QString * pOption,bool bEnabled) +KviStringSelector::KviStringSelector(TQWidget * par,const TQString & txt,TQString * pOption,bool bEnabled) : KviTalHBox(par) , KviSelectorInterface() { - m_pLabel = new QLabel(txt,this); - m_pLineEdit = new QLineEdit(this); + m_pLabel = new TQLabel(txt,this); + m_pLineEdit = new TQLineEdit(this); //m_pLineEdit->setMinimumWidth(200); - QString tmp = *pOption; + TQString tmp = *pOption; m_pLineEdit->setText(tmp); setSpacing(4); @@ -148,7 +148,7 @@ KviStringSelector::~KviStringSelector() void KviStringSelector::commit() { - QString tmp = m_pLineEdit->text(); + TQString tmp = m_pLineEdit->text(); *m_pOption = tmp; } @@ -159,20 +159,20 @@ void KviStringSelector::setEnabled(bool bEnabled) m_pLabel->setEnabled(bEnabled); } -void KviStringSelector::setText(const QString& text){ +void KviStringSelector::setText(const TQString& text){ m_pLineEdit->setText(text); } -KviPasswordSelector::KviPasswordSelector(QWidget * par,const QString & txt,QString *pOption,bool bEnabled) +KviPasswordSelector::KviPasswordSelector(TQWidget * par,const TQString & txt,TQString *pOption,bool bEnabled) : KviStringSelector(par,txt,pOption,bEnabled) { - m_pLineEdit->setEchoMode(QLineEdit::Password); + m_pLineEdit->setEchoMode(TQLineEdit::Password); } -KviPixmapPreview::KviPixmapPreview(QWidget * par) +KviPixmapPreview::KviPixmapPreview(TQWidget * par) : KviTalScrollView(par) { m_pPixmap = 0; @@ -200,7 +200,7 @@ void KviPixmapPreview::setPixmap(KviPixmap * pix) update(); } -void KviPixmapPreview::drawContents(QPainter * p, int clipx, int clipy, int clipw, int cliph) +void KviPixmapPreview::drawContents(TQPainter * p, int clipx, int clipy, int clipw, int cliph) { if(m_pPixmap) { @@ -212,31 +212,31 @@ void KviPixmapPreview::drawContents(QPainter * p, int clipx, int clipy, int clip } -KviPixmapSelector::KviPixmapSelector(QWidget * par,const QString & txt,KviPixmap * pOption,bool bEnabled) -: QWidget(par), KviSelectorInterface() +KviPixmapSelector::KviPixmapSelector(TQWidget * par,const TQString & txt,KviPixmap * pOption,bool bEnabled) +: TQWidget(par), KviSelectorInterface() { - QGridLayout * g = new QGridLayout(this,3,2,4,8); + TQGridLayout * g = new TQGridLayout(this,3,2,4,8); m_pOption = pOption; m_localPixmap = *pOption; m_pCheckBox = new KviStyledCheckBox(txt,this); m_pCheckBox->setChecked(m_localPixmap.pixmap()); - connect(m_pCheckBox,SIGNAL(toggled(bool)),this,SLOT(checkBoxToggled(bool))); + connect(m_pCheckBox,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(checkBoxToggled(bool))); g->addMultiCellWidget(m_pCheckBox,0,0,0,1); m_pPreview = new KviPixmapPreview(this); m_pPreview->setPixmap(&m_localPixmap); g->addMultiCellWidget(m_pPreview,1,1,0,1); - m_pFileNameLabel = new QLabel(this); - m_pFileNameLabel->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); + m_pFileNameLabel = new TQLabel(this); + m_pFileNameLabel->setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); if(m_localPixmap.pixmap())m_pFileNameLabel->setText(m_localPixmap.path()); g->addWidget(m_pFileNameLabel,2,0); - m_pChooseButton = new QPushButton("...",this); + m_pChooseButton = new TQPushButton("...",this); g->addWidget(m_pChooseButton,2,1); - connect(m_pChooseButton,SIGNAL(clicked()),this,SLOT(choosePixmap())); + connect(m_pChooseButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(choosePixmap())); g->setRowStretch(1,1); g->setColStretch(0,1); @@ -267,7 +267,7 @@ void KviPixmapSelector::commit() void KviPixmapSelector::choosePixmap() { // KviStr tmp; - QString tmp; + TQString tmp; if(KviFileDialog::askForOpenFileName(tmp,__tr("Choose an Image File - KVIrc"))) { setImagePath(tmp); @@ -294,7 +294,7 @@ void KviPixmapSelector::setImagePath(const char * path) void KviPixmapSelector::setEnabled(bool bEnabled) { - QWidget::setEnabled(bEnabled); + TQWidget::setEnabled(bEnabled); m_pCheckBox->setEnabled(bEnabled); m_pPreview->setEnabled(bEnabled && m_pCheckBox->isChecked()); m_pFileNameLabel->setEnabled(bEnabled && m_pCheckBox->isChecked()); @@ -304,17 +304,17 @@ void KviPixmapSelector::setEnabled(bool bEnabled) // FIXME: #warning "Option for DIR_MUST_EXISTS...(this widget could be turned into a file selector too)" -KviFileSelector::KviFileSelector(QWidget * par,const QString & txt,QString * pOption,bool bEnabled,unsigned int uFlags,const QString &szFilter) +KviFileSelector::KviFileSelector(TQWidget * par,const TQString & txt,TQString * pOption,bool bEnabled,unsigned int uFlags,const TQString &szFilter) : KviTalHBox(par), KviSelectorInterface() { m_uFlags = uFlags; m_szFilter = szFilter; - m_pLabel = new QLabel(txt,this); - m_pLineEdit = new QLineEdit(this); + m_pLabel = new TQLabel(txt,this); + m_pLineEdit = new TQLineEdit(this); //m_pLineEdit->setMinimumWidth(200); m_pLineEdit->setText(*pOption); - m_pButton = new QPushButton(__tr2qs("&Browse..."),this); - connect(m_pButton,SIGNAL(clicked()),this,SLOT(browseClicked())); + m_pButton = new TQPushButton(__tr2qs("&Browse..."),this); + connect(m_pButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(browseClicked())); setSpacing(4); setStretchFactor(m_pLineEdit,1); @@ -343,7 +343,7 @@ void KviFileSelector::browseClicked() select(); } -void KviFileSelector::setSelection(const QString &szSelection) +void KviFileSelector::setSelection(const TQString &szSelection) { m_pLineEdit->setText(szSelection); } @@ -352,7 +352,7 @@ void KviFileSelector::setSelection(const QString &szSelection) void KviFileSelector::select() { //KviStr tmp; - QString tmp = *m_pOption; + TQString tmp = *m_pOption; if(m_uFlags & ChooseSaveFileName) { if(KviFileDialog::askForSaveFileName(tmp,__tr2qs("Choose a File - KVIrc"),tmp,m_szFilter,true,!(m_uFlags & DontConfirmOverwrite))) @@ -371,14 +371,14 @@ void KviFileSelector::select() } -KviDirectorySelector::KviDirectorySelector(QWidget * par,const QString & txt,QString * pOption,bool bEnabled) +KviDirectorySelector::KviDirectorySelector(TQWidget * par,const TQString & txt,TQString * pOption,bool bEnabled) : KviFileSelector(par,txt,pOption,bEnabled) { } void KviDirectorySelector::select() { - QString tmp; + TQString tmp; if(KviFileDialog::askForDirectoryName(tmp,__tr2qs("Choose a Directory - KVIrc"),"")) { m_pLineEdit->setText(tmp); @@ -393,23 +393,23 @@ void KviDirectorySelector::select() -KviStringListSelector::KviStringListSelector(QWidget * par,const QString & txt,QStringList * pOption,bool bEnabled) +KviStringListSelector::KviStringListSelector(TQWidget * par,const TQString & txt,TQStringList * pOption,bool bEnabled) : KviTalVBox(par), KviSelectorInterface() { - m_pLabel = new QLabel(txt,this); + m_pLabel = new TQLabel(txt,this); m_pListBox = new KviTalListBox(this); - m_pLineEdit = new QLineEdit(this); - connect(m_pLineEdit,SIGNAL(textChanged(const QString &)),this,SLOT(textChanged(const QString &))); - connect(m_pLineEdit,SIGNAL(returnPressed()),this,SLOT(addClicked())); + m_pLineEdit = new TQLineEdit(this); + connect(m_pLineEdit,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(textChanged(const TQString &))); + connect(m_pLineEdit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(addClicked())); KviTalHBox * hBox = new KviTalHBox(this); - m_pAddButton = new QPushButton(__tr2qs("A&dd"),hBox); - connect(m_pAddButton,SIGNAL(clicked()),this,SLOT(addClicked())); - m_pRemoveButton = new QPushButton(__tr2qs("Re&move"),hBox); - connect(m_pRemoveButton,SIGNAL(clicked()),this,SLOT(removeClicked())); + m_pAddButton = new TQPushButton(__tr2qs("A&dd"),hBox); + connect(m_pAddButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked())); + m_pRemoveButton = new TQPushButton(__tr2qs("Re&move"),hBox); + connect(m_pRemoveButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeClicked())); m_pOption = pOption; m_pListBox->insertStringList(*pOption); m_pListBox->setSelectionMode(KviTalListBox::Extended); - connect(m_pListBox,SIGNAL(selectionChanged()),this,SLOT(selectionChanged())); + connect(m_pListBox,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(selectionChanged())); setSpacing(4); setStretchFactor(m_pListBox,1); setEnabled(bEnabled); @@ -434,7 +434,7 @@ void KviStringListSelector::selectionChanged() m_pRemoveButton->setEnabled(isEnabled() && bSomeSelected); } -void KviStringListSelector::textChanged(const QString &str) +void KviStringListSelector::textChanged(const TQString &str) { str.stripWhiteSpace(); m_pAddButton->setEnabled((str.length() > 0) && isEnabled()); @@ -445,7 +445,7 @@ void KviStringListSelector::setEnabled(bool bEnabled) KviTalVBox::setEnabled(bEnabled); m_pLineEdit->setEnabled(bEnabled); m_pLabel->setEnabled(bEnabled); - QString txt = m_pLineEdit->text(); + TQString txt = m_pLineEdit->text(); txt.stripWhiteSpace(); m_pAddButton->setEnabled(bEnabled && (txt.length() > 0)); unsigned int uCount = m_pListBox->count(); @@ -468,7 +468,7 @@ void KviStringListSelector::commit() m_pOption->clear(); for(unsigned int u=0;u<uCount;u++) { - QString str = m_pListBox->text(u); + TQString str = m_pListBox->text(u); str.stripWhiteSpace(); if(str.length() > 0)m_pOption->append(str); } @@ -476,7 +476,7 @@ void KviStringListSelector::commit() void KviStringListSelector::addClicked() { - QString str = m_pLineEdit->text(); + TQString str = m_pLineEdit->text(); str.stripWhiteSpace(); if(str.length() > 0)m_pListBox->insertItem(str); m_pLineEdit->setText(""); @@ -492,14 +492,14 @@ void KviStringListSelector::removeClicked() } -KviColorSelector::KviColorSelector(QWidget * par,const QString & txt,QColor * pOption,bool bEnabled) +KviColorSelector::KviColorSelector(TQWidget * par,const TQString & txt,TQColor * pOption,bool bEnabled) : KviTalHBox(par), KviSelectorInterface() { - m_pLabel = new QLabel(txt,this); + m_pLabel = new TQLabel(txt,this); - m_pButton = new QPushButton(" ",this); + m_pButton = new TQPushButton(" ",this); // m_pButton->setMinimumWidth(150); - connect(m_pButton,SIGNAL(clicked()),this,SLOT(changeClicked())); + connect(m_pButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(changeClicked())); setSpacing(4); setStretchFactor(m_pLabel,1); @@ -511,25 +511,25 @@ KviColorSelector::KviColorSelector(QWidget * par,const QString & txt,QColor * pO setEnabled(bEnabled); } -void KviColorSelector::setButtonPalette(QColor * pOption) +void KviColorSelector::setButtonPalette(TQColor * pOption) { - QPalette pal(*pOption,colorGroup().background()); + TQPalette pal(*pOption,tqcolorGroup().background()); m_memColor = *pOption; m_pButton->setPalette(pal); - QPixmap pix(16,16); + TQPixmap pix(16,16); pix.fill(*pOption); m_pButton->setIconSet(pix); } -void KviColorSelector::forceColor(QColor clr) +void KviColorSelector::forceColor(TQColor clr) { setButtonPalette(&clr); } void KviColorSelector::changeClicked() { - QColor tmp = QColorDialog::getColor(m_memColor); + TQColor tmp = TQColorDialog::getColor(m_memColor); if(tmp.isValid())setButtonPalette(&tmp); } @@ -546,14 +546,14 @@ void KviColorSelector::setEnabled(bool bEnabled) } -KviFontSelector::KviFontSelector(QWidget * par,const QString & txt,QFont * pOption,bool bEnabled) +KviFontSelector::KviFontSelector(TQWidget * par,const TQString & txt,TQFont * pOption,bool bEnabled) : KviTalHBox(par), KviSelectorInterface() { - m_pLabel = new QLabel(txt,this); + m_pLabel = new TQLabel(txt,this); - m_pButton = new QPushButton("",this); + m_pButton = new TQPushButton("",this); // m_pButton->setMinimumWidth(150); - connect(m_pButton,SIGNAL(clicked()),this,SLOT(changeClicked())); + connect(m_pButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(changeClicked())); setSpacing(4); setStretchFactor(m_pLabel,1); @@ -565,7 +565,7 @@ KviFontSelector::KviFontSelector(QWidget * par,const QString & txt,QFont * pOpti setEnabled(bEnabled); } -void KviFontSelector::setButtonFont(QFont * pOption) +void KviFontSelector::setButtonFont(TQFont * pOption) { m_pButton->setText(pOption->family()); m_pButton->setFont(*pOption); @@ -574,7 +574,7 @@ void KviFontSelector::setButtonFont(QFont * pOption) void KviFontSelector::changeClicked() { bool bOk; - QFont tmp = QFontDialog::getFont(&bOk,m_pButton->font()); + TQFont tmp = TQFontDialog::getFont(&bOk,m_pButton->font()); if(bOk)setButtonFont(&tmp); } @@ -594,14 +594,14 @@ void KviFontSelector::setEnabled(bool bEnabled) -KviMircTextColorSelector::KviMircTextColorSelector(QWidget * par,const QString &txt,unsigned int * uFore,unsigned int * uBack,bool bEnabled) +KviMircTextColorSelector::KviMircTextColorSelector(TQWidget * par,const TQString &txt,unsigned int * uFore,unsigned int * uBack,bool bEnabled) : KviTalHBox(par), KviSelectorInterface() { - m_pLabel = new QLabel(txt,this); + m_pLabel = new TQLabel(txt,this); - m_pButton = new QPushButton(__tr2qs("Sample Text"),this); + m_pButton = new TQPushButton(__tr2qs("Sample Text"),this); // m_pButton->setMinimumWidth(150); - connect(m_pButton,SIGNAL(clicked()),this,SLOT(buttonClicked())); + connect(m_pButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(buttonClicked())); setSpacing(4); setStretchFactor(m_pLabel,1); @@ -619,14 +619,14 @@ KviMircTextColorSelector::KviMircTextColorSelector(QWidget * par,const QString & m_pContextPopup = new KviTalPopupMenu(this); m_pForePopup = new KviTalPopupMenu(this); - connect(m_pForePopup,SIGNAL(activated(int)),this,SLOT(foreSelected(int))); + connect(m_pForePopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(foreSelected(int))); int i; for(i=0;i<KVI_MIRCCOLOR_MAX_FOREGROUND;i++) { - QPixmap tmp(120,16); + TQPixmap tmp(120,16); tmp.fill(KVI_OPTION_MIRCCOLOR(i)); #ifdef COMPILE_USE_QT4 - int id = m_pForePopup->insertItem(tmp,QString("x")); + int id = m_pForePopup->insertItem(tmp,TQString("x")); #else int id = m_pForePopup->insertItem(tmp); #endif @@ -635,15 +635,15 @@ KviMircTextColorSelector::KviMircTextColorSelector(QWidget * par,const QString & m_pContextPopup->insertItem(__tr2qs("Foreground"),m_pForePopup); m_pBackPopup = new KviTalPopupMenu(this); - connect(m_pBackPopup,SIGNAL(activated(int)),this,SLOT(backSelected(int))); + connect(m_pBackPopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(backSelected(int))); i = m_pBackPopup->insertItem(__tr2qs("Transparent")); m_pBackPopup->setItemParameter(i,KVI_TRANSPARENT); for(i=0;i<KVI_MIRCCOLOR_MAX_BACKGROUND;i++) { - QPixmap tmp(120,16); + TQPixmap tmp(120,16); tmp.fill(KVI_OPTION_MIRCCOLOR(i)); #ifdef COMPILE_USE_QT4 - int id = m_pForePopup->insertItem(tmp,QString("x")); + int id = m_pForePopup->insertItem(tmp,TQString("x")); #else int id = m_pBackPopup->insertItem(tmp); #endif @@ -671,27 +671,27 @@ void KviMircTextColorSelector::setEnabled(bool bEnabled) void KviMircTextColorSelector::setButtonPalette() { - QPalette pal; + TQPalette pal; if(m_uBack > KVI_MIRCCOLOR_MAX_BACKGROUND) { if(m_uBack != KVI_TRANSPARENT)m_uBack = KVI_TRANSPARENT; pal = palette(); } else { - pal = QPalette(KVI_OPTION_MIRCCOLOR(m_uBack)); + pal = TQPalette(KVI_OPTION_MIRCCOLOR(m_uBack)); } if(m_uFore > KVI_MIRCCOLOR_MAX_FOREGROUND)m_uFore = KVI_MIRCCOLOR_MAX_FOREGROUND; - pal.setColor(QColorGroup::ButtonText,KVI_OPTION_MIRCCOLOR(m_uFore)); - pal.setColor(QColorGroup::Text,KVI_OPTION_MIRCCOLOR(m_uFore)); + pal.setColor(TQColorGroup::ButtonText,KVI_OPTION_MIRCCOLOR(m_uFore)); + pal.setColor(TQColorGroup::Text,KVI_OPTION_MIRCCOLOR(m_uFore)); m_pButton->setPalette(pal); } void KviMircTextColorSelector::buttonClicked() { - QPoint p = m_pButton->mapToGlobal(QPoint(0,m_pButton->height())); + TQPoint p = m_pButton->mapToGlobal(TQPoint(0,m_pButton->height())); m_pContextPopup->popup(p); } @@ -709,11 +709,11 @@ void KviMircTextColorSelector::backSelected(int id) setButtonPalette(); } -KviSoundSelector::KviSoundSelector(QWidget * par,const QString & txt,QString * pOption,bool bEnabled) +KviSoundSelector::KviSoundSelector(TQWidget * par,const TQString & txt,TQString * pOption,bool bEnabled) :KviFileSelector(par,txt,pOption,bEnabled) { - m_pPlayButton = new QPushButton(__tr2qs("Play"),this); - connect(m_pPlayButton,SIGNAL(clicked()),this,SLOT(playSound())); + m_pPlayButton = new TQPushButton(__tr2qs("Play"),this); + connect(m_pPlayButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(playSound())); } KviSoundSelector::~KviSoundSelector() @@ -731,49 +731,49 @@ void KviSoundSelector::setEnabled(bool bEnabled) m_pPlayButton->setEnabled(bEnabled); } -KviChanListViewItem::KviChanListViewItem(KviTalListView* pList,QString szChan,QString szPass) +KviChanListViewItem::KviChanListViewItem(KviTalListView* pList,TQString szChan,TQString szPass) :KviTalListViewItem(pList,szChan) { m_szPass=szPass; - QString mask; - mask.fill('*',szPass.length()); - setText(1,mask); + TQString tqmask; + tqmask.fill('*',szPass.length()); + setText(1,tqmask); } -KviCahnnelListSelector::KviCahnnelListSelector(QWidget * par,const QString & txt,QStringList * pOption,bool bEnabled) +KviCahnnelListSelector::KviCahnnelListSelector(TQWidget * par,const TQString & txt,TQStringList * pOption,bool bEnabled) : KviTalVBox(par), KviSelectorInterface() { - m_pLabel = new QLabel(txt,this); + m_pLabel = new TQLabel(txt,this); m_pListView = new KviTalListView(this); m_pListView->addColumn(__tr2qs("Channel name")); m_pListView->addColumn(__tr2qs("Channel password")); KviTalHBox* pEditsHBox = new KviTalHBox(this); - m_pChanLineEdit = new QLineEdit(pEditsHBox); - connect(m_pChanLineEdit,SIGNAL(textChanged(const QString &)),this,SLOT(textChanged(const QString &))); - connect(m_pChanLineEdit,SIGNAL(returnPressed()),this,SLOT(addClicked())); + m_pChanLineEdit = new TQLineEdit(pEditsHBox); + connect(m_pChanLineEdit,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(textChanged(const TQString &))); + connect(m_pChanLineEdit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(addClicked())); - m_pPassLineEdit = new QLineEdit(pEditsHBox); - m_pPassLineEdit->setEchoMode(QLineEdit::Password); - connect(m_pPassLineEdit,SIGNAL(textChanged(const QString &)),this,SLOT(textChanged(const QString &))); - connect(m_pPassLineEdit,SIGNAL(returnPressed()),this,SLOT(addClicked())); + m_pPassLineEdit = new TQLineEdit(pEditsHBox); + m_pPassLineEdit->setEchoMode(TQLineEdit::Password); + connect(m_pPassLineEdit,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(textChanged(const TQString &))); + connect(m_pPassLineEdit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(addClicked())); KviTalHBox * hBox = new KviTalHBox(this); - m_pAddButton = new QPushButton(__tr2qs("A&dd"),hBox); - connect(m_pAddButton,SIGNAL(clicked()),this,SLOT(addClicked())); - m_pRemoveButton = new QPushButton(__tr2qs("Re&move"),hBox); - connect(m_pRemoveButton,SIGNAL(clicked()),this,SLOT(removeClicked())); + m_pAddButton = new TQPushButton(__tr2qs("A&dd"),hBox); + connect(m_pAddButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked())); + m_pRemoveButton = new TQPushButton(__tr2qs("Re&move"),hBox); + connect(m_pRemoveButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeClicked())); m_pOption = pOption; - for ( QStringList::Iterator it = pOption->begin(); it != pOption->end(); ++it ) { + for ( TQStringList::Iterator it = pOption->begin(); it != pOption->end(); ++it ) { new KviChanListViewItem(m_pListView,(*it).section(':',0,0),(*it).section(':',1)); } m_pListView->setSelectionMode(KviTalListView::Extended); m_pListView->setAllColumnsShowFocus(TRUE); - connect(m_pListView,SIGNAL(selectionChanged()),this,SLOT(selectionChanged())); + connect(m_pListView,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(selectionChanged())); setSpacing(4); setStretchFactor(m_pListView,1); setEnabled(bEnabled); @@ -805,7 +805,7 @@ void KviCahnnelListSelector::setEnabled(bool bEnabled) m_pRemoveButton->setEnabled(bEnabled); } -void KviCahnnelListSelector::textChanged(const QString &str) +void KviCahnnelListSelector::textChanged(const TQString &str) { m_pAddButton->setEnabled(!m_pChanLineEdit->text().isEmpty()); } diff --git a/src/kvirc/ui/kvi_selectors.h b/src/kvirc/ui/kvi_selectors.h index 3e62012..ad37ed5 100644 --- a/src/kvirc/ui/kvi_selectors.h +++ b/src/kvirc/ui/kvi_selectors.h @@ -28,27 +28,27 @@ #include "kvi_settings.h" -#include <qcheckbox.h> +#include <tqcheckbox.h> #include "kvi_tal_hbox.h" #include "kvi_tal_vbox.h" -#include <qlineedit.h> -#include <qlabel.h> +#include <tqlineedit.h> +#include <tqlabel.h> #include "kvi_tal_scrollview.h" -#include <qpushbutton.h> -#include <qcolor.h> -#include <qfont.h> +#include <tqpushbutton.h> +#include <tqcolor.h> +#include <tqfont.h> #include "kvi_tal_listbox.h" #include "kvi_tal_listview.h" -#include <qspinbox.h> -#include <qstringlist.h> -#include <qvalidator.h> +#include <tqspinbox.h> +#include <tqstringlist.h> +#include <tqvalidator.h> #include "kvi_string.h" #include "kvi_pixmap.h" #include "kvi_styled_controls.h" //#ifndef _KVI_SELECTORS_CPP_ -// extern void commitAllSelectors(QWidget * par,const char * classname); +// extern void commitAllSelectors(TQWidget * par,const char * classname); //#endif @@ -57,7 +57,7 @@ // // Note: I'm always learning // Today I have discovered that: -// QObject * o = new KviBoolSelector(...) +// TQObject * o = new KviBoolSelector(...) // ((KviSelectorInterface *)o)->commit() // Does not work (SIGSEGV when jumping into commit(): bad vtable entry) // But the following works fine: @@ -80,8 +80,9 @@ public: class KVIRC_API KviBoolSelector : public KviStyledCheckBox, public KviSelectorInterface { Q_OBJECT + TQ_OBJECT public: - KviBoolSelector(QWidget * par,const QString & txt,bool *pOption,bool bEnabled); + KviBoolSelector(TQWidget * par,const TQString & txt,bool *pOption,bool bEnabled); ~KviBoolSelector(){}; private: bool * m_pOption; @@ -94,56 +95,60 @@ public slots: class KVIRC_API KviStringSelector : public KviTalHBox, public KviSelectorInterface { Q_OBJECT + TQ_OBJECT public: - KviStringSelector(QWidget * par,const QString & txt,QString * pOption,bool bEnabled); + KviStringSelector(TQWidget * par,const TQString & txt,TQString * pOption,bool bEnabled); ~KviStringSelector(); protected: - QLabel * m_pLabel; - QLineEdit * m_pLineEdit; - QString * m_pOption; + TQLabel * m_pLabel; + TQLineEdit * m_pLineEdit; + TQString * m_pOption; public: - void setValidator(QValidator * v){ m_pLineEdit->setValidator(v); }; + void setValidator(TQValidator * v){ m_pLineEdit->setValidator(v); }; void setMinimumLabelWidth(unsigned int uWidth){ m_pLabel->setMinimumWidth(uWidth); }; virtual void commit(); virtual void setEnabled(bool bEnabled); - void setText(const QString& text); + void setText(const TQString& text); }; class KVIRC_API KviPasswordSelector : public KviStringSelector { Q_OBJECT + TQ_OBJECT public: - KviPasswordSelector(QWidget * par,const QString & txt,QString * pOption,bool bEnabled); + KviPasswordSelector(TQWidget * par,const TQString & txt,TQString * pOption,bool bEnabled); ~KviPasswordSelector(){}; }; class KVIRC_API KviPixmapPreview : public KviTalScrollView { Q_OBJECT + TQ_OBJECT public: - KviPixmapPreview(QWidget * par); + KviPixmapPreview(TQWidget * par); ~KviPixmapPreview(); protected: KviPixmap * m_pPixmap; public: void setPixmap(KviPixmap * pix); protected: - virtual void drawContents(QPainter * p, int clipx, int clipy, int clipw, int cliph); + virtual void drawContents(TQPainter * p, int clipx, int clipy, int clipw, int cliph); }; -class KVIRC_API KviPixmapSelector : public QWidget, public KviSelectorInterface +class KVIRC_API KviPixmapSelector : public TQWidget, public KviSelectorInterface { Q_OBJECT + TQ_OBJECT public: - KviPixmapSelector(QWidget * par,const QString & txt,KviPixmap * pOption,bool bEnabled); + KviPixmapSelector(TQWidget * par,const TQString & txt,KviPixmap * pOption,bool bEnabled); ~KviPixmapSelector(); private: KviStyledCheckBox * m_pCheckBox; - QLabel * m_pFileNameLabel; + TQLabel * m_pFileNameLabel; KviPixmapPreview * m_pPreview; - QPushButton * m_pChooseButton; + TQPushButton * m_pChooseButton; KviPixmap * m_pOption; KviPixmap m_localPixmap; public: @@ -158,21 +163,22 @@ protected slots: class KVIRC_API KviUIntSelector : public KviTalHBox, public KviSelectorInterface { Q_OBJECT + TQ_OBJECT public: - KviUIntSelector(QWidget * par,const QString & txt,unsigned int *pOption, + KviUIntSelector(TQWidget * par,const TQString & txt,unsigned int *pOption, unsigned int uLowBound,unsigned int uHighBound,unsigned int uDefault,bool bEnabled,bool bShortInt = false); ~KviUIntSelector(){}; private: - QLabel * m_pLabel; - QSpinBox * m_pSpinBox; + TQLabel * m_pLabel; + TQSpinBox * m_pSpinBox; unsigned int * m_pOption; unsigned int m_uLowBound; unsigned int m_uHighBound; unsigned int m_uDefault; bool m_bIsShortInt; public: - virtual void setPrefix(const QString & txt); - virtual void setSuffix(const QString & txt); + virtual void setPrefix(const TQString & txt); + virtual void setSuffix(const TQString & txt); virtual void commit(); virtual void setEnabled(bool bEnabled); }; @@ -181,8 +187,9 @@ public: class KVIRC_API KviFileSelector : public KviTalHBox, public KviSelectorInterface { Q_OBJECT + TQ_OBJECT public: - KviFileSelector(QWidget * par,const QString & txt,QString * pOption,bool bEnabled,unsigned int uFlags = 0,const QString &szFilter = QString::null); + KviFileSelector(TQWidget * par,const TQString & txt,TQString * pOption,bool bEnabled,unsigned int uFlags = 0,const TQString &szFilter = TQString()); ~KviFileSelector(){}; public: enum Flags { @@ -190,18 +197,18 @@ public: DontConfirmOverwrite = 2 }; protected: - QLabel * m_pLabel; - QLineEdit * m_pLineEdit; - QPushButton * m_pButton; - QString * m_pOption; + TQLabel * m_pLabel; + TQLineEdit * m_pLineEdit; + TQPushButton * m_pButton; + TQString * m_pOption; unsigned int m_uFlags; - QString m_szFilter; + TQString m_szFilter; public: virtual void commit(); virtual void setEnabled(bool bEnabled); - void setSelection(const QString &szSelection); + void setSelection(const TQString &szSelection); signals: - void selectionChanged(const QString &szNewValue); + void selectionChanged(const TQString &szNewValue); private slots: void browseClicked(); protected: @@ -211,8 +218,9 @@ protected: class KVIRC_API KviDirectorySelector : public KviFileSelector { Q_OBJECT + TQ_OBJECT public: - KviDirectorySelector(QWidget * par,const QString & txt,QString * pOption,bool bEnabled); + KviDirectorySelector(TQWidget * par,const TQString & txt,TQString * pOption,bool bEnabled); ~KviDirectorySelector(){}; protected: virtual void select(); @@ -222,21 +230,22 @@ protected: class KVIRC_API KviColorSelector : public KviTalHBox, public KviSelectorInterface { Q_OBJECT + TQ_OBJECT public: - KviColorSelector(QWidget * par,const QString & txt,QColor * pOption,bool bEnabled); + KviColorSelector(TQWidget * par,const TQString & txt,TQColor * pOption,bool bEnabled); ~KviColorSelector(){}; private: - QLabel * m_pLabel; - QColor * m_pOption; - QColor m_memColor; - QPushButton * m_pButton; + TQLabel * m_pLabel; + TQColor * m_pOption; + TQColor m_memColor; + TQPushButton * m_pButton; public: virtual void commit(); virtual void setEnabled(bool bEnabled); - QColor getColor(){ return m_memColor; }; - void forceColor(QColor clr); + TQColor getColor(){ return m_memColor; }; + void forceColor(TQColor clr); private: - void setButtonPalette(QColor * pOption); + void setButtonPalette(TQColor * pOption); private slots: void changeClicked(); }; @@ -244,18 +253,19 @@ private slots: class KVIRC_API KviFontSelector : public KviTalHBox, public KviSelectorInterface { Q_OBJECT + TQ_OBJECT public: - KviFontSelector(QWidget * par,const QString & txt,QFont * pOption,bool bEnabled); + KviFontSelector(TQWidget * par,const TQString & txt,TQFont * pOption,bool bEnabled); ~KviFontSelector(){}; private: - QLabel * m_pLabel; - QFont * m_pOption; - QPushButton * m_pButton; + TQLabel * m_pLabel; + TQFont * m_pOption; + TQPushButton * m_pButton; public: virtual void commit(); virtual void setEnabled(bool bEnabled); private: - void setButtonFont(QFont * pOption); + void setButtonFont(TQFont * pOption); private slots: void changeClicked(); }; @@ -263,21 +273,22 @@ private slots: class KVIRC_API KviStringListSelector : public KviTalVBox, public KviSelectorInterface { Q_OBJECT + TQ_OBJECT public: - KviStringListSelector(QWidget * par,const QString & txt,QStringList * pOption,bool bEnabled); + KviStringListSelector(TQWidget * par,const TQString & txt,TQStringList * pOption,bool bEnabled); ~KviStringListSelector(); private: - QLabel * m_pLabel; + TQLabel * m_pLabel; KviTalListBox * m_pListBox; - QLineEdit * m_pLineEdit; - QPushButton * m_pAddButton; - QPushButton * m_pRemoveButton; - QStringList * m_pOption; + TQLineEdit * m_pLineEdit; + TQPushButton * m_pAddButton; + TQPushButton * m_pRemoveButton; + TQStringList * m_pOption; public: virtual void commit(); virtual void setEnabled(bool bEnabled); private slots: - void textChanged(const QString &str); + void textChanged(const TQString &str); void selectionChanged(); void addClicked(); void removeClicked(); @@ -288,12 +299,13 @@ class KviTalPopupMenu; class KVIRC_API KviMircTextColorSelector : public KviTalHBox, public KviSelectorInterface { Q_OBJECT + TQ_OBJECT public: - KviMircTextColorSelector(QWidget * par,const QString &txt,unsigned int * uFore,unsigned int * uBack,bool bEnabled); + KviMircTextColorSelector(TQWidget * par,const TQString &txt,unsigned int * uFore,unsigned int * uBack,bool bEnabled); ~KviMircTextColorSelector(); private: - QLabel *m_pLabel; - QPushButton * m_pButton; + TQLabel *m_pLabel; + TQPushButton * m_pButton; unsigned int * m_pUFore; unsigned int * m_pUBack; unsigned int m_uFore; @@ -316,11 +328,12 @@ protected: class KVIRC_API KviSoundSelector : public KviFileSelector { Q_OBJECT + TQ_OBJECT public: - KviSoundSelector(QWidget * par,const QString & txt,QString * pOption,bool bEnabled); + KviSoundSelector(TQWidget * par,const TQString & txt,TQString * pOption,bool bEnabled); ~KviSoundSelector(); protected: - QPushButton *m_pPlayButton; + TQPushButton *m_pPlayButton; private slots: void playSound(); public: @@ -330,33 +343,34 @@ public: class KVIRC_API KviChanListViewItem : public KviTalListViewItem { private: - QString m_szPass; + TQString m_szPass; public: - KviChanListViewItem(KviTalListView* pList,QString szChan,QString szPass); + KviChanListViewItem(KviTalListView* pList,TQString szChan,TQString szPass); ~KviChanListViewItem() {}; - const QString& pass() { return m_szPass; } + const TQString& pass() { return m_szPass; } }; class KVIRC_API KviCahnnelListSelector : public KviTalVBox, public KviSelectorInterface { Q_OBJECT + TQ_OBJECT public: - KviCahnnelListSelector(QWidget * par,const QString & txt,QStringList * pOption,bool bEnabled); + KviCahnnelListSelector(TQWidget * par,const TQString & txt,TQStringList * pOption,bool bEnabled); ~KviCahnnelListSelector(); private: - QLabel * m_pLabel; + TQLabel * m_pLabel; KviTalListView * m_pListView; - QLineEdit * m_pChanLineEdit; - QLineEdit * m_pPassLineEdit; - QPushButton * m_pAddButton; - QPushButton * m_pRemoveButton; - QStringList * m_pOption; + TQLineEdit * m_pChanLineEdit; + TQLineEdit * m_pPassLineEdit; + TQPushButton * m_pAddButton; + TQPushButton * m_pRemoveButton; + TQStringList * m_pOption; public: virtual void commit(); virtual void setEnabled(bool bEnabled); private slots: - void textChanged(const QString &str); + void textChanged(const TQString &str); void selectionChanged(); void addClicked(); void removeClicked(); diff --git a/src/kvirc/ui/kvi_splash.cpp b/src/kvirc/ui/kvi_splash.cpp index 7b6b717..d91be01 100644 --- a/src/kvirc/ui/kvi_splash.cpp +++ b/src/kvirc/ui/kvi_splash.cpp @@ -29,38 +29,38 @@ #include "kvi_splash.h" #include "kvi_locale.h" #include "kvi_fileutils.h" -#include <qsplashscreen.h> +#include <tqsplashscreen.h> #ifdef COMPILE_USE_QT4 - #include <qdesktopwidget.h> + #include <tqdesktopwidget.h> #endif -#include <qpixmap.h> -#include <qpainter.h> -#include <qlayout.h> +#include <tqpixmap.h> +#include <tqpainter.h> +#include <tqlayout.h> #include <stdio.h> KviSplashScreen::KviSplashScreen() -: QSplashScreen(QPixmap(1,1),Qt::WStyle_NoBorder | Qt::WType_TopLevel | Qt::WStyle_Customize | Qt::WStyle_StaysOnTop | Qt::WStyle_Splash) +: TQSplashScreen(TQPixmap(1,1),TQt::WStyle_NoBorder | TQt::WType_TopLevel | TQt::WStyle_Customize | TQt::WStyle_StaysOnTop | TQt::WStyle_Splash) { - QString szPix; - QPixmap * pix = 0; + TQString szPix; + TQPixmap * pix = 0; // check for the current theme splash screen pointer - QString szPointerFile; + TQString szPointerFile; g_pApp->getLocalKvircDirectory(szPointerFile,KviApp::Themes,"current-splash"); if(KviFileUtils::fileExists(szPointerFile)) { - QString szBuf; + TQString szBuf; KviFileUtils::readFile(szPointerFile,szBuf); if(!szBuf.isEmpty()) { g_pApp->getLocalKvircDirectory(szPix,KviApp::Themes,szBuf); - KviQString::ensureLastCharIs(szPix,KVI_PATH_SEPARATOR_CHAR); + KviTQString::ensureLastCharIs(szPix,KVI_PATH_SEPARATOR_CHAR); szPix.append("kvi_splash.png"); - pix = new QPixmap(szPix); + pix = new TQPixmap(szPix); if(pix->isNull()) { // no way.. @@ -69,9 +69,9 @@ KviSplashScreen::KviSplashScreen() } else { // else we might have a themed splash screen // g_pApp->getLocalKvircDirectory(szPix,KviApp::Themes,szBuf); - KviQString::ensureLastCharIs(szPix,KVI_PATH_SEPARATOR_CHAR); + KviTQString::ensureLastCharIs(szPix,KVI_PATH_SEPARATOR_CHAR); szPix.append("kvi_splash_overlay.png"); - m_pOverlay = new QPixmap(szPix); + m_pOverlay = new TQPixmap(szPix); if(m_pOverlay->isNull()) { // no way.. @@ -88,39 +88,39 @@ KviSplashScreen::KviSplashScreen() { if(g_pApp->findImage(szPix,"kvi_splash.png")) { - pix = new QPixmap(szPix); + pix = new TQPixmap(szPix); } else { // dummy image - pix = new QPixmap(300,200); + pix = new TQPixmap(300,200); } if(g_pApp->findImage(szPix,"kvi_splash_overlay.png")) { - m_pOverlay = new QPixmap(szPix); + m_pOverlay = new TQPixmap(szPix); } else { - m_pOverlay = new QPixmap(300,20); + m_pOverlay = new TQPixmap(300,20); } } setPixmap(*pix); - m_pTimer = new QTimer(this); - connect(m_pTimer,SIGNAL(timeout()),this,SLOT(suicide())); + m_pTimer = new TQTimer(this); + connect(m_pTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(suicide())); delete pix; #ifdef COMPILE_USE_QT4 setWindowOpacity(0); m_bIncreasing=true; m_rTransparency=0; - m_pFadeTimer= new QTimer(this); - connect(m_pFadeTimer,SIGNAL(timeout()),this,SLOT(fadeTimerShot())); + m_pFadeTimer= new TQTimer(this); + connect(m_pFadeTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(fadeTimerShot())); m_pFadeTimer->start(6); #endif } // We don't need messages on the splash: they just add work to the translators and nobody can read them anyway :D -//void KviSplashScreen::message(QString szMessage) +//void KviSplashScreen::message(TQString szMessage) //{ - //QSplashScreen::message(szMessage, Qt::AlignRight | Qt::AlignBottom, Qt::white); + //TQSplashScreen::message(szMessage, TQt::AlignRight | TQt::AlignBottom, TQt::white); //} KviSplashScreen::~KviSplashScreen() @@ -131,14 +131,14 @@ KviSplashScreen::~KviSplashScreen() } -void KviSplashScreen::showEvent(QShowEvent *e) +void KviSplashScreen::showEvent(TQShowEvent *e) { move((g_pApp->desktop()->width() - width())/2, (g_pApp->desktop()->height() - height())/2); - m_creationTime = QTime::currentTime(); + m_creationTime = TQTime::currentTime(); } -void KviSplashScreen::hideEvent(QHideEvent *e) +void KviSplashScreen::hideEvent(TQHideEvent *e) { suicide(); } @@ -146,21 +146,21 @@ void KviSplashScreen::hideEvent(QHideEvent *e) void KviSplashScreen::setProgress(int progress) { #ifdef COMPILE_USE_QT4 - QPixmap slowQt4Copy = pixmap(); - QPainter painter(&slowQt4Copy); - QSize size = slowQt4Copy.size(); + TQPixmap slowTQt4Copy = pixmap(); + TQPainter painter(&slowTQt4Copy); + TQSize size = slowTQt4Copy.size(); int w = (m_pOverlay->width() * progress) / 100; painter.drawPixmap(0,size.height() - m_pOverlay->height(),w,m_pOverlay->height(),*m_pOverlay,0,0,w,m_pOverlay->height()); painter.end(); - setPixmap(slowQt4Copy); + setPixmap(slowTQt4Copy); #else - QPainter painter(pixmap()); - QSize size = pixmap()->size(); + TQPainter painter(pixmap()); + TQSize size = pixmap()->size(); painter.drawPixmap(0,size.height() - m_pOverlay->height(),*m_pOverlay,0,0,(m_pOverlay->width() * progress) / 100,m_pOverlay->height()); painter.end(); #endif //raise(); - repaint(); + tqrepaint(); g_pApp->processEvents(); //damn... } @@ -172,7 +172,7 @@ void KviSplashScreen::die() m_bIncreasing = false; m_pFadeTimer->start(6); #else - QTime now = QTime::currentTime(); + TQTime now = TQTime::currentTime(); int mSecs = m_creationTime.msecsTo(now); int mRemaining = KVI_SPLASH_SCREEN_MINIMUM_TIMEOUT_IN_MSECS - mSecs; if(mRemaining < 0)mRemaining = 0; diff --git a/src/kvirc/ui/kvi_splash.h b/src/kvirc/ui/kvi_splash.h index 83cfb73..a89e8e9 100644 --- a/src/kvirc/ui/kvi_splash.h +++ b/src/kvirc/ui/kvi_splash.h @@ -27,37 +27,38 @@ #include "kvi_settings.h" -#include <qframe.h> +#include <tqframe.h> -#include <qprogressbar.h> -#include <qlabel.h> -#include <qtimer.h> -#include <qdatetime.h> -#include <qsplashscreen.h> -#include <qpixmap.h> +#include <tqprogressbar.h> +#include <tqlabel.h> +#include <tqtimer.h> +#include <tqdatetime.h> +#include <tqsplashscreen.h> +#include <tqpixmap.h> -class KVIRC_API KviSplashScreen : public QSplashScreen +class KVIRC_API KviSplashScreen : public TQSplashScreen { Q_OBJECT + TQ_OBJECT public: KviSplashScreen(); virtual ~KviSplashScreen(); private: - QTimer * m_pTimer; - QTime m_creationTime; - QPixmap * m_pOverlay; + TQTimer * m_pTimer; + TQTime m_creationTime; + TQPixmap * m_pOverlay; #ifdef COMPILE_USE_QT4 bool m_bIncreasing; qreal m_rTransparency; - QTimer * m_pFadeTimer; + TQTimer * m_pFadeTimer; #endif protected: - virtual void showEvent(QShowEvent * e); - virtual void hideEvent(QHideEvent * e); + virtual void showEvent(TQShowEvent * e); + virtual void hideEvent(TQHideEvent * e); public: void setProgress(int progress); void die(); - //void message(QString); + //void message(TQString); protected slots: void suicide(); void fadeTimerShot(); diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp index df20a22..6aad95b 100644 --- a/src/kvirc/ui/kvi_statusbar.cpp +++ b/src/kvirc/ui/kvi_statusbar.cpp @@ -27,7 +27,7 @@ #include "kvi_statusbar.h" #include "kvi_frame.h" -#include <qlabel.h> +#include <tqlabel.h> #include "kvi_iconmanager.h" #include "kvi_window.h" @@ -41,16 +41,16 @@ #include "kvi_statusbarapplet.h" #include "kvi_dynamictooltip.h" -#include <qpainter.h> -#include <qstyle.h> -#include <qlayout.h> -#include <qtimer.h> -#include <qcursor.h> +#include <tqpainter.h> +#include <tqstyle.h> +#include <tqlayout.h> +#include <tqtimer.h> +#include <tqcursor.h> #include "kvi_tal_popupmenu.h" -#include <qpixmap.h> +#include <tqpixmap.h> #ifdef COMPILE_USE_QT4 - #include <qevent.h> + #include <tqevent.h> #endif // This class COULD be derived also from KStatusBar but in fact @@ -61,7 +61,7 @@ #include "kvi_time.h" #include "kvi_qstring.h" -#include <qfont.h> +#include <tqfont.h> /* IDEAS: @@ -73,7 +73,7 @@ KviStatusBar::KviStatusBar(KviFrame * pFrame) -: QStatusBar(pFrame) +: TQStatusBar(pFrame) { setProperty("name","statusbar"); @@ -86,7 +86,7 @@ KviStatusBar::KviStatusBar(KviFrame * pFrame) m_pClickedApplet = 0; - m_pAppletDescriptors = new KviPointerHashTable<QString,KviStatusBarAppletDescriptor>; + m_pAppletDescriptors = new KviPointerHashTable<TQString,KviStatusBarAppletDescriptor>; m_pAppletDescriptors->setAutoDelete(true); KviStatusBarClock::selfRegister(this); @@ -103,28 +103,28 @@ KviStatusBar::KviStatusBar(KviFrame * pFrame) m_pMessageTimer = 0; - m_pMessageLabel = new QLabel("<b>[x]</b> x",this,"msgstatuslabel"); + m_pMessageLabel = new TQLabel("<b>[x]</b> x",this,"msgstatuslabel"); m_pMessageLabel->setMargin(1); #ifdef COMPILE_USE_QT4 - m_pMessageLabel->setAlignment(Qt::AlignVCenter | Qt::AlignLeft); + m_pMessageLabel->tqsetAlignment(TQt::AlignVCenter | TQt::AlignLeft); #else - m_pMessageLabel->setAlignment(SingleLine | Qt::AlignVCenter | Qt::AlignLeft); + m_pMessageLabel->tqsetAlignment(SingleLine | TQt::AlignVCenter | TQt::AlignLeft); #endif m_pMessageLabel->setMinimumWidth(350); m_iLastMinimumHeight = 0; m_bStopLayoutOnAddRemove = true; - connect(m_pFrame,SIGNAL(activeContextChanged()),this,SLOT(setPermanentMessage())); - connect(m_pFrame,SIGNAL(activeContextStateChanged()),this,SLOT(setPermanentMessage())); - connect(m_pFrame,SIGNAL(activeConnectionUserModeChanged()),this,SLOT(setPermanentMessage())); - connect(m_pFrame,SIGNAL(activeConnectionNickNameChanged()),this,SLOT(setPermanentMessage())); + connect(m_pFrame,TQT_SIGNAL(activeContextChanged()),this,TQT_SLOT(setPermanentMessage())); + connect(m_pFrame,TQT_SIGNAL(activeContextStateChanged()),this,TQT_SLOT(setPermanentMessage())); + connect(m_pFrame,TQT_SIGNAL(activeConnectionUserModeChanged()),this,TQT_SLOT(setPermanentMessage())); + connect(m_pFrame,TQT_SIGNAL(activeConnectionNickNameChanged()),this,TQT_SLOT(setPermanentMessage())); setPermanentMessage(); m_bStopLayoutOnAddRemove = false; m_pToolTip = new KviDynamicToolTip(this); - connect(m_pToolTip,SIGNAL(tipRequest(KviDynamicToolTip *,const QPoint &)),this,SLOT(tipRequest(KviDynamicToolTip *,const QPoint &))); + connect(m_pToolTip,TQT_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQT_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); updateLayout(); } @@ -154,11 +154,11 @@ void KviStatusBar::load() { KviStr prefix(KviStr::Format,"Applet%d",i); KviStr tmp(KviStr::Format,"%s_InternalName",prefix.ptr()); - QString szInternalName = cfg.readEntry(tmp.ptr(),""); + TQString szInternalName = cfg.readEntry(tmp.ptr(),""); if(!szInternalName.isEmpty()) { tmp.sprintf("%s_PreloadModule",prefix.ptr()); - QString szPreloadModule = cfg.readEntry(tmp.ptr(),""); + TQString szPreloadModule = cfg.readEntry(tmp.ptr(),""); if(!szPreloadModule.isEmpty()) g_pModuleManager->getModule(szPreloadModule.utf8().data()); @@ -204,13 +204,13 @@ void KviStatusBar::save() #define SPACING 3 #define RICHTEXTLABELTRICK 2 -void KviStatusBar::layoutChildren() +void KviStatusBar::tqlayoutChildren() { int x = width() - HMARGIN; int h = height() - (VMARGIN * 2); for(KviStatusBarApplet * a = m_pAppletList->last();a;a = m_pAppletList->prev()) { - int w = a->sizeHint().width(); + int w = a->tqsizeHint().width(); x -= w; a->setGeometry(x,VMARGIN,w,h); x -= SPACING; @@ -219,29 +219,29 @@ void KviStatusBar::layoutChildren() m_pMessageLabel->setGeometry(HMARGIN,VMARGIN,x - HMARGIN,h - RICHTEXTLABELTRICK); } -void KviStatusBar::resizeEvent(QResizeEvent * e) +void KviStatusBar::resizeEvent(TQResizeEvent * e) { - layoutChildren(); + tqlayoutChildren(); } -bool KviStatusBar::event(QEvent * e) +bool KviStatusBar::event(TQEvent * e) { - if(e->type() == QEvent::LayoutHint) + if(e->type() == TQEvent::LayoutHint) { updateLayout(); - return false; // send to parents too! + return false; // send to tqparents too! } - return QStatusBar::event(e); + return TQStatusBar::event(e); } void KviStatusBar::recalcMinimumHeight() { int s = 18; - int h = m_pMessageLabel->sizeHint().height(); + int h = m_pMessageLabel->tqsizeHint().height(); if(h > s)s = h; for(KviStatusBarApplet * a = m_pAppletList->last();a;a = m_pAppletList->prev()) { - h = a->sizeHint().height(); + h = a->tqsizeHint().height(); if(h > s)s = h; } s += (VMARGIN * 2) + RICHTEXTLABELTRICK; @@ -249,22 +249,22 @@ void KviStatusBar::recalcMinimumHeight() { m_iLastMinimumHeight = s; setMinimumHeight(s); - QLayout * l = layout(); + TQLayout * l = tqlayout(); if(l) - if(l->inherits("QBoxLayout")) - ((QBoxLayout *)l)->addStrut(s); - // FIXME: do QMainWindow need setUpLayout() here ? + if(l->inherits(TQBOXLAYOUT_OBJECT_NAME_STRING)) + ((TQBoxLayout *)l)->addStrut(s); + // FIXME: do TQMainWindow need setUpLayout() here ? } } bool KviStatusBar::appletExists(KviStatusBarApplet * pApplet) { - return (m_pAppletList->findRef(pApplet) != -1); + return (m_pAppletList->tqfindRef(pApplet) != -1); } -KviStatusBarApplet * KviStatusBar::appletAt(const QPoint &pnt,bool bBestMatch) +KviStatusBarApplet * KviStatusBar::appletAt(const TQPoint &pnt,bool bBestMatch) { - QPoint local = mapFromGlobal(pnt); + TQPoint local = mapFromGlobal(pnt); if(bBestMatch) { for(KviStatusBarApplet * a = m_pAppletList->first();a;a = m_pAppletList->next()) @@ -287,16 +287,16 @@ KviStatusBarApplet * KviStatusBar::appletAt(const QPoint &pnt,bool bBestMatch) return 0; } -void KviStatusBar::tipRequest(KviDynamicToolTip *pTip,const QPoint &pnt) +void KviStatusBar::tipRequest(KviDynamicToolTip *pTip,const TQPoint &pnt) { KviStatusBarApplet * a = appletAt(mapToGlobal(pnt)); - QString szTip; - QRect r; + TQString szTip; + TQRect r; if(a) { szTip = "<table width=\"100%\"><tr><td bgcolor=\"#303030\" align=\"center\"><font color=\"#ffffff\"><b>" + a->descriptor()->visibleName() + "</b></font></td></tr>"; - QString szTipx = a->tipText(a->mapFromGlobal(mapToGlobal(pnt))); + TQString szTipx = a->tipText(a->mapFromGlobal(mapToGlobal(pnt))); if(!szTipx.isEmpty()) { szTip += "<tr><td>"; @@ -307,12 +307,12 @@ void KviStatusBar::tipRequest(KviDynamicToolTip *pTip,const QPoint &pnt) szTip += "<tr><td align=\"center\"><font color=\"#808080\" size=\"-1\">"; szTip += __tr2qs("<b>Shift+Drag</b> or <b>Ctrl+Drag</b> to move the applet around<br><b>Right click</b> to see the other options"); szTip += "</font></td></tr></table>"; - r = QRect(a->x(),a->y(),a->width(),a->height()); + r = TQRect(a->x(),a->y(),a->width(),a->height()); } else { szTip = "<center>"; szTip += __tr2qs("<b>Right click</b> to add/remove applets"); szTip += "</center>"; - r = QRect(m_pMessageLabel->x(),m_pMessageLabel->y(),m_pMessageLabel->width(),m_pMessageLabel->height()); + r = TQRect(m_pMessageLabel->x(),m_pMessageLabel->y(),m_pMessageLabel->width(),m_pMessageLabel->height()); } pTip->tip(r,szTip); } @@ -322,9 +322,9 @@ KviTalPopupMenu * KviStatusBar::contextPopup() if(!m_pContextPopup) { m_pContextPopup = new KviTalPopupMenu(this); - connect(m_pContextPopup,SIGNAL(aboutToShow()),this,SLOT(contextPopupAboutToShow())); + connect(m_pContextPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(contextPopupAboutToShow())); } - m_pClickedApplet = appletAt(QCursor::pos()); + m_pClickedApplet = appletAt(TQCursor::pos()); return m_pContextPopup; } @@ -336,30 +336,30 @@ void KviStatusBar::contextPopupAboutToShow() if(appletExists(m_pClickedApplet)) { - QString app = m_pClickedApplet->descriptor()->visibleName(); + TQString app = m_pClickedApplet->descriptor()->visibleName(); - QString tmp; - KviQString::sprintf(tmp,"<center><b>%Q</b></center>",&app); + TQString tmp; + KviTQString::sprintf(tmp,"<center><b>%Q</b></center>",&app); #ifndef COMPILE_USE_QT4 - // FIXME: This is not supported under Qt4.. :( - QLabel * l = new QLabel(tmp,m_pContextPopup); - l->setFrameStyle(QFrame::Raised | QFrame::StyledPanel); + // FIXME: This is not supported under TQt4.. :( + TQLabel * l = new TQLabel(tmp,m_pContextPopup); + l->setFrameStyle(TQFrame::Raised | TQFrame::StyledPanel); m_pContextPopup->insertItem(l); #endif m_pClickedApplet->fillContextPopup(m_pContextPopup); - KviQString::sprintf(tmp,__tr2qs("Remove %Q"),&app); + KviTQString::sprintf(tmp,__tr2qs("Remove %Q"),&app); m_pContextPopup->insertSeparator(); - m_pContextPopup->insertItem(tmp,this,SLOT(removeClickedApplet())); + m_pContextPopup->insertItem(tmp,this,TQT_SLOT(removeClickedApplet())); } if(!m_pAppletsPopup) { m_pAppletsPopup = new KviTalPopupMenu(this); - connect(m_pAppletsPopup,SIGNAL(aboutToShow()),this,SLOT(appletsPopupAboutToShow())); - connect(m_pAppletsPopup,SIGNAL(activated(int)),this,SLOT(appletsPopupActivated(int))); + connect(m_pAppletsPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(appletsPopupAboutToShow())); + connect(m_pAppletsPopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(appletsPopupActivated(int))); } m_pContextPopup->insertItem(__tr2qs("Add Applet"),m_pAppletsPopup); @@ -380,11 +380,11 @@ void KviStatusBar::appletsPopupAboutToShow() // FIXME: could we cache the module results in some way ? g_pModuleManager->loadModulesByCaps("statusbarapplet"); - KviPointerHashTableIterator<QString,KviStatusBarAppletDescriptor> it(*m_pAppletDescriptors); + KviPointerHashTableIterator<TQString,KviStatusBarAppletDescriptor> it(*m_pAppletDescriptors); while(KviStatusBarAppletDescriptor * d = it.current()) { int id; - QPixmap * pix = d->icon(); + TQPixmap * pix = d->icon(); if(pix)id = m_pAppletsPopup->insertItem(*pix,d->visibleName()); else id = m_pAppletsPopup->insertItem(d->visibleName()); m_pAppletsPopup->setItemParameter(id,d->id()); @@ -392,9 +392,9 @@ void KviStatusBar::appletsPopupAboutToShow() } } -KviStatusBarApplet * KviStatusBar::createApplet(const QString &szInternalName) +KviStatusBarApplet * KviStatusBar::createApplet(const TQString &szInternalName) { - KviStatusBarAppletDescriptor * d = m_pAppletDescriptors->find(szInternalName); + KviStatusBarAppletDescriptor * d = m_pAppletDescriptors->tqfind(szInternalName); if(!d)return 0; return d->create(this); } @@ -412,14 +412,14 @@ void KviStatusBar::appletsPopupActivated(int id) if(!m_pAppletsPopup)return; int par = m_pAppletsPopup->itemParameter(id); - KviPointerHashTableIterator<QString,KviStatusBarAppletDescriptor> it(*m_pAppletDescriptors); + KviPointerHashTableIterator<TQString,KviStatusBarAppletDescriptor> it(*m_pAppletDescriptors); while(KviStatusBarAppletDescriptor * d = it.current()) { if(par == d->id()) { if(m_pClickedApplet) { - int idx = m_pAppletList->findRef(m_pClickedApplet); + int idx = m_pAppletList->tqfindRef(m_pClickedApplet); if(idx != -1) { // try to put the new applet just after the clicked one @@ -444,7 +444,7 @@ void KviStatusBar::appletsPopupActivated(int id) void KviStatusBar::registerAppletDescriptor(KviStatusBarAppletDescriptor * d) { - m_pAppletDescriptors->replace(d->internalName(),d); + m_pAppletDescriptors->tqreplace(d->internalName(),d); } void KviStatusBar::registerApplet(KviStatusBarApplet * a) @@ -463,42 +463,42 @@ void KviStatusBar::unregisterApplet(KviStatusBarApplet * a) } -void KviStatusBar::paintEvent(QPaintEvent * e) +void KviStatusBar::paintEvent(TQPaintEvent * e) { - // avoid the ugly rectangle around the widgets painted by QStatusBar -// QPainter p(this); -// style().drawPrimitive(QStyle::PE_Panel,&p,rect(),colorGroup(),QStyle::Style_Raised,QStyleOption(1,1)); - //QStatusBar::paintEvent(e); - //qDrawWinPanel(&p,0,0,width(),height(),colorGroup(),false,0); + // avoid the ugly rectangle around the widgets painted by TQStatusBar +// TQPainter p(this); +// style().drawPrimitive(TQStyle::PE_Panel,&p,rect(),tqcolorGroup(),TQStyle::Style_Raised,TQStyleOption(1,1)); + //TQStatusBar::paintEvent(e); + //qDrawWinPanel(&p,0,0,width(),height(),tqcolorGroup(),false,0); } -void KviStatusBar::mousePressEvent(QMouseEvent * e) +void KviStatusBar::mousePressEvent(TQMouseEvent * e) { m_pClickedApplet = 0; if(e->button() & Qt::RightButton) { - contextPopup()->popup(QCursor::pos()); + contextPopup()->popup(TQCursor::pos()); return; } - if((e->button() & Qt::LeftButton) && (e->state() & (Qt::ShiftButton | Qt::ControlButton))) + if((e->button() & Qt::LeftButton) && (e->state() & (TQt::ShiftButton | TQt::ControlButton))) { // move! m_pClickedApplet = appletAt(mapToGlobal(e->pos())); if(!m_pClickedApplet)return; m_pClickedApplet->select(); #ifdef COMPILE_USE_QT4 - g_pApp->setOverrideCursor(Qt::SizeAllCursor); + g_pApp->setOverrideCursor(TQt::SizeAllCursor); #else g_pApp->setOverrideCursor(sizeAllCursor); #endif } } -void KviStatusBar::mouseMoveEvent(QMouseEvent * e) +void KviStatusBar::mouseMoveEvent(TQMouseEvent * e) { if(!m_pClickedApplet)return; if(!appletExists(m_pClickedApplet))return; - QPoint g = mapToGlobal(e->pos()); + TQPoint g = mapToGlobal(e->pos()); KviStatusBarApplet * a = appletAt(g,true); if(a == m_pClickedApplet)return; // move! @@ -518,17 +518,17 @@ void KviStatusBar::mouseMoveEvent(QMouseEvent * e) } m_pAppletList->removeRef(m_pClickedApplet); - int idx = m_pAppletList->findRef(a); + int idx = m_pAppletList->tqfindRef(a); if(idx == -1)m_pAppletList->append(m_pClickedApplet); // uhg ? else { - QPoint p = a->mapFromGlobal(g); + TQPoint p = a->mapFromGlobal(g); if(p.x() > (a->width() / 2))idx++; // just after m_pAppletList->insert(idx,m_pClickedApplet); } - layoutChildren(); + tqlayoutChildren(); } -void KviStatusBar::mouseReleaseEvent(QMouseEvent * e) +void KviStatusBar::mouseReleaseEvent(TQMouseEvent * e) { if(e->button() & Qt::LeftButton) { @@ -585,8 +585,8 @@ void KviStatusBar::showFirstMessageInQueue() if(!m_pMessageTimer) { - m_pMessageTimer = new QTimer(this); - QObject::connect(m_pMessageTimer,SIGNAL(timeout()),this,SLOT(messageTimerFired())); + m_pMessageTimer = new TQTimer(this); + TQObject::connect(m_pMessageTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(messageTimerFired())); } else { m_pMessageTimer->stop(); } @@ -602,7 +602,7 @@ void KviStatusBar::setPermanentMessage() KviIrcContext * c = m_pFrame->activeContext(); - QString txt = "<nobr>"; + TQString txt = "<nobr>"; if(c) { diff --git a/src/kvirc/ui/kvi_statusbar.h b/src/kvirc/ui/kvi_statusbar.h index 119c93d..0030ea5 100644 --- a/src/kvirc/ui/kvi_statusbar.h +++ b/src/kvirc/ui/kvi_statusbar.h @@ -28,29 +28,29 @@ #include "kvi_pointerlist.h" #include "kvi_heapobject.h" -#include <qstring.h> +#include <tqstring.h> #include "kvi_pointerhashtable.h" -#include <qstatusbar.h> +#include <tqstatusbar.h> class KviFrame; -class QTimer; -class QLabel; +class TQTimer; +class TQLabel; class KviTalPopupMenu; class KVIRC_API KviStatusBarMessage : public KviHeapObject { friend class KviStatusBar; protected: - QString m_szText; + TQString m_szText; unsigned int m_uTimeout; unsigned int m_uPriority; public: - KviStatusBarMessage(const QString &szText,unsigned int uTimeout = 8000,unsigned int uPriority = 0) + KviStatusBarMessage(const TQString &szText,unsigned int uTimeout = 8000,unsigned int uPriority = 0) : KviHeapObject(), m_szText(szText), m_uTimeout(uTimeout), m_uPriority(uPriority) {}; ~KviStatusBarMessage(){}; public: - const QString & text(){ return m_szText; }; + const TQString & text(){ return m_szText; }; unsigned int timeout(){ return m_uTimeout; }; unsigned int priority(){ return m_uPriority; }; }; @@ -61,21 +61,22 @@ class KviStatusBarAppletDescriptor; class KviIrcContext; class KviDynamicToolTip; -class KVIRC_API KviStatusBar : public QStatusBar +class KVIRC_API KviStatusBar : public TQStatusBar { friend class KviStatusBarApplet; friend class KviFrame; Q_OBJECT + TQ_OBJECT public: KviStatusBar(KviFrame * pFrame); ~KviStatusBar(); protected: KviFrame * m_pFrame; KviPointerList<KviStatusBarMessage> * m_pMessageQueue; - QTimer * m_pMessageTimer; - QLabel * m_pMessageLabel; + TQTimer * m_pMessageTimer; + TQLabel * m_pMessageLabel; KviPointerList<KviStatusBarApplet> * m_pAppletList; - KviPointerHashTable<QString,KviStatusBarAppletDescriptor> * m_pAppletDescriptors; + KviPointerHashTable<TQString,KviStatusBarAppletDescriptor> * m_pAppletDescriptors; KviTalPopupMenu * m_pContextPopup; KviTalPopupMenu * m_pAppletsPopup; KviStatusBarApplet * m_pClickedApplet; @@ -88,25 +89,25 @@ protected slots: void messageTimerFired(); protected: void showFirstMessageInQueue(); - virtual void paintEvent(QPaintEvent * e); - virtual void mousePressEvent(QMouseEvent * e); - virtual void mouseMoveEvent(QMouseEvent * e); - virtual void mouseReleaseEvent(QMouseEvent * e); - virtual void resizeEvent(QResizeEvent * e); - virtual bool event(QEvent * e); + virtual void paintEvent(TQPaintEvent * e); + virtual void mousePressEvent(TQMouseEvent * e); + virtual void mouseMoveEvent(TQMouseEvent * e); + virtual void mouseReleaseEvent(TQMouseEvent * e); + virtual void resizeEvent(TQResizeEvent * e); + virtual bool event(TQEvent * e); void registerApplet(KviStatusBarApplet * a); void unregisterApplet(KviStatusBarApplet * a); void recalcMinimumHeight(); - void layoutChildren(); - void updateLayout(){ recalcMinimumHeight(); layoutChildren(); }; + void tqlayoutChildren(); + void updateLayout(){ recalcMinimumHeight(); tqlayoutChildren(); }; void save(); void load(); - KviStatusBarApplet * createApplet(const QString &szInternalName); + KviStatusBarApplet * createApplet(const TQString &szInternalName); void showLayoutHelp(); public: bool appletExists(KviStatusBarApplet * pApplet); // pnt is global! - KviStatusBarApplet * appletAt(const QPoint &pnt,bool bBestMatch = false); + KviStatusBarApplet * appletAt(const TQPoint &pnt,bool bBestMatch = false); KviTalPopupMenu * contextPopup(); // takes the ownership of pMsg @@ -124,7 +125,7 @@ protected slots: void appletsPopupActivated(int id); void removeClickedApplet(); void setPermanentMessage(); - void tipRequest(KviDynamicToolTip *pTip,const QPoint &pnt); + void tipRequest(KviDynamicToolTip *pTip,const TQPoint &pnt); }; #endif //!_KVI_STATUSBAR_H_ diff --git a/src/kvirc/ui/kvi_statusbarapplet.cpp b/src/kvirc/ui/kvi_statusbarapplet.cpp index 8e4ec89..bc8fa02 100644 --- a/src/kvirc/ui/kvi_statusbarapplet.cpp +++ b/src/kvirc/ui/kvi_statusbarapplet.cpp @@ -40,15 +40,15 @@ #include "kvi_options.h" #include "kvi_kvs_script.h" -#include <qpainter.h> -#include <qstyle.h> -#include <qlayout.h> -#include <qtimer.h> -#include <qcursor.h> +#include <tqpainter.h> +#include <tqstyle.h> +#include <tqlayout.h> +#include <tqtimer.h> +#include <tqcursor.h> #include "kvi_tal_popupmenu.h" -#include <qpixmap.h> +#include <tqpixmap.h> #ifdef COMPILE_USE_QT4 - #include <qevent.h> + #include <tqevent.h> #endif // This class COULD be derived also from KStatusBar but in fact @@ -61,7 +61,7 @@ #include "kvi_time.h" #include "kvi_qstring.h" -#include <qfont.h> +#include <tqfont.h> /* IDEAS: @@ -69,7 +69,7 @@ - Countdown timer */ -KviStatusBarAppletDescriptor::KviStatusBarAppletDescriptor(const QString &szVisibleName,const QString &szInternalName,CreateAppletCallback pProc,const QString &szPreloadModule,const QPixmap &pixIcon) +KviStatusBarAppletDescriptor::KviStatusBarAppletDescriptor(const TQString &szVisibleName,const TQString &szInternalName,CreateAppletCallback pProc,const TQString &szPreloadModule,const TQPixmap &pixIcon) : KviHeapObject() { static int s_iAppletDescriptorUniqueId = 0; @@ -81,7 +81,7 @@ KviStatusBarAppletDescriptor::KviStatusBarAppletDescriptor(const QString &szVisi m_pProc = pProc; m_pAppletList = new KviPointerList<KviStatusBarApplet>; m_pAppletList->setAutoDelete(false); - if(!pixIcon.isNull())m_pIcon = new QPixmap(pixIcon); + if(!pixIcon.isNull())m_pIcon = new TQPixmap(pixIcon); else m_pIcon = 0; } @@ -113,7 +113,7 @@ void KviStatusBarAppletDescriptor::unregisterApplet(KviStatusBarApplet * a) KviStatusBarApplet::KviStatusBarApplet(KviStatusBar * pParent,KviStatusBarAppletDescriptor *pDescriptor) -: QLabel(pParent), m_pStatusBar(pParent), m_pDescriptor(pDescriptor) +: TQLabel(pParent), m_pStatusBar(pParent), m_pDescriptor(pDescriptor) { m_pDescriptor->registerApplet(this); m_pStatusBar->registerApplet(this); @@ -126,26 +126,26 @@ KviStatusBarApplet::~KviStatusBarApplet() m_pStatusBar->unregisterApplet(this); } -QString KviStatusBarApplet::tipText(const QPoint &) +TQString KviStatusBarApplet::tipText(const TQPoint &) { - return QString::null; + return TQString(); } -void KviStatusBarApplet::paintEvent(QPaintEvent * e) +void KviStatusBarApplet::paintEvent(TQPaintEvent * e) { - QLabel::paintEvent(e); + TQLabel::paintEvent(e); setFont(KVI_OPTION_FONT(KviOption_fontIrcToolBarApplet)); if(m_bSelected) { - QPainter p(this); + TQPainter p(this); #ifdef COMPILE_USE_QT4 - p.setCompositionMode(QPainter::CompositionMode_SourceOut); - p.fillRect(rect(),Qt::black); - p.setCompositionMode(QPainter::CompositionMode_SourceOver); + p.setCompositionMode(TQPainter::CompositionMode_SourceOut); + p.fillRect(rect(),TQt::black); + p.setCompositionMode(TQPainter::CompositionMode_SourceOver); #else - p.setRasterOp(Qt::NotROP); - p.fillRect(rect(),Qt::black); - p.setRasterOp(Qt::CopyROP); + p.setRasterOp(TQt::NotROP); + p.fillRect(rect(),TQt::black); + p.setRasterOp(TQt::CopyROP); #endif } } @@ -164,9 +164,9 @@ KviStatusBarAwayIndicator::KviStatusBarAwayIndicator(KviStatusBar * pParent,KviS : KviStatusBarApplet(pParent,pDescriptor) { m_bAwayOnAllContexts = false; - connect(pParent->frame(),SIGNAL(activeContextChanged()),this,SLOT(updateDisplay())); - connect(pParent->frame(),SIGNAL(activeContextStateChanged()),this,SLOT(updateDisplay())); - connect(pParent->frame(),SIGNAL(activeConnectionAwayStateChanged()),this,SLOT(updateDisplay())); + connect(pParent->frame(),TQT_SIGNAL(activeContextChanged()),this,TQT_SLOT(updateDisplay())); + connect(pParent->frame(),TQT_SIGNAL(activeContextStateChanged()),this,TQT_SLOT(updateDisplay())); + connect(pParent->frame(),TQT_SIGNAL(activeConnectionAwayStateChanged()),this,TQT_SLOT(updateDisplay())); updateDisplay(); @@ -200,7 +200,7 @@ void KviStatusBarAwayIndicator::toggleContext() void KviStatusBarAwayIndicator::fillContextPopup(KviTalPopupMenu *p) { - int id = p->insertItem(__tr2qs("Apply to all IRC Contexts"),this,SLOT(toggleContext())); + int id = p->insertItem(__tr2qs("Apply to all IRC Contexts"),this,TQT_SLOT(toggleContext())); p->setItemChecked(id,m_bAwayOnAllContexts); } @@ -229,13 +229,13 @@ void KviStatusBarAwayIndicator::selfRegister(KviStatusBar * pBar) } // FIXME: Away on all context should know where user is not away/back before toggling status -void KviStatusBarAwayIndicator::mouseDoubleClickEvent(QMouseEvent * e) +void KviStatusBarAwayIndicator::mouseDoubleClickEvent(TQMouseEvent * e) { if(!(e->button() & Qt::LeftButton))return; KviIrcConnection * c = statusBar()->frame()->activeConnection(); if(!c)return; if(c->state() != KviIrcConnection::Connected)return; - QString command; + TQString command; if(m_bAwayOnAllContexts) command = "if($away)back -a; else away -a"; else @@ -243,15 +243,15 @@ void KviStatusBarAwayIndicator::mouseDoubleClickEvent(QMouseEvent * e) KviKvsScript::run(command,c->console()); } -QString KviStatusBarAwayIndicator::tipText(const QPoint &) +TQString KviStatusBarAwayIndicator::tipText(const TQPoint &) { KviIrcConnection * c = statusBar()->frame()->activeConnection(); - QString ret = "<center><b>"; + TQString ret = "<center><b>"; if(!c)goto not_connected; if(c->state() != KviIrcConnection::Connected)goto not_connected; if(c->userInfo()->isAway()) { - QString tmp = KviTimeUtils::formatTimeInterval(kvi_unixTime() - c->userInfo()->awayTime(),KviTimeUtils::NoLeadingEmptyIntervals); + TQString tmp = KviTimeUtils::formatTimeInterval(kvi_unixTime() - c->userInfo()->awayTime(),KviTimeUtils::NoLeadingEmptyIntervals); ret += __tr2qs("Away since"); ret += ' '; ret += tmp; @@ -275,13 +275,13 @@ not_connected: KviStatusBarLagIndicator::KviStatusBarLagIndicator(KviStatusBar * pParent,KviStatusBarAppletDescriptor *pDescriptor) : KviStatusBarApplet(pParent,pDescriptor) { - connect(pParent->frame(),SIGNAL(activeContextChanged()),this,SLOT(updateDisplay())); - connect(pParent->frame(),SIGNAL(activeContextStateChanged()),this,SLOT(updateDisplay())); - connect(pParent->frame(),SIGNAL(activeConnectionLagChanged()),this,SLOT(updateDisplay())); + connect(pParent->frame(),TQT_SIGNAL(activeContextChanged()),this,TQT_SLOT(updateDisplay())); + connect(pParent->frame(),TQT_SIGNAL(activeContextStateChanged()),this,TQT_SLOT(updateDisplay())); + connect(pParent->frame(),TQT_SIGNAL(activeConnectionLagChanged()),this,TQT_SLOT(updateDisplay())); updateDisplay(); - QFont f = font(); + TQFont f = font(); f.setFixedPitch(true); f.setFamily("fixed"); setFont(f); @@ -293,7 +293,7 @@ KviStatusBarLagIndicator::~KviStatusBarLagIndicator() { } -void KviStatusBarLagIndicator::mouseDoubleClickEvent(QMouseEvent *e) +void KviStatusBarLagIndicator::mouseDoubleClickEvent(TQMouseEvent *e) { if(!(e->button() & Qt::LeftButton))return; @@ -308,10 +308,10 @@ void KviStatusBarLagIndicator::mouseDoubleClickEvent(QMouseEvent *e) } -QString KviStatusBarLagIndicator::tipText(const QPoint &) +TQString KviStatusBarLagIndicator::tipText(const TQPoint &) { KviIrcConnection * c = statusBar()->frame()->activeConnection(); - QString ret = "<center><b>"; + TQString ret = "<center><b>"; if(!c)goto not_connected; if(c->state() != KviIrcConnection::Connected)goto not_connected; if(c->lagMeter()) @@ -322,12 +322,12 @@ QString KviStatusBarLagIndicator::tipText(const QPoint &) int llls = lll / 1000; int llld = (lll % 1000) / 100; int lllc = (lll % 100) / 10; - KviQString::appendFormatted(ret,__tr2qs("Lag: %d.%d%d"),llls,llld,lllc); + KviTQString::appendFormatted(ret,__tr2qs("Lag: %d.%d%d"),llls,llld,lllc); ret += "</b><br>"; int vss = c->lagMeter()->secondsSinceLastCompleted(); int vmm = vss / 60; vss = vss % 60; - KviQString::appendFormatted(ret,__tr2qs("Last checked %d mins %d secs ago"),vmm,vss); + KviTQString::appendFormatted(ret,__tr2qs("Last checked %d mins %d secs ago"),vmm,vss); } else { ret += __tr2qs("Lag measure not available yet"); ret += "</b>"; @@ -361,8 +361,8 @@ void KviStatusBarLagIndicator::updateDisplay() int llls = lll / 1000; int llld = (lll % 1000) / 100; int lllc = (lll % 100) / 10; - QString tmp; - KviQString::sprintf(tmp,__tr2qs("Lag: %d.%d%d"),llls,llld,lllc); + TQString tmp; + KviTQString::sprintf(tmp,__tr2qs("Lag: %d.%d%d"),llls,llld,lllc); if(lll > 60000) { // one minute lag! @@ -401,7 +401,7 @@ KviStatusBarClock::KviStatusBarClock(KviStatusBar * pParent,KviStatusBarAppletDe startTimer(1000); - QFont f = font(); + TQFont f = font(); f.setFixedPitch(true); f.setFamily("fixed"); setFont(f); @@ -411,12 +411,12 @@ KviStatusBarClock::~KviStatusBarClock() { } -void KviStatusBarClock::timerEvent(QTimerEvent *) +void KviStatusBarClock::timerEvent(TQTimerEvent *) { kvi_time_t tt = kvi_unixTime(); struct tm * t = m_bUtc ? gmtime(&tt) : localtime(&tt); - QString tmp; - KviQString::sprintf(tmp,"%d%d:%d%d:%d%d", + TQString tmp; + KviTQString::sprintf(tmp,"%d%d:%d%d:%d%d", t->tm_hour / 10, t->tm_hour % 10, t->tm_min / 10, @@ -428,7 +428,7 @@ void KviStatusBarClock::timerEvent(QTimerEvent *) void KviStatusBarClock::fillContextPopup(KviTalPopupMenu * p) { - int id = p->insertItem("UTC",this,SLOT(toggleUtc())); + int id = p->insertItem("UTC",this,TQT_SLOT(toggleUtc())); p->setItemChecked(id,m_bUtc); } @@ -474,7 +474,7 @@ KviStatusBarConnectionTimer::~KviStatusBarConnectionTimer() { } //g_pApp->topmostConnectedConsole() -void KviStatusBarConnectionTimer::timerEvent(QTimerEvent * e) +void KviStatusBarConnectionTimer::timerEvent(TQTimerEvent * e) { if(m_bTotal) { @@ -509,7 +509,7 @@ void KviStatusBarConnectionTimer::toggleTotal() void KviStatusBarConnectionTimer::fillContextPopup(KviTalPopupMenu *p) { - int id = p->insertItem(__tr2qs("Show total connection time"),this,SLOT(toggleTotal())); + int id = p->insertItem(__tr2qs("Show total connection time"),this,TQT_SLOT(toggleTotal())); p->setItemChecked(id,m_bTotal); } @@ -542,7 +542,7 @@ void KviStatusBarConnectionTimer::selfRegister(KviStatusBar * pBar) KviStatusBarSeparator::KviStatusBarSeparator(KviStatusBar * pParent,KviStatusBarAppletDescriptor *pDescriptor) : KviStatusBarApplet(pParent,pDescriptor) { - setFrameStyle(QFrame::VLine | QFrame::Sunken); + setFrameStyle(TQFrame::VLine | TQFrame::Sunken); } KviStatusBarSeparator::~KviStatusBarSeparator() diff --git a/src/kvirc/ui/kvi_statusbarapplet.h b/src/kvirc/ui/kvi_statusbarapplet.h index 6302be5..f324657 100644 --- a/src/kvirc/ui/kvi_statusbarapplet.h +++ b/src/kvirc/ui/kvi_statusbarapplet.h @@ -29,14 +29,14 @@ #include "kvi_heapobject.h" #include "kvi_statusbar.h" -#include <qstring.h> +#include <tqstring.h> #include "kvi_pointerhashtable.h" -#include <qstatusbar.h> -#include <qlabel.h> -#include <qpixmap.h> +#include <tqstatusbar.h> +#include <tqlabel.h> +#include <tqpixmap.h> -class QTimer; -class QLabel; +class TQTimer; +class TQLabel; class KviTalPopupMenu; class KviConfig; @@ -53,26 +53,26 @@ class KVIRC_API KviStatusBarAppletDescriptor : public KviHeapObject friend class KviStatusBar; friend class KviStatusBarApplet; protected: - QString m_szVisibleName; // visible name of the applet - QString m_szInternalName; // UNIQUE name of the applet - QString m_szPreloadModule; // name of the module that must be preloaded for this applet + TQString m_szVisibleName; // visible name of the applet + TQString m_szInternalName; // UNITQUE name of the applet + TQString m_szPreloadModule; // name of the module that must be preloaded for this applet CreateAppletCallback m_pProc; // creation callback - QPixmap * m_pIcon; + TQPixmap * m_pIcon; int m_iId; KviPointerList<KviStatusBarApplet> * m_pAppletList; public: - KviStatusBarAppletDescriptor(const QString &szVisibleName, - const QString &szInternalName, + KviStatusBarAppletDescriptor(const TQString &szVisibleName, + const TQString &szInternalName, CreateAppletCallback pProc, - const QString &szPreloadModule = QString::null, - const QPixmap &pixIcon = QPixmap()); + const TQString &szPreloadModule = TQString(), + const TQPixmap &pixIcon = TQPixmap()); virtual ~KviStatusBarAppletDescriptor(); public: - const QString &visibleName(){ return m_szVisibleName; }; - const QString &internalName(){ return m_szInternalName; }; - const QString &preloadModule(){ return m_szPreloadModule; }; + const TQString &visibleName(){ return m_szVisibleName; }; + const TQString &internalName(){ return m_szInternalName; }; + const TQString &preloadModule(){ return m_szPreloadModule; }; int id(){ return m_iId; }; - QPixmap * icon(){ return m_pIcon; }; + TQPixmap * icon(){ return m_pIcon; }; protected: KviStatusBarApplet * create(KviStatusBar * pBar); void registerApplet(KviStatusBarApplet * a); @@ -80,10 +80,11 @@ protected: }; -class KVIRC_API KviStatusBarApplet : public QLabel +class KVIRC_API KviStatusBarApplet : public TQLabel { friend class KviStatusBar; Q_OBJECT + TQ_OBJECT protected: KviStatusBar * m_pStatusBar; KviStatusBarAppletDescriptor * m_pDescriptor; @@ -98,11 +99,11 @@ public: void select(bool bSelect = true); bool isSelected(){ return m_bSelected; }; protected: - virtual void paintEvent(QPaintEvent *e); + virtual void paintEvent(TQPaintEvent *e); virtual void fillContextPopup(KviTalPopupMenu *p){}; virtual void loadState(const char * prefix,KviConfig *cfg){}; virtual void saveState(const char * prefix,KviConfig *cfg){}; - virtual QString tipText(const QPoint &); + virtual TQString tipText(const TQPoint &); }; @@ -110,6 +111,7 @@ protected: class KviStatusBarClock : public KviStatusBarApplet { Q_OBJECT + TQ_OBJECT public: KviStatusBarClock(KviStatusBar * pParent,KviStatusBarAppletDescriptor *pDescriptor); virtual ~KviStatusBarClock(); @@ -119,7 +121,7 @@ public: static void selfRegister(KviStatusBar * pBar); protected: virtual void fillContextPopup(KviTalPopupMenu * p); - virtual void timerEvent(QTimerEvent * e); + virtual void timerEvent(TQTimerEvent * e); virtual void loadState(const char * prefix,KviConfig *cfg); virtual void saveState(const char * prefix,KviConfig *cfg); protected slots: @@ -129,13 +131,14 @@ protected slots: class KviStatusBarConnectionTimer : public KviStatusBarApplet { Q_OBJECT + TQ_OBJECT public: KviStatusBarConnectionTimer(KviStatusBar * pParent,KviStatusBarAppletDescriptor *pDescriptor); virtual ~KviStatusBarConnectionTimer(); protected: bool m_bTotal; protected: - virtual void timerEvent(QTimerEvent * e); + virtual void timerEvent(TQTimerEvent * e); virtual void fillContextPopup(KviTalPopupMenu *p); virtual void loadState(const char * prefix,KviConfig *cfg); virtual void saveState(const char * prefix,KviConfig *cfg); @@ -148,6 +151,7 @@ protected slots: class KviStatusBarSeparator : public KviStatusBarApplet { Q_OBJECT + TQ_OBJECT public: KviStatusBarSeparator(KviStatusBar * pParent,KviStatusBarAppletDescriptor *pDescriptor); virtual ~KviStatusBarSeparator(); @@ -158,6 +162,7 @@ public: class KviStatusBarAwayIndicator : public KviStatusBarApplet { Q_OBJECT + TQ_OBJECT public: KviStatusBarAwayIndicator(KviStatusBar * pParent,KviStatusBarAppletDescriptor *pDescriptor); virtual ~KviStatusBarAwayIndicator(); @@ -166,8 +171,8 @@ public: protected: bool m_bAwayOnAllContexts; protected: - virtual void mouseDoubleClickEvent(QMouseEvent *e); - virtual QString tipText(const QPoint &); + virtual void mouseDoubleClickEvent(TQMouseEvent *e); + virtual TQString tipText(const TQPoint &); virtual void fillContextPopup(KviTalPopupMenu *p); virtual void loadState(const char * prefix,KviConfig *cfg); virtual void saveState(const char * prefix,KviConfig *cfg); @@ -179,14 +184,15 @@ protected slots: class KviStatusBarLagIndicator : public KviStatusBarApplet { Q_OBJECT + TQ_OBJECT public: KviStatusBarLagIndicator(KviStatusBar * pParent,KviStatusBarAppletDescriptor *pDescriptor); virtual ~KviStatusBarLagIndicator(); public: static void selfRegister(KviStatusBar * pBar); protected: - virtual void mouseDoubleClickEvent(QMouseEvent *e); - virtual QString tipText(const QPoint &); + virtual void mouseDoubleClickEvent(TQMouseEvent *e); + virtual TQString tipText(const TQPoint &); protected slots: void updateDisplay(); }; diff --git a/src/kvirc/ui/kvi_styled_controls.cpp b/src/kvirc/ui/kvi_styled_controls.cpp index 8656b69..e81376e 100644 --- a/src/kvirc/ui/kvi_styled_controls.cpp +++ b/src/kvirc/ui/kvi_styled_controls.cpp @@ -35,15 +35,15 @@ #include "kvi_doublebuffer.h" #include "kvi_tal_toolbar.h" -#include <qcheckbox.h> -#include <qpainter.h> -#include <qimage.h> -#include <qevent.h> -#include <qtimer.h> +#include <tqcheckbox.h> +#include <tqpainter.h> +#include <tqimage.h> +#include <tqevent.h> +#include <tqtimer.h> KviStyledControlInternal::KviStyledControlInternal( KviStyledControl* control) -:QObject(0,0) +:TQObject(0,0) { m_pControl=control; } @@ -53,12 +53,12 @@ KviStyledControlInternal::~KviStyledControlInternal() } -bool KviStyledControlInternal::eventFilter( QObject *obj, QEvent *ev ) +bool KviStyledControlInternal::eventFilter( TQObject *obj, TQEvent *ev ) { - if(ev->type()==QEvent::Enter) + if(ev->type()==TQEvent::Enter) { m_pControl->enterEvent(ev); - } else if(ev->type()==QEvent::Leave) { + } else if(ev->type()==TQEvent::Leave) { m_pControl->leaveEvent(ev); } return FALSE; @@ -84,16 +84,16 @@ void KviStyledControlInternal::paintTimerShot () m_pControl->m_pTimer->stop(); } } - m_pControl->m_pWidget->repaint( false ); + m_pControl->m_pWidget->tqrepaint( false ); } -KviStyledControl::KviStyledControl(QWidget* w) +KviStyledControl::KviStyledControl(TQWidget* w) { m_pWidget=w; m_iStepNumber=0; m_bMouseEnter=0; m_pInternal=new KviStyledControlInternal(this); - m_pTimer = new QTimer(m_pInternal); + m_pTimer = new TQTimer(m_pInternal); m_pWidget->installEventFilter(m_pInternal); } @@ -103,7 +103,7 @@ KviStyledControl::~KviStyledControl() delete m_pInternal; } -void KviStyledControl::enterEvent ( QEvent * ) +void KviStyledControl::enterEvent ( TQEvent * ) { // debug("%s %s %i",__FILE__,__FUNCTION__,__LINE__); if(m_pWidget->isEnabled() && KVI_OPTION_BOOL(KviOption_boolEnableVisualEffects)) @@ -112,17 +112,17 @@ void KviStyledControl::enterEvent ( QEvent * ) { if(!m_pTimer->isActive()) { - m_pTimer->connect( m_pTimer, SIGNAL(timeout()), m_pInternal, SLOT(paintTimerShot()) ); + m_pTimer->connect( m_pTimer, TQT_SIGNAL(timeout()), m_pInternal, TQT_SLOT(paintTimerShot()) ); m_pTimer->start(KVI_STYLE_TIMER_STEP); } } m_bMouseEnter=1; m_iStepNumber++; - m_pWidget->repaint( false ); + m_pWidget->tqrepaint( false ); } } -void KviStyledControl::leaveEvent ( QEvent * ) +void KviStyledControl::leaveEvent ( TQEvent * ) { // debug("%s %s %i",__FILE__,__FUNCTION__,__LINE__); if(m_pWidget->isEnabled() && KVI_OPTION_BOOL(KviOption_boolEnableVisualEffects)) @@ -131,26 +131,26 @@ void KviStyledControl::leaveEvent ( QEvent * ) { if(!m_pTimer->isActive()) { - m_pTimer->connect( m_pTimer, SIGNAL(timeout()), m_pInternal, SLOT(paintTimerShot()) ); + m_pTimer->connect( m_pTimer, TQT_SIGNAL(timeout()), m_pInternal, TQT_SLOT(paintTimerShot()) ); m_pTimer->start(KVI_STYLE_TIMER_STEP); } } m_bMouseEnter=0; m_iStepNumber--; - m_pWidget->repaint( false ); + m_pWidget->tqrepaint( false ); } } -KviStyledCheckBox::KviStyledCheckBox ( QWidget * parent, const char * name ) -: QCheckBox(parent,name), KviStyledControl(this) +KviStyledCheckBox::KviStyledCheckBox ( TQWidget * tqparent, const char * name ) +: TQCheckBox(tqparent,name), KviStyledControl(this) { setWFlags(WNoAutoErase); } -KviStyledCheckBox::KviStyledCheckBox ( const QString & text, QWidget * parent, const char * name ) -: QCheckBox(text,parent,name), KviStyledControl(this) +KviStyledCheckBox::KviStyledCheckBox ( const TQString & text, TQWidget * tqparent, const char * name ) +: TQCheckBox(text,tqparent,name), KviStyledControl(this) { setWFlags(WNoAutoErase); } @@ -161,21 +161,21 @@ KviStyledCheckBox::~KviStyledCheckBox() } -void KviStyledCheckBox::paintEvent ( QPaintEvent * event) +void KviStyledCheckBox::paintEvent ( TQPaintEvent * event) { //debug("%s %s %i %i %i",__FILE__,__FUNCTION__,__LINE__,m_bMouseEnter,m_iStepNumber); if(KVI_OPTION_BOOL(KviOption_boolEnableVisualEffects)) { KviDoubleBuffer doublebuffer(event->rect().width(),event->rect().height()); - QPixmap * pDoubleBufferPixmap = doublebuffer.pixmap(); + TQPixmap * pDoubleBufferPixmap = doublebuffer.pixmap(); - QRect rect=event->rect(); + TQRect rect=event->rect(); pDoubleBufferPixmap->fill(this, rect.topLeft()); - QPainter p(pDoubleBufferPixmap, this); + TQPainter p(pDoubleBufferPixmap, this); p.translate(-rect.x(), -rect.y()); - QPixmap* pStoredPix = 0; + TQPixmap* pStoredPix = 0; if(isChecked()) pStoredPix=g_pIconManager->getBigIcon("kvi_checkbox_selected.png"); @@ -185,35 +185,35 @@ void KviStyledCheckBox::paintEvent ( QPaintEvent * event) if(pStoredPix) { //debug("%s %s %i %i %i",__FILE__,__FUNCTION__,__LINE__,m_bMouseEnter,m_iStepNumber); - QPixmap pix=*pStoredPix; + TQPixmap pix=*pStoredPix; if(m_iStepNumber && isEnabled()) { - QImage image = pix.convertToImage(); + TQImage image = pix.convertToImage(); for(int x=0; x<image.width(); x++) for(int y=0; y<image.height(); y++) { - QRgb rgb=image.pixel(x,y); - rgb=qRgba( - qRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber < 255 ? qRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber : 255 , - qGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber < 255 ? qGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber : 255, - qBlue(rgb), - qAlpha(rgb) + TQRgb rgb=image.pixel(x,y); + rgb=tqRgba( + tqRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber < 255 ? tqRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber : 255 , + tqGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber < 255 ? tqGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber : 255, + tqBlue(rgb), + tqAlpha(rgb) ); image.setPixel(x,y,rgb); } p.drawImage(0,0,image); } else if( !isEnabled()) { - QImage image = pix.convertToImage(); + TQImage image = pix.convertToImage(); for(int x=0; x<image.width(); x++) for(int y=0; y<image.height(); y++) { //- From Black to Gray conversion for disabled mode. - QRgb rgb=image.pixel(x,y); - rgb=qRgba( - qRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber == 0 ? 180 : qRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber, - qGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber == 0 ? 180 : qGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber, - qBlue(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber == 0 ? 180 : qBlue(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber, - qAlpha(rgb) + TQRgb rgb=image.pixel(x,y); + rgb=tqRgba( + tqRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber == 0 ? 180 : tqRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber, + tqGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber == 0 ? 180 : tqGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber, + tqBlue(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber == 0 ? 180 : tqBlue(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber, + tqAlpha(rgb) ); image.setPixel(x,y,rgb); } @@ -222,27 +222,27 @@ void KviStyledCheckBox::paintEvent ( QPaintEvent * event) p.drawPixmap(0,0,pix); } //debug("%s %s %i %i %i",__FILE__,__FUNCTION__,__LINE__,m_bMouseEnter,m_iStepNumber); - QString szText=text(); + TQString szText=text(); szText=szText.remove("&"); p.drawText(pix.width()+3,0,width(),height(),0,szText); bitBlt(this, rect.x(), rect.y(), pDoubleBufferPixmap, 0, 0, rect.width(), rect.height()); //debug("%s %s %i %i %i",__FILE__,__FUNCTION__,__LINE__,m_bMouseEnter,m_iStepNumber); } else { - QCheckBox::paintEvent(event); + TQCheckBox::paintEvent(event); } } else - QCheckBox::paintEvent(event); + TQCheckBox::paintEvent(event); } -KviStyledToolButton::KviStyledToolButton( QWidget * parent, const char * name ) -: QToolButton(parent,name), KviStyledControl(this), bShowSubmenuIndicator(false) +KviStyledToolButton::KviStyledToolButton( TQWidget * tqparent, const char * name ) +: TQToolButton(tqparent,name), KviStyledControl(this), bShowSubmenuIndicator(false) { setWFlags(WNoAutoErase); resizeEvent(0); } -KviStyledToolButton::KviStyledToolButton ( const QIconSet & iconSet, const QString & textLabel, const QString & grouptext, QObject * receiver, const char * slot, KviTalToolBar * parent, const char * name ) -: QToolButton(iconSet,textLabel,grouptext,receiver,slot,parent,name), KviStyledControl(this), bShowSubmenuIndicator(false) +KviStyledToolButton::KviStyledToolButton ( const TQIconSet & iconSet, const TQString & textLabel, const TQString & grouptext, TQObject * receiver, const char * slot, KviTalToolBar * tqparent, const char * name ) +: TQToolButton(iconSet,textLabel,grouptext,receiver,slot,tqparent,name), KviStyledControl(this), bShowSubmenuIndicator(false) { setWFlags(WNoAutoErase); resizeEvent(0); @@ -259,11 +259,11 @@ void KviStyledToolButton::setShowSubmenuIndicator(bool bShow) resizeEvent(0); } -void KviStyledToolButton::paintEvent ( QPaintEvent * event) +void KviStyledToolButton::paintEvent ( TQPaintEvent * event) { if(KVI_OPTION_BOOL(KviOption_boolEnableVisualEffects)) { - QPixmap* pArrowPix = 0; + TQPixmap* pArrowPix = 0; int iWidth=width(); int iPixWidth=0; if(bShowSubmenuIndicator) @@ -273,62 +273,62 @@ void KviStyledToolButton::paintEvent ( QPaintEvent * event) } bool bActive= isOn() || m_bMouseEnter; KviDoubleBuffer doublebuffer(event->rect().width(),event->rect().height()); - QPixmap * pDoubleBufferPixmap = doublebuffer.pixmap(); + TQPixmap * pDoubleBufferPixmap = doublebuffer.pixmap(); - QRect rect=event->rect(); + TQRect rect=event->rect(); pDoubleBufferPixmap->fill( - bActive ? QColor(206,215,223) : - colorGroup().background() + bActive ? TQColor(206,215,223) : + tqcolorGroup().background() ); - QPainter p(pDoubleBufferPixmap, this); + TQPainter p(pDoubleBufferPixmap, this); p.translate(-rect.x(), -rect.y()); if(bActive) { - p.setPen(QColor(185,190,195)); + p.setPen(TQColor(185,190,195)); p.drawRect(0,0,iWidth,height()); } - QPixmap pix=iconSet().pixmap( - usesBigPixmap() ? QIconSet::Large : QIconSet::Small, - isEnabled() ? QIconSet::Normal : - QIconSet::Disabled, - isOn() ? QIconSet::On : - QIconSet::Off); - QPoint pos((iWidth-iPixWidth-pix.width())/2,(height()-pix.height())/2); + TQPixmap pix=iconSet().pixmap( + usesBigPixmap() ? TQIconSet::Large : TQIconSet::Small, + isEnabled() ? TQIconSet::Normal : + TQIconSet::Disabled, + isOn() ? TQIconSet::On : + TQIconSet::Off); + TQPoint pos((iWidth-iPixWidth-pix.width())/2,(height()-pix.height())/2); if(!pix.isNull()) { if(m_iStepNumber && isEnabled()) { - QImage image = pix.convertToImage(); + TQImage image = pix.convertToImage(); for(int x=0; x<image.width(); x++) for(int y=0; y<image.height(); y++) { - QRgb rgb=image.pixel(x,y); - rgb=qRgba( - qRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber < 255 ? qRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber : 255 , - qGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber < 255 ? qGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber : 255, - qBlue(rgb), - qAlpha(rgb) + TQRgb rgb=image.pixel(x,y); + rgb=tqRgba( + tqRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber < 255 ? tqRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber : 255 , + tqGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber < 255 ? tqGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber : 255, + tqBlue(rgb), + tqAlpha(rgb) ); image.setPixel(x,y,rgb); } p.drawImage(pos,image); } else if( !isEnabled()) { - QImage image = pix.convertToImage(); + TQImage image = pix.convertToImage(); for(int x=0; x<image.width(); x++) for(int y=0; y<image.height(); y++) { //- From Black to Gray conversion for disabled mode. - QRgb rgb=image.pixel(x,y); - rgb=qRgba( - qRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber == 0 ? 180 : qRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber, - qGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber == 0 ? 180 : qGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber, - qBlue(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber == 0 ? 180 : qBlue(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber, - qAlpha(rgb) + TQRgb rgb=image.pixel(x,y); + rgb=tqRgba( + tqRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber == 0 ? 180 : tqRed(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber, + tqGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber == 0 ? 180 : tqGreen(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber, + tqBlue(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber == 0 ? 180 : tqBlue(rgb)+KVI_STYLE_COLOR_DIFF/KVI_STYLE_NUM_STEPS*m_iStepNumber, + tqAlpha(rgb) ); image.setPixel(x,y,rgb); } @@ -348,21 +348,21 @@ void KviStyledToolButton::paintEvent ( QPaintEvent * event) bitBlt(this, rect.x(), rect.y(), pDoubleBufferPixmap, 0, 0, rect.width(), rect.height()); } else { - QToolButton::paintEvent(event); + TQToolButton::paintEvent(event); } } -void KviStyledToolButton::resizeEvent ( QResizeEvent * e) +void KviStyledToolButton::resizeEvent ( TQResizeEvent * e) { - QPixmap* pStoredPix = 0; + TQPixmap* pStoredPix = 0; if(pStoredPix=g_pIconManager->getBigIcon("kvi_toolbutton_menuindicator.png")) { - QPixmap pix=iconSet().pixmap( - usesBigPixmap() ? QIconSet::Large : QIconSet::Small, - isEnabled() ? QIconSet::Normal : - QIconSet::Disabled, - isOn() ? QIconSet::On : - QIconSet::Off); + TQPixmap pix=iconSet().pixmap( + usesBigPixmap() ? TQIconSet::Large : TQIconSet::Small, + isEnabled() ? TQIconSet::Normal : + TQIconSet::Disabled, + isOn() ? TQIconSet::On : + TQIconSet::Off); setMinimumWidth(bShowSubmenuIndicator ? pix.width()+8+pStoredPix->width() : pix.width()); } diff --git a/src/kvirc/ui/kvi_styled_controls.h b/src/kvirc/ui/kvi_styled_controls.h index 8d096fa..f7e6641 100644 --- a/src/kvirc/ui/kvi_styled_controls.h +++ b/src/kvirc/ui/kvi_styled_controls.h @@ -28,18 +28,18 @@ #include "kvi_settings.h" #ifdef COMPILE_USE_QT4 - // we use internal Qt4 styles for now - #include <qcheckbox.h> - #include <qtoolbutton.h> + // we use internal TQt4 styles for now + #include <tqcheckbox.h> + #include <tqtoolbutton.h> - #define KviStyledCheckBox QCheckBox - #define KviStyledToolButton QToolButton + #define KviStyledCheckBox TQCheckBox + #define KviStyledToolButton TQToolButton #else -#include <qcheckbox.h> -#include <qtoolbutton.h> -#include <qevent.h> -#include <qtimer.h> +#include <tqcheckbox.h> +#include <tqtoolbutton.h> +#include <tqevent.h> +#include <tqtimer.h> #include "kvi_heapobject.h" class KviTalToolBar; @@ -50,16 +50,17 @@ class KviTalToolBar; class KviStyledControl; -class KVIRC_API KviStyledControlInternal : public QObject +class KVIRC_API KviStyledControlInternal : public TQObject { Q_OBJECT + TQ_OBJECT public: KviStyledControlInternal( KviStyledControl* control ); ~KviStyledControlInternal(); public slots: virtual void paintTimerShot(); protected: - bool eventFilter( QObject *obj, QEvent *ev ); + bool eventFilter( TQObject *obj, TQEvent *ev ); protected: KviStyledControl* m_pControl; }; @@ -68,44 +69,46 @@ class KVIRC_API KviStyledControl { friend class KviStyledControlInternal; public: - KviStyledControl(QWidget*); + KviStyledControl(TQWidget*); ~KviStyledControl(); protected: - virtual void enterEvent ( QEvent * ); - virtual void leaveEvent ( QEvent * ); + virtual void enterEvent ( TQEvent * ); + virtual void leaveEvent ( TQEvent * ); int m_bMouseEnter; int m_iStepNumber; - QTimer* m_pTimer; + TQTimer* m_pTimer; KviStyledControlInternal* m_pInternal; - QWidget *m_pWidget; + TQWidget *m_pWidget; }; -class KVIRC_API KviStyledCheckBox : public QCheckBox, public KviStyledControl +class KVIRC_API KviStyledCheckBox : public TQCheckBox, public KviStyledControl { Q_OBJECT + TQ_OBJECT public: - KviStyledCheckBox ( QWidget * parent, const char * name = 0 ); - KviStyledCheckBox ( const QString & text, QWidget * parent, const char * name = 0 ); + KviStyledCheckBox ( TQWidget * tqparent, const char * name = 0 ); + KviStyledCheckBox ( const TQString & text, TQWidget * tqparent, const char * name = 0 ); ~KviStyledCheckBox(); protected: - virtual void paintEvent ( QPaintEvent * ); + virtual void paintEvent ( TQPaintEvent * ); }; -class KVIRC_API KviStyledToolButton : public QToolButton, public KviStyledControl +class KVIRC_API KviStyledToolButton : public TQToolButton, public KviStyledControl { Q_OBJECT + TQ_OBJECT private: bool bShowSubmenuIndicator; public: - KviStyledToolButton ( QWidget * parent, const char * name = 0 ); - KviStyledToolButton ( const QIconSet & iconSet, const QString & textLabel, const QString & grouptext, QObject * receiver, const char * slot, KviTalToolBar * parent, const char * name = 0 ); + KviStyledToolButton ( TQWidget * tqparent, const char * name = 0 ); + KviStyledToolButton ( const TQIconSet & iconSet, const TQString & textLabel, const TQString & grouptext, TQObject * receiver, const char * slot, KviTalToolBar * tqparent, const char * name = 0 ); ~KviStyledToolButton(); void setShowSubmenuIndicator(bool bShow); protected: - virtual void paintEvent ( QPaintEvent * ); - virtual void resizeEvent ( QResizeEvent * ) ; + virtual void paintEvent ( TQPaintEvent * ); + virtual void resizeEvent ( TQResizeEvent * ) ; }; #endif diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp index 8e75bfd..9a0c0b9 100644 --- a/src/kvirc/ui/kvi_taskbar.cpp +++ b/src/kvirc/ui/kvi_taskbar.cpp @@ -47,31 +47,31 @@ #include "kvi_doublebuffer.h" // FIXME: #warning "The tree taskbar min width should be configurable" -#include <qtimer.h> -#include <qfontmetrics.h> -#include <qpainter.h> -#include <qpixmap.h> -#include <qimage.h> +#include <tqtimer.h> +#include <tqfontmetrics.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqimage.h> #include "kvi_tal_popupmenu.h" -#include <qcursor.h> +#include <tqcursor.h> #ifdef COMPILE_USE_QT4 - #include <q3header.h> + #include <tq3header.h> #else - #include <qheader.h> + #include <tqheader.h> #endif -#include <qevent.h> +#include <tqevent.h> #ifdef COMPILE_USE_QT4 - #include <QPaintEvent> + #include <TQPaintEvent> #endif #ifdef COMPILE_PSEUDO_TRANSPARENCY - extern QPixmap * g_pShadedChildGlobalDesktopBackground; + extern TQPixmap * g_pShadedChildGlobalDesktopBackground; #endif -extern QPixmap * g_pActivityMeterPixmap; +extern TQPixmap * g_pActivityMeterPixmap; // FIXME: This should be renamed to "Window List" @@ -81,18 +81,18 @@ extern QPixmap * g_pActivityMeterPixmap; KviTaskBarBase::KviTaskBarBase() #ifdef COMPILE_USE_QT4 -: QDockWidget(__tr2qs("Taskbar"),g_pFrame) +: TQDockWidget(__tr2qs("Taskbar"),g_pFrame) #else -: KviToolBar(__tr2qs("Taskbar"),QT_DOCK_BOTTOM,false,"taskbar") +: KviToolBar(__tr2qs("Taskbar"),TQT_DOCK_BOTTOM,false,"taskbar") #endif { // FIXME: this timer should be started only if KVI_OPTION_BOOL(KviOption_boolUseTaskBarActivityMeter) #ifdef COMPILE_USE_QT4 setObjectName(__tr2qs("taskbar")); - setFeatures(QDockWidget::DockWidgetMovable); + setFeatures(TQDockWidget::DockWidgetMovable); #endif //COMPILE_USE_QT4 - m_pActivityMeterTimer = new QTimer(); - connect(m_pActivityMeterTimer,SIGNAL(timeout()),this,SLOT(updateActivityMeter())); + m_pActivityMeterTimer = new TQTimer(); + connect(m_pActivityMeterTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(updateActivityMeter())); m_pActivityMeterTimer->start(5000); } @@ -105,7 +105,7 @@ void KviTaskBarBase::updateActivityMeter() { } -void KviTaskBarBase::getTextForConsole(QString &szText,KviConsole * pConsole) +void KviTaskBarBase::getTextForConsole(TQString &szText,KviConsole * pConsole) { if(pConsole->isConnected()) { @@ -194,13 +194,13 @@ KviTaskBarItem::~KviTaskBarItem() // -KviTaskBarButton::KviTaskBarButton(QWidget * par,KviWindow * wnd,const char * name) -: QPushButton(par,name) , KviTaskBarItem(wnd) +KviTaskBarButton::KviTaskBarButton(TQWidget * par,KviWindow * wnd,const char * name) +: TQPushButton(par,name) , KviTaskBarItem(wnd) { m_bActive = false; m_pTip = new KviDynamicToolTip(this); - connect(m_pTip,SIGNAL(tipRequest(KviDynamicToolTip *,const QPoint &)),this,SLOT(tipRequest(KviDynamicToolTip *,const QPoint &))); -// setBackgroundMode(QWidget::NoBackground); + connect(m_pTip,TQT_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQT_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); +// setBackgroundMode(TQWidget::NoBackground); setToggleButton (true); setFlat ( KVI_OPTION_BOOL(KviOption_boolUseFlatClassicTaskbarButtons) ); } @@ -210,21 +210,21 @@ KviTaskBarButton::~KviTaskBarButton() delete m_pTip; //not necessary ? } -void KviTaskBarButton::tipRequest(KviDynamicToolTip *,const QPoint &pnt) +void KviTaskBarButton::tipRequest(KviDynamicToolTip *,const TQPoint &pnt) { if(KVI_OPTION_BOOL(KviOption_boolShowTaskBarToolTips)) { - QString szText; + TQString szText; m_pWindow->getTaskBarTipText(szText); m_pTip->tip(rect(),szText); } } -void KviTaskBarButton::mousePressEvent(QMouseEvent *e) +void KviTaskBarButton::mousePressEvent(TQMouseEvent *e) { if(e->button() & Qt::LeftButton) { - if(e->state() & Qt::ShiftButton) + if(e->state() & TQt::ShiftButton) { m_pWindow->delayedClose(); } else { @@ -234,13 +234,11 @@ void KviTaskBarButton::mousePressEvent(QMouseEvent *e) } else m_pWindow->contextPopup(); } -#if QT_VERSION >= 300 -void KviTaskBarButton::contextMenuEvent(QContextMenuEvent *e) +void KviTaskBarButton::contextMenuEvent(TQContextMenuEvent *e) { m_pWindow->contextPopup(); e->accept(); } -#endif void KviTaskBarButton::setActive(bool bActive) { @@ -261,46 +259,46 @@ void KviTaskBarButton::setActive(bool bActive) } #ifdef COMPILE_USE_QT4 -void KviTaskBarButton::paintEvent(QPaintEvent * e) +void KviTaskBarButton::paintEvent(TQPaintEvent * e) { - QPainter p(this); - QStyleOption opt; + TQPainter p(this); + TQStyleOption opt; opt.initFrom(this); if(isOn()) - opt.state = QStyle::State_On | QStyle::State_Active; - style()->drawPrimitive(QStyle::PE_PanelButtonTool,&opt,&p,this); + opt.state = TQStyle::State_On | TQStyle::State_Active; + style()->drawPrimitive(TQStyle::PE_PanelButtonTool,&opt,&p,this); drawButtonLabel(&p); } #endif -void KviTaskBarButton::drawButtonLabel(QPainter * painter) +void KviTaskBarButton::drawButtonLabel(TQPainter * painter) { - QRect distRect = painter->window(); + TQRect distRect = painter->window(); int iHeight = distRect.height(); int iWidth = distRect.width(); - QPainter * pPainter; + TQPainter * pPainter; #ifdef COMPILE_USE_QT4 pPainter = painter; #else //!COMPILE_USE_QT4 KviDoubleBuffer db(iWidth,iHeight); - QPixmap * pMemBuffer = db.pixmap(); - QPainter p(pMemBuffer); + TQPixmap * pMemBuffer = db.pixmap(); + TQPainter p(pMemBuffer); bitBlt(pMemBuffer,0,0,painter->device(),distRect.x(),distRect.y(),iWidth,iHeight); pPainter = &p; #endif //!COMPILE_USE_QT4 if(KVI_OPTION_BOOL(KviOption_boolUseTaskBarIrcContextIndicator)) { iHeight -= KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT; - QColor base = colorGroup().background(); + TQColor base = tqcolorGroup().background(); if(m_pWindow->console()) { - QColor cntx = KVI_OPTION_ICCOLOR(m_pWindow->console()->ircContextId() % KVI_NUM_ICCOLOR_OPTIONS); + TQColor cntx = KVI_OPTION_ICCOLOR(m_pWindow->console()->ircContextId() % KVI_NUM_ICCOLOR_OPTIONS); base.setRgb((base.red() + cntx.red()) >> 1,(base.green() + cntx.green()) >> 1, (base.blue() + cntx.blue()) >> 1); pPainter->fillRect(2,iHeight,iWidth - 4,KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT - 2,base); } else { - pPainter->fillRect(2,iHeight,iWidth - 4,KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT - 2,colorGroup().brush(QColorGroup::Background)); + pPainter->fillRect(2,iHeight,iWidth - 4,KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT - 2,tqcolorGroup().brush(TQColorGroup::Background)); } } @@ -323,7 +321,7 @@ void KviTaskBarButton::drawButtonLabel(QPainter * painter) } } - QRect cRect(daX,3,iWidth - (20 + daX),iHeight - 6); + TQRect cRect(daX,3,iWidth - (20 + daX),iHeight - 6); if(m_iProgress >= 0) { @@ -334,8 +332,8 @@ void KviTaskBarButton::drawButtonLabel(QPainter * painter) pPainter->fillRect(daX,3,wdth,cRect.height(),KVI_OPTION_COLOR(KviOption_colorTaskBarProgressBar)); } - QRect bRect; - QString szText; + TQRect bRect; + TQString szText; bool bMinimized = m_pWindow->isMinimized(); @@ -363,7 +361,7 @@ void KviTaskBarButton::drawButtonLabel(QPainter * painter) { case KVI_WINDOW_TYPE_CONSOLE: { - QFont f = QFont(KVI_OPTION_FONT(KviOption_fontTaskbar)); + TQFont f = TQFont(KVI_OPTION_FONT(KviOption_fontTaskbar)); f.setBold(true); pPainter->setFont(f); KviTaskBarBase::getTextForConsole(szText,(KviConsole *)m_pWindow); @@ -373,8 +371,8 @@ void KviTaskBarButton::drawButtonLabel(QPainter * painter) case KVI_WINDOW_TYPE_DEADCHANNEL: szText = ((KviChannel *)m_pWindow)->nameWithUserFlag(); break; - case KVI_WINDOW_TYPE_QUERY: - case KVI_WINDOW_TYPE_DEADQUERY: + case KVI_WINDOW_TYPE_TQUERY: + case KVI_WINDOW_TYPE_DEADTQUERY: szText = m_pWindow->windowName(); break; default: @@ -384,28 +382,28 @@ void KviTaskBarButton::drawButtonLabel(QPainter * painter) if(bMinimized) { - QString tmp = QChar('('); + TQString tmp = TQChar('('); tmp += szText; - tmp += QChar(')'); - pPainter->drawText(cRect,Qt::AlignLeft | Qt::AlignTop,tmp,-1,&bRect); + tmp += TQChar(')'); + pPainter->drawText(cRect,TQt::AlignLeft | TQt::AlignTop,tmp,-1,&bRect); } else { - pPainter->drawText(cRect,Qt::AlignLeft | Qt::AlignTop,szText,-1,&bRect); + pPainter->drawText(cRect,TQt::AlignLeft | TQt::AlignTop,szText,-1,&bRect); } if(bRect.width() > cRect.width()) { pPainter->setClipRect(cRect.right(),cRect.y(),10,cRect.height()); - QColor base = pPainter->pen().color(); - QColor bg = colorGroup().color(QColorGroup::Background); + TQColor base = pPainter->pen().color(); + TQColor bg = tqcolorGroup().color(TQColorGroup::Background); base.setRgb((base.red() + bg.red()) / 2,(base.green() + bg.green()) / 2,(base.blue() + bg.blue()) / 2); pPainter->setPen(base); cRect.setWidth(cRect.width() + 10); - pPainter->drawText(cRect,Qt::AlignLeft | Qt::AlignTop,szText,-1); + pPainter->drawText(cRect,TQt::AlignLeft | TQt::AlignTop,szText,-1); pPainter->setClipRect(cRect.right(),cRect.y(),5,cRect.height()); base.setRgb((base.red() + bg.red()) / 2,(base.green() + bg.green()) / 2,(base.blue() + bg.blue()) / 2); pPainter->setPen(base); cRect.setWidth(cRect.width() + 10); - pPainter->drawText(cRect,Qt::AlignLeft | Qt::AlignTop,szText,-1); + pPainter->drawText(cRect,TQt::AlignLeft | TQt::AlignTop,szText,-1); } #ifndef COMPILE_USE_QT4 pPainter->setClipping(FALSE); @@ -423,7 +421,7 @@ void KviTaskBarButton::setProgress(int progress) { if(progress == m_iProgress)return; m_iProgress = progress; - update(); // repaint(false) ? + update(); // tqrepaint(false) ? } void KviTaskBarButton::unhighlight() @@ -441,7 +439,7 @@ void KviTaskBarButton::highlight(int iLevel) m_iHighlightLevel = iLevel; if(g_pFrame->dockExtension())g_pFrame->dockExtension()->refresh(); if(m_bActive)return; - update(); // repaint(false) ? + update(); // tqrepaint(false) ? } @@ -460,7 +458,7 @@ KviTaskBarToolTip::~KviTaskBarToolTip() { } -void KviTaskBarToolTip::maybeTip(const QPoint &pnt) +void KviTaskBarToolTip::maybeTip(const TQPoint &pnt) { tip(m_pTaskBarButton->rect(),m_pTaskBarButton->m_pWindow->plainTextCaption()); } @@ -479,7 +477,7 @@ KviClassicTaskBar::KviClassicTaskBar() calcButtonHeight(); - m_pBase = new QWidget(this); + m_pBase = new TQWidget(this); // m_pBase->setBackgroundMode(NoBackground); #ifdef COMPILE_USE_QT4 setWidget(m_pBase); @@ -500,7 +498,7 @@ KviClassicTaskBar::KviClassicTaskBar() #ifndef COMPILE_USE_QT4 setResizeEnabled( true ); - connect(this,SIGNAL(orientationChanged(Orientation)),this,SLOT(orientationChangedSlot(Orientation))); + connect(this,TQT_SIGNAL(orientationChanged(Qt::Orientation)),this,TQT_SLOT(orientationChangedSlot(Qt::Orientation))); #endif } @@ -519,11 +517,11 @@ void KviClassicTaskBar::orientationChangedSlot(Qt::Orientation o) } /* -void KviClassicTaskBar::fontChange(const QFont &old) +void KviClassicTaskBar::fontChange(const TQFont &old) { calcButtonHeight(); doLayout(); - QToolBar::fontChange(old); + TQToolBar::fontChange(old); } */ @@ -538,7 +536,7 @@ void KviClassicTaskBar::updateActivityMeter() void KviClassicTaskBar::calcButtonHeight() { - QFontMetrics fm(KVI_OPTION_FONT(KviOption_fontTaskbar)); + TQFontMetrics fm(KVI_OPTION_FONT(KviOption_fontTaskbar)); m_iButtonHeight = fm.lineSpacing() + 6; if(m_iButtonHeight < 22)m_iButtonHeight = 22; if(KVI_OPTION_BOOL(KviOption_boolUseTaskBarIrcContextIndicator)) @@ -569,7 +567,7 @@ void KviClassicTaskBar::insertButton(KviTaskBarButton * b) { // same type! // sort by name - if(!KVI_OPTION_BOOL(KviOption_boolSortTaskBarItemsByName) || (KviQString::cmpCI(btn->kviWindow()->windowName(),b->kviWindow()->windowName()) > 0)) + if(!KVI_OPTION_BOOL(KviOption_boolSortTaskBarItemsByName) || (KviTQString::cmpCI(btn->kviWindow()->windowName(),b->kviWindow()->windowName()) > 0)) { // got a "higher one" m_pButtonList->insert(idx,b); @@ -658,19 +656,19 @@ void KviClassicTaskBar::doLayout() } #ifdef COMPILE_USE_QT4 - if(isFloating() || ((g_pFrame->dockWidgetArea(this) != Qt::BottomDockWidgetArea) && (g_pFrame->dockWidgetArea(this) != Qt::TopDockWidgetArea))) + if(isFloating() || ((g_pFrame->dockWidgetArea(this) != TQt::BottomDockWidgetArea) && (g_pFrame->dockWidgetArea(this) != TQt::TopDockWidgetArea))) { - QDockWidget::DockWidgetFeatures f = features(); - if(f & QDockWidget::DockWidgetVerticalTitleBar) + TQDockWidget::DockWidgetFeatures f = features(); + if(f & TQDockWidget::DockWidgetVerticalTitleBar) { - f &= ~QDockWidget::DockWidgetVerticalTitleBar; + f &= ~TQDockWidget::DockWidgetVerticalTitleBar; setFeatures(f); } } else { - QDockWidget::DockWidgetFeatures f = features(); - if(!(f & QDockWidget::DockWidgetVerticalTitleBar)) + TQDockWidget::DockWidgetFeatures f = features(); + if(!(f & TQDockWidget::DockWidgetVerticalTitleBar)) { - f |= QDockWidget::DockWidgetVerticalTitleBar; + f |= TQDockWidget::DockWidgetVerticalTitleBar; setFeatures(f); } } @@ -740,7 +738,7 @@ void KviClassicTaskBar::applyOptions() doLayout(); } -void KviClassicTaskBar::resizeEvent(QResizeEvent *e) +void KviClassicTaskBar::resizeEvent(TQResizeEvent *e) { /* #ifdef COMPILE_USE_QT4 @@ -779,7 +777,7 @@ inline KviTaskBarItem * KviClassicTaskBar::prevItem(void) inline bool KviClassicTaskBar::setIterationPointer(KviTaskBarItem * it) { - return (m_pButtonList->findRef((const KviTaskBarButton *)it) != -1); + return (m_pButtonList->tqfindRef((const KviTaskBarButton *)it) != -1); } @@ -794,8 +792,8 @@ KviTreeTaskBarItem::KviTreeTaskBarItem(KviTalListView * par,KviWindow * wnd) m_iStepNumber=0; m_bIncreasing=0; m_pInternal=new KviTreeTaskBarItemInternal(this); - m_pAnimTimer=new QTimer(); - QObject::connect( m_pAnimTimer, SIGNAL(timeout()), m_pInternal, SLOT(timerShot())); + m_pAnimTimer=new TQTimer(); + TQObject::connect( m_pAnimTimer, TQT_SIGNAL(timeout()), m_pInternal, TQT_SLOT(timerShot())); applyOptions(); } @@ -805,8 +803,8 @@ KviTreeTaskBarItem::KviTreeTaskBarItem(KviTreeTaskBarItem * par,KviWindow * wnd) m_iStepNumber=0; m_bIncreasing=0; m_pInternal=new KviTreeTaskBarItemInternal(this); - m_pAnimTimer=new QTimer(); - QObject::connect( m_pAnimTimer, SIGNAL(timeout()), m_pInternal, SLOT(timerShot())); + m_pAnimTimer=new TQTimer(); + TQObject::connect( m_pAnimTimer, TQT_SIGNAL(timeout()), m_pInternal, TQT_SLOT(timerShot())); applyOptions(); } @@ -835,7 +833,7 @@ void KviTreeTaskBarItem::applyOptions() void KviTreeTaskBarItem::captionChanged() { // FIXME: can we do better ? - repaint(); + tqrepaint(); } void KviTreeTaskBarItem::unhighlight() @@ -843,7 +841,7 @@ void KviTreeTaskBarItem::unhighlight() if(m_iHighlightLevel < 1)return; m_iHighlightLevel = 0; if(g_pFrame->dockExtension())g_pFrame->dockExtension()->refresh(); - repaint(); + tqrepaint(); } void KviTreeTaskBarItem::highlight(int iLevel) @@ -853,14 +851,14 @@ void KviTreeTaskBarItem::highlight(int iLevel) m_iHighlightLevel = iLevel; if(g_pFrame->dockExtension())g_pFrame->dockExtension()->refresh(); if(isSelected())return; - repaint(); // repaint(false) ? + tqrepaint(); // tqrepaint(false) ? } void KviTreeTaskBarItem::setProgress(int progress) { if(progress == m_iProgress)return; m_iProgress = progress; - repaint(); // repaint(false) ? + tqrepaint(); // tqrepaint(false) ? } void KviTreeTaskBarItem::setActive(bool bActive) @@ -870,7 +868,7 @@ void KviTreeTaskBarItem::setActive(bool bActive) // m_bHighlighted = false; // m_bAltColor = false; m_iHighlightLevel = 0; - // was not selected: the listView will repaint it + // was not selected: the listView will tqrepaint it } else { if(isSelected()) { @@ -878,26 +876,26 @@ void KviTreeTaskBarItem::setActive(bool bActive) // m_bHighlighted = false; // m_bAltColor = false; m_iHighlightLevel = 0; - // was selected: the list view will repaint it + // was selected: the list view will tqrepaint it } } } #ifdef COMPILE_USE_QT4 -void KviTreeTaskBarItem::paintBranches(QPainter *p,const QColorGroup &,int w,int y,int h) +void KviTreeTaskBarItem::paintBranches(TQPainter *p,const TQColorGroup &,int w,int y,int h) #else -void KviTreeTaskBarItem::paintBranches(QPainter *p,const QColorGroup &,int w,int y,int h,GUIStyle s) +void KviTreeTaskBarItem::paintBranches(TQPainter *p,const TQColorGroup &,int w,int y,int h,GUIStyle s) #endif { SET_ANTI_ALIASING(*p); - ((KviTreeTaskBarListView *)listView())->paintEmptyArea(p,QRect(0,y,w,totalHeight() - height())); + ((KviTreeTaskBarListView *)listView())->paintEmptyArea(p,TQRect(0,y,w,totalHeight() - height())); } -void KviTreeTaskBarItem::paintCell(QPainter *painter,const QColorGroup &cg,int column,int width,int) +void KviTreeTaskBarItem::paintCell(TQPainter *painter,const TQColorGroup &cg,int column,int width,int) { KviDoubleBuffer db(width,height()); - QPixmap * pMemBuffer = db.pixmap(); - QPainter p(pMemBuffer); + TQPixmap * pMemBuffer = db.pixmap(); + TQPainter p(pMemBuffer); SET_ANTI_ALIASING(p); if(isSelected()) @@ -909,7 +907,7 @@ void KviTreeTaskBarItem::paintCell(QPainter *painter,const QColorGroup &cg,int c #ifdef COMPILE_PSEUDO_TRANSPARENCY if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = listView()->viewport()->mapToGlobal(QPoint(int(painter->worldMatrix().dx()),int(painter->worldMatrix().dy()))); + TQPoint pnt = listView()->viewport()->mapToGlobal(TQPoint(int(painter->tqworldMatrix().dx()),int(painter->tqworldMatrix().dy()))); p.drawTiledPixmap(0,0,width,height(),*g_pShadedChildGlobalDesktopBackground,pnt.x(),pnt.y()); } else { #endif @@ -917,19 +915,19 @@ void KviTreeTaskBarItem::paintCell(QPainter *painter,const QColorGroup &cg,int c #ifdef COMPILE_PSEUDO_TRANSPARENCY } #endif - QPixmap * pix = KVI_OPTION_PIXMAP(KviOption_pixmapTreeTaskBarBackground).pixmap(); + TQPixmap * pix = KVI_OPTION_PIXMAP(KviOption_pixmapTreeTaskBarBackground).pixmap(); if(pix) { - QPoint pnt = listView()->viewportToContents(QPoint(int(painter->worldMatrix().dx()),int(painter->worldMatrix().dy()))); + TQPoint pnt = listView()->viewportToContents(TQPoint(int(painter->tqworldMatrix().dx()),int(painter->tqworldMatrix().dy()))); //p.drawTiledPixmap(0,0,width,height(),*pix,pnt.x(),pnt.y()); // debug("%i %i",pnt.x(),pnt.y()); p.translate(-pnt.x(),-pnt.y()); - KviPixmapUtils::drawPixmapWithPainter(&p,pix,KVI_OPTION_UINT(KviOption_uintTreeTaskBarPixmapAlign),QRect(pnt.x(),pnt.y(),width,height()),listView()->width(),listView()->height()); + KviPixmapUtils::drawPixmapWithPainter(&p,pix,KVI_OPTION_UINT(KviOption_uintTreeTaskBarPixmapAlign),TQRect(pnt.x(),pnt.y(),width,height()),listView()->width(),listView()->height()); p.translate(pnt.x(),pnt.y()); } } else { p.fillRect(0,0,width,height(), - QColor(KVI_OPTION_COLOR(KviOption_colorTreeTaskBarBackground).red()+m_iRedDiff*m_iStepNumber, + TQColor(KVI_OPTION_COLOR(KviOption_colorTreeTaskBarBackground).red()+m_iRedDiff*m_iStepNumber, KVI_OPTION_COLOR(KviOption_colorTreeTaskBarBackground).green()+m_iGreenDiff*m_iStepNumber, KVI_OPTION_COLOR(KviOption_colorTreeTaskBarBackground).blue()+m_iBlueDiff*m_iStepNumber ) @@ -942,9 +940,9 @@ void KviTreeTaskBarItem::paintCell(QPainter *painter,const QColorGroup &cg,int c int im = listView()->itemMargin(); int yPixmap = (h - 16) >> 1; - QString szText; + TQString szText; - QRect cRect(im + 3,0,width - (im << 1),height()); + TQRect cRect(im + 3,0,width - (im << 1),height()); switch(m_pWindow->type()) { @@ -952,8 +950,8 @@ void KviTreeTaskBarItem::paintCell(QPainter *painter,const QColorGroup &cg,int c { if(KVI_OPTION_BOOL(KviOption_boolUseTaskBarIrcContextIndicator)) { - QColor base = cg.background(); - QColor cntx = KVI_OPTION_ICCOLOR(m_pWindow->console()->ircContextId() % KVI_NUM_ICCOLOR_OPTIONS); + TQColor base = cg.background(); + TQColor cntx = KVI_OPTION_ICCOLOR(m_pWindow->console()->ircContextId() % KVI_NUM_ICCOLOR_OPTIONS); base.setRgb((base.red() + cntx.red()) >> 1,(base.green() + cntx.green()) >> 1, (base.blue() + cntx.blue()) >> 1); p.fillRect(im + 2,yPixmap + 1,14,15,base); @@ -972,7 +970,7 @@ void KviTreeTaskBarItem::paintCell(QPainter *painter,const QColorGroup &cg,int c cRect.setLeft(cRect.left() + 17); } } - QFont f = QFont(); + TQFont f = TQFont(); f.setBold(true); p.setFont(f); KviTaskBarBase::getTextForConsole(szText,(KviConsole *)m_pWindow); @@ -987,8 +985,8 @@ void KviTreeTaskBarItem::paintCell(QPainter *painter,const QColorGroup &cg,int c cRect.setLeft(cRect.left() + 17); } break; - case KVI_WINDOW_TYPE_QUERY: - case KVI_WINDOW_TYPE_DEADQUERY: + case KVI_WINDOW_TYPE_TQUERY: + case KVI_WINDOW_TYPE_DEADTQUERY: szText = m_pWindow->windowName(); if(KVI_OPTION_BOOL(KviOption_boolUseTaskBarIcons)) { @@ -1039,7 +1037,7 @@ void KviTreeTaskBarItem::paintCell(QPainter *painter,const QColorGroup &cg,int c default: iLevel = KviOption_colorTreeTaskBarHighlight5Foreground; break; } p.setPen( - QColor( + TQColor( calculateColor(KVI_OPTION_COLOR(iLevel).red(),KVI_OPTION_COLOR(KviOption_colorTreeTaskBarActiveForeground).red()), calculateColor(KVI_OPTION_COLOR(iLevel).green(),KVI_OPTION_COLOR(KviOption_colorTreeTaskBarActiveForeground).green()), calculateColor(KVI_OPTION_COLOR(iLevel).blue(),KVI_OPTION_COLOR(KviOption_colorTreeTaskBarActiveForeground).blue()) @@ -1049,21 +1047,21 @@ void KviTreeTaskBarItem::paintCell(QPainter *painter,const QColorGroup &cg,int c if(m_pWindow->isMinimized()) { - QString tmp = QChar('('); + TQString tmp = TQChar('('); tmp += szText; - tmp += QChar(')'); - p.drawText(cRect,Qt::AlignLeft | Qt::AlignVCenter,tmp,-1,0); + tmp += TQChar(')'); + p.drawText(cRect,TQt::AlignLeft | TQt::AlignVCenter,tmp,-1,0); } else { - p.drawText(cRect,Qt::AlignLeft | Qt::AlignVCenter,szText,-1,0); + p.drawText(cRect,TQt::AlignLeft | TQt::AlignVCenter,szText,-1,0); } painter->drawPixmap(0,0,*pMemBuffer,0,0,width,height()); - //bitBlt(painter->pixmap(),0,0,pMemBuffer,0,0,width,height(),Qt::CopyROP,false); + //bitBlt(painter->pixmap(),0,0,pMemBuffer,0,0,width,height(),TQt::CopyROP,false); } -QString KviTreeTaskBarItem::key(int,bool) const +TQString KviTreeTaskBarItem::key(int,bool) const { - QString ret = m_pWindow->typeString(); + TQString ret = m_pWindow->typeString(); ret.append(m_pWindow->windowName()); return ret; } @@ -1083,7 +1081,7 @@ void KviTreeTaskBarItem::timerShot() m_pAnimTimer->stop(); m_iStepNumber=0; //make shure, that we cannot get out of range } - repaint(); + tqrepaint(); } void KviTreeTaskBarItem::mouseEnter() @@ -1110,7 +1108,7 @@ void KviTreeTaskBarItem::mouseLeave() // -KviTreeTaskBarListView::KviTreeTaskBarListView(QWidget * par) +KviTreeTaskBarListView::KviTreeTaskBarListView(TQWidget * par) : KviTalListView(par) { //setSorting(0); @@ -1126,7 +1124,7 @@ KviTreeTaskBarListView::~KviTreeTaskBarListView() { } -void KviTreeTaskBarListView::contentsMouseMoveEvent ( QMouseEvent * e ) +void KviTreeTaskBarListView::contentsMouseMoveEvent ( TQMouseEvent * e ) { if(!e) return; KviTreeTaskBarItem* pCur=(KviTreeTaskBarItem*)(itemAt(contentsToViewport(e->pos()))); @@ -1134,21 +1132,21 @@ void KviTreeTaskBarListView::contentsMouseMoveEvent ( QMouseEvent * e ) { if(m_pPrevItem)m_pPrevItem->mouseLeave(); if(pCur) pCur->mouseEnter(); - setCursor(Qt::PointingHandCursor); + setCursor(TQt::PointingHandCursor); m_pPrevItem=pCur; } else if(!pCur) { - setCursor(Qt::ArrowCursor); + setCursor(TQt::ArrowCursor); } } -void KviTreeTaskBarListView::leaveEvent(QEvent *) +void KviTreeTaskBarListView::leaveEvent(TQEvent *) { if(m_pPrevItem) m_pPrevItem->mouseLeave(); m_pPrevItem=0; - setCursor(Qt::ArrowCursor); + setCursor(TQt::ArrowCursor); } -void KviTreeTaskBarListView::contentsMousePressEvent(QMouseEvent *e) +void KviTreeTaskBarListView::contentsMousePressEvent(TQMouseEvent *e) { KviTalListViewItem * it = (KviTalListViewItem *)itemAt(contentsToViewport(e->pos())); if(it) @@ -1159,9 +1157,9 @@ void KviTreeTaskBarListView::contentsMousePressEvent(QMouseEvent *e) if(e->button() & Qt::RightButton) { KviTalPopupMenu* pPopup=new KviTalPopupMenu(); - pPopup->insertItem(__tr2qs("Sort"),this,SLOT(sort())); - pPopup->insertItem(__tr2qs("Reverse Sort"),this,SLOT(reverseSort())); - pPopup->popup(QCursor::pos()); + pPopup->insertItem(__tr2qs("Sort"),this,TQT_SLOT(sort())); + pPopup->insertItem(__tr2qs("Reverse Sort"),this,TQT_SLOT(reverseSort())); + pPopup->popup(TQCursor::pos()); } } } @@ -1176,25 +1174,25 @@ void KviTreeTaskBarListView::reverseSort() setSorting(0,FALSE); } -void KviTreeTaskBarListView::resizeEvent(QResizeEvent *e) +void KviTreeTaskBarListView::resizeEvent(TQResizeEvent *e) { KviTalListView::resizeEvent(e); setColumnWidth(0,viewport()->width()); resizeContents(viewport()->width(),contentsHeight()); } -//void KviTreeTaskBarListView::paintEmptyAreaInternal(QPainter * p,const QRect &viewportRect,const QRect &painterRect) +//void KviTreeTaskBarListView::paintEmptyAreaInternal(TQPainter * p,const TQRect &viewportRect,const TQRect &painterRect) //{ // //} -void KviTreeTaskBarListView::paintEmptyArea(QPainter * p,const QRect &rct) +void KviTreeTaskBarListView::paintEmptyArea(TQPainter * p,const TQRect &rct) { SET_ANTI_ALIASING(*p); #ifdef COMPILE_PSEUDO_TRANSPARENCY if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = viewport()->mapToGlobal(QPoint(rct.x() + int(p->worldMatrix().dx()),rct.y() + int(p->worldMatrix().dy()))); + TQPoint pnt = viewport()->mapToGlobal(TQPoint(rct.x() + int(p->tqworldMatrix().dx()),rct.y() + int(p->tqworldMatrix().dy()))); p->drawTiledPixmap(rct.x(),rct.y(),rct.width(),rct.height(),*g_pShadedChildGlobalDesktopBackground,pnt.x(),pnt.y()); } else { #endif @@ -1203,10 +1201,10 @@ void KviTreeTaskBarListView::paintEmptyArea(QPainter * p,const QRect &rct) } #endif - QPixmap * pix = KVI_OPTION_PIXMAP(KviOption_pixmapTreeTaskBarBackground).pixmap(); + TQPixmap * pix = KVI_OPTION_PIXMAP(KviOption_pixmapTreeTaskBarBackground).pixmap(); if(pix) { - QPoint pnt = viewportToContents(QPoint(rct.x() + int(p->worldMatrix().dx()),rct.y() + int(p->worldMatrix().dy()))); + TQPoint pnt = viewportToContents(TQPoint(rct.x() + int(p->tqworldMatrix().dx()),rct.y() + int(p->tqworldMatrix().dy()))); //p->drawTiledPixmap(rct.x(),rct.y(),rct.width(),rct.height(),*pix,pnt.x(),pnt.y()); KviPixmapUtils::drawPixmapWithPainter(p,pix,KVI_OPTION_UINT(KviOption_uintTreeTaskBarPixmapAlign),rct,viewport()->width(),viewport()->height(),pnt.x(),pnt.y()); } @@ -1237,7 +1235,7 @@ KviTreeTaskBar::KviTreeTaskBar() // FIXME: this code is useless ? if(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth) < 48) KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth) = 48; - int iMin = m_pListView->minimumSize().width() + 4; + int iMin = m_pListView->tqminimumSize().width() + 4; if(((unsigned int)iMin) < KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth)) iMin = KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth); setMinimumWidth(iMin); @@ -1249,15 +1247,15 @@ KviTreeTaskBar::KviTreeTaskBar() //m_pListView->setMinimumWidth(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMinimumWidth)); //m_pListView->setMaximumWidth(KVI_OPTION_UINT(KviOption_uintTreeTaskBarMaximumWidth)); #ifdef COMPILE_USE_QT4 - m_pListView->setFocusPolicy(Qt::NoFocus); + m_pListView->setFocusPolicy(TTQ_NoFocus); #else - m_pListView->setFocusPolicy(QWidget::NoFocus); + m_pListView->setFocusPolicy(TQ_NoFocus); #endif m_pListView->setStaticBackground(true); #ifdef COMPILE_USE_QT4 m_pListView->viewport()->setAutoFillBackground(false); #else - m_pListView->viewport()->setBackgroundMode(QWidget::NoBackground); + m_pListView->viewport()->setBackgroundMode(TQWidget::NoBackground); #endif if(!KVI_OPTION_BOOL(KviOption_boolShowTreeTaskbarHeader)) { @@ -1272,14 +1270,12 @@ KviTreeTaskBar::KviTreeTaskBar() m_pListView->viewport()->installEventFilter(this); -#if QT_VERSION >= 300 #ifndef COMPILE_USE_QT4 setResizeEnabled(true); #endif -#endif m_pToolTip = new KviDynamicToolTip(m_pListView->viewport(),"tree_taskbar_tooltip"); - connect(m_pToolTip,SIGNAL(tipRequest(KviDynamicToolTip *,const QPoint &)),this,SLOT(tipRequest(KviDynamicToolTip *,const QPoint &))); + connect(m_pToolTip,TQT_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQT_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); } KviTreeTaskBar::~KviTreeTaskBar() @@ -1293,34 +1289,34 @@ void KviTreeTaskBar::updatePseudoTransparency() #endif } -void KviTreeTaskBar::moveEvent(QMoveEvent *) +void KviTreeTaskBar::moveEvent(TQMoveEvent *) { #ifdef COMPILE_PSEUDO_TRANSPARENCY updatePseudoTransparency(); #endif } -void KviTreeTaskBar::tipRequest(KviDynamicToolTip *,const QPoint &pnt) +void KviTreeTaskBar::tipRequest(KviDynamicToolTip *,const TQPoint &pnt) { if(KVI_OPTION_BOOL(KviOption_boolShowTaskBarToolTips)) { KviTalListViewItem * it = (KviTalListViewItem *)m_pListView->itemAt(pnt); if(it) { - QString szText; + TQString szText; ((KviTreeTaskBarItem *)it)->m_pWindow->getTaskBarTipText(szText); - m_pToolTip->tip(m_pListView->itemRect(it),szText); + m_pToolTip->tip(m_pListView->tqitemRect(it),szText); } } } -bool KviTreeTaskBar::eventFilter(QObject * o,QEvent *e) +bool KviTreeTaskBar::eventFilter(TQObject * o,TQEvent *e) { - if(o == m_pListView->viewport()) + if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pListView->viewport())) { - if(e->type() == QEvent::MouseButtonPress) + if(e->type() == TQEvent::MouseButtonPress) { - QMouseEvent * ev = (QMouseEvent *)e; + TQMouseEvent * ev = (TQMouseEvent *)e; KviTreeTaskBarItem * it = (KviTreeTaskBarItem *)m_pListView->itemAt(ev->pos()); if(!it)return false; KviWindow * wnd = it->kviWindow(); @@ -1328,7 +1324,7 @@ bool KviTreeTaskBar::eventFilter(QObject * o,QEvent *e) { if(ev->button() & Qt::LeftButton) { - if(ev->state() & Qt::ShiftButton) + if(ev->state() & TQt::ShiftButton) { wnd->delayedClose(); } else { @@ -1377,9 +1373,9 @@ void KviTreeTaskBar::setActiveItem(KviTaskBarItem * it) { cur->setActive(false); } - if(((KviTreeTaskBarItem *)it)->parent()) + if(((KviTreeTaskBarItem *)it)->tqparent()) { - if(!((KviTreeTaskBarItem *)it)->parent()->isOpen())((KviTreeTaskBarItem *)it)->parent()->setOpen(true); + if(!((KviTreeTaskBarItem *)it)->tqparent()->isOpen())((KviTreeTaskBarItem *)it)->tqparent()->setOpen(true); } ((KviTreeTaskBarItem *)it)->setActive(true); m_pListView->setSelected(((KviTreeTaskBarItem *)it),true); // this MUST go after it->setActive() @@ -1409,15 +1405,15 @@ KviTaskBarItem * KviTreeTaskBar::nextItem() { m_pCurrentItem = (KviTreeTaskBarItem *)m_pCurrentItem->firstChild(); } else { - // this item has no children: try the next sibling + // this item has no tqchildren: try the next sibling if(m_pCurrentItem->nextSibling()) { m_pCurrentItem = (KviTreeTaskBarItem *)m_pCurrentItem->nextSibling(); } else { - if(m_pCurrentItem->parent()) + if(m_pCurrentItem->tqparent()) { - // child with not siblings : try the sibling of the parent - m_pCurrentItem = (KviTreeTaskBarItem *)m_pCurrentItem->parent()->nextSibling(); + // child with not siblings : try the sibling of the tqparent + m_pCurrentItem = (KviTreeTaskBarItem *)m_pCurrentItem->tqparent()->nextSibling(); } else { m_pCurrentItem = 0; // toplevel with no siblings } @@ -1432,10 +1428,10 @@ KviTaskBarItem * KviTreeTaskBar::prevItem() if(!m_pCurrentItem)return 0; - if(m_pCurrentItem->parent()) + if(m_pCurrentItem->tqparent()) { // a child item - it = (KviTreeTaskBarItem *)m_pCurrentItem->parent()->firstChild(); + it = (KviTreeTaskBarItem *)m_pCurrentItem->tqparent()->firstChild(); while(it) { @@ -1444,7 +1440,7 @@ KviTaskBarItem * KviTreeTaskBar::prevItem() } if(!it) { - it = (KviTreeTaskBarItem *)m_pCurrentItem->parent(); + it = (KviTreeTaskBarItem *)m_pCurrentItem->tqparent(); } } else { diff --git a/src/kvirc/ui/kvi_taskbar.h b/src/kvirc/ui/kvi_taskbar.h index 300e0f6..9e9ebe2 100644 --- a/src/kvirc/ui/kvi_taskbar.h +++ b/src/kvirc/ui/kvi_taskbar.h @@ -27,16 +27,16 @@ #include "kvi_settings.h" #include "kvi_pointerlist.h" -#include <qframe.h> +#include <tqframe.h> #include "kvi_tal_tooltip.h" #include "kvi_tal_listview.h" -#include <qpushbutton.h> +#include <tqpushbutton.h> class KviWindow; class KviFrame; -class QPixmap; +class TQPixmap; class KviDynamicToolTip; class KviConsole; @@ -74,28 +74,29 @@ public: // This is the basic interface that all the external classes should see // -// Please note that Qt3 moc skips the *_SKIP_BEGIN -> *_SKIP_END blocks -// while the Qt4 moc skips the Q_MOC_RUN ifdef block.. so... +// Please note that TQt3 tqmoc skips the *_SKIP_BEGIN -> *_SKIP_END blocks +// while the TQt4 tqmoc skips the TQ_TQMOC_RUN ifdef block.. so... -// Qt4 version +// TQt4 version // If you get failures (undefined references) in some non-autotools based -// build system that uses Qt4 then you must add the -DCOMPILE_USE_QT4 -// commandline parameter to moc (at leat) when parsing this file. +// build system that uses TQt4 then you must add the -DCOMPILE_USE_QT4 +// commandline parameter to tqmoc (at leat) when parsing this file. -// MOC_SKIP_BEGIN +// TQMOC_SKIP_BEGIN #ifdef COMPILE_USE_QT4 -#include <QDockWidget> +#include <TQDockWidget> -class KVIRC_API KviTaskBarBase : public QDockWidget +class KVIRC_API KviTaskBarBase : public TQDockWidget { Q_OBJECT + TQ_OBJECT #endif //COMPILE_USE_QT4 -// MOC_SKIP_END +// TQMOC_SKIP_END -// Qt3 version -#ifndef Q_MOC_RUN +// TQt3 version +#ifndef TQ_TQMOC_RUN #ifndef COMPILE_USE_QT4 #include "kvi_toolbar.h" @@ -103,6 +104,7 @@ class KVIRC_API KviTaskBarBase : public QDockWidget class KVIRC_API KviTaskBarBase : public KviToolBar { Q_OBJECT + TQ_OBJECT #endif #endif @@ -111,7 +113,7 @@ public: virtual ~KviTaskBarBase(); protected: KviFrame * m_pFrm; - QTimer * m_pActivityMeterTimer; + TQTimer * m_pActivityMeterTimer; public: virtual KviTaskBarItem * addItem(KviWindow *){ return 0; }; virtual bool removeItem(KviTaskBarItem *){ return false; }; @@ -125,7 +127,7 @@ public: virtual void switchWindow(bool bNext,bool bInContextOnly); virtual void updatePseudoTransparency(){}; virtual void applyOptions(){}; - static void getTextForConsole(QString &szText,KviConsole * pConsole); + static void getTextForConsole(TQString &szText,KviConsole * pConsole); protected slots: virtual void updateActivityMeter(); }; @@ -138,24 +140,23 @@ protected slots: class KviClassicTaskBar; -class KVIRC_API KviTaskBarButton : public QPushButton , KviTaskBarItem +class KVIRC_API KviTaskBarButton : public TQPushButton , KviTaskBarItem { friend class KviClassicTaskBar; Q_OBJECT + TQ_OBJECT public: - KviTaskBarButton(QWidget * par,KviWindow * wnd,const char * name); + KviTaskBarButton(TQWidget * par,KviWindow * wnd,const char * name); ~KviTaskBarButton(); protected: bool m_bActive; KviDynamicToolTip * m_pTip; protected: - virtual void mousePressEvent(QMouseEvent *e); -#if QT_VERSION >= 300 - virtual void contextMenuEvent(QContextMenuEvent *e); -#endif - virtual void drawButtonLabel(QPainter *p); + virtual void mousePressEvent(TQMouseEvent *e); + virtual void contextMenuEvent(TQContextMenuEvent *e); + virtual void drawButtonLabel(TQPainter *p); #ifdef COMPILE_USE_QT4 - virtual void paintEvent(QPaintEvent * e); + virtual void paintEvent(TQPaintEvent * e); #endif public: virtual bool active(){ return m_bActive; }; @@ -166,27 +167,28 @@ public: protected: void setActive(bool bActive); protected slots: - void tipRequest(KviDynamicToolTip *tip,const QPoint &pnt); + void tipRequest(KviDynamicToolTip *tip,const TQPoint &pnt); }; class KVIRC_API KviClassicTaskBar : public KviTaskBarBase { Q_OBJECT + TQ_OBJECT public: KviClassicTaskBar(); ~KviClassicTaskBar(); protected: KviPointerList<KviTaskBarButton> * m_pButtonList; int m_iButtonHeight; - QWidget * m_pBase; + TQWidget * m_pBase; protected: void calcButtonHeight(); void doLayout(); // called by KviFrame to adjust a bug on WIndows void insertButton(KviTaskBarButton * b); public: -// virtual void fontChange(const QFont & old); - virtual void resizeEvent(QResizeEvent *e); +// virtual void fontChange(const TQFont & old); + virtual void resizeEvent(TQResizeEvent *e); public: virtual KviTaskBarItem * addItem(KviWindow *); virtual bool removeItem(KviTaskBarItem *); @@ -217,18 +219,18 @@ public: protected: int m_iStepNumber; bool m_bIncreasing; - QTimer* m_pAnimTimer; + TQTimer* m_pAnimTimer; KviTreeTaskBarItemInternal *m_pInternal; int m_iRedDiff; int m_iGreenDiff; int m_iBlueDiff; public: - virtual QString key(int column,bool) const; - virtual void paintCell(QPainter *p,const QColorGroup &cg,int column,int width,int alignment); + virtual TQString key(int column,bool) const; + virtual void paintCell(TQPainter *p,const TQColorGroup &cg,int column,int width,int tqalignment); #ifdef COMPILE_USE_QT4 - virtual void paintBranches(QPainter *p,const QColorGroup &cg,int w,int y,int h); + virtual void paintBranches(TQPainter *p,const TQColorGroup &cg,int w,int y,int h); #else - virtual void paintBranches(QPainter *p,const QColorGroup &cg,int w,int y,int h,GUIStyle s); + virtual void paintBranches(TQPainter *p,const TQColorGroup &cg,int w,int y,int h,GUIStyle s); #endif virtual void captionChanged(); virtual void highlight(int iLevel = 1); @@ -244,9 +246,10 @@ protected: int calculateColor(int col1,int col2); }; -class KviTreeTaskBarItemInternal : public QObject +class KviTreeTaskBarItemInternal : public TQObject { Q_OBJECT + TQ_OBJECT public: KviTreeTaskBarItemInternal(KviTreeTaskBarItem* pItem):m_pItem(pItem) {}; ~KviTreeTaskBarItemInternal() {}; @@ -260,16 +263,17 @@ class KVIRC_API KviTreeTaskBarListView : public KviTalListView { friend class KviTreeTaskBarItem; Q_OBJECT + TQ_OBJECT KviTreeTaskBarItem* m_pPrevItem; public: - KviTreeTaskBarListView(QWidget * par); + KviTreeTaskBarListView(TQWidget * par); ~KviTreeTaskBarListView(); protected: - virtual void contentsMousePressEvent(QMouseEvent *e); - virtual void paintEmptyArea(QPainter * p,const QRect &rct); - virtual void resizeEvent(QResizeEvent *e); - virtual void contentsMouseMoveEvent ( QMouseEvent * e ); - virtual void leaveEvent(QEvent *); + virtual void contentsMousePressEvent(TQMouseEvent *e); + virtual void paintEmptyArea(TQPainter * p,const TQRect &rct); + virtual void resizeEvent(TQResizeEvent *e); + virtual void contentsMouseMoveEvent ( TQMouseEvent * e ); + virtual void leaveEvent(TQEvent *); signals: void leftMousePress(KviTalListViewItem * it); void rightMousePress(KviTalListViewItem * it); @@ -282,6 +286,7 @@ public slots: class KVIRC_API KviTreeTaskBar : public KviTaskBarBase { Q_OBJECT + TQ_OBJECT public: KviTreeTaskBar(); ~KviTreeTaskBar(); @@ -299,13 +304,13 @@ public: virtual KviTaskBarItem * prevItem(void); virtual bool setIterationPointer(KviTaskBarItem * it); virtual void updatePseudoTransparency(); - virtual bool eventFilter(QObject * o,QEvent *e); + virtual bool eventFilter(TQObject * o,TQEvent *e); virtual void updateActivityMeter(); virtual void applyOptions(); protected: - virtual void moveEvent(QMoveEvent *); + virtual void moveEvent(TQMoveEvent *); protected slots: - void tipRequest(KviDynamicToolTip *tip,const QPoint &pnt); + void tipRequest(KviDynamicToolTip *tip,const TQPoint &pnt); }; diff --git a/src/kvirc/ui/kvi_texticonwin.cpp b/src/kvirc/ui/kvi_texticonwin.cpp index bd48078..fed0535 100644 --- a/src/kvirc/ui/kvi_texticonwin.cpp +++ b/src/kvirc/ui/kvi_texticonwin.cpp @@ -33,18 +33,18 @@ #include "kvi_mirccntrl.h" #include "kvi_iconmanager.h" -#include <qnamespace.h> -#include <qlineedit.h> +#include <tqnamespace.h> +#include <tqlineedit.h> #include <ctype.h> #ifdef COMPILE_USE_QT4 - #include <qevent.h> + #include <tqevent.h> #endif KviTextIconWindow::KviTextIconWindow() #ifdef COMPILE_USE_QT4 -: KviTalIconView(0,Qt::Popup) +: KviTalIconView(0,TQt::Popup) #else -: KviTalIconView(0,Qt::WType_Popup) +: KviTalIconView(0,TQt::WType_Popup) #endif { m_iTimerId = -1; @@ -52,9 +52,9 @@ KviTextIconWindow::KviTextIconWindow() setFixedSize(KVI_TEXTICON_WIN_WIDTH,KVI_TEXTICON_WIN_HEIGHT); m_pOwner = 0; fill(); - connect(g_pTextIconManager,SIGNAL(changed()),this,SLOT(fill())); - connect(this,SIGNAL(doubleClicked( KviTalIconViewItem * )),this,SLOT(itemSelected(KviTalIconViewItem *))); - connect(this,SIGNAL(returnPressed ( KviTalIconViewItem * ) ),this,SLOT(itemSelected(KviTalIconViewItem *))); + connect(g_pTextIconManager,TQT_SIGNAL(changed()),this,TQT_SLOT(fill())); + connect(this,TQT_SIGNAL(doubleClicked( KviTalIconViewItem * )),this,TQT_SLOT(itemSelected(KviTalIconViewItem *))); + connect(this,TQT_SIGNAL(returnPressed ( KviTalIconViewItem * ) ),this,TQT_SLOT(itemSelected(KviTalIconViewItem *))); m_bAltMode = false; setWordWrapIconText(true); } @@ -73,11 +73,11 @@ KviTextIconWindow::~KviTextIconWindow() void KviTextIconWindow::fill() { clear(); - KviPointerHashTable<QString,KviTextIcon> * d = g_pTextIconManager->textIconDict(); - KviPointerHashTableIterator<QString,KviTextIcon> it(*d); + KviPointerHashTable<TQString,KviTextIcon> * d = g_pTextIconManager->textIconDict(); + KviPointerHashTableIterator<TQString,KviTextIcon> it(*d); while(KviTextIcon * i = it.current()) { - QPixmap *pix = i->pixmap(); + TQPixmap *pix = i->pixmap(); if(pix)insertItem(new KviTalIconViewItem(this,it.currentKey(),*pix)); ++it; } @@ -85,13 +85,13 @@ void KviTextIconWindow::fill() setCurrentItem(0); } -void KviTextIconWindow::popup(QWidget *owner,bool bAltMode) +void KviTextIconWindow::popup(TQWidget *owner,bool bAltMode) { - if(m_pOwner)disconnect(m_pOwner,SIGNAL(destroyed()),this,SLOT(ownerDead())); + if(m_pOwner)disconnect(m_pOwner,TQT_SIGNAL(destroyed()),this,TQT_SLOT(ownerDead())); m_pOwner = owner; m_szTypedSeq = ""; m_bAltMode = bAltMode; - connect(m_pOwner,SIGNAL(destroyed()),this,SLOT(ownerDead())); + connect(m_pOwner,TQT_SIGNAL(destroyed()),this,TQT_SLOT(ownerDead())); show(); } @@ -104,7 +104,7 @@ bool KviTextIconWindow::findTypedSeq() KviTalIconViewItem *item; for ( item = (KviTalIconViewItem *)firstItem(); item; item = (KviTalIconViewItem *)item->nextItem() ) { - QString szIt = item->text(); + TQString szIt = item->text(); int j; for(j=0;j<((int)(szIt.length()));j++) { @@ -128,25 +128,25 @@ got_mit: return bFullMax; } -void KviTextIconWindow::keyPressEvent(QKeyEvent *e) +void KviTextIconWindow::keyPressEvent(TQKeyEvent *e) { switch(e->key()) { - case Qt::Key_Up: - case Qt::Key_Down: - case Qt::Key_Left: - case Qt::Key_Right: - case Qt::Key_PageUp: - case Qt::Key_PageDown: - case Qt::Key_Return: + case TQt::Key_Up: + case TQt::Key_Down: + case TQt::Key_Left: + case TQt::Key_Right: + case TQt::Key_PageUp: + case TQt::Key_PageDown: + case TQt::Key_Return: KviTalIconView::keyPressEvent(e); return; break; - case Qt::Key_Escape: + case TQt::Key_Escape: doHide(); return; break; - case Qt::Key_Backspace: + case TQt::Key_Backspace: if(!m_szTypedSeq.isEmpty()) { m_szTypedSeq.remove(m_szTypedSeq.length() - 1,1); @@ -157,11 +157,11 @@ void KviTextIconWindow::keyPressEvent(QKeyEvent *e) } return; break; - case Qt::Key_Space: + case TQt::Key_Space: doHide(); if(findTypedSeq()) { - QString szItem = m_szTypedSeq; + TQString szItem = m_szTypedSeq; szItem.append(' '); if(m_pOwner) { @@ -169,12 +169,12 @@ void KviTextIconWindow::keyPressEvent(QKeyEvent *e) ((KviInputEditor *)m_pOwner)->insertText(szItem); else if(m_pOwner->inherits("KviInput")) ((KviInput *)m_pOwner)->insertText(szItem); - else if(m_pOwner->inherits("QLineEdit")) + else if(m_pOwner->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) { - QString tmp = ((QLineEdit *)m_pOwner)->text(); - tmp.insert(((QLineEdit *)m_pOwner)->cursorPosition(),szItem); - ((QLineEdit *)m_pOwner)->setText(tmp); - ((QLineEdit *)m_pOwner)->setCursorPosition(((QLineEdit *)m_pOwner)->cursorPosition() + szItem.length()); + TQString tmp = ((TQLineEdit *)m_pOwner)->text(); + tmp.insert(((TQLineEdit *)m_pOwner)->cursorPosition(),szItem); + ((TQLineEdit *)m_pOwner)->setText(tmp); + ((TQLineEdit *)m_pOwner)->setCursorPosition(((TQLineEdit *)m_pOwner)->cursorPosition() + szItem.length()); } } } else { @@ -182,22 +182,22 @@ void KviTextIconWindow::keyPressEvent(QKeyEvent *e) } return; break; - case Qt::Key_Tab: + case TQt::Key_Tab: doHide(); findTypedSeq(); - QString szItem = m_szCurFullSeq; + TQString szItem = m_szCurFullSeq; szItem.append(' '); if(m_bAltMode)szItem.prepend(KVI_TEXT_ICON); if(m_pOwner->inherits("KviInputEditor")) ((KviInputEditor *)m_pOwner)->insertText(szItem); else if(m_pOwner->inherits("KviInput")) ((KviInput *)m_pOwner)->insertText(szItem); - else if(m_pOwner->inherits("QLineEdit")) + else if(m_pOwner->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) { - QString tmp = ((QLineEdit *)m_pOwner)->text(); - tmp.insert(((QLineEdit *)m_pOwner)->cursorPosition(),szItem); - ((QLineEdit *)m_pOwner)->setText(tmp); - ((QLineEdit *)m_pOwner)->setCursorPosition(((QLineEdit *)m_pOwner)->cursorPosition() + szItem.length()); + TQString tmp = ((TQLineEdit *)m_pOwner)->text(); + tmp.insert(((TQLineEdit *)m_pOwner)->cursorPosition(),szItem); + ((TQLineEdit *)m_pOwner)->setText(tmp); + ((TQLineEdit *)m_pOwner)->setCursorPosition(((TQLineEdit *)m_pOwner)->cursorPosition() + szItem.length()); } return; break; @@ -223,10 +223,10 @@ void KviTextIconWindow::ownerDead() void KviTextIconWindow::show() { m_iTimerId = startTimer(50000); //50 sec ...seems enough - QWidget::show(); + TQWidget::show(); } -void KviTextIconWindow::timerEvent(QTimerEvent *) +void KviTextIconWindow::timerEvent(TQTimerEvent *) { doHide(); } @@ -246,26 +246,26 @@ void KviTextIconWindow::itemSelected(KviTalIconViewItem * item) { if(item) { -// debug("%i %i %i %s",m_pOwner->inherits("KviInputEditor"),m_pOwner->inherits("KviInput"),m_pOwner->inherits("QLineEdit"),m_pOwner->className()); +// debug("%i %i %i %s",m_pOwner->inherits("KviInputEditor"),m_pOwner->inherits("KviInput"),m_pOwner->inherits(TQLINEEDIT_OBJECT_NAME_STRING),m_pOwner->className()); doHide(); - QString szItem = item->text(); + TQString szItem = item->text(); szItem.append(' '); if(m_bAltMode)szItem.prepend(KVI_TEXT_ICON); if(m_pOwner->inherits("KviInputEditor")) ((KviInputEditor *)m_pOwner)->insertText(szItem); else if(m_pOwner->inherits("KviInput")) ((KviInput *)m_pOwner)->insertText(szItem); - else if(m_pOwner->inherits("QLineEdit")) + else if(m_pOwner->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) { - QString tmp = ((QLineEdit *)m_pOwner)->text(); - tmp.insert(((QLineEdit *)m_pOwner)->cursorPosition(),szItem); - ((QLineEdit *)m_pOwner)->setText(tmp); - ((QLineEdit *)m_pOwner)->setCursorPosition(((QLineEdit *)m_pOwner)->cursorPosition() + szItem.length()); + TQString tmp = ((TQLineEdit *)m_pOwner)->text(); + tmp.insert(((TQLineEdit *)m_pOwner)->cursorPosition(),szItem); + ((TQLineEdit *)m_pOwner)->setText(tmp); + ((TQLineEdit *)m_pOwner)->setCursorPosition(((TQLineEdit *)m_pOwner)->cursorPosition() + szItem.length()); } } } -void KviTextIconWindow::mousePressEvent(QMouseEvent *e) +void KviTextIconWindow::mousePressEvent(TQMouseEvent *e) { if(e->pos().x() < 0)goto hideme; if(e->pos().x() > width())goto hideme; diff --git a/src/kvirc/ui/kvi_texticonwin.h b/src/kvirc/ui/kvi_texticonwin.h index 76a4a60..83c9c3d 100644 --- a/src/kvirc/ui/kvi_texticonwin.h +++ b/src/kvirc/ui/kvi_texticonwin.h @@ -36,25 +36,26 @@ class KVIRC_API KviTextIconWindow : public KviTalIconView { Q_OBJECT + TQ_OBJECT public: KviTextIconWindow(); ~KviTextIconWindow(); private: - QWidget * m_pOwner; - QString m_szTypedSeq; - QString m_szCurFullSeq; - bool m_bAltMode; // in alt mode the itemSelected() string contains + TQWidget * m_pOwner; + TQString m_szTypedSeq; + TQString m_szCurFullSeq; + bool m_bAltMode; // in alt mode the itemSelected() string tqcontains // also the CTRL+I escape code int m_iTimerId; public: - void popup(QWidget *owner,bool bAltMode = false); + void popup(TQWidget *owner,bool bAltMode = false); private: void doHide(); virtual void show(); bool findTypedSeq(); // returns true if it is a complete word - virtual void keyPressEvent(QKeyEvent *e); - virtual void mousePressEvent(QMouseEvent *); - virtual void timerEvent(QTimerEvent *); + virtual void keyPressEvent(TQKeyEvent *e); + virtual void mousePressEvent(TQMouseEvent *); + virtual void timerEvent(TQTimerEvent *); public slots: void fill(); void ownerDead(); diff --git a/src/kvirc/ui/kvi_themedlabel.cpp b/src/kvirc/ui/kvi_themedlabel.cpp index f9cf8e3..4d4243c 100644 --- a/src/kvirc/ui/kvi_themedlabel.cpp +++ b/src/kvirc/ui/kvi_themedlabel.cpp @@ -26,16 +26,16 @@ #include "kvi_settings.h" #include "kvi_app.h" #include "kvi_window.h" -#include <qpainter.h> +#include <tqpainter.h> #ifdef COMPILE_PSEUDO_TRANSPARENCY - extern QPixmap * g_pShadedChildGlobalDesktopBackground; + extern TQPixmap * g_pShadedChildGlobalDesktopBackground; #endif -KviThemedLabel::KviThemedLabel(QWidget * par,const char * name) -: QFrame(par,name) +KviThemedLabel::KviThemedLabel(TQWidget * par,const char * name) +: TQFrame(par,name) { - setFrameStyle(QFrame::Sunken | QFrame::StyledPanel); + setFrameStyle(TQFrame::Sunken | TQFrame::StyledPanel); applyOptions(); m_bAutoHeight=0; } @@ -44,34 +44,34 @@ KviThemedLabel::~KviThemedLabel() { } -/*QSize KviThemedLabel::sizeHint() +/*TQSize KviThemedLabel::tqsizeHint() { - QSize size=QFrame::sizeHint(); - int iHeight=fontMetrics().height()*QStringList::split('\n',m_szText).count()+4; + TQSize size=TQFrame::tqsizeHint(); + int iHeight=fontMetrics().height()*TQStringList::split('\n',m_szText).count()+4; size.setHeight(iHeight); return size; }*/ void KviThemedLabel::setText(const char * text) { - m_szText = QString(text); + m_szText = TQString(text); if(m_bAutoHeight) { - int iHeight=fontMetrics().height()*QStringList::split('\n',m_szText).count()+4; + int iHeight=fontMetrics().height()*TQStringList::split('\n',m_szText).count()+4; setMinimumHeight(iHeight); - //g_pApp->postEvent(parent(),new QEvent(QEvent::Resize)); + //g_pApp->postEvent(tqparent(),new TQEvent(TQEvent::Resize)); } update(); } -void KviThemedLabel::setText(const QString& text) +void KviThemedLabel::setText(const TQString& text) { m_szText = text; if(m_bAutoHeight) { - int iHeight=fontMetrics().height()*QStringList::split('\n',m_szText).count()+4; + int iHeight=fontMetrics().height()*TQStringList::split('\n',m_szText).count()+4; setMinimumHeight(iHeight); - //g_pApp->postEvent(parent(),new QEvent(QEvent::Resize)); + //g_pApp->postEvent(tqparent(),new TQEvent(TQEvent::Resize)); } update(); } @@ -83,15 +83,15 @@ void KviThemedLabel::applyOptions() } #ifdef COMPILE_USE_QT4 -void KviThemedLabel::paintEvent ( QPaintEvent * event ) +void KviThemedLabel::paintEvent ( TQPaintEvent * event ) { - QFrame::paintEvent(event); - QPainter p(this); + TQFrame::paintEvent(event); + TQPainter p(this); SET_ANTI_ALIASING(p); #ifdef COMPILE_PSEUDO_TRANSPARENCY if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = mapToGlobal(contentsRect().topLeft()); + TQPoint pnt = mapToGlobal(contentsRect().topLeft()); p.drawTiledPixmap(contentsRect(),*g_pShadedChildGlobalDesktopBackground,pnt); } else { #endif @@ -107,20 +107,20 @@ void KviThemedLabel::paintEvent ( QPaintEvent * event ) } #endif - QRect r = contentsRect(); + TQRect r = contentsRect(); r.setLeft(r.left() + 2); // some margin p.setPen(KVI_OPTION_COLOR(KviOption_colorLabelForeground)); - p.drawText(r,Qt::AlignLeft | Qt::AlignVCenter,m_szText); + p.drawText(r,TQt::AlignLeft | TQt::AlignVCenter,m_szText); } #else -void KviThemedLabel::drawContents(QPainter *p) +void KviThemedLabel::drawContents(TQPainter *p) { #ifdef COMPILE_PSEUDO_TRANSPARENCY if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = mapToGlobal(contentsRect().topLeft()); + TQPoint pnt = mapToGlobal(contentsRect().topLeft()); p->drawTiledPixmap(contentsRect(),*g_pShadedChildGlobalDesktopBackground,pnt); } else { #endif @@ -136,16 +136,16 @@ void KviThemedLabel::drawContents(QPainter *p) } #endif - QRect r = contentsRect(); + TQRect r = contentsRect(); r.setLeft(r.left() + 2); // some margin p->setPen(KVI_OPTION_COLOR(KviOption_colorLabelForeground)); - p->drawText(r,Qt::AlignLeft | Qt::AlignVCenter,m_szText); + p->drawText(r,TQt::AlignLeft | TQt::AlignVCenter,m_szText); } #endif -void KviThemedLabel::mouseDoubleClickEvent(QMouseEvent *) +void KviThemedLabel::mouseDoubleClickEvent(TQMouseEvent *) { emit doubleClicked(); } diff --git a/src/kvirc/ui/kvi_themedlabel.h b/src/kvirc/ui/kvi_themedlabel.h index b63e238..a307149 100644 --- a/src/kvirc/ui/kvi_themedlabel.h +++ b/src/kvirc/ui/kvi_themedlabel.h @@ -25,36 +25,37 @@ #include "kvi_settings.h" -#include <qframe.h> +#include <tqframe.h> #include "kvi_string.h" -class KVIRC_API KviThemedLabel : public QFrame +class KVIRC_API KviThemedLabel : public TQFrame { Q_OBJECT - Q_PROPERTY(int TransparencyCapable READ dummyRead) + TQ_OBJECT + TQ_PROPERTY(int TransparencyCapable READ dummyRead) public: - KviThemedLabel(QWidget * par,const char * name); + KviThemedLabel(TQWidget * par,const char * name); ~KviThemedLabel(); private: - QString m_szText; + TQString m_szText; bool m_bAutoHeight; protected: #ifdef COMPILE_USE_QT4 - virtual void paintEvent ( QPaintEvent * event ); + virtual void paintEvent ( TQPaintEvent * event ); #else - virtual void drawContents(QPainter *p); + virtual void drawContents(TQPainter *p); #endif - virtual void mouseDoubleClickEvent(QMouseEvent *e); + virtual void mouseDoubleClickEvent(TQMouseEvent *e); public: int dummyRead() const { return 0; }; void setText(const char * text); - void setText(const QString& text); - QString text() { return m_szText; }; + void setText(const TQString& text); + TQString text() { return m_szText; }; void setAutoHeight(bool value) { m_bAutoHeight=value; }; void applyOptions(); -// QSize sizeHint(); +// TQSize tqsizeHint(); signals: void doubleClicked(); }; diff --git a/src/kvirc/ui/kvi_toolbar.cpp b/src/kvirc/ui/kvi_toolbar.cpp index 792f9fc..7e62bf6 100644 --- a/src/kvirc/ui/kvi_toolbar.cpp +++ b/src/kvirc/ui/kvi_toolbar.cpp @@ -29,11 +29,11 @@ #include "kvi_locale.h" #include "kvi_app.h" -#include <qcursor.h> +#include <tqcursor.h> #include "kvi_tal_popupmenu.h" #ifdef COMPILE_USE_QT4 - #include <qevent.h> + #include <tqevent.h> #endif static KviTalPopupMenu * g_pToolBarContextPopup = 0; @@ -42,7 +42,7 @@ static KviTalPopupMenu * g_pToolBarIconSizesPopup = 0; static KviTalPopupMenu * g_pToolBarPositionsPopup = 0; -KviToolBar::KviToolBar(const QString &label,QT_TOOLBARDOCK_TYPE dock,bool bNewLine,const char * nam) +KviToolBar::KviToolBar(const TQString &label,TQT_TOOLBARDOCK_TYPE dock,bool bNewLine,const char * nam) : KviTalToolBar(label,g_pFrame,dock,bNewLine,nam) { } @@ -60,7 +60,7 @@ KviToolBar::~KviToolBar() g_pToolBarWindowsPopup = 0; } -void KviToolBar::mousePressEvent(QMouseEvent *e) +void KviToolBar::mousePressEvent(TQMouseEvent *e) { if(!(e->button() & Qt::RightButton)) { @@ -81,67 +81,63 @@ void KviToolBar::mousePressEvent(QMouseEvent *e) g_pFrame->fillToolBarsPopup(g_pToolBarWindowsPopup); g_pToolBarContextPopup->insertItem(__tr2qs("Toolbars"),g_pToolBarWindowsPopup); - g_pToolBarContextPopup->insertItem(__tr2qs("Orientation"),g_pToolBarPositionsPopup); + g_pToolBarContextPopup->insertItem(__tr2qs("Qt::Orientation"),g_pToolBarPositionsPopup); - g_pToolBarPositionsPopup->insertItem(__tr2qs("Top"),this,SLOT(moveToTop())); - g_pToolBarPositionsPopup->insertItem(__tr2qs("Left"),this,SLOT(moveToLeft())); - g_pToolBarPositionsPopup->insertItem(__tr2qs("Right"),this,SLOT(moveToRight())); - g_pToolBarPositionsPopup->insertItem(__tr2qs("Bottom"),this,SLOT(moveToBottom())); + g_pToolBarPositionsPopup->insertItem(__tr2qs("Top"),this,TQT_SLOT(moveToTop())); + g_pToolBarPositionsPopup->insertItem(__tr2qs("Left"),this,TQT_SLOT(moveToLeft())); + g_pToolBarPositionsPopup->insertItem(__tr2qs("Right"),this,TQT_SLOT(moveToRight())); + g_pToolBarPositionsPopup->insertItem(__tr2qs("Bottom"),this,TQT_SLOT(moveToBottom())); g_pToolBarPositionsPopup->insertSeparator(); - g_pToolBarPositionsPopup->insertItem(__tr2qs("Detached"),this,SLOT(moveToTornOff())); - g_pToolBarPositionsPopup->insertItem(__tr2qs("Flat"),this,SLOT(moveToMinimized())); + g_pToolBarPositionsPopup->insertItem(__tr2qs("Detached"),this,TQT_SLOT(moveToTornOff())); + g_pToolBarPositionsPopup->insertItem(__tr2qs("Flat"),this,TQT_SLOT(moveToMinimized())); g_pToolBarContextPopup->insertItem(__tr2qs("Icon Size"),g_pToolBarIconSizesPopup); - g_pToolBarIconSizesPopup->insertItem(__tr2qs("Small (22x22)"),this,SLOT(setSmallIcons())); - g_pToolBarIconSizesPopup->insertItem(__tr2qs("Large (32x32)"),this,SLOT(setBigIcons())); + g_pToolBarIconSizesPopup->insertItem(__tr2qs("Small (22x22)"),this,TQT_SLOT(setSmallIcons())); + g_pToolBarIconSizesPopup->insertItem(__tr2qs("Large (32x32)"),this,TQT_SLOT(setBigIcons())); - g_pToolBarContextPopup->popup(QCursor::pos()); + g_pToolBarContextPopup->popup(TQCursor::pos()); } -void KviToolBar::moveTo(QT_TOOLBARDOCK_TYPE dock) +void KviToolBar::moveTo(TQT_TOOLBARDOCK_TYPE dock) { // FIXME: this should be hidden in Tal #ifdef COMPILE_USE_QT4 g_pFrame->removeToolBar(this); g_pFrame->addToolBar(dock,this); #else //!COMPILE_USE_QT4 -#if QT_VERSION >= 300 g_pFrame->moveDockWindow(this,dock); -#else - g_pFrame->moveToolBar(this,dock); -#endif #endif //!COMPILE_USE_QT4 } void KviToolBar::moveToTop() { - moveTo(QT_DOCK_TOP); + moveTo(TQT_DOCK_TOP); } void KviToolBar::moveToLeft() { - moveTo(QT_DOCK_LEFT); + moveTo(TQT_DOCK_LEFT); } void KviToolBar::moveToRight() { - moveTo(QT_DOCK_RIGHT); + moveTo(TQT_DOCK_RIGHT); } void KviToolBar::moveToBottom() { - moveTo(QT_DOCK_BOTTOM); + moveTo(TQT_DOCK_BOTTOM); } void KviToolBar::moveToMinimized() { - moveTo(QT_DOCK_MINIMIZED); + moveTo(TQT_DOCK_MINIMIZED); } void KviToolBar::moveToTornOff() { - moveTo(QT_DOCK_TORNOFF); + moveTo(TQT_DOCK_TORNOFF); } void KviToolBar::setBigIcons() diff --git a/src/kvirc/ui/kvi_toolbar.h b/src/kvirc/ui/kvi_toolbar.h index a0e0511..bc5a781 100644 --- a/src/kvirc/ui/kvi_toolbar.h +++ b/src/kvirc/ui/kvi_toolbar.h @@ -31,12 +31,13 @@ class KviFrame; class KVIRC_API KviToolBar : public KviTalToolBar { Q_OBJECT + TQ_OBJECT public: - KviToolBar(const QString &label,QT_TOOLBARDOCK_TYPE dock = QT_DOCK_TOP,bool bNewLine = false,const char * nam = 0); + KviToolBar(const TQString &label,TQT_TOOLBARDOCK_TYPE dock = TQT_DOCK_TOP,bool bNewLine = false,const char * nam = 0); ~KviToolBar(); protected: - virtual void mousePressEvent(QMouseEvent *e); - void moveTo(QT_TOOLBARDOCK_TYPE dock); + virtual void mousePressEvent(TQMouseEvent *e); + void moveTo(TQT_TOOLBARDOCK_TYPE dock); public slots: void moveToTop(); void moveToLeft(); diff --git a/src/kvirc/ui/kvi_toolwindows_container.cpp b/src/kvirc/ui/kvi_toolwindows_container.cpp index 270a706..bd424fe 100644 --- a/src/kvirc/ui/kvi_toolwindows_container.cpp +++ b/src/kvirc/ui/kvi_toolwindows_container.cpp @@ -1,22 +1,22 @@ #define __KVIRC__ -#include <qlayout.h> -#include <qtoolbutton.h> -#include <qobjectcleanuphandler.h> -#include <qpushbutton.h> +#include <tqlayout.h> +#include <tqtoolbutton.h> +#include <tqobjectcleanuphandler.h> +#include <tqpushbutton.h> #include "kvi_tal_vbox.h" -#include <qpainter.h> -#include <qapplication.h> +#include <tqpainter.h> +#include <tqapplication.h> #include "kvi_toolwindows_container.h" #include "kvi_iconmanager.h" -KviWindowToolWidget::KviWindowToolWidget(QWidget * parent, KviWindowToolPageButton* button/*, const char * name, WFlags f*/ ) -:QWidget(parent/*,name,f*/) +KviWindowToolWidget::KviWindowToolWidget(TQWidget * tqparent, KviWindowToolPageButton* button/*, const char * name, WFlags f*/ ) +:TQWidget(tqparent/*,name,f*/) { -// m_pContainer=parent; +// m_pContainer=tqparent; m_pButton=button; m_bAutoDelete=1; m_bHidden=0; @@ -64,7 +64,7 @@ void KviWindowToolWidget::unregisterSelf() unregisterSelf(); m_bHidden=1; } - QWidget::hide(); + TQWidget::hide(); }*/ /*void KviWindowToolWidget::show() @@ -73,28 +73,28 @@ void KviWindowToolWidget::unregisterSelf() { registerSelf(); } - QWidget::show(); + TQWidget::show(); m_bHidden=0; }*/ -KviWindowToolPageButton::KviWindowToolPageButton ( int pixon,int pixoff, const QString & text, QWidget * parent,bool bOn, const char * name ) -:TOOL_PAGE_PARENT(parent) +KviWindowToolPageButton::KviWindowToolPageButton ( int pixon,int pixoff, const TQString & text, TQWidget * tqparent,bool bOn, const char * name ) +:TOOL_PAGE_PARENT(tqparent) { #ifdef COMPILE_USE_QT4 setFlat(true); setObjectName("kvi_window_tool_button"); - setIcon(QIcon(*(g_pIconManager->getSmallIcon(pixon)))); + setIcon(TQIcon(*(g_pIconManager->getSmallIcon(pixon)))); #else - QIconSet is1; - is1.setPixmap(*(g_pIconManager->getSmallIcon(pixon)),QIconSet::Small,QIconSet::Normal,QIconSet::On); - is1.setPixmap(*(g_pIconManager->getSmallIcon(pixoff)),QIconSet::Small,QIconSet::Normal,QIconSet::Off); + TQIconSet is1; + is1.setPixmap(*(g_pIconManager->getSmallIcon(pixon)),TQIconSet::Small,TQIconSet::Normal,TQIconSet::On); + is1.setPixmap(*(g_pIconManager->getSmallIcon(pixoff)),TQIconSet::Small,TQIconSet::Normal,TQIconSet::Off); setIconSet(is1); setUsesBigPixmap(false); #endif setToggleButton(true); setOn(bOn); -// setSizePolicy(QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Ignored)); +// tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Ignored)); } KviWindowToolPageButton::~KviWindowToolPageButton() @@ -102,34 +102,34 @@ KviWindowToolPageButton::~KviWindowToolPageButton() } -/*void KviWindowToolPageButton::drawButton ( QPainter * p) +/*void KviWindowToolPageButton::drawButton ( TQPainter * p) { - QPixmap pixmap( height(), width() ); + TQPixmap pixmap( height(), width() ); if(isOn()) - pixmap.fill(colorGroup().mid()); + pixmap.fill(tqcolorGroup().mid()); else - pixmap.fill(colorGroup().button()); - QPainter painter( &pixmap ); + pixmap.fill(tqcolorGroup().button()); + TQPainter painter( &pixmap ); - QPixmap icon; + TQPixmap icon; if(isOn()) - icon=iconSet()->pixmap(QIconSet::Small,QIconSet::Normal,QIconSet::On); + icon=iconSet()->pixmap(TQIconSet::Small,TQIconSet::Normal,TQIconSet::On); else - icon=iconSet()->pixmap(QIconSet::Small,QIconSet::Normal,QIconSet::Off); + icon=iconSet()->pixmap(TQIconSet::Small,TQIconSet::Normal,TQIconSet::Off); // Draw the frame - //painter.setPen( colorGroup().mid() ); + //painter.setPen( tqcolorGroup().mid() ); //if ( m_id != NUM_TABS - 1 ) painter.drawLine( 0, 0, 0, pixmap.height() - 1 ); //painter.drawLine( 0, pixmap.height() - 1, pixmap.width() - 1, pixmap.height() - 1 ); // Draw the text - QFont font; - QString str = text(); + TQFont font; + TQString str = text(); str.remove("&"); - const int textX = pixmap.width() / 2 - QFontMetrics( font ).width( str ) / 2; - painter.setPen( colorGroup().buttonText() ); - const QRect rect( textX + icon.width() / 2 + 2, 0, pixmap.width(), pixmap.height() ); - painter.drawText( rect, Qt::AlignLeft | Qt::AlignVCenter, str ); + const int textX = pixmap.width() / 2 - TQFontMetrics( font ).width( str ) / 2; + painter.setPen( tqcolorGroup().buttonText() ); + const TQRect rect( textX + icon.width() / 2 + 2, 0, pixmap.width(), pixmap.height() ); + painter.drawText( rect, TQt::AlignLeft | TQt::AlignVCenter, str ); // Draw the icon painter.drawPixmap( textX - icon.width() / 2 - 2, pixmap.height() / 2 - icon.height() / 2, icon ); diff --git a/src/kvirc/ui/kvi_toolwindows_container.h b/src/kvirc/ui/kvi_toolwindows_container.h index ec131d9..7b43af3 100644 --- a/src/kvirc/ui/kvi_toolwindows_container.h +++ b/src/kvirc/ui/kvi_toolwindows_container.h @@ -4,9 +4,9 @@ #include "kvi_tal_widgetstack.h" #include "kvi_tal_vbox.h" -#include <qtoolbutton.h> -#include <qobjectcleanuphandler.h> -#include <qpushbutton.h> +#include <tqtoolbutton.h> +#include <tqobjectcleanuphandler.h> +#include <tqpushbutton.h> #include "kvi_heapobject.h" #include "kvi_styled_controls.h" @@ -21,11 +21,12 @@ class KviWindowToolPageButton; -class KVIRC_API KviWindowToolWidget : public QWidget +class KVIRC_API KviWindowToolWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KviWindowToolWidget( QWidget * parent,KviWindowToolPageButton* button/*, const char * name = 0, WFlags f = 0 */); + KviWindowToolWidget( TQWidget * tqparent,KviWindowToolPageButton* button/*, const char * name = 0, WFlags f = 0 */); ~KviWindowToolWidget(); void setAutoDelete(bool b) { m_bAutoDelete=b; }; @@ -41,12 +42,12 @@ protected: KviWindowToolPageButton *m_pButton; bool m_bAutoDelete; bool m_bHidden; -// QObjectCleanupHandler m_ObjectHandler; +// TQObjectCleanupHandler m_ObjectHandler; }; #ifdef COMPILE_USE_QT4 - #define TOOL_PAGE_PARENT QPushButton + #define TOOL_PAGE_PARENT TQPushButton #else #define TOOL_PAGE_PARENT KviStyledToolButton #endif @@ -55,11 +56,12 @@ protected: class KVIRC_API KviWindowToolPageButton : public TOOL_PAGE_PARENT { Q_OBJECT + TQ_OBJECT public: - KviWindowToolPageButton ( int pixon,int pixoff, const QString & text, QWidget * parent,bool bOn=0,const char * name = 0 ); + KviWindowToolPageButton ( int pixon,int pixoff, const TQString & text, TQWidget * tqparent,bool bOn=0,const char * name = 0 ); ~KviWindowToolPageButton(); /*protected: - virtual void drawButton ( QPainter * painter);*/ + virtual void drawButton ( TQPainter * painter);*/ }; #endif //_KVI_TOOLWINDOWS_CONTAINER_H_ diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp index bbcf0c5..8ae1962 100644 --- a/src/kvirc/ui/kvi_topicw.cpp +++ b/src/kvirc/ui/kvi_topicw.cpp @@ -46,42 +46,42 @@ extern KviTextIconWindow * g_pTextIconWindow; extern KviColorWindow * g_pColorWindow; static int g_iInputFontCharWidth[256]; -#include <qpainter.h> -#include <qfontmetrics.h> +#include <tqpainter.h> +#include <tqfontmetrics.h> #include "kvi_tal_tooltip.h" -#include <qlineedit.h> +#include <tqlineedit.h> #include "kvi_tal_listbox.h" -#include <qregexp.h> -#include <qclipboard.h> +#include <tqregexp.h> +#include <tqclipboard.h> #include "kvi_tal_popupmenu.h" -#include <qevent.h> +#include <tqevent.h> // FIXME: #warning "The combo should disappear when it looses focus!...(how to do it ?)" #ifdef COMPILE_PSEUDO_TRANSPARENCY - extern QPixmap * g_pShadedChildGlobalDesktopBackground; + extern TQPixmap * g_pShadedChildGlobalDesktopBackground; #endif -extern QStringList * g_pRecentTopicList; +extern TQStringList * g_pRecentTopicList; int KviListBoxTopicItem::width ( const KviTalListBox * lb ) const { - QFontMetrics fm(lb->font()); + TQFontMetrics fm(lb->font()); return fm.width(KviMircCntrl::stripControlBytes(text())); } -void KviListBoxTopicItem::paint ( QPainter * p ) +void KviListBoxTopicItem::paint ( TQPainter * p ) { - KviTopicWidget::paintColoredText(p,text(),listBox()->colorGroup(),height(listBox())); + KviTopicWidget::paintColoredText(p,text(),listBox()->tqcolorGroup(),height(listBox())); } -KviTopicWidget::KviTopicWidget(QWidget * par,const char * name) -: QFrame(par,name) +KviTopicWidget::KviTopicWidget(TQWidget * par,const char * name) +: TQFrame(par,name) { - setFrameStyle(QFrame::Sunken | QFrame::StyledPanel); + setFrameStyle(TQFrame::Sunken | TQFrame::StyledPanel); setFont(KVI_OPTION_FONT(KviOption_fontLabel)); m_pHistory = 0; m_pAccept = 0; @@ -92,21 +92,21 @@ KviTopicWidget::KviTopicWidget(QWidget * par,const char * name) #ifdef COMPILE_USE_QT4 setAutoFillBackground(false); #else - setBackgroundMode(QWidget::NoBackground); + setBackgroundMode(TQWidget::NoBackground); #endif reset(); #ifdef COMPILE_USE_QT4 - m_pCompletionBox=new KviTalListBox(this,Qt::Popup); + m_pCompletionBox=new KviTalListBox(this,TQt::Popup); #else - m_pCompletionBox=new KviTalListBox(this,Qt::WType_Popup); + m_pCompletionBox=new KviTalListBox(this,TQt::WType_Popup); #endif m_pCompletionBox->setFont( font() ); m_pCompletionBox->setPalette( palette() ); // m_pCompletionBox->setVScrollBarMode( KviTalListBox::AlwaysOff ); // m_pCompletionBox->setHScrollBarMode( KviTalListBox::AlwaysOff ); - m_pCompletionBox->setFrameStyle( QFrame::Box | QFrame::Plain ); + m_pCompletionBox->setFrameStyle( TQFrame::Box | TQFrame::Plain ); m_pCompletionBox->setLineWidth( 1 ); - connect(m_pCompletionBox,SIGNAL(selected(int)),this,SLOT(complete(int))); + connect(m_pCompletionBox,TQT_SIGNAL(selected(int)),this,TQT_SLOT(complete(int))); m_pCompletionBox->hide(); } @@ -141,9 +141,9 @@ void KviTopicWidget::applyOptions() #define KVI_LABEL_DEF_BACK 100 #define KVI_LABEL_DEF_FORE 101 -QString convertToHtml(const QString &text) +TQString convertToHtml(const TQString &text) { - QString result; + TQString result; bool curBold = false; bool curUnderline = false; unsigned char curFore = KVI_LABEL_DEF_FORE; //default fore @@ -153,7 +153,7 @@ QString convertToHtml(const QString &text) while(idx < text.length()) { - unsigned short c = text[(int)idx].unicode(); + unsigned short c = text[(int)idx].tqunicode(); unsigned int start = idx; @@ -168,7 +168,7 @@ QString convertToHtml(const QString &text) { idx++; if(idx >= text.length())break; - else c = text[(int)idx].unicode(); + else c = text[(int)idx].tqunicode(); } int len = idx - start; @@ -176,7 +176,7 @@ QString convertToHtml(const QString &text) if(len > 0) { bool bOpened = FALSE; - QString szText = text.mid(start,len); + TQString szText = text.mid(start,len); if(curBold) result.append("<b>"); if(curUnderline) result.append("<u>"); @@ -251,7 +251,7 @@ QString convertToHtml(const QString &text) ++idx; unsigned int icoStart = idx; - while((idx < text.length()) && (text[(int)idx].unicode() > 32))idx++; + while((idx < text.length()) && (text[(int)idx].tqunicode() > 32))idx++; KviStr lookupString = text.mid(icoStart,idx - icoStart); @@ -259,7 +259,7 @@ QString convertToHtml(const QString &text) if(icon) { //TODO: icons -/* QPixmap * pigzmap = icon->pixmap(); +/* TQPixmap * pigzmap = icon->pixmap(); p->drawPixmap(curX,(baseline + 2) - pigzmap->height(),*(pigzmap)); curX += pigzmap->width();*/ } else { @@ -272,9 +272,9 @@ QString convertToHtml(const QString &text) return result; } -void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QColorGroup& cg,int height, int width) +void KviTopicWidget::paintColoredText(TQPainter *p, TQString text,const TQColorGroup& cg,int height, int width) { - QFontMetrics fm(p->font()); + TQFontMetrics fm(p->font()); if(height<0) height=p->window().height(); if(width<0) width=p->window().width(); @@ -291,7 +291,7 @@ void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QColorGrou while((idx < text.length()) && (curX < width)) { - unsigned short c = text[(int)idx].unicode(); + unsigned short c = text[(int)idx].tqunicode(); unsigned int start = idx; @@ -305,7 +305,7 @@ void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QColorGrou ) { idx++; - c = text[(int)idx].unicode(); + c = text[(int)idx].tqunicode(); } int len = idx - start; @@ -313,7 +313,7 @@ void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QColorGrou if(len > 0) { - QString szText = text.mid(start,len); + TQString szText = text.mid(start,len); wdth = fm.width(szText); @@ -392,14 +392,14 @@ void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QColorGrou ++idx; unsigned int icoStart = idx; - while((idx < text.length()) && (text[(int)idx].unicode() > 32))idx++; + while((idx < text.length()) && (text[(int)idx].tqunicode() > 32))idx++; KviStr lookupString = text.mid(icoStart,idx - icoStart); KviTextIcon * icon = g_pTextIconManager->lookupTextIcon(lookupString.ptr()); if(icon) { - QPixmap * pigzmap = icon->pixmap(); + TQPixmap * pigzmap = icon->pixmap(); p->drawPixmap(curX,(baseline + 2) - pigzmap->height(),*(pigzmap)); curX += pigzmap->width(); } else { @@ -412,20 +412,20 @@ void KviTopicWidget::paintColoredText(QPainter *p, QString text,const QColorGrou } #ifdef COMPILE_USE_QT4 -void KviTopicWidget::paintEvent(QPaintEvent * e) +void KviTopicWidget::paintEvent(TQPaintEvent * e) { - QPainter pa(this); + TQPainter pa(this); drawFrame(&pa); drawContents(&pa); } #endif -void KviTopicWidget::drawContents(QPainter *p) +void KviTopicWidget::drawContents(TQPainter *p) { #ifdef COMPILE_PSEUDO_TRANSPARENCY if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = mapToGlobal(contentsRect().topLeft()); + TQPoint pnt = mapToGlobal(contentsRect().topLeft()); p->drawTiledPixmap(contentsRect(),*g_pShadedChildGlobalDesktopBackground,pnt); } else { #endif @@ -438,18 +438,18 @@ void KviTopicWidget::drawContents(QPainter *p) #ifdef COMPILE_PSEUDO_TRANSPARENCY } #endif - QColorGroup colorGroup; - //colorGroup() - colorGroup.setColor(QColorGroup::Text,KVI_OPTION_COLOR(KviOption_colorLabelForeground)); - colorGroup.setColor(QColorGroup::Background,KVI_OPTION_COLOR(KviOption_colorLabelBackground)); - paintColoredText(p,m_szTopic,colorGroup); + TQColorGroup tqcolorGroup; + //tqcolorGroup() + tqcolorGroup.setColor(TQColorGroup::Text,KVI_OPTION_COLOR(KviOption_colorLabelForeground)); + tqcolorGroup.setColor(TQColorGroup::Background,KVI_OPTION_COLOR(KviOption_colorLabelBackground)); + paintColoredText(p,m_szTopic,tqcolorGroup); } -void KviTopicWidget::setTopic(const QString & topic) +void KviTopicWidget::setTopic(const TQString & topic) { m_szTopic = topic; bool bFound = false; - for(QStringList::Iterator it=g_pRecentTopicList->begin();it != g_pRecentTopicList->end(); ++it) + for(TQStringList::Iterator it=g_pRecentTopicList->begin();it != g_pRecentTopicList->end(); ++it) { if(*it == m_szTopic) { @@ -469,13 +469,13 @@ void KviTopicWidget::setTopic(const QString & topic) update(); } -void KviTopicWidget::setTopicSetBy(const QString & setBy) +void KviTopicWidget::setTopicSetBy(const TQString & setBy) { m_szSetBy = setBy; updateToolTip(); } -void KviTopicWidget::setTopicSetAt(const QString & setAt) +void KviTopicWidget::setTopicSetAt(const TQString & setAt) { m_szSetAt = setAt; updateToolTip(); @@ -485,7 +485,7 @@ void KviTopicWidget::updateToolTip() { KviTalToolTip::remove(this); - QString txt = "<html>" \ + TQString txt = "<html>" \ "<body>" \ "<table width=\"100%\">"; @@ -497,11 +497,11 @@ void KviTopicWidget::updateToolTip() txt += "<tr><td><center>"; - QString tmp = m_szTopic; + TQString tmp = m_szTopic; - tmp.replace('&',"&"); - tmp.replace('<',"<"); - tmp.replace('>',">"); + tmp.tqreplace('&',"&"); + tmp.tqreplace('<',"<"); + tmp.tqreplace('>',">"); tmp = convertToHtml(tmp); txt += tmp; @@ -541,20 +541,20 @@ void KviTopicWidget::updateToolTip() KviTalToolTip::add(this,txt); } -QSize KviTopicWidget::sizeHint() const +TQSize KviTopicWidget::tqsizeHint() const { - QFontMetrics fm(font()); + TQFontMetrics fm(font()); int hght = fm.lineSpacing() + (frameWidth() << 1) + 4; int baseline = ((hght + fm.ascent() - fm.descent() + 1) >> 1); if(baseline < 16)hght += (16 - baseline); - return QSize(width(),hght); + return TQSize(width(),hght); } -void KviTopicWidget::mouseDoubleClickEvent(QMouseEvent *) +void KviTopicWidget::mouseDoubleClickEvent(TQMouseEvent *) { int maxlen=-1; - QObject * w = parent(); - QString szModes; + TQObject * w = tqparent(); + TQString szModes; bool bCanEdit = TRUE; while(w) { @@ -563,12 +563,12 @@ void KviTopicWidget::mouseDoubleClickEvent(QMouseEvent *) KviChannel *chan = ((KviChannel *)w); maxlen=chan->connection()->serverInfo()->maxTopicLen(); chan->getChannelModeString(szModes); - if(szModes.contains('t') && !( chan->isMeHalfOp() || chan->isMeOp() || chan->isMeChanOwner() || chan->isMeChanAdmin() || chan->connection()->userInfo()->hasUserMode('o') || chan->connection()->userInfo()->hasUserMode('O')) ) { + if(szModes.tqcontains('t') && !( chan->isMeHalfOp() || chan->isMeOp() || chan->isMeChanOwner() || chan->isMeChanAdmin() || chan->connection()->userInfo()->hasUserMode('o') || chan->connection()->userInfo()->hasUserMode('O')) ) { bCanEdit=false; } break; } - w = w->parent(); + w = w->tqparent(); } if(m_pInput == 0) { @@ -577,45 +577,45 @@ void KviTopicWidget::mouseDoubleClickEvent(QMouseEvent *) m_pInput->setMaxBufferSize(maxlen); m_pInput->setGeometry(0,0,width() - (height() << 2)+height(),height()); m_pInput->setText(m_szTopic); - connect(m_pInput,SIGNAL(enterPressed()),this,SLOT(acceptClicked())); - connect(m_pInput,SIGNAL(escapePressed()),this,SLOT(discardClicked())); + connect(m_pInput,TQT_SIGNAL(enterPressed()),this,TQT_SLOT(acceptClicked())); + connect(m_pInput,TQT_SIGNAL(escapePressed()),this,TQT_SLOT(discardClicked())); m_pInput->installEventFilter(this); - m_pHistory = new QPushButton(this); + m_pHistory = new TQPushButton(this); m_pHistory->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME))); m_pHistory->setGeometry(width() - (height() << 2)+height(),0,height(),height()); KviTalToolTip::add(m_pHistory,__tr2qs("History")); m_pHistory->show(); - connect(m_pHistory,SIGNAL(clicked()),this,SLOT(historyClicked())); + connect(m_pHistory,TQT_SIGNAL(clicked()),this,TQT_SLOT(historyClicked())); - m_pAccept = new QPushButton(this); + m_pAccept = new TQPushButton(this); m_pAccept->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); m_pAccept->setGeometry(width() - (height() << 1),0,height(),height()); m_pAccept->setEnabled(bCanEdit); m_pAccept->show(); KviTalToolTip::add(m_pAccept,__tr2qs("Commit Changes")); - connect(m_pAccept,SIGNAL(clicked()),this,SLOT(acceptClicked())); + connect(m_pAccept,TQT_SIGNAL(clicked()),this,TQT_SLOT(acceptClicked())); - m_pDiscard = new QPushButton(this); + m_pDiscard = new TQPushButton(this); m_pDiscard->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD))); m_pDiscard->setGeometry(width() - height(),0,height(),height()); KviTalToolTip::add(m_pDiscard,__tr2qs("Discard Changes")); m_pDiscard->show(); - connect(m_pDiscard,SIGNAL(clicked()),this,SLOT(discardClicked())); + connect(m_pDiscard,TQT_SIGNAL(clicked()),this,TQT_SLOT(discardClicked())); m_pInput->show(); m_pInput->setFocus(); } } -void KviTopicWidget::mousePressEvent(QMouseEvent * e) +void KviTopicWidget::mousePressEvent(TQMouseEvent * e) { if(!(e->button() & Qt::RightButton))return; if(!m_pContextPopup) { m_pContextPopup = new KviTalPopupMenu(this); - connect(m_pContextPopup,SIGNAL(aboutToShow()),this,SLOT(contextPopupAboutToShow())); + connect(m_pContextPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(contextPopupAboutToShow())); } m_pContextPopup->popup(mapToGlobal(e->pos())); } @@ -624,50 +624,50 @@ void KviTopicWidget::contextPopupAboutToShow() { if(!m_pContextPopup)return; // hm ? m_pContextPopup->clear(); - m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_COPY)),__tr2qs("Copy to clipboard"),this,SLOT(copy())); + m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_COPY)),__tr2qs("Copy to clipboard"),this,TQT_SLOT(copy())); } void KviTopicWidget::copy() { - QClipboard * c = QApplication::clipboard(); + TQClipboard * c = TQApplication::tqclipboard(); if(!c)return; - if(c->supportsSelection())c->setText(m_szTopic,QClipboard::Selection); - c->setText(m_szTopic,QClipboard::Clipboard); + if(c->supportsSelection())c->setText(m_szTopic,TQClipboard::Selection); + c->setText(m_szTopic,TQClipboard::Clipboard); } -bool KviTopicWidget::eventFilter(QObject *object,QEvent *e) +bool KviTopicWidget::eventFilter(TQObject *object,TQEvent *e) { if ( !e ) return TRUE; - if(object==m_pCompletionBox) + if(TQT_BASE_OBJECT(object)==TQT_BASE_OBJECT(m_pCompletionBox)) { switch( e->type() ) { - case QEvent::MouseButtonPress: - if ( m_pCompletionBox->rect().contains( ((QMouseEvent*)e)->pos() ) ) { - complete(m_pCompletionBox->index(m_pCompletionBox->itemAt(((QMouseEvent*)e)->pos()))); + case TQEvent::MouseButtonPress: + if ( TQT_TQRECT_OBJECT(m_pCompletionBox->rect()).tqcontains( ((TQMouseEvent*)e)->pos() ) ) { + complete(m_pCompletionBox->index(m_pCompletionBox->itemAt(((TQMouseEvent*)e)->pos()))); return TRUE; } break; - case QEvent::MouseButtonRelease: - if ( m_pCompletionBox->rect().contains( ((QMouseEvent*)e)->pos() ) ) { - QMouseEvent tmp( QEvent::MouseButtonDblClick, - ((QMouseEvent*)e)->pos(), ((QMouseEvent*)e)->button(), ((QMouseEvent*)e)->state() ) ; + case TQEvent::MouseButtonRelease: + if ( TQT_TQRECT_OBJECT(m_pCompletionBox->rect()).tqcontains( ((TQMouseEvent*)e)->pos() ) ) { + TQMouseEvent tmp( TQEvent::MouseButtonDblClick, + ((TQMouseEvent*)e)->pos(), ((TQMouseEvent*)e)->button(), ((TQMouseEvent*)e)->state() ) ; // will hide popup - QApplication::sendEvent( object, &tmp ); + TQApplication::sendEvent( object, &tmp ); return TRUE; } else { if ( m_pCompletionBox->isVisible() ) popDownListBox(); } break; - case QEvent::KeyPress: - switch( ((QKeyEvent *)e)->key() ) { - case Qt::Key_Up: - case Qt::Key_Down: - if ( !(((QKeyEvent *)e)->state() & Qt::AltButton) ) + case TQEvent::KeyPress: + switch( ((TQKeyEvent *)e)->key() ) { + case TQt::Key_Up: + case TQt::Key_Down: + if ( !(((TQKeyEvent *)e)->state() & TQt::AltButton) ) break; - case Qt::Key_F4: - case Qt::Key_Escape: + case TQt::Key_F4: + case TQt::Key_Escape: if ( m_pCompletionBox->isVisible() ) { popDownListBox(); return TRUE; @@ -677,22 +677,22 @@ bool KviTopicWidget::eventFilter(QObject *object,QEvent *e) break; } break; - case QEvent::Hide: + case TQEvent::Hide: popDownListBox(); break; default: break; } } - return QFrame::eventFilter(object,e); + return TQFrame::eventFilter(object,e); } -bool KviTopicWidget::handleKeyPressEvent(QKeyEvent * e) +bool KviTopicWidget::handleKeyPressEvent(TQKeyEvent * e) { return 1; } -void KviTopicWidget::keyPressEvent(QKeyEvent * e) +void KviTopicWidget::keyPressEvent(TQKeyEvent * e) { if(handleKeyPressEvent(e)) { @@ -701,9 +701,9 @@ void KviTopicWidget::keyPressEvent(QKeyEvent * e) } } -void KviTopicWidget::resizeEvent(QResizeEvent *e) +void KviTopicWidget::resizeEvent(TQResizeEvent *e) { - if(e)QFrame::resizeEvent(e); + if(e)TQFrame::resizeEvent(e); if(m_pInput) { m_pInput->setGeometry(0,0,width() - (height() << 2)+height(),height()); @@ -728,9 +728,9 @@ void KviTopicWidget::deactivate() m_pDiscard = 0; } - // try to find a KviWindow parent and give it the focus + // try to find a KviWindow tqparent and give it the focus - QObject * w = parent(); + TQObject * w = tqparent(); while(w) { if(w->inherits("KviWindow")) @@ -738,15 +738,15 @@ void KviTopicWidget::deactivate() ((KviWindow *)w)->setFocus(); return; } - w = w->parent(); + w = w->tqparent(); } // no KviWindow on the path - w = parent(); + w = tqparent(); if(w) { - if(w->inherits("QWidget")) - ((QWidget *)w)->setFocus(); + if(w->inherits(TQWIDGET_OBJECT_NAME_STRING)) + ((TQWidget *)w)->setFocus(); } } @@ -761,12 +761,12 @@ void KviTopicWidget::historyClicked() { m_pCompletionBox->installEventFilter( this ); m_pCompletionBox->clear(); - for ( QStringList::Iterator it = g_pRecentTopicList->begin(); it != g_pRecentTopicList->end(); ++it ) { + for ( TQStringList::Iterator it = g_pRecentTopicList->begin(); it != g_pRecentTopicList->end(); ++it ) { KviListBoxTopicItem* item=new KviListBoxTopicItem(m_pCompletionBox,*it); } m_pCompletionBox->resize(m_pInput->width(),6*m_pCompletionBox->fontMetrics().height()+20); - QPoint point=m_pInput->mapToGlobal(QPoint(0,0)); - point+=QPoint(0,m_pInput->height()); + TQPoint point=m_pInput->mapToGlobal(TQPoint(0,0)); + point+=TQPoint(0,m_pInput->height()); m_pCompletionBox->move(point); m_pCompletionBox->show(); } @@ -776,18 +776,18 @@ void KviTopicWidget::acceptClicked() { if(!m_pInput->readOnly()) { - QString tmp = m_pInput->text(); + TQString tmp = m_pInput->text(); if(tmp != m_szTopic)emit topicSelected(tmp); } deactivate(); } -void KviTopicWidget::insertChar(QChar c) +void KviTopicWidget::insertChar(TQChar c) { - insertText(QString(c)); + insertText(TQString(c)); } -void KviTopicWidget::insertText(const QString &c) +void KviTopicWidget::insertText(const TQString &c) { if(m_pInput) m_pInput->insertText(c); @@ -803,30 +803,30 @@ void KviTopicWidget::complete(int pos) popDownListBox(); } -QChar KviTopicWidget::getSubstituteChar(unsigned short control_code) +TQChar KviTopicWidget::getSubstituteChar(unsigned short control_code) { switch(control_code) { case KVI_TEXT_COLOR: - return QChar('K'); + return TQChar('K'); break; case KVI_TEXT_BOLD: - return QChar('B'); + return TQChar('B'); break; case KVI_TEXT_RESET: - return QChar('O'); + return TQChar('O'); break; case KVI_TEXT_REVERSE: - return QChar('R'); + return TQChar('R'); break; case KVI_TEXT_UNDERLINE: - return QChar('U'); + return TQChar('U'); break; case KVI_TEXT_ICON: - return QChar('I'); + return TQChar('I'); break; default: - return QChar(control_code); + return TQChar(control_code); break; } } diff --git a/src/kvirc/ui/kvi_topicw.h b/src/kvirc/ui/kvi_topicw.h index b13088d..5a59ced 100644 --- a/src/kvirc/ui/kvi_topicw.h +++ b/src/kvirc/ui/kvi_topicw.h @@ -27,15 +27,15 @@ #include "kvi_settings.h" -#include <qframe.h> -#include <qpushbutton.h> +#include <tqframe.h> +#include <tqpushbutton.h> #include "kvi_tal_listbox.h" #include "kvi_string.h" #include "kvi_app.h" #include "kvi_input.h" -class QComboBox; +class TQComboBox; class KviChannel; class KviTalPopupMenu; class KviIrcConnection; @@ -44,67 +44,68 @@ class KviTalListBox; class KVIRC_API KviListBoxTopicItem : public KviTalListBoxText { public: - KviListBoxTopicItem( KviTalListBox * listbox = 0 , const QString & text = QString::null):KviTalListBoxText(listbox,text) { ; }; + KviListBoxTopicItem( KviTalListBox * listbox = 0 , const TQString & text = TQString()):KviTalListBoxText(listbox,text) { ; }; virtual int width ( const KviTalListBox * lb ) const; protected: - virtual void paint ( QPainter * p ); + virtual void paint ( TQPainter * p ); }; -class KVIRC_API KviTopicWidget : public QFrame +class KVIRC_API KviTopicWidget : public TQFrame { Q_OBJECT - Q_PROPERTY(int TransparencyCapable READ dummyRead) + TQ_OBJECT + TQ_PROPERTY(int TransparencyCapable READ dummyRead) friend class KviChannel; public: - KviTopicWidget(QWidget * par,const char * name); + KviTopicWidget(TQWidget * par,const char * name); ~KviTopicWidget(); private: - QString m_szTopic; - QString m_szSetBy; - QString m_szSetAt; - QPushButton * m_pAccept; - QPushButton * m_pDiscard; - QPushButton * m_pHistory; + TQString m_szTopic; + TQString m_szSetBy; + TQString m_szSetAt; + TQPushButton * m_pAccept; + TQPushButton * m_pDiscard; + TQPushButton * m_pHistory; KviTalPopupMenu * m_pContextPopup; - QChar getSubstituteChar(unsigned short control_code); + TQChar getSubstituteChar(unsigned short control_code); int xCursorPostionCalculation(int xInd); KviInputEditor* m_pInput; KviTalListBox* m_pCompletionBox; protected: int m_iCursorPosition; - virtual void drawContents(QPainter *p); - virtual void mouseDoubleClickEvent(QMouseEvent *e); - virtual void mousePressEvent(QMouseEvent *e); - virtual void keyPressEvent(QKeyEvent *e); - virtual void resizeEvent(QResizeEvent *e); + virtual void drawContents(TQPainter *p); + virtual void mouseDoubleClickEvent(TQMouseEvent *e); + virtual void mousePressEvent(TQMouseEvent *e); + virtual void keyPressEvent(TQKeyEvent *e); + virtual void resizeEvent(TQResizeEvent *e); #ifdef COMPILE_USE_QT4 - virtual void paintEvent(QPaintEvent * e); + virtual void paintEvent(TQPaintEvent * e); #endif void updateToolTip(); void deactivate(); void iconButtonClicked(); - virtual bool eventFilter(QObject *o,QEvent *e); - bool handleKeyPressEvent(QKeyEvent * e); + virtual bool eventFilter(TQObject *o,TQEvent *e); + bool handleKeyPressEvent(TQKeyEvent * e); public: - void insertChar(QChar c); - void insertText(const QString &s); + void insertChar(TQChar c); + void insertText(const TQString &s); int dummyRead() const { return 0; }; void reset(); - void setTopic(const QString & szTopic); - void setTopicSetBy(const QString & setBy); - void setTopicSetAt(const QString & setAt); + void setTopic(const TQString & szTopic); + void setTopicSetBy(const TQString & setBy); + void setTopicSetAt(const TQString & setAt); - const QString & topic(){ return m_szTopic; }; - const QString & topicSetBy(){ return m_szSetBy; }; - const QString & topicSetAt(){ return m_szSetAt; }; - virtual QSize sizeHint() const; + const TQString & topic(){ return m_szTopic; }; + const TQString & topicSetBy(){ return m_szSetBy; }; + const TQString & topicSetAt(){ return m_szSetAt; }; + virtual TQSize tqsizeHint() const; void applyOptions(); - static void paintColoredText(QPainter *p, QString text,const QColorGroup& cg, int h=-1, int w=-1); + static void paintColoredText(TQPainter *p, TQString text,const TQColorGroup& cg, int h=-1, int w=-1); protected slots: void acceptClicked(); void discardClicked(); @@ -114,7 +115,7 @@ protected slots: void complete(int); void popDownListBox(); signals: - void topicSelected(const QString &szTopic); + void topicSelected(const TQString &szTopic); }; #endif //_KVI_TOPICW_H_ diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp index 20f75f0..d96aa53 100644 --- a/src/kvirc/ui/kvi_userlistview.cpp +++ b/src/kvirc/ui/kvi_userlistview.cpp @@ -48,23 +48,23 @@ #include "kvi_ircconnection.h" #include "kvi_ircconnectionserverinfo.h" -#include <qlabel.h> -#include <qscrollbar.h> -#include <qpainter.h> -#include <qpixmap.h> -#include <qfontmetrics.h> -#include <qdatetime.h> -#include <qmime.h> +#include <tqlabel.h> +#include <tqscrollbar.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqfontmetrics.h> +#include <tqdatetime.h> +#include <tqmime.h> #include "kvi_styled_controls.h" -#include <qevent.h> +#include <tqevent.h> #ifdef COMPILE_PSEUDO_TRANSPARENCY - extern QPixmap * g_pShadedChildGlobalDesktopBackground; + extern TQPixmap * g_pShadedChildGlobalDesktopBackground; #endif // kvi_app.cpp (loaded and destroyed by KviIconManager) -extern QPixmap * g_pUserChanStatePixmap; +extern TQPixmap * g_pUserChanStatePixmap; // Yet another really complex widget :) @@ -83,7 +83,7 @@ KviUserListToolTip::~KviUserListToolTip() { } -void KviUserListToolTip::maybeTip(const QPoint &pnt) +void KviUserListToolTip::maybeTip(const TQPoint &pnt) { m_pListView->maybeTip(this,pnt); } @@ -91,10 +91,10 @@ void KviUserListToolTip::maybeTip(const QPoint &pnt) -KviUserListEntry::KviUserListEntry(KviUserListView * parent,const QString &nick, +KviUserListEntry::KviUserListEntry(KviUserListView * tqparent,const TQString &nick, KviIrcUserEntry * e,short int iFlags,bool bJoinTimeUnknown) { - m_pListView = parent; + m_pListView = tqparent; m_szNick = nick; m_pGlobalData = e; m_iFlags = iFlags; @@ -111,7 +111,7 @@ KviUserListEntry::~KviUserListEntry() { } -bool KviUserListEntry::color(QColor& color) +bool KviUserListEntry::color(TQColor& color) { // // FIXME: Unused ? @@ -167,7 +167,7 @@ void KviUserListEntry::recalcSize() ) ) { - QPixmap * pix = av->scaledPixmap(KVI_OPTION_UINT(KviOption_uintAvatarScaleWidth), KVI_OPTION_UINT(KviOption_uintAvatarScaleHeight)); + TQPixmap * pix = av->scaledPixmap(KVI_OPTION_UINT(KviOption_uintAvatarScaleWidth), KVI_OPTION_UINT(KviOption_uintAvatarScaleHeight)); m_iHeight += pix->height(); } @@ -184,15 +184,15 @@ void KviUserListEntry::recalcSize() -KviUserListView::KviUserListView(QWidget * parent,KviWindowToolPageButton* button,KviIrcUserDataBase * db,KviWindow * pWnd,int dictSize,const QString & label_text,const char * name) -: KviWindowToolWidget(parent,button) +KviUserListView::KviUserListView(TQWidget * tqparent,KviWindowToolPageButton* button,KviIrcUserDataBase * db,KviWindow * pWnd,int dictSize,const TQString & label_text,const char * name) +: KviWindowToolWidget(tqparent,button) { setAutoDelete(0); m_pKviWindow = pWnd; - m_pEntryDict = new KviPointerHashTable<QString,KviUserListEntry>(dictSize,false); + m_pEntryDict = new KviPointerHashTable<TQString,KviUserListEntry>(dictSize,false); m_pEntryDict->setAutoDelete(true); - m_pUsersLabel = new QLabel(this,"userslabel"); + m_pUsersLabel = new TQLabel(this,"userslabel"); KviTalToolTip::add(m_pUsersLabel,label_text); m_pViewArea = new KviUserListViewArea(this); @@ -212,7 +212,7 @@ KviUserListView::KviUserListView(QWidget * parent,KviWindowToolPageButton* butto m_ieEntries = 0; m_iIEntries = 0; m_iSelectedCount = 0; -// setBackgroundMode(QWidget::NoBackground); +// setBackgroundMode(TQWidget::NoBackground); applyOptions(); registerSelf(); } @@ -230,7 +230,7 @@ void KviUserListView::emitRightClick() switch(m_pKviWindow->type()) { case KVI_WINDOW_TYPE_CHANNEL: ev = KviEvent_OnChannelNickPopupRequest; break; - case KVI_WINDOW_TYPE_QUERY: ev = KviEvent_OnQueryNickPopupRequest; break; + case KVI_WINDOW_TYPE_TQUERY: ev = KviEvent_OnQueryNickPopupRequest; break; case KVI_WINDOW_TYPE_CONSOLE: ev = KviEvent_OnNotifyListPopupRequest; break; default: ev = KviEvent_OnNickLinkPopupRequest; break; // this should actually never happen } @@ -238,7 +238,7 @@ void KviUserListView::emitRightClick() { if(KviKvsEventManager::instance()->hasAppHandlers(ev)) { - QString nicks; + TQString nicks; appendSelectedNicknames(nicks); KviKvsVariantList vList; vList.append(nicks); @@ -255,7 +255,7 @@ void KviUserListView::emitDoubleClick() switch(m_pKviWindow->type()) { case KVI_WINDOW_TYPE_CHANNEL: ev = KviEvent_OnChannelNickDefaultActionRequest; break; - case KVI_WINDOW_TYPE_QUERY: ev = KviEvent_OnQueryNickDefaultActionRequest; break; + case KVI_WINDOW_TYPE_TQUERY: ev = KviEvent_OnQueryNickDefaultActionRequest; break; case KVI_WINDOW_TYPE_CONSOLE: ev = KviEvent_OnNotifyListDefaultActionRequest; break; default: ev = KviEvent_OnNickLinkDefaultActionRequest; break; // this should actually never happen } @@ -263,7 +263,7 @@ void KviUserListView::emitDoubleClick() { if(KviKvsEventManager::instance()->hasAppHandlers(ev)) { - QString nicks; + TQString nicks; appendSelectedNicknames(nicks); KviKvsVariantList vList; vList.append(nicks); @@ -291,7 +291,7 @@ void KviUserListView::applyOptions() updateUsersLabel(); }*/ setFont(KVI_OPTION_FONT(KviOption_fontUserListView)); - QFontMetrics fm(KVI_OPTION_FONT(KviOption_fontUserListView)); + TQFontMetrics fm(KVI_OPTION_FONT(KviOption_fontUserListView)); m_iFontHeight = fm.lineSpacing(); KviUserListEntry * e = m_pHeadItem; m_iTotalHeight = 0; @@ -305,7 +305,7 @@ void KviUserListView::applyOptions() m_pUsersLabel->setFont(KVI_OPTION_FONT(KviOption_fontUserListView)); setMinimumWidth(100); resizeEvent(0); // this will call update() too - repaint(); + tqrepaint(); } void KviUserListView::updateArea() { @@ -338,27 +338,27 @@ void KviUserListView::setMaskEntries(char type, int num) updateUsersLabel(); } -void KviUserListView::completeNickBashLike(const QString &begin,KviPointerList<QString> *l,bool bAppendMask) +void KviUserListView::completeNickBashLike(const TQString &begin,KviPointerList<TQString> *l,bool bAppendMask) { KviUserListEntry * entry = m_pHeadItem; while(entry) { - if(KviQString::equalCIN(begin,entry->m_szNick,begin.length())) + if(KviTQString::equalCIN(begin,entry->m_szNick,begin.length())) { if(bAppendMask) { - QString * s = new QString(); - KviQString::sprintf(*s,"%Q!%Q@%Q",&(entry->m_szNick),&(entry->m_pGlobalData->user()),&(entry->m_pGlobalData->host())); + TQString * s = new TQString(); + KviTQString::sprintf(*s,"%Q!%Q@%Q",&(entry->m_szNick),&(entry->m_pGlobalData->user()),&(entry->m_pGlobalData->host())); l->append(s); } else - l->append(new QString(entry->m_szNick)); + l->append(new TQString(entry->m_szNick)); } entry = entry->m_pNext; } } -bool KviUserListView::completeNickStandard(const QString &begin,const QString &skipAfter,QString &buffer,bool bAppendMask) +bool KviUserListView::completeNickStandard(const TQString &begin,const TQString &skipAfter,TQString &buffer,bool bAppendMask) { KviUserListEntry * entry = m_pHeadItem; @@ -366,7 +366,7 @@ bool KviUserListView::completeNickStandard(const QString &begin,const QString &s { while(entry) { - if(KviQString::equalCI(skipAfter,entry->m_szNick)) + if(KviTQString::equalCI(skipAfter,entry->m_szNick)) { entry = entry->m_pNext; break; @@ -387,7 +387,7 @@ bool KviUserListView::completeNickStandard(const QString &begin,const QString &s { if(entry->m_szNick.length() >= begin.length()) { - int result = KviQString::cmpCIN(begin,entry->m_szNick,begin.length()); + int result = KviTQString::cmpCIN(begin,entry->m_szNick,begin.length()); if(result == 0) { // This is ok. @@ -421,7 +421,7 @@ bool KviUserListView::completeNickStandard(const QString &begin,const QString &s } -void KviUserListView::insertUserEntry(const QString &nick,KviUserListEntry * e) +void KviUserListView::insertUserEntry(const TQString &nick,KviUserListEntry * e) { // Complex insertion task :) @@ -538,7 +538,7 @@ void KviUserListView::insertUserEntry(const QString &nick,KviUserListEntry * e) } // else it is chan owner, so nothing to skip: the chan owners are first in the list // now strcmp within the current user-flag group... - while(entry && (KviQString::cmpCI(entry->m_szNick,e->m_szNick) < 0) && + while(entry && (KviTQString::cmpCI(entry->m_szNick,e->m_szNick) < 0) && ((entry->m_iFlags & flag) || (flag == 0))) { if(entry == m_pTopItem)bGotTopItem = true; @@ -601,17 +601,17 @@ void KviUserListView::insertUserEntry(const QString &nick,KviUserListEntry * e) } } -KviUserListEntry * KviUserListView::join(const QString &nick,const QString &user, - const QString &host,int iFlags) +KviUserListEntry * KviUserListView::join(const TQString &nick,const TQString &user, + const TQString &host,int iFlags) { // Ok..an user joins the channel - KviUserListEntry * it = m_pEntryDict->find(nick); + KviUserListEntry * it = m_pEntryDict->tqfind(nick); if(it == 0) { // add an entry to the global dict KviIrcUserEntry * pGlobalData = m_pIrcUserDataBase->insertUser(nick,user,host); // calculate the flags and update the counters - it = new KviUserListEntry(this,nick,pGlobalData,iFlags,(user == QString::null)); + it = new KviUserListEntry(this,nick,pGlobalData,iFlags,(user == TQString())); insertUserEntry(nick,it); } else { // if(!host.isEmpty()) - it can be UHNAMES with host or NAMEX(X) w/o it @@ -646,9 +646,9 @@ void KviUserListView::triggerUpdate() } } -bool KviUserListView::avatarChanged(const QString &nick) +bool KviUserListView::avatarChanged(const TQString &nick) { - KviUserListEntry * it = m_pEntryDict->find(nick); + KviUserListEntry * it = m_pEntryDict->tqfind(nick); if(it) { int oldH = it->m_iHeight; @@ -694,7 +694,7 @@ bool KviUserListView::avatarChanged(const QString &nick) } -bool KviUserListView::userActionVerifyMask(const QString &nick,const QString &user,const QString &host,int actionTemperature,QString &oldUser,QString &oldHost) +bool KviUserListView::userActionVerifyMask(const TQString &nick,const TQString &user,const TQString &host,int actionTemperature,TQString &oldUser,TQString &oldHost) { // This is called when an user "acts" in some visible way // on the channel, so we can keep track of his channeel @@ -704,16 +704,16 @@ bool KviUserListView::userActionVerifyMask(const QString &nick,const QString &us // change (unless they were not known at all) // This will also update the username and hostname // if needed. - KviUserListEntry * it = m_pEntryDict->find(QString(nick)); + KviUserListEntry * it = m_pEntryDict->tqfind(TQString(nick)); if(it) { it->m_lastActionTime = kvi_unixTime(); bool bChanged = false; - if(!(host.isEmpty() || (KviQString::equalCS(host,"*")))) + if(!(host.isEmpty() || (KviTQString::equalCS(host,"*")))) { - if(!KviQString::equalCI(it->m_pGlobalData->host(),host)) + if(!KviTQString::equalCI(it->m_pGlobalData->host(),host)) { - if(!(it->m_pGlobalData->host().isEmpty() || KviQString::equalCS(it->m_pGlobalData->host(),"*"))) + if(!(it->m_pGlobalData->host().isEmpty() || KviTQString::equalCS(it->m_pGlobalData->host(),"*"))) { oldHost = it->m_pGlobalData->host(); bChanged = true; @@ -721,11 +721,11 @@ bool KviUserListView::userActionVerifyMask(const QString &nick,const QString &us it->m_pGlobalData->setHost(host); } } - if(!(user.isEmpty() || (KviQString::equalCS(user,"*")))) + if(!(user.isEmpty() || (KviTQString::equalCS(user,"*")))) { - if(!KviQString::equalCI(it->m_pGlobalData->user(),user)) + if(!KviTQString::equalCI(it->m_pGlobalData->user(),user)) { - if(!(it->m_pGlobalData->user().isEmpty() || KviQString::equalCS(it->m_pGlobalData->user(),"*"))) + if(!(it->m_pGlobalData->user().isEmpty() || KviTQString::equalCS(it->m_pGlobalData->user(),"*"))) { oldUser = it->m_pGlobalData->user(); bChanged = true; @@ -744,19 +744,19 @@ bool KviUserListView::userActionVerifyMask(const QString &nick,const QString &us } -void KviUserListView::userAction(const QString &nick,const QString &user,const QString &host,int actionTemperature) +void KviUserListView::userAction(const TQString &nick,const TQString &user,const TQString &host,int actionTemperature) { // This is called when an user "acts" in some visible way // on the channel, so we can keep track of his channeel // idle time. This will also update the username and hostname // if needed. - KviUserListEntry * it = m_pEntryDict->find(QString(nick)); + KviUserListEntry * it = m_pEntryDict->tqfind(TQString(nick)); if(it) { it->m_lastActionTime = kvi_unixTime(); - if(!(host.isEmpty() || (KviQString::equalCS(host,"*")))) + if(!(host.isEmpty() || (KviTQString::equalCS(host,"*")))) it->m_pGlobalData->setHost(host); - if(!(user.isEmpty() || (KviQString::equalCS(user,"*")))) + if(!(user.isEmpty() || (KviTQString::equalCS(user,"*")))) it->m_pGlobalData->setUser(user); it->m_iTemperature += actionTemperature; // Don't allow it to grow too much @@ -773,7 +773,7 @@ void KviUserListView::userAction(KviIrcMask *user,int actionTemperature) // on the channel, so we can keep track of his channeel // idle time. This will also update the username and hostname // if needed. - KviUserListEntry * it = m_pEntryDict->find(QString(user->nick())); + KviUserListEntry * it = m_pEntryDict->tqfind(TQString(user->nick())); if(it) { it->m_lastActionTime = kvi_unixTime(); @@ -787,13 +787,13 @@ void KviUserListView::userAction(KviIrcMask *user,int actionTemperature) } } -void KviUserListView::userAction(const QString &nick,int actionTemperature) +void KviUserListView::userAction(const TQString &nick,int actionTemperature) { // This is called when an user "acts" in some visible way // on the channel, so we can keep track of his channeel // idle time. This will also update the username and hostname // if needed. - KviUserListEntry * it = m_pEntryDict->find(nick); + KviUserListEntry * it = m_pEntryDict->tqfind(nick); if(it) { it->m_lastActionTime = kvi_unixTime(); @@ -804,24 +804,24 @@ void KviUserListView::userAction(const QString &nick,int actionTemperature) } } -kvi_time_t KviUserListView::getUserJoinTime(const QString &szNick) +kvi_time_t KviUserListView::getUserJoinTime(const TQString &szNick) { - KviUserListEntry * e = m_pEntryDict->find(szNick); + KviUserListEntry * e = m_pEntryDict->tqfind(szNick); if(!e)return (kvi_time_t)0; return e->m_joinTime; } -kvi_time_t KviUserListView::getUserLastActionTime(const QString &szNick) +kvi_time_t KviUserListView::getUserLastActionTime(const TQString &szNick) { - KviUserListEntry * e = m_pEntryDict->find(szNick); + KviUserListEntry * e = m_pEntryDict->tqfind(szNick); if(!e)return (kvi_time_t)0; return e->m_lastActionTime; } -int KviUserListView::getUserModeLevel(const QString &szNick) +int KviUserListView::getUserModeLevel(const TQString &szNick) { - KviUserListEntry * e = m_pEntryDict->find(szNick); + KviUserListEntry * e = m_pEntryDict->tqfind(szNick); if(!e)return 0; if(e->m_iFlags & KVI_USERFLAG_MODEMASK) { @@ -838,25 +838,25 @@ int KviUserListView::getUserModeLevel(const QString &szNick) char KviUserListView::getUserFlag(KviUserListEntry * e) { if(!e)return 0; - return (char)m_pKviWindow->connection()->serverInfo()->modePrefixChar(e->m_iFlags).unicode(); + return (char)m_pKviWindow->connection()->serverInfo()->modePrefixChar(e->m_iFlags).tqunicode(); } -void KviUserListView::prependUserFlag(const QString &nick,QString &buffer) +void KviUserListView::prependUserFlag(const TQString &nick,TQString &buffer) { char uFlag = getUserFlag(nick); if(uFlag)buffer.prepend(uFlag); } -int KviUserListView::flags(const QString &nick) +int KviUserListView::flags(const TQString &nick) { - KviUserListEntry * it = m_pEntryDict->find(nick); + KviUserListEntry * it = m_pEntryDict->tqfind(nick); return it ? it->m_iFlags : 0; } #define SET_FLAG_FUNC(__funcname,__flag) \ - bool KviUserListView::__funcname(const QString &nick,bool bYes) \ + bool KviUserListView::__funcname(const TQString &nick,bool bYes) \ { \ - KviUserListEntry * it = m_pEntryDict->find(nick); \ + KviUserListEntry * it = m_pEntryDict->tqfind(nick); \ if(!it)return false; \ m_pEntryDict->setAutoDelete(false); \ partInternal(nick,false); \ @@ -881,9 +881,9 @@ SET_FLAG_FUNC(userop,KVI_USERFLAG_USEROP) SET_FLAG_FUNC(voice,KVI_USERFLAG_VOICE) #define GET_FLAG_FUNC(__funcname,__flag) \ - bool KviUserListView::__funcname(const QString &nick,bool bAtLeast) \ + bool KviUserListView::__funcname(const TQString &nick,bool bAtLeast) \ { \ - KviUserListEntry * it = m_pEntryDict->find(nick); \ + KviUserListEntry * it = m_pEntryDict->tqfind(nick); \ return it ? (bAtLeast ? (it->m_iFlags >= __flag) : (it->m_iFlags & __flag)) : false; \ } @@ -895,14 +895,14 @@ GET_FLAG_FUNC(isHalfOp,KVI_USERFLAG_HALFOP) GET_FLAG_FUNC(isUserOp,KVI_USERFLAG_USEROP) -QString * KviUserListView::firstSelectedNickname() +TQString * KviUserListView::firstSelectedNickname() { m_pIterator = m_pHeadItem; while(m_pIterator) { if(m_pIterator->m_bSelected) { - QString * s = &(m_pIterator->m_szNick); + TQString * s = &(m_pIterator->m_szNick); m_pIterator = m_pIterator->m_pNext; return s; } @@ -911,13 +911,13 @@ QString * KviUserListView::firstSelectedNickname() return 0; } -QString * KviUserListView::nextSelectedNickname() +TQString * KviUserListView::nextSelectedNickname() { while(m_pIterator) { if(m_pIterator->m_bSelected) { - QString * s = &(m_pIterator->m_szNick); + TQString * s = &(m_pIterator->m_szNick); m_pIterator = m_pIterator->m_pNext; return s; } @@ -926,7 +926,7 @@ QString * KviUserListView::nextSelectedNickname() return 0; } -void KviUserListView::appendSelectedNicknames(QString &buffer) +void KviUserListView::appendSelectedNicknames(TQString &buffer) { KviUserListEntry * aux = m_pHeadItem; bool bFirst = true; @@ -942,15 +942,15 @@ void KviUserListView::appendSelectedNicknames(QString &buffer) } } -void KviUserListView::select(const QString& nick){ - KviPointerHashTableIterator<QString,KviUserListEntry> it(*m_pEntryDict); +void KviUserListView::select(const TQString& nick){ + KviPointerHashTableIterator<TQString,KviUserListEntry> it(*m_pEntryDict); while(it.current()) { ((KviUserListEntry *)it.current())->m_bSelected = false; ++it; } - KviUserListEntry * entry = m_pEntryDict->find(nick); + KviUserListEntry * entry = m_pEntryDict->tqfind(nick); if(entry) { entry->m_bSelected = true; @@ -962,9 +962,9 @@ void KviUserListView::select(const QString& nick){ m_pViewArea->update(); } -bool KviUserListView::partInternal(const QString &nick,bool bRemove) +bool KviUserListView::partInternal(const TQString &nick,bool bRemove) { - KviUserListEntry * it = m_pEntryDict->find(nick); + KviUserListEntry * it = m_pEntryDict->tqfind(nick); if(it) { // so, first of all..check if this item is over, or below the top item @@ -1028,13 +1028,13 @@ bool KviUserListView::partInternal(const QString &nick,bool bRemove) return false; } -bool KviUserListView::nickChange(const QString &oldNick,const QString &newNick) +bool KviUserListView::nickChange(const TQString &oldNick,const TQString &newNick) { - KviUserListEntry * it = m_pEntryDict->find(oldNick); + KviUserListEntry * it = m_pEntryDict->tqfind(oldNick); if(it) { - QString user = it->m_pGlobalData->user(); - QString host = it->m_pGlobalData->host(); + TQString user = it->m_pGlobalData->user(); + TQString host = it->m_pGlobalData->host(); int iFlags = it->m_iFlags; kvi_time_t joint = it->m_joinTime; bool bSelect = it->m_bSelected; @@ -1042,7 +1042,7 @@ bool KviUserListView::nickChange(const QString &oldNick,const QString &newNick) KviIrcUserEntry::Gender gender = it->m_pGlobalData->gender(); bool bBot = it->m_pGlobalData->isBot(); part(oldNick); - __range_invalid(m_pEntryDict->find(oldNick)); + __range_invalid(m_pEntryDict->tqfind(oldNick)); it = join(newNick,user,host,iFlags); it->m_pGlobalData->setGender(gender); it->m_pGlobalData->setBot(bBot); @@ -1082,17 +1082,17 @@ void KviUserListView::updateUsersLabel() } // FIXME: this could be done really better -void KviUserListView::partAllButOne(const QString &whoNot) +void KviUserListView::partAllButOne(const TQString &whoNot) { - QStringList ll; - KviPointerHashTableIterator<QString,KviUserListEntry> it(*m_pEntryDict); + TQStringList ll; + KviPointerHashTableIterator<TQString,KviUserListEntry> it(*m_pEntryDict); while(it.current()) { - if(!KviQString::equalCI(whoNot,it.currentKey())) + if(!KviTQString::equalCI(whoNot,it.currentKey())) ll.append(it.currentKey()); ++it; } - for(QStringList::Iterator it2 = ll.begin();it2 != ll.end();it2++) + for(TQStringList::Iterator it2 = ll.begin();it2 != ll.end();it2++) { part(*it2); } @@ -1100,7 +1100,7 @@ void KviUserListView::partAllButOne(const QString &whoNot) void KviUserListView::removeAllEntries() { - KviPointerHashTableIterator<QString,KviUserListEntry> it(*m_pEntryDict); + KviPointerHashTableIterator<TQString,KviUserListEntry> it(*m_pEntryDict); while(it.current()) { m_pIrcUserDataBase->removeUser(it.currentKey(), @@ -1136,12 +1136,12 @@ void KviUserListView::partAll() triggerUpdate(); } -void KviUserListView::resizeEvent(QResizeEvent *) +void KviUserListView::resizeEvent(TQResizeEvent *) { int hght; if(!KVI_OPTION_BOOL(KviOption_boolDisableUserListLabel))//G&N 2005 { - hght = m_pUsersLabel->sizeHint().height(); + hght = m_pUsersLabel->tqsizeHint().height(); if(hght < 16)hght = 16; // at least m_pUsersLabel->setGeometry(0,0,width(),hght); } @@ -1169,7 +1169,7 @@ bool KviUserListView::itemVisible(KviUserListEntry * e) return false; } -KviUserListEntry * KviUserListView::itemAt(const QPoint &pnt,QRect * rct) +KviUserListEntry * KviUserListView::itemAt(const TQPoint &pnt,TQRect * rct) { if(!m_pTopItem)return 0; if(pnt.y() < 0)return 0; @@ -1262,26 +1262,26 @@ void KviUserListView::userStats(KviUserListViewUserStats * s) } -void KviUserListView::maybeTip(KviUserListToolTip * tip,const QPoint &pnt) +void KviUserListView::maybeTip(KviUserListToolTip * tip,const TQPoint &pnt) { if(!KVI_OPTION_BOOL(KviOption_boolShowUserListViewToolTips))return; - QRect itRect; + TQRect itRect; KviUserListEntry * it = (KviUserListEntry *)itemAt(pnt,&itRect); if(it) { if(m_pKviWindow->console()) { - QString buffer; + TQString buffer; m_pKviWindow->console()->getUserTipText(it->m_szNick,it->m_pGlobalData,buffer); buffer += "<table width=\"100%\">"; if(it->m_joinTime != 0) { - QDateTime dt; + TQDateTime dt; dt.setTime_t(it->m_joinTime); buffer += "<tr><td bgcolor=\"#F0F0F0\"><nobr>"; - buffer += __tr2qs("Joined on <b>%1</b>").arg(dt.toString()); + buffer += __tr2qs("Joined on <b>%1</b>").tqarg(dt.toString()); buffer += "</nobr></td></tr>"; } @@ -1293,7 +1293,7 @@ void KviUserListView::maybeTip(KviUserListToolTip * tip,const QPoint &pnt) int hors = mins / 60; mins = mins % 60; buffer += "<tr><td bgcolor=\"#F0F0F0\"><nobr>"; - buffer += __tr2qs("Quiet for <b>%1h %2m %3s</b>").arg(hors).arg(mins).arg(secs); + buffer += __tr2qs("Quiet for <b>%1h %2m %3s</b>").tqarg(hors).tqarg(mins).tqarg(secs); buffer += "</nobr></td></tr>"; } buffer += "</table>"; @@ -1306,22 +1306,22 @@ void KviUserListView::maybeTip(KviUserListToolTip * tip,const QPoint &pnt) /////////////////////////////////////////////////////////////// KviUserListViewArea::KviUserListViewArea(KviUserListView * par) -: QWidget(par) +: TQWidget(par) { m_pListView = par; #ifdef COMPILE_USE_QT4 setAutoFillBackground(false); #else - setBackgroundMode(QWidget::NoBackground); + setBackgroundMode(TQWidget::NoBackground); #endif #ifdef COMPILE_USE_QT4 - m_pScrollBar = new QScrollBar(Qt::Vertical,this,"scrollbar"); + m_pScrollBar = new TQScrollBar(Qt::Vertical,this,"scrollbar"); #else - m_pScrollBar = new QScrollBar(QScrollBar::Vertical,this,"scrollbar"); + m_pScrollBar = new TQScrollBar(Qt::Vertical,this,"scrollbar"); #endif m_pScrollBar->setRange(0,0); m_pScrollBar->setValue(0); - connect(m_pScrollBar,SIGNAL(valueChanged(int)),this,SLOT(scrollBarMoved(int))); + connect(m_pScrollBar,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(scrollBarMoved(int))); m_pScrollBar->setPageStep(height()); m_pScrollBar->setLineStep(m_pListView->m_iFontHeight); m_iLastScrollBarVal = 0; @@ -1390,7 +1390,7 @@ void KviUserListViewArea::scrollBarMoved(int newVal) } -void KviUserListViewArea::paintEvent(QPaintEvent *ev) +void KviUserListViewArea::paintEvent(TQPaintEvent *ev) { // update the scroll bar @@ -1409,30 +1409,30 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev) int wdth = width() - m_pScrollBar->width(); - QRect r = ev->rect(); + TQRect r = ev->rect(); if(r.right() > wdth)r.setRight(wdth); //debug("PAINT EVENT %d,%d,%d,%d",r.left(),r.top(),r.width(),r.height()); KviDoubleBuffer db(width(),height()); - QPixmap * pMemBuffer = db.pixmap(); + TQPixmap * pMemBuffer = db.pixmap(); - QPainter p(pMemBuffer); + TQPainter p(pMemBuffer); SET_ANTI_ALIASING(p); p.setFont(KVI_OPTION_FONT(KviOption_fontUserListView)); #ifdef COMPILE_USE_QT4 - QFontMetrics fm(p.fontMetrics()); + TQFontMetrics fm(p.fontMetrics()); #endif #ifdef COMPILE_PSEUDO_TRANSPARENCY if(g_pShadedChildGlobalDesktopBackground) { - QPoint pnt = mapToGlobal(QPoint(r.left(),r.top())); + TQPoint pnt = mapToGlobal(TQPoint(r.left(),r.top())); p.drawTiledPixmap(r.left(),r.top(),r.width(),r.height(),*g_pShadedChildGlobalDesktopBackground,pnt.x(),pnt.y()); } else { #endif - QPixmap *pix = KVI_OPTION_PIXMAP(KviOption_pixmapUserListViewBackground).pixmap(); + TQPixmap *pix = KVI_OPTION_PIXMAP(KviOption_pixmapUserListViewBackground).pixmap(); p.fillRect(r.left(),r.top(),r.width(),r.height(),KVI_OPTION_COLOR(KviOption_colorUserListViewBackground)); if(pix) KviPixmapUtils::drawPixmapWithPainter(&p,pix,KVI_OPTION_UINT(KviOption_uintUserListPixmapAlign),r,width(),height()); @@ -1460,7 +1460,7 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev) if(bottom >= r.top()) { - QColor * pClrFore = 0; + TQColor * pClrFore = 0; bool bColorAllocated=0; // FIXME: bool is true or false if(e->m_bSelected) { @@ -1476,7 +1476,7 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev) // FIXME: // // this is slow... VERY slow when one has a lot of registered users. - // (this is NOT a simple lookup in the user db... it is a mask match) + // (this is NOT a simple lookup in the user db... it is a tqmask match) // if we REALLY need to use custom colors for regged users then // they should be updated ONCE and stored (cached) in the KviUserListEntry structure // @@ -1515,11 +1515,11 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev) { case KVI_USERLISTVIEW_GRIDTYPE_PLAINGRID: case KVI_USERLISTVIEW_GRIDTYPE_DOTGRID: - p.setPen(QPen(KVI_OPTION_COLOR(KviOption_colorUserListViewGrid),0, + p.setPen(TQPen(KVI_OPTION_COLOR(KviOption_colorUserListViewGrid),0, #ifdef COMPILE_USE_QT4 - (KVI_OPTION_UINT(KviOption_uintUserListViewGridType) == KVI_USERLISTVIEW_GRIDTYPE_DOTGRID) ? Qt::DotLine : Qt::SolidLine)); + (KVI_OPTION_UINT(KviOption_uintUserListViewGridType) == KVI_USERLISTVIEW_GRIDTYPE_DOTGRID) ? TQt::DotLine : TQt::SolidLine)); #else - (KVI_OPTION_UINT(KviOption_uintUserListViewGridType) == KVI_USERLISTVIEW_GRIDTYPE_DOTGRID) ? QPen::DotLine : QPen::SolidLine)); + (KVI_OPTION_UINT(KviOption_uintUserListViewGridType) == KVI_USERLISTVIEW_GRIDTYPE_DOTGRID) ? TQPen::DotLine : TQPen::SolidLine)); #endif p.drawLine(0,bottom - 1,wdth,bottom - 1); if(bShowState || bShowIcons) @@ -1528,12 +1528,12 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev) default: // KVI_USERLISTVIEW_GRIDTYPE_3DGRID and KVI_USERLISTVIEW_GRIDTYPE_3DBUTTONS if(!e->m_bSelected) { - p.setPen(QPen(KVI_OPTION_COLOR(KviOption_colorUserListViewGrid),0 /*,QPen::DotLine*/)); + p.setPen(TQPen(KVI_OPTION_COLOR(KviOption_colorUserListViewGrid),0 /*,TQPen::DotLine*/)); if((bShowState || bShowIcons) && (KVI_OPTION_UINT(KviOption_uintUserListViewGridType) == KVI_USERLISTVIEW_GRIDTYPE_3DGRID)) p.drawLine(iAvatarAndTextX,bottom - 1,iAvatarAndTextX,theY); - p.setPen(colorGroup().shadow()); + p.setPen(tqcolorGroup().shadow()); p.drawLine(0,bottom - 1,wdth,bottom - 1); - p.setPen(colorGroup().light()); + p.setPen(tqcolorGroup().light()); p.drawLine(0,theY,wdth,theY); theY--; } @@ -1547,9 +1547,9 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev) if(e->globalData()->isAway()) { - QRgb rgb2 = pClrFore->rgb(); - QRgb rgb1 = KVI_OPTION_COLOR(KviOption_colorUserListViewAwayForeground).rgb(); - p.setPen(QColor(((qRed(rgb1)*2) + qRed(rgb2)) / 3,((qGreen(rgb1)*2) + qGreen(rgb2)) / 3,((qBlue(rgb1)*2) + qBlue(rgb2)) / 3)); + TQRgb rgb2 = pClrFore->rgb(); + TQRgb rgb1 = KVI_OPTION_COLOR(KviOption_colorUserListViewAwayForeground).rgb(); + p.setPen(TQColor(((tqRed(rgb1)*2) + tqRed(rgb2)) / 3,((tqGreen(rgb1)*2) + tqGreen(rgb2)) / 3,((tqBlue(rgb1)*2) + tqBlue(rgb2)) / 3)); } else { p.setPen(*pClrFore); } @@ -1560,7 +1560,7 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev) KviAvatar * av = e->m_pGlobalData->avatar(); if(av && KVI_OPTION_UINT(KviOption_uintAvatarScaleWidth) && KVI_OPTION_UINT(KviOption_uintAvatarScaleHeight)) { - QPixmap * pix; + TQPixmap * pix; if( KVI_OPTION_BOOL(KviOption_boolScaleAvatars) && ( !KVI_OPTION_BOOL(KviOption_boolDoNotStretchAvatars) || @@ -1580,12 +1580,12 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev) { if(e->globalData()->gender()!=KviIrcUserEntry::Unknown) { - QPixmap * ico = g_pIconManager->getBigIcon((e->globalData()->gender()==KviIrcUserEntry::Male) ? "kvi_icon_male.png" : "kvi_icon_female.png"); + TQPixmap * ico = g_pIconManager->getBigIcon((e->globalData()->gender()==KviIrcUserEntry::Male) ? "kvi_icon_male.png" : "kvi_icon_female.png"); p.drawPixmap(theX,theY+(m_pListView->m_iFontHeight-11)/2,*ico); } if(e->globalData()->isBot()) { - QPixmap * ico = g_pIconManager->getBigIcon("kvi_icon_bot.png"); + TQPixmap * ico = g_pIconManager->getBigIcon("kvi_icon_bot.png"); p.drawPixmap(theX,theY+(m_pListView->m_iFontHeight-11)/2,*ico); } theX +=11; @@ -1663,7 +1663,7 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev) //p.drawRect(theX,theY + 2,18,e->m_iHeight - 4); if(e->m_iFlags != 0) { - QPixmap * ico = g_pIconManager->getSmallIcon( \ + TQPixmap * ico = g_pIconManager->getSmallIcon( \ e->globalData()->isAway() ? \ ( \ (e->m_iFlags & KVI_USERFLAG_CHANOWNER) ? \ @@ -1691,27 +1691,27 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev) } theX +=18; #ifdef COMPILE_USE_QT4 - p.drawText(iAvatarAndTextX,theY,wdth - theX,fm.lineSpacing(),Qt::AlignLeft|Qt::AlignVCenter,e->m_szNick); + p.drawText(iAvatarAndTextX,theY,wdth - theX,fm.lineSpacing(),TQt::AlignLeft|TQt::AlignVCenter,e->m_szNick); #else - p.drawText(iAvatarAndTextX,theY,wdth - theX,m_pListView->m_iFontHeight,Qt::AlignLeft|Qt::AlignVCenter,e->m_szNick); + p.drawText(iAvatarAndTextX,theY,wdth - theX,m_pListView->m_iFontHeight,TQt::AlignLeft|TQt::AlignVCenter,e->m_szNick); #endif } else { char flag = m_pListView->getUserFlag(e); if(flag) { - QString ttt = QChar(flag); + TQString ttt = TQChar(flag); ttt += e->m_szNick; #ifdef COMPILE_USE_QT4 - p.drawText(iAvatarAndTextX,theY,wdth - theX,fm.lineSpacing(),Qt::AlignLeft|Qt::AlignVCenter,ttt); + p.drawText(iAvatarAndTextX,theY,wdth - theX,fm.lineSpacing(),TQt::AlignLeft|TQt::AlignVCenter,ttt); #else - p.drawText(iAvatarAndTextX,theY,wdth - theX,m_pListView->m_iFontHeight,Qt::AlignLeft|Qt::AlignVCenter,ttt); + p.drawText(iAvatarAndTextX,theY,wdth - theX,m_pListView->m_iFontHeight,TQt::AlignLeft|TQt::AlignVCenter,ttt); #endif } else { #ifdef COMPILE_USE_QT4 - p.drawText(iAvatarAndTextX,theY,wdth - theX,fm.lineSpacing(),Qt::AlignLeft|Qt::AlignVCenter,e->m_szNick); + p.drawText(iAvatarAndTextX,theY,wdth - theX,fm.lineSpacing(),TQt::AlignLeft|TQt::AlignVCenter,e->m_szNick); #else - p.drawText(iAvatarAndTextX,theY,wdth - theX,m_pListView->m_iFontHeight,Qt::AlignLeft|Qt::AlignVCenter,e->m_szNick); + p.drawText(iAvatarAndTextX,theY,wdth - theX,m_pListView->m_iFontHeight,TQt::AlignLeft|TQt::AlignVCenter,e->m_szNick); #endif } } @@ -1725,30 +1725,30 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev) //we really do not need any self-draw borders. //if we will need it, we will draw a better one with system style - //p.setPen(colorGroup().dark()); + //p.setPen(tqcolorGroup().dark()); //p.drawLine(0,0,wdth,0); //p.drawLine(0,0,0,height()); - //p.setPen(colorGroup().light()); + //p.setPen(tqcolorGroup().light()); //p.drawLine(1,height()-1,wdth,height()-1); //p.drawLine(wdth - 1,1,wdth - 1,height()); #ifdef COMPILE_USE_QT4 - QPainter qt4SuxBecauseOfThisAdditionalPainter(this); + TQPainter qt4SuxBecauseOfThisAdditionalPainter(this); qt4SuxBecauseOfThisAdditionalPainter.drawPixmap(r.left(),r.top(),r.width(),r.height(),*pMemBuffer,r.left(),r.top(),r.width(),r.height()); #else - bitBlt(this,r.left(),r.top(),pMemBuffer,r.left(),r.top(),r.width(),r.height(),Qt::CopyROP,false); + bitBlt(TQT_TQPAINTDEVICE(this),r.left(),r.top(),TQT_TQPAINTDEVICE(pMemBuffer),r.left(),r.top(),r.width(),r.height(),TQt::CopyROP,false); #endif } -void KviUserListViewArea::resizeEvent(QResizeEvent *) +void KviUserListViewArea::resizeEvent(TQResizeEvent *) { - int iScr = m_pScrollBar->sizeHint().width(); + int iScr = m_pScrollBar->tqsizeHint().width(); m_pScrollBar->setGeometry(width() - iScr,0,iScr,height()); m_pScrollBar->setPageStep(height()); m_pScrollBar->setLineStep(m_pListView->m_iFontHeight - 1); } -void KviUserListViewArea::mousePressEvent(QMouseEvent *e) +void KviUserListViewArea::mousePressEvent(TQMouseEvent *e) { setFocus(); if(e->button() & Qt::LeftButton) @@ -1756,14 +1756,14 @@ void KviUserListViewArea::mousePressEvent(QMouseEvent *e) KviUserListEntry * entry = m_pListView->itemAt(e->pos()); if(entry) { - if(e->state() & Qt::ShiftButton) + if(e->state() & TQt::ShiftButton) { // Multiselect mode if(!entry->m_bSelected)m_pListView->m_iSelectedCount++; entry->m_bSelected = true; if(m_pListView->m_iSelectedCount == 1)g_pFrame->childWindowSelectionStateChange(m_pListView->m_pKviWindow,true); update(); - } else if(e->state() & Qt::ControlButton) + } else if(e->state() & TQt::ControlButton) { // Invert mode if(!entry->m_bSelected)m_pListView->m_iSelectedCount++; @@ -1800,7 +1800,7 @@ void KviUserListViewArea::mousePressEvent(QMouseEvent *e) if(!entry->m_bSelected){ entry->m_bSelected = true; m_pListView->m_iSelectedCount=1; - KviPointerHashTableIterator<QString,KviUserListEntry> it(*(m_pListView->m_pEntryDict)); + KviPointerHashTableIterator<TQString,KviUserListEntry> it(*(m_pListView->m_pEntryDict)); while(it.current()) { if(it.current()!=entry) @@ -1815,22 +1815,22 @@ void KviUserListViewArea::mousePressEvent(QMouseEvent *e) m_pListView->emitRightClick(); } } -void KviUserListViewArea::keyPressEvent( QKeyEvent * e ) +void KviUserListViewArea::keyPressEvent( TQKeyEvent * e ) { - if(e->key()==Qt::Key_Escape) + if(e->key()==TQt::Key_Escape) { if(m_pListView->m_pKviWindow->input()) - ((QWidget*)(m_pListView->m_pKviWindow->input()))->setFocus(); + ((TQWidget*)(m_pListView->m_pKviWindow->input()))->setFocus(); } else { - QString szKey=e->text(); + TQString szKey=e->text(); if(!szKey.isEmpty()) { KviUserListEntry * nick=0; KviUserListEntry * aux = m_pListView->m_pHeadItem; while(aux) { - //debug("%s %s %i %s %i",__FILE__,__FUNCTION__,__LINE__,aux->nick().utf8().data(),aux->nick().find(szKey,0,0)); - if(aux->nick().find(szKey,0,0)==0) + //debug("%s %s %i %s %i",__FILE__,__FUNCTION__,__LINE__,aux->nick().utf8().data(),aux->nick().tqfind(szKey,0,0)); + if(aux->nick().tqfind(szKey,0,0)==0) { nick=aux; break; @@ -1859,19 +1859,19 @@ void KviUserListViewArea::keyPressEvent( QKeyEvent * e ) } } -void KviUserListViewArea::mouseDoubleClickEvent(QMouseEvent *e) +void KviUserListViewArea::mouseDoubleClickEvent(TQMouseEvent *e) { m_pListView->emitDoubleClick(); } -void KviUserListViewArea::mouseMoveEvent(QMouseEvent *e) +void KviUserListViewArea::mouseMoveEvent(TQMouseEvent *e) { if(e->state() & Qt::LeftButton) { KviUserListEntry * entry = m_pListView->itemAt(e->pos()); if(entry && (entry != m_pLastEntryUnderMouse)) { - if(e->state() & Qt::ControlButton) + if(e->state() & TQt::ControlButton) { if(entry->m_bSelected)m_pListView->m_iSelectedCount--; else m_pListView->m_iSelectedCount++; @@ -1896,7 +1896,7 @@ void KviUserListViewArea::mouseMoveEvent(QMouseEvent *e) m_pScrollBar->setValue(m_pScrollBar->value() - top->m_iHeight); if(m_pListView->m_pTopItem != top) { - if(e->state() & Qt::ControlButton) + if(e->state() & TQt::ControlButton) { if(m_pListView->m_pTopItem->m_bSelected)m_pListView->m_iSelectedCount--; else m_pListView->m_iSelectedCount++; @@ -1929,7 +1929,7 @@ void KviUserListViewArea::mouseMoveEvent(QMouseEvent *e) m_pScrollBar->setValue(m_pScrollBar->value() + bottom->m_iHeight); if(bottom != m_pLastEntryUnderMouse) { - if(e->state() & Qt::ControlButton) + if(e->state() & TQt::ControlButton) { if(bottom->m_bSelected)m_pListView->m_iSelectedCount--; else m_pListView->m_iSelectedCount++; @@ -1951,15 +1951,15 @@ void KviUserListViewArea::mouseMoveEvent(QMouseEvent *e) } } -void KviUserListViewArea::mouseReleaseEvent(QMouseEvent *) +void KviUserListViewArea::mouseReleaseEvent(TQMouseEvent *) { m_pLastEntryUnderMouse = 0; } -void KviUserListViewArea::wheelEvent(QWheelEvent *e) +void KviUserListViewArea::wheelEvent(TQWheelEvent *e) { #ifdef COMPILE_USE_QT4 - static bool bHere = false; // Qt4(<= 4.2.2) has a nasty bug that makes the re-sent wheelEvent to cause infinite recursion + static bool bHere = false; // TQt4(<= 4.2.2) has a nasty bug that makes the re-sent wheelEvent to cause infinite recursion if(bHere)return; bHere = true; #endif diff --git a/src/kvirc/ui/kvi_userlistview.h b/src/kvirc/ui/kvi_userlistview.h index f540593..2098a94 100644 --- a/src/kvirc/ui/kvi_userlistview.h +++ b/src/kvirc/ui/kvi_userlistview.h @@ -34,13 +34,13 @@ #include <time.h> #include "kvi_tal_tooltip.h" -#include <qwidget.h> +#include <tqwidget.h> #include "kvi_pointerlist.h" #include "kvi_pointerhashtable.h" #include "kvi_toolwindows_container.h" -class QLabel; -class QScrollBar; +class TQLabel; +class TQScrollBar; class KviUserListView; class KviUserListViewArea; @@ -63,8 +63,8 @@ public: private: KviUserListView * m_pListView; public: - virtual void maybeTip(const QPoint &pnt); - void doTip(const QRect &rct,const QString &str){ tip(rct,str); }; + virtual void maybeTip(const TQPoint &pnt); + void doTip(const TQRect &rct,const TQString &str){ tip(rct,str); }; }; @@ -74,11 +74,11 @@ class KVIRC_API KviUserListEntry friend class KviUserListView; friend class KviUserListViewArea; public: - KviUserListEntry(KviUserListView * parent,const QString &nick,KviIrcUserEntry * e,short int iFlags,bool bJoinTimeUnknown = true); + KviUserListEntry(KviUserListView * tqparent,const TQString &nick,KviIrcUserEntry * e,short int iFlags,bool bJoinTimeUnknown = true); ~KviUserListEntry(); protected: KviUserListView * m_pListView; - QString m_szNick; + TQString m_szNick; KviIrcUserEntry * m_pGlobalData; short int m_iFlags; short int m_iTemperature; // user temperature : 0 = neutral @@ -92,9 +92,9 @@ protected: public: short int flags() const { return m_iFlags; }; KviIrcUserEntry * globalData(){ return m_pGlobalData; }; - const QString &nick() const { return m_szNick; }; + const TQString &nick() const { return m_szNick; }; KviUserListEntry * next(){ return m_pNext; }; - bool color(QColor& color); + bool color(TQColor& color); protected: void recalcSize(); }; @@ -126,16 +126,17 @@ class KVIRC_API KviUserListView : public KviWindowToolWidget friend class KviChannel; friend class KviQuery; Q_OBJECT + TQ_OBJECT public: - KviUserListView(QWidget * parent,KviWindowToolPageButton* button,KviIrcUserDataBase * db,KviWindow * pWnd,int dictSize = 5,const QString &label_text = QString::null,const char * name = 0); + KviUserListView(TQWidget * tqparent,KviWindowToolPageButton* button,KviIrcUserDataBase * db,KviWindow * pWnd,int dictSize = 5,const TQString &label_text = TQString(),const char * name = 0); ~KviUserListView(); protected: - KviPointerHashTable<QString,KviUserListEntry> * m_pEntryDict; + KviPointerHashTable<TQString,KviUserListEntry> * m_pEntryDict; KviUserListEntry * m_pTopItem; KviUserListEntry * m_pHeadItem; KviUserListEntry * m_pTailItem; KviUserListEntry * m_pIterator; - QLabel * m_pUsersLabel; + TQLabel * m_pUsersLabel; KviUserListViewArea * m_pViewArea; KviIrcUserDataBase * m_pIrcUserDataBase; int m_iSelectedCount; @@ -153,22 +154,22 @@ protected: int m_iIEntries; KviWindow * m_pKviWindow; protected: - void maybeTip(KviUserListToolTip * tip,const QPoint &pnt); + void maybeTip(KviUserListToolTip * tip,const TQPoint &pnt); void triggerUpdate(); void updateUsersLabel(); - void insertUserEntry(const QString &nick,KviUserListEntry * e); + void insertUserEntry(const TQString &nick,KviUserListEntry * e); void removeAllEntries(); - virtual void resizeEvent(QResizeEvent *); - bool partInternal(const QString &nick,bool bRemove = true); + virtual void resizeEvent(TQResizeEvent *); + bool partInternal(const TQString &nick,bool bRemove = true); void setUserDataBase(KviIrcUserDataBase * db){ m_pIrcUserDataBase = db; }; void updateScrollBarRange(); public: void updateArea(); - void select(const QString&); + void select(const TQString&); void applyOptions(); - KviPointerHashTable<QString,KviUserListEntry> * entryDict(){ return m_pEntryDict; }; + KviPointerHashTable<TQString,KviUserListEntry> * entryDict(){ return m_pEntryDict; }; KviUserListEntry * firstItem(){ return m_pHeadItem; }; - KviUserListEntry * itemAt(const QPoint &pnt,QRect * rct = 0); + KviUserListEntry * itemAt(const TQPoint &pnt,TQRect * rct = 0); bool itemVisible(KviUserListEntry * e); KviWindow * window(){ return m_pKviWindow; }; @@ -181,55 +182,56 @@ public: int halfOpCount(){ return m_iHalfOpCount; }; int userOpCount(){ return m_iUserOpCount; }; - KviUserListEntry * findEntry(const QString &nick){ return nick.isEmpty() ? 0 : m_pEntryDict->find(nick); }; - void appendSelectedNicknames(QString &buffer); - QString * firstSelectedNickname(); - QString * nextSelectedNickname(); + KviUserListEntry * findEntry(const TQString &nick){ return nick.isEmpty() ? 0 : m_pEntryDict->tqfind(nick); }; + void appendSelectedNicknames(TQString &buffer); + TQString * firstSelectedNickname(); + TQString * nextSelectedNickname(); void partAll(); - void partAllButOne(const QString &whoNot); + void partAllButOne(const TQString &whoNot); void userStats(KviUserListViewUserStats * s); - int getUserModeLevel(const QString &nick); - kvi_time_t getUserJoinTime(const QString &nick); - kvi_time_t getUserLastActionTime(const QString &nick); + int getUserModeLevel(const TQString &nick); + kvi_time_t getUserJoinTime(const TQString &nick); + kvi_time_t getUserLastActionTime(const TQString &nick); char getUserFlag(KviUserListEntry * e); - char getUserFlag(const QString &nick){ return getUserFlag(m_pEntryDict->find(nick)); }; - bool part(const QString &nick){ return partInternal(nick,true); }; - bool op(const QString &nick,bool bOp); - void prependUserFlag(const QString &nick,QString &buffer); - int flags(const QString &nick); - bool isOp(const QString &nick,bool bAtLeast = false); - bool isVoice(const QString &nick,bool bAtLeast = false); - bool isHalfOp(const QString &nick,bool bAtLeast = false); - bool isChanAdmin(const QString &nick,bool bAtLeast = false); - bool isChanOwner(const QString &nick,bool bAtLeast = false); - bool isUserOp(const QString &nick,bool bAtLeast = false); - bool voice(const QString &nick,bool bVoice); - bool setChanAdmin(const QString &nick,bool bChanAdmin); - bool setChanOwner(const QString &nick,bool bChanOwner); - bool halfop(const QString &nick,bool bHalfOp); - bool userop(const QString &nick,bool bUserOp); + char getUserFlag(const TQString &nick){ return getUserFlag(m_pEntryDict->tqfind(nick)); }; + bool part(const TQString &nick){ return partInternal(nick,true); }; + bool op(const TQString &nick,bool bOp); + void prependUserFlag(const TQString &nick,TQString &buffer); + int flags(const TQString &nick); + bool isOp(const TQString &nick,bool bAtLeast = false); + bool isVoice(const TQString &nick,bool bAtLeast = false); + bool isHalfOp(const TQString &nick,bool bAtLeast = false); + bool isChanAdmin(const TQString &nick,bool bAtLeast = false); + bool isChanOwner(const TQString &nick,bool bAtLeast = false); + bool isUserOp(const TQString &nick,bool bAtLeast = false); + bool voice(const TQString &nick,bool bVoice); + bool setChanAdmin(const TQString &nick,bool bChanAdmin); + bool setChanOwner(const TQString &nick,bool bChanOwner); + bool halfop(const TQString &nick,bool bHalfOp); + bool userop(const TQString &nick,bool bUserOp); void userAction(KviIrcMask *user,int actionTemperature); - bool userActionVerifyMask(const QString &nick,const QString &user,const QString &host,int actionTemperature,QString &oldUser,QString &oldHost); - void userAction(const QString &nick,const QString &user,const QString &host,int actionTemperature); - void userAction(const QString &nick,int actionTemperature); - bool nickChange(const QString &oldNick,const QString &newNick); + bool userActionVerifyMask(const TQString &nick,const TQString &user,const TQString &host,int actionTemperature,TQString &oldUser,TQString &oldHost); + void userAction(const TQString &nick,const TQString &user,const TQString &host,int actionTemperature); + void userAction(const TQString &nick,int actionTemperature); + bool nickChange(const TQString &oldNick,const TQString &newNick); //KviUserListEntry * join(const char *nick,const char * user,const char * host,bool bOp,bool bVoice,bool bHalfOp); - KviUserListEntry * join(const QString &nick,const QString &user = QString::null,const QString &host = QString::null,int iFlags = 0); - bool avatarChanged(const QString &nick); + KviUserListEntry * join(const TQString &nick,const TQString &user = TQString(),const TQString &host = TQString(),int iFlags = 0); + bool avatarChanged(const TQString &nick); void enableUpdates(bool bEnable); void setMaskEntries(char type, int num); void emitRightClick(); void emitDoubleClick(); - bool completeNickStandard(const QString &begin,const QString &skipAfter,QString &buffer,bool bAppendMask); - void completeNickBashLike(const QString &begin,KviPointerList<QString> * l,bool bAppendMask); + bool completeNickStandard(const TQString &begin,const TQString &skipAfter,TQString &buffer,bool bAppendMask); + void completeNickBashLike(const TQString &begin,KviPointerList<TQString> * l,bool bAppendMask); }; -class KVIRC_API KviUserListViewArea : public QWidget +class KVIRC_API KviUserListViewArea : public TQWidget { friend class KviUserListView; Q_OBJECT - Q_PROPERTY(int TransparencyCapable READ dummyRead) + TQ_OBJECT + TQ_PROPERTY(int TransparencyCapable READ dummyRead) public: KviUserListViewArea(KviUserListView * par); ~KviUserListViewArea(); @@ -238,19 +240,19 @@ public: protected: KviUserListView * m_pListView; KviUserListEntry * m_pLastEntryUnderMouse; - QScrollBar * m_pScrollBar; + TQScrollBar * m_pScrollBar; int m_iLastScrollBarVal; int m_iTopItemOffset; bool m_bIgnoreScrollBar; protected: - virtual void paintEvent(QPaintEvent *); - virtual void resizeEvent(QResizeEvent *); - virtual void mousePressEvent(QMouseEvent *e); - virtual void mouseMoveEvent(QMouseEvent *e); - virtual void mouseReleaseEvent(QMouseEvent *); - virtual void mouseDoubleClickEvent(QMouseEvent *e); - virtual void wheelEvent(QWheelEvent *e); - virtual void keyPressEvent( QKeyEvent * e ); + virtual void paintEvent(TQPaintEvent *); + virtual void resizeEvent(TQResizeEvent *); + virtual void mousePressEvent(TQMouseEvent *e); + virtual void mouseMoveEvent(TQMouseEvent *e); + virtual void mouseReleaseEvent(TQMouseEvent *); + virtual void mouseDoubleClickEvent(TQMouseEvent *e); + virtual void wheelEvent(TQWheelEvent *e); + virtual void keyPressEvent( TQKeyEvent * e ); protected slots: void scrollBarMoved(int newVal); }; diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp index 2cf6408..763df17 100644 --- a/src/kvirc/ui/kvi_window.cpp +++ b/src/kvirc/ui/kvi_window.cpp @@ -53,29 +53,29 @@ #include "kvi_styled_controls.h" #include "kvi_kvs_script.h" -#include <qpixmap.h> +#include <tqpixmap.h> #include "kvi_tal_popupmenu.h" -#include <qcursor.h> -#include <qtimer.h> -#include <qsplitter.h> -#include <qmetaobject.h> -#include <qdatetime.h> -#include <qtextcodec.h> -#include <qevent.h> +#include <tqcursor.h> +#include <tqtimer.h> +#include <tqsplitter.h> +#include <tqmetaobject.h> +#include <tqdatetime.h> +#include <tqtextcodec.h> +#include <tqevent.h> // it looks they can't decide :D #ifdef COMPILE_USE_QT4 - #include <QPushButton> - #include <qdesktopwidget.h> + #include <TQPushButton> + #include <tqdesktopwidget.h> #else - #include <qobjectlist.h> + #include <tqobjectlist.h> #endif -#include <qvariant.h> -#include <qtoolbutton.h> +#include <tqvariant.h> +#include <tqtoolbutton.h> #include "kvi_tal_tooltip.h" -#include <qmessagebox.h> +#include <tqmessagebox.h> #ifdef COMPILE_CRYPT_SUPPORT #include "kvi_crypt.h" @@ -102,8 +102,8 @@ static KviTalPopupMenu * g_pMdiWindowSystemTextEncodingPopupSmartUtf8 = 0; unsigned long int g_uUniqueWindowId = 1; // FIXME: #warning "Mouse wheel support" -KviWindow::KviWindow(int type,KviFrame * lpFrm,const QString &name,KviConsole * lpConsole) - : QWidget(0) +KviWindow::KviWindow(int type,KviFrame * lpFrm,const TQString &name,KviConsole * lpConsole) + : TQWidget(0) { m_uId = g_uUniqueWindowId; g_uUniqueWindowId++; @@ -146,13 +146,13 @@ KviWindow::KviWindow(int type,KviFrame * lpFrm,const QString &name,KviConsole * setMinimumSize(KVI_WINDOW_MIN_WIDTH,KVI_WINDOW_MIN_HEIGHT); #ifdef COMPILE_USE_QT4 //setAutoFillBackground(false); - setFocusPolicy(Qt::StrongFocus); + setFocusPolicy(TTQ_StrongFocus); #else setBackgroundMode(NoBackground); - setFocusPolicy(StrongFocus); + setFocusPolicy(TQ_StrongFocus); #endif - connect(g_pApp,SIGNAL(reloadImages()),this,SLOT(reloadImages())); + connect(g_pApp,TQT_SIGNAL(reloadImages()),this,TQT_SLOT(reloadImages())); } KviWindow::~KviWindow() @@ -180,7 +180,7 @@ KviWindow::~KviWindow() #endif } -void KviWindow::setWindowName(const QString &szName) +void KviWindow::setWindowName(const TQString &szName) { m_szName = szName; emit windowNameChanged(); @@ -188,7 +188,7 @@ void KviWindow::setWindowName(const QString &szName) void KviWindow::toggleButtonContainer() { - QFrame *pContainer=buttonContainer(); + TQFrame *pContainer=buttonContainer(); if(pContainer) { pContainer->setHidden(!pContainer->isHidden()); @@ -198,7 +198,7 @@ void KviWindow::toggleButtonContainer() void KviWindow::setName(const char * name) { m_szName = name; - QWidget::setName(name); + TQWidget::setName(name); } KviIrcConnection * KviWindow::connection() @@ -213,22 +213,22 @@ void KviWindow::reloadImages() bool KviWindow::hasAttention() { - if(((QApplication *)g_pApp)->activeWindow() == 0)return false; // no application window has the focus atm + if(((TQApplication *)g_pApp)->activeWindow() == 0)return false; // no application window has the focus atm if(mdiParent()) { if(frame()->isActiveWindow())return true; // This frame is not the active window but the // active window still belongs to KVIrc. - // When the active window is derived from QDialog + // When the active window is derived from TQDialog // then it is probably a KVIrc's option dialog // or something similar. // In this case we assume that the user has the // KVIrc window just below and can see it. // Handle the special case of the dialogs then - QWidget * w = ((QApplication *)g_pApp)->activeWindow(); - if(w->inherits("QDialog")) + TQWidget * w = TQT_TQWIDGET(((TQApplication *)g_pApp)->activeWindow()); + if(w->inherits(TQDIALOG_OBJECT_NAME_STRING)) { // but make sure that the frame is visible at all! if(!frame()->isVisible())return false; @@ -285,43 +285,43 @@ void KviWindow::demandAttention() bool KviWindow::focusNextPrevChild(bool next) { - QWidget * w = focusWidget(); + TQWidget * w = tqfocusWidget(); if(w) { #ifdef COMPILE_USE_QT4 - if(w->focusPolicy() == Qt::StrongFocus)return false; + if(w->focusPolicy() == TTQ_StrongFocus)return false; #else - if(w->focusPolicy() == QWidget::StrongFocus)return false; + if(w->focusPolicy() == TQ_StrongFocus)return false; #endif - //QVariant v = w->property("KviProperty_FocusOwner"); + //TQVariant v = w->property("KviProperty_FocusOwner"); //if(v.isValid())return false; // Do NOT change the focus widget! - if(w->parent()) + if(w->tqparent()) { #ifdef COMPILE_USE_QT4 - if(w->parent()->metaObject()->indexOfProperty("KviProperty_ChildFocusOwner") == -1) + if(w->tqparent()->tqmetaObject()->indexOfProperty("KviProperty_ChildFocusOwner") == -1) #else - if(w->parent()->metaObject()->findProperty("KviProperty_ChildFocusOwner") == -1) + if(w->tqparent()->tqmetaObject()->tqfindProperty("KviProperty_ChildFocusOwner") == -1) #endif return false; // Do NOT change the focus widget! } } - return QWidget::focusNextPrevChild(next); + return TQWidget::focusNextPrevChild(next); } -void KviWindow::forceTextCodec(QTextCodec * c) +void KviWindow::forceTextCodec(TQTextCodec * c) { if(!c)return; m_pTextCodec = c; - QTextCodec * dc = defaultTextCodec(); + TQTextCodec * dc = defaultTextCodec(); if(dc != c) m_szTextEncoding = c->name(); else m_szTextEncoding = ""; // this is the default anyway } -bool KviWindow::setTextEncoding(const QString &szTextEncoding) +bool KviWindow::setTextEncoding(const TQString &szTextEncoding) { if(!szTextEncoding.isEmpty()) { @@ -340,24 +340,24 @@ bool KviWindow::setTextEncoding(const QString &szTextEncoding) return false; } -QTextCodec * KviWindow::defaultTextCodec() +TQTextCodec * KviWindow::defaultTextCodec() { // if we have a connection try to inherit from there... if(connection()) { - QTextCodec * c = connection()->textCodec(); + TQTextCodec * c = connection()->textCodec(); if(c)return c; } return KviApp::defaultTextCodec(); } -KviQCString KviWindow::encodeText(const QString &szText) +KviTQCString KviWindow::encodeText(const TQString &szText) { if(!m_pTextCodec)return defaultTextCodec()->fromUnicode(szText); return m_pTextCodec->fromUnicode(szText); } -QString KviWindow::decodeText(const char * szText) +TQString KviWindow::decodeText(const char * szText) { if(!m_pTextCodec)return defaultTextCodec()->toUnicode(szText); return m_pTextCodec->toUnicode(szText); @@ -427,20 +427,20 @@ void KviWindow::destroyTaskBarItem() // m_pTaskBarItem = 0; // actually the taskBarItem destructor sets it } -BUTTON_CLASS * KviWindow::createToolButton(QWidget * par,const char * nam,int pixon,int pixoff,const QString & tooltip,bool bOn) +BUTTON_CLASS * KviWindow::createToolButton(TQWidget * par,const char * nam,int pixon,int pixoff,const TQString & tooltip,bool bOn) { #ifdef COMPILE_USE_QT4 BUTTON_CLASS * b = new BUTTON_CLASS(par); b->setObjectName(nam); b->setFlat(true); - b->setIcon(QIcon(*(g_pIconManager->getSmallIcon(pixon)))); + b->setIcon(TQIcon(*(g_pIconManager->getSmallIcon(pixon)))); #else BUTTON_CLASS * b = new BUTTON_CLASS(par,nam); b->setToggleButton(true); b->setUsesBigPixmap(false); - QIconSet is1; - is1.setPixmap(*(g_pIconManager->getSmallIcon(pixon)),QIconSet::Small,QIconSet::Normal,QIconSet::On); - is1.setPixmap(*(g_pIconManager->getSmallIcon(pixoff)),QIconSet::Small,QIconSet::Normal,QIconSet::Off); + TQIconSet is1; + is1.setPixmap(*(g_pIconManager->getSmallIcon(pixon)),TQIconSet::Small,TQIconSet::Normal,TQIconSet::On); + is1.setPixmap(*(g_pIconManager->getSmallIcon(pixoff)),TQIconSet::Small,TQIconSet::Normal,TQIconSet::Off); b->setIconSet(is1); #endif @@ -452,43 +452,43 @@ BUTTON_CLASS * KviWindow::createToolButton(QWidget * par,const char * nam,int pi } // This is always defined... -void KviWindow::createCryptControllerButton(QWidget * par) +void KviWindow::createCryptControllerButton(TQWidget * par) { #ifdef COMPILE_CRYPT_SUPPORT m_pCryptControllerButton = new KviWindowToolPageButton(KVI_SMALLICON_UNLOCKEDOFF,KVI_SMALLICON_UNLOCKED,__tr2qs("Crypting"),buttonContainer(),false,"crypt_controller_button"); - connect(m_pCryptControllerButton,SIGNAL(clicked()),this,SLOT(toggleCryptController())); + connect(m_pCryptControllerButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleCryptController())); #endif // COMPILE_CRYPT_SUPPORT } -void KviWindow::createTextEncodingButton(QWidget * par) +void KviWindow::createTextEncodingButton(TQWidget * par) { if(m_pTextEncodingButton)delete m_pTextEncodingButton; m_pTextEncodingButton = createToolButton(par,"text_encoding_button",KVI_SMALLICON_TEXTENCODING,KVI_SMALLICON_TEXTENCODING,__tr2qs("Private Text Encoding"),false); - connect(m_pTextEncodingButton,SIGNAL(clicked()),this,SLOT(textEncodingButtonClicked())); + connect(m_pTextEncodingButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(textEncodingButtonClicked())); } void KviWindow::textEncodingButtonClicked() { createSystemTextEncodingPopup(); - g_pMdiWindowSystemTextEncodingPopup->popup(m_pTextEncodingButton->mapToGlobal(QPoint(0,m_pTextEncodingButton->height()))); + g_pMdiWindowSystemTextEncodingPopup->popup(m_pTextEncodingButton->mapToGlobal(TQPoint(0,m_pTextEncodingButton->height()))); m_pTextEncodingButton->setOn(false); } -const QString & KviWindow::lastLineOfText() +const TQString & KviWindow::lastLineOfText() { if(m_pIrcView) return m_pIrcView->lastLineOfText(); - return KviQString::empty; + return KviTQString::empty; } -const QString & KviWindow::lastMessageText() +const TQString & KviWindow::lastMessageText() { if(m_pIrcView) return m_pIrcView->lastMessageText(); - return KviQString::empty; + return KviTQString::empty; } -// The following three have to be here even if the crypt support is disabled...moc does not support conditional compilations +// The following three have to be here even if the crypt support is disabled...tqmoc does not support conditional compilations void KviWindow::toggleCryptController() { #ifdef COMPILE_CRYPT_SUPPORT @@ -507,8 +507,8 @@ void KviWindow::toggleCryptController() if(m_pSplitter && m_pInput) { m_pCryptController = new KviCryptController(m_pSplitter,m_pCryptControllerButton,"crypt_controller",this,m_pCryptSessionInfo); - connect(m_pCryptController,SIGNAL(done()),this,SLOT(cryptControllerFinished())); - //setFocusHandlerNoClass(m_pInput,m_pCryptController,"QLineEdit"); //link it! + connect(m_pCryptController,TQT_SIGNAL(done()),this,TQT_SLOT(cryptControllerFinished())); + //setFocusHandlerNoClass(m_pInput,m_pCryptController,TQLINEEDIT_OBJECT_NAME_STRING); //link it! m_pCryptController->show(); if(!m_pCryptControllerButton) return; @@ -527,22 +527,14 @@ void KviWindow::setCryptSessionInfo(KviCryptSessionInfo * inf) m_pCryptSessionInfo = inf; if(m_pCryptSessionInfo) { - connect(m_pCryptSessionInfo->pEngine,SIGNAL(destroyed()),this,SLOT(cryptSessionInfoDestroyed())); + connect(m_pCryptSessionInfo->pEngine,TQT_SIGNAL(destroyed()),this,TQT_SLOT(cryptSessionInfoDestroyed())); } if(m_pCryptControllerButton) { -#if QT_VERSION >= 300 - QIconSet is; - is.setPixmap(*(g_pIconManager->getSmallIcon(m_pCryptSessionInfo ? KVI_SMALLICON_LOCKEDOFF : KVI_SMALLICON_UNLOCKEDOFF)),QIconSet::Small,QIconSet::Normal,QIconSet::Off); - is.setPixmap(*(g_pIconManager->getSmallIcon(m_pCryptSessionInfo ? KVI_SMALLICON_LOCKED : KVI_SMALLICON_UNLOCKED)),QIconSet::Small,QIconSet::Normal,QIconSet::On); + TQIconSet is; + is.setPixmap(*(g_pIconManager->getSmallIcon(m_pCryptSessionInfo ? KVI_SMALLICON_LOCKEDOFF : KVI_SMALLICON_UNLOCKEDOFF)),TQIconSet::Small,TQIconSet::Normal,TQIconSet::Off); + is.setPixmap(*(g_pIconManager->getSmallIcon(m_pCryptSessionInfo ? KVI_SMALLICON_LOCKED : KVI_SMALLICON_UNLOCKED)),TQIconSet::Small,TQIconSet::Normal,TQIconSet::On); m_pCryptControllerButton->setIconSet(is); -#else - - m_pCryptControllerButton->setOnIconSet( - *(g_pIconManager->getSmallIcon(m_pCryptSessionInfo ? KVI_SMALLICON_LOCKEDOFF : KVI_SMALLICON_UNLOCKEDOFF))); - m_pCryptControllerButton->setOffIconSet( - *(g_pIconManager->getSmallIcon(m_pCryptSessionInfo ? KVI_SMALLICON_LOCKED : KVI_SMALLICON_UNLOCKED))); -#endif if(m_pCryptControllerButton->isOn()) m_pCryptControllerButton->setOn(false); @@ -584,28 +576,28 @@ void KviWindow::listWindowTypes() outputNoFmt(KVI_OUT_SYSTEMMESSAGE,m_typeTable[i]); } -void KviWindow::getConfigGroupName(QString &buf) +void KviWindow::getConfigGroupName(TQString &buf) { buf = typeString(); } -void KviWindow::getDefaultLogFileName(QString &buffer) +void KviWindow::getDefaultLogFileName(TQString &buffer) { // FIXME: #warning "Make it configurable ?" - QString date; - QDate dt(QDate::currentDate()); + TQString date; + TQDate dt(TQDate::tqcurrentDate()); date=dt.toString("yyyy.MM.dd"); - QString base; + TQString base; getBaseLogFileName(base); kvi_encodeFileName(base); - base.replace("%%2e","%2e"); + base.tqreplace("%%2e","%2e"); base=base.lower(); - QString tmp; + TQString tmp; if(KVI_OPTION_BOOL(KviOption_boolGzipLogs)) - KviQString::sprintf(tmp,"%s_%s_%s.log.gz",typeString(),base.utf8().data(),date.utf8().data()); + KviTQString::sprintf(tmp,"%s_%s_%s.log.gz",typeString(),base.utf8().data(),date.utf8().data()); else - KviQString::sprintf(tmp,"%s_%s_%s.log",typeString(),base.utf8().data(),date.utf8().data()); + KviTQString::sprintf(tmp,"%s_%s_%s.log",typeString(),base.utf8().data(),date.utf8().data()); g_pApp->getLocalKvircDirectory(buffer,KviApp::Log,tmp); } @@ -614,7 +606,7 @@ void KviWindow::getDefaultLogFileName(QString &buffer) buffer = m_szName; }*/ -void KviWindow::getBaseLogFileName(QString &buffer) +void KviWindow::getBaseLogFileName(TQString &buffer) { buffer = m_szName; } @@ -623,17 +615,17 @@ void KviWindow::getBaseLogFileName(QString &buffer) void KviWindow::saveProperties(KviConfig *cfg) { // store only the non-default text encoding. - QString szCodec = m_szTextEncoding; - QTextCodec * c = defaultTextCodec(); + TQString szCodec = m_szTextEncoding; + TQTextCodec * c = defaultTextCodec(); if(c && m_pTextCodec) { #ifdef COMPILE_USE_QT4 - if(KviQString::equalCI(szCodec,c->name().data()))szCodec = KviQString::empty; // store "default" + if(KviTQString::equalCI(szCodec,c->name().data()))szCodec = KviTQString::empty; // store "default" #else - if(KviQString::equalCI(szCodec,c->name()))szCodec = KviQString::empty; // store "default" + if(KviTQString::equalCI(szCodec,c->name()))szCodec = KviTQString::empty; // store "default" #endif } - QString szKey = "TextEncoding_"; + TQString szKey = "TextEncoding_"; szKey += m_szName; cfg->writeEntry(szKey,szCodec); if(m_pInput) { @@ -650,9 +642,9 @@ void KviWindow::saveProperties(KviConfig *cfg) void KviWindow::loadProperties(KviConfig *cfg) { - QString szKey = "TextEncoding_"; + TQString szKey = "TextEncoding_"; szKey += m_szName; - setTextEncoding(cfg->readQStringEntry(szKey,KviQString::empty).utf8().data()); + setTextEncoding(cfg->readTQStringEntry(szKey,KviTQString::empty).utf8().data()); if(m_pInput) { m_pInput->setButtonsHidden(cfg->readBoolEntry("inputToolButtonsHidden",KVI_OPTION_BOOL(KviOption_boolHideInputToolButtons))); m_pInput->setUserFriendly(cfg->readBoolEntry("commandLineIsUserFriendly",KVI_OPTION_BOOL(KviOption_boolCommandlineInUserFriendlyModeByDefault))); @@ -662,42 +654,42 @@ void KviWindow::loadProperties(KviConfig *cfg) bool bEnableLogs=cfg->readBoolEntry("LoggingEnabled",0); if(!m_pIrcView->isLogging() && bEnableLogs) { - QString szTmp; + TQString szTmp; getBaseLogFileName(szTmp); m_pIrcView->startLogging(); } }*/ } -QPixmap * KviWindow::myIconPtr() +TQPixmap * KviWindow::myIconPtr() { return g_pIconManager->getSmallIcon(KVI_SMALLICON_DEFAULTICON); } -void KviWindow::getTaskBarTipText(QString &buffer) +void KviWindow::getTaskBarTipText(TQString &buffer) { buffer = m_szPlainTextCaption; } -void KviWindow::setFixedCaption(const QString &szCaption) +void KviWindow::setFixedCaption(const TQString &szCaption) { m_szPlainTextCaption = szCaption; } void KviWindow::fillCaptionBuffers() { - QString szCaption = m_szPlainTextCaption; + TQString szCaption = m_szPlainTextCaption; if(szCaption.isEmpty()) szCaption = m_szName; fillSingleColorCaptionBuffers(szCaption); } -void KviWindow::fillSingleColorCaptionBuffers(const QString &szName) +void KviWindow::fillSingleColorCaptionBuffers(const TQString &szName) { - static QString p1("<nobr><font color=\""); - static QString p2("\"><b>"); - static QString p3("</b></font></nobr>"); + static TQString p1("<nobr><font color=\""); + static TQString p2("\"><b>"); + static TQString p3("</b></font></nobr>"); m_szPlainTextCaption = szName; @@ -740,7 +732,7 @@ void KviWindow::createSystemTextEncodingPopup() else { g_pMdiWindowSystemTextEncodingPopupStandard->clear(); - disconnect(g_pMdiWindowSystemTextEncodingPopupStandard,SIGNAL(activated(int)),0,0); + disconnect(g_pMdiWindowSystemTextEncodingPopupStandard,TQT_SIGNAL(activated(int)),0,0); } if(!g_pMdiWindowSystemTextEncodingPopupSmart) @@ -748,7 +740,7 @@ void KviWindow::createSystemTextEncodingPopup() else { g_pMdiWindowSystemTextEncodingPopupSmart->clear(); - disconnect(g_pMdiWindowSystemTextEncodingPopupSmart,SIGNAL(activated(int)),0,0); + disconnect(g_pMdiWindowSystemTextEncodingPopupSmart,TQT_SIGNAL(activated(int)),0,0); } if(!g_pMdiWindowSystemTextEncodingPopupSmartUtf8) @@ -756,11 +748,11 @@ void KviWindow::createSystemTextEncodingPopup() else { g_pMdiWindowSystemTextEncodingPopupSmartUtf8->clear(); - disconnect(g_pMdiWindowSystemTextEncodingPopupSmartUtf8,SIGNAL(activated(int)),0,0); + disconnect(g_pMdiWindowSystemTextEncodingPopupSmartUtf8,TQT_SIGNAL(activated(int)),0,0); } - QTextCodec * c = defaultTextCodec(); - QString tmp = __tr2qs("Use Default Encoding"); + TQTextCodec * c = defaultTextCodec(); + TQString tmp = __tr2qs("Use Default Encoding"); if(c) { tmp += " ("; @@ -768,7 +760,7 @@ void KviWindow::createSystemTextEncodingPopup() tmp += ")"; } - int id = g_pMdiWindowSystemTextEncodingPopup->insertItem(tmp,this,SLOT(systemTextEncodingPopupDefault())); + int id = g_pMdiWindowSystemTextEncodingPopup->insertItem(tmp,this,TQT_SLOT(systemTextEncodingPopupDefault())); if(m_szTextEncoding.isEmpty())g_pMdiWindowSystemTextEncodingPopup->setItemChecked(id,true); g_pMdiWindowSystemTextEncodingPopup->insertSeparator(); @@ -780,22 +772,22 @@ void KviWindow::createSystemTextEncodingPopup() KviLocale::EncodingDescription * d = KviLocale::encodingDescription(i); while(d->szName) { - KviQString::sprintf(tmp,"%s (%s)",d->szName,d->szDescription); + KviTQString::sprintf(tmp,"%s (%s)",d->szName,d->szDescription); KviTalPopupMenu * ppp = d->bSmart ? (d->bSendUtf8 ? g_pMdiWindowSystemTextEncodingPopupSmartUtf8 : g_pMdiWindowSystemTextEncodingPopupSmart) : g_pMdiWindowSystemTextEncodingPopupStandard; id = ppp->insertItem(tmp); - if(KviQString::equalCI(m_szTextEncoding,d->szName)) + if(KviTQString::equalCI(m_szTextEncoding,d->szName)) ppp->setItemChecked(id,true); i = i + 1; d = KviLocale::encodingDescription(i); } - connect(g_pMdiWindowSystemTextEncodingPopupSmart,SIGNAL(activated(int)),this,SLOT(systemTextEncodingPopupSmartActivated(int))); - connect(g_pMdiWindowSystemTextEncodingPopupSmartUtf8,SIGNAL(activated(int)),this,SLOT(systemTextEncodingPopupSmartUtf8Activated(int))); - connect(g_pMdiWindowSystemTextEncodingPopupStandard,SIGNAL(activated(int)),this,SLOT(systemTextEncodingPopupStandardActivated(int))); + connect(g_pMdiWindowSystemTextEncodingPopupSmart,TQT_SIGNAL(activated(int)),this,TQT_SLOT(systemTextEncodingPopupSmartActivated(int))); + connect(g_pMdiWindowSystemTextEncodingPopupSmartUtf8,TQT_SIGNAL(activated(int)),this,TQT_SLOT(systemTextEncodingPopupSmartUtf8Activated(int))); + connect(g_pMdiWindowSystemTextEncodingPopupStandard,TQT_SIGNAL(activated(int)),this,TQT_SLOT(systemTextEncodingPopupStandardActivated(int))); } -void KviWindow::systemPopupRequest(const QPoint &pnt) +void KviWindow::systemPopupRequest(const TQPoint &pnt) { if(!g_pMdiWindowSystemMainPopup) g_pMdiWindowSystemMainPopup = new KviTalPopupMenu(); @@ -807,27 +799,27 @@ void KviWindow::systemPopupRequest(const QPoint &pnt) if(mdiParent()) g_pMdiWindowSystemMainPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_UNDOCK)), - __tr2qs("&Undock"),this,SLOT(undock())); + __tr2qs("&Undock"),this,TQT_SLOT(undock())); else g_pMdiWindowSystemMainPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DOCK)), - __tr2qs("&Dock"),this,SLOT(dock())); + __tr2qs("&Dock"),this,TQT_SLOT(dock())); g_pMdiWindowSystemMainPopup->insertSeparator(); int id = g_pMdiWindowSystemMainPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)), - __tr2qs("Mi&nimize"),this,SLOT(minimize())); + __tr2qs("Mi&nimize"),this,TQT_SLOT(minimize())); g_pMdiWindowSystemMainPopup->setItemEnabled(id,!isMinimized()); id = g_pMdiWindowSystemMainPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXIMIZE)), - __tr2qs("Ma&ximize"),this,SLOT(maximize())); + __tr2qs("Ma&ximize"),this,TQT_SLOT(maximize())); g_pMdiWindowSystemMainPopup->setItemEnabled(id,!isMaximized()); id = g_pMdiWindowSystemMainPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RESTORE)), - __tr2qs("&Restore"),this,SLOT(restore())); + __tr2qs("&Restore"),this,TQT_SLOT(restore())); g_pMdiWindowSystemMainPopup->setItemEnabled(id,isMinimized()||isMaximized()); g_pMdiWindowSystemMainPopup->insertSeparator(); g_pMdiWindowSystemMainPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)), - __tr2qs("Close"),this,SLOT(close())); + __tr2qs("Close"),this,TQT_SLOT(close())); g_pMdiWindowSystemMainPopup->insertSeparator(); @@ -839,7 +831,7 @@ void KviWindow::systemPopupRequest(const QPoint &pnt) g_pMdiWindowSystemMainPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_XY)), - __tr2qs("Sa&ve Window Properties"),this,SLOT(savePropertiesAsDefault())); + __tr2qs("Sa&ve Window Properties"),this,TQT_SLOT(savePropertiesAsDefault())); fillContextPopup(g_pMdiWindowSystemMainPopup); @@ -856,8 +848,8 @@ void KviWindow::systemTextEncodingPopupSmartActivated(int id) { if(!g_pMdiWindowSystemTextEncodingPopupSmart) return; - QString tmp = g_pMdiWindowSystemTextEncodingPopupSmart->text(id); - KviQString::cutFromFirst(tmp," ("); + TQString tmp = g_pMdiWindowSystemTextEncodingPopupSmart->text(id); + KviTQString::cutFromFirst(tmp," ("); setTextEncoding(tmp); } @@ -865,8 +857,8 @@ void KviWindow::systemTextEncodingPopupSmartUtf8Activated(int id) { if(!g_pMdiWindowSystemTextEncodingPopupSmartUtf8) return; - QString tmp = g_pMdiWindowSystemTextEncodingPopupSmartUtf8->text(id); - KviQString::cutFromFirst(tmp," ("); + TQString tmp = g_pMdiWindowSystemTextEncodingPopupSmartUtf8->text(id); + KviTQString::cutFromFirst(tmp," ("); setTextEncoding(tmp); } @@ -874,14 +866,14 @@ void KviWindow::systemTextEncodingPopupStandardActivated(int id) { if(!g_pMdiWindowSystemTextEncodingPopupStandard) return; - QString tmp = g_pMdiWindowSystemTextEncodingPopupStandard->text(id); - KviQString::cutFromFirst(tmp," ("); + TQString tmp = g_pMdiWindowSystemTextEncodingPopupStandard->text(id); + KviTQString::cutFromFirst(tmp," ("); setTextEncoding(tmp); } void KviWindow::savePropertiesAsDefault() { - QString group; + TQString group; getConfigGroupName(group); if(!kvi_strEqualCI(group,typeString())) @@ -895,7 +887,7 @@ void KviWindow::savePropertiesAsDefault() void KviWindow::contextPopup() { - systemPopupRequest(QCursor::pos()); + systemPopupRequest(TQCursor::pos()); } void KviWindow::fillContextPopup(KviTalPopupMenu *) @@ -915,7 +907,7 @@ void KviWindow::dock() void KviWindow::delayedAutoRaise() { - QTimer::singleShot(0,this,SLOT(autoRaise())); + TQTimer::singleShot(0,this,TQT_SLOT(autoRaise())); } void KviWindow::autoRaise() @@ -933,10 +925,10 @@ void KviWindow::autoRaise() void KviWindow::delayedClose() { - QTimer::singleShot(0,this,SLOT(close())); + TQTimer::singleShot(0,this,TQT_SLOT(close())); } -void KviWindow::closeEvent(QCloseEvent *e) +void KviWindow::closeEvent(TQCloseEvent *e) { e->ignore(); g_pFrame->childWindowCloseRequest(this); @@ -944,9 +936,9 @@ void KviWindow::closeEvent(QCloseEvent *e) void KviWindow::updateIcon() { - if(parent()) + if(tqparent()) { - ((KviMdiChild *)parent())->setIcon(*myIconPtr()); + ((KviMdiChild *)tqparent())->setIcon(*myIconPtr()); } else { setIcon(*myIconPtr()); } @@ -959,9 +951,9 @@ void KviWindow::youAreDocked() delete m_pAccel; m_pAccel = 0; } - ((KviMdiChild *)parent())->setIcon(*myIconPtr()); + ((KviMdiChild *)tqparent())->setIcon(*myIconPtr()); updateCaption(); - connect(((KviMdiChild *)parent()),SIGNAL(systemPopupRequest(const QPoint &)),this,SLOT(systemPopupRequest(const QPoint &))); + connect(((KviMdiChild *)tqparent()),TQT_SIGNAL(systemPopupRequest(const TQPoint &)),this,TQT_SLOT(systemPopupRequest(const TQPoint &))); } void KviWindow::youAreUndocked() @@ -988,13 +980,13 @@ void KviWindow::activateSelf() void KviWindow::setFocus() { - // don't trigger the whole Qt focus mechanism.. + // don't trigger the whole TQt focus mechanism.. // just trigger directly our focusInEvent // so we'll redirect the focus to the m_pFocusHandler focusInEvent(0); } -void KviWindow::focusInEvent(QFocusEvent *) +void KviWindow::focusInEvent(TQFocusEvent *) { if(m_pLastFocusedChild) { @@ -1014,25 +1006,25 @@ void KviWindow::focusInEvent(QFocusEvent *) if(m_pIrcView)m_pFocusHandler = m_pIrcView; else { #ifdef COMPILE_USE_QT4 - QList<QObject *> list = children(); - for(QList<QObject *>::Iterator it = list.begin();it != list.end();++it) + TQList<TQObject *> list = tqchildren(); + for(TQList<TQObject *>::Iterator it = list.begin();it != list.end();++it) { - QObject * c = *it; + TQObject * c = *it; if(c->isWidgetType()) { - m_pFocusHandler = (QWidget *)c; + m_pFocusHandler = (TQWidget *)c; break; } } #else - QObjectList *list = (QObjectList *)(children()); - if(list) + TQObjectList list = childrenListObject(); + if(!list.isEmpty()) { - for(QObject * c = list->first();c;c = list->next()) + for(TQObject * c = list.first();c;c = list.next()) { if(c->isWidgetType()) { - m_pFocusHandler = (QWidget *)c; + m_pFocusHandler = (TQWidget *)c; break; } } @@ -1050,7 +1042,7 @@ void KviWindow::focusInEvent(QFocusEvent *) } // Setting the focus to the focus handler usually - // triggers our filter for the children's focusInEvent. + // triggers our filter for the tqchildren's focusInEvent. // This should call activateSelf() and thus // we should be already the active window at this point. // If we're not, then run activateSelf() to fix this. @@ -1059,26 +1051,26 @@ void KviWindow::focusInEvent(QFocusEvent *) updateCaption(); } -bool KviWindow::eventFilter(QObject *o,QEvent *e) +bool KviWindow::eventFilter(TQObject *o,TQEvent *e) { switch(e->type()) { - case QEvent::FocusIn: - m_pLastFocusedChild = (QWidget *)o; + case TQEvent::FocusIn: + m_pLastFocusedChild = (TQWidget *)o; if(g_pActiveWindow != this)activateSelf(); break; - case QEvent::Enter: + case TQEvent::Enter: // this is a handler moved here from KviMdiChild::eventFilter - if(QApplication::overrideCursor()) - QApplication::restoreOverrideCursor(); + if(TQApplication::overrideCursor()) + TQApplication::restoreOverrideCursor(); break; - case QEvent::MouseButtonPress: + case TQEvent::MouseButtonPress: #ifdef COMPILE_USE_QT4 - if( (((QWidget *)o)->focusPolicy() == Qt::NoFocus) || - (((QWidget *)o)->focusPolicy() == Qt::TabFocus)) + if( (((TQWidget *)o)->focusPolicy() == TTQ_NoFocus) || + (((TQWidget *)o)->focusPolicy() == TTQ_TabFocus)) #else - if( (((QWidget *)o)->focusPolicy() == QWidget::NoFocus) || - (((QWidget *)o)->focusPolicy() == QWidget::TabFocus)) + if( (((TQWidget *)o)->focusPolicy() == TQ_NoFocus) || + (((TQWidget *)o)->focusPolicy() == TQ_TabFocus)) #endif { // this will not focus our window @@ -1097,13 +1089,13 @@ bool KviWindow::eventFilter(QObject *o,QEvent *e) } } break; - case QEvent::ChildInserted: - if(((QChildEvent *)e)->child()->isWidgetType()) - childInserted((QWidget *)((QChildEvent *)e)->child()); + case TQEvent::ChildInserted: + if(((TQChildEvent *)e)->child()->isWidgetType()) + childInserted((TQWidget *)((TQChildEvent *)e)->child()); break; - case QEvent::ChildRemoved: - if(((QChildEvent *)e)->child()->isWidgetType()) - childRemoved((QWidget *)((QChildEvent *)e)->child()); + case TQEvent::ChildRemoved: + if(((TQChildEvent *)e)->child()->isWidgetType()) + childRemoved((TQWidget *)((TQChildEvent *)e)->child()); break; default: /* make gcc happy */ break; } @@ -1111,20 +1103,20 @@ bool KviWindow::eventFilter(QObject *o,QEvent *e) } -void KviWindow::childInserted(QWidget * o) +void KviWindow::childInserted(TQWidget * o) { o->removeEventFilter(this); // ensure that we don't filter twice o->installEventFilter(this); // we filter its events - connect(o,SIGNAL(destroyed()),this,SLOT(childDestroyed())); + connect(o,TQT_SIGNAL(destroyed()),this,TQT_SLOT(childDestroyed())); if(o->inherits("KviInput")) m_pFocusHandler = o; else { #ifdef COMPILE_USE_QT4 - if(!m_pFocusHandler && (o->focusPolicy() == Qt::StrongFocus)) + if(!m_pFocusHandler && (o->focusPolicy() == TTQ_StrongFocus)) #else - if(!m_pFocusHandler && (o->focusPolicy() == QWidget::StrongFocus)) + if(!m_pFocusHandler && (o->focusPolicy() == TQ_StrongFocus)) #endif { m_pFocusHandler = o; @@ -1132,23 +1124,23 @@ void KviWindow::childInserted(QWidget * o) } #ifdef COMPILE_USE_QT4 - QList<QObject *> list = o->children(); - for(QList<QObject *>::Iterator it = list.begin();it != list.end();++it) + TQList<TQObject *> list = o->tqchildren(); + for(TQList<TQObject *>::Iterator it = list.begin();it != list.end();++it) { - QObject * c = *it; + TQObject * c = *it; if(c->isWidgetType()) { - childInserted((QWidget *)c); + childInserted((TQWidget *)c); } } #else - QObjectList *list = (QObjectList *)(o->children()); - if(list) + TQObjectList list = o->childrenListObject(); + if(!list.isEmpty()) { - for(QObject * c = list->first();c;c = list->next()) + for(TQObject * c = list.first();c;c = list.next()) { if(c->isWidgetType()) - childInserted((QWidget *)c); + childInserted((TQWidget *)c); } } #endif @@ -1156,11 +1148,11 @@ void KviWindow::childInserted(QWidget * o) void KviWindow::childDestroyed() { - QWidget * s = (QWidget *)sender(); + TQWidget * s = (TQWidget *)sender(); childRemoved(s); } -void KviWindow::childRemoved(QWidget * o) +void KviWindow::childRemoved(TQWidget * o) { //debug("CHILD REMOVED %d",o); o->removeEventFilter(this); @@ -1170,92 +1162,85 @@ void KviWindow::childRemoved(QWidget * o) m_pLastFocusedChild = 0; #ifdef COMPILE_USE_QT4 - QList<QObject *> list = o->children(); - for(QList<QObject *>::Iterator it = list.begin();it != list.end();++it) + TQList<TQObject *> list = o->tqchildren(); + for(TQList<TQObject *>::Iterator it = list.begin();it != list.end();++it) { - QObject * c = *it; + TQObject * c = *it; if(c->isWidgetType()) { - childRemoved((QWidget *)c); + childRemoved((TQWidget *)c); } } #else - QObjectList *list = (QObjectList *)(o->children()); - if(list) + TQObjectList list = o->childrenListObject(); + if(!list.isEmpty()) { - for(QObject * c = list->first();c;c = list->next()) + for(TQObject * c = list.first();c;c = list.next()) { if(c->isWidgetType()) - childRemoved((QWidget *)c); + childRemoved((TQWidget *)c); } - } //else debug("The removed object has no children"); + } //else debug("The removed object has no tqchildren"); #endif } -void KviWindow::childEvent(QChildEvent *e) +void KviWindow::childEvent(TQChildEvent *e) { if(e->child()->isWidgetType()) { if(e->removed()) - childRemoved((QWidget *)(e->child())); + childRemoved((TQWidget *)(e->child())); else - childInserted((QWidget *)(e->child())); + childInserted((TQWidget *)(e->child())); } - QWidget::childEvent(e); + TQWidget::childEvent(e); } -void KviWindow::wheelEvent(QWheelEvent *e) +void KviWindow::wheelEvent(TQWheelEvent *e) { /* NOTHING HERE FOR NOW (FIXME) */ } -void KviWindow::childrenTreeChanged(QWidget * widgetAdded) +void KviWindow::tqchildrenTreeChanged(TQWidget * widgetAdded) { // if(widgetAdded && m_pFocusHandler)setFocusHandler(m_pFocusHandler,widgetAdded); // FIXME: This might be useless - QResizeEvent * e = new QResizeEvent(size(),size()); + TQResizeEvent * e = new TQResizeEvent(size(),size()); resizeEvent(e); delete e; } -void KviWindow::updateBackgrounds(QObject * obj) +void KviWindow::updateBackgrounds(TQObject * obj) { if(!obj) - obj = this; + obj = TQT_TQOBJECT(this); #ifdef COMPILE_USE_QT4 - QList<QObject *> list = obj->children(); + TQList<TQObject *> list = obj->tqchildren(); if (list.count()) { - for(QList<QObject *>::Iterator it = list.begin();it != list.end();++it) + for(TQList<TQObject *>::Iterator it = list.begin();it != list.end();++it) { - QObject * child = *it; - if(child->metaObject()->indexOfProperty("TransparencyCapable") != -1){ + TQObject * child = *it; + if(child->tqmetaObject()->indexOfProperty("TransparencyCapable") != -1){ // if (child->isWidgetType()) - ((QWidget *)child)->update(); + ((TQWidget *)child)->update(); } updateBackgrounds(child); } } #else - QObjectList * list = (QObjectList *)(obj->children()); - if(list) + TQObjectList list = obj->childrenListObject(); + if(!list.isEmpty()) { - for(unsigned int i=0;i<list->count();i++) + for(unsigned int i=0;i<list.count();i++) { - QObject * child = list->at(i); -#if QT_VERSION >= 300 + TQObject * child = list.at(i); // FIXME: check if this code can work with qt < 3.0.0 too - if(child->metaObject()->findProperty("TransparencyCapable",true) != -1) - ((QWidget *)child)->update(); -#else - - QVariant v = list->at(i)->property("TransparencyCapable"); - if(v.isValid()) - ((QWidget *)child)->update(); -#endif + if(child->tqmetaObject()->tqfindProperty("TransparencyCapable",true) != -1) + ((TQWidget *)child)->update(); updateBackgrounds(child); } @@ -1263,13 +1248,13 @@ void KviWindow::updateBackgrounds(QObject * obj) #endif } -void KviWindow::moveEvent(QMoveEvent *e) +void KviWindow::moveEvent(TQMoveEvent *e) { #ifdef COMPILE_PSEUDO_TRANSPARENCY updateBackgrounds(); #endif - QWidget::moveEvent(e); + TQWidget::moveEvent(e); } void KviWindow::minimize() @@ -1300,7 +1285,7 @@ bool KviWindow::isMinimized() if(mdiParent()) return (mdiParent()->state() == KviMdiChild::Minimized); else - return QWidget::isMinimized(); + return TQWidget::isMinimized(); } bool KviWindow::isMaximized() @@ -1327,12 +1312,12 @@ void KviWindow::restore() autoRaise(); } -QRect KviWindow::externalGeometry() +TQRect KviWindow::externalGeometry() { #ifndef Q_OS_MACX return mdiParent() ? mdiParent()->restoredGeometry() : frameGeometry(); #else - return mdiParent() ? mdiParent()->restoredGeometry() : geometry(); + return mdiParent() ? mdiParent()->restoredGeometry() : tqgeometry(); #endif } @@ -1342,7 +1327,7 @@ void KviWindow::applyOptions() if(m_pIrcView)m_pIrcView->applyOptions(); if(m_pInput)m_pInput->applyOptions(); - // trick: relayout + // trick: retqlayout resize(width() - 1,height() - 1); resize(width() + 1,height() + 1); } @@ -1392,8 +1377,8 @@ void KviWindow::internalOutput(KviIrcView * pView,int msg_type,const kvi_wchar_t ( KVI_OPTION_BOOL(KviOption_boolHighlightOnlyNormalMsgQueryToo) && ( - (msg_type == KVI_OUT_QUERYPRIVMSG) || (msg_type == KVI_OUT_QUERYTRACE) || - (msg_type == KVI_OUT_QUERYPRIVMSGCRYPTED) || (msg_type == KVI_OUT_QUERYNOTICE) || (msg_type == KVI_OUT_QUERYNOTICECRYPTED) + (msg_type == KVI_OUT_TQUERYPRIVMSG) || (msg_type == KVI_OUT_TQUERYTRACE) || + (msg_type == KVI_OUT_TQUERYPRIVMSGCRYPTED) || (msg_type == KVI_OUT_TQUERYNOTICE) || (msg_type == KVI_OUT_TQUERYNOTICECRYPTED) ) ) || @@ -1417,59 +1402,59 @@ void KviWindow::internalOutput(KviIrcView * pView,int msg_type,const kvi_wchar_t void KviWindow::output(int msg_type,const char *format,...) { - QString szFmt(format); + TQString szFmt(format); kvi_va_list l; kvi_va_start(l,format); - QString szBuf; - KviQString::vsprintf(szBuf,szFmt,l); + TQString szBuf; + KviTQString::vsprintf(szBuf,szFmt,l); kvi_va_end(l); preprocessMessage(szBuf); - const QChar * pC = KviQString::nullTerminatedArray(szBuf); + const TQChar * pC = KviTQString::nullTerminatedArray(szBuf); if(!pC)return; internalOutput(m_pIrcView,msg_type,(kvi_wchar_t *)pC); } -void KviWindow::output(int msg_type,const QString &szFmt,...) +void KviWindow::output(int msg_type,const TQString &szFmt,...) { kvi_va_list l; kvi_va_start_by_reference(l,szFmt); - QString szBuf; - KviQString::vsprintf(szBuf,szFmt,l); + TQString szBuf; + KviTQString::vsprintf(szBuf,szFmt,l); kvi_va_end(l); preprocessMessage(szBuf); - const QChar * pC = KviQString::nullTerminatedArray(szBuf); + const TQChar * pC = KviTQString::nullTerminatedArray(szBuf); if(!pC)return; internalOutput(m_pIrcView,msg_type,(kvi_wchar_t *)pC); } void KviWindow::output(int msg_type,const kvi_wchar_t *format,...) { - QString szFmt=QString::fromUtf8(KviStr(format).ptr()); + TQString szFmt=TQString::fromUtf8(KviStr(format).ptr()); kvi_va_list l; kvi_va_start(l,format); - QString szBuf; - KviQString::vsprintf(szBuf,szFmt,l); + TQString szBuf; + KviTQString::vsprintf(szBuf,szFmt,l); kvi_va_end(l); preprocessMessage(szBuf); - const QChar * pC = KviQString::nullTerminatedArray(szBuf); + const TQChar * pC = KviTQString::nullTerminatedArray(szBuf); if(!pC)return; internalOutput(m_pIrcView,msg_type,(kvi_wchar_t *)pC); } void KviWindow::outputNoFmt(int msg_type,const char * text,int iFlags) { - QString szText(text); + TQString szText(text); preprocessMessage(szText); - const QChar * pC = KviQString::nullTerminatedArray(szText); + const TQChar * pC = KviTQString::nullTerminatedArray(szText); if(!pC)return; internalOutput(m_pIrcView,msg_type,(kvi_wchar_t *)pC,iFlags); } -void KviWindow::outputNoFmt(int msg_type,const QString &szText,int iFlags) +void KviWindow::outputNoFmt(int msg_type,const TQString &szText,int iFlags) { - QString szBuf(szText); + TQString szBuf(szText); preprocessMessage(szBuf); - const QChar * pC = KviQString::nullTerminatedArray(szBuf); + const TQChar * pC = KviTQString::nullTerminatedArray(szBuf); if(!pC)return; internalOutput(m_pIrcView,msg_type,(kvi_wchar_t *)pC,iFlags); } @@ -1488,27 +1473,27 @@ void KviWindow::unhighlight() Fixed */ -void KviWindow::preprocessMessage(QString & szMessage) +void KviWindow::preprocessMessage(TQString & szMessage) { // slow #ifdef COMPILE_USE_QT4 - QStringList strings = szMessage.split(" "); + TQStringList strings = szMessage.split(" "); #else - QStringList strings = QStringList::split(" ",szMessage, TRUE); + TQStringList strings = TQStringList::split(" ",szMessage, TRUE); #endif - for ( QStringList::Iterator it = strings.begin(); it != strings.end(); ++it ) { - QString tmp(*it); - if(tmp.contains('\r')) continue; + for ( TQStringList::Iterator it = strings.begin(); it != strings.end(); ++it ) { + TQString tmp(*it); + if(tmp.tqcontains('\r')) continue; tmp = KviMircCntrl::stripControlBytes(tmp); tmp.stripWhiteSpace(); if(m_pConsole) if(m_pConsole->connection()) - if(m_pConsole->connection()->serverInfo()->supportedChannelTypes().contains(tmp[0])) + if(m_pConsole->connection()->serverInfo()->supportedChannelTypes().tqcontains(tmp[0])) if((*it)==tmp) - *it=QString("\r!c\r%1\r").arg(*it); + *it=TQString("\r!c\r%1\r").tqarg(*it); else { - *it=QString("\r!c%1\r%2\r").arg(tmp).arg(*it); + *it=TQString("\r!c%1\r%2\r").tqarg(tmp).tqarg(*it); } } szMessage=strings.join(" "); diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/kvi_window.h index 419096f..f86b6c2 100644 --- a/src/kvirc/ui/kvi_window.h +++ b/src/kvirc/ui/kvi_window.h @@ -30,13 +30,13 @@ #include "kvi_settings.h" #ifdef COMPILE_ON_WINDOWS - // The brain-damaged MSVC compiler can't instantiate QList templates without a destructor definition + // The brain-damaged MSVC compiler can't instantiate TQList templates without a destructor definition #include "kvi_mdichild.h" #else class KviMdiChild; #endif -#include <qframe.h> +#include <tqframe.h> class KviFrame; class KviTaskBarItem; @@ -49,11 +49,11 @@ class KviIrcConnection; class KviWindowToolPageButton; class KviTalPopupMenu; -class QPixmap; -class QSplitter; +class TQPixmap; +class TQSplitter; class KviTalHBox; -class QToolButton; -class QTextCodec; +class TQToolButton; +class TQTextCodec; class KviTalWidgetStack; #include "kvi_tal_hbox.h" @@ -65,7 +65,7 @@ class KviTalWidgetStack; class KviCryptSessionInfo; #endif -#include <qwidget.h> +#include <tqwidget.h> // // Window types @@ -77,7 +77,7 @@ class KviTalWidgetStack; #define KVI_WINDOW_TYPE_CONSOLE 0 #define KVI_WINDOW_TYPE_CHANNEL 1 -#define KVI_WINDOW_TYPE_QUERY 2 +#define KVI_WINDOW_TYPE_TQUERY 2 #define KVI_WINDOW_TYPE_HELP 3 #define KVI_WINDOW_TYPE_TERM 4 #define KVI_WINDOW_TYPE_EDITOR 5 @@ -94,7 +94,7 @@ class KviTalWidgetStack; #define KVI_WINDOW_TYPE_OFFER 16 #define KVI_WINDOW_TYPE_LOGVIEW 17 #define KVI_WINDOW_TYPE_DEADCHANNEL 18 -#define KVI_WINDOW_TYPE_DEADQUERY 19 +#define KVI_WINDOW_TYPE_DEADTQUERY 19 #define KVI_WINDOW_TYPE_SCRIPTEDITOR 20 #define KVI_WINDOW_TYPE_SCRIPTOBJECT 21 #define KVI_WINDOW_TYPE_USERWINDOW 22 @@ -125,14 +125,14 @@ class KviTalWidgetStack; #define KVI_ACTIVITY_FIRE 6 #ifdef COMPILE_USE_QT4 - class QPushButton; - #define BUTTON_CLASS QPushButton + class TQPushButton; + #define BUTTON_CLASS TQPushButton #else - #define BUTTON_CLASS QToolButton + #define BUTTON_CLASS TQToolButton #endif -class KVIRC_API KviWindow : public QWidget +class KVIRC_API KviWindow : public TQWidget { friend class KviInput; friend class KviFrame; @@ -140,13 +140,14 @@ class KVIRC_API KviWindow : public QWidget friend class KviTaskBarButton; friend class KviTreeTaskBarItem; friend class KviTreeTaskBar; - Q_PROPERTY(int KviProperty_ChildFocusOwner READ type) + TQ_PROPERTY(int KviProperty_ChildFocusOwner READ type) Q_OBJECT + TQ_OBJECT public: - KviWindow(int type,KviFrame * lpFrm,const QString &name,KviConsole * pConsole = 0); + KviWindow(int type,KviFrame * lpFrm,const TQString &name,KviConsole * pConsole = 0); virtual ~KviWindow(); protected: // almost private: don't touch :D - QString m_szName; // the current window name (usually also the target) + TQString m_szName; // the current window name (usually also the target) KviFrame * m_pFrm; KviConsole * m_pConsole; KviIrcContext * m_pContext; @@ -154,38 +155,38 @@ protected: // almost private: don't touch :D int m_iType; KviTaskBarItem * m_pTaskBarItem; - QWidget * m_pFocusHandler; - QString m_szPlainTextCaption; - QString m_szHtmlActiveCaption; - QString m_szHtmlInactiveCaption; + TQWidget * m_pFocusHandler; + TQString m_szPlainTextCaption; + TQString m_szHtmlActiveCaption; + TQString m_szHtmlInactiveCaption; KviIrcView * m_pIrcView; KviInput * m_pInput; - QSplitter * m_pSplitter; + TQSplitter * m_pSplitter; KviTalHBox * m_pButtonBox; unsigned long int m_uId; - QString m_szTextEncoding; + TQString m_szTextEncoding; #ifdef COMPILE_CRYPT_SUPPORT KviWindowToolPageButton * m_pCryptControllerButton; KviCryptController * m_pCryptController; KviCryptSessionInfo * m_pCryptSessionInfo; #endif BUTTON_CLASS * m_pTextEncodingButton; - QToolButton * m_pHideToolsButton; - QWidget * m_pLastFocusedChild; + TQToolButton * m_pHideToolsButton; + TQWidget * m_pLastFocusedChild; KviAccel * m_pAccel; static const char * m_typeTable[KVI_WINDOW_NUM_TYPES + 1]; // text encoding and decoding //unsigned int m_uTextEncoding; - QTextCodec * m_pTextCodec; + TQTextCodec * m_pTextCodec; // KviToolWindowsContainer * m_pEditorsContainer; public: // The global ID of this window: unique in the application - QString id(){ return QString("%1").arg(m_uId); }; + TQString id(){ return TQString("%1").tqarg(m_uId); }; unsigned long int numericId(){ return m_uId; }; public: // THIS is the function that should be used - const QString & windowName(){ return m_szName; }; - void setWindowName(const QString &szName); + const TQString & windowName(){ return m_szName; }; + void setWindowName(const TQString &szName); // force QT to set our UNICODE name too... FIXME: this should be removed later... virtual void setName(const char * szName); @@ -196,8 +197,8 @@ public: // by THIS implementation is "unknown" virtual const char * typeString(); - QTextCodec * textCodec(){ return m_pTextCodec ? m_pTextCodec : defaultTextCodec(); }; - void forceTextCodec(QTextCodec * c); + TQTextCodec * textCodec(){ return m_pTextCodec ? m_pTextCodec : defaultTextCodec(); }; + void forceTextCodec(TQTextCodec * c); // The frame that this window belongs to // It is always non-null and never changes @@ -205,7 +206,7 @@ public: // The KviIrcView of this window: may be NULL if the window has no KviIrcView (and thus supports no direct output) KviIrcView * view() const { return m_pIrcView; }; // The mdiParent widget: may be nulll if the window is undocked - KviMdiChild * mdiParent(){ return (KviMdiChild *)parent(); }; + KviMdiChild * mdiParent(){ return (KviMdiChild *)tqparent(); }; // The console that this window belongs to: may be null for windows that aren't bound to irc contexts KviConsole * console(){ return m_pConsole; }; // same as above @@ -213,11 +214,11 @@ public: // the current IRC connection (if any) KviIrcConnection * connection(); // The splitter of this window: it *shouldn't* be null... but ... well.. who knows ? :D ...better check it - QSplitter * splitter(){ return m_pSplitter; }; + TQSplitter * splitter(){ return m_pSplitter; }; // The window has ALWAYS a taskbar item KviTaskBarItem * taskBarItem(){ return m_pTaskBarItem; }; // The window *might* have a button container - virtual QFrame * buttonContainer(){ return (QFrame*)m_pButtonBox; }; + virtual TQFrame * buttonContainer(){ return (TQFrame*)m_pButtonBox; }; virtual void toggleButtonContainer(); // The window *might* have an output proxy: if it has no view() for example virtual KviWindow * outputProxy(); @@ -225,9 +226,9 @@ public: KviInput * input(){ return m_pInput; }; // The target of this window: empty when it makes no sense :D - virtual const QString & target(){ return KviQString::empty; }; + virtual const TQString & target(){ return KviTQString::empty; }; // The local nickname bound to this window: might be empty when a local nickname makes no sense - virtual const QString & localNick(){ return KviQString::empty; }; + virtual const TQString & localNick(){ return KviTQString::empty; }; #ifdef COMPILE_CRYPT_SUPPORT KviCryptSessionInfo * cryptSessionInfo(){ return m_pCryptSessionInfo; }; @@ -238,20 +239,20 @@ public: void unhighlight(); - virtual void getTaskBarTipText(QString &buffer); + virtual void getTaskBarTipText(TQString &buffer); // This is meaningful only if view() is non NULL - const QString & lastLineOfText(); - const QString & lastMessageText(); + const TQString & lastLineOfText(); + const TQString & lastMessageText(); - const QString &textEncoding(){ return m_szTextEncoding; }; + const TQString &textEncoding(){ return m_szTextEncoding; }; // returns true if the encoding could be succesfully set - bool setTextEncoding(const QString &szTextEncoding); + bool setTextEncoding(const TQString &szTextEncoding); // this must return a default text codec suitable for this window - virtual QTextCodec * defaultTextCodec(); + virtual TQTextCodec * defaultTextCodec(); // encode the text from szSource by using m_uTextEncoding - KviQCString encodeText(const QString &szText); - QString decodeText(const char * szText); + KviTQCString encodeText(const TQString &szText); + TQString decodeText(const char * szText); void contextPopup(); // Raises the window (after a light delay to prevent focus pingpongs) @@ -260,25 +261,25 @@ public: bool isMinimized(); bool isMaximized(); // Retrieves the default log file name: this is pre-build - void getDefaultLogFileName(QString &buffer); - // Well...the external geometry :) - QRect externalGeometry(); + void getDefaultLogFileName(TQString &buffer); + // Well...the external tqgeometry :) + TQRect externalGeometry(); void delayedClose(); // close that jumps out of the current event loop // Interesting overridables: virtual void fillContextPopup(KviTalPopupMenu * p); - virtual void getConfigGroupName(QString &buf); + virtual void getConfigGroupName(TQString &buf); // virtual void getBaseLogFileName(KviStr &buffer); - virtual void getBaseLogFileName(QString &buffer); + virtual void getBaseLogFileName(TQString &buffer); virtual void updateCaption(); virtual void applyOptions(); virtual void updateIcon(); - virtual void ownMessage(const QString &text){}; - virtual void ownAction(const QString &text){}; - virtual const QString & plainTextCaption(){ return m_szPlainTextCaption; }; - virtual const QString & htmlActiveCaption(){ return m_szHtmlActiveCaption; }; - virtual const QString & htmlInactiveCaption(){ return m_szHtmlInactiveCaption; }; + virtual void ownMessage(const TQString &text){}; + virtual void ownAction(const TQString &text){}; + virtual const TQString & plainTextCaption(){ return m_szPlainTextCaption; }; + virtual const TQString & htmlActiveCaption(){ return m_szHtmlActiveCaption; }; + virtual const TQString & htmlInactiveCaption(){ return m_szHtmlInactiveCaption; }; virtual void setFocus(); void internalOutput(KviIrcView * pView,int msg_type,const kvi_wchar_t * text,int iFlags=0); @@ -287,10 +288,10 @@ public: virtual void outputNoFmt(int msg_type,const char * text,int iFlags=0); virtual void output(int msg_type,const kvi_wchar_t * format,...); virtual void outputNoFmt(int msg_type,const kvi_wchar_t * text,int iFlags=0){ internalOutput(m_pIrcView,msg_type,text,iFlags); }; - virtual void output(int msg_type,const QString &szFmt,...); - virtual void outputNoFmt(int msg_type,const QString &szText,int iFlags=0); // <-- these are KviIrcView::AppendTextFlags + virtual void output(int msg_type,const TQString &szFmt,...); + virtual void outputNoFmt(int msg_type,const TQString &szText,int iFlags=0); // <-- these are KviIrcView::AppendTextFlags // Just helpers.. FIXME: might be redesigned in some other way - void updateBackgrounds(QObject * obj = 0); + void updateBackgrounds(TQObject * obj = 0); void demandAttention(); bool hasAttention(); @@ -308,11 +309,11 @@ public slots: void reloadImages(); protected slots: void savePropertiesAsDefault(); - void toggleCryptController(); // This has to be here even if the crypt support is enabled...moc does not support conditionals + void toggleCryptController(); // This has to be here even if the crypt support is enabled...tqmoc does not support conditionals void cryptControllerFinished(); // same as above void cryptSessionInfoDestroyed(); // same as above void textEncodingButtonClicked(); - void systemPopupRequest(const QPoint &pnt); + void systemPopupRequest(const TQPoint &pnt); void systemTextEncodingPopupSmartActivated(int id); void systemTextEncodingPopupSmartUtf8Activated(int id); void systemTextEncodingPopupStandardActivated(int id); @@ -339,45 +340,45 @@ protected: // call this in the constructor if your caption is fixed: // it will set m_szPlainTextCaption to szCaption and it will // automatically use it without the need of overriding fillCaptionBuffers - void setFixedCaption(const QString &szCaption); + void setFixedCaption(const TQString &szCaption); // this by default calls fillSingleColorCaptionBuffer(plainTextCaption()); virtual void fillCaptionBuffers(); // protected helper - void fillSingleColorCaptionBuffers(const QString &szName); + void fillSingleColorCaptionBuffers(const TQString &szName); // Virtual events that signal dock state change virtual void youAreDocked(); virtual void youAreUndocked(); // Reimplement to show a special icon in the taskbar items and captions - virtual QPixmap * myIconPtr(); + virtual TQPixmap * myIconPtr(); // Sets the type of this window: be careful with this void setType(int iType); - bool eventFilter(QObject *o,QEvent *e); + bool eventFilter(TQObject *o,TQEvent *e); - // Virtuals overridden to manage the internal layouts... - virtual void moveEvent(QMoveEvent *e); - virtual void closeEvent(QCloseEvent *e); - virtual void wheelEvent(QWheelEvent *e); - virtual void childEvent(QChildEvent *e); - virtual void focusInEvent(QFocusEvent *e); + // Virtuals overridden to manage the internal tqlayouts... + virtual void moveEvent(TQMoveEvent *e); + virtual void closeEvent(TQCloseEvent *e); + virtual void wheelEvent(TQWheelEvent *e); + virtual void childEvent(TQChildEvent *e); + virtual void focusInEvent(TQFocusEvent *e); - void childInserted(QWidget * o); - void childRemoved(QWidget * o); + void childInserted(TQWidget * o); + void childRemoved(TQWidget * o); void activateSelf(); // Internal helpers - void createCryptControllerButton(QWidget * par); - void createTextEncodingButton(QWidget * par); + void createCryptControllerButton(TQWidget * par); + void createTextEncodingButton(TQWidget * par); void createSystemTextEncodingPopup(); - BUTTON_CLASS * createToolButton(QWidget * par,const char * nam,int pixon,int pixoff,const QString & tooltip,bool bOn); + BUTTON_CLASS * createToolButton(TQWidget * par,const char * nam,int pixon,int pixoff,const TQString & tooltip,bool bOn); // This is called by KviInput: actually it links the widgetAdded - virtual void childrenTreeChanged(QWidget * widgetAdded); + virtual void tqchildrenTreeChanged(TQWidget * widgetAdded); virtual bool focusNextPrevChild(bool bNext); - virtual void preprocessMessage(QString & szMessage); + virtual void preprocessMessage(TQString & szMessage); }; #ifndef _KVI_WINDOW_CPP_ diff --git a/src/kvirc/ui/moc_kvi_actiondrawer.cpp b/src/kvirc/ui/moc_kvi_actiondrawer.cpp index 833bc39..7b3bad7 100644 --- a/src/kvirc/ui/moc_kvi_actiondrawer.cpp +++ b/src/kvirc/ui/moc_kvi_actiondrawer.cpp @@ -2,21 +2,21 @@ ** KviActionDrawerPageListView meta object code from reading C++ file 'kvi_actiondrawer.h' ** ** Created: Mon Feb 25 00:12:20 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_actiondrawer.h" -#include <qmetaobject.h> -#include <qapplication.h> - -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <tqmetaobject.h> +#include <tqapplication.h> + +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviActionDrawerPageListView::className() const @@ -24,72 +24,72 @@ const char *KviActionDrawerPageListView::className() const return "KviActionDrawerPageListView"; } -QMetaObject *KviActionDrawerPageListView::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviActionDrawerPageListView( "KviActionDrawerPageListView", &KviActionDrawerPageListView::staticMetaObject ); +TQMetaObject *KviActionDrawerPageListView::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviActionDrawerPageListView( "KviActionDrawerPageListView", &KviActionDrawerPageListView::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviActionDrawerPageListView::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviActionDrawerPageListView::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviActionDrawerPageListView", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviActionDrawerPageListView", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviActionDrawerPageListView::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviActionDrawerPageListView::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviActionDrawerPageListView", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviActionDrawerPageListView", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviActionDrawerPageListView::staticMetaObject() +TQMetaObject* KviActionDrawerPageListView::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviListView::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviActionDrawerPageListView", parentObject, + TQMetaObject* tqparentObject = KviListView::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviActionDrawerPageListView", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviActionDrawerPageListView.setMetaObject( metaObj ); return metaObj; } -void* KviActionDrawerPageListView::qt_cast( const char* clname ) +void* KviActionDrawerPageListView::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviActionDrawerPageListView" ) ) return this; - return KviListView::qt_cast( clname ); + return KviListView::tqqt_cast( clname ); } -bool KviActionDrawerPageListView::qt_invoke( int _id, QUObject* _o ) +bool KviActionDrawerPageListView::qt_invoke( int _id, TQUObject* _o ) { return KviListView::qt_invoke(_id,_o); } -bool KviActionDrawerPageListView::qt_emit( int _id, QUObject* _o ) +bool KviActionDrawerPageListView::qt_emit( int _id, TQUObject* _o ) { return KviListView::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviActionDrawerPageListView::qt_property( int id, int f, QVariant* v) +bool KviActionDrawerPageListView::qt_property( int id, int f, TQVariant* v) { return KviListView::qt_property( id, f, v); } -bool KviActionDrawerPageListView::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviActionDrawerPageListView::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviActionDrawerPage::className() const @@ -97,72 +97,72 @@ const char *KviActionDrawerPage::className() const return "KviActionDrawerPage"; } -QMetaObject *KviActionDrawerPage::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviActionDrawerPage( "KviActionDrawerPage", &KviActionDrawerPage::staticMetaObject ); +TQMetaObject *KviActionDrawerPage::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviActionDrawerPage( "KviActionDrawerPage", &KviActionDrawerPage::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviActionDrawerPage::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviActionDrawerPage::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviActionDrawerPage", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviActionDrawerPage", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviActionDrawerPage::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviActionDrawerPage::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviActionDrawerPage", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviActionDrawerPage", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviActionDrawerPage::staticMetaObject() +TQMetaObject* KviActionDrawerPage::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QWidget::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviActionDrawerPage", parentObject, + TQMetaObject* tqparentObject = TQWidget::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviActionDrawerPage", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviActionDrawerPage.setMetaObject( metaObj ); return metaObj; } -void* KviActionDrawerPage::qt_cast( const char* clname ) +void* KviActionDrawerPage::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviActionDrawerPage" ) ) return this; - return QWidget::qt_cast( clname ); + return TQWidget::tqqt_cast( clname ); } -bool KviActionDrawerPage::qt_invoke( int _id, QUObject* _o ) +bool KviActionDrawerPage::qt_invoke( int _id, TQUObject* _o ) { - return QWidget::qt_invoke(_id,_o); + return TQWidget::qt_invoke(_id,_o); } -bool KviActionDrawerPage::qt_emit( int _id, QUObject* _o ) +bool KviActionDrawerPage::qt_emit( int _id, TQUObject* _o ) { - return QWidget::qt_emit(_id,_o); + return TQWidget::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviActionDrawerPage::qt_property( int id, int f, QVariant* v) +bool KviActionDrawerPage::qt_property( int id, int f, TQVariant* v) { - return QWidget::qt_property( id, f, v); + return TQWidget::qt_property( id, f, v); } -bool KviActionDrawerPage::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviActionDrawerPage::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviActionDrawer::className() const @@ -170,69 +170,69 @@ const char *KviActionDrawer::className() const return "KviActionDrawer"; } -QMetaObject *KviActionDrawer::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviActionDrawer( "KviActionDrawer", &KviActionDrawer::staticMetaObject ); +TQMetaObject *KviActionDrawer::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviActionDrawer( "KviActionDrawer", &KviActionDrawer::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviActionDrawer::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviActionDrawer::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviActionDrawer", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviActionDrawer", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviActionDrawer::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviActionDrawer::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviActionDrawer", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviActionDrawer", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviActionDrawer::staticMetaObject() +TQMetaObject* KviActionDrawer::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QTabWidget::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviActionDrawer", parentObject, + TQMetaObject* tqparentObject = TQTabWidget::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviActionDrawer", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviActionDrawer.setMetaObject( metaObj ); return metaObj; } -void* KviActionDrawer::qt_cast( const char* clname ) +void* KviActionDrawer::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviActionDrawer" ) ) return this; - return QTabWidget::qt_cast( clname ); + return TQTabWidget::tqqt_cast( clname ); } -bool KviActionDrawer::qt_invoke( int _id, QUObject* _o ) +bool KviActionDrawer::qt_invoke( int _id, TQUObject* _o ) { - return QTabWidget::qt_invoke(_id,_o); + return TQTabWidget::qt_invoke(_id,_o); } -bool KviActionDrawer::qt_emit( int _id, QUObject* _o ) +bool KviActionDrawer::qt_emit( int _id, TQUObject* _o ) { - return QTabWidget::qt_emit(_id,_o); + return TQTabWidget::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviActionDrawer::qt_property( int id, int f, QVariant* v) +bool KviActionDrawer::qt_property( int id, int f, TQVariant* v) { - return QTabWidget::qt_property( id, f, v); + return TQTabWidget::qt_property( id, f, v); } -bool KviActionDrawer::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviActionDrawer::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/ui/moc_kvi_customtoolbar.cpp b/src/kvirc/ui/moc_kvi_customtoolbar.cpp index 4a89b12..46989ea 100644 --- a/src/kvirc/ui/moc_kvi_customtoolbar.cpp +++ b/src/kvirc/ui/moc_kvi_customtoolbar.cpp @@ -2,21 +2,21 @@ ** KviCustomToolBarSeparator meta object code from reading C++ file 'kvi_customtoolbar.h' ** ** Created: Mon Feb 25 00:12:23 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_customtoolbar.h" -#include <qmetaobject.h> -#include <qapplication.h> - -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <tqmetaobject.h> +#include <tqapplication.h> + +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviCustomToolBarSeparator::className() const @@ -24,72 +24,72 @@ const char *KviCustomToolBarSeparator::className() const return "KviCustomToolBarSeparator"; } -QMetaObject *KviCustomToolBarSeparator::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviCustomToolBarSeparator( "KviCustomToolBarSeparator", &KviCustomToolBarSeparator::staticMetaObject ); +TQMetaObject *KviCustomToolBarSeparator::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviCustomToolBarSeparator( "KviCustomToolBarSeparator", &KviCustomToolBarSeparator::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviCustomToolBarSeparator::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviCustomToolBarSeparator::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviCustomToolBarSeparator", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviCustomToolBarSeparator", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviCustomToolBarSeparator::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviCustomToolBarSeparator::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviCustomToolBarSeparator", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviCustomToolBarSeparator", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviCustomToolBarSeparator::staticMetaObject() +TQMetaObject* KviCustomToolBarSeparator::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QWidget::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviCustomToolBarSeparator", parentObject, + TQMetaObject* tqparentObject = TQWidget::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviCustomToolBarSeparator", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviCustomToolBarSeparator.setMetaObject( metaObj ); return metaObj; } -void* KviCustomToolBarSeparator::qt_cast( const char* clname ) +void* KviCustomToolBarSeparator::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviCustomToolBarSeparator" ) ) return this; - return QWidget::qt_cast( clname ); + return TQWidget::tqqt_cast( clname ); } -bool KviCustomToolBarSeparator::qt_invoke( int _id, QUObject* _o ) +bool KviCustomToolBarSeparator::qt_invoke( int _id, TQUObject* _o ) { - return QWidget::qt_invoke(_id,_o); + return TQWidget::qt_invoke(_id,_o); } -bool KviCustomToolBarSeparator::qt_emit( int _id, QUObject* _o ) +bool KviCustomToolBarSeparator::qt_emit( int _id, TQUObject* _o ) { - return QWidget::qt_emit(_id,_o); + return TQWidget::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviCustomToolBarSeparator::qt_property( int id, int f, QVariant* v) +bool KviCustomToolBarSeparator::qt_property( int id, int f, TQVariant* v) { - return QWidget::qt_property( id, f, v); + return TQWidget::qt_property( id, f, v); } -bool KviCustomToolBarSeparator::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviCustomToolBarSeparator::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviCustomToolBar::className() const @@ -97,63 +97,63 @@ const char *KviCustomToolBar::className() const return "KviCustomToolBar"; } -QMetaObject *KviCustomToolBar::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviCustomToolBar( "KviCustomToolBar", &KviCustomToolBar::staticMetaObject ); +TQMetaObject *KviCustomToolBar::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviCustomToolBar( "KviCustomToolBar", &KviCustomToolBar::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviCustomToolBar::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviCustomToolBar::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviCustomToolBar", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviCustomToolBar", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviCustomToolBar::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviCustomToolBar::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviCustomToolBar", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviCustomToolBar", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviCustomToolBar::staticMetaObject() +TQMetaObject* KviCustomToolBar::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviToolBar::staticMetaObject(); - static const QUMethod slot_0 = {"beginCustomize", 0, 0 }; - static const QUMethod slot_1 = {"endCustomize", 0, 0 }; - static const QUMethod slot_2 = {"filteredChildDestroyed", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "beginCustomize()", &slot_0, QMetaData::Protected }, - { "endCustomize()", &slot_1, QMetaData::Protected }, - { "filteredChildDestroyed()", &slot_2, QMetaData::Protected } + TQMetaObject* tqparentObject = KviToolBar::staticMetaObject(); + static const TQUMethod slot_0 = {"beginCustomize", 0, 0 }; + static const TQUMethod slot_1 = {"endCustomize", 0, 0 }; + static const TQUMethod slot_2 = {"filteredChildDestroyed", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "beginCustomize()", &slot_0, TQMetaData::Protected }, + { "endCustomize()", &slot_1, TQMetaData::Protected }, + { "filteredChildDestroyed()", &slot_2, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviCustomToolBar", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviCustomToolBar", tqparentObject, slot_tbl, 3, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviCustomToolBar.setMetaObject( metaObj ); return metaObj; } -void* KviCustomToolBar::qt_cast( const char* clname ) +void* KviCustomToolBar::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviCustomToolBar" ) ) return this; - return KviToolBar::qt_cast( clname ); + return KviToolBar::tqqt_cast( clname ); } -bool KviCustomToolBar::qt_invoke( int _id, QUObject* _o ) +bool KviCustomToolBar::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: beginCustomize(); break; @@ -165,16 +165,16 @@ bool KviCustomToolBar::qt_invoke( int _id, QUObject* _o ) return TRUE; } -bool KviCustomToolBar::qt_emit( int _id, QUObject* _o ) +bool KviCustomToolBar::qt_emit( int _id, TQUObject* _o ) { return KviToolBar::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviCustomToolBar::qt_property( int id, int f, QVariant* v) +bool KviCustomToolBar::qt_property( int id, int f, TQVariant* v) { return KviToolBar::qt_property( id, f, v); } -bool KviCustomToolBar::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviCustomToolBar::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/ui/moc_kvi_debugwindow.cpp b/src/kvirc/ui/moc_kvi_debugwindow.cpp index 5e3da82..5e096e2 100644 --- a/src/kvirc/ui/moc_kvi_debugwindow.cpp +++ b/src/kvirc/ui/moc_kvi_debugwindow.cpp @@ -2,21 +2,21 @@ ** KviDebugWindow meta object code from reading C++ file 'kvi_debugwindow.h' ** ** Created: Mon Feb 25 00:12:25 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_debugwindow.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviDebugWindow::className() const @@ -24,69 +24,69 @@ const char *KviDebugWindow::className() const return "KviDebugWindow"; } -QMetaObject *KviDebugWindow::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviDebugWindow( "KviDebugWindow", &KviDebugWindow::staticMetaObject ); +TQMetaObject *KviDebugWindow::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviDebugWindow( "KviDebugWindow", &KviDebugWindow::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviDebugWindow::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviDebugWindow::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviDebugWindow", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviDebugWindow", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviDebugWindow::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviDebugWindow::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviDebugWindow", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviDebugWindow", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviDebugWindow::staticMetaObject() +TQMetaObject* KviDebugWindow::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviWindow::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviDebugWindow", parentObject, + TQMetaObject* tqparentObject = KviWindow::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviDebugWindow", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviDebugWindow.setMetaObject( metaObj ); return metaObj; } -void* KviDebugWindow::qt_cast( const char* clname ) +void* KviDebugWindow::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviDebugWindow" ) ) return this; - return KviWindow::qt_cast( clname ); + return KviWindow::tqqt_cast( clname ); } -bool KviDebugWindow::qt_invoke( int _id, QUObject* _o ) +bool KviDebugWindow::qt_invoke( int _id, TQUObject* _o ) { return KviWindow::qt_invoke(_id,_o); } -bool KviDebugWindow::qt_emit( int _id, QUObject* _o ) +bool KviDebugWindow::qt_emit( int _id, TQUObject* _o ) { return KviWindow::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviDebugWindow::qt_property( int id, int f, QVariant* v) +bool KviDebugWindow::qt_property( int id, int f, TQVariant* v) { return KviWindow::qt_property( id, f, v); } -bool KviDebugWindow::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviDebugWindow::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/ui/moc_kvi_htmldialog.cpp b/src/kvirc/ui/moc_kvi_htmldialog.cpp index 62d7681..d98ff98 100644 --- a/src/kvirc/ui/moc_kvi_htmldialog.cpp +++ b/src/kvirc/ui/moc_kvi_htmldialog.cpp @@ -2,21 +2,21 @@ ** KviHtmlDialog meta object code from reading C++ file 'kvi_htmldialog.h' ** ** Created: Mon Feb 25 00:12:27 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_htmldialog.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviHtmlDialog::className() const @@ -24,84 +24,84 @@ const char *KviHtmlDialog::className() const return "KviHtmlDialog"; } -QMetaObject *KviHtmlDialog::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviHtmlDialog( "KviHtmlDialog", &KviHtmlDialog::staticMetaObject ); +TQMetaObject *KviHtmlDialog::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviHtmlDialog( "KviHtmlDialog", &KviHtmlDialog::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviHtmlDialog::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviHtmlDialog::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviHtmlDialog", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviHtmlDialog", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviHtmlDialog::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviHtmlDialog::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviHtmlDialog", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviHtmlDialog", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviHtmlDialog::staticMetaObject() +TQMetaObject* KviHtmlDialog::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QDialog::staticMetaObject(); - static const QUMethod slot_0 = {"button1Pressed", 0, 0 }; - static const QUMethod slot_1 = {"button2Pressed", 0, 0 }; - static const QUMethod slot_2 = {"button3Pressed", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "button1Pressed()", &slot_0, QMetaData::Protected }, - { "button2Pressed()", &slot_1, QMetaData::Protected }, - { "button3Pressed()", &slot_2, QMetaData::Protected } + TQMetaObject* tqparentObject = TQDialog::staticMetaObject(); + static const TQUMethod slot_0 = {"button1Pressed", 0, 0 }; + static const TQUMethod slot_1 = {"button2Pressed", 0, 0 }; + static const TQUMethod slot_2 = {"button3Pressed", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "button1Pressed()", &slot_0, TQMetaData::Protected }, + { "button2Pressed()", &slot_1, TQMetaData::Protected }, + { "button3Pressed()", &slot_2, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviHtmlDialog", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviHtmlDialog", tqparentObject, slot_tbl, 3, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviHtmlDialog.setMetaObject( metaObj ); return metaObj; } -void* KviHtmlDialog::qt_cast( const char* clname ) +void* KviHtmlDialog::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviHtmlDialog" ) ) return this; - return QDialog::qt_cast( clname ); + return TQDialog::tqqt_cast( clname ); } -bool KviHtmlDialog::qt_invoke( int _id, QUObject* _o ) +bool KviHtmlDialog::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: button1Pressed(); break; case 1: button2Pressed(); break; case 2: button3Pressed(); break; default: - return QDialog::qt_invoke( _id, _o ); + return TQDialog::qt_invoke( _id, _o ); } return TRUE; } -bool KviHtmlDialog::qt_emit( int _id, QUObject* _o ) +bool KviHtmlDialog::qt_emit( int _id, TQUObject* _o ) { - return QDialog::qt_emit(_id,_o); + return TQDialog::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviHtmlDialog::qt_property( int id, int f, QVariant* v) +bool KviHtmlDialog::qt_property( int id, int f, TQVariant* v) { - return QDialog::qt_property( id, f, v); + return TQDialog::qt_property( id, f, v); } -bool KviHtmlDialog::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviHtmlDialog::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/ui/moc_kvi_imagedialog.cpp b/src/kvirc/ui/moc_kvi_imagedialog.cpp index be88643..22a1e62 100644 --- a/src/kvirc/ui/moc_kvi_imagedialog.cpp +++ b/src/kvirc/ui/moc_kvi_imagedialog.cpp @@ -2,21 +2,21 @@ ** KviImageDialog meta object code from reading C++ file 'kvi_imagedialog.h' ** ** Created: Mon Feb 25 00:12:28 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_imagedialog.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviImageDialog::className() const @@ -24,103 +24,103 @@ const char *KviImageDialog::className() const return "KviImageDialog"; } -QMetaObject *KviImageDialog::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviImageDialog( "KviImageDialog", &KviImageDialog::staticMetaObject ); +TQMetaObject *KviImageDialog::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviImageDialog( "KviImageDialog", &KviImageDialog::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviImageDialog::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviImageDialog::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviImageDialog", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviImageDialog", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviImageDialog::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviImageDialog::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviImageDialog", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviImageDialog", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviImageDialog::staticMetaObject() +TQMetaObject* KviImageDialog::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QDialog::staticMetaObject(); - static const QUMethod slot_0 = {"okClicked", 0, 0 }; - static const QUMethod slot_1 = {"cancelClicked", 0, 0 }; - static const QUMethod slot_2 = {"heartbeat", 0, 0 }; - static const QUParameter param_slot_3[] = { - { "index", &static_QUType_int, 0, QUParameter::In } + TQMetaObject* tqparentObject = TQDialog::staticMetaObject(); + static const TQUMethod slot_0 = {"okClicked", 0, 0 }; + static const TQUMethod slot_1 = {"cancelClicked", 0, 0 }; + static const TQUMethod slot_2 = {"heartbeat", 0, 0 }; + static const TQUParameter param_slot_3[] = { + { "index", &static_TQUType_int, 0, TQUParameter::In } }; - static const QUMethod slot_3 = {"jobTypeSelected", 1, param_slot_3 }; - static const QUParameter param_slot_4[] = { - { "it", &static_QUType_ptr, "KviTalListBoxItem", QUParameter::In } + static const TQUMethod slot_3 = {"jobTypeSelected", 1, param_slot_3 }; + static const TQUParameter param_slot_4[] = { + { "it", &static_TQUType_ptr, "KviTalListBoxItem", TQUParameter::In } }; - static const QUMethod slot_4 = {"itemDoubleClicked", 1, param_slot_4 }; - static const QUParameter param_slot_5[] = { - { 0, &static_QUType_ptr, "KviDynamicToolTip", QUParameter::In }, - { "pnt", &static_QUType_varptr, "\x0e", QUParameter::In } + static const TQUMethod slot_4 = {"itemDoubleClicked", 1, param_slot_4 }; + static const TQUParameter param_slot_5[] = { + { 0, &static_TQUType_ptr, "KviDynamicToolTip", TQUParameter::In }, + { "pnt", &static_TQUType_varptr, "\x0e", TQUParameter::In } }; - static const QUMethod slot_5 = {"tipRequest", 2, param_slot_5 }; - static const QMetaData slot_tbl[] = { - { "okClicked()", &slot_0, QMetaData::Protected }, - { "cancelClicked()", &slot_1, QMetaData::Protected }, - { "heartbeat()", &slot_2, QMetaData::Protected }, - { "jobTypeSelected(int)", &slot_3, QMetaData::Protected }, - { "itemDoubleClicked(KviTalListBoxItem*)", &slot_4, QMetaData::Protected }, - { "tipRequest(KviDynamicToolTip*,const QPoint&)", &slot_5, QMetaData::Protected } + static const TQUMethod slot_5 = {"tipRequest", 2, param_slot_5 }; + static const TQMetaData slot_tbl[] = { + { "okClicked()", &slot_0, TQMetaData::Protected }, + { "cancelClicked()", &slot_1, TQMetaData::Protected }, + { "heartbeat()", &slot_2, TQMetaData::Protected }, + { "jobTypeSelected(int)", &slot_3, TQMetaData::Protected }, + { "itemDoubleClicked(KviTalListBoxItem*)", &slot_4, TQMetaData::Protected }, + { "tipRequest(KviDynamicToolTip*,const TQPoint&)", &slot_5, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviImageDialog", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviImageDialog", tqparentObject, slot_tbl, 6, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviImageDialog.setMetaObject( metaObj ); return metaObj; } -void* KviImageDialog::qt_cast( const char* clname ) +void* KviImageDialog::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviImageDialog" ) ) return this; - return QDialog::qt_cast( clname ); + return TQDialog::tqqt_cast( clname ); } -bool KviImageDialog::qt_invoke( int _id, QUObject* _o ) +bool KviImageDialog::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: okClicked(); break; case 1: cancelClicked(); break; case 2: heartbeat(); break; - case 3: jobTypeSelected((int)static_QUType_int.get(_o+1)); break; - case 4: itemDoubleClicked((KviTalListBoxItem*)static_QUType_ptr.get(_o+1)); break; - case 5: tipRequest((KviDynamicToolTip*)static_QUType_ptr.get(_o+1),(const QPoint&)*((const QPoint*)static_QUType_ptr.get(_o+2))); break; + case 3: jobTypeSelected((int)static_TQUType_int.get(_o+1)); break; + case 4: itemDoubleClicked((KviTalListBoxItem*)static_TQUType_ptr.get(_o+1)); break; + case 5: tipRequest((KviDynamicToolTip*)static_TQUType_ptr.get(_o+1),(const TQPoint&)*((const TQPoint*)static_TQUType_ptr.get(_o+2))); break; default: - return QDialog::qt_invoke( _id, _o ); + return TQDialog::qt_invoke( _id, _o ); } return TRUE; } -bool KviImageDialog::qt_emit( int _id, QUObject* _o ) +bool KviImageDialog::qt_emit( int _id, TQUObject* _o ) { - return QDialog::qt_emit(_id,_o); + return TQDialog::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviImageDialog::qt_property( int id, int f, QVariant* v) +bool KviImageDialog::qt_property( int id, int f, TQVariant* v) { - return QDialog::qt_property( id, f, v); + return TQDialog::qt_property( id, f, v); } -bool KviImageDialog::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviImageDialog::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/ui/moc_kvi_ircviewtools.cpp b/src/kvirc/ui/moc_kvi_ircviewtools.cpp index e44adb6..37f7c77 100644 --- a/src/kvirc/ui/moc_kvi_ircviewtools.cpp +++ b/src/kvirc/ui/moc_kvi_ircviewtools.cpp @@ -2,21 +2,21 @@ ** KviIrcViewToolWidget meta object code from reading C++ file 'kvi_ircviewtools.h' ** ** Created: Mon Feb 25 00:12:30 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_ircviewtools.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviIrcViewToolWidget::className() const @@ -24,69 +24,69 @@ const char *KviIrcViewToolWidget::className() const return "KviIrcViewToolWidget"; } -QMetaObject *KviIrcViewToolWidget::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviIrcViewToolWidget( "KviIrcViewToolWidget", &KviIrcViewToolWidget::staticMetaObject ); +TQMetaObject *KviIrcViewToolWidget::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviIrcViewToolWidget( "KviIrcViewToolWidget", &KviIrcViewToolWidget::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviIrcViewToolWidget::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviIrcViewToolWidget::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviIrcViewToolWidget", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviIrcViewToolWidget", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviIrcViewToolWidget::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviIrcViewToolWidget::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviIrcViewToolWidget", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviIrcViewToolWidget", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviIrcViewToolWidget::staticMetaObject() +TQMetaObject* KviIrcViewToolWidget::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QFrame::staticMetaObject(); - static const QUMethod slot_0 = {"findPrev", 0, 0 }; - static const QUMethod slot_1 = {"findNext", 0, 0 }; - static const QUMethod slot_2 = {"filterEnableAll", 0, 0 }; - static const QUMethod slot_3 = {"filterEnableNone", 0, 0 }; - static const QUMethod slot_4 = {"filterSave", 0, 0 }; - static const QUMethod slot_5 = {"filterLoad", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "findPrev()", &slot_0, QMetaData::Protected }, - { "findNext()", &slot_1, QMetaData::Protected }, - { "filterEnableAll()", &slot_2, QMetaData::Protected }, - { "filterEnableNone()", &slot_3, QMetaData::Protected }, - { "filterSave()", &slot_4, QMetaData::Protected }, - { "filterLoad()", &slot_5, QMetaData::Protected } + TQMetaObject* tqparentObject = TQFrame::staticMetaObject(); + static const TQUMethod slot_0 = {"findPrev", 0, 0 }; + static const TQUMethod slot_1 = {"findNext", 0, 0 }; + static const TQUMethod slot_2 = {"filterEnableAll", 0, 0 }; + static const TQUMethod slot_3 = {"filterEnableNone", 0, 0 }; + static const TQUMethod slot_4 = {"filterSave", 0, 0 }; + static const TQUMethod slot_5 = {"filterLoad", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "findPrev()", &slot_0, TQMetaData::Protected }, + { "findNext()", &slot_1, TQMetaData::Protected }, + { "filterEnableAll()", &slot_2, TQMetaData::Protected }, + { "filterEnableNone()", &slot_3, TQMetaData::Protected }, + { "filterSave()", &slot_4, TQMetaData::Protected }, + { "filterLoad()", &slot_5, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviIrcViewToolWidget", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviIrcViewToolWidget", tqparentObject, slot_tbl, 6, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviIrcViewToolWidget.setMetaObject( metaObj ); return metaObj; } -void* KviIrcViewToolWidget::qt_cast( const char* clname ) +void* KviIrcViewToolWidget::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviIrcViewToolWidget" ) ) return this; - return QFrame::qt_cast( clname ); + return TQFrame::tqqt_cast( clname ); } -bool KviIrcViewToolWidget::qt_invoke( int _id, QUObject* _o ) +bool KviIrcViewToolWidget::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: findPrev(); break; @@ -96,21 +96,21 @@ bool KviIrcViewToolWidget::qt_invoke( int _id, QUObject* _o ) case 4: filterSave(); break; case 5: filterLoad(); break; default: - return QFrame::qt_invoke( _id, _o ); + return TQFrame::qt_invoke( _id, _o ); } return TRUE; } -bool KviIrcViewToolWidget::qt_emit( int _id, QUObject* _o ) +bool KviIrcViewToolWidget::qt_emit( int _id, TQUObject* _o ) { - return QFrame::qt_emit(_id,_o); + return TQFrame::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviIrcViewToolWidget::qt_property( int id, int f, QVariant* v) +bool KviIrcViewToolWidget::qt_property( int id, int f, TQVariant* v) { - return QFrame::qt_property( id, f, v); + return TQFrame::qt_property( id, f, v); } -bool KviIrcViewToolWidget::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviIrcViewToolWidget::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/ui/moc_kvi_listview.cpp b/src/kvirc/ui/moc_kvi_listview.cpp index f9f6118..30ebd51 100644 --- a/src/kvirc/ui/moc_kvi_listview.cpp +++ b/src/kvirc/ui/moc_kvi_listview.cpp @@ -2,21 +2,21 @@ ** KviListView meta object code from reading C++ file 'kvi_listview.h' ** ** Created: Mon Feb 25 00:12:44 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_listview.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviListView::className() const @@ -24,69 +24,69 @@ const char *KviListView::className() const return "KviListView"; } -QMetaObject *KviListView::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviListView( "KviListView", &KviListView::staticMetaObject ); +TQMetaObject *KviListView::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviListView( "KviListView", &KviListView::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviListView::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviListView::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviListView", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviListView", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviListView::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviListView::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviListView", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviListView", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviListView::staticMetaObject() +TQMetaObject* KviListView::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviTalListView::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviListView", parentObject, + TQMetaObject* tqparentObject = KviTalListView::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviListView", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviListView.setMetaObject( metaObj ); return metaObj; } -void* KviListView::qt_cast( const char* clname ) +void* KviListView::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviListView" ) ) return this; - return KviTalListView::qt_cast( clname ); + return KviTalListView::tqqt_cast( clname ); } -bool KviListView::qt_invoke( int _id, QUObject* _o ) +bool KviListView::qt_invoke( int _id, TQUObject* _o ) { return KviTalListView::qt_invoke(_id,_o); } -bool KviListView::qt_emit( int _id, QUObject* _o ) +bool KviListView::qt_emit( int _id, TQUObject* _o ) { return KviTalListView::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviListView::qt_property( int id, int f, QVariant* v) +bool KviListView::qt_property( int id, int f, TQVariant* v) { return KviTalListView::qt_property( id, f, v); } -bool KviListView::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviListView::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/ui/moc_kvi_mdicaption.cpp b/src/kvirc/ui/moc_kvi_mdicaption.cpp index 3e027b9..3966c6e 100644 --- a/src/kvirc/ui/moc_kvi_mdicaption.cpp +++ b/src/kvirc/ui/moc_kvi_mdicaption.cpp @@ -2,21 +2,21 @@ ** KviMdiCaptionButton meta object code from reading C++ file 'kvi_mdicaption.h' ** ** Created: Mon Feb 25 00:12:32 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_mdicaption.h" -#include <qmetaobject.h> -#include <qapplication.h> - -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <tqmetaobject.h> +#include <tqapplication.h> + +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviMdiCaptionButton::className() const @@ -24,72 +24,72 @@ const char *KviMdiCaptionButton::className() const return "KviMdiCaptionButton"; } -QMetaObject *KviMdiCaptionButton::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviMdiCaptionButton( "KviMdiCaptionButton", &KviMdiCaptionButton::staticMetaObject ); +TQMetaObject *KviMdiCaptionButton::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviMdiCaptionButton( "KviMdiCaptionButton", &KviMdiCaptionButton::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviMdiCaptionButton::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviMdiCaptionButton::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviMdiCaptionButton", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviMdiCaptionButton", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviMdiCaptionButton::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviMdiCaptionButton::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviMdiCaptionButton", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviMdiCaptionButton", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviMdiCaptionButton::staticMetaObject() +TQMetaObject* KviMdiCaptionButton::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QToolButton::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviMdiCaptionButton", parentObject, + TQMetaObject* tqparentObject = TQToolButton::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviMdiCaptionButton", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviMdiCaptionButton.setMetaObject( metaObj ); return metaObj; } -void* KviMdiCaptionButton::qt_cast( const char* clname ) +void* KviMdiCaptionButton::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviMdiCaptionButton" ) ) return this; - return QToolButton::qt_cast( clname ); + return TQToolButton::tqqt_cast( clname ); } -bool KviMdiCaptionButton::qt_invoke( int _id, QUObject* _o ) +bool KviMdiCaptionButton::qt_invoke( int _id, TQUObject* _o ) { - return QToolButton::qt_invoke(_id,_o); + return TQToolButton::qt_invoke(_id,_o); } -bool KviMdiCaptionButton::qt_emit( int _id, QUObject* _o ) +bool KviMdiCaptionButton::qt_emit( int _id, TQUObject* _o ) { - return QToolButton::qt_emit(_id,_o); + return TQToolButton::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviMdiCaptionButton::qt_property( int id, int f, QVariant* v) +bool KviMdiCaptionButton::qt_property( int id, int f, TQVariant* v) { - return QToolButton::qt_property( id, f, v); + return TQToolButton::qt_property( id, f, v); } -bool KviMdiCaptionButton::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviMdiCaptionButton::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviMenuBarToolButton::className() const @@ -97,72 +97,72 @@ const char *KviMenuBarToolButton::className() const return "KviMenuBarToolButton"; } -QMetaObject *KviMenuBarToolButton::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviMenuBarToolButton( "KviMenuBarToolButton", &KviMenuBarToolButton::staticMetaObject ); +TQMetaObject *KviMenuBarToolButton::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviMenuBarToolButton( "KviMenuBarToolButton", &KviMenuBarToolButton::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviMenuBarToolButton::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviMenuBarToolButton::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviMenuBarToolButton", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviMenuBarToolButton", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviMenuBarToolButton::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviMenuBarToolButton::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviMenuBarToolButton", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviMenuBarToolButton", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviMenuBarToolButton::staticMetaObject() +TQMetaObject* KviMenuBarToolButton::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviStyledToolButton::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviMenuBarToolButton", parentObject, + TQMetaObject* tqparentObject = KviStyledToolButton::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviMenuBarToolButton", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviMenuBarToolButton.setMetaObject( metaObj ); return metaObj; } -void* KviMenuBarToolButton::qt_cast( const char* clname ) +void* KviMenuBarToolButton::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviMenuBarToolButton" ) ) return this; - return KviStyledToolButton::qt_cast( clname ); + return KviStyledToolButton::tqqt_cast( clname ); } -bool KviMenuBarToolButton::qt_invoke( int _id, QUObject* _o ) +bool KviMenuBarToolButton::qt_invoke( int _id, TQUObject* _o ) { return KviStyledToolButton::qt_invoke(_id,_o); } -bool KviMenuBarToolButton::qt_emit( int _id, QUObject* _o ) +bool KviMenuBarToolButton::qt_emit( int _id, TQUObject* _o ) { return KviStyledToolButton::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviMenuBarToolButton::qt_property( int id, int f, QVariant* v) +bool KviMenuBarToolButton::qt_property( int id, int f, TQVariant* v) { return KviStyledToolButton::qt_property( id, f, v); } -bool KviMenuBarToolButton::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviMenuBarToolButton::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviMdiCaption::className() const @@ -170,69 +170,69 @@ const char *KviMdiCaption::className() const return "KviMdiCaption"; } -QMetaObject *KviMdiCaption::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviMdiCaption( "KviMdiCaption", &KviMdiCaption::staticMetaObject ); +TQMetaObject *KviMdiCaption::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviMdiCaption( "KviMdiCaption", &KviMdiCaption::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviMdiCaption::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviMdiCaption::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviMdiCaption", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviMdiCaption", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviMdiCaption::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviMdiCaption::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviMdiCaption", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviMdiCaption", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviMdiCaption::staticMetaObject() +TQMetaObject* KviMdiCaption::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QWidget::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviMdiCaption", parentObject, + TQMetaObject* tqparentObject = TQWidget::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviMdiCaption", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviMdiCaption.setMetaObject( metaObj ); return metaObj; } -void* KviMdiCaption::qt_cast( const char* clname ) +void* KviMdiCaption::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviMdiCaption" ) ) return this; - return QWidget::qt_cast( clname ); + return TQWidget::tqqt_cast( clname ); } -bool KviMdiCaption::qt_invoke( int _id, QUObject* _o ) +bool KviMdiCaption::qt_invoke( int _id, TQUObject* _o ) { - return QWidget::qt_invoke(_id,_o); + return TQWidget::qt_invoke(_id,_o); } -bool KviMdiCaption::qt_emit( int _id, QUObject* _o ) +bool KviMdiCaption::qt_emit( int _id, TQUObject* _o ) { - return QWidget::qt_emit(_id,_o); + return TQWidget::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviMdiCaption::qt_property( int id, int f, QVariant* v) +bool KviMdiCaption::qt_property( int id, int f, TQVariant* v) { - return QWidget::qt_property( id, f, v); + return TQWidget::qt_property( id, f, v); } -bool KviMdiCaption::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviMdiCaption::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/ui/moc_kvi_mdichild.cpp b/src/kvirc/ui/moc_kvi_mdichild.cpp index 3fcefcd..ae461eb 100644 --- a/src/kvirc/ui/moc_kvi_mdichild.cpp +++ b/src/kvirc/ui/moc_kvi_mdichild.cpp @@ -2,21 +2,21 @@ ** KviMdiChild meta object code from reading C++ file 'kvi_mdichild.h' ** ** Created: Mon Feb 25 00:12:34 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_mdichild.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviMdiChild::className() const @@ -24,90 +24,90 @@ const char *KviMdiChild::className() const return "KviMdiChild"; } -QMetaObject *KviMdiChild::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviMdiChild( "KviMdiChild", &KviMdiChild::staticMetaObject ); +TQMetaObject *KviMdiChild::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviMdiChild( "KviMdiChild", &KviMdiChild::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviMdiChild::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviMdiChild::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviMdiChild", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviMdiChild", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviMdiChild::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviMdiChild::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviMdiChild", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviMdiChild", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviMdiChild::staticMetaObject() +TQMetaObject* KviMdiChild::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QFrame::staticMetaObject(); - static const QUMethod slot_0 = {"maximize", 0, 0 }; - static const QUMethod slot_1 = {"minimize", 0, 0 }; - static const QUMethod slot_2 = {"restore", 0, 0 }; - static const QUMethod slot_3 = {"systemPopupSlot", 0, 0 }; - static const QUMethod slot_4 = {"closeRequest", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "maximize()", &slot_0, QMetaData::Public }, - { "minimize()", &slot_1, QMetaData::Public }, - { "restore()", &slot_2, QMetaData::Public }, - { "systemPopupSlot()", &slot_3, QMetaData::Public }, - { "closeRequest()", &slot_4, QMetaData::Public } + TQMetaObject* tqparentObject = TQFrame::staticMetaObject(); + static const TQUMethod slot_0 = {"maximize", 0, 0 }; + static const TQUMethod slot_1 = {"minimize", 0, 0 }; + static const TQUMethod slot_2 = {"restore", 0, 0 }; + static const TQUMethod slot_3 = {"systemPopupSlot", 0, 0 }; + static const TQUMethod slot_4 = {"closeRequest", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "maximize()", &slot_0, TQMetaData::Public }, + { "minimize()", &slot_1, TQMetaData::Public }, + { "restore()", &slot_2, TQMetaData::Public }, + { "systemPopupSlot()", &slot_3, TQMetaData::Public }, + { "closeRequest()", &slot_4, TQMetaData::Public } }; - static const QUParameter param_signal_0[] = { - { "pnt", &static_QUType_varptr, "\x0e", QUParameter::In } + static const TQUParameter param_signal_0[] = { + { "pnt", &static_TQUType_varptr, "\x0e", TQUParameter::In } }; - static const QUMethod signal_0 = {"systemPopupRequest", 1, param_signal_0 }; - static const QMetaData signal_tbl[] = { - { "systemPopupRequest(const QPoint&)", &signal_0, QMetaData::Public } + static const TQUMethod signal_0 = {"systemPopupRequest", 1, param_signal_0 }; + static const TQMetaData signal_tbl[] = { + { "systemPopupRequest(const TQPoint&)", &signal_0, TQMetaData::Public } }; - metaObj = QMetaObject::new_metaobject( - "KviMdiChild", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviMdiChild", tqparentObject, slot_tbl, 5, signal_tbl, 1, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviMdiChild.setMetaObject( metaObj ); return metaObj; } -void* KviMdiChild::qt_cast( const char* clname ) +void* KviMdiChild::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviMdiChild" ) ) return this; - return QFrame::qt_cast( clname ); + return TQFrame::tqqt_cast( clname ); } -#include <qobjectdefs.h> -#include <qsignalslotimp.h> +#include <tqobjectdefs.h> +#include <tqtqsignalslotimp.h> -// SIGNAL systemPopupRequest -void KviMdiChild::systemPopupRequest( const QPoint& t0 ) +// TQT_SIGNAL systemPopupRequest +void KviMdiChild::systemPopupRequest( const TQPoint& t0 ) { if ( signalsBlocked() ) return; - QConnectionList *clist = receivers( staticMetaObject()->signalOffset() + 0 ); + TQConnectionList *clist = tqreceivers( staticMetaObject()->signalOffset() + 0 ); if ( !clist ) return; - QUObject o[2]; - static_QUType_varptr.set(o+1,&t0); + TQUObject o[2]; + static_TQUType_varptr.set(o+1,&t0); activate_signal( clist, o ); } -bool KviMdiChild::qt_invoke( int _id, QUObject* _o ) +bool KviMdiChild::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: maximize(); break; @@ -116,26 +116,26 @@ bool KviMdiChild::qt_invoke( int _id, QUObject* _o ) case 3: systemPopupSlot(); break; case 4: closeRequest(); break; default: - return QFrame::qt_invoke( _id, _o ); + return TQFrame::qt_invoke( _id, _o ); } return TRUE; } -bool KviMdiChild::qt_emit( int _id, QUObject* _o ) +bool KviMdiChild::qt_emit( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->signalOffset() ) { - case 0: systemPopupRequest((const QPoint&)*((const QPoint*)static_QUType_ptr.get(_o+1))); break; + case 0: systemPopupRequest((const TQPoint&)*((const TQPoint*)static_TQUType_ptr.get(_o+1))); break; default: - return QFrame::qt_emit(_id,_o); + return TQFrame::qt_emit(_id,_o); } return TRUE; } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviMdiChild::qt_property( int id, int f, QVariant* v) +bool KviMdiChild::qt_property( int id, int f, TQVariant* v) { - return QFrame::qt_property( id, f, v); + return TQFrame::qt_property( id, f, v); } -bool KviMdiChild::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviMdiChild::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/ui/moc_kvi_mdimanager.cpp b/src/kvirc/ui/moc_kvi_mdimanager.cpp index fed719b..0ddbf66 100644 --- a/src/kvirc/ui/moc_kvi_mdimanager.cpp +++ b/src/kvirc/ui/moc_kvi_mdimanager.cpp @@ -2,21 +2,21 @@ ** KviMdiManager meta object code from reading C++ file 'kvi_mdimanager.h' ** ** Created: Mon Feb 25 00:12:36 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_mdimanager.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviMdiManager::className() const @@ -24,126 +24,126 @@ const char *KviMdiManager::className() const return "KviMdiManager"; } -QMetaObject *KviMdiManager::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviMdiManager( "KviMdiManager", &KviMdiManager::staticMetaObject ); +TQMetaObject *KviMdiManager::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviMdiManager( "KviMdiManager", &KviMdiManager::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviMdiManager::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviMdiManager::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviMdiManager", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviMdiManager", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviMdiManager::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviMdiManager::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviMdiManager", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviMdiManager", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviMdiManager::staticMetaObject() +TQMetaObject* KviMdiManager::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviTalScrollView::staticMetaObject(); - static const QUMethod slot_0 = {"relayoutMenuButtons", 0, 0 }; - static const QUMethod slot_1 = {"cascadeWindows", 0, 0 }; - static const QUMethod slot_2 = {"cascadeMaximized", 0, 0 }; - static const QUMethod slot_3 = {"expandVertical", 0, 0 }; - static const QUMethod slot_4 = {"expandHorizontal", 0, 0 }; - static const QUMethod slot_5 = {"minimizeAll", 0, 0 }; - static const QUMethod slot_6 = {"tile", 0, 0 }; - static const QUMethod slot_7 = {"toggleAutoTile", 0, 0 }; - static const QUMethod slot_8 = {"tileAnodine", 0, 0 }; - static const QUMethod slot_9 = {"reloadImages", 0, 0 }; - static const QUMethod slot_10 = {"minimizeActiveChild", 0, 0 }; - static const QUMethod slot_11 = {"restoreActiveChild", 0, 0 }; - static const QUMethod slot_12 = {"closeActiveChild", 0, 0 }; - static const QUMethod slot_13 = {"activeChildSystemPopup", 0, 0 }; - static const QUParameter param_slot_14[] = { - { "id", &static_QUType_int, 0, QUParameter::In } + TQMetaObject* tqparentObject = KviTalScrollView::staticMetaObject(); + static const TQUMethod slot_0 = {"retqlayoutMenuButtons", 0, 0 }; + static const TQUMethod slot_1 = {"cascadeWindows", 0, 0 }; + static const TQUMethod slot_2 = {"cascadeMaximized", 0, 0 }; + static const TQUMethod slot_3 = {"expandVertical", 0, 0 }; + static const TQUMethod slot_4 = {"expandHorizontal", 0, 0 }; + static const TQUMethod slot_5 = {"minimizeAll", 0, 0 }; + static const TQUMethod slot_6 = {"tile", 0, 0 }; + static const TQUMethod slot_7 = {"toggleAutoTile", 0, 0 }; + static const TQUMethod slot_8 = {"tileAnodine", 0, 0 }; + static const TQUMethod slot_9 = {"reloadImages", 0, 0 }; + static const TQUMethod slot_10 = {"minimizeActiveChild", 0, 0 }; + static const TQUMethod slot_11 = {"restoreActiveChild", 0, 0 }; + static const TQUMethod slot_12 = {"closeActiveChild", 0, 0 }; + static const TQUMethod slot_13 = {"activeChildSystemPopup", 0, 0 }; + static const TQUParameter param_slot_14[] = { + { "id", &static_TQUType_int, 0, TQUParameter::In } }; - static const QUMethod slot_14 = {"menuActivated", 1, param_slot_14 }; - static const QUParameter param_slot_15[] = { - { "id", &static_QUType_int, 0, QUParameter::In } + static const TQUMethod slot_14 = {"menuActivated", 1, param_slot_14 }; + static const TQUParameter param_slot_15[] = { + { "id", &static_TQUType_int, 0, TQUParameter::In } }; - static const QUMethod slot_15 = {"tileMethodMenuActivated", 1, param_slot_15 }; - static const QUMethod slot_16 = {"fillWindowPopup", 0, 0 }; - static const QUMethod slot_17 = {"sdiMinimizeButtonDestroyed", 0, 0 }; - static const QUMethod slot_18 = {"sdiRestoreButtonDestroyed", 0, 0 }; - static const QUMethod slot_19 = {"sdiCloseButtonDestroyed", 0, 0 }; - static const QUMethod slot_20 = {"sdiIconButtonDestroyed", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "relayoutMenuButtons()", &slot_0, QMetaData::Public }, - { "cascadeWindows()", &slot_1, QMetaData::Public }, - { "cascadeMaximized()", &slot_2, QMetaData::Public }, - { "expandVertical()", &slot_3, QMetaData::Public }, - { "expandHorizontal()", &slot_4, QMetaData::Public }, - { "minimizeAll()", &slot_5, QMetaData::Public }, - { "tile()", &slot_6, QMetaData::Public }, - { "toggleAutoTile()", &slot_7, QMetaData::Public }, - { "tileAnodine()", &slot_8, QMetaData::Public }, - { "reloadImages()", &slot_9, QMetaData::Public }, - { "minimizeActiveChild()", &slot_10, QMetaData::Protected }, - { "restoreActiveChild()", &slot_11, QMetaData::Protected }, - { "closeActiveChild()", &slot_12, QMetaData::Protected }, - { "activeChildSystemPopup()", &slot_13, QMetaData::Protected }, - { "menuActivated(int)", &slot_14, QMetaData::Protected }, - { "tileMethodMenuActivated(int)", &slot_15, QMetaData::Protected }, - { "fillWindowPopup()", &slot_16, QMetaData::Protected }, - { "sdiMinimizeButtonDestroyed()", &slot_17, QMetaData::Protected }, - { "sdiRestoreButtonDestroyed()", &slot_18, QMetaData::Protected }, - { "sdiCloseButtonDestroyed()", &slot_19, QMetaData::Protected }, - { "sdiIconButtonDestroyed()", &slot_20, QMetaData::Protected } + static const TQUMethod slot_15 = {"tileMethodMenuActivated", 1, param_slot_15 }; + static const TQUMethod slot_16 = {"fillWindowPopup", 0, 0 }; + static const TQUMethod slot_17 = {"sdiMinimizeButtonDestroyed", 0, 0 }; + static const TQUMethod slot_18 = {"sdiRestoreButtonDestroyed", 0, 0 }; + static const TQUMethod slot_19 = {"sdiCloseButtonDestroyed", 0, 0 }; + static const TQUMethod slot_20 = {"sdiIconButtonDestroyed", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "retqlayoutMenuButtons()", &slot_0, TQMetaData::Public }, + { "cascadeWindows()", &slot_1, TQMetaData::Public }, + { "cascadeMaximized()", &slot_2, TQMetaData::Public }, + { "expandVertical()", &slot_3, TQMetaData::Public }, + { "expandHorizontal()", &slot_4, TQMetaData::Public }, + { "minimizeAll()", &slot_5, TQMetaData::Public }, + { "tile()", &slot_6, TQMetaData::Public }, + { "toggleAutoTile()", &slot_7, TQMetaData::Public }, + { "tileAnodine()", &slot_8, TQMetaData::Public }, + { "reloadImages()", &slot_9, TQMetaData::Public }, + { "minimizeActiveChild()", &slot_10, TQMetaData::Protected }, + { "restoreActiveChild()", &slot_11, TQMetaData::Protected }, + { "closeActiveChild()", &slot_12, TQMetaData::Protected }, + { "activeChildSystemPopup()", &slot_13, TQMetaData::Protected }, + { "menuActivated(int)", &slot_14, TQMetaData::Protected }, + { "tileMethodMenuActivated(int)", &slot_15, TQMetaData::Protected }, + { "fillWindowPopup()", &slot_16, TQMetaData::Protected }, + { "sdiMinimizeButtonDestroyed()", &slot_17, TQMetaData::Protected }, + { "sdiRestoreButtonDestroyed()", &slot_18, TQMetaData::Protected }, + { "sdiCloseButtonDestroyed()", &slot_19, TQMetaData::Protected }, + { "sdiIconButtonDestroyed()", &slot_20, TQMetaData::Protected } }; - static const QUMethod signal_0 = {"enteredSdiMode", 0, 0 }; - static const QUMethod signal_1 = {"leftSdiMode", 0, 0 }; - static const QMetaData signal_tbl[] = { - { "enteredSdiMode()", &signal_0, QMetaData::Private }, - { "leftSdiMode()", &signal_1, QMetaData::Private } + static const TQUMethod signal_0 = {"enteredSdiMode", 0, 0 }; + static const TQUMethod signal_1 = {"leftSdiMode", 0, 0 }; + static const TQMetaData signal_tbl[] = { + { "enteredSdiMode()", &signal_0, TQMetaData::Private }, + { "leftSdiMode()", &signal_1, TQMetaData::Private } }; - metaObj = QMetaObject::new_metaobject( - "KviMdiManager", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviMdiManager", tqparentObject, slot_tbl, 21, signal_tbl, 2, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviMdiManager.setMetaObject( metaObj ); return metaObj; } -void* KviMdiManager::qt_cast( const char* clname ) +void* KviMdiManager::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviMdiManager" ) ) return this; - return KviTalScrollView::qt_cast( clname ); + return KviTalScrollView::tqqt_cast( clname ); } -// SIGNAL enteredSdiMode +// TQT_SIGNAL enteredSdiMode void KviMdiManager::enteredSdiMode() { activate_signal( staticMetaObject()->signalOffset() + 0 ); } -// SIGNAL leftSdiMode +// TQT_SIGNAL leftSdiMode void KviMdiManager::leftSdiMode() { activate_signal( staticMetaObject()->signalOffset() + 1 ); } -bool KviMdiManager::qt_invoke( int _id, QUObject* _o ) +bool KviMdiManager::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { - case 0: relayoutMenuButtons(); break; + case 0: retqlayoutMenuButtons(); break; case 1: cascadeWindows(); break; case 2: cascadeMaximized(); break; case 3: expandVertical(); break; @@ -157,8 +157,8 @@ bool KviMdiManager::qt_invoke( int _id, QUObject* _o ) case 11: restoreActiveChild(); break; case 12: closeActiveChild(); break; case 13: activeChildSystemPopup(); break; - case 14: menuActivated((int)static_QUType_int.get(_o+1)); break; - case 15: tileMethodMenuActivated((int)static_QUType_int.get(_o+1)); break; + case 14: menuActivated((int)static_TQUType_int.get(_o+1)); break; + case 15: tileMethodMenuActivated((int)static_TQUType_int.get(_o+1)); break; case 16: fillWindowPopup(); break; case 17: sdiMinimizeButtonDestroyed(); break; case 18: sdiRestoreButtonDestroyed(); break; @@ -170,7 +170,7 @@ bool KviMdiManager::qt_invoke( int _id, QUObject* _o ) return TRUE; } -bool KviMdiManager::qt_emit( int _id, QUObject* _o ) +bool KviMdiManager::qt_emit( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->signalOffset() ) { case 0: enteredSdiMode(); break; @@ -180,12 +180,12 @@ bool KviMdiManager::qt_emit( int _id, QUObject* _o ) } return TRUE; } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviMdiManager::qt_property( int id, int f, QVariant* v) +bool KviMdiManager::qt_property( int id, int f, TQVariant* v) { return KviTalScrollView::qt_property( id, f, v); } -bool KviMdiManager::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviMdiManager::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/ui/moc_kvi_statusbar.cpp b/src/kvirc/ui/moc_kvi_statusbar.cpp index d3cbf9c..2c0fbfa 100644 --- a/src/kvirc/ui/moc_kvi_statusbar.cpp +++ b/src/kvirc/ui/moc_kvi_statusbar.cpp @@ -2,21 +2,21 @@ ** KviStatusBar meta object code from reading C++ file 'kvi_statusbar.h' ** ** Created: Mon Feb 25 00:12:38 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_statusbar.h" -#include <qmetaobject.h> -#include <qapplication.h> +#include <tqmetaobject.h> +#include <tqapplication.h> -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviStatusBar::className() const @@ -24,103 +24,103 @@ const char *KviStatusBar::className() const return "KviStatusBar"; } -QMetaObject *KviStatusBar::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviStatusBar( "KviStatusBar", &KviStatusBar::staticMetaObject ); +TQMetaObject *KviStatusBar::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviStatusBar( "KviStatusBar", &KviStatusBar::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviStatusBar::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviStatusBar::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviStatusBar", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviStatusBar", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviStatusBar::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviStatusBar::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviStatusBar", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviStatusBar", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviStatusBar::staticMetaObject() +TQMetaObject* KviStatusBar::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QStatusBar::staticMetaObject(); - static const QUMethod slot_0 = {"messageTimerFired", 0, 0 }; - static const QUMethod slot_1 = {"contextPopupAboutToShow", 0, 0 }; - static const QUMethod slot_2 = {"appletsPopupAboutToShow", 0, 0 }; - static const QUParameter param_slot_3[] = { - { "id", &static_QUType_int, 0, QUParameter::In } + TQMetaObject* tqparentObject = TQStatusBar::staticMetaObject(); + static const TQUMethod slot_0 = {"messageTimerFired", 0, 0 }; + static const TQUMethod slot_1 = {"contextPopupAboutToShow", 0, 0 }; + static const TQUMethod slot_2 = {"appletsPopupAboutToShow", 0, 0 }; + static const TQUParameter param_slot_3[] = { + { "id", &static_TQUType_int, 0, TQUParameter::In } }; - static const QUMethod slot_3 = {"appletsPopupActivated", 1, param_slot_3 }; - static const QUMethod slot_4 = {"removeClickedApplet", 0, 0 }; - static const QUMethod slot_5 = {"setPermanentMessage", 0, 0 }; - static const QUParameter param_slot_6[] = { - { "pTip", &static_QUType_ptr, "KviDynamicToolTip", QUParameter::In }, - { "pnt", &static_QUType_varptr, "\x0e", QUParameter::In } + static const TQUMethod slot_3 = {"appletsPopupActivated", 1, param_slot_3 }; + static const TQUMethod slot_4 = {"removeClickedApplet", 0, 0 }; + static const TQUMethod slot_5 = {"setPermanentMessage", 0, 0 }; + static const TQUParameter param_slot_6[] = { + { "pTip", &static_TQUType_ptr, "KviDynamicToolTip", TQUParameter::In }, + { "pnt", &static_TQUType_varptr, "\x0e", TQUParameter::In } }; - static const QUMethod slot_6 = {"tipRequest", 2, param_slot_6 }; - static const QMetaData slot_tbl[] = { - { "messageTimerFired()", &slot_0, QMetaData::Protected }, - { "contextPopupAboutToShow()", &slot_1, QMetaData::Protected }, - { "appletsPopupAboutToShow()", &slot_2, QMetaData::Protected }, - { "appletsPopupActivated(int)", &slot_3, QMetaData::Protected }, - { "removeClickedApplet()", &slot_4, QMetaData::Protected }, - { "setPermanentMessage()", &slot_5, QMetaData::Protected }, - { "tipRequest(KviDynamicToolTip*,const QPoint&)", &slot_6, QMetaData::Protected } + static const TQUMethod slot_6 = {"tipRequest", 2, param_slot_6 }; + static const TQMetaData slot_tbl[] = { + { "messageTimerFired()", &slot_0, TQMetaData::Protected }, + { "contextPopupAboutToShow()", &slot_1, TQMetaData::Protected }, + { "appletsPopupAboutToShow()", &slot_2, TQMetaData::Protected }, + { "appletsPopupActivated(int)", &slot_3, TQMetaData::Protected }, + { "removeClickedApplet()", &slot_4, TQMetaData::Protected }, + { "setPermanentMessage()", &slot_5, TQMetaData::Protected }, + { "tipRequest(KviDynamicToolTip*,const TQPoint&)", &slot_6, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviStatusBar", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviStatusBar", tqparentObject, slot_tbl, 7, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviStatusBar.setMetaObject( metaObj ); return metaObj; } -void* KviStatusBar::qt_cast( const char* clname ) +void* KviStatusBar::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviStatusBar" ) ) return this; - return QStatusBar::qt_cast( clname ); + return TQStatusBar::tqqt_cast( clname ); } -bool KviStatusBar::qt_invoke( int _id, QUObject* _o ) +bool KviStatusBar::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: messageTimerFired(); break; case 1: contextPopupAboutToShow(); break; case 2: appletsPopupAboutToShow(); break; - case 3: appletsPopupActivated((int)static_QUType_int.get(_o+1)); break; + case 3: appletsPopupActivated((int)static_TQUType_int.get(_o+1)); break; case 4: removeClickedApplet(); break; case 5: setPermanentMessage(); break; - case 6: tipRequest((KviDynamicToolTip*)static_QUType_ptr.get(_o+1),(const QPoint&)*((const QPoint*)static_QUType_ptr.get(_o+2))); break; + case 6: tipRequest((KviDynamicToolTip*)static_TQUType_ptr.get(_o+1),(const TQPoint&)*((const TQPoint*)static_TQUType_ptr.get(_o+2))); break; default: - return QStatusBar::qt_invoke( _id, _o ); + return TQStatusBar::qt_invoke( _id, _o ); } return TRUE; } -bool KviStatusBar::qt_emit( int _id, QUObject* _o ) +bool KviStatusBar::qt_emit( int _id, TQUObject* _o ) { - return QStatusBar::qt_emit(_id,_o); + return TQStatusBar::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviStatusBar::qt_property( int id, int f, QVariant* v) +bool KviStatusBar::qt_property( int id, int f, TQVariant* v) { - return QStatusBar::qt_property( id, f, v); + return TQStatusBar::qt_property( id, f, v); } -bool KviStatusBar::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviStatusBar::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/ui/moc_kvi_statusbarapplet.cpp b/src/kvirc/ui/moc_kvi_statusbarapplet.cpp index 85eb55e..d244ce0 100644 --- a/src/kvirc/ui/moc_kvi_statusbarapplet.cpp +++ b/src/kvirc/ui/moc_kvi_statusbarapplet.cpp @@ -2,21 +2,21 @@ ** KviStatusBarApplet meta object code from reading C++ file 'kvi_statusbarapplet.h' ** ** Created: Mon Feb 25 00:12:39 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_statusbarapplet.h" -#include <qmetaobject.h> -#include <qapplication.h> - -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <tqmetaobject.h> +#include <tqapplication.h> + +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviStatusBarApplet::className() const @@ -24,72 +24,72 @@ const char *KviStatusBarApplet::className() const return "KviStatusBarApplet"; } -QMetaObject *KviStatusBarApplet::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviStatusBarApplet( "KviStatusBarApplet", &KviStatusBarApplet::staticMetaObject ); +TQMetaObject *KviStatusBarApplet::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviStatusBarApplet( "KviStatusBarApplet", &KviStatusBarApplet::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviStatusBarApplet::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviStatusBarApplet::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviStatusBarApplet", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviStatusBarApplet", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviStatusBarApplet::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviStatusBarApplet::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviStatusBarApplet", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviStatusBarApplet", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviStatusBarApplet::staticMetaObject() +TQMetaObject* KviStatusBarApplet::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QLabel::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviStatusBarApplet", parentObject, + TQMetaObject* tqparentObject = TQLabel::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviStatusBarApplet", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviStatusBarApplet.setMetaObject( metaObj ); return metaObj; } -void* KviStatusBarApplet::qt_cast( const char* clname ) +void* KviStatusBarApplet::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviStatusBarApplet" ) ) return this; - return QLabel::qt_cast( clname ); + return TQLabel::tqqt_cast( clname ); } -bool KviStatusBarApplet::qt_invoke( int _id, QUObject* _o ) +bool KviStatusBarApplet::qt_invoke( int _id, TQUObject* _o ) { - return QLabel::qt_invoke(_id,_o); + return TQLabel::qt_invoke(_id,_o); } -bool KviStatusBarApplet::qt_emit( int _id, QUObject* _o ) +bool KviStatusBarApplet::qt_emit( int _id, TQUObject* _o ) { - return QLabel::qt_emit(_id,_o); + return TQLabel::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviStatusBarApplet::qt_property( int id, int f, QVariant* v) +bool KviStatusBarApplet::qt_property( int id, int f, TQVariant* v) { - return QLabel::qt_property( id, f, v); + return TQLabel::qt_property( id, f, v); } -bool KviStatusBarApplet::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviStatusBarApplet::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviStatusBarClock::className() const @@ -97,59 +97,59 @@ const char *KviStatusBarClock::className() const return "KviStatusBarClock"; } -QMetaObject *KviStatusBarClock::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviStatusBarClock( "KviStatusBarClock", &KviStatusBarClock::staticMetaObject ); +TQMetaObject *KviStatusBarClock::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviStatusBarClock( "KviStatusBarClock", &KviStatusBarClock::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviStatusBarClock::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviStatusBarClock::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviStatusBarClock", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviStatusBarClock", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviStatusBarClock::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviStatusBarClock::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviStatusBarClock", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviStatusBarClock", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviStatusBarClock::staticMetaObject() +TQMetaObject* KviStatusBarClock::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviStatusBarApplet::staticMetaObject(); - static const QUMethod slot_0 = {"toggleUtc", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "toggleUtc()", &slot_0, QMetaData::Protected } + TQMetaObject* tqparentObject = KviStatusBarApplet::staticMetaObject(); + static const TQUMethod slot_0 = {"toggleUtc", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "toggleUtc()", &slot_0, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviStatusBarClock", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviStatusBarClock", tqparentObject, slot_tbl, 1, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviStatusBarClock.setMetaObject( metaObj ); return metaObj; } -void* KviStatusBarClock::qt_cast( const char* clname ) +void* KviStatusBarClock::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviStatusBarClock" ) ) return this; - return KviStatusBarApplet::qt_cast( clname ); + return KviStatusBarApplet::tqqt_cast( clname ); } -bool KviStatusBarClock::qt_invoke( int _id, QUObject* _o ) +bool KviStatusBarClock::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: toggleUtc(); break; @@ -159,19 +159,19 @@ bool KviStatusBarClock::qt_invoke( int _id, QUObject* _o ) return TRUE; } -bool KviStatusBarClock::qt_emit( int _id, QUObject* _o ) +bool KviStatusBarClock::qt_emit( int _id, TQUObject* _o ) { return KviStatusBarApplet::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviStatusBarClock::qt_property( int id, int f, QVariant* v) +bool KviStatusBarClock::qt_property( int id, int f, TQVariant* v) { return KviStatusBarApplet::qt_property( id, f, v); } -bool KviStatusBarClock::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviStatusBarClock::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviStatusBarConnectionTimer::className() const @@ -179,59 +179,59 @@ const char *KviStatusBarConnectionTimer::className() const return "KviStatusBarConnectionTimer"; } -QMetaObject *KviStatusBarConnectionTimer::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviStatusBarConnectionTimer( "KviStatusBarConnectionTimer", &KviStatusBarConnectionTimer::staticMetaObject ); +TQMetaObject *KviStatusBarConnectionTimer::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviStatusBarConnectionTimer( "KviStatusBarConnectionTimer", &KviStatusBarConnectionTimer::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviStatusBarConnectionTimer::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviStatusBarConnectionTimer::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviStatusBarConnectionTimer", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviStatusBarConnectionTimer", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviStatusBarConnectionTimer::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviStatusBarConnectionTimer::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviStatusBarConnectionTimer", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviStatusBarConnectionTimer", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviStatusBarConnectionTimer::staticMetaObject() +TQMetaObject* KviStatusBarConnectionTimer::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviStatusBarApplet::staticMetaObject(); - static const QUMethod slot_0 = {"toggleTotal", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "toggleTotal()", &slot_0, QMetaData::Protected } + TQMetaObject* tqparentObject = KviStatusBarApplet::staticMetaObject(); + static const TQUMethod slot_0 = {"toggleTotal", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "toggleTotal()", &slot_0, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviStatusBarConnectionTimer", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviStatusBarConnectionTimer", tqparentObject, slot_tbl, 1, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviStatusBarConnectionTimer.setMetaObject( metaObj ); return metaObj; } -void* KviStatusBarConnectionTimer::qt_cast( const char* clname ) +void* KviStatusBarConnectionTimer::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviStatusBarConnectionTimer" ) ) return this; - return KviStatusBarApplet::qt_cast( clname ); + return KviStatusBarApplet::tqqt_cast( clname ); } -bool KviStatusBarConnectionTimer::qt_invoke( int _id, QUObject* _o ) +bool KviStatusBarConnectionTimer::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: toggleTotal(); break; @@ -241,19 +241,19 @@ bool KviStatusBarConnectionTimer::qt_invoke( int _id, QUObject* _o ) return TRUE; } -bool KviStatusBarConnectionTimer::qt_emit( int _id, QUObject* _o ) +bool KviStatusBarConnectionTimer::qt_emit( int _id, TQUObject* _o ) { return KviStatusBarApplet::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviStatusBarConnectionTimer::qt_property( int id, int f, QVariant* v) +bool KviStatusBarConnectionTimer::qt_property( int id, int f, TQVariant* v) { return KviStatusBarApplet::qt_property( id, f, v); } -bool KviStatusBarConnectionTimer::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviStatusBarConnectionTimer::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviStatusBarSeparator::className() const @@ -261,72 +261,72 @@ const char *KviStatusBarSeparator::className() const return "KviStatusBarSeparator"; } -QMetaObject *KviStatusBarSeparator::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviStatusBarSeparator( "KviStatusBarSeparator", &KviStatusBarSeparator::staticMetaObject ); +TQMetaObject *KviStatusBarSeparator::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviStatusBarSeparator( "KviStatusBarSeparator", &KviStatusBarSeparator::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviStatusBarSeparator::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviStatusBarSeparator::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviStatusBarSeparator", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviStatusBarSeparator", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviStatusBarSeparator::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviStatusBarSeparator::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviStatusBarSeparator", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviStatusBarSeparator", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviStatusBarSeparator::staticMetaObject() +TQMetaObject* KviStatusBarSeparator::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviStatusBarApplet::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviStatusBarSeparator", parentObject, + TQMetaObject* tqparentObject = KviStatusBarApplet::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviStatusBarSeparator", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviStatusBarSeparator.setMetaObject( metaObj ); return metaObj; } -void* KviStatusBarSeparator::qt_cast( const char* clname ) +void* KviStatusBarSeparator::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviStatusBarSeparator" ) ) return this; - return KviStatusBarApplet::qt_cast( clname ); + return KviStatusBarApplet::tqqt_cast( clname ); } -bool KviStatusBarSeparator::qt_invoke( int _id, QUObject* _o ) +bool KviStatusBarSeparator::qt_invoke( int _id, TQUObject* _o ) { return KviStatusBarApplet::qt_invoke(_id,_o); } -bool KviStatusBarSeparator::qt_emit( int _id, QUObject* _o ) +bool KviStatusBarSeparator::qt_emit( int _id, TQUObject* _o ) { return KviStatusBarApplet::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviStatusBarSeparator::qt_property( int id, int f, QVariant* v) +bool KviStatusBarSeparator::qt_property( int id, int f, TQVariant* v) { return KviStatusBarApplet::qt_property( id, f, v); } -bool KviStatusBarSeparator::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviStatusBarSeparator::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviStatusBarAwayIndicator::className() const @@ -334,61 +334,61 @@ const char *KviStatusBarAwayIndicator::className() const return "KviStatusBarAwayIndicator"; } -QMetaObject *KviStatusBarAwayIndicator::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviStatusBarAwayIndicator( "KviStatusBarAwayIndicator", &KviStatusBarAwayIndicator::staticMetaObject ); +TQMetaObject *KviStatusBarAwayIndicator::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviStatusBarAwayIndicator( "KviStatusBarAwayIndicator", &KviStatusBarAwayIndicator::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviStatusBarAwayIndicator::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviStatusBarAwayIndicator::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviStatusBarAwayIndicator", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviStatusBarAwayIndicator", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviStatusBarAwayIndicator::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviStatusBarAwayIndicator::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviStatusBarAwayIndicator", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviStatusBarAwayIndicator", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviStatusBarAwayIndicator::staticMetaObject() +TQMetaObject* KviStatusBarAwayIndicator::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviStatusBarApplet::staticMetaObject(); - static const QUMethod slot_0 = {"updateDisplay", 0, 0 }; - static const QUMethod slot_1 = {"toggleContext", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "updateDisplay()", &slot_0, QMetaData::Protected }, - { "toggleContext()", &slot_1, QMetaData::Protected } + TQMetaObject* tqparentObject = KviStatusBarApplet::staticMetaObject(); + static const TQUMethod slot_0 = {"updateDisplay", 0, 0 }; + static const TQUMethod slot_1 = {"toggleContext", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "updateDisplay()", &slot_0, TQMetaData::Protected }, + { "toggleContext()", &slot_1, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviStatusBarAwayIndicator", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviStatusBarAwayIndicator", tqparentObject, slot_tbl, 2, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviStatusBarAwayIndicator.setMetaObject( metaObj ); return metaObj; } -void* KviStatusBarAwayIndicator::qt_cast( const char* clname ) +void* KviStatusBarAwayIndicator::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviStatusBarAwayIndicator" ) ) return this; - return KviStatusBarApplet::qt_cast( clname ); + return KviStatusBarApplet::tqqt_cast( clname ); } -bool KviStatusBarAwayIndicator::qt_invoke( int _id, QUObject* _o ) +bool KviStatusBarAwayIndicator::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: updateDisplay(); break; @@ -399,19 +399,19 @@ bool KviStatusBarAwayIndicator::qt_invoke( int _id, QUObject* _o ) return TRUE; } -bool KviStatusBarAwayIndicator::qt_emit( int _id, QUObject* _o ) +bool KviStatusBarAwayIndicator::qt_emit( int _id, TQUObject* _o ) { return KviStatusBarApplet::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviStatusBarAwayIndicator::qt_property( int id, int f, QVariant* v) +bool KviStatusBarAwayIndicator::qt_property( int id, int f, TQVariant* v) { return KviStatusBarApplet::qt_property( id, f, v); } -bool KviStatusBarAwayIndicator::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviStatusBarAwayIndicator::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviStatusBarLagIndicator::className() const @@ -419,59 +419,59 @@ const char *KviStatusBarLagIndicator::className() const return "KviStatusBarLagIndicator"; } -QMetaObject *KviStatusBarLagIndicator::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviStatusBarLagIndicator( "KviStatusBarLagIndicator", &KviStatusBarLagIndicator::staticMetaObject ); +TQMetaObject *KviStatusBarLagIndicator::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviStatusBarLagIndicator( "KviStatusBarLagIndicator", &KviStatusBarLagIndicator::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviStatusBarLagIndicator::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviStatusBarLagIndicator::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviStatusBarLagIndicator", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviStatusBarLagIndicator", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviStatusBarLagIndicator::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviStatusBarLagIndicator::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviStatusBarLagIndicator", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviStatusBarLagIndicator", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviStatusBarLagIndicator::staticMetaObject() +TQMetaObject* KviStatusBarLagIndicator::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = KviStatusBarApplet::staticMetaObject(); - static const QUMethod slot_0 = {"updateDisplay", 0, 0 }; - static const QMetaData slot_tbl[] = { - { "updateDisplay()", &slot_0, QMetaData::Protected } + TQMetaObject* tqparentObject = KviStatusBarApplet::staticMetaObject(); + static const TQUMethod slot_0 = {"updateDisplay", 0, 0 }; + static const TQMetaData slot_tbl[] = { + { "updateDisplay()", &slot_0, TQMetaData::Protected } }; - metaObj = QMetaObject::new_metaobject( - "KviStatusBarLagIndicator", parentObject, + metaObj = TQMetaObject::new_metaobject( + "KviStatusBarLagIndicator", tqparentObject, slot_tbl, 1, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviStatusBarLagIndicator.setMetaObject( metaObj ); return metaObj; } -void* KviStatusBarLagIndicator::qt_cast( const char* clname ) +void* KviStatusBarLagIndicator::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviStatusBarLagIndicator" ) ) return this; - return KviStatusBarApplet::qt_cast( clname ); + return KviStatusBarApplet::tqqt_cast( clname ); } -bool KviStatusBarLagIndicator::qt_invoke( int _id, QUObject* _o ) +bool KviStatusBarLagIndicator::qt_invoke( int _id, TQUObject* _o ) { switch ( _id - staticMetaObject()->slotOffset() ) { case 0: updateDisplay(); break; @@ -481,16 +481,16 @@ bool KviStatusBarLagIndicator::qt_invoke( int _id, QUObject* _o ) return TRUE; } -bool KviStatusBarLagIndicator::qt_emit( int _id, QUObject* _o ) +bool KviStatusBarLagIndicator::qt_emit( int _id, TQUObject* _o ) { return KviStatusBarApplet::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviStatusBarLagIndicator::qt_property( int id, int f, QVariant* v) +bool KviStatusBarLagIndicator::qt_property( int id, int f, TQVariant* v) { return KviStatusBarApplet::qt_property( id, f, v); } -bool KviStatusBarLagIndicator::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviStatusBarLagIndicator::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES diff --git a/src/kvirc/ui/moc_kvi_toolwindows_container.cpp b/src/kvirc/ui/moc_kvi_toolwindows_container.cpp index dc5a24f..977626a 100644 --- a/src/kvirc/ui/moc_kvi_toolwindows_container.cpp +++ b/src/kvirc/ui/moc_kvi_toolwindows_container.cpp @@ -2,21 +2,21 @@ ** KviWindowToolWidget meta object code from reading C++ file 'kvi_toolwindows_container.h' ** ** Created: Mon Feb 25 00:12:41 2008 -** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) +** by: The TQt TQMOC ($Id: qt/tqmoc_yacc.cpp 3.3.8 edited Feb 2 14:59 $) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "kvi_toolwindows_container.h" -#include <qmetaobject.h> -#include <qapplication.h> - -#include <private/qucomextra_p.h> -#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) -#error "This file was generated using the moc from 3.3.8. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" +#include <tqmetaobject.h> +#include <tqapplication.h> + +#include <private/tqucomextra_p.h> +#if !defined(TQ_TQMOC_OUTPUT_REVISION) || (TQ_TQMOC_OUTPUT_REVISION != 26) +#error "This file was generated using the tqmoc from 3.3.8. It" +#error "cannot be used with the include files from this version of TQt." +#error "(The tqmoc has changed too much.)" #endif const char *KviWindowToolWidget::className() const @@ -24,72 +24,72 @@ const char *KviWindowToolWidget::className() const return "KviWindowToolWidget"; } -QMetaObject *KviWindowToolWidget::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviWindowToolWidget( "KviWindowToolWidget", &KviWindowToolWidget::staticMetaObject ); +TQMetaObject *KviWindowToolWidget::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviWindowToolWidget( "KviWindowToolWidget", &KviWindowToolWidget::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviWindowToolWidget::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviWindowToolWidget::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviWindowToolWidget", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviWindowToolWidget", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviWindowToolWidget::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviWindowToolWidget::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviWindowToolWidget", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviWindowToolWidget", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviWindowToolWidget::staticMetaObject() +TQMetaObject* KviWindowToolWidget::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = QWidget::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviWindowToolWidget", parentObject, + TQMetaObject* tqparentObject = TQWidget::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviWindowToolWidget", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviWindowToolWidget.setMetaObject( metaObj ); return metaObj; } -void* KviWindowToolWidget::qt_cast( const char* clname ) +void* KviWindowToolWidget::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviWindowToolWidget" ) ) return this; - return QWidget::qt_cast( clname ); + return TQWidget::tqqt_cast( clname ); } -bool KviWindowToolWidget::qt_invoke( int _id, QUObject* _o ) +bool KviWindowToolWidget::qt_invoke( int _id, TQUObject* _o ) { - return QWidget::qt_invoke(_id,_o); + return TQWidget::qt_invoke(_id,_o); } -bool KviWindowToolWidget::qt_emit( int _id, QUObject* _o ) +bool KviWindowToolWidget::qt_emit( int _id, TQUObject* _o ) { - return QWidget::qt_emit(_id,_o); + return TQWidget::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviWindowToolWidget::qt_property( int id, int f, QVariant* v) +bool KviWindowToolWidget::qt_property( int id, int f, TQVariant* v) { - return QWidget::qt_property( id, f, v); + return TQWidget::qt_property( id, f, v); } -bool KviWindowToolWidget::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviWindowToolWidget::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES const char *KviWindowToolPageButton::className() const @@ -97,69 +97,69 @@ const char *KviWindowToolPageButton::className() const return "KviWindowToolPageButton"; } -QMetaObject *KviWindowToolPageButton::metaObj = 0; -static QMetaObjectCleanUp cleanUp_KviWindowToolPageButton( "KviWindowToolPageButton", &KviWindowToolPageButton::staticMetaObject ); +TQMetaObject *KviWindowToolPageButton::metaObj = 0; +static TQMetaObjectCleanUp cleanUp_KviWindowToolPageButton( "KviWindowToolPageButton", &KviWindowToolPageButton::staticMetaObject ); -#ifndef QT_NO_TRANSLATION -QString KviWindowToolPageButton::tr( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION +TQString KviWindowToolPageButton::tr( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviWindowToolPageButton", s, c, QApplication::DefaultCodec ); + if ( tqApp ) + return tqApp->translate( "KviWindowToolPageButton", s, c, TQApplication::DefaultCodec ); else - return QString::fromLatin1( s ); + return TQString::tqfromLatin1( s ); } -#ifndef QT_NO_TRANSLATION_UTF8 -QString KviWindowToolPageButton::trUtf8( const char *s, const char *c ) +#ifndef TQT_NO_TRANSLATION_UTF8 +TQString KviWindowToolPageButton::trUtf8( const char *s, const char *c ) { - if ( qApp ) - return qApp->translate( "KviWindowToolPageButton", s, c, QApplication::UnicodeUTF8 ); + if ( tqApp ) + return tqApp->translate( "KviWindowToolPageButton", s, c, TQApplication::UnicodeUTF8 ); else - return QString::fromUtf8( s ); + return TQString::fromUtf8( s ); } -#endif // QT_NO_TRANSLATION_UTF8 +#endif // TQT_NO_TRANSLATION_UTF8 -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION -QMetaObject* KviWindowToolPageButton::staticMetaObject() +TQMetaObject* KviWindowToolPageButton::staticMetaObject() { if ( metaObj ) return metaObj; - QMetaObject* parentObject = TOOL_PAGE_PARENT::staticMetaObject(); - metaObj = QMetaObject::new_metaobject( - "KviWindowToolPageButton", parentObject, + TQMetaObject* tqparentObject = TOOL_PAGE_PARENT::staticMetaObject(); + metaObj = TQMetaObject::new_metaobject( + "KviWindowToolPageButton", tqparentObject, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, 0, 0, -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES 0, 0 ); cleanUp_KviWindowToolPageButton.setMetaObject( metaObj ); return metaObj; } -void* KviWindowToolPageButton::qt_cast( const char* clname ) +void* KviWindowToolPageButton::tqqt_cast( const char* clname ) { if ( !qstrcmp( clname, "KviWindowToolPageButton" ) ) return this; - return TOOL_PAGE_PARENT::qt_cast( clname ); + return TOOL_PAGE_PARENT::tqqt_cast( clname ); } -bool KviWindowToolPageButton::qt_invoke( int _id, QUObject* _o ) +bool KviWindowToolPageButton::qt_invoke( int _id, TQUObject* _o ) { return TOOL_PAGE_PARENT::qt_invoke(_id,_o); } -bool KviWindowToolPageButton::qt_emit( int _id, QUObject* _o ) +bool KviWindowToolPageButton::qt_emit( int _id, TQUObject* _o ) { return TOOL_PAGE_PARENT::qt_emit(_id,_o); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES -bool KviWindowToolPageButton::qt_property( int id, int f, QVariant* v) +bool KviWindowToolPageButton::qt_property( int id, int f, TQVariant* v) { return TOOL_PAGE_PARENT::qt_property( id, f, v); } -bool KviWindowToolPageButton::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } -#endif // QT_NO_PROPERTIES +bool KviWindowToolPageButton::qt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } +#endif // TQT_NO_PROPERTIES |