summaryrefslogtreecommitdiffstats
path: root/kdcop
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
commit8155225c9be993acc0512956416d195edfef4eb9 (patch)
treede4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /kdcop
parent364641b8e0279758d236af39abd138d379328a19 (diff)
downloadtdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz
tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdcop')
-rw-r--r--kdcop/kdcoplistview.cpp8
-rw-r--r--kdcop/kdcoplistview.h2
-rw-r--r--kdcop/kdcopview.ui14
-rw-r--r--kdcop/kdcopwindow.cpp74
4 files changed, 49 insertions, 49 deletions
diff --git a/kdcop/kdcoplistview.cpp b/kdcop/kdcoplistview.cpp
index cc727072..7348fbc0 100644
--- a/kdcop/kdcoplistview.cpp
+++ b/kdcop/kdcoplistview.cpp
@@ -62,7 +62,7 @@ TQString KDCOPListView::encode(TQListViewItem *theCode)
TQString unNormalisedSignature(function);
- int s = unNormalisedSignature.find(' ');
+ int s = unNormalisedSignature.tqfind(' ');
if ( s < 0 )
s = 0;
@@ -71,8 +71,8 @@ TQString KDCOPListView::encode(TQListViewItem *theCode)
unNormalisedSignature = unNormalisedSignature.mid(s);
- int left = unNormalisedSignature.find('(');
- int right = unNormalisedSignature.findRev(')');
+ int left = unNormalisedSignature.tqfind('(');
+ int right = unNormalisedSignature.tqfindRev(')');
if (-1 == left)
{
@@ -86,7 +86,7 @@ TQString KDCOPListView::encode(TQListViewItem *theCode)
for (TQStringList::Iterator it = types.begin(); it != types.end(); ++it)
{
(*it) = (*it).stripWhiteSpace();
- int s = (*it).find(' ');
+ int s = (*it).tqfind(' ');
if (-1 != s)
{
names.append((*it).mid(s + 1));
diff --git a/kdcop/kdcoplistview.h b/kdcop/kdcoplistview.h
index b104e95c..9cb549f7 100644
--- a/kdcop/kdcoplistview.h
+++ b/kdcop/kdcoplistview.h
@@ -28,7 +28,7 @@ class KDCOPListView : public KListView
};
-class DCOPBrowserItem : public QListViewItem
+class DCOPBrowserItem : public TQListViewItem
{
public:
diff --git a/kdcop/kdcopview.ui b/kdcop/kdcopview.ui
index 5d1de7a9..7491da6c 100644
--- a/kdcop/kdcopview.ui
+++ b/kdcop/kdcopview.ui
@@ -1,7 +1,7 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>kdcopview</class>
<author>Ian Reinhart Geiser geiseri@kde.org</author>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>kdcopview</cstring>
</property>
@@ -25,7 +25,7 @@
<cstring>kListViewSearchLine1</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -36,7 +36,7 @@
<cstring>kListViewSearchLine1</cstring>
</property>
</widget>
- <widget class="QSplitter" row="1" column="0" rowspan="1" colspan="2">
+ <widget class="TQSplitter" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>splitter8</cstring>
</property>
@@ -48,7 +48,7 @@
<cstring>lv</cstring>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>layout18</cstring>
</property>
@@ -56,7 +56,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="1">
+ <widget class="TQLabel" row="0" column="1">
<property name="name">
<cstring>l_replyType</cstring>
</property>
@@ -86,7 +86,7 @@
<cstring>lb_replyData</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>TextLabel1</cstring>
</property>
@@ -98,7 +98,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>0</height>
diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp
index b7b21bd7..78db79f3 100644
--- a/kdcop/kdcopwindow.cpp
+++ b/kdcop/kdcopwindow.cpp
@@ -60,7 +60,7 @@ class DCOPBrowserFunctionItem;
//------------------------------
-class KMultiIntEdit : public QVBox
+class KMultiIntEdit : public TQVBox
{
public:
KMultiIntEdit(TQWidget *parent , const char * name=0) : TQVBox(parent,name) {}
@@ -70,7 +70,7 @@ public:
new TQLabel(caption + ": ", l);
KLineEdit* e = new KLineEdit( l );
m_widgets.insert(key, e ) ;
- e->setValidator( new TQIntValidator( e ) );
+ e->setValidator( new TQIntValidator( TQT_TQOBJECT(e) ) );
}
int field(int key)
{
@@ -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.
@@ -157,7 +157,7 @@ DCOPBrowserApplicationItem::setOpen(bool o)
void
DCOPBrowserApplicationItem::populate()
{
- KApplication::setOverrideCursor(waitCursor);
+ KApplication::setOverrideCursor(tqwaitCursor);
bool ok = false;
bool isDefault = false;
@@ -202,7 +202,7 @@ void DCOPBrowserApplicationItem::retreiveIcon(int /*callId*/,const TQCString& /*
TQPixmap returnQPixmap;
reply >> returnQPixmap;
if(!returnQPixmap.isNull())
- setPixmap(0, TQPixmap(returnQPixmap.convertToImage().smoothScale(16,16)) );
+ setPixmap(0, TQPixmap(TQImage(returnQPixmap.convertToImage()).smoothScale(16,16)) );
else
kdDebug() << "Unable to retreive the icon" << endl;
}
@@ -240,7 +240,7 @@ DCOPBrowserInterfaceItem::setOpen(bool o)
void
DCOPBrowserInterfaceItem::populate()
{
- KApplication::setOverrideCursor(waitCursor);
+ KApplication::setOverrideCursor(tqwaitCursor);
bool ok = false;
@@ -312,12 +312,12 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name)
// set up the actions
- KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() );
- KStdAction::copy( this, TQT_SLOT( slotCopy()), actionCollection() );
+ KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
+ KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy()), actionCollection() );
KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() );
- (void) new KAction( i18n( "&Reload" ), "reload", KStdAccel::shortcut(KStdAccel::Reload), this, TQT_SLOT( slotReload() ), actionCollection(), "reload" );
+ (void) new KAction( i18n( "&Reload" ), "reload", KStdAccel::shortcut(KStdAccel::Reload), TQT_TQOBJECT(this), TQT_SLOT( slotReload() ), actionCollection(), "reload" );
exeaction =
new KAction
@@ -325,7 +325,7 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name)
i18n("&Execute"),
"exec",
CTRL + Key_E,
- this,
+ TQT_TQOBJECT(this),
TQT_SLOT(slotCallFunction()),
actionCollection(),
"execute"
@@ -336,7 +336,7 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name)
langmode = new KSelectAction ( i18n("Language Mode"),
CTRL + Key_M,
- this,
+ TQT_TQOBJECT(this),
TQT_SLOT(slotMode()),
actionCollection(),
"langmode");
@@ -424,7 +424,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
TQString::null, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true );
mydialog.setCaption
- ( i18n("Call Function %1").arg( fitem->function() ) );
+ ( i18n("Call Function %1").arg( static_cast<const char *>(fitem->function()) ) );
TQFrame *frame = mydialog.makeMainWidget();
@@ -464,10 +464,10 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
KLineEdit* e = new KLineEdit( frame );
grid->addWidget( e, i, 2 );
wl.append( e );
- e->setValidator( new TQIntValidator( e ) );
+ e->setValidator( new TQIntValidator( TQT_TQOBJECT(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 );
@@ -477,7 +477,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
grid->addWidget( e, i, 2 );
wl.append( e );
- TQIntValidator* iv = new TQIntValidator( e );
+ TQIntValidator* iv = new TQIntValidator( TQT_TQOBJECT(e) );
iv->setBottom( 0 );
e->setValidator( iv );
}
@@ -490,10 +490,10 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
KLineEdit* e = new KLineEdit( frame );
grid->addWidget( e, i, 2 );
wl.append( e );
- e->setValidator( new TQIntValidator( e ) );
+ e->setValidator( new TQIntValidator( TQT_TQOBJECT(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 );
@@ -502,7 +502,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
KLineEdit* e = new KLineEdit( frame );
grid->addWidget( e, i, 2 );
wl.append( e );
- e->setValidator( new TQIntValidator( e ) );
+ e->setValidator( new TQIntValidator( TQT_TQOBJECT(e) ) );
}
else if ( type == "short" || type == "short int" )
{
@@ -513,7 +513,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
KLineEdit* e = new KLineEdit( frame );
grid->addWidget( e, i, 2 );
wl.append( e );
- e->setValidator( new TQIntValidator( e ) );
+ e->setValidator( new TQIntValidator( TQT_TQOBJECT(e) ) );
}
else if ( type == "ushort" || type == "unsigned short" || type == "unsigned short int" )
{
@@ -524,7 +524,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
KLineEdit* e = new KLineEdit( frame );
grid->addWidget( e, i, 2 );
wl.append( e );
- e->setValidator( new TQIntValidator( e ) );
+ e->setValidator( new TQIntValidator( TQT_TQOBJECT(e) ) );
}
else if ( type == "float" )
{
@@ -535,7 +535,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
KLineEdit* e = new KLineEdit( frame );
grid->addWidget( e, i, 2 );
wl.append( e );
- e->setValidator( new TQDoubleValidator( e ) );
+ e->setValidator( new TQDoubleValidator( TQT_TQOBJECT(e) ) );
}
else if ( type == "double" )
{
@@ -546,7 +546,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
KLineEdit* e = new KLineEdit( frame );
grid->addWidget( e, i, 2 );
wl.append( e );
- e->setValidator( new TQDoubleValidator( e ) );
+ e->setValidator( new TQDoubleValidator( TQT_TQOBJECT(e) ) );
}
else if ( type == "bool" )
{
@@ -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();
@@ -902,7 +902,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
void KDCOPWindow::slotFillApplications()
{
- KApplication::setOverrideCursor(waitCursor);
+ KApplication::setOverrideCursor(tqwaitCursor);
QCStringList apps = dcopClient->registeredApplications();
TQCString appId = dcopClient->appId();
@@ -924,7 +924,7 @@ bool KDCOPWindow::demarshal
(
TQCString & replyType,
TQDataStream & reply,
- QListBox *theList
+ TQListBox *theList
)
{
TQStringList ret;
@@ -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")
{
@@ -1093,7 +1093,7 @@ bool KDCOPWindow::demarshal
DCOPRef r;
reply >> r;
if (!r.app().isEmpty() && !r.obj().isEmpty())
- ret << TQString("DCOPRef(%1, %2)").arg(r.app(), r.obj());
+ ret << TQString("DCOPRef(%1, %2)").arg(static_cast<const char *>(r.app()), static_cast<const char *>(r.obj()));
}
else
{
@@ -1158,7 +1158,7 @@ KDCOPWindow::getParameters
{
TQString unNormalisedSignature(_unNormalisedSignature);
- int s = unNormalisedSignature.find(' ');
+ int s = unNormalisedSignature.tqfind(' ');
if ( s < 0 )
s = 0;
@@ -1167,8 +1167,8 @@ KDCOPWindow::getParameters
unNormalisedSignature = unNormalisedSignature.mid(s);
- int left = unNormalisedSignature.find('(');
- int right = unNormalisedSignature.findRev(')');
+ int left = unNormalisedSignature.tqfind('(');
+ int right = unNormalisedSignature.tqfindRev(')');
if (-1 == left)
{
@@ -1189,9 +1189,9 @@ KDCOPWindow::getParameters
{
(*it) = (*it).simplifyWhiteSpace();
- int s = (*it).findRev(' ');
+ int s = (*it).tqfindRev(' ');
- if (-1 != s && !intTypes.contains((*it).mid(s + 1)))
+ if (-1 != s && !intTypes.tqcontains((*it).mid(s + 1)))
{
names.append((*it).mid(s + 1));