summaryrefslogtreecommitdiffstats
path: root/kregexpeditor/KMultiFormListBox
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-23 01:42:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-23 01:42:07 +0000
commita2277b6bc715464e83882b90c2a058139b8a6b54 (patch)
treeab09b14014f59b4d8e2ddd12226aa0b22e4dfc5d /kregexpeditor/KMultiFormListBox
parentd3f79e04b34bd1f70a458b81b28fc8799498c8dc (diff)
downloadtdeutils-a2277b6bc715464e83882b90c2a058139b8a6b54.tar.gz
tdeutils-a2277b6bc715464e83882b90c2a058139b8a6b54.zip
TQt4 port kdeutils
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1238125 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kregexpeditor/KMultiFormListBox')
-rw-r--r--kregexpeditor/KMultiFormListBox/ccp.cpp12
-rw-r--r--kregexpeditor/KMultiFormListBox/indexWindow.cpp14
-rw-r--r--kregexpeditor/KMultiFormListBox/indexWindow.h3
-rw-r--r--kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp22
-rw-r--r--kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.h5
-rw-r--r--kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp8
-rw-r--r--kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.h5
-rw-r--r--kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp14
-rw-r--r--kregexpeditor/KMultiFormListBox/kmultiformlistbox.h7
-rw-r--r--kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.cpp2
-rw-r--r--kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h11
-rw-r--r--kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.cpp4
-rw-r--r--kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.h8
-rw-r--r--kregexpeditor/KMultiFormListBox/widgetwindow.cpp10
-rw-r--r--kregexpeditor/KMultiFormListBox/widgetwindow.h2
-rw-r--r--kregexpeditor/KMultiFormListBox/windowlistboxitem.h2
16 files changed, 67 insertions, 62 deletions
diff --git a/kregexpeditor/KMultiFormListBox/ccp.cpp b/kregexpeditor/KMultiFormListBox/ccp.cpp
index d868591..ff2d6c3 100644
--- a/kregexpeditor/KMultiFormListBox/ccp.cpp
+++ b/kregexpeditor/KMultiFormListBox/ccp.cpp
@@ -23,7 +23,7 @@
#include "ccp.h"
#include <tqobjectlist.h>
#include <tqpopupmenu.h>
-#ifdef QT_ONLY
+#ifdef TQT_ONLY
#include "compat.h"
#else
#include <klocale.h>
@@ -32,15 +32,15 @@
CCP::CCP(KMultiFormListBoxMultiVisible *ee_, KMultiFormListBoxEntry *eee_) : TQObject() {
ee = ee_;
eee = eee_;
- install(eee);
+ install(TQT_TQOBJECT(eee));
}
void CCP::install(TQObject *elm)
{
elm->installEventFilter(this);
- const TQObjectList *children = elm->children();
- if (children) {
- TQObjectListIt it = TQObjectListIt(*children);
+ const TQObjectList tqchildren = elm->childrenListObject();
+ if (!tqchildren.isEmpty()) {
+ TQObjectListIt it = TQObjectListIt(tqchildren);
while (TQObject *child=it.current()) {
if (child->inherits("KMultiFormListBoxMultiVisible")) {
@@ -58,7 +58,7 @@ void CCP::install(TQObject *elm)
bool CCP::eventFilter(TQObject *, TQEvent *event)
{
if (event->type() != TQEvent::MouseButtonPress ||
- ((TQMouseEvent *) event)->button() != RightButton ||
+ ((TQMouseEvent *) event)->button() != Qt::RightButton ||
((TQMouseEvent *) event)->state() != TQEvent::ControlButton) {
return false;
}
diff --git a/kregexpeditor/KMultiFormListBox/indexWindow.cpp b/kregexpeditor/KMultiFormListBox/indexWindow.cpp
index dccb184..f81ea07 100644
--- a/kregexpeditor/KMultiFormListBox/indexWindow.cpp
+++ b/kregexpeditor/KMultiFormListBox/indexWindow.cpp
@@ -16,7 +16,7 @@
* Boston, MA 02110-1301, USA.
**/
-#ifdef QT_ONLY
+#ifdef TQT_ONLY
#include "compat.h"
#else
#include "indexWindow.moc"
@@ -46,7 +46,7 @@ void indexWindow::lbSelected(int index)
void indexWindow::finish(int index)
{
itemSelected = index;
- qApp->exit_loop();
+ tqApp->exit_loop();
}
@@ -71,7 +71,7 @@ int indexWindow::exec(const TQPoint & /*start*/, int /*width*/)
// 23 Feb. 2003 11:28 -- Jesper K. Pedersen
/*
// calculate the height of all the elements together.
- // I need to do it this way, as sizeHint doesn't report the correct size
+ // I need to do it this way, as tqsizeHint doesn't report the correct size
// and itemHeight doesn't neither.
int elm_h = lb->item(0)->height(lb) * lb->count();
elm_h += 2*lb->frameWidth();
@@ -79,17 +79,17 @@ int indexWindow::exec(const TQPoint & /*start*/, int /*width*/)
TQWidget *desktop = TQApplication::desktop();
int desktop_h = desktop->height();
int rest_h = desktop_h - start.y();
- int below_h = QMAX(rest_h, 200);
+ int below_h = TQMAX(rest_h, 200);
int start_y = start.y();
if (rest_h < 200 && elm_h > 200) {
- start_y = desktop_h-QMIN(elm_h,200);
+ start_y = desktop_h-TQMIN(elm_h,200);
}
- setGeometry(start.x(), start_y, width, QMIN(elm_h, below_h));
+ setGeometry(start.x(), start_y, width, TQMIN(elm_h, below_h));
show();
- qApp->enter_loop();
+ tqApp->enter_loop();
return itemSelected;
*/
return 0;
diff --git a/kregexpeditor/KMultiFormListBox/indexWindow.h b/kregexpeditor/KMultiFormListBox/indexWindow.h
index ab20e73..833c789 100644
--- a/kregexpeditor/KMultiFormListBox/indexWindow.h
+++ b/kregexpeditor/KMultiFormListBox/indexWindow.h
@@ -38,9 +38,10 @@
@internal
**/
-class indexWindow : public QWidget{
+class indexWindow : public TQWidget{
Q_OBJECT
+ TQ_OBJECT
public:
indexWindow();
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp
index 4a740c5..0dfa991 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp
+++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp
@@ -16,7 +16,7 @@
* Boston, MA 02110-1301, USA.
**/
-#ifdef QT_ONLY
+#ifdef TQT_ONLY
#include "compat.h"
#include <tqmessagebox.h>
#else
@@ -38,8 +38,8 @@ const uchar indexButtonBits[] = {
};
-KMultiFormListBoxMultiVisible::KMultiFormListBoxMultiVisible(KMultiFormListBoxFactory *fact, TQWidget *parent, const char *name)
- : TQScrollView(parent, name)
+KMultiFormListBoxMultiVisible::KMultiFormListBoxMultiVisible(KMultiFormListBoxFactory *fact, TQWidget *tqparent, const char *name)
+ : TQScrollView(tqparent, name)
{
factory = fact;
@@ -94,9 +94,9 @@ void KMultiFormListBoxMultiVisible::updateClipperContent()
// calculate the required size.
for (TQWidget *child = elms->first(); child; child=elms->next()) {
- maxWidth = QMAX(maxWidth, child->sizeHint().width());
+ maxWidth = TQMAX(maxWidth, child->tqsizeHint().width());
if (strcmp(child->name(), "seperator") != 0) {
- totalHeight += child->sizeHint().height();
+ totalHeight += child->tqsizeHint().height();
count++;
}
else {
@@ -116,7 +116,7 @@ void KMultiFormListBoxMultiVisible::updateClipperContent()
for (TQWidget *child2 = elms->first(); child2; child2=elms->next()) {
int h;
if ( strcmp(child2->name(),"seperator") != 0) {
- h = child2->sizeHint().height();
+ h = child2->tqsizeHint().height();
h += extra;
}
else {
@@ -154,7 +154,7 @@ void KMultiFormListBoxMultiVisible::append(KMultiFormListBoxEntry *elm)
void KMultiFormListBoxMultiVisible::delElement(TQWidget *elm)
{
- int index = elms->find(elm);
+ int index = elms->tqfind(elm);
TQWidget *next = elms->at(index+1);
if (strcmp(next->name(),"seperator") != 0) {
elms->removeRef(next);
@@ -186,7 +186,7 @@ void KMultiFormListBoxMultiVisible::insertElmIntoWidget(KMultiFormListBoxEntry *
// Find the location to insert the new element.
int index = elms->count();
if (after) {
- index = elms->findRef(after);
+ index = elms->tqfindRef(after);
}
// Now show the new element.
@@ -266,14 +266,14 @@ void KMultiFormListBoxMultiVisible::cut(KMultiFormListBoxEntry *elm)
}
TQDataStream stream(clipboard, IO_WriteOnly);
- factory->toStream( elm, stream );
+ factory->toStream( TQT_TQOBJECT(elm), stream );
delElement(elm);
}
void KMultiFormListBoxMultiVisible::copy(KMultiFormListBoxEntry *elm)
{
TQDataStream stream(clipboard, IO_WriteOnly);
- factory->toStream(elm, stream);
+ factory->toStream(TQT_TQOBJECT(elm), stream);
}
void KMultiFormListBoxMultiVisible::paste(KMultiFormListBoxEntry *oldElm)
@@ -285,7 +285,7 @@ void KMultiFormListBoxMultiVisible::paste(KMultiFormListBoxEntry *oldElm)
KMultiFormListBoxEntry *newElm = factory->create(viewport());
TQDataStream stream( clipboard, IO_ReadOnly );
- factory->fromStream(stream, newElm);
+ factory->fromStream(stream, TQT_TQOBJECT(newElm));
insertElmIntoWidget(newElm,oldElm);
}
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.h b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.h
index 309044a..f0e5d79 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.h
+++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.h
@@ -35,6 +35,7 @@
class KMultiFormListBoxMultiVisible :public TQScrollView, KMultiFormListBoxShower {
Q_OBJECT
+ TQ_OBJECT
friend class KMultiFormListBox;
@@ -42,9 +43,9 @@ private:
/**
@param factory A factory used to generate the instances of KMultiFormListBoxEntry
class which is repeated in the KMultiFormListBox
- @param parent A pointer to the parent widget
+ @param tqparent A pointer to the tqparent widget
*/
- KMultiFormListBoxMultiVisible(KMultiFormListBoxFactory *factory, TQWidget *parent = 0, const char *name = 0);
+ KMultiFormListBoxMultiVisible(KMultiFormListBoxFactory *factory, TQWidget *tqparent = 0, const char *name = 0);
/**
@return The elements in the KMultiFormListBox
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp
index c0e6090..6f9246c 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp
+++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp
@@ -15,7 +15,7 @@
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
**/
-#ifdef QT_ONLY
+#ifdef TQT_ONLY
#include "compat.h"
#else
#include <kmessagebox.h>
@@ -27,10 +27,10 @@
#include "widgetwindow.h"
#include "windowlistboxitem.h"
-KMultiFormListBoxWindowed::KMultiFormListBoxWindowed(KMultiFormListBoxFactory *factory, TQWidget *parent,
+KMultiFormListBoxWindowed::KMultiFormListBoxWindowed(KMultiFormListBoxFactory *factory, TQWidget *tqparent,
bool showUpDownButtons, bool showHelpButton,
TQString addButtonText,const char *name)
- : TQWidget( parent, name )
+ : TQWidget( tqparent, name )
{
_layout = new TQVBoxLayout(this);
@@ -150,7 +150,7 @@ void KMultiFormListBoxWindowed::slotDeleteEntry()
WindowListboxItem *item = selected();
if (item) {
int answer =
- KMessageBox::warningContinueCancel(0, i18n("Delete item \"%1\"?").arg(item->text()),i18n("Delete Item"),KStdGuiItem::del());
+ KMessageBox::warningContinueCancel(0, i18n("Delete item \"%1\"?").tqarg(item->text()),i18n("Delete Item"),KStdGuiItem::del());
if (answer == KMessageBox::Continue) {
delete item;
slotUpdateButtonState();
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.h b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.h
index 873c406..ca3f8bf 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.h
+++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.h
@@ -18,7 +18,7 @@
#ifndef __kmultiformlistboxwindowed
#define __kmultiformlistboxwindowed
-#ifdef QT_ONLY
+#ifdef TQT_ONLY
#include "compat.h"
#include <tqlistbox.h>
#else
@@ -38,11 +38,12 @@ class WindowListboxItem;
class KMultiFormListBoxWindowed :public TQWidget, KMultiFormListBoxShower {
Q_OBJECT
+ TQ_OBJECT
friend class KMultiFormListBox;
private:
- KMultiFormListBoxWindowed(KMultiFormListBoxFactory *factory, TQWidget *parent,
+ KMultiFormListBoxWindowed(KMultiFormListBoxFactory *factory, TQWidget *tqparent,
bool showUpDownButtons, bool showHelpButton, TQString addButtonText,
const char *name);
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp b/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp
index 0aa384e..8ddb5c7 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp
+++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp
@@ -15,16 +15,16 @@
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
**/
-#ifndef QT_ONLY
+#ifndef TQT_ONLY
#include "kmultiformlistbox.moc"
#endif
#include "kmultiformlistbox-multivisible.h"
#include "kmultiformlistbox-windowed.h"
-KMultiFormListBox::KMultiFormListBox( KMultiFormListBoxFactory *factory, KMultiFormListBoxType tp, TQWidget *parent,
+KMultiFormListBox::KMultiFormListBox( KMultiFormListBoxFactory *factory, KMultiFormListBoxType tp, TQWidget *tqparent,
bool showUpDownButtons, bool showHelpButton, TQString addButtonText,
- const char *name ) : TQWidget( parent, name )
+ const char *name ) : TQWidget( tqparent, name )
{
switch ( tp ) {
@@ -40,9 +40,9 @@ KMultiFormListBox::KMultiFormListBox( KMultiFormListBoxFactory *factory, KMultiF
TQWidget *widget = theWidget->qWidget();
- TQHBoxLayout *layout = new TQHBoxLayout( this );
+ TQHBoxLayout *tqlayout = new TQHBoxLayout( this );
_factory = factory;
- layout->addWidget( widget );
+ tqlayout->addWidget( widget );
}
void KMultiFormListBox::append( KMultiFormListBoxEntry *element )
@@ -77,7 +77,7 @@ void KMultiFormListBox::toStream( TQDataStream& stream ) const
const KMultiFormListBoxEntryList elms = elements();
stream << elms.count();
for ( TQPtrListIterator<KMultiFormListBoxEntry> it(elms); *it; ++it)
- _factory->toStream( *it, stream );
+ _factory->toStream( TQT_TQOBJECT(*it), stream );
}
void KMultiFormListBox::fromStream( TQDataStream& stream )
@@ -97,7 +97,7 @@ void KMultiFormListBox::fromStream( TQDataStream& stream )
KMultiFormListBoxEntryList elms = elements();
for (TQPtrListIterator<KMultiFormListBoxEntry> it(elms); *it; ++it)
- _factory->fromStream( stream, *it );
+ _factory->fromStream( stream, TQT_TQOBJECT(*it) );
}
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.h b/kregexpeditor/KMultiFormListBox/kmultiformlistbox.h
index fd11648..0a23863 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.h
+++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox.h
@@ -25,7 +25,7 @@
#include <tqlayout.h>
#include <tqscrollview.h>
-#ifdef QT_ONLY
+#ifdef TQT_ONLY
#include "compat.h"
#else
#include <klocale.h>
@@ -63,6 +63,7 @@ class KMultiFormListBoxMultiVisible;
class KMultiFormListBox : public TQWidget {
Q_OBJECT
+ TQ_OBJECT
public:
@@ -71,11 +72,11 @@ public:
/**
@param factory A factory used to generate the instances of
KMultiFormListBoxEntry class which is repeated in the KMultiFormListBox
- @param parent A pointer to the parent widget
+ @param tqparent A pointer to the tqparent widget
**/
KMultiFormListBox(KMultiFormListBoxFactory *factory,
KMultiFormListBoxType tp=Windowed,
- TQWidget *parent = 0, bool showUpDownButtons = true,
+ TQWidget *tqparent = 0, bool showUpDownButtons = true,
bool showHelpButton = true, TQString addButtonText = i18n("Add"),
const char *name = 0);
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.cpp b/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.cpp
index e885c29..5631078 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.cpp
+++ b/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.cpp
@@ -16,7 +16,7 @@
* Boston, MA 02110-1301, USA.
**/
-#ifndef QT_ONLY
+#ifndef TQT_ONLY
#include "kmultiformlistboxentry.moc"
#endif
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h b/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h
index 313f026..c51ac16 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h
+++ b/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h
@@ -31,8 +31,8 @@
button. If you want to use this in you KMultiFormListBox, then you must do the
following:
@li Create a @ref TQPushButton as a sub-widget to your KMultiFormListBoxEntry.
- @li Override the @ref indexButton method to return your QPushButton
- @li Override the @ref idxString to return a @ref QString
+ @li Override the @ref indexButton method to return your TQPushButton
+ @li Override the @ref idxString to return a @ref TQString
with a textual representation of the content in this KMultiFormListBoxEntry. This
string will be used in the drop-down box which the user gets when he
presses the Idx button.
@@ -45,12 +45,13 @@
indexWindowPos method to return a start point for the drop down window and
a width.
**/
-class KMultiFormListBoxEntry : public QWidget
+class KMultiFormListBoxEntry : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- KMultiFormListBoxEntry(TQWidget *parent, const char *name) : TQWidget(parent,name) {}
+ KMultiFormListBoxEntry(TQWidget *tqparent, const char *name) : TQWidget(tqparent,name) {}
virtual TQPushButton *indexButton() { return 0; }
virtual TQWidget *valueWidget() { return 0; }
@@ -59,7 +60,7 @@ public:
// This function must return a string representing the KMultiFormListBox. This is
// used when showing the fast-search menu available from the `Idx' button.
- virtual TQString idxString() { return TQString::fromLatin1(""); }
+ virtual TQString idxString() { return TQString::tqfromLatin1(""); }
public slots:
void acceptIndexButton();
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.cpp b/kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.cpp
index 08a800a..8432ccf 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.cpp
+++ b/kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.cpp
@@ -18,8 +18,8 @@
#include "kmultiformlistboxfactory.h"
#include <tqframe.h>
-TQWidget *KMultiFormListBoxFactory::separator(TQWidget *parent) {
- TQFrame* sep = new TQFrame( parent );
+TQWidget *KMultiFormListBoxFactory::separator(TQWidget *tqparent) {
+ TQFrame* sep = new TQFrame( tqparent );
sep->setFrameStyle( TQFrame::HLine | TQFrame::Sunken);
sep->setLineWidth(1);
return sep;
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.h b/kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.h
index dc0bcce..61a78aa 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.h
+++ b/kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.h
@@ -47,23 +47,23 @@ public:
a subclass of this class. This instance will be owned by the caller of
this function.
- @param parent A pointer to the parent of this KMultiFormListBoxEntry widget
+ @param tqparent A pointer to the tqparent of this KMultiFormListBoxEntry widget
returned.
@return A fresh @ref KMultiFormListBoxEntry to be used in an instance of the
@ref KMultiFormListBox class.
**/
- virtual KMultiFormListBoxEntry *create(TQWidget *parent) = 0;
+ virtual KMultiFormListBoxEntry *create(TQWidget *tqparent) = 0;
/**
This method is used to get a separator between the elements in an @ref
KMultiFormListBox. The widget returned from this method will be owned by the
caller.
- @param parent A pointer to the parent of the TQWidget returned.
+ @param tqparent A pointer to the tqparent of the TQWidget returned.
@return A widget which must be used as a separator between the @ref
KMultiFormListBoxEntry elements in an @ref KMultiFormListBox.
**/
- virtual TQWidget *separator(TQWidget *parent);
+ virtual TQWidget *separator(TQWidget *tqparent);
};
#endif /* kmultiformlistbox */
diff --git a/kregexpeditor/KMultiFormListBox/widgetwindow.cpp b/kregexpeditor/KMultiFormListBox/widgetwindow.cpp
index e94210d..73bfcd6 100644
--- a/kregexpeditor/KMultiFormListBox/widgetwindow.cpp
+++ b/kregexpeditor/KMultiFormListBox/widgetwindow.cpp
@@ -47,7 +47,7 @@ void WidgetWindow::init(KMultiFormListBoxFactory *factory, KListBox *lb, KMultiF
myWidget = factory->create(frame);
}
TQDataStream stream( _backup, IO_WriteOnly );
- myFact->toStream( myWidget, stream );
+ myFact->toStream( TQT_TQOBJECT(myWidget), stream );
lay->addWidget(myWidget);
@@ -86,7 +86,7 @@ void WidgetWindow::slotCancel()
}
else {
TQDataStream stream( _backup, IO_ReadOnly );
- myFact->fromStream( stream, myWidget );
+ myFact->fromStream( stream, TQT_TQOBJECT(myWidget) );
}
KDialogBase::slotCancel();
}
@@ -96,9 +96,9 @@ WidgetWindow *WidgetWindow::clone()
WidgetWindow *item = new WidgetWindow(myFact, listbox);
TQByteArray data;
TQDataStream ws( data, IO_WriteOnly );
- myFact->toStream( myWidget, ws );
+ myFact->toStream( TQT_TQOBJECT(myWidget), ws );
TQDataStream rs( data, IO_ReadOnly );
- myFact->fromStream( rs, item->myWidget );
+ myFact->fromStream( rs, TQT_TQOBJECT(item->myWidget) );
item->slotOk();
return item;
@@ -107,7 +107,7 @@ WidgetWindow *WidgetWindow::clone()
void WidgetWindow::display()
{
TQDataStream stream( _backup, IO_WriteOnly);
- myFact->toStream( myWidget, stream );
+ myFact->toStream( TQT_TQOBJECT(myWidget), stream );
show();
}
diff --git a/kregexpeditor/KMultiFormListBox/widgetwindow.h b/kregexpeditor/KMultiFormListBox/widgetwindow.h
index 647b2ef..eea6500 100644
--- a/kregexpeditor/KMultiFormListBox/widgetwindow.h
+++ b/kregexpeditor/KMultiFormListBox/widgetwindow.h
@@ -18,7 +18,7 @@
#ifndef __configwindow
#define __configwindow
-#ifdef QT_ONLY
+#ifdef TQT_ONLY
#include "compat.h"
#include <tqlistbox.h>
#else
diff --git a/kregexpeditor/KMultiFormListBox/windowlistboxitem.h b/kregexpeditor/KMultiFormListBox/windowlistboxitem.h
index 5e9d0f6..6cad532 100644
--- a/kregexpeditor/KMultiFormListBox/windowlistboxitem.h
+++ b/kregexpeditor/KMultiFormListBox/windowlistboxitem.h
@@ -26,7 +26,7 @@ class KMultiFormListBoxEntry;
/**
@internal
*/
-class WindowListboxItem :public QListBoxText
+class WindowListboxItem :public TQListBoxText
{
friend class WidgetWindow;
friend class KMultiFormListBoxWindowed;