summaryrefslogtreecommitdiffstats
path: root/kdcop
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
commitfd3a982e26813f5bcc82c7e89ce6fa2ad44432bf (patch)
tree9eda848e56fcb862fdfdf479adeccd95b6fe387a /kdcop
parent02f67d0e1355b79b1806746efb0f2f640e57f13d (diff)
downloadtdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.tar.gz
tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdcop')
-rw-r--r--kdcop/kdcopview.ui10
-rw-r--r--kdcop/kdcopwindow.cpp22
2 files changed, 16 insertions, 16 deletions
diff --git a/kdcop/kdcopview.ui b/kdcop/kdcopview.ui
index ec992848..5d1de7a9 100644
--- a/kdcop/kdcopview.ui
+++ b/kdcop/kdcopview.ui
@@ -5,7 +5,7 @@
<property name="name">
<cstring>kdcopview</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -50,7 +50,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout18</cstring>
+ <cstring>layout18</cstring>
</property>
<grid>
<property name="name">
@@ -98,7 +98,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -139,8 +139,8 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions 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 06f6a6e2..b7b21bd7 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::tqfromLatin1( "exec" ), KIcon::Small ));
+ setPixmap(0, KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "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 == "TQ_UINT32" )
+ || type == "Q_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 == "TQ_UINT64" )
+ || type == "Q_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 == "TQ_UINT32" )
+ || type == "Q_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 == "TQ_UINT64" )
+ else if ( type == "Q_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
- TQ_INT32 type;
+ Q_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 == "TQ_UINT32" )
+ || replyType == "Q_UINT32" )
{
uint i;
reply >> i;
@@ -970,9 +970,9 @@ bool KDCOPWindow::demarshal
reply >> l;
ret << TQString::number(l);
}
- else if ( replyType == "TQ_UINT64" )
+ else if ( replyType == "Q_UINT64" )
{
- TQ_UINT64 i;
+ Q_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.tqshape());
+ ret << "Cursor #" + TQString::number(r.shape());
}
else if (replyType == "TQPixmap")
{
@@ -1191,7 +1191,7 @@ KDCOPWindow::getParameters
int s = (*it).findRev(' ');
- if (-1 != s && !intTypes.tqcontains((*it).mid(s + 1)))
+ if (-1 != s && !intTypes.contains((*it).mid(s + 1)))
{
names.append((*it).mid(s + 1));