summaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/about/mkabouttext.pl2
-rw-r--r--src/modules/actioneditor/actioneditor.cpp2
-rw-r--r--src/modules/channelsjoin/channelsjoinwindow.cpp4
-rw-r--r--src/modules/dcc/broker.cpp2
-rw-r--r--src/modules/dockwidget/libkvidockwidget_qt3.cpp6
-rw-r--r--src/modules/editor/scripteditor.cpp4
-rw-r--r--src/modules/objects/class_xmlreader.cpp2
-rw-r--r--src/modules/options/optw_texticons.cpp2
-rw-r--r--src/modules/regchan/libkviregchan.cpp10
-rw-r--r--src/modules/snd/libkvisnd.cpp14
-rw-r--r--src/modules/tip/libkvitip.cpp2
-rw-r--r--src/modules/toolbareditor/toolbareditor.cpp2
-rw-r--r--src/modules/window/libkviwindow.cpp24
13 files changed, 38 insertions, 38 deletions
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"))
generated by cgit v1.2.3 (git 2.46.0) at 2026-02-04 05:16:02 +0000