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.cpp48
-rw-r--r--src/modules/objects/class_label.cpp2
-rw-r--r--src/modules/objects/class_socket.cpp2
-rw-r--r--src/modules/objects/class_wrapper.cpp2
-rw-r--r--src/modules/objects/libkviobjects.cpp8
5 files changed, 31 insertions, 31 deletions
diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp
index 35d9c070..aa9c8f88 100644
--- a/src/modules/objects/class_dockwindow.cpp
+++ b/src/modules/objects/class_dockwindow.cpp
@@ -217,25 +217,25 @@ bool KviKvsObject_dockwindow::function_setAllowedDockAreas(KviKvsObjectFunctionC
#ifdef COMPILE_USE_QT4
TQt::DockWidgetAreas fAreas = TQt::NoDockWidgetArea;
- if(szFlags.tqfind('t',false))fAreas |= TQt::TopDockWidgetArea;
- if(szFlags.tqfind('l',false))fAreas |= TQt::LeftDockWidgetArea;
- if(szFlags.tqfind('r',false))fAreas |= TQt::RightDockWidgetArea;
- if(szFlags.tqfind('b',false))fAreas |= TQt::BottomDockWidgetArea;
+ if(szFlags.find('t',false))fAreas |= TQt::TopDockWidgetArea;
+ if(szFlags.find('l',false))fAreas |= TQt::LeftDockWidgetArea;
+ if(szFlags.find('r',false))fAreas |= TQt::RightDockWidgetArea;
+ if(szFlags.find('b',false))fAreas |= TQt::BottomDockWidgetArea;
_pDockWindow->setAllowedAreas(fAreas);
TQDockWidget::DockWidgetFeatures fFeatures = _pDockWindow->features();
- if(szFlags.tqfind('f',false))
+ if(szFlags.find('f',false))
fFeatures |= TQDockWidget::DockWidgetFloatable;
else
fFeatures &= ~TQDockWidget::DockWidgetFloatable;
// no support for minimized dock widgets
_pDockWindow->setFeatures(fFeatures);
#else //!COMPILE_USE_QT4
- g_pFrame->setDockEnabled(_pDockWindow,TQt::DockTop,szFlags.tqfind('t',false) != -1);
- g_pFrame->setDockEnabled(_pDockWindow,TQt::DockLeft,szFlags.tqfind('l',false) != -1);
- g_pFrame->setDockEnabled(_pDockWindow,TQt::DockRight,szFlags.tqfind('r',false) != -1);
- g_pFrame->setDockEnabled(_pDockWindow,TQt::DockBottom,szFlags.tqfind('b',false) != -1);
- g_pFrame->setDockEnabled(_pDockWindow,TQt::DockTornOff,szFlags.tqfind('f',false) != -1);
- g_pFrame->setDockEnabled(_pDockWindow,TQt::DockMinimized,szFlags.tqfind('m',false) != -1);
+ g_pFrame->setDockEnabled(_pDockWindow,TQt::DockTop,szFlags.find('t',false) != -1);
+ g_pFrame->setDockEnabled(_pDockWindow,TQt::DockLeft,szFlags.find('l',false) != -1);
+ g_pFrame->setDockEnabled(_pDockWindow,TQt::DockRight,szFlags.find('r',false) != -1);
+ g_pFrame->setDockEnabled(_pDockWindow,TQt::DockBottom,szFlags.find('b',false) != -1);
+ g_pFrame->setDockEnabled(_pDockWindow,TQt::DockTornOff,szFlags.find('f',false) != -1);
+ g_pFrame->setDockEnabled(_pDockWindow,TQt::DockMinimized,szFlags.find('m',false) != -1);
#endif //!COMPILE_USE_QT4
return true;
@@ -252,22 +252,22 @@ bool KviKvsObject_dockwindow::function_dock(KviKvsObjectFunctionCall * c)
if(!widget())return true; // hum ? dead ?
#ifdef COMPILE_USE_QT4
g_pFrame->removeDockWidget(_pDockWindow);
- if(szDock.tqfind('m',false) == -1)_pDockWindow->setFloating(false);
- if(szDock.tqfind('t',false) != -1)g_pFrame->addDockWidget(TQt::TopDockWidgetArea,_pDockWindow);
- else if(szDock.tqfind('l',false) != -1)g_pFrame->addDockWidget(TQt::LeftDockWidgetArea,_pDockWindow);
- else if(szDock.tqfind('r',false) != -1)g_pFrame->addDockWidget(TQt::RightDockWidgetArea,_pDockWindow);
- else if(szDock.tqfind('b',false) != -1)g_pFrame->addDockWidget(TQt::BottomDockWidgetArea,_pDockWindow);
- else if(szDock.tqfind('f',false) != -1)_pDockWindow->setFloating(true);
- else if(szDock.tqfind('m',false) != -1)qDebug("Sorry: no support for minimized dock widgets in TQt4");
+ if(szDock.find('m',false) == -1)_pDockWindow->setFloating(false);
+ if(szDock.find('t',false) != -1)g_pFrame->addDockWidget(TQt::TopDockWidgetArea,_pDockWindow);
+ else if(szDock.find('l',false) != -1)g_pFrame->addDockWidget(TQt::LeftDockWidgetArea,_pDockWindow);
+ else if(szDock.find('r',false) != -1)g_pFrame->addDockWidget(TQt::RightDockWidgetArea,_pDockWindow);
+ else if(szDock.find('b',false) != -1)g_pFrame->addDockWidget(TQt::BottomDockWidgetArea,_pDockWindow);
+ else if(szDock.find('f',false) != -1)_pDockWindow->setFloating(true);
+ else if(szDock.find('m',false) != -1)qDebug("Sorry: no support for minimized dock widgets in TQt4");
else c->warning(__tr2qs("Invalid dock area specified"));
#else //!COMPILE_USE_QT4
- if(szDock.tqfind('t',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,TQt::DockTop,false,100);
- else if(szDock.tqfind('l',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,TQt::DockLeft,false,100);
- else if(szDock.tqfind('r',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,TQt::DockRight,false,100);
- else if(szDock.tqfind('b',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,TQt::DockBottom,false,100);
- else if(szDock.tqfind('f',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,TQt::DockTornOff,false,100);
- else if(szDock.tqfind('m',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,TQt::DockMinimized,false,100);
+ if(szDock.find('t',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,TQt::DockTop,false,100);
+ else if(szDock.find('l',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,TQt::DockLeft,false,100);
+ else if(szDock.find('r',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,TQt::DockRight,false,100);
+ else if(szDock.find('b',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,TQt::DockBottom,false,100);
+ else if(szDock.find('f',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,TQt::DockTornOff,false,100);
+ else if(szDock.find('m',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,TQt::DockMinimized,false,100);
else c->warning(__tr2qs("Invalid dock area specified"));
#endif //!COMPILE_USE_QT4
return true;
diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp
index 20184b9c..1a23aa4c 100644
--- a/src/modules/objects/class_label.cpp
+++ b/src/modules/objects/class_label.cpp
@@ -142,7 +142,7 @@ const int frame_cod[] = {
Sets auto-resize ability to enabled (if <benabled> is 1) or disabled
(if <benabled> is 0). If auto-resize is enabled, the label will
automagically resize itself accordingly to the 'size' of the
- text it tqcontains.
+ text it contains.
See also [classfnc]$autoResize[/classfnc]().
!fn: <string> $tqalignment()
Returns a string containing tqalignment flags that are set for
diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp
index 4ce0b92a..5b9103b3 100644
--- a/src/modules/objects/class_socket.cpp
+++ b/src/modules/objects/class_socket.cpp
@@ -218,7 +218,7 @@ void KviScriptSocketObject::reset()
the incoming connection will be automatically terminated.
!fn: $connectFailedEvent(<reason>)
- This function is called when a connection attempt fails for some reason. <reason> tqcontains
+ This function is called when a connection attempt fails for some reason. <reason> contains
the error string.[br]
This function may be called only between a call to [classfnc:socket]$connect[/classfnc]() and
the [classfnc:socket]$connectEvent[/classfnc]().
diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp
index 87d2e0c4..ca1333f9 100644
--- a/src/modules/objects/class_wrapper.cpp
+++ b/src/modules/objects/class_wrapper.cpp
@@ -132,7 +132,7 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
pParams->at(i)->asString(s);
if (!s.isEmpty())
{
- int idx = s.tqfind("::");
+ int idx = s.find("::");
if( idx != -1 ) {
szClass = s.left(idx);
szName = s.right(s.length() - idx - 2);
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 81d3bef1..b91af107 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -209,7 +209,7 @@ static bool objects_kvs_cmd_clearObjects(KviKvsModuleCommandCall * c)
*/
KviKvsKernel::instance()->objectController()->clearInstances();
- if(!c->switches()->tqfind('i',"ii")) KviKvsKernel::instance()->objectController()->clearUserClasses();
+ if(!c->switches()->find('i',"ii")) KviKvsKernel::instance()->objectController()->clearUserClasses();
return true;
}
@@ -345,7 +345,7 @@ static bool objects_kvs_fnc_instances(KviKvsModuleFunctionCall * c)
KviKvsObjectClass * pClass = KviKvsKernel::instance()->objectController()->lookupClass(szClassName);
if(!pClass)
{
- if(!szFlags.tqcontains(TQChar('q')))
+ if(!szFlags.contains(TQChar('q')))
c->warning(__tr2qs("The class '%Q' does not exist"),&szClassName);
return true;
}
@@ -353,7 +353,7 @@ static bool objects_kvs_fnc_instances(KviKvsModuleFunctionCall * c)
KviPointerHashTableIterator<void *,KviKvsObject> it(*od);
kvs_uint_t uIdx = 0;
- if(szFlags.tqcontains(TQChar('s')))
+ if(szFlags.contains(TQChar('s')))
{
while(KviKvsObject * ob = it.current())
{
@@ -498,7 +498,7 @@ static bool objects_kvs_fnc_classes(KviKvsModuleFunctionCall * c)
for(TQStringList::Iterator it2 = sl.begin();it2 != sl.end();++it2)
{
TQString szName=*it2;
- szName.tqreplace("--","::");
+ szName.replace("--","::");
if (szName!=".." && szName!=".") classdict->insert(szName.left(szName.length()-4),&bFake);
}
KviKvsArray* pArray = new KviKvsArray();