diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 20:16:47 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 20:16:47 +0000 |
commit | 495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 (patch) | |
tree | daabcb652c07b9a17cad88ca50b63a2d91ead4a3 /kdcop | |
parent | 50001f1757f97510e80cb1990e2f2d5b00144c2a (diff) | |
download | tdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.tar.gz tdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.zip |
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdcop')
-rw-r--r-- | kdcop/kdcopview.ui | 10 | ||||
-rw-r--r-- | kdcop/kdcopwindow.cpp | 22 |
2 files changed, 16 insertions, 16 deletions
diff --git a/kdcop/kdcopview.ui b/kdcop/kdcopview.ui index 5d1de7a93..ec9928480 100644 --- a/kdcop/kdcopview.ui +++ b/kdcop/kdcopview.ui @@ -5,7 +5,7 @@ <property name="name"> <cstring>kdcopview</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -50,7 +50,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout18</cstring> + <cstring>tqlayout18</cstring> </property> <grid> <property name="name"> @@ -98,7 +98,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -139,8 +139,8 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klistviewsearchline.h</includehint> <includehint>kdcoplistview.h</includehint> diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp index b7b21bd7f..06f6a6e28 100644 --- a/kdcop/kdcopwindow.cpp +++ b/kdcop/kdcopwindow.cpp @@ -114,7 +114,7 @@ DCOPBrowserApplicationItem::DCOPBrowserApplicationItem { setExpandable(true); setText(0, TQString::fromUtf8(app_)); - setPixmap(0, KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "exec" ), KIcon::Small )); + setPixmap(0, KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "exec" ), KIcon::Small )); /* Get the icon: we use the icon from a mainwindow in that class. @@ -467,7 +467,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it ) e->setValidator( new TQIntValidator( e ) ); } else if ( type == "unsigned" || type == "uint" || type == "unsigned int" - || type == "Q_UINT32" ) + || type == "TQ_UINT32" ) { TQLabel* n = new TQLabel( name, frame ); grid->addWidget( n, i, 0 ); @@ -493,7 +493,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it ) e->setValidator( new TQIntValidator( e ) ); } else if ( type == "ulong" || type == "unsigned long" || type == "unsigned long int" - || type == "Q_UINT64" ) + || type == "TQ_UINT64" ) { TQLabel* n = new TQLabel( name, frame ); grid->addWidget( n, i, 0 ); @@ -697,7 +697,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it ) arg << e->text().toInt(); } else if ( type == "unsigned" || type == "uint" || type == "unsigned int" - || type == "Q_UINT32" ) + || type == "TQ_UINT32" ) { KLineEdit* e = (KLineEdit*)wl.at( i ); arg << e->text().toUInt(); @@ -722,7 +722,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it ) KLineEdit* e = (KLineEdit*)wl.at( i ); arg << e->text().toUShort(); } - else if ( type == "Q_UINT64" ) + else if ( type == "TQ_UINT64" ) { KLineEdit* e = ( KLineEdit* )wl.at( i ); arg << e->text().toULongLong(); @@ -936,7 +936,7 @@ bool KDCOPWindow::demarshal if ( replyType == "TQVariant" ) { // read data type from stream - Q_INT32 type; + TQ_INT32 type; reply >> type; // change replyType to real typename @@ -952,7 +952,7 @@ bool KDCOPWindow::demarshal ret << TQString::number(i); } else if ( replyType == "uint" || replyType == "unsigned int" - || replyType == "Q_UINT32" ) + || replyType == "TQ_UINT32" ) { uint i; reply >> i; @@ -970,9 +970,9 @@ bool KDCOPWindow::demarshal reply >> l; ret << TQString::number(l); } - else if ( replyType == "Q_UINT64" ) + else if ( replyType == "TQ_UINT64" ) { - Q_UINT64 i; + TQ_UINT64 i; reply >> i; ret << TQString::number(i); } @@ -1053,7 +1053,7 @@ bool KDCOPWindow::demarshal TQCursor r; reply >> r; //theList->insertItem(r, 1); - ret << "Cursor #" + TQString::number(r.shape()); + ret << "Cursor #" + TQString::number(r.tqshape()); } else if (replyType == "TQPixmap") { @@ -1191,7 +1191,7 @@ KDCOPWindow::getParameters int s = (*it).findRev(' '); - if (-1 != s && !intTypes.contains((*it).mid(s + 1))) + if (-1 != s && !intTypes.tqcontains((*it).mid(s + 1))) { names.append((*it).mid(s + 1)); |