diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-28 18:31:12 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-28 18:31:12 +0000 |
commit | 0a80cfd57d271dd44221467efb426675fa470356 (patch) | |
tree | 6f503a31aa078eaf8fa015cf1749808529d49fc9 /src/kvirc/kernel | |
parent | 3329e5a804e28ef3f5eb51d1e7affdd5a508e8f2 (diff) | |
download | kvirc-0a80cfd57d271dd44221467efb426675fa470356.tar.gz kvirc-0a80cfd57d271dd44221467efb426675fa470356.zip |
TQt4 port kvirc
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1238719 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/kvirc/kernel')
69 files changed, 2749 insertions, 2729 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 |