summaryrefslogtreecommitdiffstats
path: root/kregexpeditor/KMultiFormListBox
diff options
context:
space:
mode:
Diffstat (limited to 'kregexpeditor/KMultiFormListBox')
-rw-r--r--kregexpeditor/KMultiFormListBox/ccp.cpp6
-rw-r--r--kregexpeditor/KMultiFormListBox/indexWindow.cpp4
-rw-r--r--kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp6
-rw-r--r--kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp2
-rw-r--r--kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp4
-rw-r--r--kregexpeditor/KMultiFormListBox/kmultiformlistbox.h2
-rw-r--r--kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h2
7 files changed, 13 insertions, 13 deletions
diff --git a/kregexpeditor/KMultiFormListBox/ccp.cpp b/kregexpeditor/KMultiFormListBox/ccp.cpp
index ff2d6c3..be65d35 100644
--- a/kregexpeditor/KMultiFormListBox/ccp.cpp
+++ b/kregexpeditor/KMultiFormListBox/ccp.cpp
@@ -38,9 +38,9 @@ CCP::CCP(KMultiFormListBoxMultiVisible *ee_, KMultiFormListBoxEntry *eee_) : TQO
void CCP::install(TQObject *elm)
{
elm->installEventFilter(this);
- const TQObjectList tqchildren = elm->childrenListObject();
- if (!tqchildren.isEmpty()) {
- TQObjectListIt it = TQObjectListIt(tqchildren);
+ const TQObjectList children = elm->childrenListObject();
+ if (!children.isEmpty()) {
+ TQObjectListIt it = TQObjectListIt(children);
while (TQObject *child=it.current()) {
if (child->inherits("KMultiFormListBoxMultiVisible")) {
diff --git a/kregexpeditor/KMultiFormListBox/indexWindow.cpp b/kregexpeditor/KMultiFormListBox/indexWindow.cpp
index f81ea07..ccbd636 100644
--- a/kregexpeditor/KMultiFormListBox/indexWindow.cpp
+++ b/kregexpeditor/KMultiFormListBox/indexWindow.cpp
@@ -24,7 +24,7 @@
#include "indexWindow.h"
#include <iostream>
-#include <tqlayout.h>
+#include <layout.h>
indexWindow::indexWindow() : TQWidget(0,"", WStyle_Customize | WType_Popup)
{
@@ -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 tqsizeHint doesn't report the correct size
+ // I need to do it this way, as sizeHint 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();
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp
index 6e82e85..3dcab67 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp
+++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp
@@ -94,9 +94,9 @@ void KMultiFormListBoxMultiVisible::updateClipperContent()
// calculate the required size.
for (TQWidget *child = elms->first(); child; child=elms->next()) {
- maxWidth = TQMAX(maxWidth, child->tqsizeHint().width());
+ maxWidth = TQMAX(maxWidth, child->sizeHint().width());
if (strcmp(child->name(), "seperator") != 0) {
- totalHeight += child->tqsizeHint().height();
+ totalHeight += child->sizeHint().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->tqsizeHint().height();
+ h = child2->sizeHint().height();
h += extra;
}
else {
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp
index 905634c..8d3ffe3 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp
+++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp
@@ -150,7 +150,7 @@ void KMultiFormListBoxWindowed::slotDeleteEntry()
WindowListboxItem *item = selected();
if (item) {
int answer =
- KMessageBox::warningContinueCancel(0, i18n("Delete item \"%1\"?").tqarg(item->text()),i18n("Delete Item"),KStdGuiItem::del());
+ KMessageBox::warningContinueCancel(0, i18n("Delete item \"%1\"?").arg(item->text()),i18n("Delete Item"),KStdGuiItem::del());
if (answer == KMessageBox::Continue) {
delete item;
slotUpdateButtonState();
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp b/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp
index a455bae..58b82da 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp
+++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp
@@ -40,9 +40,9 @@ KMultiFormListBox::KMultiFormListBox( KMultiFormListBoxFactory *factory, KMultiF
TQWidget *widget = theWidget->qWidget();
- TQHBoxLayout *tqlayout = new TQHBoxLayout( this );
+ TQHBoxLayout *layout = new TQHBoxLayout( this );
_factory = factory;
- tqlayout->addWidget( widget );
+ layout->addWidget( widget );
}
void KMultiFormListBox::append( KMultiFormListBoxEntry *element )
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.h b/kregexpeditor/KMultiFormListBox/kmultiformlistbox.h
index ba9b8a8..e432c59 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.h
+++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox.h
@@ -22,7 +22,7 @@
#include "kmultiformlistbox-shower.h"
#include "kmultiformlistboxentry.h"
#include <tqptrlist.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqscrollview.h>
#ifdef TQT_ONLY
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h b/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h
index b4bf36c..90d4e35 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h
+++ b/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h
@@ -60,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::tqfromLatin1(""); }
+ virtual TQString idxString() { return TQString::fromLatin1(""); }
public slots:
void acceptIndexButton();