summaryrefslogtreecommitdiffstats
path: root/src/modules/objects
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/objects')
-rw-r--r--src/modules/objects/class_dockwindow.cpp2
-rw-r--r--src/modules/objects/class_file.cpp9
-rw-r--r--src/modules/objects/class_lineedit.cpp2
-rw-r--r--src/modules/objects/class_multilineedit.cpp2
-rw-r--r--src/modules/objects/class_painter.cpp6
-rw-r--r--src/modules/objects/class_socket.cpp20
-rw-r--r--src/modules/objects/class_socket.h4
-rw-r--r--src/modules/objects/class_toolbutton.cpp2
-rw-r--r--src/modules/objects/class_widget.cpp2
-rw-r--r--src/modules/objects/class_wrapper.cpp11
-rw-r--r--src/modules/objects/class_wrapper.h4
-rw-r--r--src/modules/objects/libkviobjects.cpp6
12 files changed, 33 insertions, 37 deletions
diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp
index f42f72df..db589358 100644
--- a/src/modules/objects/class_dockwindow.cpp
+++ b/src/modules/objects/class_dockwindow.cpp
@@ -91,7 +91,7 @@ KVSO_END_DESTRUCTOR(KviKvsObject_dockwindow)
bool KviKvsObject_dockwindow::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams)
{
- setObject(new TQT_DOCK_WINDOW(g_pFrame,getName()),true);
+ setObject(new TQT_DOCK_WINDOW(g_pFrame,getName().utf8().data()),true);
return true;
}
diff --git a/src/modules/objects/class_file.cpp b/src/modules/objects/class_file.cpp
index 9195f117..89237ed4 100644
--- a/src/modules/objects/class_file.cpp
+++ b/src/modules/objects/class_file.cpp
@@ -296,8 +296,7 @@ bool KviKvsObject_file::functionputch(KviKvsObjectFunctionCall *c)
if (m_pFile)
{
if (szChar.length()>1)c->warning(__tr2qs("Argument to long, using only first char"));
- const char *ch=szChar;
- if (m_pFile->putch(ch[0])<0) c->warning(__tr2qs("Write error occured !"));
+ if (m_pFile->putch(szChar.utf8().data()[0])<0) c->warning(__tr2qs("Write error occured !"));
}
return true;
@@ -328,8 +327,7 @@ bool KviKvsObject_file::functionunGetch(KviKvsObjectFunctionCall *c)
else
{
if (szChar.length()>1) c->warning(__tr2qs("Argument to long, using only first char"));
- const char *ch=szChar;
- if (m_pFile->ungetch(ch[0])<0) c->warning(__tr2qs("An error occured !"));// c->error ?
+ if (m_pFile->ungetch(szChar.utf8().data()[0])<0) c->warning(__tr2qs("An error occured !"));// c->error ?
}
return true;
}
@@ -365,8 +363,7 @@ bool KviKvsObject_file::functionwriteBlock(KviKvsObjectFunctionCall *c)
if (!m_pFile) return true;
if(!m_pFile->isOpen())
c->warning(__tr("File is not open !"));
- const char *block=szBlock;
- int rlen = m_pFile->writeBlock(block, uLen);
+ int rlen = m_pFile->writeBlock(szBlock.utf8().data(), uLen);
c->returnValue()->setInteger(rlen);
m_pFile->flush();
return true;
diff --git a/src/modules/objects/class_lineedit.cpp b/src/modules/objects/class_lineedit.cpp
index 650af411..d51f4df8 100644
--- a/src/modules/objects/class_lineedit.cpp
+++ b/src/modules/objects/class_lineedit.cpp
@@ -217,7 +217,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_lineedit)
bool KviKvsObject_lineedit::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams)
{
- setObject(new TQLineEdit(parentScriptWidget(),getName()),true);
+ setObject(new TQLineEdit(parentScriptWidget(),getName().utf8().data()),true);
connect(widget(),TQ_SIGNAL(returnPressed()),this,TQ_SLOT(slotreturnPressed()));
connect(widget(),TQ_SIGNAL(lostFocus()),this,TQ_SLOT(slotlostFocus()));
connect(widget(),TQ_SIGNAL(textChanged(const TQString & )),this,TQ_SLOT(slottextChanged(const TQString & )));
diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp
index 3205800a..12faa34b 100644
--- a/src/modules/objects/class_multilineedit.cpp
+++ b/src/modules/objects/class_multilineedit.cpp
@@ -340,7 +340,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_mledit)
bool KviKvsObject_mledit::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams)
{
- setObject(new KviTalMultiLineEdit(parentScriptWidget(),getName()),true);
+ setObject(new KviTalMultiLineEdit(parentScriptWidget(),getName().utf8().data()),true);
return true;
}
diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp
index 9c510044..83b44974 100644
--- a/src/modules/objects/class_painter.cpp
+++ b/src/modules/objects/class_painter.cpp
@@ -408,7 +408,7 @@ if(__pXOrArray->isArray())\
if(c->params()->count() < 4)\
{\
TQString error=function+" requires either an array as first parameter or four integers";\
- c->error(__tr2qs(error));\
+ c->error(__tr2qs(error.local8Bit().data()));\
return false;\
}\
if(!__pXOrArray->asInteger(iX))\
@@ -442,7 +442,7 @@ if(__pXOrArray->isArray())\
if(c->params()->count() < 2)\
{\
TQString error=function+" requires either an array as first parameter or two integers";\
- c->error(__tr2qs(error));\
+ c->error(__tr2qs(error.local8Bit().data()));\
return false;\
}\
if(!__pXOrArray->asInteger(iX))\
@@ -477,7 +477,7 @@ if(__pCol1OrArray->isArray())\
if(c->params()->count() < 3)\
{\
TQString error=function+" requires either an array as first parameter or 3 integers";\
- c->error(__tr2qs(error));\
+ c->error(__tr2qs(error.local8Bit().data()));\
return false;\
}\
if(!__pCol1OrArray->asInteger(iCol1))\
diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp
index edf086b3..686a5de7 100644
--- a/src/modules/objects/class_socket.cpp
+++ b/src/modules/objects/class_socket.cpp
@@ -600,18 +600,18 @@ bool KviKvsObject_socket::functionConnect(KviKvsObjectFunctionCall *c)
#ifdef COMPILE_IPV6_SUPPORT
- if(kvi_isValidStringIp(m_szRemoteIp) || kvi_isValidStringIp_V6(m_szRemoteIp))
+ if(kvi_isValidStringIp(m_szRemoteIp.utf8().data()) || kvi_isValidStringIp_V6(m_szRemoteIp.utf8().data()))
#else
- if(kvi_isValidStringIp(m_szRemoteIp))
+ if(kvi_isValidStringIp(m_szRemoteIp.utf8().data()))
#endif
{
tqDebug ("ok connecting");
- tqDebug ("connectinhg on ip %s ",m_szRemoteIp.latin1());
+ tqDebug ("connectinhg on ip %s ",m_szRemoteIp.local8Bit().data());
tqDebug ("non so ip");
m_iStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTING;
delayedConnect();
} else {
- tqDebug ("connectinhg on ip %s port %d",m_szRemoteIp.latin1(),m_uRemotePort);
+ tqDebug ("connectinhg on ip %s port %ld",m_szRemoteIp.local8Bit().data(),m_uRemotePort);
m_iStatus = KVI_SCRIPT_SOCKET_STATUS_DNS;
delayedLookupRemoteIp();
}
@@ -658,10 +658,10 @@ bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c)
{
// Check the address type
- if(kvi_isValidStringIp(m_szLocalIp))bGotIp = true;
+ if(kvi_isValidStringIp(m_szLocalIp.utf8().data()))bGotIp = true;
else {
#ifdef COMPILE_IPV6_SUPPORT
- if(kvi_isValidStringIp_V6(m_szLocalIp))
+ if(kvi_isValidStringIp_V6(m_szLocalIp.utf8().data()))
{
bGotIp = true;
m_bIpV6 = true;
@@ -697,9 +697,9 @@ bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c)
if(!m_szLocalIp.isEmpty())
{
#ifdef COMPILE_IPV6_SUPPORT
- KviSockaddr sa(m_szLocalIp,m_uLocalPort,m_bIpV6,m_bUdp);
+ KviSockaddr sa(m_szLocalIp.utf8().data(),m_uLocalPort,m_bIpV6,m_bUdp);
#else
- KviSockaddr sa(m_szLocalIp,m_uLocalPort,false,m_bUdp);
+ KviSockaddr sa(m_szLocalIp.utf8().data(),m_uLocalPort,false,m_bUdp);
#endif
if(!sa.socketAddress())
{
@@ -826,7 +826,7 @@ void KviKvsObject_socket::incomingConnection(int)
} // else..huh ?... wait for the next notifier call
}
-void KviKvsObject_socket::acceptConnection(kvi_socket_t s,kvi_u32_t uPort,const char * szIp)
+void KviKvsObject_socket::acceptConnection(kvi_socket_t s,kvi_u32_t uPort,const TQString &szIp)
{
reset();
m_sock = s;
@@ -868,7 +868,7 @@ void KviKvsObject_socket::doConnect()
m_pDelayTimer = 0;
- KviSockaddr sa(m_szRemoteIp,m_uRemotePort,!kvi_isValidStringIp(m_szRemoteIp),m_bUdp);
+ KviSockaddr sa(m_szRemoteIp.utf8().data(),m_uRemotePort,!kvi_isValidStringIp(m_szRemoteIp.utf8().data()),m_bUdp);
if(!sa.socketAddress())
{
diff --git a/src/modules/objects/class_socket.h b/src/modules/objects/class_socket.h
index bcb0284f..6b185b10 100644
--- a/src/modules/objects/class_socket.h
+++ b/src/modules/objects/class_socket.h
@@ -92,7 +92,7 @@ protected:
void eatInData(unsigned int uLen);
unsigned int readGetLength(KviParameterList * params);
- void acceptConnection(kvi_socket_t s,unsigned short int uPort,const char * szIp);
+ void acceptConnection(kvi_socket_t s,unsigned short int uPort,const TQString &szIp);
void reset();
protected slots:
@@ -171,7 +171,7 @@ protected:
void eatInData(unsigned int uLen);
unsigned int readGetLength(KviKvsObjectFunctionCall * params);
- void acceptConnection(kvi_socket_t s,kvi_u32_t uPort,const char * szIp);
+ void acceptConnection(kvi_socket_t s,kvi_u32_t uPort,const TQString &szIp);
void reset();
protected slots:
diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp
index 35a16c20..5eb72bff 100644
--- a/src/modules/objects/class_toolbutton.cpp
+++ b/src/modules/objects/class_toolbutton.cpp
@@ -235,7 +235,7 @@ bool KviKvsObject_toolbutton::functionsetTextLabel(KviKvsObjectFunctionCall *c)
if(!widget()) return true;
if (szTip.isEmpty()) ((TQToolButton *)widget())->setTextLabel(szLabel);
- else ((TQToolButton *)widget())->setTextLabel(szLabel,szTip);
+ else ((TQToolButton *)widget())->setTextLabel(szLabel,true);
return true;
}
bool KviKvsObject_toolbutton::functiontextLabel(KviKvsObjectFunctionCall *c)
diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
index e04ce2b1..69f416f1 100644
--- a/src/modules/objects/class_widget.cpp
+++ b/src/modules/objects/class_widget.cpp
@@ -592,7 +592,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_widget)
bool KviKvsObject_widget::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams)
{
- setObject(new TQWidget(parentScriptWidget(),getName()),true);
+ setObject(new TQWidget(parentScriptWidget(),getName().utf8().data()),true);
return true;
}
diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp
index f18858ee..9a14f5d8 100644
--- a/src/modules/objects/class_wrapper.cpp
+++ b/src/modules/objects/class_wrapper.cpp
@@ -178,7 +178,7 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
return true;
}
-TQWidget *KviKvsObject_wrapper::findTopLevelWidgetToWrap(const TQString szClass, const TQString szName)
+TQWidget *KviKvsObject_wrapper::findTopLevelWidgetToWrap(const TQString &szClass, const TQString &szName)
{
TQWidgetList *list = g_pApp->topLevelWidgets();
@@ -188,11 +188,11 @@ TQWidget *KviKvsObject_wrapper::findTopLevelWidgetToWrap(const TQString szClass,
while( it.current() ) {
bool bNameMatch = false;
bool bClassMatch = false;
- if( szName )
+ if( !szName.isEmpty() )
bNameMatch = KviTQString::equalCI(it.current()->name(), szName);
else
bNameMatch = true;
- if( szClass )
+ if( !szClass.isEmpty() )
bClassMatch = KviTQString::equalCI(it.current()->className(), szClass);
else
bClassMatch = true;
@@ -208,10 +208,9 @@ TQWidget *KviKvsObject_wrapper::findTopLevelWidgetToWrap(const TQString szClass,
return 0;
}
-TQWidget *KviKvsObject_wrapper::findWidgetToWrap(const char *szClass, const char *szName, TQWidget *childOf)
+TQWidget *KviKvsObject_wrapper::findWidgetToWrap(const TQString &szClass, const TQString &szName, TQWidget *childOf)
{
-
- TQObjectList *list = childOf->queryList(szClass ? szClass : 0, szName ? szName : 0, false, true);
+ TQObjectList *list = childOf->queryList(!szClass.isEmpty() ? szClass.utf8().data() : 0, !szName.isEmpty() ? szName.utf8().data() : 0, false, true);
if( !list ) return 0;
TQObjectListIt it(*list);
diff --git a/src/modules/objects/class_wrapper.h b/src/modules/objects/class_wrapper.h
index f1707311..ba26424b 100644
--- a/src/modules/objects/class_wrapper.h
+++ b/src/modules/objects/class_wrapper.h
@@ -44,8 +44,8 @@ public:
TQWidget * widget() { return (TQWidget *)object(); };
protected:
virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams);
- TQWidget * findTopLevelWidgetToWrap(const TQString szClass, const TQString szName);
- TQWidget * findWidgetToWrap(const char *szClass, const char *szName, TQWidget *childOf);
+ TQWidget * findTopLevelWidgetToWrap(const TQString &szClass, const TQString &szName);
+ TQWidget * findWidgetToWrap(const TQString &szClass, const TQString &szName, TQWidget *childOf);
};
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 782b486d..b62b5c50 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -84,7 +84,7 @@
#include "class_dockwindow.h"
#include "class_vbox.h"
#include "class_hbox.h"
-static void dumpChildObjects(KviWindow *pWnd, TQObject *parent, const char *spacing, bool bWidgetsOnly, KviKvsArray *n, int &idx);
+static void dumpChildObjects(KviWindow *pWnd, TQObject *parent, const TQString &spacing, bool bWidgetsOnly, KviKvsArray *n, int &idx);
static bool objects_module_cleanup(KviModule *m)
{
@@ -853,7 +853,7 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd)
return true;
}
-static void dumpChildObjects(KviWindow *pWnd, TQObject *parent, const char *spacing, bool bFlag, KviKvsArray *n, int &idx)
+static void dumpChildObjects(KviWindow *pWnd, TQObject *parent, const TQString &spacing, bool bFlag, KviKvsArray *n, int &idx)
{
const TQObjectList l = parent->childrenListObject();
if( l.isEmpty() ) return;
@@ -867,7 +867,7 @@ static void dumpChildObjects(KviWindow *pWnd, TQObject *parent, const char *spac
if (bFlag)
{
pWnd->output(80, "%sPtr %u: object: %c%s%c, class %s",
- spacing, it.current(), KVI_TEXT_BOLD,
+ spacing.local8Bit().data(), it.current(), KVI_TEXT_BOLD,
it.current()->name(), KVI_TEXT_BOLD, it.current()->className()
);
}
generated by cgit v1.2.3 (git 2.46.0) at 2026-02-22 04:50:43 +0000