summaryrefslogtreecommitdiffstats
path: root/dcop
diff options
context:
space:
mode:
Diffstat (limited to 'dcop')
-rw-r--r--dcop/HOWTO32
-rw-r--r--dcop/Mainpage.dox32
-rw-r--r--dcop/client/README.dcop4
-rw-r--r--dcop/dcopidl/dcopidl_output.kidl6
-rw-r--r--dcop/dcopidl/yacc.cpp124
-rw-r--r--dcop/dcopidl/yacc.cpp.h2
-rw-r--r--dcop/dcopidl/yacc.yy124
-rw-r--r--dcop/dcopidlng/kalyptus14
-rw-r--r--dcop/dcopidlng/kdocUtil.pm2
-rw-r--r--dcop/tests/testcases6
10 files changed, 173 insertions, 173 deletions
diff --git a/dcop/HOWTO b/dcop/HOWTO
index 0fa520e1e..344ed82d1 100644
--- a/dcop/HOWTO
+++ b/dcop/HOWTO
@@ -169,8 +169,8 @@ if (!client->call("someAppId", "fooObject/barObject", "doIt(int)",
tqDebug("there was some error using DCOP.");
else {
QDataStream reply(replyData, IO_ReadOnly);
- if (replyType == "QString") {
- QString result;
+ if (replyType == "TQString") {
+ TQString result;
reply >> result;
print("the result is: %s",result.latin1());
} else
@@ -190,7 +190,7 @@ Receiving Data via DCOP:
Currently the only real way to receive data from DCOP is to multiply
inherit from the normal class that you are inheriting (usually some
-sort of QWidget subclass or QObject) as well as the DCOPObject class.
+sort of TQWidget subclass or TQObject) as well as the DCOPObject class.
DCOPObject provides one very important method: DCOPObject::process().
This is a pure virtual method that you must implement in order to
process DCOP messages that you receive. It takes a function
@@ -210,10 +210,10 @@ bool BarObject::process(const QCString &fun, const QByteArray &data,
QDataStream arg(data, IO_ReadOnly);
int i; // parameter
arg >> i;
- QString result = self->doIt (i);
+ TQString result = self->doIt (i);
QDataStream reply(replyData, IO_WriteOnly);
reply << result;
- replyType = "QString";
+ replyType = "TQString";
return true;
} else {
tqDebug("unknown function call to BarObject::process()");
@@ -244,7 +244,7 @@ bool BarObject::process(const QCString &fun, const QByteArray &data,
QDataStream arg(data, IO_ReadOnly);
int i; // parameter
arg >> i;
- QString result = self->doIt(i);
+ TQString result = self->doIt(i);
DCOPClientTransaction *myTransaction;
myTransaction = kapp->dcopClient()->beginTransaction();
@@ -260,9 +260,9 @@ bool BarObject::process(const QCString &fun, const QByteArray &data,
}
}
-slotProcessingDone(DCOPClientTransaction *myTransaction, const QString &result)
+slotProcessingDone(DCOPClientTransaction *myTransaction, const TQString &result)
{
- QCString replyType = "QString";
+ QCString replyType = "TQString";
QByteArray replyData;
QDataStream reply(replyData, IO_WriteOnly);
reply << result;
@@ -358,7 +358,7 @@ class MyInterface : virtual public DCOPObject
k_dcop:
- virtual ASYNC myAsynchronousMethod(QString someParameter) = 0;
+ virtual ASYNC myAsynchronousMethod(TQString someParameter) = 0;
virtual QRect mySynchronousMethod() = 0;
};
@@ -385,7 +385,7 @@ but virtual, not pure virtual.
Example:
-class MyClass: public QObject, virtual public MyInterface
+class MyClass: public TQObject, virtual public MyInterface
{
TQ_OBJECT
@@ -393,11 +393,11 @@ class MyClass: public QObject, virtual public MyInterface
MyClass();
~MyClass();
- ASYNC myAsynchronousMethod(QString someParameter);
+ ASYNC myAsynchronousMethod(TQString someParameter);
QRect mySynchronousMethod();
};
-Note: (Qt issue) Remember that if you are inheriting from QObject, you must
+Note: (Qt issue) Remember that if you are inheriting from TQObject, you must
place it first in the list of inherited classes.
In the implementation of your class' ctor, you must explicitly initialize
@@ -408,7 +408,7 @@ the interface which your are implementing.
Example:
MyClass::MyClass()
- : QObject(),
+ : TQObject(),
DCOPObject("MyInterface")
{
// whatever...
@@ -419,7 +419,7 @@ exactly the same as you would normally.
Example:
-void MyClass::myAsynchronousMethod(QString someParameter)
+void MyClass::myAsynchronousMethod(TQString someParameter)
{
tqDebug("myAsyncMethod called with param `" + someParameter + "'");
}
@@ -429,7 +429,7 @@ It is not necessary (though very clean) to define an interface as an
abstract class of its own, like we did in the example above. We could
just as well have defined a k_dcop section directly within MyClass:
-class MyClass: public QObject, virtual public DCOPObject
+class MyClass: public TQObject, virtual public DCOPObject
{
TQ_OBJECT
K_DCOP
@@ -439,7 +439,7 @@ class MyClass: public QObject, virtual public DCOPObject
~MyClass();
k_dcop:
- ASYNC myAsynchronousMethod(QString someParameter);
+ ASYNC myAsynchronousMethod(TQString someParameter);
QRect mySynchronousMethod();
};
diff --git a/dcop/Mainpage.dox b/dcop/Mainpage.dox
index 266f2d9fe..ca596022c 100644
--- a/dcop/Mainpage.dox
+++ b/dcop/Mainpage.dox
@@ -134,8 +134,8 @@ if (!client->call("someAppId", "fooObject/barObject", "doIt(int)",
tqDebug("there was some error using DCOP.");
else {
QDataStream reply(replyData, IO_ReadOnly);
- if (replyType == "QString") {
- QString result;
+ if (replyType == "TQString") {
+ TQString result;
reply >> result;
print("the result is: %s",result.latin1());
} else
@@ -148,7 +148,7 @@ else {
Currently the only real way to receive data from DCOP is to multiply
inherit from the normal class that you are inheriting (usually some
-sort of QWidget subclass or QObject) as well as the DCOPObject class.
+sort of TQWidget subclass or TQObject) as well as the DCOPObject class.
DCOPObject provides one very important method: DCOPObject::process().
This is a pure virtual method that you must implement in order to
process DCOP messages that you receive. It takes a function
@@ -169,10 +169,10 @@ bool BarObject::process(const QCString &fun, const QByteArray &data,
QDataStream arg(data, IO_ReadOnly);
int i; // parameter
arg >> i;
- QString result = self->doIt (i);
+ TQString result = self->doIt (i);
QDataStream reply(replyData, IO_WriteOnly);
reply << result;
- replyType = "QString";
+ replyType = "TQString";
return true;
} else {
tqDebug("unknown function call to BarObject::process()");
@@ -205,7 +205,7 @@ bool BarObject::process(const QCString &fun, const QByteArray &data,
QDataStream arg(data, IO_ReadOnly);
int i; // parameter
arg >> i;
- QString result = self->doIt(i);
+ TQString result = self->doIt(i);
DCOPClientTransaction *myTransaction;
myTransaction = kapp->dcopClient()->beginTransaction();
@@ -221,9 +221,9 @@ bool BarObject::process(const QCString &fun, const QByteArray &data,
}
}
-slotProcessingDone(DCOPClientTransaction *myTransaction, const QString &result)
+slotProcessingDone(DCOPClientTransaction *myTransaction, const TQString &result)
{
- QCString replyType = "QString";
+ QCString replyType = "TQString";
QByteArray replyData;
QDataStream reply(replyData, IO_WriteOnly);
reply << result;
@@ -260,7 +260,7 @@ class MyInterface : virtual public DCOPObject
k_dcop:
- virtual ASYNC myAsynchronousMethod(QString someParameter) = 0;
+ virtual ASYNC myAsynchronousMethod(TQString someParameter) = 0;
virtual QRect mySynchronousMethod() = 0;
};
@@ -289,7 +289,7 @@ but virtual, not pure virtual.
Example:
\code
-class MyClass: public QObject, virtual public MyInterface
+class MyClass: public TQObject, virtual public MyInterface
{
TQ_OBJECT
@@ -297,11 +297,11 @@ class MyClass: public QObject, virtual public MyInterface
MyClass();
~MyClass();
- ASYNC myAsynchronousMethod(QString someParameter);
+ ASYNC myAsynchronousMethod(TQString someParameter);
QRect mySynchronousMethod();
};
\endcode
-\note (Qt issue) Remember that if you are inheriting from QObject, you must
+\note (Qt issue) Remember that if you are inheriting from TQObject, you must
place it first in the list of inherited classes.
In the implementation of your class' ctor, you must explicitly initialize
@@ -313,7 +313,7 @@ Example:
\code
MyClass::MyClass()
- : QObject(),
+ : TQObject(),
DCOPObject("MyInterface")
{
// whatever...
@@ -327,7 +327,7 @@ exactly the same as you would normally.
Example:
\code
-void MyClass::myAsynchronousMethod(QString someParameter)
+void MyClass::myAsynchronousMethod(TQString someParameter)
{
tqDebug("myAsyncMethod called with param `" + someParameter + "'");
}
@@ -338,7 +338,7 @@ abstract class of its own, like we did in the example above. We could
just as well have defined a k_dcop section directly within MyClass:
\code
-class MyClass: public QObject, virtual public DCOPObject
+class MyClass: public TQObject, virtual public DCOPObject
{
TQ_OBJECT
K_DCOP
@@ -348,7 +348,7 @@ class MyClass: public QObject, virtual public DCOPObject
~MyClass();
k_dcop:
- ASYNC myAsynchronousMethod(QString someParameter);
+ ASYNC myAsynchronousMethod(TQString someParameter);
QRect mySynchronousMethod();
};
\endcode
diff --git a/dcop/client/README.dcop b/dcop/client/README.dcop
index e352cb439..b20a9d2c0 100644
--- a/dcop/client/README.dcop
+++ b/dcop/client/README.dcop
@@ -43,10 +43,10 @@ error message is printed to stderr and the command exits with exit-code '2'.
The default selection criteria is "any". Applications can declare their own
select_func as they see fit, e.g. konqueror could declare
-"isDoingProtocol(QString protocol)" and then the following command would
+"isDoingProtocol(TQString protocol)" and then the following command would
select a konqueror mainwindow that is currently handling the help-protocol:
- "dcopfind 'konqueror*' 'konqueror-mainwindow*' 'isDoingProtocol(QString
+ "dcopfind 'konqueror*' 'konqueror-mainwindow*' 'isDoingProtocol(TQString
protocol)' help"
diff --git a/dcop/dcopidl/dcopidl_output.kidl b/dcop/dcopidl/dcopidl_output.kidl
index 678ff6732..a0ffc5353 100644
--- a/dcop/dcopidl/dcopidl_output.kidl
+++ b/dcop/dcopidl/dcopidl_output.kidl
@@ -8,13 +8,13 @@
<LINK_SCOPE>TDEUI_EXPORT</LINK_SCOPE>
<SUPER>MyNamespace::MyParentClass</SUPER>
<SUPER>DCOPObject</SUPER>
- <SUPER>QValueList&lt;<TYPE>QString</TYPE>&gt;</SUPER>
+ <SUPER>QValueList&lt;<TYPE>TQString</TYPE>&gt;</SUPER>
<FUNC>
- <TYPE>QString</TYPE>
+ <TYPE>TQString</TYPE>
<NAME>url</NAME>
</FUNC>
<FUNC qual="const">
- <TYPE>QString</TYPE>
+ <TYPE>TQString</TYPE>
<NAME>constTest</NAME>
</FUNC>
<FUNC>
diff --git a/dcop/dcopidl/yacc.cpp b/dcop/dcopidl/yacc.cpp
index 9a58cefc9..ada46126c 100644
--- a/dcop/dcopidl/yacc.cpp
+++ b/dcop/dcopidl/yacc.cpp
@@ -113,14 +113,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
extern int yylex();
-// extern QString idl_lexFile;
+// extern TQString idl_lexFile;
extern int idl_line_no;
extern int function_mode;
static int dcop_area = 0;
static int dcop_signal_area = 0;
-static QString in_namespace( "" );
+static TQString in_namespace( "" );
void dcopidlInitFlex( const char *_code );
@@ -238,7 +238,7 @@ typedef union YYSTYPE
#line 67 "yacc.yy"
long _int;
- QString *_str;
+ TQString *_str;
unsigned short _char;
double _float;
@@ -2096,7 +2096,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 308 "yacc.yy"
{
- QString* tmp = new QString( "%1::%2" );
+ TQString* tmp = new TQString( "%1::%2" );
*tmp = tmp->arg(*((yyvsp[(1) - (3)]._str))).arg(*((yyvsp[(3) - (3)]._str)));
(yyval._str) = tmp;
;}
@@ -2107,7 +2107,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 317 "yacc.yy"
{
- QString* tmp = new QString( " <SUPER>%1</SUPER>\n" );
+ TQString* tmp = new TQString( " <SUPER>%1</SUPER>\n" );
*tmp = tmp->arg( *((yyvsp[(1) - (1)]._str)) );
(yyval._str) = tmp;
;}
@@ -2118,7 +2118,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 323 "yacc.yy"
{
- QString* tmp = new QString( " <SUPER>%1</SUPER>\n" );
+ TQString* tmp = new TQString( " <SUPER>%1</SUPER>\n" );
*tmp = tmp->arg( *((yyvsp[(1) - (4)]._str)) + "&lt;" + *((yyvsp[(3) - (4)]._str)) + "&gt;" );
(yyval._str) = tmp;
;}
@@ -2157,7 +2157,7 @@ yyreduce:
#line 347 "yacc.yy"
{
/* $$ = $1; */
- (yyval._str) = new QString( *((yyvsp[(1) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) );
+ (yyval._str) = new TQString( *((yyvsp[(1) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) );
;}
break;
@@ -2175,7 +2175,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 359 "yacc.yy"
{
- (yyval._str) = new QString( "" );
+ (yyval._str) = new TQString( "" );
;}
break;
@@ -2192,7 +2192,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 373 "yacc.yy"
{
- (yyval._str) = new QString( "" );
+ (yyval._str) = new TQString( "" );
;}
break;
@@ -2201,7 +2201,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 377 "yacc.yy"
{
- (yyval._str) = new QString( *((yyvsp[(1) - (2)]._str)) + *((yyvsp[(2) - (2)]._str)) );
+ (yyval._str) = new TQString( *((yyvsp[(1) - (2)]._str)) + *((yyvsp[(2) - (2)]._str)) );
;}
break;
@@ -2210,7 +2210,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 381 "yacc.yy"
{
- (yyval._str) = new QString( *((yyvsp[(2) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) );
+ (yyval._str) = new TQString( *((yyvsp[(2) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) );
;}
break;
@@ -2219,7 +2219,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 385 "yacc.yy"
{
- (yyval._str) = new QString( *((yyvsp[(1) - (2)]._str)) + *((yyvsp[(2) - (2)]._str)) );
+ (yyval._str) = new TQString( *((yyvsp[(1) - (2)]._str)) + *((yyvsp[(2) - (2)]._str)) );
;}
break;
@@ -2416,11 +2416,11 @@ yyreduce:
#line 475 "yacc.yy"
{
if (dcop_area) {
- QString* tmp = new QString("<TYPEDEF name=\"%1\" template=\"%2\"><PARAM %3</TYPEDEF>\n");
+ TQString* tmp = new TQString("<TYPEDEF name=\"%1\" template=\"%2\"><PARAM %3</TYPEDEF>\n");
*tmp = tmp->arg( *((yyvsp[(6) - (7)]._str)) ).arg( *((yyvsp[(2) - (7)]._str)) ).arg( *((yyvsp[(4) - (7)]._str)) );
(yyval._str) = tmp;
} else {
- (yyval._str) = new QString("");
+ (yyval._str) = new TQString("");
}
;}
break;
@@ -2457,140 +2457,140 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 503 "yacc.yy"
- { (yyval._str) = new QString("signed int"); ;}
+ { (yyval._str) = new TQString("signed int"); ;}
break;
case 90:
/* Line 1455 of yacc.c */
#line 504 "yacc.yy"
- { (yyval._str) = new QString("signed int"); ;}
+ { (yyval._str) = new TQString("signed int"); ;}
break;
case 91:
/* Line 1455 of yacc.c */
#line 505 "yacc.yy"
- { (yyval._str) = new QString("unsigned int"); ;}
+ { (yyval._str) = new TQString("unsigned int"); ;}
break;
case 92:
/* Line 1455 of yacc.c */
#line 506 "yacc.yy"
- { (yyval._str) = new QString("unsigned int"); ;}
+ { (yyval._str) = new TQString("unsigned int"); ;}
break;
case 93:
/* Line 1455 of yacc.c */
#line 507 "yacc.yy"
- { (yyval._str) = new QString("signed short int"); ;}
+ { (yyval._str) = new TQString("signed short int"); ;}
break;
case 94:
/* Line 1455 of yacc.c */
#line 508 "yacc.yy"
- { (yyval._str) = new QString("signed short int"); ;}
+ { (yyval._str) = new TQString("signed short int"); ;}
break;
case 95:
/* Line 1455 of yacc.c */
#line 509 "yacc.yy"
- { (yyval._str) = new QString("signed long int"); ;}
+ { (yyval._str) = new TQString("signed long int"); ;}
break;
case 96:
/* Line 1455 of yacc.c */
#line 510 "yacc.yy"
- { (yyval._str) = new QString("signed long int"); ;}
+ { (yyval._str) = new TQString("signed long int"); ;}
break;
case 97:
/* Line 1455 of yacc.c */
#line 511 "yacc.yy"
- { (yyval._str) = new QString("unsigned short int"); ;}
+ { (yyval._str) = new TQString("unsigned short int"); ;}
break;
case 98:
/* Line 1455 of yacc.c */
#line 512 "yacc.yy"
- { (yyval._str) = new QString("unsigned short int"); ;}
+ { (yyval._str) = new TQString("unsigned short int"); ;}
break;
case 99:
/* Line 1455 of yacc.c */
#line 513 "yacc.yy"
- { (yyval._str) = new QString("unsigned long int"); ;}
+ { (yyval._str) = new TQString("unsigned long int"); ;}
break;
case 100:
/* Line 1455 of yacc.c */
#line 514 "yacc.yy"
- { (yyval._str) = new QString("unsigned long int"); ;}
+ { (yyval._str) = new TQString("unsigned long int"); ;}
break;
case 101:
/* Line 1455 of yacc.c */
#line 515 "yacc.yy"
- { (yyval._str) = new QString("int"); ;}
+ { (yyval._str) = new TQString("int"); ;}
break;
case 102:
/* Line 1455 of yacc.c */
#line 516 "yacc.yy"
- { (yyval._str) = new QString("long int"); ;}
+ { (yyval._str) = new TQString("long int"); ;}
break;
case 103:
/* Line 1455 of yacc.c */
#line 517 "yacc.yy"
- { (yyval._str) = new QString("long int"); ;}
+ { (yyval._str) = new TQString("long int"); ;}
break;
case 104:
/* Line 1455 of yacc.c */
#line 518 "yacc.yy"
- { (yyval._str) = new QString("short int"); ;}
+ { (yyval._str) = new TQString("short int"); ;}
break;
case 105:
/* Line 1455 of yacc.c */
#line 519 "yacc.yy"
- { (yyval._str) = new QString("short int"); ;}
+ { (yyval._str) = new TQString("short int"); ;}
break;
case 106:
/* Line 1455 of yacc.c */
#line 520 "yacc.yy"
- { (yyval._str) = new QString("char"); ;}
+ { (yyval._str) = new TQString("char"); ;}
break;
case 107:
/* Line 1455 of yacc.c */
#line 521 "yacc.yy"
- { (yyval._str) = new QString("signed char"); ;}
+ { (yyval._str) = new TQString("signed char"); ;}
break;
case 108:
/* Line 1455 of yacc.c */
#line 522 "yacc.yy"
- { (yyval._str) = new QString("unsigned char"); ;}
+ { (yyval._str) = new TQString("unsigned char"); ;}
break;
case 111:
@@ -2598,7 +2598,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 532 "yacc.yy"
{
- (yyval._str) = new QString( "" );
+ (yyval._str) = new TQString( "" );
;}
break;
@@ -2607,7 +2607,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 537 "yacc.yy"
{
- (yyval._str) = new QString( *((yyvsp[(1) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) );
+ (yyval._str) = new TQString( *((yyvsp[(1) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) );
;}
break;
@@ -2637,7 +2637,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 548 "yacc.yy"
{
- QString *tmp = new QString("%1&lt;%2&gt;");
+ TQString *tmp = new TQString("%1&lt;%2&gt;");
*tmp = tmp->arg(*((yyvsp[(1) - (4)]._str)));
*tmp = tmp->arg(*((yyvsp[(3) - (4)]._str)));
(yyval._str) = tmp;
@@ -2649,7 +2649,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 554 "yacc.yy"
{
- QString *tmp = new QString("%1&lt;%2&gt;::%3");
+ TQString *tmp = new TQString("%1&lt;%2&gt;::%3");
*tmp = tmp->arg(*((yyvsp[(1) - (6)]._str)));
*tmp = tmp->arg(*((yyvsp[(3) - (6)]._str)));
*tmp = tmp->arg(*((yyvsp[(6) - (6)]._str)));
@@ -2662,7 +2662,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 566 "yacc.yy"
{
- (yyval._str) = new QString(*((yyvsp[(1) - (3)]._str)) + "," + *((yyvsp[(3) - (3)]._str)));
+ (yyval._str) = new TQString(*((yyvsp[(1) - (3)]._str)) + "," + *((yyvsp[(3) - (3)]._str)));
;}
break;
@@ -2710,7 +2710,7 @@ yyreduce:
#line 596 "yacc.yy"
{
if (dcop_area) {
- QString* tmp = new QString("<TYPE qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>");
+ TQString* tmp = new TQString("<TYPE qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>");
*tmp = tmp->arg( *((yyvsp[(2) - (3)]._str)) );
(yyval._str) = tmp;
}
@@ -2722,7 +2722,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 603 "yacc.yy"
{
- QString* tmp = new QString("<TYPE>%1</TYPE>");
+ TQString* tmp = new TQString("<TYPE>%1</TYPE>");
*tmp = tmp->arg( *((yyvsp[(2) - (2)]._str)) );
(yyval._str) = tmp;
;}
@@ -2733,7 +2733,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 608 "yacc.yy"
{
- QString* tmp = new QString("<TYPE>%1</TYPE>");
+ TQString* tmp = new TQString("<TYPE>%1</TYPE>");
*tmp = tmp->arg( *((yyvsp[(1) - (2)]._str)) );
(yyval._str) = tmp;
;}
@@ -2745,7 +2745,7 @@ yyreduce:
#line 613 "yacc.yy"
{
if (dcop_area) {
- QString* tmp = new QString("<TYPE qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>");
+ TQString* tmp = new TQString("<TYPE qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>");
*tmp = tmp->arg( *((yyvsp[(1) - (3)]._str)) );
(yyval._str) = tmp;
}
@@ -2767,7 +2767,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 625 "yacc.yy"
{
- QString* tmp = new QString("<TYPE>%1</TYPE>");
+ TQString* tmp = new TQString("<TYPE>%1</TYPE>");
*tmp = tmp->arg( *((yyvsp[(1) - (1)]._str)) );
(yyval._str) = tmp;
;}
@@ -2788,7 +2788,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 639 "yacc.yy"
{
- (yyval._str) = new QString(*((yyvsp[(1) - (3)]._str)) + "," + *((yyvsp[(3) - (3)]._str)));
+ (yyval._str) = new TQString(*((yyvsp[(1) - (3)]._str)) + "," + *((yyvsp[(3) - (3)]._str)));
;}
break;
@@ -2807,11 +2807,11 @@ yyreduce:
#line 650 "yacc.yy"
{
if (dcop_area) {
- QString* tmp = new QString("\n <ARG>%1<NAME>%2</NAME></ARG>");
+ TQString* tmp = new TQString("\n <ARG>%1<NAME>%2</NAME></ARG>");
*tmp = tmp->arg( *((yyvsp[(1) - (3)]._str)) );
*tmp = tmp->arg( *((yyvsp[(2) - (3)]._str)) );
(yyval._str) = tmp;
- } else (yyval._str) = new QString();
+ } else (yyval._str) = new TQString();
;}
break;
@@ -2821,10 +2821,10 @@ yyreduce:
#line 659 "yacc.yy"
{
if (dcop_area) {
- QString* tmp = new QString("\n <ARG>%1</ARG>");
+ TQString* tmp = new TQString("\n <ARG>%1</ARG>");
*tmp = tmp->arg( *((yyvsp[(1) - (2)]._str)) );
(yyval._str) = tmp;
- } else (yyval._str) = new QString();
+ } else (yyval._str) = new TQString();
;}
break;
@@ -2835,7 +2835,7 @@ yyreduce:
{
if (dcop_area)
yyerror("variable arguments not supported in dcop area.");
- (yyval._str) = new QString("");
+ (yyval._str) = new TQString("");
;}
break;
@@ -2923,8 +2923,8 @@ yyreduce:
#line 716 "yacc.yy"
{
if (dcop_area || dcop_signal_area) {
- QString* tmp = 0;
- tmp = new QString(
+ TQString* tmp = 0;
+ tmp = new TQString(
" <%4>\n"
" %2\n"
" <NAME>%1</NAME>"
@@ -2934,13 +2934,13 @@ yyreduce:
*tmp = tmp->arg( *((yyvsp[(1) - (6)]._str)) );
*tmp = tmp->arg( *((yyvsp[(4) - (6)]._str)) );
- QString tagname = (dcop_signal_area) ? "SIGNAL" : "FUNC";
- QString attr = ((yyvsp[(6) - (6)]._int)) ? " qual=\"const\"" : "";
- *tmp = tmp->arg( QString("%1%2").arg(tagname).arg(attr) );
- *tmp = tmp->arg( QString("%1").arg(tagname) );
+ TQString tagname = (dcop_signal_area) ? "SIGNAL" : "FUNC";
+ TQString attr = ((yyvsp[(6) - (6)]._int)) ? " qual=\"const\"" : "";
+ *tmp = tmp->arg( TQString("%1%2").arg(tagname).arg(attr) );
+ *tmp = tmp->arg( TQString("%1").arg(tagname) );
(yyval._str) = tmp;
} else
- (yyval._str) = new QString("");
+ (yyval._str) = new TQString("");
;}
break;
@@ -2951,7 +2951,7 @@ yyreduce:
{
if (dcop_area)
yyerror("operators aren't allowed in dcop areas!");
- (yyval._str) = new QString("");
+ (yyval._str) = new TQString("");
;}
break;
@@ -3031,7 +3031,7 @@ yyreduce:
{
/* The constructor */
assert(!dcop_area);
- (yyval._str) = new QString("");
+ (yyval._str) = new TQString("");
;}
break;
@@ -3042,7 +3042,7 @@ yyreduce:
{
/* The constructor */
assert(!dcop_area);
- (yyval._str) = new QString("");
+ (yyval._str) = new TQString("");
;}
break;
@@ -3053,7 +3053,7 @@ yyreduce:
{
/* The destructor */
assert(!dcop_area);
- (yyval._str) = new QString("");
+ (yyval._str) = new TQString("");
;}
break;
@@ -3068,7 +3068,7 @@ yyreduce:
else
yyerror("DCOP functions cannot be static");
} else {
- (yyval._str) = new QString();
+ (yyval._str) = new TQString();
}
;}
break;
diff --git a/dcop/dcopidl/yacc.cpp.h b/dcop/dcopidl/yacc.cpp.h
index 2a6c1b403..5bbacfa1f 100644
--- a/dcop/dcopidl/yacc.cpp.h
+++ b/dcop/dcopidl/yacc.cpp.h
@@ -116,7 +116,7 @@ typedef union YYSTYPE
#line 67 "yacc.yy"
long _int;
- QString *_str;
+ TQString *_str;
unsigned short _char;
double _float;
diff --git a/dcop/dcopidl/yacc.yy b/dcop/dcopidl/yacc.yy
index ac744e902..82d5fc333 100644
--- a/dcop/dcopidl/yacc.yy
+++ b/dcop/dcopidl/yacc.yy
@@ -42,14 +42,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
extern int yylex();
-// extern QString idl_lexFile;
+// extern TQString idl_lexFile;
extern int idl_line_no;
extern int function_mode;
static int dcop_area = 0;
static int dcop_signal_area = 0;
-static QString in_namespace( "" );
+static TQString in_namespace( "" );
void dcopidlInitFlex( const char *_code );
@@ -66,7 +66,7 @@ void yyerror( const char *s )
%union
{
long _int;
- QString *_str;
+ TQString *_str;
unsigned short _char;
double _float;
}
@@ -306,7 +306,7 @@ Identifier
$$ = $1;
}
| T_IDENTIFIER T_SCOPE Identifier {
- QString* tmp = new QString( "%1::%2" );
+ TQString* tmp = new TQString( "%1::%2" );
*tmp = tmp->arg(*($1)).arg(*($3));
$$ = tmp;
}
@@ -315,13 +315,13 @@ Identifier
super_class_name
: Identifier
{
- QString* tmp = new QString( " <SUPER>%1</SUPER>\n" );
+ TQString* tmp = new TQString( " <SUPER>%1</SUPER>\n" );
*tmp = tmp->arg( *($1) );
$$ = tmp;
}
| Identifier T_LESS type_list T_GREATER
{
- QString* tmp = new QString( " <SUPER>%1</SUPER>\n" );
+ TQString* tmp = new TQString( " <SUPER>%1</SUPER>\n" );
*tmp = tmp->arg( *($1) + "&lt;" + *($3) + "&gt;" );
$$ = tmp;
}
@@ -346,7 +346,7 @@ super_classes
| super_class T_COMMA super_classes
{
/* $$ = $1; */
- $$ = new QString( *($1) + *($3) );
+ $$ = new TQString( *($1) + *($3) );
}
;
@@ -357,7 +357,7 @@ class_header
}
| T_LEFT_CURLY_BRACKET
{
- $$ = new QString( "" );
+ $$ = new TQString( "" );
}
;
@@ -371,19 +371,19 @@ opt_semicolon
body
: T_RIGHT_CURLY_BRACKET
{
- $$ = new QString( "" );
+ $$ = new TQString( "" );
}
| typedef body
{
- $$ = new QString( *($1) + *($2) );
+ $$ = new TQString( *($1) + *($2) );
}
| T_INLINE function body
{
- $$ = new QString( *($2) + *($3) );
+ $$ = new TQString( *($2) + *($3) );
}
| function body
{
- $$ = new QString( *($1) + *($2) );
+ $$ = new TQString( *($1) + *($2) );
}
| dcop_signal_area_begin body
{
@@ -474,11 +474,11 @@ typedef
: T_TYPEDEF Identifier T_LESS type_list T_GREATER Identifier T_SEMICOLON
{
if (dcop_area) {
- QString* tmp = new QString("<TYPEDEF name=\"%1\" template=\"%2\"><PARAM %3</TYPEDEF>\n");
+ TQString* tmp = new TQString("<TYPEDEF name=\"%1\" template=\"%2\"><PARAM %3</TYPEDEF>\n");
*tmp = tmp->arg( *($6) ).arg( *($2) ).arg( *($4) );
$$ = tmp;
} else {
- $$ = new QString("");
+ $$ = new TQString("");
}
}
| T_TYPEDEF Identifier T_LESS type_list T_GREATER T_SCOPE T_IDENTIFIER Identifier T_SEMICOLON
@@ -500,26 +500,26 @@ const_qualifier
;
int_type
- : T_SIGNED { $$ = new QString("signed int"); }
- | T_SIGNED T_INT { $$ = new QString("signed int"); }
- | T_UNSIGNED { $$ = new QString("unsigned int"); }
- | T_UNSIGNED T_INT { $$ = new QString("unsigned int"); }
- | T_SIGNED T_SHORT { $$ = new QString("signed short int"); }
- | T_SIGNED T_SHORT T_INT { $$ = new QString("signed short int"); }
- | T_SIGNED T_LONG { $$ = new QString("signed long int"); }
- | T_SIGNED T_LONG T_INT { $$ = new QString("signed long int"); }
- | T_UNSIGNED T_SHORT { $$ = new QString("unsigned short int"); }
- | T_UNSIGNED T_SHORT T_INT { $$ = new QString("unsigned short int"); }
- | T_UNSIGNED T_LONG { $$ = new QString("unsigned long int"); }
- | T_UNSIGNED T_LONG T_INT { $$ = new QString("unsigned long int"); }
- | T_INT { $$ = new QString("int"); }
- | T_LONG { $$ = new QString("long int"); }
- | T_LONG T_INT { $$ = new QString("long int"); }
- | T_SHORT { $$ = new QString("short int"); }
- | T_SHORT T_INT { $$ = new QString("short int"); }
- | T_CHAR { $$ = new QString("char"); }
- | T_SIGNED T_CHAR { $$ = new QString("signed char"); }
- | T_UNSIGNED T_CHAR { $$ = new QString("unsigned char"); }
+ : T_SIGNED { $$ = new TQString("signed int"); }
+ | T_SIGNED T_INT { $$ = new TQString("signed int"); }
+ | T_UNSIGNED { $$ = new TQString("unsigned int"); }
+ | T_UNSIGNED T_INT { $$ = new TQString("unsigned int"); }
+ | T_SIGNED T_SHORT { $$ = new TQString("signed short int"); }
+ | T_SIGNED T_SHORT T_INT { $$ = new TQString("signed short int"); }
+ | T_SIGNED T_LONG { $$ = new TQString("signed long int"); }
+ | T_SIGNED T_LONG T_INT { $$ = new TQString("signed long int"); }
+ | T_UNSIGNED T_SHORT { $$ = new TQString("unsigned short int"); }
+ | T_UNSIGNED T_SHORT T_INT { $$ = new TQString("unsigned short int"); }
+ | T_UNSIGNED T_LONG { $$ = new TQString("unsigned long int"); }
+ | T_UNSIGNED T_LONG T_INT { $$ = new TQString("unsigned long int"); }
+ | T_INT { $$ = new TQString("int"); }
+ | T_LONG { $$ = new TQString("long int"); }
+ | T_LONG T_INT { $$ = new TQString("long int"); }
+ | T_SHORT { $$ = new TQString("short int"); }
+ | T_SHORT T_INT { $$ = new TQString("short int"); }
+ | T_CHAR { $$ = new TQString("char"); }
+ | T_SIGNED T_CHAR { $$ = new TQString("signed char"); }
+ | T_UNSIGNED T_CHAR { $$ = new TQString("unsigned char"); }
;
asterisks
@@ -530,12 +530,12 @@ asterisks
params
: /* empty */
{
- $$ = new QString( "" );
+ $$ = new TQString( "" );
}
| param
| params T_COMMA param
{
- $$ = new QString( *($1) + *($3) );
+ $$ = new TQString( *($1) + *($3) );
}
;
@@ -546,13 +546,13 @@ type_name
| T_STRUCT Identifier { $$ = $2; }
| T_CLASS Identifier { $$ = $2; }
| Identifier T_LESS templ_type_list T_GREATER {
- QString *tmp = new QString("%1&lt;%2&gt;");
+ TQString *tmp = new TQString("%1&lt;%2&gt;");
*tmp = tmp->arg(*($1));
*tmp = tmp->arg(*($3));
$$ = tmp;
}
| Identifier T_LESS templ_type_list T_GREATER T_SCOPE Identifier{
- QString *tmp = new QString("%1&lt;%2&gt;::%3");
+ TQString *tmp = new TQString("%1&lt;%2&gt;::%3");
*tmp = tmp->arg(*($1));
*tmp = tmp->arg(*($3));
*tmp = tmp->arg(*($6));
@@ -564,7 +564,7 @@ type_name
templ_type_list
: templ_type T_COMMA templ_type_list
{
- $$ = new QString(*($1) + "," + *($3));
+ $$ = new TQString(*($1) + "," + *($3));
}
| templ_type
{
@@ -595,24 +595,24 @@ type
}
| T_CONST type_name T_AMPERSAND {
if (dcop_area) {
- QString* tmp = new QString("<TYPE qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>");
+ TQString* tmp = new TQString("<TYPE qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>");
*tmp = tmp->arg( *($2) );
$$ = tmp;
}
}
| T_CONST type_name %prec T_UNIMPORTANT {
- QString* tmp = new QString("<TYPE>%1</TYPE>");
+ TQString* tmp = new TQString("<TYPE>%1</TYPE>");
*tmp = tmp->arg( *($2) );
$$ = tmp;
}
| type_name T_CONST %prec T_UNIMPORTANT {
- QString* tmp = new QString("<TYPE>%1</TYPE>");
+ TQString* tmp = new TQString("<TYPE>%1</TYPE>");
*tmp = tmp->arg( *($1) );
$$ = tmp;
}
| type_name T_CONST T_AMPERSAND {
if (dcop_area) {
- QString* tmp = new QString("<TYPE qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>");
+ TQString* tmp = new TQString("<TYPE qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>");
*tmp = tmp->arg( *($1) );
$$ = tmp;
}
@@ -623,7 +623,7 @@ type
}
| type_name %prec T_UNIMPORTANT {
- QString* tmp = new QString("<TYPE>%1</TYPE>");
+ TQString* tmp = new TQString("<TYPE>%1</TYPE>");
*tmp = tmp->arg( *($1) );
$$ = tmp;
}
@@ -637,7 +637,7 @@ type
type_list
: type T_COMMA type_list
{
- $$ = new QString(*($1) + "," + *($3));
+ $$ = new TQString(*($1) + "," + *($3));
}
| type
{
@@ -649,25 +649,25 @@ param
: type Identifier default
{
if (dcop_area) {
- QString* tmp = new QString("\n <ARG>%1<NAME>%2</NAME></ARG>");
+ TQString* tmp = new TQString("\n <ARG>%1<NAME>%2</NAME></ARG>");
*tmp = tmp->arg( *($1) );
*tmp = tmp->arg( *($2) );
$$ = tmp;
- } else $$ = new QString();
+ } else $$ = new TQString();
}
| type default
{
if (dcop_area) {
- QString* tmp = new QString("\n <ARG>%1</ARG>");
+ TQString* tmp = new TQString("\n <ARG>%1</ARG>");
*tmp = tmp->arg( *($1) );
$$ = tmp;
- } else $$ = new QString();
+ } else $$ = new TQString();
}
| T_TRIPLE_DOT
{
if (dcop_area)
yyerror("variable arguments not supported in dcop area.");
- $$ = new QString("");
+ $$ = new TQString("");
}
;
@@ -715,8 +715,8 @@ function_header
: type Identifier T_LEFT_PARANTHESIS params T_RIGHT_PARANTHESIS const_qualifier
{
if (dcop_area || dcop_signal_area) {
- QString* tmp = 0;
- tmp = new QString(
+ TQString* tmp = 0;
+ tmp = new TQString(
" <%4>\n"
" %2\n"
" <NAME>%1</NAME>"
@@ -726,19 +726,19 @@ function_header
*tmp = tmp->arg( *($1) );
*tmp = tmp->arg( *($4) );
- QString tagname = (dcop_signal_area) ? "SIGNAL" : "FUNC";
- QString attr = ($6) ? " qual=\"const\"" : "";
- *tmp = tmp->arg( QString("%1%2").arg(tagname).arg(attr) );
- *tmp = tmp->arg( QString("%1").arg(tagname) );
+ TQString tagname = (dcop_signal_area) ? "SIGNAL" : "FUNC";
+ TQString attr = ($6) ? " qual=\"const\"" : "";
+ *tmp = tmp->arg( TQString("%1%2").arg(tagname).arg(attr) );
+ *tmp = tmp->arg( TQString("%1").arg(tagname) );
$$ = tmp;
} else
- $$ = new QString("");
+ $$ = new TQString("");
}
| type T_FUNOPERATOR operator T_LEFT_PARANTHESIS params T_RIGHT_PARANTHESIS const_qualifier
{
if (dcop_area)
yyerror("operators aren't allowed in dcop areas!");
- $$ = new QString("");
+ $$ = new TQString("");
}
;
@@ -778,19 +778,19 @@ function
{
/* The constructor */
assert(!dcop_area);
- $$ = new QString("");
+ $$ = new TQString("");
}
| Identifier T_LEFT_PARANTHESIS params T_RIGHT_PARANTHESIS T_COLON init_list function_body
{
/* The constructor */
assert(!dcop_area);
- $$ = new QString("");
+ $$ = new TQString("");
}
| virtual_qualifier T_TILDE Identifier T_LEFT_PARANTHESIS T_RIGHT_PARANTHESIS function_body
{
/* The destructor */
assert(!dcop_area);
- $$ = new QString("");
+ $$ = new TQString("");
}
| T_STATIC function_header function_body
{
@@ -800,7 +800,7 @@ function
else
yyerror("DCOP functions cannot be static");
} else {
- $$ = new QString();
+ $$ = new TQString();
}
}
;
diff --git a/dcop/dcopidlng/kalyptus b/dcop/dcopidlng/kalyptus
index 5ce123890..768bf6b9c 100644
--- a/dcop/dcopidlng/kalyptus
+++ b/dcop/dcopidlng/kalyptus
@@ -73,9 +73,9 @@ public:
virtual bool tqt_emit( int, QUObject* );
virtual bool tqt_property( int, int, QVariant* );
static QMetaObject* staticMetaObject();
- QObject* qObject();
- static QString tr( const char *, const char * = 0 );
- static QString trUtf8( const char *, const char * = 0 );
+ TQObject* qObject();
+ static TQString tr( const char *, const char * = 0 );
+ static TQString trUtf8( const char *, const char * = 0 );
private:
CODE
@@ -119,8 +119,8 @@ public:
virtual const char *className() const;
virtual bool tqt_invoke( int, QUObject* );
virtual bool tqt_emit( int, QUObject* );
- static QString tr( const char *, const char * = 0 );
- static QString trUtf8( const char *, const char * = 0 );
+ static TQString tr( const char *, const char * = 0 );
+ static TQString trUtf8( const char *, const char * = 0 );
private:
CODE
};
@@ -418,7 +418,7 @@ LOOP:
}
next if ( $p =~ /^\s*$/s ); # blank lines
-# || $p =~ /^\s*TQ_OBJECT/ # QObject macro
+# || $p =~ /^\s*TQ_OBJECT/ # TQObject macro
# );
#
@@ -1470,7 +1470,7 @@ sub newMethod
This property contains a list of nodes, one for each parameter.
Each parameter node has the following properties:
- * ArgType the type of the argument, e.g. const QString&
+ * ArgType the type of the argument, e.g. const TQString&
* ArgName the name of the argument - optionnal
* DefaultValue the default value of the argument - optionnal
diff --git a/dcop/dcopidlng/kdocUtil.pm b/dcop/dcopidlng/kdocUtil.pm
index 629147ac3..e045a6790 100644
--- a/dcop/dcopidlng/kdocUtil.pm
+++ b/dcop/dcopidlng/kdocUtil.pm
@@ -139,7 +139,7 @@ sub userName
=head2 splitUnnested
Helper to split a list using a delimiter, but looking for
nesting with (), {}, [] and <>.
- Example: splitting int a, QPair<c,b> d, e=","
+ Example: splitting int a, TQPair<c,b> d, e=","
on ',' will give 3 items in the list.
Parameter: delimiter, string
diff --git a/dcop/tests/testcases b/dcop/tests/testcases
index e2357eb1c..e3bd2e3d0 100644
--- a/dcop/tests/testcases
+++ b/dcop/tests/testcases
@@ -19,7 +19,7 @@
# 2. First you put shell like argument:
# "string with spaces" 4 string_without_spaces
# Then you should put c++ style arguments:
-# QString::fromLatin1("string with spaces"),4,"string_with_spaces"
+# TQString::fromLatin1("string with spaces"),4,"string_with_spaces"
#
# Note that the first argument has type TQString and the last type const char*
# (adapt accordingly)
@@ -29,7 +29,7 @@ TQString
url
()
{
-return QString::fromLatin1( "http://www.kde.org/");
+return TQString::fromLatin1( "http://www.kde.org/");
}
-
@@ -63,7 +63,7 @@ identity
{
return x;
}
-"test";QString::fromLatin1("test")
+"test";TQString::fromLatin1("test")
// 2.3 unsigned long int
unsigned long int
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-22 13:54:57 +0000