diff options
Diffstat (limited to 'src')
185 files changed, 699 insertions, 717 deletions
diff --git a/src/kvilib/ext/kvi_imagelib.cpp b/src/kvilib/ext/kvi_imagelib.cpp index 8c0b6b43..bc5b581d 100644 --- a/src/kvilib/ext/kvi_imagelib.cpp +++ b/src/kvilib/ext/kvi_imagelib.cpp @@ -86,7 +86,7 @@ bool KviImageLibrary::loadLibrary(const TQString &path) { delete m_pLibrary; m_pLibrary=0; - tqDebug("WARNING : Can not load image library %s",KviTQString::toUtf8(path).data()); + tqDebug("WARNING : Can not load image library %s",path.local8Bit().data()); } return (m_pLibrary != 0); } diff --git a/src/kvilib/ext/kvi_mediatype.cpp b/src/kvilib/ext/kvi_mediatype.cpp index 7631e36c..f7c226b9 100644 --- a/src/kvilib/ext/kvi_mediatype.cpp +++ b/src/kvilib/ext/kvi_mediatype.cpp @@ -233,7 +233,7 @@ void KviMediaManager::insertMediaType(KviMediaType * m) } -KviMediaType * KviMediaManager::findMediaType(const char * filename,bool bCheckMagic) +KviMediaType * KviMediaManager::findMediaType(const TQString &filename,bool bCheckMagic) { // FIXME: This should be ported at least to TQString.... __range_valid(locked()); @@ -452,7 +452,7 @@ static KviDefaultMediaType g_defMediaTypes[]= { 0,0,0,0,0 } }; -void KviMediaManager::load(const char * filename) +void KviMediaManager::load(const TQString &filename) { __range_valid(locked()); @@ -497,7 +497,7 @@ void KviMediaManager::load(const char * filename) } -void KviMediaManager::save(const char * filename) +void KviMediaManager::save(const TQString &filename) { __range_valid(locked()); KviConfig cfg(filename,KviConfig::Write); diff --git a/src/kvilib/ext/kvi_mediatype.h b/src/kvilib/ext/kvi_mediatype.h index 77e96594..8d07e230 100644 --- a/src/kvilib/ext/kvi_mediatype.h +++ b/src/kvilib/ext/kvi_mediatype.h @@ -72,11 +72,11 @@ public: bool removeMediaType(KviMediaType * t){ return m_pMediaTypeList->removeRef(t); }; void clear(){ m_pMediaTypeList->clear(); }; void insertMediaType(KviMediaType * t); - KviMediaType * findMediaType(const char * filename,bool bCheckMagic = true); + KviMediaType * findMediaType(const TQString &filename,bool bCheckMagic = true); static void copyMediaType(KviMediaType * dst,KviMediaType * src); - void load(const char * filename); - void save(const char * filename); + void load(const TQString &filename); + void save(const TQString &filename); }; diff --git a/src/kvilib/ext/kvi_pixmap.cpp b/src/kvilib/ext/kvi_pixmap.cpp index c5877300..add446f2 100644 --- a/src/kvilib/ext/kvi_pixmap.cpp +++ b/src/kvilib/ext/kvi_pixmap.cpp @@ -37,7 +37,7 @@ KviPixmap::KviPixmap() m_pPix = 0; } -KviPixmap::KviPixmap(const char * path) +KviPixmap::KviPixmap(const TQString &path) { m_pPix = 0; load(path); diff --git a/src/kvilib/ext/kvi_pixmap.h b/src/kvilib/ext/kvi_pixmap.h index 9f92e456..5307f5dd 100644 --- a/src/kvilib/ext/kvi_pixmap.h +++ b/src/kvilib/ext/kvi_pixmap.h @@ -34,7 +34,7 @@ class KVILIB_API KviPixmap { public: KviPixmap(); - KviPixmap(const char * path); + KviPixmap(const TQString &path); KviPixmap(const KviPixmap &pix); ~KviPixmap(); private: diff --git a/src/kvilib/ext/kvi_proxydb.cpp b/src/kvilib/ext/kvi_proxydb.cpp index 95bf66a4..2238bb50 100644 --- a/src/kvilib/ext/kvi_proxydb.cpp +++ b/src/kvilib/ext/kvi_proxydb.cpp @@ -94,7 +94,7 @@ KviProxyDataBase::~KviProxyDataBase() delete m_pProxyList; } -void KviProxyDataBase::updateProxyIp(const char * proxy,const char * ip) +void KviProxyDataBase::updateProxyIp(const char * proxy,const TQString &ip) { for(KviProxy * prx = m_pProxyList->first();prx;prx = m_pProxyList->next()) { @@ -114,7 +114,7 @@ void KviProxyDataBase::clear() m_pCurrentProxy = 0; } -void KviProxyDataBase::load(const char * filename) +void KviProxyDataBase::load(const TQString &filename) { clear(); KviConfig cfg(filename,KviConfig::Read); @@ -149,7 +149,7 @@ void KviProxyDataBase::load(const char * filename) if(!m_pCurrentProxy)m_pCurrentProxy = m_pProxyList->first(); } -void KviProxyDataBase::save(const char * filename) +void KviProxyDataBase::save(const TQString &filename) { KviConfig cfg(filename,KviConfig::Write); diff --git a/src/kvilib/ext/kvi_proxydb.h b/src/kvilib/ext/kvi_proxydb.h index 0ab18f5e..a35a726d 100644 --- a/src/kvilib/ext/kvi_proxydb.h +++ b/src/kvilib/ext/kvi_proxydb.h @@ -76,11 +76,11 @@ public: void clear(); KviPointerList<KviProxy> * proxyList(){ return m_pProxyList; }; KviProxy * currentProxy(){ return m_pCurrentProxy; }; - void updateProxyIp(const char * proxy,const char * ip); + void updateProxyIp(const char * proxy,const TQString &ip); void setCurrentProxy(KviProxy * prx){ m_pCurrentProxy = prx; }; void insertProxy(KviProxy * prx){ m_pProxyList->append(prx); }; - void load(const char * filename); - void save(const char * filename); + void load(const TQString &filename); + void save(const TQString &filename); }; #endif //_KVI_PROXYDB_H_ diff --git a/src/kvilib/ext/kvi_regchan.cpp b/src/kvilib/ext/kvi_regchan.cpp index 9cddac5c..8f37b8b2 100644 --- a/src/kvilib/ext/kvi_regchan.cpp +++ b/src/kvilib/ext/kvi_regchan.cpp @@ -32,7 +32,7 @@ KviRegisteredChannel::KviRegisteredChannel(const KviStr &name,const KviStr &netm { m_szName = name; m_szNetMask = netmask; - m_pPropertyDict = new KviPointerHashTable<const char *,KviStr>(7,false,true); + m_pPropertyDict = new KviPointerHashTable<TQString,KviStr>(7,false,true); m_pPropertyDict->setAutoDelete(true); } @@ -45,7 +45,7 @@ KviRegisteredChannel::~KviRegisteredChannel() KviRegisteredChannelDataBase::KviRegisteredChannelDataBase() { - m_pChannelDict = new KviPointerHashTable<const char *,KviRegisteredChannelList>(17,false,true); + m_pChannelDict = new KviPointerHashTable<TQString,KviRegisteredChannelList>(17,false,true); m_pChannelDict->setAutoDelete(true); } @@ -54,7 +54,7 @@ KviRegisteredChannelDataBase::~KviRegisteredChannelDataBase() delete m_pChannelDict; } -void KviRegisteredChannelDataBase::load(const char * filename) +void KviRegisteredChannelDataBase::load(const TQString &filename) { KviConfig cfg(filename,KviConfig::Read); m_pChannelDict->clear(); @@ -69,26 +69,26 @@ void KviRegisteredChannelDataBase::load(const char * filename) KviConfigGroupIterator sit(*d); while(TQString * s = sit.current()) { - c->setProperty(KviTQString::toUtf8(sit.currentKey()).data(),new KviStr(*s)); + c->setProperty(sit.currentKey(),new KviStr(*s)); ++sit; } ++it; } } -void KviRegisteredChannelDataBase::save(const char * filename) +void KviRegisteredChannelDataBase::save(const TQString &filename) { KviConfig cfg(filename,KviConfig::Write); cfg.clear(); - KviPointerHashTableIterator<const char *,KviRegisteredChannelList> it(*m_pChannelDict); + KviPointerHashTableIterator<TQString,KviRegisteredChannelList> it(*m_pChannelDict); while(KviRegisteredChannelList * l = it.current()) { for(KviRegisteredChannel * c = l->first();c;c = l->next()) { KviStr szGrp(KviStr::Format,"%s@%s",c->name().ptr(),c->netMask().ptr()); cfg.setGroup(szGrp.ptr()); - KviPointerHashTableIterator<const char *,KviStr> pit(*(c->propertyDict())); + KviPointerHashTableIterator<TQString,KviStr> pit(*(c->propertyDict())); while(KviStr * s = pit.current()) { cfg.writeEntry(pit.currentKey(),s->ptr()); @@ -99,25 +99,25 @@ void KviRegisteredChannelDataBase::save(const char * filename) } } -KviRegisteredChannel * KviRegisteredChannelDataBase::find(const char * name,const char * net) +KviRegisteredChannel * KviRegisteredChannelDataBase::find(const TQString &name,const TQString &net) { KviRegisteredChannelList * l = m_pChannelDict->find(name); if(!l)return 0; for(KviRegisteredChannel * c = l->first();c;c = l->next()) { - if(kvi_matchString(c->netMask().ptr(),net))return c; + if(kvi_matchString(c->netMask().ptr(),net.utf8().data()))return c; } return 0; } -KviRegisteredChannel * KviRegisteredChannelDataBase::findExact(const char * name,const char * netmask) +KviRegisteredChannel * KviRegisteredChannelDataBase::findExact(const TQString &name,const TQString &netmask) { KviRegisteredChannelList * l = m_pChannelDict->find(name); if(!l)return 0; for(KviRegisteredChannel * c = l->first();c;c = l->next()) { - if(kvi_strEqualCI(c->netMask().ptr(),netmask))return c; + if(kvi_strEqualCI(c->netMask().ptr(),netmask.utf8().data()))return c; } return 0; } @@ -147,7 +147,7 @@ void KviRegisteredChannelDataBase::add(KviRegisteredChannel * c) KviRegisteredChannel * old = findExact(c->name().ptr(),c->netMask().ptr()); if(old) { - KviPointerHashTableIterator<const char *,KviStr> pit(*(old->propertyDict())); + KviPointerHashTableIterator<TQString,KviStr> pit(*(old->propertyDict())); while(KviStr *s = pit.current()) { if(!c->property(pit.currentKey())) diff --git a/src/kvilib/ext/kvi_regchan.h b/src/kvilib/ext/kvi_regchan.h index 5b4e7554..10d49aee 100644 --- a/src/kvilib/ext/kvi_regchan.h +++ b/src/kvilib/ext/kvi_regchan.h @@ -40,15 +40,15 @@ public: protected: KviStr m_szName; KviStr m_szNetMask; - KviPointerHashTable<const char *,KviStr> * m_pPropertyDict; + KviPointerHashTable<TQString,KviStr> * m_pPropertyDict; public: - KviPointerHashTable<const char *,KviStr> * propertyDict(){ return m_pPropertyDict; }; + KviPointerHashTable<TQString,KviStr> * propertyDict(){ return m_pPropertyDict; }; const KviStr & name(){ return m_szName; }; const KviStr & netMask(){ return m_szNetMask; }; - KviStr * property(const char * name){ return m_pPropertyDict->find(name); }; + KviStr * property(const TQString &name){ return m_pPropertyDict->find(name); }; // val must be allocated with NEW! - void setProperty(const char * name,KviStr * val){ m_pPropertyDict->replace(name,val); }; - void removeProperty(const char * name){ m_pPropertyDict->remove(name); }; + void setProperty(const TQString &name,KviStr * val){ m_pPropertyDict->replace(name,val); }; + void removeProperty(const TQString &name){ m_pPropertyDict->remove(name); }; }; typedef KviPointerList<KviRegisteredChannel> KviRegisteredChannelList; @@ -59,15 +59,15 @@ public: KviRegisteredChannelDataBase(); ~KviRegisteredChannelDataBase(); protected: - KviPointerHashTable<const char *,KviRegisteredChannelList> * m_pChannelDict; + KviPointerHashTable<TQString,KviRegisteredChannelList> * m_pChannelDict; public: - KviPointerHashTable<const char *,KviRegisteredChannelList> * channelDict(){ return m_pChannelDict; }; - KviRegisteredChannel * find(const char * name,const char * net); - KviRegisteredChannel * findExact(const char * name,const char * netmask); + KviPointerHashTable<TQString,KviRegisteredChannelList> * channelDict(){ return m_pChannelDict; }; + KviRegisteredChannel * find(const TQString &name,const TQString &net); + KviRegisteredChannel * findExact(const TQString &name,const TQString &netmask); void remove(KviRegisteredChannel * c); void add(KviRegisteredChannel * c); - void load(const char * filename); - void save(const char * filename); + void load(const TQString &filename); + void save(const TQString &filename); }; diff --git a/src/kvilib/ext/kvi_regusersdb.cpp b/src/kvilib/ext/kvi_regusersdb.cpp index 8ab9aa2f..eff602df 100644 --- a/src/kvilib/ext/kvi_regusersdb.cpp +++ b/src/kvilib/ext/kvi_regusersdb.cpp @@ -487,7 +487,7 @@ bool KviRegisteredUserDataBase::removeUser(const TQString & name) while(KviIrcMask * mask = u->maskList()->first()) { if(!removeMaskByPointer(mask)) - tqDebug("Ops... removeMaskByPointer(%s) failed ?",KviTQString::toUtf8(name).data()); + tqDebug("Ops... removeMaskByPointer(%s) failed ?",name.local8Bit().data()); } emit(userRemoved(name)); m_pUserDict->remove(name); diff --git a/src/kvilib/ext/kvi_sharedfiles.cpp b/src/kvilib/ext/kvi_sharedfiles.cpp index 2e6da616..f2066b2e 100644 --- a/src/kvilib/ext/kvi_sharedfiles.cpp +++ b/src/kvilib/ext/kvi_sharedfiles.cpp @@ -265,7 +265,7 @@ KviSharedFile * KviSharedFilesManager::addSharedFile(const TQString &szName,cons return o; } else { - tqDebug("File %s unreadable: can't add offer",KviTQString::toUtf8(szAbsPath).data()); + tqDebug("File %s unreadable: can't add offer",szAbsPath.local8Bit().data()); return 0; } } diff --git a/src/kvilib/file/kvi_fileutils.cpp b/src/kvilib/file/kvi_fileutils.cpp index d97f398a..2a7d9021 100644 --- a/src/kvilib/file/kvi_fileutils.cpp +++ b/src/kvilib/file/kvi_fileutils.cpp @@ -122,7 +122,7 @@ namespace KviFileUtils { if(!d.mkdir(createdDir)) { - tqDebug("Can't create directory %s",KviTQString::toUtf8(createdDir).data()); + tqDebug("Can't create directory %s",createdDir.local8Bit().data()); return false; } } @@ -466,12 +466,12 @@ void kvi_encodeFileName(TQString & path) //================ kvi_isAbsolutePath ===============// -bool kvi_isAbsolutePath(const char *path) +bool kvi_isAbsolutePath(const TQString &path) { - if(*path == '/')return true; - if(isalpha(*path)) + if(path[0] == '/')return true; + if(isalpha(path[0])) { - if((*(path + 1)) == ':')return true; + if(path[1] == ':')return true; } return false; } diff --git a/src/kvilib/file/kvi_fileutils.h b/src/kvilib/file/kvi_fileutils.h index bea07fed..5224eb0c 100644 --- a/src/kvilib/file/kvi_fileutils.h +++ b/src/kvilib/file/kvi_fileutils.h @@ -98,7 +98,7 @@ namespace KviFileUtils // ALL THIS STUFF BELOW SHOULD DIE: IF YOU SEE IT, REPLACE WITH THE FUNCTIONS IN THE NAMESPACE ABOVE // Returns true if the path begins with '/' -KVILIB_API extern bool kvi_isAbsolutePath(const char *path); +KVILIB_API extern bool kvi_isAbsolutePath(const TQString &path); // Translates ANY string into a valid filename (with no path!) // There is NO way to come back to the original string // the algo is one-way only diff --git a/src/kvilib/system/kvi_locale.cpp b/src/kvilib/system/kvi_locale.cpp index 0f456f44..db5868d7 100644 --- a/src/kvilib/system/kvi_locale.cpp +++ b/src/kvilib/system/kvi_locale.cpp @@ -478,7 +478,7 @@ bool KviMessageCatalogue::load(const TQString& name) KviFile f(szCatalogueFile); if(!f.openForReading()) { - tqDebug("[KviLocale]: Failed to open the messages file %s: probably doesn't exist",KviTQString::toUtf8(szCatalogueFile).data()); + tqDebug("[KviLocale]: Failed to open the messages file %s: probably doesn't exist",szCatalogueFile.local8Bit().data()); return false; } @@ -486,7 +486,7 @@ bool KviMessageCatalogue::load(const TQString& name) if(f.readBlock((char *)&hdr,sizeof(GnuMoFileHeader)) < (int)sizeof(GnuMoFileHeader)) { - tqDebug("KviLocale: Failed to read header of %s",KviTQString::toUtf8(szCatalogueFile).data()); + tqDebug("KviLocale: Failed to read header of %s",szCatalogueFile.local8Bit().data()); f.close(); return false; } @@ -497,10 +497,10 @@ bool KviMessageCatalogue::load(const TQString& name) { if(hdr.magic == KVI_LOCALE_MAGIC_SWAPPED) { - tqDebug("KviLocale: Swapped magic for file %s: swapping data too",KviTQString::toUtf8(szCatalogueFile).data()); + tqDebug("KviLocale: Swapped magic for file %s: swapping data too",szCatalogueFile.local8Bit().data()); bMustSwap = true; } else { - tqDebug("KviLocale: Bad locale magic for file %s: not a *.mo file ?",KviTQString::toUtf8(szCatalogueFile).data()); + tqDebug("KviLocale: Bad locale magic for file %s: not a *.mo file ?",szCatalogueFile.local8Bit().data()); f.close(); return false; } @@ -508,7 +508,7 @@ bool KviMessageCatalogue::load(const TQString& name) if(KVI_SWAP_IF_NEEDED(bMustSwap,hdr.revision) != MO_REVISION_NUMBER) { - tqDebug("KviLocale: Invalid *.mo file revision number for file %s",KviTQString::toUtf8(szCatalogueFile).data()); + tqDebug("KviLocale: Invalid *.mo file revision number for file %s",szCatalogueFile.local8Bit().data()); f.close(); return false; } @@ -517,7 +517,7 @@ bool KviMessageCatalogue::load(const TQString& name) if(numberOfStrings <= 0) { - tqDebug("KviLocale: No translated messages found in file %s",KviTQString::toUtf8(szCatalogueFile).data()); + tqDebug("KviLocale: No translated messages found in file %s",szCatalogueFile.local8Bit().data()); f.close(); return false; } @@ -537,7 +537,7 @@ bool KviMessageCatalogue::load(const TQString& name) // FIXME: maybe read it in blocks eh ? if(f.readBlock(buffer,fSize) < (int)fSize) { - tqDebug("KviLocale: Error while reading the translation file %s",KviTQString::toUtf8(szCatalogueFile).data()); + tqDebug("KviLocale: Error while reading the translation file %s",szCatalogueFile.local8Bit().data()); kvi_free(buffer); f.close(); return false; @@ -546,7 +546,7 @@ bool KviMessageCatalogue::load(const TQString& name) // Check for broken *.mo files if(fSize < (24 + (sizeof(GnuMoStringDescriptor) * numberOfStrings))) { - tqDebug("KviLocale: Broken translation file %s (too small for all descriptors)",KviTQString::toUtf8(szCatalogueFile).data()); + tqDebug("KviLocale: Broken translation file %s (too small for all descriptors)",szCatalogueFile.local8Bit().data()); kvi_free(buffer); f.close(); return false; @@ -561,7 +561,7 @@ bool KviMessageCatalogue::load(const TQString& name) if(fSize < (unsigned int)expectedFileSize) { - tqDebug("KviLocale: Broken translation file %s (too small for all the message strings)",KviTQString::toUtf8(szCatalogueFile).data()); + tqDebug("KviLocale: Broken translation file %s (too small for all the message strings)",szCatalogueFile.local8Bit().data()); kvi_free(buffer); f.close(); return false; diff --git a/src/kvilib/system/kvi_thread.cpp b/src/kvilib/system/kvi_thread.cpp index 017e789d..26761175 100644 --- a/src/kvilib/system/kvi_thread.cpp +++ b/src/kvilib/system/kvi_thread.cpp @@ -189,17 +189,17 @@ KviThreadManager::KviThreadManager() if(pipe(m_fd) != 0) { - tqDebug("Ops...thread manager pipe creation failed (%s)",KviTQString::toUtf8(KviError::getDescription(KviError::translateSystemError(errno))).data()); + tqDebug("Ops...thread manager pipe creation failed (%s)",KviError::getDescription(KviError::translateSystemError(errno)).local8Bit().data()); } if(fcntl(m_fd[KVI_THREAD_PIPE_SIDE_SLAVE],F_SETFL,O_NONBLOCK) == -1) { - tqDebug("Ops...thread manager slave pipe initialisation failed (%s)",KviTQString::toUtf8(KviError::getDescription(KviError::translateSystemError(errno))).data()); + tqDebug("Ops...thread manager slave pipe initialisation failed (%s)",KviError::getDescription(KviError::translateSystemError(errno)).local8Bit().data()); } if(fcntl(m_fd[KVI_THREAD_PIPE_SIDE_MASTER],F_SETFL,O_NONBLOCK) == -1) { - tqDebug("Ops...thread manager master pipe initialisation failed (%s)",KviTQString::toUtf8(KviError::getDescription(KviError::translateSystemError(errno))).data()); + tqDebug("Ops...thread manager master pipe initialisation failed (%s)",KviError::getDescription(KviError::translateSystemError(errno)).local8Bit().data()); } m_pSn = new TQSocketNotifier(m_fd[KVI_THREAD_PIPE_SIDE_MASTER],TQSocketNotifier::Read); diff --git a/src/kvirc/kernel/kvi_action.cpp b/src/kvirc/kernel/kvi_action.cpp index 910a00ff..64511082 100644 --- a/src/kvirc/kernel/kvi_action.cpp +++ b/src/kvirc/kernel/kvi_action.cpp @@ -417,7 +417,7 @@ TQWidget * KviAction::addToCustomToolBar(KviCustomToolBar *pParentToolBar) p ? *p : TQPixmap(), visibleName(), visibleName(), - this,TQ_SLOT(activate()),pParentToolBar,m_szName); + this,TQ_SLOT(activate()),pParentToolBar,m_szName.utf8().data()); if(!isEnabled())b->setEnabled(false); registerWidget(b); return b; diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp index 09f94c4e..c80f3080 100644 --- a/src/kvirc/kernel/kvi_app.cpp +++ b/src/kvirc/kernel/kvi_app.cpp @@ -116,7 +116,7 @@ KVIRC_API KviTextIconWindow * g_pTextIconWindow = 0; KVIRC_API KviTalPopupMenu * g_pInputPopup = 0; KVIRC_API TQStringList * g_pRecentTopicList = 0; //KVIRC_API TQStringList * g_pBookmarkList = 0; -KVIRC_API KviPointerHashTable<const char *,KviWindow> * g_pGlobalWindowDict = 0; +KVIRC_API KviPointerHashTable<TQString,KviWindow> * g_pGlobalWindowDict = 0; KVIRC_API KviMediaManager * g_pMediaManager = 0; //KVIRC_API KviRegisteredUserDataBase * g_pRegisteredUserDataBase = 0; KVIRC_API KviSharedFilesManager * g_pSharedFilesManager = 0; @@ -440,7 +440,7 @@ void KviApp::setup() KVI_SPLASH_SET_PROGRESS(91) // Global window dictionary - g_pGlobalWindowDict = new KviPointerHashTable<const char *,KviWindow>(41); + g_pGlobalWindowDict = new KviPointerHashTable<TQString,KviWindow>(41); g_pGlobalWindowDict->setAutoDelete(false); // Script object controller //g_pScriptObjectController = new KviScriptObjectController(); gone @@ -896,7 +896,7 @@ void KviApp::setClipboardText(const KviStr &str) void KviApp::setAvatarFromOptions() { - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(it.current()) { @@ -1559,7 +1559,7 @@ void KviApp::destroyFrame() bool KviApp::connectionExists(KviIrcConnection *cnn) { - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(it.current()) { @@ -1572,7 +1572,7 @@ bool KviApp::connectionExists(KviIrcConnection *cnn) bool KviApp::windowExists(KviWindow *wnd) { - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(it.current()) { @@ -1589,7 +1589,7 @@ unsigned int KviApp::windowCount() KviConsole * KviApp::findConsole(TQString &server,TQString &nick) { - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(it.current()) { @@ -1634,7 +1634,7 @@ KviConsole * KviApp::findConsole(KviStr &server,KviStr &nick) void KviApp::restartLagMeters() { - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(it.current()) { @@ -1649,7 +1649,7 @@ void KviApp::restartLagMeters() void KviApp::restartNotifyLists() { - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(it.current()) { @@ -1664,7 +1664,7 @@ void KviApp::restartNotifyLists() void KviApp::resetAvatarForMatchingUsers(KviRegisteredUser * u) { - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(it.current()) { @@ -1678,7 +1678,7 @@ void KviApp::resetAvatarForMatchingUsers(KviRegisteredUser * u) KviConsole * KviApp::findConsole(unsigned int ircContextId) { - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(it.current()) { @@ -1704,7 +1704,7 @@ KviConsole * KviApp::topmostConnectedConsole() // try ANY connected console - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(it.current()) { @@ -1718,14 +1718,14 @@ KviConsole * KviApp::topmostConnectedConsole() return 0; } -KviWindow * KviApp::findWindow(const char * windowId) +KviWindow * KviApp::findWindow(const TQString &windowId) { return g_pGlobalWindowDict->find(windowId); } KviWindow * KviApp::findWindowByCaption(const TQString &windowCaption,int iContextId) { - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(it.current()) { diff --git a/src/kvirc/kernel/kvi_app.h b/src/kvirc/kernel/kvi_app.h index a0824b23..f6de2250 100644 --- a/src/kvirc/kernel/kvi_app.h +++ b/src/kvirc/kernel/kvi_app.h @@ -199,21 +199,21 @@ public: // if the mediatype can be guessed ,it is looked up in the media type save path // if found , true is returned // if not found or the mediatype can't be guessed then false is returned - bool findFileByMediaType(KviStr &szRetPath,const char * filename); + bool findFileByMediaType(KviStr &szRetPath,const TQString &filename); - bool findImageInImageSearchPath(KviStr &szRetPath,const char * filename); - bool findImageInImageSearchPath(TQString &szRetPath,const char * filename); + bool findImageInImageSearchPath(KviStr &szRetPath,const TQString &filename); + bool findImageInImageSearchPath(TQString &szRetPath,const TQString &filename); bool findUserFile(KviStr &szRetPath,const char *filename); - bool findImage(KviStr &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); + bool findImage(KviStr &szRetPath,const TQString &filename); + bool findImage(TQString &szRetPath,const TQString &filename); + bool findImageThemeOnlyCompat(TQString &szRetPath,const TQString &filename); // temporary compat, will be removed soon (do not use) + bool findSmallIcon(TQString &szRetPath,const TQString &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(TQString &szRetPath,const char * filename); + bool mapImageFile(KviStr &szRetPath,const TQString &filename); + bool mapImageFile(TQString &szRetPath,const TQString &filename); //void getDefaultDccSaveFilePath(KviStr &path,const char *filename); void completeDirectory(const TQString &word,KviPointerList<TQString> * matches); @@ -230,7 +230,7 @@ public: 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 * findWindow(const TQString &windowId); KviWindow * findWindowByCaption(const TQString &windowCaption,int iContextId=-1); KviConsole * findConsole(unsigned int ircContextId); KviConsole * findConsole(KviStr & server,KviStr & nick); diff --git a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/kvi_app_fs.cpp index 3cffd7d9..cd80567a 100644 --- a/src/kvirc/kernel/kvi_app_fs.cpp +++ b/src/kvirc/kernel/kvi_app_fs.cpp @@ -329,7 +329,7 @@ void KviApp::getChannelDumpLogFileName(TQString &str) KviFileUtils::adjustFilePath(str); } -bool KviApp::findFileByMediaType(KviStr &szRetPath,const char * filename) +bool KviApp::findFileByMediaType(KviStr &szRetPath,const TQString &filename) { g_pMediaManager->lock(); KviMediaType * m = g_pMediaManager->findMediaType(filename,false); @@ -430,7 +430,7 @@ bool KviApp::findUserFile(KviStr &szRetPath,const char *filename) // FIXME: #warning "Check WHEN findImage is used and when findUserFile is used...we have a mess here" -bool KviApp::findImageInImageSearchPath(KviStr &szRetPath,const char * filename) +bool KviApp::findImageInImageSearchPath(KviStr &szRetPath,const TQString &filename) { // first lookup the user defined paths for(TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).begin(); @@ -446,7 +446,7 @@ bool KviApp::findImageInImageSearchPath(KviStr &szRetPath,const char * filename) return false; } -bool KviApp::findImageInImageSearchPath(TQString &szRetPath,const char * filename) +bool KviApp::findImageInImageSearchPath(TQString &szRetPath,const TQString &filename) { // first lookup the user defined paths for(TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).begin(); @@ -465,7 +465,7 @@ bool KviApp::findImageInImageSearchPath(TQString &szRetPath,const char * filenam static KviApp::KvircSubdir pics_localsubdirs[2]={ KviApp::Pics , KviApp::Avatars }; static KviApp::KvircSubdir pics_globalsubdirs[2]={ KviApp::Pics , KviApp::Avatars }; -bool KviApp::mapImageFile(KviStr &szRetPath,const char * filename) +bool KviApp::mapImageFile(KviStr &szRetPath,const TQString &filename) { TQString buff; bool ret=mapImageFile(buff,filename); @@ -473,7 +473,7 @@ bool KviApp::mapImageFile(KviStr &szRetPath,const char * filename) return ret; } -bool KviApp::mapImageFile(TQString &szRetPath,const char * filename) +bool KviApp::mapImageFile(TQString &szRetPath,const TQString &filename) { szRetPath = filename; // can't map non absolute paths @@ -481,7 +481,7 @@ bool KviApp::mapImageFile(TQString &szRetPath,const char * filename) // can't map non existing paths if(!KviFileUtils::fileExists(filename))return false; - TQFileInfo fi = TQFileInfo(TQString::fromUtf8(filename)); + TQFileInfo fi = TQFileInfo(filename); unsigned int size = fi.size(); @@ -554,7 +554,7 @@ bool KviApp::mapImageFile(TQString &szRetPath,const char * filename) } -bool KviApp::findImage(KviStr &szRetPath,const char *filename) +bool KviApp::findImage(KviStr &szRetPath,const TQString &filename) { TQString buff; bool ret=findImage(buff,filename); @@ -562,7 +562,7 @@ bool KviApp::findImage(KviStr &szRetPath,const char *filename) return ret; } -bool KviApp::findImage(TQString &szRetPath,const char *filename) +bool KviApp::findImage(TQString &szRetPath,const TQString &filename) { // Find an user file... if(kvi_isAbsolutePath(filename)) @@ -612,7 +612,7 @@ bool KviApp::findImage(TQString &szRetPath,const char *filename) return false; } -bool KviApp::findImageThemeOnlyCompat(TQString &szRetPath,const char *filename) +bool KviApp::findImageThemeOnlyCompat(TQString &szRetPath,const TQString &filename) { // if we have a theme, look it up as first if(!KVI_OPTION_STRING(KviOption_stringIconThemeSubdir).isEmpty()) @@ -639,18 +639,11 @@ bool KviApp::findImageThemeOnlyCompat(TQString &szRetPath,const char *filename) return false; } -bool KviApp::findSmallIcon(TQString &szRetPath,const char *filename) +bool KviApp::findSmallIcon(TQString &szRetPath,const TQString &filename) { // this is a bit optimized for the small builtin icons // looks up less places. - //if(kvi_isAbsolutePath(filename)) - //{ - // BUG!.. we should never - //szRetPath=filename; - //return KviFileUtils::fileExists(filename); - //} - // if we have a theme, look it up as first if(!KVI_OPTION_STRING(KviOption_stringIconThemeSubdir).isEmpty()) { diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp index 7042b369..2a449ac7 100644 --- a/src/kvirc/kernel/kvi_coreactions.cpp +++ b/src/kvirc/kernel/kvi_coreactions.cpp @@ -678,7 +678,7 @@ TQWidget * KviConnectAction::addToCustomToolBar(KviCustomToolBar *t) *(g_pIconManager->getBigIcon(KVI_BIGICON_DISCONNECTED)), m_szConnectString, m_szConnectString, - this,TQ_SLOT(activate()),t,name()); + this,TQ_SLOT(activate()),t,name().utf8().data()); registerWidget(b); activeContextStateChanged(); return b; @@ -751,7 +751,7 @@ TQWidget * KviSubmenuAction::addToCustomToolBar(KviCustomToolBar *t) *(bigIcon()), visibleName(), visibleName(), - this,TQ_SLOT(activate()),t,name()); + this,TQ_SLOT(activate()),t,name().utf8().data()); b->setPopup(m_pPopup); b->setShowSubmenuIndicator(true); @@ -1094,7 +1094,7 @@ TQWidget * KviGoAwayAction::addToCustomToolBar(KviCustomToolBar *t) *(g_pIconManager->getBigIcon("kvi_bigicon_nokeyboard.png")), m_szAwayString, m_szAwayString, - this,TQ_SLOT(activate()),t,name()); + this,TQ_SLOT(activate()),t,name().utf8().data()); registerWidget(b); activeContextStateChanged(); return b; diff --git a/src/kvirc/kernel/kvi_iconmanager.cpp b/src/kvirc/kernel/kvi_iconmanager.cpp index 6d9f328a..786e6680 100644 --- a/src/kvirc/kernel/kvi_iconmanager.cpp +++ b/src/kvirc/kernel/kvi_iconmanager.cpp @@ -688,14 +688,13 @@ void KviIconManager::addToCache(const TQString &szName,KviCachedPixmap * p) m_uCacheTotalSize += p->size(); } -TQPixmap * KviIconManager::getImage(const char * id,bool bCanBeNumber,TQString* pRetPath) +TQPixmap * KviIconManager::getImage(const TQString &id,bool bCanBeNumber,TQString* pRetPath) { - if(!id)return 0; + if(id.isEmpty())return 0; if(bCanBeNumber) { bool bOk; - TQString tmp = id; - int idx = tmp.toInt(&bOk); + int idx = id.toInt(&bOk); if(bOk) { // was a number : this is not a filename diff --git a/src/kvirc/kernel/kvi_iconmanager.h b/src/kvirc/kernel/kvi_iconmanager.h index ee444d23..021b5e15 100644 --- a/src/kvirc/kernel/kvi_iconmanager.h +++ b/src/kvirc/kernel/kvi_iconmanager.h @@ -450,7 +450,7 @@ public: // WARNING: Don't store this pointer! // id == filename | number that indicates an internal pixmap // 0 stands for "any" - TQPixmap * getImage(const char * id,bool bCanBeNumber = true,TQString* pRetPath = 0); + TQPixmap * getImage(const TQString &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 diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp index 886198c7..20374ebb 100644 --- a/src/kvirc/kernel/kvi_ircconnection.cpp +++ b/src/kvirc/kernel/kvi_ircconnection.cpp @@ -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)tqDebug("KviIrcConnection: can't find TQTextCodec for encoding %s",m_pTarget->server()->encoding().utf8().data()); + if(!m_pTextCodec)tqDebug("KviIrcConnection: can't find TQTextCodec for encoding %s",m_pTarget->server()->encoding().local8Bit().data()); } if(!m_pTextCodec) { @@ -194,7 +194,7 @@ void KviIrcConnection::setupTextCodec() if(!m_pTarget->network()->encoding().isEmpty()) { m_pTextCodec = KviLocale::codecForName(m_pTarget->network()->encoding().latin1()); - if(!m_pTextCodec)tqDebug("KviIrcConnection: can't find TQTextCodec for encoding %s",m_pTarget->network()->encoding().utf8().data()); + if(!m_pTextCodec)tqDebug("KviIrcConnection: can't find TQTextCodec for encoding %s",m_pTarget->network()->encoding().local8Bit().data()); } } if(!m_pTextCodec) @@ -420,7 +420,7 @@ KviChannel * KviIrcConnection::createChannel(const TQString &szName) c->setFocus(); } } else { - c = new KviChannel(m_pFrame,m_pConsole,szName); + c = new KviChannel(m_pFrame,m_pConsole,szName.utf8().data()); m_pFrame->addWindow(c,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedChannels)); if(KVI_OPTION_BOOL(KviOption_boolCreateMinimizedChannels)) c->minimize(); } diff --git a/src/kvirc/kernel/kvi_irclink.cpp b/src/kvirc/kernel/kvi_irclink.cpp index 909671ab..4c53d0eb 100644 --- a/src/kvirc/kernel/kvi_irclink.cpp +++ b/src/kvirc/kernel/kvi_irclink.cpp @@ -129,7 +129,7 @@ void KviIrcLink::createSocket(const TQString &szLinkFilterName) if(KviTQString::equalCI(szLinkFilterName,"irc"))return; m_pLinkFilter = (KviMexLinkFilter *)g_pModuleExtensionManager->allocateExtension("linkfilter", - szLinkFilterName.utf8().data(),m_pConsole,0,this,szLinkFilterName.utf8().data()); + szLinkFilterName.utf8().data(),m_pConsole,0,this,szLinkFilterName); if(m_pLinkFilter) { diff --git a/src/kvirc/kernel/kvi_ircsocket.cpp b/src/kvirc/kernel/kvi_ircsocket.cpp index 84a892b8..ac03b885 100644 --- a/src/kvirc/kernel/kvi_ircsocket.cpp +++ b/src/kvirc/kernel/kvi_ircsocket.cpp @@ -701,7 +701,7 @@ void KviIrcSocket::proxyLoginV4() struct in_addr ircInAddr; - if(!kvi_stringIpToBinaryIp(m_pIrcServer->ip(),&ircInAddr)) + if(!kvi_stringIpToBinaryIp(m_pIrcServer->ip().utf8().data(),&ircInAddr)) tqDebug("SOCKET INTERNAL ERROR IN IPV4 (SOCKS4) ADDR CONVERSION"); TQ_UINT32 host=(TQ_UINT32)ircInAddr.s_addr; @@ -922,7 +922,7 @@ void KviIrcSocket::proxySendTargetDataV5() } else { struct in_addr ircInAddr; - if(!kvi_stringIpToBinaryIp(m_pIrcServer->ip(),&ircInAddr))tqDebug("SOCKET INTERNAL ERROR IN IPV4 ADDR CONVERSION"); + if(!kvi_stringIpToBinaryIp(m_pIrcServer->ip().utf8().data(),&ircInAddr))tqDebug("SOCKET INTERNAL ERROR IN IPV4 ADDR CONVERSION"); TQ_UINT32 host = (TQ_UINT32)ircInAddr.s_addr; kvi_memmove((void *)(bufToSend + 4),(void *)&host,4); TQ_UINT16 port = (TQ_UINT16)htons(m_pIrcServer->port()); diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp index 69a0fb36..a702c5a2 100644 --- a/src/kvirc/kernel/kvi_options.cpp +++ b/src/kvirc/kernel/kvi_options.cpp @@ -1019,7 +1019,7 @@ namespace KviTheme cfg.writeEntry(g_pixmapOptionsTable[i].name,szPixName); } else { // we ignore this error for now - tqDebug("failed to save %s",szPixPath.utf8().data()); + tqDebug("failed to save %s",szPixPath.local8Bit().data()); cfg.writeEntry(g_pixmapOptionsTable[i].name,""); } } else { diff --git a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp index 93880f52..8e38915b 100644 --- a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp +++ b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp @@ -437,7 +437,7 @@ namespace KviKvsCoreCallbackCommands return true; } - pButton = (KviScriptUserButton *)(KVSCCC_pWindow->buttonContainer())->child(szName,"KviWindowScriptButton"); + pButton = (KviScriptUserButton *)(KVSCCC_pWindow->buttonContainer())->child(szName.utf8().data(),"KviWindowScriptButton"); if(KVSCCC_pCallback->code().isEmpty()) { @@ -451,7 +451,7 @@ namespace KviKvsCoreCallbackCommands if(!pButton) { - pButton = new KviWindowScriptButton(KVSCCC_pWindow->buttonContainer(),KVSCCC_pWindow,szName); + pButton = new KviWindowScriptButton(KVSCCC_pWindow->buttonContainer(),KVSCCC_pWindow,szName.utf8()); pButton->show(); } diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp index 6968c1e2..76e935b4 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp @@ -425,7 +425,7 @@ namespace KviKvsCoreFunctions KVSCF_PARAMETER("optionName",KVS_PT_NONEMPTYSTRING,0,szOpt) KVSCF_PARAMETERS_END TQString tmp; - if(g_pApp->getOptionString(szOpt,tmp))KVSCF_pRetBuffer->setString(tmp); + if(g_pApp->getOptionString(szOpt.utf8().data(),tmp))KVSCF_pRetBuffer->setString(tmp); else { KVSCF_pContext->warning(__tr2qs("There is no option named '%Q'"),&szOpt); KVSCF_pRetBuffer->setNothing(); diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp index b78c0be3..aecd6bbf 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp @@ -114,7 +114,7 @@ namespace KviKvsCoreFunctions KviWindow * wnd; if(KVSCF_pParams->count() > 0) { - wnd = g_pApp->findWindow(winId.utf8().data()); + wnd = g_pApp->findWindow(winId); if(!wnd) { KVSCF_pContext->warning(__tr2qs("Window with ID '%s' not found, returning empty string"),winId.utf8().data()); @@ -458,7 +458,7 @@ namespace KviKvsCoreFunctions KviWindow * wnd; if(KVSCF_pParams->count() > 0) { - wnd = g_pApp->findWindow(winId.utf8().data()); + wnd = g_pApp->findWindow(winId); if(!wnd) { KVSCF_pContext->warning(__tr2qs("Window with ID '%s' not found, returning empty string"),winId.utf8().data()); @@ -705,7 +705,7 @@ namespace KviKvsCoreFunctions KviMessageCatalogue * pCat = KviLocale::getLoadedCatalogue(szCatalogue); if(pCat) { - translation = pCat->translateToTQString(szString); + translation = pCat->translateToTQString(szString.utf8().data()); } else { // attempt to load it automatically TQString szDir; @@ -722,10 +722,10 @@ namespace KviKvsCoreFunctions // not fail unless /trunload is explicitly used // This will avoid trashing the user's disk too much // when a catalogue for a given language is not available - translation = __tr2qs_ctx_no_xgettext(szString,szCatalogue); + translation = __tr2qs_ctx_no_xgettext(szString.utf8().data(),szCatalogue.utf8().data()); } } else { - translation = __tr2qs_no_xgettext(szString); + translation = __tr2qs_no_xgettext(szString.utf8().data()); } // epilogue: set the return value diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp index 66d3d969..41185641 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp @@ -54,7 +54,7 @@ #include "kvi_tal_tooltip.h" // kvi_app.cpp -extern KviPointerHashTable<const char *,KviWindow> * g_pGlobalWindowDict; +extern KviPointerHashTable<TQString,KviWindow> * g_pGlobalWindowDict; namespace KviKvsCoreSimpleCommands { @@ -119,7 +119,7 @@ namespace KviKvsCoreSimpleCommands if(KVSCSC_pSwitches->find('a',"all-networks")) { - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { if(wnd->type()==KVI_WINDOW_TYPE_CONSOLE) @@ -173,7 +173,7 @@ namespace KviKvsCoreSimpleCommands if(KVSCSC_pSwitches->find('a',"all-networks")) { - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { if(wnd->type()==KVI_WINDOW_TYPE_CONSOLE) @@ -409,7 +409,7 @@ namespace KviKvsCoreSimpleCommands return true; } - pButton = (KviScriptUserButton *)(KVSCSC_pWindow->buttonContainer())->child(tbName,"KviWindowScriptButton"); + pButton = (KviScriptUserButton *)(KVSCSC_pWindow->buttonContainer())->child(tbName.utf8().data(),"KviWindowScriptButton"); if(!pButton) { @@ -849,7 +849,7 @@ namespace KviKvsCoreSimpleCommands TQString szWnd; v->asString(szWnd); //#warning "FIXME: the window database is not unicode! (we even could keep integer window id's at this point!)" - pWnd = g_pApp->findWindow(szWnd.utf8().data()); + pWnd = g_pApp->findWindow(szWnd); if(!pWnd) { KVSCSC_pContext->warning(__tr2qs("The argument of the -w switch did not evaluate to a valid window id: using default")); diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp index 2b973b53..10c02f22 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp @@ -509,7 +509,7 @@ namespace KviKvsCoreSimpleCommands // list available options g_pApp->listAvailableOptions(KVSCSC_pWindow); } else { - if(!g_pApp->setOptionValue(szName,szValue))KVSCSC_pContext->warning(__tr2qs("Option setting error: Unknown option or invalid value for option type")); + if(!g_pApp->setOptionValue(szName.utf8().data(),szValue))KVSCSC_pContext->warning(__tr2qs("Option setting error: Unknown option or invalid value for option type")); } return true; @@ -1230,7 +1230,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC_PARAMETER("window_id",KVS_PT_NONEMPTYSTRING,0,szWinId) KVSCSC_PARAMETERS_END - KviWindow * pAux = g_pApp->findWindow(szWinId.utf8().data()); + KviWindow * pAux = g_pApp->findWindow(szWinId); if(pAux)KVSCSC_pContext->setWindow(pAux); else { if(!KVSCSC_pSwitches->find('q',"quiet")) diff --git a/src/kvirc/kvs/kvi_kvs_kernel.cpp b/src/kvirc/kvs/kvi_kvs_kernel.cpp index 4ec97bc0..d2252772 100644 --- a/src/kvirc/kvs/kvi_kvs_kernel.cpp +++ b/src/kvirc/kvs/kvi_kvs_kernel.cpp @@ -140,7 +140,7 @@ void KviKvsKernel::completeCommand(const TQString &szCommandBegin,KviPointerList void KviKvsKernel::completeModuleCommand(const TQString &szModuleName,const TQString &szCommandBegin,KviPointerList<TQString> * pMatches) { - KviModule * pModule = g_pModuleManager->getModule(szModuleName.latin1()); + KviModule * pModule = g_pModuleManager->getModule(szModuleName); if(!pModule)return; KviPointerList<TQString> lModuleMatches; @@ -204,7 +204,7 @@ void KviKvsKernel::completeFunction(const TQString &szFunctionBegin,KviPointerLi void KviKvsKernel::completeModuleFunction(const TQString &szModuleName,const TQString &szCommandBegin,KviPointerList<TQString> * pMatches) { - KviModule * pModule = g_pModuleManager->getModule(szModuleName.latin1()); + KviModule * pModule = g_pModuleManager->getModule(szModuleName); if(!pModule)return; KviPointerList<TQString> lModuleMatches; diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp index 4677f842..6f957657 100644 --- a/src/kvirc/kvs/kvi_kvs_object.cpp +++ b/src/kvirc/kvs/kvi_kvs_object.cpp @@ -1120,7 +1120,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) return true; } - int idx = m_pObject->metaObject()->findProperty(szName,true); + int idx = m_pObject->metaObject()->findProperty(szName.utf8().data(),true); if(idx < 0) { c->warning(__tr2qs("No TQt property named \"%Q\" for object named \"%Q\" of class %Q"),&szName,&m_szName,&(m_pClass->name())); @@ -1133,7 +1133,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) return true; } - TQVariant vv = m_pObject->property(szName); + TQVariant vv = m_pObject->property(szName.utf8().data()); if(!vv.isValid()) { c->warning(__tr2qs("Can't find property named \"%Q\" for object named \"%Q\" of class %Q: the property is indexed and defined but the returned variant is not valid"),&szName,&m_szName,&(m_pClass->name())); @@ -1144,9 +1144,9 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) { TQString szKey; v->asString(szKey); - int val = p->keyToValue(szKey); + int val = p->keyToValue(szKey.utf8().data()); TQVariant var(val); - m_pObject->setProperty(szName,var); + m_pObject->setProperty(szName.utf8().data(),var); return true; } @@ -1162,7 +1162,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) { kvs_int_t i; if(!v->asInteger(i))WRONG_TYPE("integer") - m_pObject->setProperty(szName,TQVariant((int)i)); + m_pObject->setProperty(szName.utf8().data(),TQVariant((int)i)); } break; case TQVariant::UInt: @@ -1170,24 +1170,24 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) kvs_int_t i; if(!v->asInteger(i))WRONG_TYPE("unsigned integer") if(i < 0)WRONG_TYPE("unsigned integer") - m_pObject->setProperty(szName,TQVariant((unsigned int)i)); + m_pObject->setProperty(szName.utf8().data(),TQVariant((unsigned int)i)); } break; case TQVariant::Bool: - m_pObject->setProperty(szName,TQVariant(v->asBoolean())); + m_pObject->setProperty(szName.utf8().data(),TQVariant(v->asBoolean())); break; case TQVariant::String: { TQString s; v->asString(s); - m_pObject->setProperty(szName,TQVariant(s)); + m_pObject->setProperty(szName.utf8().data(),TQVariant(s)); } break; case TQVariant::CString: { TQString s; v->asString(s); - m_pObject->setProperty(szName,TQVariant(s.utf8())); + m_pObject->setProperty(szName.utf8().data(),TQVariant(s.utf8().data())); } break; case TQVariant::Point: @@ -1199,7 +1199,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(!x || !y)WRONG_TYPE("array(integer,integer)") kvs_int_t iX,iY; if(!x->asInteger(iX) || !y->asInteger(iY))WRONG_TYPE("array(integer,integer)") - m_pObject->setProperty(szName,TQVariant(TQPoint(iX,iY))); + m_pObject->setProperty(szName.utf8().data(),TQVariant(TQPoint(iX,iY))); } break; case TQVariant::Size: @@ -1211,7 +1211,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(!w || !h)WRONG_TYPE("array(integer,integer)") kvs_int_t iW,iH; if(!w->asInteger(iW) || !h->asInteger(iH))WRONG_TYPE("array(integer,integer)") - m_pObject->setProperty(szName,TQVariant(TQSize(iW,iH))); + m_pObject->setProperty(szName.utf8().data(),TQVariant(TQSize(iW,iH))); } break; case TQVariant::Rect: @@ -1225,7 +1225,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(!x || !y || !w || !h)WRONG_TYPE("array(integer,integer,integer,integer)") kvs_int_t iX,iY,iW,iH; if(!x->asInteger(iX) || !y->asInteger(iY) || !w->asInteger(iW) || !h->asInteger(iH))WRONG_TYPE("array(integer,integer,integer,integer)") - m_pObject->setProperty(szName,TQVariant(TQRect(iX,iY,iW,iH))); + m_pObject->setProperty(szName.utf8().data(),TQVariant(TQRect(iX,iY,iW,iH))); } break; case TQVariant::Color: @@ -1238,7 +1238,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(!r || !g || !b)WRONG_TYPE("array(integer,integer,integer)") kvs_int_t iR,iG,iB; if(!r->asInteger(iR) || !g->asInteger(iG) || !b->asInteger(iB))WRONG_TYPE("array(integer,integer,integer)") - m_pObject->setProperty(szName,TQVariant(TQColor(iR,iG,iB))); + m_pObject->setProperty(szName.utf8().data(),TQVariant(TQColor(iR,iG,iB))); } break; case TQVariant::Font: @@ -1263,7 +1263,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(szFl.find('o') != -1)fnt.setOverline(true); if(szFl.find('f') != -1)fnt.setFixedPitch(true); if(szFl.find('s') != -1)fnt.setStrikeOut(true); - m_pObject->setProperty(szName,TQVariant(fnt)); + m_pObject->setProperty(szName.utf8().data(),TQVariant(fnt)); } break; case TQVariant::Pixmap: @@ -1275,9 +1275,9 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) { // null pixmap if(vv.type() == TQVariant::Pixmap) - m_pObject->setProperty(szName,TQVariant(TQPixmap())); + m_pObject->setProperty(szName.utf8().data(),TQVariant(TQPixmap())); else - m_pObject->setProperty(szName,TQVariant(TQIconSet())); + m_pObject->setProperty(szName.utf8().data(),TQVariant(TQIconSet())); } else { KviKvsObject * pix = KviKvsKernel::instance()->objectController()->lookupObject(v->hobject()); if(!pix->inherits("KviScriptPixmapObject")) @@ -1285,9 +1285,9 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) else { TQVariant pixv = pix->property("pixmap"); if(vv.type() == TQVariant::Pixmap) - m_pObject->setProperty(szName,pixv); + m_pObject->setProperty(szName.utf8().data(),pixv); else - m_pObject->setProperty(szName,TQVariant(TQIconSet(pixv.toPixmap()))); + m_pObject->setProperty(szName.utf8().data(),TQVariant(TQIconSet(pixv.toPixmap()))); } } } else { @@ -1297,9 +1297,9 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(pPix) { if(vv.type() == TQVariant::Pixmap) - m_pObject->setProperty(szName,TQVariant(*pPix)); + m_pObject->setProperty(szName.utf8().data(),TQVariant(*pPix)); else - m_pObject->setProperty(szName,TQVariant(TQIconSet(*pPix))); + m_pObject->setProperty(szName.utf8().data(),TQVariant(TQIconSet(*pPix))); } else c->warning(__tr2qs("Can't find the requested image")); @@ -1335,7 +1335,7 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c) return true; } - int idx = m_pObject->metaObject()->findProperty(szName,true); + int idx = m_pObject->metaObject()->findProperty(szName.utf8().data(),true); if(idx < 0) { if (bNoerror) c->returnValue()->setString("No TQt properties"); @@ -1354,7 +1354,7 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c) return true; } - TQVariant v = m_pObject->property(szName); + TQVariant v = m_pObject->property(szName.utf8().data()); if(!v.isValid()) { c->warning(__tr2qs("Can't find property named \"%Q\" for object named \"%Q\" of class %Q: the property is indexed and defined but the returned variant is not valid"),&szName,&m_szName,&(m_pClass->name())); diff --git a/src/kvirc/kvs/kvi_kvs_script.cpp b/src/kvirc/kvs/kvi_kvs_script.cpp index 064b7aee..27fb323a 100644 --- a/src/kvirc/kvs/kvi_kvs_script.cpp +++ b/src/kvirc/kvs/kvi_kvs_script.cpp @@ -123,10 +123,10 @@ bool KviKvsScript::locked() const return m_pData->m_uLock > 0; } -void KviKvsScript::dump(const char * prefix) +void KviKvsScript::dump(const TQString &prefix) { if(m_pData->m_pTree)m_pData->m_pTree->dump(prefix); - else tqDebug("%s KviKvsScript : no tree to dump",prefix); + else tqDebug("%s KviKvsScript : no tree to dump",prefix.local8Bit().data()); } void KviKvsScript::detach() diff --git a/src/kvirc/kvs/kvi_kvs_script.h b/src/kvirc/kvs/kvi_kvs_script.h index 60e96a08..c1a6f77c 100644 --- a/src/kvirc/kvs/kvi_kvs_script.h +++ b/src/kvirc/kvs/kvi_kvs_script.h @@ -129,7 +129,7 @@ public: static int evaluate(const TQString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams,KviKvsVariant * pRetVal); static int evaluateAsString(const TQString &szCode,KviWindow * pWindow,KviKvsVariantList * pParams,TQString &szRetVal); public: - void dump(const char * prefix); + void dump(const TQString &prefix); protected: // returns true after a succesfull parsing // pOutput is useful only for printing errors diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp index cc309d81..d1cebb18 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp @@ -47,13 +47,13 @@ void KviKvsTreeNodeAliasFunctionCall::contextDescription(TQString &szBuffer) -void KviKvsTreeNodeAliasFunctionCall::dump(const char * prefix) +void KviKvsTreeNodeAliasFunctionCall::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s AliasFunctionCall(%s)",prefix,m_szFunctionName.utf8().data()); + tqDebug("%s AliasFunctionCall(%s)",prefix.local8Bit().data(),m_szFunctionName.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pParams->dump(tmp.utf8().data()); + m_pParams->dump(tmp); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.h index af0770fc..6e352b13 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.h @@ -37,7 +37,7 @@ public: KviKvsTreeNodeAliasFunctionCall(const TQChar * pLocation,const TQString &szAliasName,KviKvsTreeNodeDataList * pParams); ~KviKvsTreeNodeAliasFunctionCall(); public: - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual void contextDescription(TQString &szBuffer); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp index 1396250f..5bea0e41 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp @@ -52,9 +52,9 @@ void KviKvsTreeNodeAliasSimpleCommand::contextDescription(TQString &szBuffer) KviTQString::sprintf(szBuffer,"Alias Simple Command \"%Q\"",&m_szCmdName); } -void KviKvsTreeNodeAliasSimpleCommand::dump(const char * prefix) +void KviKvsTreeNodeAliasSimpleCommand::dump(const TQString &prefix) { - tqDebug("%s AliasSimpleCommand(%s)",prefix,m_szCmdName.utf8().data()); + tqDebug("%s AliasSimpleCommand(%s)",prefix.local8Bit().data(),m_szCmdName.local8Bit().data()); dumpSwitchList(prefix); dumpParameterList(prefix); } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.h b/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.h index 34a1a246..65183724 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.h @@ -38,7 +38,7 @@ public: ~KviKvsTreeNodeAliasSimpleCommand(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arraycount.cpp b/src/kvirc/kvs/kvi_kvs_treenode_arraycount.cpp index 50d11e97..97fceb3b 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arraycount.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_arraycount.cpp @@ -45,10 +45,10 @@ void KviKvsTreeNodeArrayCount::contextDescription(TQString &szBuffer) szBuffer = "Array Count Operator"; } -void KviKvsTreeNodeArrayCount::dump(const char * prefix) +void KviKvsTreeNodeArrayCount::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s ArrayCount",prefix); + tqDebug("%s ArrayCount",prefix.local8Bit().data()); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arraycount.h b/src/kvirc/kvs/kvi_kvs_treenode_arraycount.h index 87ce7217..4fb43f90 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arraycount.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_arraycount.h @@ -39,7 +39,7 @@ public: ~KviKvsTreeNodeArrayCount(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject *o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp b/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp index 7f85813b..6d6f1c40 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp @@ -52,14 +52,14 @@ void KviKvsTreeNodeArrayElement::contextDescription(TQString &szBuffer) szBuffer = "Array Element Evaluation"; } -void KviKvsTreeNodeArrayElement::dump(const char * prefix) +void KviKvsTreeNodeArrayElement::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s ArrayElement",prefix); + tqDebug("%s ArrayElement",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pSource->dump(tmp.utf8().data()); - m_pIndex->dump(tmp.utf8().data()); + m_pSource->dump(tmp); + m_pIndex->dump(tmp); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.h b/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.h index 1d472032..7a40d1b0 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.h @@ -42,7 +42,7 @@ protected: KviKvsTreeNodeExpression * m_pIndex; // can't be null public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject *o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp b/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp index 6d4fea2e..2c66c8da 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp @@ -51,10 +51,10 @@ void KviKvsTreeNodeArrayReferenceAssert::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeArrayReferenceAssert::dump(const char * prefix) +void KviKvsTreeNodeArrayReferenceAssert::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s ArrayReferenceAssert",prefix); + tqDebug("%s ArrayReferenceAssert",prefix.local8Bit().data()); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.h b/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.h index 663068a8..436958c7 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.h @@ -43,7 +43,7 @@ protected: public: virtual bool isReadOnly(); virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject *o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_base.h b/src/kvirc/kvs/kvi_kvs_treenode_base.h index 62f5314c..519973dc 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_base.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_base.h @@ -44,7 +44,7 @@ protected: public: KviKvsTreeNode * parent(){ return m_pParent; }; const TQChar * location(){ return m_pLocation; }; - virtual void dump(const char * prefix) = 0; + virtual void dump(const TQString &prefix) = 0; virtual void contextDescription(TQString &szBuffer) = 0; }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp index a32c9092..80cd34fb 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp @@ -46,13 +46,13 @@ void KviKvsTreeNodeBaseObjectFunctionCall::contextDescription(TQString &szBuffer KviTQString::sprintf(szBuffer,"Base Object Function Call \"%s::%s\"",&m_szBaseClass,&m_szFunctionName); } -void KviKvsTreeNodeBaseObjectFunctionCall::dump(const char * prefix) +void KviKvsTreeNodeBaseObjectFunctionCall::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s BaseObjectFunctionCall(%s::%s)",prefix,m_szBaseClass.utf8().data(),m_szFunctionName.utf8().data()); + tqDebug("%s BaseObjectFunctionCall(%s::%s)",prefix.local8Bit().data(),m_szBaseClass.local8Bit().data(),m_szFunctionName.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pParams->dump(tmp.utf8().data()); + m_pParams->dump(tmp); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.h index 1b8df699..5ff6b621 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.h @@ -42,7 +42,7 @@ protected: TQString m_szBaseClass; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject * o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.cpp index 53e85eba..ef0c461a 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.cpp @@ -52,22 +52,22 @@ void KviKvsTreeNodeCallbackCommand::contextDescription(TQString &szBuffer) KviTQString::sprintf(szBuffer,"Callback Command \"%s\"",&m_szCmdName); } -void KviKvsTreeNodeCallbackCommand::dump(const char * prefix) +void KviKvsTreeNodeCallbackCommand::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s CallbackCommand(%s)",prefix,m_szCmdName.utf8().data()); + tqDebug("%s CallbackCommand(%s)",prefix.local8Bit().data(),m_szCmdName.local8Bit().data()); dumpSwitchList(prefix); dumpParameterList(prefix); dumpCallback(prefix); #endif } -void KviKvsTreeNodeCallbackCommand::dumpCallback(const char * prefix) +void KviKvsTreeNodeCallbackCommand::dumpCallback(const TQString &prefix) { #ifdef COMPILE_NEW_KVS TQString tmp = prefix; tmp.append(" "); - m_pCallback->dump(tmp.utf8().data()); + m_pCallback->dump(tmp); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.h b/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.h index 73b125b2..a2ac753f 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.h @@ -40,8 +40,8 @@ protected: KviKvsScript * m_pCallback; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); - void dumpCallback(const char * prefix); + virtual void dump(const TQString &prefix); + void dumpCallback(const TQString &prefix); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_command.cpp b/src/kvirc/kvs/kvi_kvs_treenode_command.cpp index bb1457dc..073c1579 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_command.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_command.cpp @@ -52,21 +52,21 @@ void KviKvsTreeNodeCommand::contextDescription(TQString &szBuffer) #endif } -void KviKvsTreeNodeCommand::dump(const char * prefix) +void KviKvsTreeNodeCommand::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s Command(%s)",prefix,m_szCmdName.utf8().data()); + tqDebug("%s Command(%s)",prefix.local8Bit().data(),m_szCmdName.local8Bit().data()); dumpSwitchList(prefix); #endif } -void KviKvsTreeNodeCommand::dumpSwitchList(const char * prefix) +void KviKvsTreeNodeCommand::dumpSwitchList(const TQString &prefix) { #ifdef COMPILE_NEW_KVS if(!m_pSwitches)return; TQString tmp = prefix; tmp.append(" "); - m_pSwitches->dump(tmp.utf8().data()); + m_pSwitches->dump(tmp); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_command.h b/src/kvirc/kvs/kvi_kvs_treenode_command.h index aff3f552..a8893120 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_command.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_command.h @@ -43,8 +43,8 @@ protected: KviKvsTreeNodeSwitchList * m_pSwitches; // MAY BE 0! public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); - void dumpSwitchList(const char * prefix); + virtual void dump(const TQString &prefix); + void dumpSwitchList(const TQString &prefix); const TQString & commandName(){ return m_szCmdName; }; protected: void setSwitchList(KviKvsTreeNodeSwitchList * sw); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.cpp b/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.cpp index 2c83b9b2..e0e30fe4 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.cpp @@ -47,20 +47,20 @@ void KviKvsTreeNodeCommandWithParameters::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeCommandWithParameters::dump(const char * prefix) +void KviKvsTreeNodeCommandWithParameters::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s CommandWithParameters(%s)",prefix,m_szCmdName.utf8().data()); + tqDebug("%s CommandWithParameters(%s)",prefix.local8Bit().data(),m_szCmdName.local8Bit().data()); dumpSwitchList(prefix); dumpParameterList(prefix); #endif } -void KviKvsTreeNodeCommandWithParameters::dumpParameterList(const char * prefix) +void KviKvsTreeNodeCommandWithParameters::dumpParameterList(const TQString &prefix) { #ifdef COMPILE_NEW_KVS TQString tmp = prefix; tmp.append(" "); - m_pParams->dump(tmp.utf8().data()); + m_pParams->dump(tmp); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.h b/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.h index f8991fee..5247a20c 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.h @@ -42,8 +42,8 @@ protected: public: KviKvsTreeNodeDataList * params(){ return m_pParams; }; virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); - void dumpParameterList(const char * prefix); + virtual void dump(const TQString &prefix); + void dumpParameterList(const TQString &prefix); }; #endif //!_KVI_KVS_TREENODE_COMMANDWITHPARAMETERS_H_ diff --git a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp index 756af49c..f654f517 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp @@ -73,14 +73,14 @@ void KviKvsTreeNodeCompositeData::contextDescription(TQString &szBuffer) szBuffer = "Composite Data Evaluation (Implicit String Cast)"; } -void KviKvsTreeNodeCompositeData::dump(const char * prefix) +void KviKvsTreeNodeCompositeData::dump(const TQString &prefix) { - tqDebug("%s CompositeData",prefix); + tqDebug("%s CompositeData",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); for(KviKvsTreeNodeData * p = m_pSubData->first();p;p = m_pSubData->next()) { - p->dump(tmp.utf8().data()); + p->dump(tmp); } } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.h b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.h index 065a4a7e..7875e027 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.h @@ -41,7 +41,7 @@ public: virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_constantdata.cpp b/src/kvirc/kvs/kvi_kvs_treenode_constantdata.cpp index 08d8f1db..35ba39f0 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_constantdata.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_constantdata.cpp @@ -65,12 +65,12 @@ bool KviKvsTreeNodeConstantData::convertStringConstantToNumeric() return true; } -void KviKvsTreeNodeConstantData::dump(const char * prefix) +void KviKvsTreeNodeConstantData::dump(const TQString &prefix) { - tqDebug("%s ConstantData",prefix); + tqDebug("%s ConstantData",prefix.local8Bit().data()); TQString tmp = prefix; tmp.prepend(" "); - m_pValue->dump(tmp.utf8().data()); + m_pValue->dump(tmp); } bool KviKvsTreeNodeConstantData::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_constantdata.h b/src/kvirc/kvs/kvi_kvs_treenode_constantdata.h index 489caac5..c6602a76 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_constantdata.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_constantdata.h @@ -41,7 +41,7 @@ public: virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant *pBuffer); virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool convertStringConstantToNumeric(); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.cpp index b4a21b49..98400a77 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.cpp @@ -46,9 +46,9 @@ void KviKvsTreeNodeCoreCallbackCommand::contextDescription(TQString &szBuffer) KviTQString::sprintf(szBuffer,"Core Callback Command \"%Q\"",&m_szCmdName); } -void KviKvsTreeNodeCoreCallbackCommand::dump(const char * prefix) +void KviKvsTreeNodeCoreCallbackCommand::dump(const TQString &prefix) { - tqDebug("%s CoreCallbackCommand(%s)",prefix,m_szCmdName.utf8().data()); + tqDebug("%s CoreCallbackCommand(%s)",prefix.local8Bit().data(),m_szCmdName.local8Bit().data()); dumpSwitchList(prefix); dumpParameterList(prefix); dumpCallback(prefix); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.h b/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.h index 499db2b3..f92658bb 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.h @@ -43,7 +43,7 @@ protected: KviKvsCoreCallbackCommandExecRoutine * m_pExecRoutine; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.cpp index 23bf13d3..40738da4 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.cpp @@ -43,12 +43,12 @@ void KviKvsTreeNodeCoreFunctionCall::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeCoreFunctionCall::dump(const char * prefix) +void KviKvsTreeNodeCoreFunctionCall::dump(const TQString &prefix) { - tqDebug("%s CoreFunctionCall(%s)",prefix,m_szFunctionName.utf8().data()); + tqDebug("%s CoreFunctionCall(%s)",prefix.local8Bit().data(),m_szFunctionName.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pParams->dump(tmp.utf8().data()); + m_pParams->dump(tmp); } bool KviKvsTreeNodeCoreFunctionCall::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.h index 9cbf18db..58cfa679 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.h @@ -41,7 +41,7 @@ protected: KviKvsCoreFunctionExecRoutine * m_pExecRoutine; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.cpp index 064c29d0..bd5549bd 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.cpp @@ -45,9 +45,9 @@ void KviKvsTreeNodeCoreSimpleCommand::contextDescription(TQString &szBuffer) KviTQString::sprintf(szBuffer,"Core Simple Command \"%Q\"",&m_szCmdName); } -void KviKvsTreeNodeCoreSimpleCommand::dump(const char * prefix) +void KviKvsTreeNodeCoreSimpleCommand::dump(const TQString &prefix) { - tqDebug("%s CoreSimpleCommand(%s)",prefix,m_szCmdName.utf8().data()); + tqDebug("%s CoreSimpleCommand(%s)",prefix.local8Bit().data(),m_szCmdName.local8Bit().data()); dumpSwitchList(prefix); dumpParameterList(prefix); } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.h b/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.h index 290b0cf6..b23cdd7b 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.h @@ -41,7 +41,7 @@ private: KviKvsCoreSimpleCommandExecRoutine * m_pExecRoutine; // shallow pointer! public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_data.cpp b/src/kvirc/kvs/kvi_kvs_treenode_data.cpp index f1b34863..00bfb3bb 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_data.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_data.cpp @@ -43,9 +43,9 @@ void KviKvsTreeNodeData::contextDescription(TQString &szBuffer) szBuffer = "Data Evaluation"; } -void KviKvsTreeNodeData::dump(const char * prefix) +void KviKvsTreeNodeData::dump(const TQString &prefix) { - tqDebug("%s Data",prefix); + tqDebug("%s Data",prefix.local8Bit().data()); } bool KviKvsTreeNodeData::isReadOnly() diff --git a/src/kvirc/kvs/kvi_kvs_treenode_data.h b/src/kvirc/kvs/kvi_kvs_treenode_data.h index 18d8d7b4..c9978f07 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_data.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_data.h @@ -49,7 +49,7 @@ public: virtual KviKvsRWEvaluationResult * evaluateReadWriteInObjectScope(KviKvsObject * o,KviKvsRunTimeContext * c); // error by default virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool isReadOnly(); // true by default virtual bool canEvaluateToObjectReference(); // no by default diff --git a/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp b/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp index f086029a..07287353 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp @@ -65,14 +65,14 @@ void KviKvsTreeNodeDataList::contextDescription(TQString &szBuffer) szBuffer = "Data List Evaluation"; } -void KviKvsTreeNodeDataList::dump(const char * prefix) +void KviKvsTreeNodeDataList::dump(const TQString &prefix) { - tqDebug("%s DataList",prefix); + tqDebug("%s DataList",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); for(KviKvsTreeNodeData * t = m_pDataList->first();t;t = m_pDataList->next()) { - t->dump(tmp.utf8().data()); + t->dump(tmp); } } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_datalist.h b/src/kvirc/kvs/kvi_kvs_treenode_datalist.h index 50c2f640..50c35b54 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_datalist.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_datalist.h @@ -51,7 +51,7 @@ public: bool evaluate(KviKvsRunTimeContext * c,KviKvsVariantList * pBuffer); virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); }; #endif //!_KVI_KVS_TREENODE_DATALIST_H_ diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp b/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp index db91bf31..9e8f4529 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp @@ -45,9 +45,9 @@ void KviKvsTreeNodeExpression::contextDescription(TQString &szBuffer) szBuffer = "Expression Evaluation"; } -void KviKvsTreeNodeExpression::dump(const char * prefix) +void KviKvsTreeNodeExpression::dump(const TQString &prefix) { - tqDebug("%s Expression",prefix); + tqDebug("%s Expression",prefix.local8Bit().data()); } int KviKvsTreeNodeExpression::precedence() @@ -110,12 +110,12 @@ void KviKvsTreeNodeExpressionVariableOperand::contextDescription(TQString &szBuf szBuffer = "Expression Variable Operand Evaluation"; } -void KviKvsTreeNodeExpressionVariableOperand::dump(const char * prefix) +void KviKvsTreeNodeExpressionVariableOperand::dump(const TQString &prefix) { - tqDebug("%s ExpressionVariableOperand",prefix); + tqDebug("%s ExpressionVariableOperand",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pData->dump(tmp.utf8().data()); + m_pData->dump(tmp); } bool KviKvsTreeNodeExpressionVariableOperand::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) @@ -149,13 +149,13 @@ void KviKvsTreeNodeExpressionConstantOperand::contextDescription(TQString &szBuf } -void KviKvsTreeNodeExpressionConstantOperand::dump(const char * prefix) +void KviKvsTreeNodeExpressionConstantOperand::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s ExpressionConstantOperand",prefix); + tqDebug("%s ExpressionConstantOperand",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pConstant->dump(tmp.utf8().data()); + m_pConstant->dump(tmp); #endif } @@ -187,10 +187,10 @@ void KviKvsTreeNodeExpressionOperator::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeExpressionOperator::dump(const char * prefix) +void KviKvsTreeNodeExpressionOperator::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s ExpressionOperator",prefix); + tqDebug("%s ExpressionOperator",prefix.local8Bit().data()); #endif } @@ -226,13 +226,13 @@ void KviKvsTreeNodeExpressionUnaryOperator::contextDescription(TQString &szBuffe -void KviKvsTreeNodeExpressionUnaryOperator::dump(const char * prefix) +void KviKvsTreeNodeExpressionUnaryOperator::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s ExpressionUnaryOperator",prefix); + tqDebug("%s ExpressionUnaryOperator",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pData->dump(tmp.utf8().data()); + m_pData->dump(tmp); #endif } @@ -272,13 +272,13 @@ void KviKvsTreeNodeExpressionUnaryOperatorNegate::contextDescription(TQString &s } -void KviKvsTreeNodeExpressionUnaryOperatorNegate::dump(const char * prefix) +void KviKvsTreeNodeExpressionUnaryOperatorNegate::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s ExpressionUnaryOperatorNegate",prefix); + tqDebug("%s ExpressionUnaryOperatorNegate",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pData->dump(tmp.utf8().data()); + m_pData->dump(tmp); #endif } @@ -317,13 +317,13 @@ void KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::contextDescription(TQStrin #endif } -void KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::dump(const char * prefix) +void KviKvsTreeNodeExpressionUnaryOperatorBitwiseNot::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s ExpressionUnaryOperatorBitwiseNot",prefix); + tqDebug("%s ExpressionUnaryOperatorBitwiseNot",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pData->dump(tmp.utf8().data()); + m_pData->dump(tmp); #endif } @@ -362,13 +362,13 @@ void KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::contextDescription(TQStrin #endif } -void KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::dump(const char * prefix) +void KviKvsTreeNodeExpressionUnaryOperatorLogicalNot::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s ExpressionUnaryOperatorLogicalNot",prefix); + tqDebug("%s ExpressionUnaryOperatorLogicalNot",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pData->dump(tmp.utf8().data()); + m_pData->dump(tmp); #endif } @@ -454,12 +454,12 @@ void KviKvsTreeNodeExpressionBinaryOperator::setRight(KviKvsTreeNodeExpression * } -void KviKvsTreeNodeExpressionBinaryOperator::dumpOperands(const char * prefix) +void KviKvsTreeNodeExpressionBinaryOperator::dumpOperands(const TQString &prefix) { TQString tmp = prefix; tmp.append(" "); - if(m_pLeft)m_pLeft->dump(tmp.utf8().data()); - if(m_pRight)m_pRight->dump(tmp.utf8().data()); + if(m_pLeft)m_pLeft->dump(tmp); + if(m_pRight)m_pRight->dump(tmp); } void KviKvsTreeNodeExpressionBinaryOperator::contextDescription(TQString &szBuffer) @@ -467,9 +467,9 @@ void KviKvsTreeNodeExpressionBinaryOperator::contextDescription(TQString &szBuff szBuffer = "Expression Binary Operator"; } -void KviKvsTreeNodeExpressionBinaryOperator::dump(const char * prefix) +void KviKvsTreeNodeExpressionBinaryOperator::dump(const TQString &prefix) { - tqDebug("%s ExpressionBinaryOperator",prefix); + tqDebug("%s ExpressionBinaryOperator",prefix.local8Bit().data()); dumpOperands(prefix); } @@ -480,7 +480,7 @@ void KviKvsTreeNodeExpressionBinaryOperator::dump(const char * prefix) __name::__name(const TQChar * pLocation) \ : KviKvsTreeNodeExpressionBinaryOperator(pLocation){} \ __name::~__name(){} \ - void __name::dump(const char * prefix){ tqDebug("%s " __stringname,prefix); dumpOperands(prefix); } \ + void __name::dump(const TQString &prefix){ tqDebug("%s " __stringname,prefix.local8Bit().data()); dumpOperands(prefix); } \ void __name::contextDescription(TQString &szBuffer){ szBuffer = __contextdescription; } \ int __name::precedence(){ return __precedence; }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expression.h b/src/kvirc/kvs/kvi_kvs_treenode_expression.h index d4fb3553..37c80e0e 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_expression.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_expression.h @@ -77,7 +77,7 @@ protected: KviKvsTreeNodeExpression * m_pParentExpression; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual int precedence(); virtual KviKvsTreeNodeExpression * left(); virtual KviKvsTreeNodeExpression * right(); @@ -99,7 +99,7 @@ protected: KviKvsTreeNodeData * m_pData; // can't be null public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); }; @@ -113,7 +113,7 @@ public: KviKvsVariant * m_pConstant; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); }; @@ -136,7 +136,7 @@ public: ~KviKvsTreeNodeExpressionOperator(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); }; class KVIRC_API KviKvsTreeNodeExpressionUnaryOperator : public KviKvsTreeNodeExpressionOperator @@ -149,7 +149,7 @@ protected: KviKvsNumber m_nData; // result of the number evaluation public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); bool evaluateOperand(KviKvsRunTimeContext * c); }; @@ -161,7 +161,7 @@ public: public: virtual int precedence(); virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); }; @@ -173,7 +173,7 @@ public: public: virtual int precedence(); virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); }; @@ -185,7 +185,7 @@ public: public: virtual int precedence(); virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); }; @@ -206,9 +206,9 @@ public: void setRight(KviKvsTreeNodeExpression * pRight); virtual int firstBinaryOperator(); public: - void dumpOperands(const char * prefix); + void dumpOperands(const TQString &prefix); virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); protected: bool evaluateOperands(KviKvsRunTimeContext * c); }; @@ -221,7 +221,7 @@ protected: ~__name(); \ public: \ virtual void contextDescription(TQString &szBuffer); \ - virtual void dump(const char * prefix); \ + virtual void dump(const TQString &prefix); \ virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); \ virtual int precedence(); \ } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.cpp b/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.cpp index d963decc..bd75f4b4 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.cpp @@ -52,13 +52,13 @@ void KviKvsTreeNodeExpressionReturn::contextDescription(TQString &szBuffer) #endif } -void KviKvsTreeNodeExpressionReturn::dump(const char * prefix) +void KviKvsTreeNodeExpressionReturn::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s ExpressionReturn",prefix); + tqDebug("%s ExpressionReturn",prefix.local8Bit().data()); TQString tmp = prefix; tmp += " "; - m_pExpression->dump(tmp.utf8().data()); + m_pExpression->dump(tmp); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.h b/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.h index 7654c537..6d6a3732 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.h @@ -38,7 +38,7 @@ protected: KviKvsTreeNodeExpression * m_pExpression; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp index 38949fef..485fe524 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp @@ -44,9 +44,9 @@ void KviKvsTreeNodeExtendedScopeVariable::contextDescription(TQString &szBuffer) szBuffer += "\""; } -void KviKvsTreeNodeExtendedScopeVariable::dump(const char * prefix) +void KviKvsTreeNodeExtendedScopeVariable::dump(const TQString &prefix) { - tqDebug("%s ExtendedScopeVariable(%s)",prefix,m_szIdentifier.utf8().data()); + tqDebug("%s ExtendedScopeVariable(%s)",prefix.local8Bit().data(),m_szIdentifier.local8Bit().data()); } bool KviKvsTreeNodeExtendedScopeVariable::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.h b/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.h index 84fadc8b..aa1e605a 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.h @@ -37,7 +37,7 @@ public: ~KviKvsTreeNodeExtendedScopeVariable(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_functioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_functioncall.cpp index cfe9d324..1f620b77 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_functioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_functioncall.cpp @@ -45,9 +45,9 @@ void KviKvsTreeNodeFunctionCall::contextDescription(TQString &szBuffer) szBuffer = "Function Call"; } -void KviKvsTreeNodeFunctionCall::dump(const char * prefix) +void KviKvsTreeNodeFunctionCall::dump(const TQString &prefix) { - tqDebug("%s FunctionCall",prefix); + tqDebug("%s FunctionCall",prefix.local8Bit().data()); } bool KviKvsTreeNodeFunctionCall::canEvaluateToObjectReference() diff --git a/src/kvirc/kvs/kvi_kvs_treenode_functioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_functioncall.h index c4378109..0f3f31da 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_functioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_functioncall.h @@ -38,7 +38,7 @@ protected: KviKvsTreeNodeDataList * m_pParams; // never 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool canEvaluateToObjectReference(); // yes virtual bool isFunctionCall(); // yes }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp index 20d8594d..0636d8bb 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp @@ -43,9 +43,9 @@ void KviKvsTreeNodeGlobalVariable::contextDescription(TQString &szBuffer) szBuffer += "\""; } -void KviKvsTreeNodeGlobalVariable::dump(const char * prefix) +void KviKvsTreeNodeGlobalVariable::dump(const TQString &prefix) { - tqDebug("%s GlobalVariable(%s)",prefix,m_szIdentifier.utf8().data()); + tqDebug("%s GlobalVariable(%s)",prefix.local8Bit().data(),m_szIdentifier.local8Bit().data()); } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.h b/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.h index a30430a4..2790f8d0 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.h @@ -37,7 +37,7 @@ public: ~KviKvsTreeNodeGlobalVariable(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashcount.cpp b/src/kvirc/kvs/kvi_kvs_treenode_hashcount.cpp index ee2a7c33..b48d4610 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_hashcount.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_hashcount.cpp @@ -47,10 +47,10 @@ void KviKvsTreeNodeHashCount::contextDescription(TQString &szBuffer) #endif } -void KviKvsTreeNodeHashCount::dump(const char * prefix) +void KviKvsTreeNodeHashCount::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s HashCount",prefix); + tqDebug("%s HashCount",prefix.local8Bit().data()); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashcount.h b/src/kvirc/kvs/kvi_kvs_treenode_hashcount.h index 9119bdee..f7a349e2 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_hashcount.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_hashcount.h @@ -39,7 +39,7 @@ public: ~KviKvsTreeNodeHashCount(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject *o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp b/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp index e5dec4e5..a96f92e8 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp @@ -54,14 +54,14 @@ void KviKvsTreeNodeHashElement::contextDescription(TQString &szBuffer) #endif } -void KviKvsTreeNodeHashElement::dump(const char * prefix) +void KviKvsTreeNodeHashElement::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s HashElement",prefix); + tqDebug("%s HashElement",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pSource->dump(tmp.utf8().data()); - m_pKey->dump(tmp.utf8().data()); + m_pSource->dump(tmp); + m_pKey->dump(tmp); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.h b/src/kvirc/kvs/kvi_kvs_treenode_hashelement.h index ce36d124..161ef8e0 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_hashelement.h @@ -41,7 +41,7 @@ protected: KviKvsTreeNodeData * m_pKey; // can't be null public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject *o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp b/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp index 18889a11..8b37a744 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp @@ -51,10 +51,10 @@ void KviKvsTreeNodeHashReferenceAssert::contextDescription(TQString &szBuffer) #endif } -void KviKvsTreeNodeHashReferenceAssert::dump(const char * prefix) +void KviKvsTreeNodeHashReferenceAssert::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s HashReferenceAssert",prefix); + tqDebug("%s HashReferenceAssert",prefix.local8Bit().data()); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.h b/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.h index e97de6d3..68244b81 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.h @@ -43,7 +43,7 @@ protected: public: virtual bool isReadOnly(); virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject *o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instruction.cpp b/src/kvirc/kvs/kvi_kvs_treenode_instruction.cpp index 4d1b6403..51667c8e 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_instruction.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_instruction.cpp @@ -33,10 +33,10 @@ void KviKvsTreeNodeInstruction::contextDescription(TQString &szBuffer) #endif } -void KviKvsTreeNodeInstruction::dump(const char * prefix) +void KviKvsTreeNodeInstruction::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s Instruction",prefix); + tqDebug("%s Instruction",prefix.local8Bit().data()); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instruction.h b/src/kvirc/kvs/kvi_kvs_treenode_instruction.h index 8326b2e6..ae668518 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_instruction.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_instruction.h @@ -38,7 +38,7 @@ public: ~KviKvsTreeNodeInstruction(){}; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); // execute() is the main entry point to the tree visit // execute() returns false when the tree visiting has diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp b/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp index 87437b5d..37d39955 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp @@ -45,14 +45,14 @@ void KviKvsTreeNodeInstructionBlock::contextDescription(TQString &szBuffer) szBuffer = "Instruction Block"; } -void KviKvsTreeNodeInstructionBlock::dump(const char * prefix) +void KviKvsTreeNodeInstructionBlock::dump(const TQString &prefix) { - tqDebug("%s InstructionBlock",prefix); + tqDebug("%s InstructionBlock",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); for(KviKvsTreeNodeInstruction * i = m_pInstructionList->first();i;i = m_pInstructionList->next()) { - i->dump(tmp.utf8().data()); + i->dump(tmp); } } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h b/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h index 659aab5f..e876def7 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h @@ -45,7 +45,7 @@ public: void addInstruction(KviKvsTreeNodeInstruction * i); KviKvsTreeNodeInstruction * releaseFirst(); virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp index 36b76545..e5689faf 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp @@ -45,10 +45,10 @@ void KviKvsTreeNodeLocalVariable::contextDescription(TQString &szBuffer) #endif } -void KviKvsTreeNodeLocalVariable::dump(const char * prefix) +void KviKvsTreeNodeLocalVariable::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s LocalVariable(%s)",prefix,m_szIdentifier.utf8().data()); + tqDebug("%s LocalVariable(%s)",prefix.local8Bit().data(),m_szIdentifier.local8Bit().data()); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.h b/src/kvirc/kvs/kvi_kvs_treenode_localvariable.h index 4200fbc0..e6c5f07d 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_localvariable.h @@ -37,7 +37,7 @@ public: ~KviKvsTreeNodeLocalVariable(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pResult); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp index 8df45a3f..ea8530ce 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp @@ -53,9 +53,9 @@ void KviKvsTreeNodeModuleCallbackCommand::contextDescription(TQString &szBuffer) szBuffer += "\""; } -void KviKvsTreeNodeModuleCallbackCommand::dump(const char * prefix) +void KviKvsTreeNodeModuleCallbackCommand::dump(const TQString &prefix) { - tqDebug("%s ModuleCallbackCommand(%s.%s)",prefix,m_szModuleName.utf8().data(),m_szCmdName.utf8().data()); + tqDebug("%s ModuleCallbackCommand(%s.%s)",prefix.local8Bit().data(),m_szModuleName.local8Bit().data(),m_szCmdName.local8Bit().data()); dumpSwitchList(prefix); dumpParameterList(prefix); dumpCallback(prefix); @@ -64,7 +64,7 @@ void KviKvsTreeNodeModuleCallbackCommand::dump(const char * prefix) bool KviKvsTreeNodeModuleCallbackCommand::execute(KviKvsRunTimeContext * c) { //#warning "FIXME: module names should be UNICODE!" - KviModule * m = g_pModuleManager->getModule(m_szModuleName.utf8().data()); + KviModule * m = g_pModuleManager->getModule(m_szModuleName); if(!m) { TQString szErr = g_pModuleManager->lastError().ptr(); // <-- fixme! diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.h b/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.h index c24f1c5a..c153ac67 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.h @@ -42,7 +42,7 @@ protected: TQString m_szModuleName; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); bool execute(KviKvsRunTimeContext* c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp index 457e3f69..879a49f1 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp @@ -52,18 +52,18 @@ void KviKvsTreeNodeModuleFunctionCall::contextDescription(TQString &szBuffer) szBuffer += "\""; } -void KviKvsTreeNodeModuleFunctionCall::dump(const char * prefix) +void KviKvsTreeNodeModuleFunctionCall::dump(const TQString &prefix) { - tqDebug("%s ModuleFunctionCall(%s.%s)",prefix,m_szModuleName.utf8().data(),m_szFunctionName.utf8().data()); + tqDebug("%s ModuleFunctionCall(%s.%s)",prefix.local8Bit().data(),m_szModuleName.local8Bit().data(),m_szFunctionName.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pParams->dump(tmp.utf8().data()); + m_pParams->dump(tmp); } bool KviKvsTreeNodeModuleFunctionCall::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) { //#warning "FIXME: module names should be UNICODE!" - KviModule * m = g_pModuleManager->getModule(m_szModuleName.utf8().data()); + KviModule * m = g_pModuleManager->getModule(m_szModuleName); if(!m) { TQString szErr = g_pModuleManager->lastError().ptr(); // <-- fixme! diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.h index 86dde629..04ef7998 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.h @@ -41,7 +41,7 @@ protected: TQString m_szModuleName; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp index 18343997..94923e08 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp @@ -53,9 +53,9 @@ void KviKvsTreeNodeModuleSimpleCommand::contextDescription(TQString &szBuffer) szBuffer += "\""; } -void KviKvsTreeNodeModuleSimpleCommand::dump(const char * prefix) +void KviKvsTreeNodeModuleSimpleCommand::dump(const TQString &prefix) { - tqDebug("%s ModuleSimpleCommand(%s.%s)",prefix,m_szModuleName.utf8().data(),m_szCmdName.utf8().data()); + tqDebug("%s ModuleSimpleCommand(%s.%s)",prefix.local8Bit().data(),m_szModuleName.local8Bit().data(),m_szCmdName.local8Bit().data()); dumpSwitchList(prefix); dumpParameterList(prefix); } @@ -63,7 +63,7 @@ void KviKvsTreeNodeModuleSimpleCommand::dump(const char * prefix) bool KviKvsTreeNodeModuleSimpleCommand::execute(KviKvsRunTimeContext * c) { //#warning "FIXME: module names should be UNICODE!" - KviModule * m = g_pModuleManager->getModule(m_szModuleName.utf8().data()); + KviModule * m = g_pModuleManager->getModule(m_szModuleName); if(!m) { TQString szErr = g_pModuleManager->lastError().ptr(); // <-- fixme! diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.h b/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.h index 5396cc55..7a1921ec 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.h @@ -40,7 +40,7 @@ protected: TQString m_szModuleName; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp b/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp index 16c8ff2a..00e82905 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp @@ -48,10 +48,10 @@ void KviKvsTreeNodeMultipleParameterIdentifier::contextDescription(TQString &szB szBuffer += "\""; } -void KviKvsTreeNodeMultipleParameterIdentifier::dump(const char * prefix) +void KviKvsTreeNodeMultipleParameterIdentifier::dump(const TQString &prefix) { - if(m_iEnd < m_iStart)tqDebug("%s MultipleParameterIdentifier(%d-)",prefix,m_iStart); - else tqDebug("%s MultipleParameterIdentifier(%d-%d)",prefix,m_iStart,m_iEnd); + if(m_iEnd < m_iStart)tqDebug("%s MultipleParameterIdentifier(%d-)",prefix.local8Bit().data(),m_iStart); + else tqDebug("%s MultipleParameterIdentifier(%d-%d)",prefix.local8Bit().data(),m_iStart,m_iEnd); } bool KviKvsTreeNodeMultipleParameterIdentifier::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.h b/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.h index 54d86ec1..dc288065 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.h @@ -41,7 +41,7 @@ protected: int m_iEnd; // the index of the last parameter wanted (may be -1: in that case all up to the end) public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp b/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp index c5681cad..28962494 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp @@ -47,10 +47,10 @@ void KviKvsTreeNodeObjectField::contextDescription(TQString &szBuffer) #endif } -void KviKvsTreeNodeObjectField::dump(const char * prefix) +void KviKvsTreeNodeObjectField::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s ObjectField(%s)",prefix,m_szIdentifier.utf8().data()); + tqDebug("%s ObjectField(%s)",prefix.local8Bit().data(),m_szIdentifier.local8Bit().data()); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.h b/src/kvirc/kvs/kvi_kvs_treenode_objectfield.h index 607a69f0..9ce2fdb9 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_objectfield.h @@ -38,7 +38,7 @@ public: ~KviKvsTreeNodeObjectField(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool canEvaluateInObjectScope(); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject * o,KviKvsRunTimeContext * c,KviKvsVariant * pResult); virtual KviKvsRWEvaluationResult * evaluateReadWriteInObjectScope(KviKvsObject * o,KviKvsRunTimeContext * c); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.cpp index b86771bf..2a90d2bc 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.cpp @@ -44,13 +44,13 @@ void KviKvsTreeNodeObjectFunctionCall::contextDescription(TQString &szBuffer) #endif } -void KviKvsTreeNodeObjectFunctionCall::dump(const char * prefix) +void KviKvsTreeNodeObjectFunctionCall::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s ObjectFunctionCall(%s)",prefix,m_szFunctionName.utf8().data()); + tqDebug("%s ObjectFunctionCall(%s)",prefix.local8Bit().data(),m_szFunctionName.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pParams->dump(tmp.utf8().data()); + m_pParams->dump(tmp); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.h index 5588a02b..12aba985 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.h @@ -37,7 +37,7 @@ public: ~KviKvsTreeNodeObjectFunctionCall(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool canEvaluateInObjectScope(); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp b/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp index e717e238..2b1f6f86 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp @@ -56,12 +56,12 @@ void KviKvsTreeNodeOperation::contextDescription(TQString &szBuffer) szBuffer = "Operation"; } -void KviKvsTreeNodeOperation::dump(const char * prefix) +void KviKvsTreeNodeOperation::dump(const TQString &prefix) { - tqDebug("%s Operation",prefix); + tqDebug("%s Operation",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); } @@ -86,13 +86,13 @@ void KviKvsTreeNodeOperationAssignment::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeOperationAssignment::dump(const char * prefix) +void KviKvsTreeNodeOperationAssignment::dump(const TQString &prefix) { - tqDebug("%s OperationAssignment",prefix); + tqDebug("%s OperationAssignment",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); } bool KviKvsTreeNodeOperationAssignment::execute(KviKvsRunTimeContext * c) @@ -130,13 +130,13 @@ void KviKvsTreeNodeOperationDecrement::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeOperationDecrement::dump(const char * prefix) +void KviKvsTreeNodeOperationDecrement::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationDecrement",prefix); + tqDebug("%s OperationDecrement",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); #endif } @@ -193,13 +193,13 @@ void KviKvsTreeNodeOperationIncrement::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeOperationIncrement::dump(const char * prefix) +void KviKvsTreeNodeOperationIncrement::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationIncrement",prefix); + tqDebug("%s OperationIncrement",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); #endif } @@ -259,14 +259,14 @@ void KviKvsTreeNodeOperationSelfAnd::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeOperationSelfAnd::dump(const char * prefix) +void KviKvsTreeNodeOperationSelfAnd::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationSelfAnd",prefix); + tqDebug("%s OperationSelfAnd",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); #endif } @@ -329,14 +329,14 @@ void KviKvsTreeNodeOperationSelfDivision::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeOperationSelfDivision::dump(const char * prefix) +void KviKvsTreeNodeOperationSelfDivision::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationSelfDivision",prefix); + tqDebug("%s OperationSelfDivision",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); #endif } @@ -423,14 +423,14 @@ void KviKvsTreeNodeOperationSelfModulus::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeOperationSelfModulus::dump(const char * prefix) +void KviKvsTreeNodeOperationSelfModulus::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationSelfModulus",prefix); + tqDebug("%s OperationSelfModulus",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); #endif } @@ -518,14 +518,14 @@ void KviKvsTreeNodeOperationSelfMultiplication::contextDescription(TQString &szB } -void KviKvsTreeNodeOperationSelfMultiplication::dump(const char * prefix) +void KviKvsTreeNodeOperationSelfMultiplication::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationSelfMultiplication",prefix); + tqDebug("%s OperationSelfMultiplication",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); #endif } @@ -597,14 +597,14 @@ void KviKvsTreeNodeOperationSelfOr::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeOperationSelfOr::dump(const char * prefix) +void KviKvsTreeNodeOperationSelfOr::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationSelfOr",prefix); + tqDebug("%s OperationSelfOr",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); #endif } @@ -667,14 +667,14 @@ void KviKvsTreeNodeOperationSelfShl::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeOperationSelfShl::dump(const char * prefix) +void KviKvsTreeNodeOperationSelfShl::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationSelfShl",prefix); + tqDebug("%s OperationSelfShl",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); #endif } @@ -739,14 +739,14 @@ void KviKvsTreeNodeOperationSelfShr::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeOperationSelfShr::dump(const char * prefix) +void KviKvsTreeNodeOperationSelfShr::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationSelfShr",prefix); + tqDebug("%s OperationSelfShr",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); #endif } @@ -817,14 +817,14 @@ void KviKvsTreeNodeOperationSelfSubtraction::contextDescription(TQString &szBuff } -void KviKvsTreeNodeOperationSelfSubtraction::dump(const char * prefix) +void KviKvsTreeNodeOperationSelfSubtraction::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationSelfSubtraction",prefix); + tqDebug("%s OperationSelfSubtraction",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); #endif } @@ -900,14 +900,14 @@ void KviKvsTreeNodeOperationSelfSum::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeOperationSelfSum::dump(const char * prefix) +void KviKvsTreeNodeOperationSelfSum::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationSelfSum",prefix); + tqDebug("%s OperationSelfSum",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); #endif } @@ -985,14 +985,14 @@ void KviKvsTreeNodeOperationSelfXor::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeOperationSelfXor::dump(const char * prefix) +void KviKvsTreeNodeOperationSelfXor::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationSelfXor",prefix); + tqDebug("%s OperationSelfXor",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); #endif } @@ -1053,13 +1053,13 @@ void KviKvsTreeNodeOperationStringAppend::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeOperationStringAppend::dump(const char * prefix) +void KviKvsTreeNodeOperationStringAppend::dump(const TQString &prefix) { - tqDebug("%s OperationStringAppend",prefix); + tqDebug("%s OperationStringAppend",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); } bool KviKvsTreeNodeOperationStringAppend::execute(KviKvsRunTimeContext * c) @@ -1100,13 +1100,13 @@ void KviKvsTreeNodeOperationArrayAppend::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeOperationArrayAppend::dump(const char * prefix) +void KviKvsTreeNodeOperationArrayAppend::dump(const TQString &prefix) { - tqDebug("%s OperationArrayAppend",prefix); + tqDebug("%s OperationArrayAppend",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); } bool KviKvsTreeNodeOperationArrayAppend::execute(KviKvsRunTimeContext * c) @@ -1189,14 +1189,14 @@ void KviKvsTreeNodeOperationStringAppendWithComma::contextDescription(TQString & } -void KviKvsTreeNodeOperationStringAppendWithComma::dump(const char * prefix) +void KviKvsTreeNodeOperationStringAppendWithComma::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationStringAppendWithComma",prefix); + tqDebug("%s OperationStringAppendWithComma",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); #endif } @@ -1254,14 +1254,14 @@ void KviKvsTreeNodeOperationStringAppendWithSpace::contextDescription(TQString & } -void KviKvsTreeNodeOperationStringAppendWithSpace::dump(const char * prefix) +void KviKvsTreeNodeOperationStringAppendWithSpace::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationStringAppendWithSpace",prefix); + tqDebug("%s OperationStringAppendWithSpace",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pTargetData->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pTargetData->dump(tmp); + m_pRightSide->dump(tmp); #endif } @@ -1329,15 +1329,15 @@ void KviKvsTreeNodeOperationStringTransliteration::contextDescription(TQString & } -void KviKvsTreeNodeOperationStringTransliteration::dump(const char * prefix) +void KviKvsTreeNodeOperationStringTransliteration::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationStringTransliteration",prefix); + tqDebug("%s OperationStringTransliteration",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pLeft->dump(tmp.utf8().data()); - m_pRight->dump(tmp.utf8().data()); - m_pFlags->dump(tmp.utf8().data()); + m_pLeft->dump(tmp); + m_pRight->dump(tmp); + m_pFlags->dump(tmp); #endif } @@ -1410,15 +1410,15 @@ void KviKvsTreeNodeOperationStringSubstitution::contextDescription(TQString &szB } -void KviKvsTreeNodeOperationStringSubstitution::dump(const char * prefix) +void KviKvsTreeNodeOperationStringSubstitution::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s OperationStringSubstitution",prefix); + tqDebug("%s OperationStringSubstitution",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pLeft->dump(tmp.utf8().data()); - m_pRight->dump(tmp.utf8().data()); - m_pFlags->dump(tmp.utf8().data()); + m_pLeft->dump(tmp); + m_pRight->dump(tmp); + m_pFlags->dump(tmp); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_operation.h b/src/kvirc/kvs/kvi_kvs_treenode_operation.h index cc57df04..40563ab1 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_operation.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_operation.h @@ -42,7 +42,7 @@ protected: public: void setTargetVariableReference(KviKvsTreeNodeData * r); virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); }; class KviKvsTreeNodeOperationAssignment : public KviKvsTreeNodeOperation @@ -54,7 +54,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -65,7 +65,7 @@ public: ~KviKvsTreeNodeOperationDecrement(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -76,7 +76,7 @@ public: ~KviKvsTreeNodeOperationIncrement(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -89,7 +89,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -102,7 +102,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -115,7 +115,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -128,7 +128,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -141,7 +141,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -154,7 +154,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -167,7 +167,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -180,7 +180,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -193,7 +193,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -206,7 +206,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -219,7 +219,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -232,7 +232,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -245,7 +245,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -258,7 +258,7 @@ protected: KviKvsTreeNodeData * m_pRightSide; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -273,7 +273,7 @@ protected: KviKvsTreeNodeData * m_pFlags; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; @@ -288,7 +288,7 @@ protected: KviKvsTreeNodeData * m_pFlags; // can't be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.cpp b/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.cpp index 29fc23bb..89607e34 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.cpp @@ -53,13 +53,13 @@ void KviKvsTreeNodeParameterReturn::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeParameterReturn::dump(const char * prefix) +void KviKvsTreeNodeParameterReturn::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s ParameterReturn",prefix); + tqDebug("%s ParameterReturn",prefix.local8Bit().data()); TQString tmp = prefix; tmp += " "; - m_pDataList->dump(tmp.utf8().data()); + m_pDataList->dump(tmp); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.h b/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.h index da65b6da..0ff9620d 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.h @@ -38,7 +38,7 @@ protected: KviKvsTreeNodeDataList * m_pDataList; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.cpp b/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.cpp index 55c5646a..34ee7530 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.cpp @@ -52,13 +52,13 @@ void KviKvsTreeNodeRebindingSwitch::contextDescription(TQString &szBuffer) szBuffer = "Window Rebinding Switch"; } -void KviKvsTreeNodeRebindingSwitch::dump(const char * prefix) +void KviKvsTreeNodeRebindingSwitch::dump(const TQString &prefix) { - tqDebug("%sRebindingSwitch",prefix); + tqDebug("%sRebindingSwitch",prefix.local8Bit().data()); TQString tmp = prefix; tmp += " "; - m_pTargetWindow->dump(tmp.utf8().data()); - m_pChildCommand->dump(tmp.utf8().data()); + m_pTargetWindow->dump(tmp); + m_pChildCommand->dump(tmp); } const TQString & KviKvsTreeNodeRebindingSwitch::commandName() @@ -80,10 +80,10 @@ bool KviKvsTreeNodeRebindingSwitch::execute(KviKvsRunTimeContext * c) c->warning(this,__tr2qs("Empty window identifier specified in the standard rebinding switch: no rebinding performed")); pNewWindow = 0; } else { - pNewWindow = g_pApp->findWindow(szWinId.utf8().data()); + pNewWindow = g_pApp->findWindow(szWinId); } - pNewWindow = g_pApp->findWindow(szWinId.utf8().data()); + pNewWindow = g_pApp->findWindow(szWinId); KviWindow * pOldWindow = c->window(); if(pNewWindow) c->setWindow(pNewWindow); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.h b/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.h index b71945e9..65722a1c 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.h @@ -41,7 +41,7 @@ protected: KviKvsTreeNodeCommand * m_pChildCommand; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); const TQString & commandName(); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.cpp b/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.cpp index b8020ef6..1d121e67 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.cpp @@ -57,13 +57,13 @@ void KviKvsTreeNodeScopeOperator::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeScopeOperator::dump(const char * prefix) +void KviKvsTreeNodeScopeOperator::dump(const TQString &prefix) { - tqDebug("%s ScopeOperator",prefix); + tqDebug("%s ScopeOperator",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pObjectReference->dump(tmp.utf8().data()); - m_pRightSide->dump(tmp.utf8().data()); + m_pObjectReference->dump(tmp); + m_pRightSide->dump(tmp); } bool KviKvsTreeNodeScopeOperator::isReadOnly() diff --git a/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.h b/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.h index c132a43d..e71a156f 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.h @@ -39,7 +39,7 @@ public: KviKvsTreeNodeData * m_pRightSide; // can't be null public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool isReadOnly(); // gets the m_pRightSide read only state virtual bool canEvaluateToObjectReference(); // gets the m_pRightSide result virtual bool isFunctionCall(); // gets the m_pRightSide result diff --git a/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.cpp index 6803376b..69602592 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.cpp @@ -46,10 +46,10 @@ void KviKvsTreeNodeSimpleCommand::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeSimpleCommand::dump(const char * prefix) +void KviKvsTreeNodeSimpleCommand::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s SimpleCommand(%s)",prefix,m_szCmdName.utf8().data()); + tqDebug("%s SimpleCommand(%s)",prefix.local8Bit().data(),m_szCmdName.local8Bit().data()); dumpSwitchList(prefix); dumpParameterList(prefix); #endif diff --git a/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.h b/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.h index 3636c5e7..cbf19012 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.h @@ -36,7 +36,7 @@ public: ~KviKvsTreeNodeSimpleCommand(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.cpp b/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.cpp index 5cf892c2..a1418818 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.cpp @@ -50,10 +50,10 @@ void KviKvsTreeNodeSingleParameterIdentifier::contextDescription(TQString &szBuf } -void KviKvsTreeNodeSingleParameterIdentifier::dump(const char * prefix) +void KviKvsTreeNodeSingleParameterIdentifier::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s SingleParameterIdentifier(%d)",prefix,m_iStart); + tqDebug("%s SingleParameterIdentifier(%d)",prefix.local8Bit().data(),m_iStart); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.h b/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.h index 0a9f802c..89ba54b3 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.h @@ -40,7 +40,7 @@ protected: int m_iStart; // the index of the parameter wanted (always >= 0) public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool canEvaluateToObjectReference(); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.cpp index 5a4cd548..351caed6 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.cpp @@ -45,10 +45,10 @@ void KviKvsTreeNodeSpecialCommand::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeSpecialCommand::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommand::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s SpecialCommand(%s)",prefix,m_szCmdName.utf8().data()); + tqDebug("%s SpecialCommand(%s)",prefix.local8Bit().data(),m_szCmdName.local8Bit().data()); dumpSwitchList(prefix); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.h index c7d1153b..0fbde13d 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.h @@ -35,7 +35,7 @@ public: ~KviKvsTreeNodeSpecialCommand(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); }; #endif //!_KVI_KVS_TREENODE_SPECIALCOMMAND_H_ diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.cpp index 928dc2dc..731ebf2b 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.cpp @@ -43,9 +43,9 @@ void KviKvsTreeNodeSpecialCommandBreak::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeSpecialCommandBreak::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandBreak::dump(const TQString &prefix) { - tqDebug("%s SpecialCommandBreak",prefix); + tqDebug("%s SpecialCommandBreak",prefix.local8Bit().data()); } bool KviKvsTreeNodeSpecialCommandBreak::execute(KviKvsRunTimeContext * c) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.h index 44cdac66..15d6a32b 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.h @@ -38,7 +38,7 @@ public: ~KviKvsTreeNodeSpecialCommandBreak(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp index 6e737005..75cd7b1e 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp @@ -39,10 +39,10 @@ KviKvsTreeNodeSpecialCommandClassFunctionDefinition::KviKvsTreeNodeSpecialComman m_szBuffer = szBuffer; } -void KviKvsTreeNodeSpecialCommandClassFunctionDefinition::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandClassFunctionDefinition::dump(const TQString &prefix) { - tqDebug("%s SpecialCommandClassFunctionDefinition(%s)",prefix,m_szName.utf8().data()); - tqDebug("%s (command buffer with %d characters)",prefix,m_szBuffer.length()); + tqDebug("%s SpecialCommandClassFunctionDefinition(%s)",prefix.local8Bit().data(),m_szName.local8Bit().data()); + tqDebug("%s (command buffer with %d characters)",prefix.local8Bit().data(),m_szBuffer.length()); } void KviKvsTreeNodeSpecialCommandClassFunctionDefinition::contextDescription(TQString &szBuffer) @@ -77,14 +77,14 @@ void KviKvsTreeNodeSpecialCommandClass::contextDescription(TQString &szBuffer) szBuffer = "Special Command \"class\""; } -void KviKvsTreeNodeSpecialCommandClass::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandClass::dump(const TQString &prefix) { - tqDebug("%s SpecialCommandClass",prefix); + tqDebug("%s SpecialCommandClass",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pParams->dump(tmp.utf8().data()); + m_pParams->dump(tmp); for(KviKvsTreeNodeSpecialCommandClassFunctionDefinition * d = m_pFunctions->first();d;d = m_pFunctions->next()) - d->dump(tmp.utf8().data()); + d->dump(tmp); } bool KviKvsTreeNodeSpecialCommandClass::execute(KviKvsRunTimeContext * c) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.h index 592c4544..d7de0c7e 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.h @@ -46,7 +46,7 @@ public: const TQString & name(){ return m_szName; }; const TQString & buffer(){ return m_szBuffer; }; virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); }; @@ -62,7 +62,7 @@ protected: public: void addFunctionDefinition(KviKvsTreeNodeSpecialCommandClassFunctionDefinition * pDef); virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp index adf38511..1ec75c88 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp @@ -40,28 +40,28 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup::contextDescription(TQStr #endif } -void KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s SpecialCommandDefpopupLabelExtpopup",prefix); + tqDebug("%s SpecialCommandDefpopupLabelExtpopup",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); TQString x = tmp; x += "CONDITION: "; x += m_szCondition; - tqDebug("%s",x.utf8().data()); + tqDebug("%s",x.local8Bit().data()); x = tmp; x += "TEXT: "; x += m_szText; - tqDebug("%s",x.utf8().data()); + tqDebug("%s",x.local8Bit().data()); x = tmp; x += "NAME: "; x += m_szName; - tqDebug("%s",x.utf8().data()); + tqDebug("%s",x.local8Bit().data()); x = tmp; x += "ICON: "; x += m_szIcon; - tqDebug("%s",x.utf8().data()); + tqDebug("%s",x.local8Bit().data()); #endif } @@ -82,28 +82,28 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelItem::contextDescription(TQString } -void KviKvsTreeNodeSpecialCommandDefpopupLabelItem::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandDefpopupLabelItem::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s SpecialCommandDefpopupLabelItem",prefix); + tqDebug("%s SpecialCommandDefpopupLabelItem",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); TQString x = tmp; x += "CONDITION: "; x += m_szCondition; - tqDebug("%s",x.utf8().data()); + tqDebug("%s",x.local8Bit().data()); x = tmp; x += "TEXT: "; x += m_szText; - tqDebug("%s",x.utf8().data()); + tqDebug("%s",x.local8Bit().data()); x = tmp; x += "ICON: "; x += m_szIcon; - tqDebug("%s",x.utf8().data()); + tqDebug("%s",x.local8Bit().data()); x = tmp; x += "INSTRUCTION: "; x += m_szInstruction; - tqDebug("%s",x.utf8().data()); + tqDebug("%s",x.local8Bit().data()); #endif } @@ -123,24 +123,24 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelLabel::contextDescription(TQString } -void KviKvsTreeNodeSpecialCommandDefpopupLabelLabel::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandDefpopupLabelLabel::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s SpecialCommandDefpopupLabelLabel",prefix); + tqDebug("%s SpecialCommandDefpopupLabelLabel",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); TQString x = tmp; x += "CONDITION: "; x += m_szCondition; - tqDebug("%s",x.utf8().data()); + tqDebug("%s",x.local8Bit().data()); x = tmp; x += "TEXT: "; x += m_szText; - tqDebug("%s",x.utf8().data()); + tqDebug("%s",x.local8Bit().data()); x = tmp; x += "ICON: "; x += m_szIcon; - tqDebug("%s",x.utf8().data()); + tqDebug("%s",x.local8Bit().data()); #endif } @@ -163,14 +163,14 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator::contextDescription(TQSt } -void KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s SpecialCommandDefpopupLabelSeparator",prefix); + tqDebug("%s SpecialCommandDefpopupLabelSeparator",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" CONDITION:"); tmp.append(m_szCondition); - tqDebug("%s",tmp.utf8().data()); + tqDebug("%s",tmp.local8Bit().data()); #endif } @@ -192,14 +192,14 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue::contextDescription(TQStr } -void KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s SpecialCommandDefpopupLabelEpilogue",prefix); + tqDebug("%s SpecialCommandDefpopupLabelEpilogue",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" INSTRUCTION: "); tmp += m_szInstruction; - tqDebug("%s",tmp.utf8().data()); + tqDebug("%s",tmp.local8Bit().data()); #endif } @@ -221,14 +221,14 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue::contextDescription(TQStr -void KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s SpecialCommandDefpopupLabelPrologue",prefix); + tqDebug("%s SpecialCommandDefpopupLabelPrologue",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" INSTRUCTION: "); tmp += m_szInstruction; - tqDebug("%s",tmp.utf8().data()); + tqDebug("%s",tmp.local8Bit().data()); #endif } @@ -272,26 +272,26 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::contextDescription(TQString } -void KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s SpecialCommandDefpopupLabelPopup",prefix); + tqDebug("%s SpecialCommandDefpopupLabelPopup",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); TQString x = tmp; x += "CONDITION: "; x += m_szCondition; - tqDebug("%s",x.utf8().data()); + tqDebug("%s",x.local8Bit().data()); x = tmp; x += "TEXT: "; x += m_szText; - tqDebug("%s",x.utf8().data()); + tqDebug("%s",x.local8Bit().data()); x = tmp; x += "ICON: "; x += m_szIcon; - tqDebug("%s",x.utf8().data()); + tqDebug("%s",x.local8Bit().data()); for(KviKvsTreeNodeSpecialCommandDefpopupLabel * l = m_pLabels->first();l;l = m_pLabels->next()) - l->dump(tmp.utf8().data()); + l->dump(tmp); #endif } @@ -359,14 +359,14 @@ void KviKvsTreeNodeSpecialCommandDefpopup::contextDescription(TQString &szBuffer } -void KviKvsTreeNodeSpecialCommandDefpopup::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandDefpopup::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s SpecialCommandDefpopup",prefix); + tqDebug("%s SpecialCommandDefpopup",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pPopupName->dump(tmp.utf8().data()); - m_pMainPopup->dump(tmp.utf8().data()); + m_pPopupName->dump(tmp); + m_pMainPopup->dump(tmp); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.h index b55b1fb1..0117b50d 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.h @@ -69,7 +69,7 @@ public: ~KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator(){}; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); }; @@ -97,7 +97,7 @@ public: ~KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup(){}; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); }; @@ -111,7 +111,7 @@ public: ~KviKvsTreeNodeSpecialCommandDefpopupLabelItem(){}; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); }; @@ -124,7 +124,7 @@ public: ~KviKvsTreeNodeSpecialCommandDefpopupLabelLabel(){}; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); }; @@ -140,7 +140,7 @@ public: ~KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue(){}; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); }; @@ -154,7 +154,7 @@ public: ~KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue(){}; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); }; @@ -170,7 +170,7 @@ public: bool isEmpty(){ return m_pLabels->isEmpty(); }; void addLabel(KviKvsTreeNodeSpecialCommandDefpopupLabel * pLabel); virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); bool fill(KviKvsRunTimeContext * c,KviKvsPopupMenu * p); }; @@ -186,7 +186,7 @@ private: KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * m_pMainPopup; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp index b59ac3d4..8241f044 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp @@ -51,9 +51,9 @@ void KviKvsTreeNodeSpecialCommandDo::contextDescription(TQString &szBuffer) szBuffer = "Special Command \"do\""; } -void KviKvsTreeNodeSpecialCommandDo::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandDo::dump(const TQString &prefix) { - tqDebug("%s SpecialCommandDo",prefix); + tqDebug("%s SpecialCommandDo",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); m_pExpression->dump(tmp); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.h index 834d0eae..12ad030c 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.h @@ -43,7 +43,7 @@ private: KviKvsTreeNodeInstruction * m_pInstruction; // may be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp index 075f00e5..ff764ec1 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp @@ -56,15 +56,15 @@ void KviKvsTreeNodeSpecialCommandFor::contextDescription(TQString &szBuffer) szBuffer = "Special Command \"for\""; } -void KviKvsTreeNodeSpecialCommandFor::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandFor::dump(const TQString &prefix) { - tqDebug("%s SpecialCommandFor",prefix); + tqDebug("%s SpecialCommandFor",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - if(m_pInitialization)m_pInitialization->dump(tmp.utf8().data()); - if(m_pCondition)m_pCondition->dump(tmp.utf8().data()); - if(m_pUpdate)m_pUpdate->dump(tmp.utf8().data()); - if(m_pLoop)m_pLoop->dump(tmp.utf8().data()); + if(m_pInitialization)m_pInitialization->dump(tmp); + if(m_pCondition)m_pCondition->dump(tmp); + if(m_pUpdate)m_pUpdate->dump(tmp); + if(m_pLoop)m_pLoop->dump(tmp); } bool KviKvsTreeNodeSpecialCommandFor::execute(KviKvsRunTimeContext * c) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.h index 3800c95e..284f9d15 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.h @@ -45,7 +45,7 @@ private: KviKvsTreeNodeInstruction * m_pLoop; // can be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp index 5c56bcb1..24f3ba35 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp @@ -55,14 +55,14 @@ void KviKvsTreeNodeSpecialCommandForeach::contextDescription(TQString &szBuffer) szBuffer = "Special Command \"foreach\""; } -void KviKvsTreeNodeSpecialCommandForeach::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandForeach::dump(const TQString &prefix) { - tqDebug("%s SpecialCommandForeach",prefix); + tqDebug("%s SpecialCommandForeach",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pIterationVariable->dump(tmp.utf8().data()); - m_pIterationData->dump(tmp.utf8().data()); - m_pLoop->dump(tmp.utf8().data()); + m_pIterationVariable->dump(tmp); + m_pIterationData->dump(tmp); + m_pLoop->dump(tmp); } bool KviKvsTreeNodeSpecialCommandForeach::execute(KviKvsRunTimeContext * c) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.h index d3b8ff2d..39b32f5a 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.h @@ -45,7 +45,7 @@ private: KviKvsTreeNodeInstruction * m_pLoop; // can't be zero! public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp index 16636f6a..ef79b0bd 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp @@ -59,10 +59,10 @@ void KviKvsTreeNodeSpecialCommandIf::contextDescription(TQString &szBuffer) #endif } -void KviKvsTreeNodeSpecialCommandIf::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandIf::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s SpecialCommandIf",prefix); + tqDebug("%s SpecialCommandIf",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); m_pExpression->dump(tmp); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.h index 856b8951..e90932a4 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.h @@ -43,7 +43,7 @@ private: KviKvsTreeNodeInstruction * m_pElseInstruction; // may be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp index 0bc342dd..1ea35569 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp @@ -78,13 +78,13 @@ void KviKvsTreeNodeSpecialCommandSwitchLabelCase::contextDescription(TQString &s szBuffer = "Label \"case\" For Special Command \"switch\""; } -void KviKvsTreeNodeSpecialCommandSwitchLabelCase::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandSwitchLabelCase::dump(const TQString &prefix) { - tqDebug("%s SpecialCommandSwitchLabelCase",prefix); + tqDebug("%s SpecialCommandSwitchLabelCase",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - if(m_pParameter)m_pParameter->dump(tmp.utf8().data()); - if(m_pInstruction)m_pInstruction->dump(tmp.utf8().data()); + if(m_pParameter)m_pParameter->dump(tmp); + if(m_pInstruction)m_pInstruction->dump(tmp); } bool KviKvsTreeNodeSpecialCommandSwitchLabelCase::execute(KviKvsRunTimeContext * c,KviKvsVariant * pRealParameter) @@ -154,13 +154,13 @@ void KviKvsTreeNodeSpecialCommandSwitchLabelMatch::contextDescription(TQString & } -void KviKvsTreeNodeSpecialCommandSwitchLabelMatch::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandSwitchLabelMatch::dump(const TQString &prefix) { - tqDebug("%s SpecialCommandSwitchLabelMatch",prefix); + tqDebug("%s SpecialCommandSwitchLabelMatch",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - if(m_pParameter)m_pParameter->dump(tmp.utf8().data()); - if(m_pInstruction)m_pInstruction->dump(tmp.utf8().data()); + if(m_pParameter)m_pParameter->dump(tmp); + if(m_pInstruction)m_pInstruction->dump(tmp); } bool KviKvsTreeNodeSpecialCommandSwitchLabelMatch::execute(KviKvsRunTimeContext * c,KviKvsVariant * pRealParameter) @@ -208,13 +208,13 @@ void KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::contextDescription(TQString } -void KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::dump(const TQString &prefix) { - tqDebug("%s SpecialCommandSwitchLabelRegexp",prefix); + tqDebug("%s SpecialCommandSwitchLabelRegexp",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - if(m_pParameter)m_pParameter->dump(tmp.utf8().data()); - if(m_pInstruction)m_pInstruction->dump(tmp.utf8().data()); + if(m_pParameter)m_pParameter->dump(tmp); + if(m_pInstruction)m_pInstruction->dump(tmp); } bool KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::execute(KviKvsRunTimeContext * c,KviKvsVariant * pRealParameter) @@ -264,12 +264,12 @@ void KviKvsTreeNodeSpecialCommandSwitchLabelDefault::contextDescription(TQString } -void KviKvsTreeNodeSpecialCommandSwitchLabelDefault::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandSwitchLabelDefault::dump(const TQString &prefix) { - tqDebug("%s SpecialCommandSwitchLabelDefault",prefix); + tqDebug("%s SpecialCommandSwitchLabelDefault",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - if(m_pInstruction)m_pInstruction->dump(tmp.utf8().data()); + if(m_pInstruction)m_pInstruction->dump(tmp); } bool KviKvsTreeNodeSpecialCommandSwitchLabelDefault::execute(KviKvsRunTimeContext * c,KviKvsVariant * pRealParameter) @@ -316,14 +316,14 @@ void KviKvsTreeNodeSpecialCommandSwitch::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeSpecialCommandSwitch::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandSwitch::dump(const TQString &prefix) { - tqDebug("%s SpecialCommandSwitch",prefix); + tqDebug("%s SpecialCommandSwitch",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pExpression->dump(tmp.utf8().data()); + m_pExpression->dump(tmp); for(KviKvsTreeNodeSpecialCommandSwitchLabel * l = m_pLabels->first();l;l = m_pLabels->next()) - l->dump(tmp.utf8().data()); + l->dump(tmp); } bool KviKvsTreeNodeSpecialCommandSwitch::execute(KviKvsRunTimeContext * c) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.h index aa5473ba..1b2b1c60 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.h @@ -58,7 +58,7 @@ public: ~KviKvsTreeNodeSpecialCommandSwitchLabelCase(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsVariant * pRealParameter); }; @@ -70,7 +70,7 @@ public: ~KviKvsTreeNodeSpecialCommandSwitchLabelMatch(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsVariant * pRealParameter); }; @@ -81,7 +81,7 @@ public: ~KviKvsTreeNodeSpecialCommandSwitchLabelRegexp(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c,KviKvsVariant * pRealParameter); }; @@ -91,7 +91,7 @@ public: KviKvsTreeNodeSpecialCommandSwitchLabelDefault(const TQChar * pLocation); ~KviKvsTreeNodeSpecialCommandSwitchLabelDefault(); public: - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual void contextDescription(TQString &szBuffer); virtual bool execute(KviKvsRunTimeContext * c,KviKvsVariant * pRealParameter); }; @@ -110,7 +110,7 @@ public: void addLabel(KviKvsTreeNodeSpecialCommandSwitchLabel * l); bool isEmpty(){ return m_pLabels->isEmpty(); }; virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp index 689c120d..4486cebc 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp @@ -49,14 +49,14 @@ void KviKvsTreeNodeSpecialCommandUnset::contextDescription(TQString &szBuffer) szBuffer = "Special Command \"unset\""; } -void KviKvsTreeNodeSpecialCommandUnset::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandUnset::dump(const TQString &prefix) { - tqDebug("%s SpecialCommandUnset",prefix); + tqDebug("%s SpecialCommandUnset",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); for(KviKvsTreeNodeVariable * pVar = m_pVariableList->first();pVar;pVar = m_pVariableList->next()) { - pVar->dump(tmp.utf8().data()); + pVar->dump(tmp); } } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.h index 9d36517a..8b31d3e2 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.h @@ -40,7 +40,7 @@ private: KviPointerList<KviKvsTreeNodeVariable> * m_pVariableList; public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp index 13921ae3..eb0efd73 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp @@ -56,10 +56,10 @@ void KviKvsTreeNodeSpecialCommandWhile::contextDescription(TQString &szBuffer) #endif } -void KviKvsTreeNodeSpecialCommandWhile::dump(const char * prefix) +void KviKvsTreeNodeSpecialCommandWhile::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s SpecialCommandWhile",prefix); + tqDebug("%s SpecialCommandWhile",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); m_pExpression->dump(tmp); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.h b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.h index 38c4907e..5f8bd813 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.h @@ -43,7 +43,7 @@ private: KviKvsTreeNodeInstruction * m_pInstruction; // may be 0 public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_stringcast.cpp b/src/kvirc/kvs/kvi_kvs_treenode_stringcast.cpp index e02546f5..c9079bc1 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_stringcast.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_stringcast.cpp @@ -57,11 +57,11 @@ void KviKvsTreeNodeStringCast::contextDescription(TQString &szBuffer) szBuffer = "String Cast"; } -void KviKvsTreeNodeStringCast::dump(const char * prefix) +void KviKvsTreeNodeStringCast::dump(const TQString &prefix) { - tqDebug("%s StringCast",prefix); + tqDebug("%s StringCast",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pChildData->dump(tmp.utf8().data()); + m_pChildData->dump(tmp); } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_stringcast.h b/src/kvirc/kvs/kvi_kvs_treenode_stringcast.h index 3cc3de6c..0f4a1f35 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_stringcast.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_stringcast.h @@ -38,7 +38,7 @@ public: virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp index adf3c09f..81b86c11 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp @@ -46,9 +46,9 @@ void KviKvsTreeNodeSwitchList::contextDescription(TQString &szBuffer) } -void KviKvsTreeNodeSwitchList::dump(const char * prefix) +void KviKvsTreeNodeSwitchList::dump(const TQString &prefix) { - tqDebug("%s SwitchList",prefix); + tqDebug("%s SwitchList",prefix.local8Bit().data()); if(m_pShortSwitchDict) { KviPointerHashTableIterator<int,KviKvsTreeNodeData> it(*m_pShortSwitchDict); @@ -59,7 +59,7 @@ void KviKvsTreeNodeSwitchList::dump(const char * prefix) TQChar c((unsigned short)it.currentKey()); tmp.append(c); tmp.append("): "); - it.current()->dump(tmp.utf8().data()); + it.current()->dump(tmp); ++it; } } @@ -72,7 +72,7 @@ void KviKvsTreeNodeSwitchList::dump(const char * prefix) tmp.append(" Sw("); tmp.append(it.currentKey()); tmp.append("): "); - it.current()->dump(tmp.utf8().data()); + it.current()->dump(tmp); ++it; } } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.h b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.h index 0bc68559..16a4975e 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.h @@ -48,7 +48,7 @@ public: void addShort(int iShortKey,KviKvsTreeNodeData * p); void addLong(const TQString &szLongKey,KviKvsTreeNodeData * p); bool isEmpty(){ return (m_pShortSwitchDict == 0) && (m_pLongSwitchDict == 0); }; - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual void contextDescription(TQString &szBuffer); KviKvsTreeNodeData * getStandardRebindingSwitch(); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp index 1cba7405..38abf608 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp @@ -46,13 +46,13 @@ void KviKvsTreeNodeThisObjectFunctionCall::contextDescription(TQString &szBuffer #endif } -void KviKvsTreeNodeThisObjectFunctionCall::dump(const char * prefix) +void KviKvsTreeNodeThisObjectFunctionCall::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s ThisObjectFunctionCall(%s)",prefix,m_szFunctionName.utf8().data()); + tqDebug("%s ThisObjectFunctionCall(%s)",prefix.local8Bit().data(),m_szFunctionName.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pParams->dump(tmp.utf8().data()); + m_pParams->dump(tmp); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.h index b31f9ebf..1c00bd71 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.h @@ -41,7 +41,7 @@ public: ~KviKvsTreeNodeThisObjectFunctionCall(); public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject * o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.cpp index 3d2c0880..bec8f0a7 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.cpp @@ -49,13 +49,13 @@ void KviKvsTreeNodeVoidFunctionCall::contextDescription(TQString &szBuffer) #endif } -void KviKvsTreeNodeVoidFunctionCall::dump(const char * prefix) +void KviKvsTreeNodeVoidFunctionCall::dump(const TQString &prefix) { #ifdef COMPILE_NEW_KVS - tqDebug("%s VoidFunctionCall",prefix); + tqDebug("%s VoidFunctionCall",prefix.local8Bit().data()); TQString tmp = prefix; tmp.append(" "); - m_pFunctionCall->dump(tmp.utf8().data()); + m_pFunctionCall->dump(tmp); #endif } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.h b/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.h index 584034d0..305ffd20 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.h @@ -40,7 +40,7 @@ protected: KviKvsTreeNodeFunctionCall * m_pFunctionCall; // may be scope operator or direct function call public: virtual void contextDescription(TQString &szBuffer); - virtual void dump(const char * prefix); + virtual void dump(const TQString &prefix); virtual bool execute(KviKvsRunTimeContext * c); }; diff --git a/src/kvirc/kvs/kvi_kvs_useraction.cpp b/src/kvirc/kvs/kvi_kvs_useraction.cpp index 52bb09c2..ac5c7572 100644 --- a/src/kvirc/kvs/kvi_kvs_useraction.cpp +++ b/src/kvirc/kvs/kvi_kvs_useraction.cpp @@ -210,7 +210,7 @@ const TQString & KviKvsUserAction::descriptionCode() TQPixmap * KviKvsUserAction::smallIcon() { - return g_pIconManager->getImage(m_szSmallIcon.utf8().data()); + return g_pIconManager->getImage(m_szSmallIcon); } bool KviKvsUserAction::isKviUserActionNeverOverrideThis() diff --git a/src/kvirc/kvs/kvi_kvs_variant.cpp b/src/kvirc/kvs/kvi_kvs_variant.cpp index a556def4..8d6377d5 100644 --- a/src/kvirc/kvs/kvi_kvs_variant.cpp +++ b/src/kvirc/kvs/kvi_kvs_variant.cpp @@ -622,22 +622,22 @@ void KviKvsVariant::appendAsString(TQString &szBuffer) const } } -void KviKvsVariant::dump(const char * prefix) const +void KviKvsVariant::dump(const TQString &prefix) const { if(!m_pData) { - tqDebug("%s Nothing [this=0x%p]",prefix,this); + tqDebug("%s Nothing [this=0x%p]",prefix.local8Bit().data(),this); return; } switch(m_pData->m_eType) { - case KviKvsVariantData::String: tqDebug("%s String(%s) [this=0x%p]",prefix,m_pData->m_u.pString->utf8().data(),this); break; - case KviKvsVariantData::Array: tqDebug("%s Array(ptr=0x%p) [this=0x%p]",prefix,m_pData->m_u.pArray,this); break; - case KviKvsVariantData::Hash: tqDebug("%s Hash(ptr=0x%p,dict=0x%p) [this=0x%p]",prefix,m_pData->m_u.pHash,m_pData->m_u.pHash->dict(),this); break; - case KviKvsVariantData::Integer: tqDebug("%s Integer(%ld) [this=0x%p]",prefix,m_pData->m_u.iInteger,this); break; - case KviKvsVariantData::Real: tqDebug("%s Real(%f) [this=0x%p]",prefix,*(m_pData->m_u.pReal),this); break; - case KviKvsVariantData::Boolean: tqDebug("%s Boolean(%s) [this=0x%p]",prefix,m_pData->m_u.bBoolean ? "true" : "false",this); break; - case KviKvsVariantData::HObject: tqDebug("%s HObject(%p) [this=0x%p]",prefix,m_pData->m_u.hObject,this); break; + case KviKvsVariantData::String: tqDebug("%s String(%s) [this=0x%p]",prefix.local8Bit().data(),m_pData->m_u.pString->local8Bit().data(),this); break; + case KviKvsVariantData::Array: tqDebug("%s Array(ptr=0x%p) [this=0x%p]",prefix.local8Bit().data(),m_pData->m_u.pArray,this); break; + case KviKvsVariantData::Hash: tqDebug("%s Hash(ptr=0x%p,dict=0x%p) [this=0x%p]",prefix.local8Bit().data(),m_pData->m_u.pHash,m_pData->m_u.pHash->dict(),this); break; + case KviKvsVariantData::Integer: tqDebug("%s Integer(%ld) [this=0x%p]",prefix.local8Bit().data(),m_pData->m_u.iInteger,this); break; + case KviKvsVariantData::Real: tqDebug("%s Real(%f) [this=0x%p]",prefix.local8Bit().data(),*(m_pData->m_u.pReal),this); break; + case KviKvsVariantData::Boolean: tqDebug("%s Boolean(%s) [this=0x%p]",prefix.local8Bit().data(),m_pData->m_u.bBoolean ? "true" : "false",this); break; + case KviKvsVariantData::HObject: tqDebug("%s HObject(%p) [this=0x%p]",prefix.local8Bit().data(),m_pData->m_u.hObject,this); break; default: /* make gcc happy */ break; } } diff --git a/src/kvirc/kvs/kvi_kvs_variant.h b/src/kvirc/kvs/kvi_kvs_variant.h index 234bbc75..76d5366b 100644 --- a/src/kvirc/kvs/kvi_kvs_variant.h +++ b/src/kvirc/kvs/kvi_kvs_variant.h @@ -174,7 +174,7 @@ public: void takeFrom(KviKvsVariant * v); void takeFrom(KviKvsVariant &v); - void dump(const char * prefix) const; + void dump(const TQString &prefix) const; // returns -1 if this variant is greater than the other, 0 if are equal, 1 if the other is greater // if bPreferNumeric is true then when comparing strings a conversion to a numeric format diff --git a/src/kvirc/module/kvi_module.cpp b/src/kvirc/module/kvi_module.cpp index 6a4f30f5..3653cd2d 100644 --- a/src/kvirc/module/kvi_module.cpp +++ b/src/kvirc/module/kvi_module.cpp @@ -132,7 +132,7 @@ extern KVIRC_API KviModuleExtensionManager * g_pModuleExtensionManager; // FIXME: #warning "Move all the modules to the new locking method ?" -KviModule::KviModule(kvi_library_t handle,KviModuleInfo * info,const char * name,const char * filename) +KviModule::KviModule(kvi_library_t handle,KviModuleInfo * info,const TQString &name,const TQString &filename) : KviKvsModuleInterface() { m_dlHandle = handle; @@ -356,16 +356,14 @@ void * KviModule::getSymbol(const char * symname) void KviModule::getDefaultConfigFileName(KviStr &buffer) { - KviStr szName(KviStr::Format,"libkvi%s.kvc",m_szName.ptr()); - g_pApp->getLocalKvircDirectory(buffer,KviApp::ConfigPlugins,szName.ptr()); + TQString szName { TQString::fromLatin1("libkvi%1.kvc").arg(m_szName) }; + g_pApp->getLocalKvircDirectory(buffer,KviApp::ConfigPlugins,szName); } void KviModule::getDefaultConfigFileName(TQString &szBuffer) { - TQString tmp = "libkvi"; - tmp += m_szName.ptr(); - tmp += ".kvc"; - g_pApp->getLocalKvircDirectory(szBuffer,KviApp::ConfigPlugins,tmp); + TQString szName { TQString::fromLatin1("libkvi%1.kvc").arg(m_szName) }; + g_pApp->getLocalKvircDirectory(szBuffer,KviApp::ConfigPlugins,szName); } bool KviModule::ctrl(const char * operation,void * param) diff --git a/src/kvirc/module/kvi_module.h b/src/kvirc/module/kvi_module.h index 4c9c063a..897f104c 100644 --- a/src/kvirc/module/kvi_module.h +++ b/src/kvirc/module/kvi_module.h @@ -145,24 +145,24 @@ class KVIRC_API KviModule : public KviKvsModuleInterface friend class KviModuleManager; friend class KviUserParser; protected: - KviModule(kvi_library_t handle,KviModuleInfo * info,const char * name,const char * filename); + KviModule(kvi_library_t handle,KviModuleInfo * info,const TQString &name,const TQString &filename); public: ~KviModule(); // must be public for KviPointerList private: - KviStr m_szName; - KviStr m_szFileName; - KviModuleInfo * m_pModuleInfo; - kvi_library_t m_dlHandle; - unsigned int m_uLock; - long int m_lastAccessTime; + TQString m_szName; + TQString m_szFileName; + KviModuleInfo * m_pModuleInfo; + kvi_library_t m_dlHandle; + unsigned int m_uLock; + long int m_lastAccessTime; protected: void updateAccessTime(); unsigned int secondsSinceLastAccess(); public: // name of this module: always low case , single word - const char * name(){ return m_szName.ptr(); }; + TQString name(){ return m_szName; }; // filename of this module (with NO path): formatted as "libkvi%s.so",name() - const char * filename(){ return m_szFileName.ptr(); }; + TQString filename(){ return m_szFileName; }; kvi_library_t handle(){ return m_dlHandle; }; KviModuleInfo * moduleInfo(){ return m_pModuleInfo; }; diff --git a/src/kvirc/module/kvi_moduleextension.cpp b/src/kvirc/module/kvi_moduleextension.cpp index 7b182643..f72f1f31 100644 --- a/src/kvirc/module/kvi_moduleextension.cpp +++ b/src/kvirc/module/kvi_moduleextension.cpp @@ -149,9 +149,9 @@ void KviModuleExtensionManager::unregisterExtensionsByModule(KviModule * m) } } -KviModuleExtensionDescriptorList * KviModuleExtensionManager::allocateExtensionGetDescriptorList(const KviStr &szType,const char * preloadModule) +KviModuleExtensionDescriptorList * KviModuleExtensionManager::allocateExtensionGetDescriptorList(const KviStr &szType,const TQString &preloadModule) { - if(preloadModule) + if(!preloadModule.isEmpty()) { KviModule * m = g_pModuleManager->getModule(preloadModule); (void)m; // get rid of the unused warning :D @@ -181,7 +181,7 @@ KviModuleExtensionDescriptor * KviModuleExtensionManager::findExtensionDescripto return 0; } -KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &szType,const KviStr &szName,KviWindow * pWnd,KviPointerHashTable<TQString,TQVariant> * pParams,void * pSpecial,const char * preloadModule) +KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &szType,const KviStr &szName,KviWindow * pWnd,KviPointerHashTable<TQString,TQVariant> * pParams,void * pSpecial,const TQString &preloadModule) { KviModuleExtensionDescriptorList * l = allocateExtensionGetDescriptorList(szType,preloadModule); if(!l)return 0; @@ -208,7 +208,7 @@ KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr & } -KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &szType,int id,KviWindow * pWnd,KviPointerHashTable<TQString,TQVariant> * pParams,void * pSpecial,const char * preloadModule) +KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &szType,int id,KviWindow * pWnd,KviPointerHashTable<TQString,TQVariant> * pParams,void * pSpecial,const TQString &preloadModule) { KviModuleExtensionDescriptorList * l = allocateExtensionGetDescriptorList(szType,preloadModule); if(!l)return 0; diff --git a/src/kvirc/module/kvi_moduleextension.h b/src/kvirc/module/kvi_moduleextension.h index 7bbc360c..a39a5bcc 100644 --- a/src/kvirc/module/kvi_moduleextension.h +++ b/src/kvirc/module/kvi_moduleextension.h @@ -116,10 +116,10 @@ public: KviModuleExtensionDescriptor * findExtensionDescriptor(const KviStr &szType,const KviStr &szName); static KviModuleExtensionManager * instance(){ return g_pModuleExtensionManager; }; KviModuleExtensionDescriptorList * getExtensionList(const KviStr &szType); - KviModuleExtension * allocateExtension(const KviStr &szType,const KviStr &szName,KviWindow * pWnd = 0,KviPointerHashTable<TQString,TQVariant> * pParams = 0,void * pSpecial = 0,const char * preloadModule = 0); - KviModuleExtension * allocateExtension(const KviStr &szType,int id,KviWindow * pWnd = 0,KviPointerHashTable<TQString,TQVariant> * pParams = 0,void * pSpecial = 0,const char * preloadModule = 0); + KviModuleExtension * allocateExtension(const KviStr &szType,const KviStr &szName,KviWindow * pWnd = 0,KviPointerHashTable<TQString,TQVariant> * pParams = 0,void * pSpecial = 0,const TQString &preloadModule = TQString::null); + KviModuleExtension * allocateExtension(const KviStr &szType,int id,KviWindow * pWnd = 0,KviPointerHashTable<TQString,TQVariant> * pParams = 0,void * pSpecial = 0,const TQString &preloadModule = TQString::null); private: - KviModuleExtensionDescriptorList * allocateExtensionGetDescriptorList(const KviStr &szType,const char * preloadModule); + KviModuleExtensionDescriptorList * allocateExtensionGetDescriptorList(const KviStr &szType,const TQString &preloadModule); }; diff --git a/src/kvirc/module/kvi_modulemanager.cpp b/src/kvirc/module/kvi_modulemanager.cpp index 05e5aa89..e874c2eb 100644 --- a/src/kvirc/module/kvi_modulemanager.cpp +++ b/src/kvirc/module/kvi_modulemanager.cpp @@ -43,7 +43,7 @@ KviModuleManager * g_pModuleManager = 0; KviModuleManager::KviModuleManager() { - m_pModuleDict = new KviPointerHashTable<const char *,KviModule>(17,false); + m_pModuleDict = new KviPointerHashTable<TQString,KviModule>(17,false); m_pModuleDict->setAutoDelete(false); m_pCleanupTimer = new TQTimer(this); @@ -72,7 +72,7 @@ void KviModuleManager::loadModulesByCaps(const char * caps,const char * dir) { KviStr modname = *it; modname.cutToLast(KVI_PATH_SEPARATOR_CHAR); - getModule((*it).ascii()); + getModule((*it)); } } @@ -122,14 +122,14 @@ void KviModuleManager::completeModuleNames(const TQString &word,KviPointerList<T completeModuleNames(szDir,word,matches); } -KviModule * KviModuleManager::findModule(const char * modName) +KviModule * KviModuleManager::findModule(const TQString &modName) { KviModule * m = m_pModuleDict->find(modName); if(m)m->updateAccessTime(); return m; } -KviModule * KviModuleManager::getModule(const char * modName) +KviModule * KviModuleManager::getModule(const TQString &modName) { KviModule * m = m_pModuleDict->find(modName); if(!m) @@ -154,19 +154,18 @@ static bool default_module_cmd_unload(KviModule *m,KviCommand *) } */ -bool KviModuleManager::loadModule(const char * modName) +bool KviModuleManager::loadModule(const TQString &modName) { if(findModule(modName)) { - //tqDebug("MODULE %s ALREADY IN CORE MEMORY",modName); + //tqDebug("MODULE %s ALREADY IN CORE MEMORY",modName.local8Bit().data()); return true; } TQString tmp; - TQString szName; #ifdef COMPILE_ON_WINDOWS - KviTQString::appendFormatted(szName,"kvi%s.dll",modName); + TQString szName { TQString::fromLatin1("kvi%1.dll").arg(modName) }; #else - KviTQString::appendFormatted(szName,"libkvi%s.so",modName); + TQString szName { TQString::fromLatin1("libkvi%1.so").arg(modName) }; #endif szName=szName.lower(); @@ -181,7 +180,7 @@ bool KviModuleManager::loadModule(const char * modName) if(!handle) { m_szLastError = kvi_library_error(); - //tqDebug("ERROR IN LOADING MODULE %s (%s): %s",modName,szName.ptr(),kvi_library_error()); + //tqDebug("ERROR IN LOADING MODULE %s (%s): %s",modName.local8Bit().data(),szName.ptr(),kvi_library_error()); return false; } KviModuleInfo * info = (KviModuleInfo *)kvi_library_symbol(handle,KVIRC_MODULE_STRUCTURE_SYMBOL); @@ -209,7 +208,7 @@ bool KviModuleManager::loadModule(const char * modName) return false; } } - KviModule * module = new KviModule(handle,info,modName,szName.utf8().data()); + KviModule * module = new KviModule(handle,info,modName,szName); // the module is probably up.. the only thing can fail is the init_routine now // load the message catalogue if any @@ -230,7 +229,7 @@ bool KviModuleManager::loadModule(const char * modName) if(!((info->init_routine)(module))) { m_szLastError = __tr2qs("Failed to execute the init routine"); - //tqDebug("ERROR IN LOADING MODULE %s (%s): failed to execute the init routine",modName,szName.ptr()); + //tqDebug("ERROR IN LOADING MODULE %s (%s): failed to execute the init routine",modName.local8Bit().data(),szName.ptr()); kvi_library_close(handle); delete module; // kill the message catalogue too then @@ -258,7 +257,7 @@ bool KviModuleManager::loadModule(const char * modName) if(_OUTPUT_VERBOSE && !g_pApp->closingDown()) { if(g_pFrame)g_pFrame->firstConsole()->output(KVI_OUT_VERBOSE, - __tr2qs("Loaded module '%s' (%s)"),modName,szName.utf8().data()); + __tr2qs("Loaded module '%s' (%s)"),modName.utf8().data(),szName.utf8().data()); } return true; } @@ -271,7 +270,7 @@ void KviModuleManager::registerDefaultCommands(KviModule * module) module->registerCommand("unload",default_module_cmd_unload); } */ -bool KviModuleManager::unloadModule(const char * modName) +bool KviModuleManager::unloadModule(const TQString &modName) { return unloadModule(findModule(modName)); } @@ -310,7 +309,7 @@ bool KviModuleManager::unloadModule(KviModule * module) bool KviModuleManager::hasLockedModules() { - KviPointerHashTableIterator<const char *,KviModule> it(*m_pModuleDict); + KviPointerHashTableIterator<TQString,KviModule> it(*m_pModuleDict); while(KviModule * m = it.current()) { if(m->isLocked())return true; @@ -322,7 +321,7 @@ bool KviModuleManager::hasLockedModules() void KviModuleManager::cleanupUnusedModules() { - KviPointerHashTableIterator<const char *,KviModule> it(*m_pModuleDict); + KviPointerHashTableIterator<TQString,KviModule> it(*m_pModuleDict); KviPointerList<KviModule> lModulesToUnload; lModulesToUnload.setAutoDelete(false); @@ -354,7 +353,7 @@ void KviModuleManager::cleanupUnusedModules() void KviModuleManager::unloadAllModules() { - KviPointerHashTableIterator<const char *,KviModule> it(*m_pModuleDict); + KviPointerHashTableIterator<TQString,KviModule> it(*m_pModuleDict); KviPointerList<KviModule> lModulesToUnload; lModulesToUnload.setAutoDelete(false); diff --git a/src/kvirc/module/kvi_modulemanager.h b/src/kvirc/module/kvi_modulemanager.h index 79b34b5b..b89802ef 100644 --- a/src/kvirc/module/kvi_modulemanager.h +++ b/src/kvirc/module/kvi_modulemanager.h @@ -42,15 +42,15 @@ public: KviModuleManager(); ~KviModuleManager(); private: - KviPointerHashTable<const char *,KviModule> * m_pModuleDict; - TQTimer * m_pCleanupTimer; - KviStr m_szLastError; + KviPointerHashTable<TQString,KviModule> * m_pModuleDict; + TQTimer * m_pCleanupTimer; + KviStr m_szLastError; public: KviStr & lastError(){ return m_szLastError; }; - KviModule * findModule(const char * modName); - KviModule * getModule(const char * modName); - bool loadModule(const char * modName); - bool unloadModule(const char * modName); + KviModule * findModule(const TQString &modName); + KviModule * getModule(const TQString &modName); + bool loadModule(const TQString &modName); + bool unloadModule(const TQString &modName); bool unloadModule(KviModule * module); void unloadAllModules(); //void registerDefaultCommands(KviModule * module); diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp index a6c8f462..dfb3ab53 100644 --- a/src/kvirc/sparser/kvi_sp_ctcp.cpp +++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp @@ -1021,8 +1021,8 @@ void KviServerParser::echoCtcpRequest(KviCtcpMessage *msg) } else bIsChannel = true; } - TQString szRequest = pOut->decodeText(req); - TQString szTag = pOut->decodeText(msg->szTag); + TQString szRequest { req }; + TQString szTag { msg->szTag }; TQString szWhat = bIsChannel ? __tr2qs("Channel CTCP") : TQString("CTCP"); if(msg->bIsFlood) @@ -1315,7 +1315,7 @@ void KviServerParser::parseCtcpRequestTime(KviCtcpMessage *msg) { if(!KVI_OPTION_BOOL(KviOption_boolIgnoreCtcpTime)) { - replyCtcp(msg,TQDateTime::currentDateTime().toString()); + replyCtcp(msg,TQDateTime::currentDateTime().toString().utf8().data()); } else msg->bIgnored = true; } @@ -1333,7 +1333,7 @@ void KviServerParser::parseCtcpRequestPage(KviCtcpMessage *msg) { KVI_OPTION_STRING(KviOption_stringCtcpPageReply) = KVI_DEFAULT_CTCP_PAGE_REPLY; } - replyCtcp(msg,KVI_OPTION_STRING(KviOption_stringCtcpPageReply)); + replyCtcp(msg,KVI_OPTION_STRING(KviOption_stringCtcpPageReply).utf8().data()); if(KVI_OPTION_BOOL(KviOption_boolShowDialogOnCtcpPage)) { if(!g_pCtcpPageDialog)g_pCtcpPageDialog = new KviCtcpPageDialog(); @@ -1494,7 +1494,7 @@ void KviServerParser::parseCtcpRequestAvatar(KviCtcpMessage *msg) szFileName.replace(" ","_"); // escape the spaces with the right octal code - encodeCtcpParameter(szFileName,szReply); + encodeCtcpParameter(szFileName.utf8().data(),szReply); if(!a->isRemote()) @@ -1745,11 +1745,11 @@ void KviServerParser::parseCtcpRequestDcc(KviCtcpMessage *msg) { TQString decoded = msg->msg->console()->decodeText(p.szType.ptr()); msg->msg->console()->output(KVI_OUT_DCCREQUEST, - __tr2qs("Processing DCC %Q request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%s %s)"), + __tr2qs("Processing DCC %Q request from \r!n\r%Q\r [%Q@\r!h\r%Q\r] (%Q %s)"), &decoded,&(msg->pSource->nick()), &(msg->pSource->user()),&(msg->pSource->host()), - msg->msg->console()->decodeText(msg->szTag).data(), - msg->msg->console()->decodeText(aux.ptr()).data()); + msg->szTag, + msg->msg->console()->decodeText(aux.ptr())); } KviModule * m = g_pModuleManager->getModule("dcc"); diff --git a/src/kvirc/sparser/kvi_sp_literal.cpp b/src/kvirc/sparser/kvi_sp_literal.cpp index a8780759..08992496 100644 --- a/src/kvirc/sparser/kvi_sp_literal.cpp +++ b/src/kvirc/sparser/kvi_sp_literal.cpp @@ -1495,7 +1495,7 @@ void KviServerParser::parseLiteralNick(KviIrcMessage *msg) { // the target SHOULD have changed his nick here if(!q->nickChange(szNick,szNewNick)) - tqDebug("Internal error: query %s failed to change nick from %s to s",szNick.utf8().data(),szNick.utf8().data(),szNewNick.utf8().data()); + tqDebug("Internal error: query %s failed to change nick from %s to %s",szNick.local8Bit().data(),szNick.local8Bit().data(),szNewNick.local8Bit().data()); if(!msg->haltOutput()) q->output(KVI_OUT_NICK,__tr2qs("\r!n\r%Q\r [%Q@\r!h\r%Q\r] is now known as \r!n\r%Q\r"), &szNick,&szUser,&szHost,&szNewNick); diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp index c3041651..cb4ce52b 100644 --- a/src/kvirc/ui/kvi_channel.cpp +++ b/src/kvirc/ui/kvi_channel.cpp @@ -107,7 +107,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name m_pActionHistory->setAutoDelete(true); m_uActionHistoryHotActionCount = 0; - m_pTmpHighLighted = new KviPointerHashTable<const char *,TQString>(); + m_pTmpHighLighted = new KviPointerHashTable<TQString,TQString>(); m_pTmpHighLighted->setAutoDelete(true); // Register ourselves @@ -393,7 +393,8 @@ void KviChannel::toggleModeEditor() if(m_pModeEditorButton->isOn()) m_pModeEditorButton->setOn(false); resizeEvent(0); } else { - m_pModeEditor = new KviModeEditor(m_pSplitter,m_pModeEditorButton,"mode_editor",console(),m_szChannelMode,m_szChannelKey,m_szChannelLimit.ptr()); + m_pModeEditor = new KviModeEditor(m_pSplitter,m_pModeEditorButton,"mode_editor",console(), + m_szChannelMode.utf8().data(),m_szChannelKey.utf8().data(),m_szChannelLimit.ptr()); connect(m_pModeEditor,TQ_SIGNAL(setMode(const char *)),this,TQ_SLOT(setMode(const char *))); connect(m_pModeEditor,TQ_SIGNAL(done()),this,TQ_SLOT(modeSelectorDone())); m_pModeEditor->show(); @@ -556,28 +557,28 @@ void KviChannel::setChannelMode(char mode,bool bAdd) } } -void KviChannel::setChannelKey(const char * key) +void KviChannel::setChannelKey(const TQString &key) { m_szChannelKey = key; updateModeLabel(); updateCaption(); } -void KviChannel::setChannelLimit(const char * limit) +void KviChannel::setChannelLimit(const TQString &limit) { m_szChannelLimit = limit; updateModeLabel(); updateCaption(); } -void KviChannel::addHighlightedUser(const char * nick) +void KviChannel::addHighlightedUser(const TQString &nick) { if(!m_pUserListView->findEntry(nick))return; else m_pTmpHighLighted->replace(nick,new TQString()); } -void KviChannel::removeHighlightedUser(const char * nick) +void KviChannel::removeHighlightedUser(const TQString &nick) { m_pTmpHighLighted->remove(nick); } diff --git a/src/kvirc/ui/kvi_channel.h b/src/kvirc/ui/kvi_channel.h index 93867b40..bd223c6d 100644 --- a/src/kvirc/ui/kvi_channel.h +++ b/src/kvirc/ui/kvi_channel.h @@ -140,7 +140,7 @@ protected: KviPixmap m_privateBackground; TQDateTime m_joinTime; TQString m_szNameWithUserFlag; - KviPointerHashTable<const char *,TQString> * m_pTmpHighLighted; + KviPointerHashTable<TQString,TQString> * m_pTmpHighLighted; unsigned int m_uActionHistoryHotActionCount; KviPointerList<KviChannelAction> * m_pActionHistory; kvi_time_t m_tLastReceivedWhoReply; @@ -272,8 +272,8 @@ public: void ownMessage(const TQString &buffer); void ownAction(const TQString &buffer); void setChannelMode(char mode,bool bAdd); - void setChannelKey(const char * key); - void setChannelLimit(const char * limit); + void setChannelKey(const TQString &key); + void setChannelLimit(const TQString &limit); void getChannelModeString(TQString &buffer); @@ -283,10 +283,10 @@ public: bool hasChannelKey() { return !m_szChannelKey.isEmpty(); }; TQString & channelKey(){ return m_szChannelKey; }; - void addHighlightedUser(const char * nick); - void removeHighlightedUser(const char * nick); - bool isHighlightedUser(const char * nick) { return m_pTmpHighLighted->find(nick); }; - KviIrcView * messageView() const { return m_pMessageView; }; + void addHighlightedUser(const TQString &nick); + void removeHighlightedUser(const TQString &nick); + bool isHighlightedUser(const TQString &nick) { return m_pTmpHighLighted->find(nick); }; + KviIrcView * messageView() const { return m_pMessageView; }; virtual void lostUserFocus(); virtual void getTaskBarTipText(TQString &buffer); TQString channelMode() { return m_szChannelMode; }; diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp index 5f9fdf1b..a9ca67e2 100644 --- a/src/kvirc/ui/kvi_frame.cpp +++ b/src/kvirc/ui/kvi_frame.cpp @@ -469,7 +469,7 @@ void KviFrame::executeInternalCommand(int index) } -void KviFrame::saveWindowProperties(KviWindow * wnd,const char * szSection) +void KviFrame::saveWindowProperties(KviWindow * wnd,const TQString &szSection) { g_pWinPropertiesConfig->setGroup(szSection); g_pWinPropertiesConfig->writeEntry("EntryTimestamp",(unsigned int)time(0)); diff --git a/src/kvirc/ui/kvi_frame.h b/src/kvirc/ui/kvi_frame.h index b7486c26..22d164cb 100644 --- a/src/kvirc/ui/kvi_frame.h +++ b/src/kvirc/ui/kvi_frame.h @@ -161,7 +161,7 @@ public: // and the active irc context changes state void updateCaption(); // helper for saving the window properties - void saveWindowProperties(KviWindow * wnd,const char * szSection); + void saveWindowProperties(KviWindow * wnd,const TQString &szSection); // finds the module extension toolbar with the specified identifier // see kvi_moduleextension.h and kvi_mextoolbar.h KviMexToolBar * moduleExtensionToolBar(int extensionId); diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp index 5b3101e7..eed1c463 100644 --- a/src/kvirc/ui/kvi_input.cpp +++ b/src/kvirc/ui/kvi_input.cpp @@ -117,7 +117,7 @@ void KviInputHistory::add(TQString * s) if(m_pStringList->count() > KVI_INPUT_MAX_GLOBAL_HISTORY_ENTRIES)m_pStringList->removeLast(); } -void KviInputHistory::load(const char * filename) +void KviInputHistory::load(const TQString &filename) { KviConfig c(filename,KviConfig::Read); @@ -135,7 +135,7 @@ void KviInputHistory::load(const char * filename) } } -void KviInputHistory::save(const char * filename) +void KviInputHistory::save(const TQString &filename) { KviConfig c(filename,KviConfig::Write); c.clear(); @@ -2340,7 +2340,7 @@ void KviInput::inputEditorEnterPressed() void KviInput::keyPressEvent(TQKeyEvent *e) { - //tqDebug("KviInput::keyPressEvent(key:%d,state:%d,text:%s)",e->key(),e->state(),e->text().isEmpty() ? "empty" : e->text().utf8().data()); + //tqDebug("KviInput::keyPressEvent(key:%d,state:%d,text:%s)",e->key(),e->state(),e->text().isEmpty() ? "empty" : e->text().local8Bit().data()); if((e->state() & TQt::ControlButton) || (e->state() & TQt::AltButton) || (e->state() & TQt::MetaButton)) { diff --git a/src/kvirc/ui/kvi_input.h b/src/kvirc/ui/kvi_input.h index 60ee313d..2d1cb10c 100644 --- a/src/kvirc/ui/kvi_input.h +++ b/src/kvirc/ui/kvi_input.h @@ -67,8 +67,8 @@ protected: public: void add(TQString * s); KviPointerList<TQString> * list(){ return m_pStringList; }; - void save(const char * filename); - void load(const char * filename); + void save(const TQString &filename); + void load(const TQString &filename); }; diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp index 9422296e..6cd5d944 100644 --- a/src/kvirc/ui/kvi_ircview.cpp +++ b/src/kvirc/ui/kvi_ircview.cpp @@ -502,9 +502,7 @@ void KviIrcView::stopLogging() { if(m_pLogFile) { - TQString szLogEnd; - szLogEnd.sprintf(__tr2qs("### Log session terminated at %s ###"),TQDateTime::currentDateTime().toString().utf8().data()); - + TQString szLogEnd { __tr2qs("### Log session terminated at %1 ###").arg(TQDateTime::currentDateTime().toString()) }; add2Log(szLogEnd); m_pLogFile->close(); #ifdef COMPILE_ZLIB_SUPPORT @@ -676,8 +674,7 @@ bool KviIrcView::startLogging(const TQString& fname,bool bPrependCurBuffer) } } - TQString szLogStart; - szLogStart.sprintf(__tr2qs("### Log session started at %s ###"),TQDateTime::currentDateTime().toString().utf8().data()); + TQString szLogStart { __tr2qs("### Log session started at %1 ###").arg(TQDateTime::currentDateTime().toString()) }; add2Log(szLogStart); if(bPrependCurBuffer) { diff --git a/src/kvirc/ui/kvi_ircview.h b/src/kvirc/ui/kvi_ircview.h index 88717dfa..1ceeefcc 100644 --- a/src/kvirc/ui/kvi_ircview.h +++ b/src/kvirc/ui/kvi_ircview.h @@ -207,7 +207,7 @@ public slots: signals: void rightClicked(); void dndEntered(); - void fileDropped(const char *); + void fileDropped(const TQString&); private: void setCursorLine(KviIrcViewLine * l); KviIrcViewLine * getVisibleLineAt(int xPos,int yPos); diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp index 334530c4..bd3651f3 100644 --- a/src/kvirc/ui/kvi_query.cpp +++ b/src/kvirc/ui/kvi_query.cpp @@ -106,7 +106,7 @@ KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const TQString &nick) // FIXME: #warning "Maybe tell the user all that we know about the remote end(s)....channels..." m_pIrcView->enableDnd(true); - connect(m_pIrcView,TQ_SIGNAL(fileDropped(const char *)),this,TQ_SLOT(slotDndEvents(const char *))); + connect(m_pIrcView,TQ_SIGNAL(fileDropped(const TQString&)),this,TQ_SLOT(slotDndEvents(const TQString&))); updateCaption(); } @@ -253,9 +253,9 @@ TQString KviQuery::getInfoLabelText() } return tmp; } -void KviQuery::slotDndEvents(const char *file) +void KviQuery::slotDndEvents(const TQString &file) { - KVS_TRIGGER_EVENT_1(KviEvent_OnQueryFileDropped,this,TQString(file)); + KVS_TRIGGER_EVENT_1(KviEvent_OnQueryFileDropped,this,file); } void KviQuery::triggerCreationEvents() diff --git a/src/kvirc/ui/kvi_query.h b/src/kvirc/ui/kvi_query.h index 6f05063b..729fe87b 100644 --- a/src/kvirc/ui/kvi_query.h +++ b/src/kvirc/ui/kvi_query.h @@ -90,7 +90,7 @@ protected: protected slots: void textViewRightClicked(); void toggleListView(); - void slotDndEvents(const char *); + void slotDndEvents(const TQString&); }; #endif //_KVI_CHANNEL_H_ diff --git a/src/kvirc/ui/kvi_scriptbutton.h b/src/kvirc/ui/kvi_scriptbutton.h index c26b4332..e5857f2a 100644 --- a/src/kvirc/ui/kvi_scriptbutton.h +++ b/src/kvirc/ui/kvi_scriptbutton.h @@ -44,7 +44,7 @@ protected: public: void setButtonCode(KviKvsScript * pScript); virtual void setButtonPixmap(const TQPixmap & pix){ setIconSet(pix); }; - void setButtonText(const char * text){ setTextLabel(text); }; + void setButtonText(const TQString &text){ setTextLabel(text); }; virtual KviWindow * window(); protected slots: void btnClicked(); diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp index 16037a89..4d3cd1a7 100644 --- a/src/kvirc/ui/kvi_selectors.cpp +++ b/src/kvirc/ui/kvi_selectors.cpp @@ -274,19 +274,18 @@ void KviPixmapSelector::choosePixmap() } } -void KviPixmapSelector::setImagePath(const char * path) +void KviPixmapSelector::setImagePath(const TQString &path) { m_localPixmap.load(path); m_pPreview->setPixmap(&m_localPixmap); if(m_localPixmap.isNull()) { - KviStr tmp2(KviStr::Format,__tr("Unloadable: %s"),path); - m_pFileNameLabel->setText(tmp2.ptr()); + m_pFileNameLabel->setText(__tr2qs("Unloadable: %1").arg(path)); m_pCheckBox->setChecked(false); } else { - m_pCheckBox->setChecked(true); m_pFileNameLabel->setText(path); + m_pCheckBox->setChecked(true); } setEnabled(isEnabled()); diff --git a/src/kvirc/ui/kvi_selectors.h b/src/kvirc/ui/kvi_selectors.h index 843b31c3..7bd447f1 100644 --- a/src/kvirc/ui/kvi_selectors.h +++ b/src/kvirc/ui/kvi_selectors.h @@ -152,7 +152,7 @@ private: KviPixmap * m_pOption; KviPixmap m_localPixmap; public: - void setImagePath(const char * path); + void setImagePath(const TQString &path); virtual void commit(); virtual void setEnabled(bool bEnabled); protected slots: diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp index f34567b5..3d8be6a4 100644 --- a/src/kvirc/ui/kvi_statusbar.cpp +++ b/src/kvirc/ui/kvi_statusbar.cpp @@ -153,7 +153,7 @@ void KviStatusBar::load() tmp.sprintf("%s_PreloadModule",prefix.ptr()); TQString szPreloadModule = cfg.readEntry(tmp.ptr(),""); if(!szPreloadModule.isEmpty()) - g_pModuleManager->getModule(szPreloadModule.utf8().data()); + g_pModuleManager->getModule(szPreloadModule); KviStatusBarApplet * a = createApplet(szInternalName); if (a) diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp index e3df658a..378a0f14 100644 --- a/src/kvirc/ui/kvi_userlistview.cpp +++ b/src/kvirc/ui/kvi_userlistview.cpp @@ -1793,7 +1793,7 @@ void KviUserListViewArea::keyPressEvent( TQKeyEvent * e ) KviUserListEntry * aux = m_pListView->m_pHeadItem; while(aux) { - //tqDebug("%s %s %i %s %i",__FILE__,__FUNCTION__,__LINE__,aux->nick().utf8().data(),aux->nick().find(szKey,0,0)); + //tqDebug("%s %s %i %s %i",__FILE__,__FUNCTION__,__LINE__,aux->nick().local8Bit().data(),aux->nick().find(szKey,0,0)); if(aux->nick().find(szKey,0,0)==0) { nick=aux; diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp index 013e5215..977e2361 100644 --- a/src/kvirc/ui/kvi_window.cpp +++ b/src/kvirc/ui/kvi_window.cpp @@ -103,10 +103,6 @@ KviWindow::KviWindow(int type,KviFrame * lpFrm,const TQString &name,KviConsole * m_uId = g_uUniqueWindowId; g_uUniqueWindowId++; - - // FIXME: REMOVE THIS - setName(name); - // END FIXME m_szName = name; g_pApp->registerWindow(this); @@ -185,10 +181,10 @@ void KviWindow::toggleButtonContainer() } } -void KviWindow::setName(const char * name) +void KviWindow::setName(const TQString &name) { m_szName = name; - TQWidget::setName(name); + TQWidget::setName(name.utf8().data()); } KviIrcConnection * KviWindow::connection() @@ -847,7 +843,7 @@ void KviWindow::savePropertiesAsDefault() TQString group; getConfigGroupName(group); - if(!kvi_strEqualCI(group,typeString())) + if(!kvi_strEqualCI(group.utf8(),typeString())) { // save also the settings for THIS specialized window g_pFrame->saveWindowProperties(this,group); diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/kvi_window.h index dce7bb7c..f5abee09 100644 --- a/src/kvirc/ui/kvi_window.h +++ b/src/kvirc/ui/kvi_window.h @@ -183,7 +183,7 @@ public: const TQString & windowName(){ return m_szName; }; void setWindowName(const TQString &szName); // force TQt to set our UNICODE name too... FIXME: this should be removed later... - virtual void setName(const char * szName); + virtual void setName(const TQString &szName); // Window type management int type() const { return m_iType; }; diff --git a/src/modules/about/mkabouttext.pl b/src/modules/about/mkabouttext.pl index 0b58a42c..482bae72 100644 --- a/src/modules/about/mkabouttext.pl +++ b/src/modules/about/mkabouttext.pl @@ -70,7 +70,7 @@ sub p open(OUT,">abouttext.inc") or die "Can't open abouttext.inc"; -print OUT "static char * g_szAboutText = \"\" \\\n"; +print OUT "static const char * g_szAboutText = \"\" \\\n"; p "<html>"; p " <head>"; diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp index 608a90e5..02729582 100644 --- a/src/modules/actioneditor/actioneditor.cpp +++ b/src/modules/actioneditor/actioneditor.cpp @@ -383,7 +383,7 @@ void KviSingleActionEditor::chooseSmallIcon() TQString s = d->selectedImage(); delete d; if(ret != TQDialog::Accepted)return; - TQPixmap * p = g_pIconManager->getImage(s.utf8().data()); + TQPixmap * p = g_pIconManager->getImage(s); if(!p)return; m_pSmallIconEdit->setText(s); m_pSmallIconButton->setPixmap(*p); diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp index 57c31930..33664177 100644 --- a/src/modules/channelsjoin/channelsjoinwindow.cpp +++ b/src/modules/channelsjoin/channelsjoinwindow.cpp @@ -174,10 +174,10 @@ void KviChannelsJoinWindow::fillListView() par = new KviTalListViewItem(m_pListView,__tr2qs("Registered Channels")); par->setOpen(true); - KviPointerHashTable<const char *,KviRegisteredChannelList> * d = g_pRegisteredChannelDataBase->channelDict(); + KviPointerHashTable<TQString,KviRegisteredChannelList> * d = g_pRegisteredChannelDataBase->channelDict(); if(d) { - KviPointerHashTableIterator<const char *,KviRegisteredChannelList> it(*d); + KviPointerHashTableIterator<TQString,KviRegisteredChannelList> it(*d); while(it.current()) { chld = new KviTalListViewItem(par,it.currentKey()); diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp index a766f932..7131e233 100644 --- a/src/modules/dcc/broker.cpp +++ b/src/modules/dcc/broker.cpp @@ -576,7 +576,7 @@ void KviDccBroker::chooseSaveFileName(KviDccBox *box,KviDccDescriptor *dcc) if(KVI_OPTION_BOOL(KviOption_boolUseIncomingDccMediaTypeSavePath)) { g_pMediaManager->lock(); - if(KviMediaType * mt = g_pMediaManager->findMediaType(dcc->szFileName.utf8().data(),false)) + if(KviMediaType * mt = g_pMediaManager->findMediaType(dcc->szFileName,false)) { if(mt->szSavePath.hasData()) { diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp index 6be987b1..c2f0a269 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp +++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp @@ -88,7 +88,7 @@ #endif #endif -extern KVIRC_API KviPointerHashTable<const char *,KviWindow> * g_pGlobalWindowDict; +extern KVIRC_API KviPointerHashTable<TQString,KviWindow> * g_pGlobalWindowDict; static KviPointerList<KviDockWidget> * g_pDockWidgetList = 0; static TQPixmap * g_pDock1 = 0; @@ -380,7 +380,7 @@ void KviDockWidget::doAway(int id) { if(id<0) { - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { if(wnd->type()==KVI_WINDOW_TYPE_CONSOLE) @@ -425,7 +425,7 @@ void KviDockWidget::fillContextPopup() int iSeparator=m_pAwayPopup->insertSeparator(); - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); bool bAllAway=1; bool bAllUnaway=1; int iNetCount=0; diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp index 68a70d3f..62a49307 100644 --- a/src/modules/editor/scripteditor.cpp +++ b/src/modules/editor/scripteditor.cpp @@ -458,7 +458,7 @@ bool KviScriptEditorWidget::contextSensitiveHelp() const void KviScriptEditorWidget::getWordOnCursor(TQString &buffer,int index) const { TQRegExp re("[ \t=,\\(\\)\"}{\\[\\]\r\n+-*><;@!]"); - //tqDebug("BUFFER IS %s",buffer.utf8().data()); + //tqDebug("BUFFER IS %s",buffer.local8Bit().data()); int start = buffer.findRev(re,index); int end = buffer.find(re,index); @@ -471,7 +471,7 @@ void KviScriptEditorWidget::getWordOnCursor(TQString &buffer,int index) const tmp = buffer.mid(start,end-start); } buffer = tmp; - //tqDebug("BUFFER NOW IS %s",buffer.utf8().data()); + //tqDebug("BUFFER NOW IS %s",buffer.local8Bit().data()); } void KviScriptEditorWidget::completition(bool bCanComplete) diff --git a/src/modules/objects/class_xmlreader.cpp b/src/modules/objects/class_xmlreader.cpp index dfeea0c5..a897f9f2 100644 --- a/src/modules/objects/class_xmlreader.cpp +++ b/src/modules/objects/class_xmlreader.cpp @@ -325,7 +325,7 @@ bool KviKvsObject_xmlreader::function_parse(KviKvsObjectFunctionCall *c) TQByteArray data = utf8data; data.truncate(utf8data.length()); // don't include the null terminator in data source.setData(data); - //tqDebug("PARSING(%s) LEN(%d)",szString.utf8().data(),szString.utf8().length()); + //tqDebug("PARSING(%s) LEN(%d)",szString.local8Bit().data(),szString.local8Bit().length()); TQXmlSimpleReader reader; reader.setContentHandler(&handler); reader.setErrorHandler(&handler); diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp index f9c24501..3973fab9 100644 --- a/src/modules/options/optw_texticons.cpp +++ b/src/modules/options/optw_texticons.cpp @@ -79,7 +79,7 @@ void KviTextIconEditor::chooseFromFile() if(g_pIconManager->getPixmap(szFile)) { m_pIcon->setFilename(szFile); -// tqDebug("%s %s %i |%s| %p",__FILE__,__FUNCTION__,__LINE__,m_pIcon->filename().utf8().data(),m_pIcon); +// tqDebug("%s %s %i |%s| %p",__FILE__,__FUNCTION__,__LINE__,m_pIcon->filename().local8Bit().data(),m_pIcon); updateIcon(); } } diff --git a/src/modules/regchan/libkviregchan.cpp b/src/modules/regchan/libkviregchan.cpp index fe38cf34..a8b29de7 100644 --- a/src/modules/regchan/libkviregchan.cpp +++ b/src/modules/regchan/libkviregchan.cpp @@ -170,7 +170,7 @@ static bool regchan_kvs_cmd_setProperty(KviKvsModuleCommandCall * c) { if(!szValue.isEmpty()) { - ch->setProperty(szProperty.utf8().data(),new KviStr(szValue)); + ch->setProperty(szProperty,new KviStr(szValue)); } else { ch->removeProperty(szProperty); } @@ -199,7 +199,7 @@ static bool regchan_kvs_cmd_showlist(KviKvsModuleCommandCall * c) int tot = 0; - KviPointerHashTableIterator<const char *,KviRegisteredChannelList> it(*(g_pRegisteredChannelDataBase->channelDict())); + KviPointerHashTableIterator<TQString,KviRegisteredChannelList> it(*(g_pRegisteredChannelDataBase->channelDict())); while(KviRegisteredChannelList * l = it.current()) { for(KviRegisteredChannel * ch = l->first();ch;ch = l->next()) @@ -207,7 +207,7 @@ static bool regchan_kvs_cmd_showlist(KviKvsModuleCommandCall * c) tot++; c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Channel: %c%s@%s"), KVI_TEXT_BOLD,ch->name().ptr(),ch->netMask().ptr()); - KviPointerHashTableIterator<const char *,KviStr> pit(*(ch->propertyDict())); + KviPointerHashTableIterator<TQString,KviStr> pit(*(ch->propertyDict())); while(KviStr * s = pit.current()) { c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs(" Property: %s=%s"),pit.currentKey(),s->ptr()); @@ -259,8 +259,8 @@ static bool regchan_kvs_fnc_list(KviKvsModuleFunctionCall * c) if(szChan.isEmpty())szChan="*"; if(szNetmask.isEmpty())szNetmask="*"; - KviPointerHashTable<const char *,KviRegisteredChannelList> * d = g_pRegisteredChannelDataBase->channelDict(); - KviPointerHashTableIterator<const char *,KviRegisteredChannelList> it(*d); + KviPointerHashTable<TQString,KviRegisteredChannelList> * d = g_pRegisteredChannelDataBase->channelDict(); + KviPointerHashTableIterator<TQString,KviRegisteredChannelList> it(*d); while(KviRegisteredChannelList * l = it.current()) { diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp index d508ed39..1c3b61f9 100644 --- a/src/modules/snd/libkvisnd.cpp +++ b/src/modules/snd/libkvisnd.cpp @@ -434,7 +434,7 @@ void KviSoundThread::run() if(!f.open(IO_ReadOnly)) { - tqDebug("Could not open sound file %s! [OSS]",m_szFileName.utf8().data()); + tqDebug("Could not open sound file %s! [OSS]",m_szFileName.local8Bit().data()); return; } @@ -442,13 +442,13 @@ void KviSoundThread::run() if(iSize < 24) { - tqDebug("Could not play sound, file %s too small! [OSS]",m_szFileName.utf8().data()); + tqDebug("Could not play sound, file %s too small! [OSS]",m_szFileName.local8Bit().data()); goto exit_thread; } if(f.readBlock(buf,24) < 24) { - tqDebug("Error while reading the sound file header (%s)! [OSS]",m_szFileName.utf8().data()); + tqDebug("Error while reading the sound file header (%s)! [OSS]",m_szFileName.local8Bit().data()); goto exit_thread; } @@ -472,7 +472,7 @@ void KviSoundThread::run() int iReaded = f.readBlock(buf + iDataLen,iToRead); if(iReaded < 1) { - tqDebug("Error while reading the file data (%s)! [OSS]",m_szFileName.utf8().data()); + tqDebug("Error while reading the file data (%s)! [OSS]",m_szFileName.local8Bit().data()); goto exit_thread; } iSize -= iReaded; @@ -485,7 +485,7 @@ void KviSoundThread::run() { if((errno != EINTR) && (errno != EAGAIN)) { - tqDebug("Error while writing the audio data (%s)! [OSS]",m_szFileName.utf8().data()); + tqDebug("Error while writing the audio data (%s)! [OSS]",m_szFileName.local8Bit().data()); goto exit_thread; } } @@ -519,7 +519,7 @@ void KviSoundThread::run() { // ESD has a really nice API if(!esd_play_file(NULL,m_szFileName.utf8().data(),1)) - tqDebug("Could not play sound %s! [ESD]",m_szFileName.utf8().data()); + tqDebug("Could not play sound %s! [ESD]",m_szFileName.local8Bit().data()); } #endif //COMPILE_ESD_SUPPORT @@ -542,7 +542,7 @@ void KviSoundThread::run() Arts::SimpleSoundServer *server = new Arts::SimpleSoundServer(Arts::Reference("global:Arts_SimpleSoundServer")); if(server->isNull()) { - tqDebug("Can't connect to sound server to play file %s",m_szFileName.utf8().data()); + tqDebug("Can't connect to sound server to play file %s",m_szFileName.local8Bit().data()); } else { server->play(m_szFileName); } diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp index 911a3f9f..67afa62f 100644 --- a/src/modules/tip/libkvitip.cpp +++ b/src/modules/tip/libkvitip.cpp @@ -204,7 +204,7 @@ void KviTipWindow::nextTip() KviStr tmp(KviStr::Format,"%u",uNextTip); TQString szTip = m_pConfig->readEntry(tmp.ptr(),__tr2qs("<b>Can't find any tip... :(</b>")); - //tqDebug("REDECODED=%s",szTip.utf8().data()); + //tqDebug("REDECODED=%s",szTip.local8Bit().data()); uNextTip++; if(uNextTip >= uNumTips)uNextTip = 0; diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp index e93bfe1f..c33ba952 100644 --- a/src/modules/toolbareditor/toolbareditor.cpp +++ b/src/modules/toolbareditor/toolbareditor.cpp @@ -199,7 +199,7 @@ KviCustomToolBarPropertiesDialog::~KviCustomToolBarPropertiesDialog() void KviCustomToolBarPropertiesDialog::iconSelected(const TQString &szIconId) { - TQPixmap * p = g_pIconManager->getImage(szIconId.utf8().data()); + TQPixmap * p = g_pIconManager->getImage(szIconId); if(p) { m_pIconButton->setPixmap(*p); diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp index 3624402d..ee82b9c9 100644 --- a/src/modules/window/libkviwindow.cpp +++ b/src/modules/window/libkviwindow.cpp @@ -54,7 +54,7 @@ // kvi_app.cpp -extern KVIRC_API KviPointerHashTable<const char *,KviWindow> * g_pGlobalWindowDict; +extern KVIRC_API KviPointerHashTable<TQString,KviWindow> * g_pGlobalWindowDict; KviPointerList<KviUserWindow> * g_pUserWindowList = 0; // $window.caption $window.x $window.y $window.width $window.height $window.isActive $window.type @@ -71,7 +71,7 @@ KviPointerList<KviUserWindow> * g_pUserWindowList = 0; { \ pWnd = c->window(); \ } else { \ - pWnd = g_pApp->findWindow(szWnd.utf8().data()); \ + pWnd = g_pApp->findWindow(szWnd); \ if(!pWnd) \ { \ if(!c->hasSwitch('q',"quiet")) \ @@ -90,7 +90,7 @@ KviPointerList<KviUserWindow> * g_pUserWindowList = 0; { \ pWnd = c->window(); \ } else { \ - pWnd = g_pApp->findWindow(szWnd.utf8().data()); \ + pWnd = g_pApp->findWindow(szWnd); \ if(!pWnd) \ return true; \ } @@ -858,7 +858,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) { // all contexts but no "no_context" windows bool bAllWindows = KviTQString::equalCI(szType,"all"); - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { @@ -882,7 +882,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) { // all contexts and also "no_context" windows bool bAllWindows = KviTQString::equalCI(szType.lower(),"all"); - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { @@ -903,7 +903,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) { // only "no_context" windows bool bAllWindows = KviTQString::equalCI(szType.lower(),"all"); - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { @@ -948,7 +948,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) } bool bAllWindows = KviTQString::equalCI(szType.lower(),"all"); - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { @@ -1104,7 +1104,7 @@ static bool window_kvs_cmd_setCaption(KviKvsModuleCommandCall * c) KVSM_PARAMETER("html_active_caption",KVS_PT_STRING,KVS_PF_OPTIONAL,szActive) KVSM_PARAMETERS_END(c) - pWnd = g_pApp->findWindow(szWnd.utf8().data()); + pWnd = g_pApp->findWindow(szWnd); if(!pWnd) { if(!c->hasSwitch('q',"quiet")) @@ -1150,7 +1150,7 @@ static bool window_kvs_cmd_setInputText(KviKvsModuleCommandCall * c) KVSM_PARAMETER("text",KVS_PT_STRING,0, szText) KVSM_PARAMETERS_END(c) - pWnd = g_pApp->findWindow(szWnd.utf8().data()); + pWnd = g_pApp->findWindow(szWnd); if(!pWnd) { if(!c->hasSwitch('q',"quiet")) @@ -1195,7 +1195,7 @@ static bool window_kvs_cmd_insertInInputText(KviKvsModuleCommandCall * c) KVSM_PARAMETER("text",KVS_PT_STRING,0, szText) KVSM_PARAMETERS_END(c) - pWnd = g_pApp->findWindow(szWnd.utf8().data()); + pWnd = g_pApp->findWindow(szWnd); if(!pWnd) { if(!c->hasSwitch('q',"quiet")) @@ -1268,7 +1268,7 @@ static bool window_kvs_cmd_setBackground(KviKvsModuleCommandCall * c) KVSM_PARAMETER("plain_text_caption",KVS_PT_STRING,0, szBackground) KVSM_PARAMETERS_END(c) - pWnd = g_pApp->findWindow(szWnd.utf8().data()); + pWnd = g_pApp->findWindow(szWnd); if(!pWnd) { if(!c->hasSwitch('q',"quiet")) @@ -1401,7 +1401,7 @@ static bool window_kvs_cmd_setCryptEngine(KviKvsModuleCommandCall * c) KVSM_PARAMETERS_END(c) if(szDecryptKey.isEmpty())szDecryptKey = szEncryptKey; #ifdef COMPILE_CRYPT_SUPPORT - pWnd = g_pApp->findWindow(szWnd.utf8().data()); + pWnd = g_pApp->findWindow(szWnd); if(!pWnd) { if(!c->hasSwitch('q',"quiet")) |