summaryrefslogtreecommitdiffstats
path: root/kdeui/tests
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
commit10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch)
tree4bc444c00a79e88105f2cfce5b6209994c413ca0 /kdeui/tests
parent307136d8eef0ba133b78ceee8e901138d4c996a1 (diff)
downloadtdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz
tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.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/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdeui/tests')
-rw-r--r--kdeui/tests/kblendtest.cpp2
-rw-r--r--kdeui/tests/kbuttonboxtest.cpp36
-rw-r--r--kdeui/tests/kcharselecttest.cpp2
-rw-r--r--kdeui/tests/kcolortest.cpp6
-rw-r--r--kdeui/tests/kcomboboxtest.cpp10
-rw-r--r--kdeui/tests/kcompletiontest.cpp10
-rw-r--r--kdeui/tests/kdesattest.cpp2
-rw-r--r--kdeui/tests/kdialogbasetest.cpp8
-rw-r--r--kdeui/tests/kdockwidgetdemo.cpp14
-rw-r--r--kdeui/tests/kdualcolortest.cpp14
-rw-r--r--kdeui/tests/keditlistboxtest.cpp12
-rw-r--r--kdeui/tests/kledtest.cpp6
-rw-r--r--kdeui/tests/kledtest.h2
-rw-r--r--kdeui/tests/klineedittest.cpp6
-rw-r--r--kdeui/tests/kmessageboxtest.cpp34
-rw-r--r--kdeui/tests/kpanelmenutest.cpp2
-rw-r--r--kdeui/tests/kpopuptest.cpp2
-rw-r--r--kdeui/tests/krulertest.cpp24
-rw-r--r--kdeui/tests/krulertest.h2
-rw-r--r--kdeui/tests/ktabwidgettest.cpp26
-rw-r--r--kdeui/tests/kunbalancedgrdtest.cpp2
-rw-r--r--kdeui/tests/kwizardtest.cpp6
22 files changed, 114 insertions, 114 deletions
diff --git a/kdeui/tests/kblendtest.cpp b/kdeui/tests/kblendtest.cpp
index 59a57dc6a..e2d36a575 100644
--- a/kdeui/tests/kblendtest.cpp
+++ b/kdeui/tests/kblendtest.cpp
@@ -11,7 +11,7 @@ KBlendWidget::KBlendWidget(TQWidget *parent, const char *name)
:TQWidget(parent, name)
{
- bgnd = tqRgb(255, 255, 255);
+ bgnd = qRgb(255, 255, 255);
image = TQImage("testimage.png");
diff --git a/kdeui/tests/kbuttonboxtest.cpp b/kdeui/tests/kbuttonboxtest.cpp
index 80b4661cc..1773c47f9 100644
--- a/kdeui/tests/kbuttonboxtest.cpp
+++ b/kdeui/tests/kbuttonboxtest.cpp
@@ -37,8 +37,8 @@ int main(int argc, char **argv) {
"the window!\n"
"Press OK or Cancel when done"
, w);
- l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
- l->setMinimumSize(l->tqsizeHint());
+ l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
+ l->setMinimumSize(l->sizeHint());
tl->addWidget(l,1);
KButtonBox *bbox = new KButtonBox(w);
TQPushButton *b = bbox->addButton("OK");
@@ -50,7 +50,7 @@ int main(int argc, char **argv) {
bbox->addStretch(1);
bbox->addButton("Help");
- bbox->tqlayout();
+ bbox->layout();
tl->addWidget(bbox,0);
tl->activate();
w->exec();
@@ -65,8 +65,8 @@ int main(int argc, char **argv) {
TQLabel *l = new TQLabel("Another common dialog\n\n"\
"OK and Cancel are right aligned\n"\
"Try resizing the window!", w);
- l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
- l->setMinimumSize(l->tqsizeHint());
+ l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
+ l->setMinimumSize(l->sizeHint());
tl->addWidget(l,1);
KButtonBox *bbox = new KButtonBox(w);
bbox->addStretch(1);
@@ -76,7 +76,7 @@ int main(int argc, char **argv) {
w, TQT_SLOT(accept()));
w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()),
w, TQT_SLOT(accept()));
- bbox->tqlayout();
+ bbox->layout();
tl->addWidget(bbox,0);
tl->activate();
w->exec();
@@ -91,8 +91,8 @@ int main(int argc, char **argv) {
TQLabel *l = new TQLabel("Another common dialog\n\n"\
"OK and Cancel are middle aligned\n"\
"Try resizing the window!", w);
- l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
- l->setMinimumSize(l->tqsizeHint());
+ l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
+ l->setMinimumSize(l->sizeHint());
tl->addWidget(l,1);
KButtonBox *bbox = new KButtonBox(w);
bbox->addStretch(1);
@@ -103,7 +103,7 @@ int main(int argc, char **argv) {
w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()),
w, TQT_SLOT(accept()));
bbox->addStretch(1);
- bbox->tqlayout();
+ bbox->layout();
tl->addWidget(bbox,0);
tl->activate();
w->exec();
@@ -120,8 +120,8 @@ int main(int argc, char **argv) {
"the maximum width for all buttons\n"
"since it will look ugly -- "
"anyway, it works", w);
- l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
- l->setMinimumSize(l->tqsizeHint());
+ l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
+ l->setMinimumSize(l->sizeHint());
tl->addWidget(l,1);
KButtonBox *bbox = new KButtonBox(w);
bbox->addStretch(1);
@@ -134,7 +134,7 @@ int main(int argc, char **argv) {
bbox->addButton("Push me and I give you a banana");
bbox->addStretch(1);
- bbox->tqlayout();
+ bbox->layout();
tl->addWidget(bbox,0);
tl->activate();
w->exec();
@@ -152,8 +152,8 @@ int main(int argc, char **argv) {
"prevent this strange effect as seen\n"
"the former example!"
,w);
- l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
- l->setMinimumSize(l->tqsizeHint());
+ l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
+ l->setMinimumSize(l->sizeHint());
tl->addWidget(l,1);
KButtonBox *bbox = new KButtonBox(w);
bbox->addStretch(1);
@@ -166,7 +166,7 @@ int main(int argc, char **argv) {
bbox->addButton("Push me and I give you a banana", true);
bbox->addStretch(1);
- bbox->tqlayout();
+ bbox->layout();
tl->addWidget(bbox,0);
tl->activate();
w->exec();
@@ -182,8 +182,8 @@ int main(int argc, char **argv) {
"to make vertically aligned buttons\n"
"too?"
,w);
- l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
- l->setMinimumSize(l->tqsizeHint());
+ l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
+ l->setMinimumSize(l->sizeHint());
tl->addWidget(l,1);
KButtonBox *bbox = new KButtonBox(w, KButtonBox::Vertical);
TQPushButton *b = bbox->addButton("OK");
@@ -194,7 +194,7 @@ int main(int argc, char **argv) {
w, TQT_SLOT(accept()));
bbox->addStretch(1);
- bbox->tqlayout();
+ bbox->layout();
tl->addWidget(bbox,0);
tl->activate();
w->exec();
diff --git a/kdeui/tests/kcharselecttest.cpp b/kdeui/tests/kcharselecttest.cpp
index 5880c436a..facd17bca 100644
--- a/kdeui/tests/kcharselecttest.cpp
+++ b/kdeui/tests/kcharselecttest.cpp
@@ -7,7 +7,7 @@ int main (int argc,char **argv)
KApplication app( argc, argv, "kcharselecttest" );
KCharSelect selector( 0, "char selector" );
- selector.resize( selector.tqsizeHint() );
+ selector.resize( selector.sizeHint() );
selector.show();
selector.setCaption( "KCharSelect Test" );
diff --git a/kdeui/tests/kcolortest.cpp b/kdeui/tests/kcolortest.cpp
index 46f5b42bc..d4a5c2625 100644
--- a/kdeui/tests/kcolortest.cpp
+++ b/kdeui/tests/kcolortest.cpp
@@ -51,9 +51,9 @@ void KColorWidget::doIntensityLoop()
for (int i=0;i<size; i++, qptr++)
{
qrgb=*(QRgb *)qptr;
- *qptr=tqRgb((int)(tqRed(qrgb)*1./max),
- (int)(tqGreen(qrgb)*1./max),
- (int)(tqBlue(qrgb)*1./max));
+ *qptr=qRgb((int)(qRed(qrgb)*1./max),
+ (int)(qGreen(qrgb)*1./max),
+ (int)(qBlue(qrgb)*1./max));
}
}
pixmap.convertFromImage(image);
diff --git a/kdeui/tests/kcomboboxtest.cpp b/kdeui/tests/kcomboboxtest.cpp
index e8fd35f7e..44b849b44 100644
--- a/kdeui/tests/kcomboboxtest.cpp
+++ b/kdeui/tests/kcomboboxtest.cpp
@@ -36,7 +36,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
TQHBox* hbox = new TQHBox(this);
hbox->setSpacing (KDialog::spacingHint());
TQLabel* lbl = new TQLabel("&QCombobox:", hbox);
- lbl->tqsetSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred);
+ lbl->setSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred);
m_qc = new TQComboBox(hbox, "QtReadOnlyCombo" );
lbl->setBuddy (m_qc);
@@ -48,7 +48,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
hbox = new TQHBox(this);
hbox->setSpacing (KDialog::spacingHint());
lbl = new TQLabel("&Read-Only Combo:", hbox);
- lbl->tqsetSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred);
+ lbl->setSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred);
m_ro = new KComboBox(hbox, "ReadOnlyCombo" );
lbl->setBuddy (m_ro);
@@ -61,7 +61,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
hbox = new TQHBox(this);
hbox->setSpacing (KDialog::spacingHint());
lbl = new TQLabel("&Editable Combo:", hbox);
- lbl->tqsetSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred);
+ lbl->setSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred);
m_rw = new KComboBox( true, hbox, "ReadWriteCombo" );
lbl->setBuddy (m_rw);
@@ -78,7 +78,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
hbox = new TQHBox(this);
hbox->setSpacing (KDialog::spacingHint());
lbl = new TQLabel("&History Combo:", hbox);
- lbl->tqsetSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred);
+ lbl->setSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred);
m_hc = new KHistoryCombo( true, hbox, "HistoryCombo" );
lbl->setBuddy (m_hc);
@@ -94,7 +94,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
hbox = new TQHBox(this);
hbox->setSpacing (KDialog::spacingHint());
lbl = new TQLabel( "&Konq's Combo:", hbox);
- lbl->tqsetSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred);
+ lbl->setSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred);
m_konqc = new KComboBox( true, hbox, "KonqyCombo" );
lbl->setBuddy (m_konqc);
diff --git a/kdeui/tests/kcompletiontest.cpp b/kdeui/tests/kcompletiontest.cpp
index b38ec8095..bdd47ab48 100644
--- a/kdeui/tests/kcompletiontest.cpp
+++ b/kdeui/tests/kcompletiontest.cpp
@@ -39,10 +39,10 @@ Form1::Form1( TQWidget* parent, const char* name )
GroupBox1 = new TQGroupBox( this, "GroupBox1" );
GroupBox1->setTitle( "Completion Test" );
GroupBox1->setColumnLayout(0, Qt::Vertical );
- GroupBox1->tqlayout()->setSpacing( 0 );
- GroupBox1->tqlayout()->setMargin( 0 );
- GroupBox1Layout = new TQVBoxLayout( GroupBox1->tqlayout() );
- GroupBox1Layout->tqsetAlignment( Qt::AlignTop );
+ GroupBox1->layout()->setSpacing( 0 );
+ GroupBox1->layout()->setMargin( 0 );
+ GroupBox1Layout = new TQVBoxLayout( GroupBox1->layout() );
+ GroupBox1Layout->setAlignment( Qt::AlignTop );
GroupBox1Layout->setSpacing( 6 );
GroupBox1Layout->setMargin( 11 );
@@ -166,7 +166,7 @@ void Form1::slotList()
void Form1::slotHighlighted( const TQString& text )
{
// remove any "weighting"
- int index = text.tqfindRev( ':' );
+ int index = text.findRev( ':' );
if ( index > 0 )
LineEdit1->setText( text.left( index ) );
else
diff --git a/kdeui/tests/kdesattest.cpp b/kdeui/tests/kdesattest.cpp
index e75b320a7..28f7d4cf2 100644
--- a/kdeui/tests/kdesattest.cpp
+++ b/kdeui/tests/kdesattest.cpp
@@ -23,7 +23,7 @@ KDesatWidget::KDesatWidget(TQWidget *parent, const char *name)
void KDesatWidget::change(double) {
desat_value = slide->value();
- tqrepaint(false);
+ repaint(false);
}
void KDesatWidget::paintEvent(TQPaintEvent */*ev*/)
diff --git a/kdeui/tests/kdialogbasetest.cpp b/kdeui/tests/kdialogbasetest.cpp
index 8092f27ef..5e62115fa 100644
--- a/kdeui/tests/kdialogbasetest.cpp
+++ b/kdeui/tests/kdialogbasetest.cpp
@@ -12,12 +12,12 @@ int main(int argc, char** argv)
"<center><h1>DialogBase Example</h1></center><hr><br>"
"This example shows the usage of the <i>DialogBase</i> class. "
"<i>DialogBase</i> is the KDE user interface class used to create "
- "dialogs with unique tqlayout without having to define an own dialog "
+ "dialogs with unique layout without having to define an own dialog "
"style for your application. <br>"
"It provides three standard buttons (<b>OK</b>, <b>Apply</b>, and "
"<b>Cancel</b>) that are needed in most dialogs. Each one may be "
"hidden, enabled or disabled, and tooltips and quickhelp texts might be"
- " added. And you do not need to bother about tqgeometry management, this "
+ " added. And you do not need to bother about geometry management, this "
"is all done automatically.<br>"
"To polish your user interface even further, you might want to add "
"textures to the inner and the outer frame of the dialog (the frame is "
@@ -60,11 +60,11 @@ int main(int argc, char** argv)
view.setMinimumSize( 250, 300 );
dialog.setMainWidget(&view);
/* After finishing the setup of your main widget, the dialog needs to be
- adjusted. It is not done automatically, since the tqlayout of the main
+ adjusted. It is not done automatically, since the layout of the main
widget may change before the dialog is shown. Additionally, setting a
help chapter may cause a need for adjustment since it modifies the height
of the upper frame. */
- dialog.resize(dialog.tqminimumSize());
+ dialog.resize(dialog.minimumSize());
/* The dialog object is used just as any other TQDialog: */
if(dialog.exec())
{
diff --git a/kdeui/tests/kdockwidgetdemo.cpp b/kdeui/tests/kdockwidgetdemo.cpp
index 8cec435c3..15b83d14e 100644
--- a/kdeui/tests/kdockwidgetdemo.cpp
+++ b/kdeui/tests/kdockwidgetdemo.cpp
@@ -82,7 +82,7 @@ SFileDialog::SFileDialog( TQString initially, const TQStringList& filter, const
:TQDialog(0L,name,true)
{
KConfig* config = kapp->config();
- config->setGroup( TQString::tqfromLatin1("SFileDialogData:") + name );
+ config->setGroup( TQString::fromLatin1("SFileDialogData:") + name );
if ( initially.isNull() ){
initially = config->readPathEntry( "InitiallyDir", TQDir::currentDirPath() );
}
@@ -242,7 +242,7 @@ void PixmapView::setPixmap( const TQPixmap &pix )
{
pixmap = pix;
resizeContents( pixmap.size().width(), pixmap.size().height() );
- viewport()->tqrepaint( true );
+ viewport()->repaint( true );
}
void PixmapView::drawContents( TQPainter *p, int, int, int, int )
@@ -280,7 +280,7 @@ void Preview::showPreview( const TQString &str )
TQTextStream ts( &f );
TQString text = ts.read();
f.close();
- if ( fi.extension().lower().tqcontains( "htm" ) ) {
+ if ( fi.extension().lower().contains( "htm" ) ) {
TQString url = html->mimeSourceFactory()->makeAbsolute( path, html->context() );
html->setText( text, url );
raiseWidget( html );
@@ -777,13 +777,13 @@ int main(int argc, char* argv[]) {
#endif
#if 0
- qDebug ( SFileDialog::getOpenFileName( TQString::null, TQString::tqfromLatin1("All (*)"),
- TQString::tqfromLatin1("DockWidget Demo"), "dialog1" ) );
+ qDebug ( SFileDialog::getOpenFileName( TQString::null, TQString::fromLatin1("All (*)"),
+ TQString::fromLatin1("DockWidget Demo"), "dialog1" ) );
#endif
#if 1
- TQStringList s = SFileDialog::getOpenFileNames( TQString::null, TQString::tqfromLatin1("All (*)"),
- TQString::tqfromLatin1("DockWidget Demo"), "dialog1" );
+ TQStringList s = SFileDialog::getOpenFileNames( TQString::null, TQString::fromLatin1("All (*)"),
+ TQString::fromLatin1("DockWidget Demo"), "dialog1" );
TQStringList::Iterator it = s.begin();
for ( ; it != s.end(); ++it ){
qDebug( "%s", (*it).local8Bit().data() );
diff --git a/kdeui/tests/kdualcolortest.cpp b/kdeui/tests/kdualcolortest.cpp
index 031a54c80..2060a9842 100644
--- a/kdeui/tests/kdualcolortest.cpp
+++ b/kdeui/tests/kdualcolortest.cpp
@@ -10,8 +10,8 @@ KDualColorWidget::KDualColorWidget(TQWidget *parent, const char *name)
{
lbl = new TQLabel("Testing, testing, 1, 2, 3...", this);
KDualColorButton *colorBtn =
- new KDualColorButton(lbl->tqcolorGroup().text(),
- lbl->tqcolorGroup().background(), this);
+ new KDualColorButton(lbl->colorGroup().text(),
+ lbl->colorGroup().background(), this);
connect(colorBtn, TQT_SIGNAL(fgChanged(const TQColor &)),
TQT_SLOT(slotFgChanged(const TQColor &)));
connect(colorBtn, TQT_SIGNAL(bgChanged(const TQColor &)),
@@ -19,11 +19,11 @@ KDualColorWidget::KDualColorWidget(TQWidget *parent, const char *name)
connect(colorBtn, TQT_SIGNAL(currentChanged(KDualColorButton::DualColor)),
TQT_SLOT(slotCurrentChanged(KDualColorButton::DualColor)));
- TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 5);
- tqlayout->addWidget(colorBtn, 0);
- tqlayout->addWidget(lbl, 1);
- tqlayout->activate();
- resize(tqsizeHint());
+ TQHBoxLayout *layout = new TQHBoxLayout(this, 5);
+ layout->addWidget(colorBtn, 0);
+ layout->addWidget(lbl, 1);
+ layout->activate();
+ resize(sizeHint());
}
void KDualColorWidget::slotFgChanged(const TQColor &c)
diff --git a/kdeui/tests/keditlistboxtest.cpp b/kdeui/tests/keditlistboxtest.cpp
index fdc90a742..90dbb74d0 100644
--- a/kdeui/tests/keditlistboxtest.cpp
+++ b/kdeui/tests/keditlistboxtest.cpp
@@ -7,14 +7,14 @@ int main( int argc, char **argv )
KApplication app( argc, argv, "keditlistboxtest" );
KEditListBox::CustomEditor editor( new KComboBox( true, 0L, "test" ) );
- KEditListBox *box = new KEditListBox( TQString::tqfromLatin1("KEditListBox"),
+ KEditListBox *box = new KEditListBox( TQString::fromLatin1("KEditListBox"),
editor );
- box->insertItem( TQString::tqfromLatin1("Test") );
- box->insertItem( TQString::tqfromLatin1("for") );
- box->insertItem( TQString::tqfromLatin1("this") );
- box->insertItem( TQString::tqfromLatin1("KEditListBox") );
- box->insertItem( TQString::tqfromLatin1("Widget") );
+ box->insertItem( TQString::fromLatin1("Test") );
+ box->insertItem( TQString::fromLatin1("for") );
+ box->insertItem( TQString::fromLatin1("this") );
+ box->insertItem( TQString::fromLatin1("KEditListBox") );
+ box->insertItem( TQString::fromLatin1("Widget") );
box->show();
return app.exec();
diff --git a/kdeui/tests/kledtest.cpp b/kdeui/tests/kledtest.cpp
index f8d031530..d68f1e366 100644
--- a/kdeui/tests/kledtest.cpp
+++ b/kdeui/tests/kledtest.cpp
@@ -50,14 +50,14 @@ KLedTest::KLedTest(TQWidget* parent)
}
else {
y=Grid; index=0;
- for( int tqshape=0; (int)tqshape<2; tqshape=(KLed::Shape)(tqshape+1)) {
+ for( int shape=0; (int)shape<2; shape=(KLed::Shape)(shape+1)) {
x=Grid;
for( int look=0; (int)look<3; look=(KLed::Look)(look+1)) {
for(state=KLed::Off; (int)state<2; state=(KLed::State)(state+1))
{
leds[index]=new KLed(Qt::yellow, state,
(KLed::Look)(look+1),
- (KLed::Shape)(tqshape+1), this);
+ (KLed::Shape)(shape+1), this);
leds[index]->setGeometry(x, y, LedWidth, LedHeight);
++index;
x+=Grid+LedWidth;
@@ -108,7 +108,7 @@ KLedTest::nextLook() {
ledlook = static_cast<KLed::Look>(tmp);
l->setLook(ledlook);
//qDebug("painting look %i", ledlook);
- //l->tqrepaint();
+ //l->repaint();
}
diff --git a/kdeui/tests/kledtest.h b/kdeui/tests/kledtest.h
index 7a1416090..33c70fe83 100644
--- a/kdeui/tests/kledtest.h
+++ b/kdeui/tests/kledtest.h
@@ -15,7 +15,7 @@ protected:
const int LedWidth;
const int LedHeight;
const int Grid;
- KLed::Shape tqshape;
+ KLed::Shape shape;
KLed::Look look;
KLed::State state;
int x, y, index;
diff --git a/kdeui/tests/klineedittest.cpp b/kdeui/tests/klineedittest.cpp
index 7b9049c06..3508982fa 100644
--- a/kdeui/tests/klineedittest.cpp
+++ b/kdeui/tests/klineedittest.cpp
@@ -19,7 +19,7 @@
KLineEditTest::KLineEditTest (TQWidget* widget, const char* name )
:TQWidget( widget, name )
{
- TQVBoxLayout* tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
+ TQVBoxLayout* layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
TQStringList list;
list << "Tree" << "Suuupa" << "Stroustrup" << "Stone" << "Slick"
@@ -54,8 +54,8 @@ KLineEditTest::KLineEditTest (TQWidget* widget, const char* name )
m_btnHide->setFixedSize(100,30);
connect( m_btnHide, TQT_SIGNAL( clicked() ), TQT_SLOT( slotHide() ) );
- tqlayout->addWidget( m_lineedit );
- tqlayout->addWidget( hbox );
+ layout->addWidget( m_lineedit );
+ layout->addWidget( hbox );
setCaption( "KLineEdit Unit Test" );
}
diff --git a/kdeui/tests/kmessageboxtest.cpp b/kdeui/tests/kmessageboxtest.cpp
index 44630c178..1b926739f 100644
--- a/kdeui/tests/kmessageboxtest.cpp
+++ b/kdeui/tests/kmessageboxtest.cpp
@@ -21,22 +21,22 @@ public:
ExampleWidget::ExampleWidget( TQWidget *parent, const char *name )
: TQLabel(parent, name )
{
- // Make the top-level tqlayout; a vertical box to contain all widgets
- // and sub-tqlayouts.
+ // Make the top-level layout; a vertical box to contain all widgets
+ // and sub-layouts.
TQSize sh;
setText("<p>Hello.</p>");
- sh = tqsizeHint();
+ sh = sizeHint();
qWarning("SizeHint = %d x %d", sh.width(), sh.height());
setText("Hello.");
- sh = tqsizeHint();
+ sh = sizeHint();
qWarning("SizeHint = %d x %d", sh.width(), sh.height());
setText("<p>Hello<br>World</p>");
- sh = tqsizeHint();
+ sh = sizeHint();
qWarning("SizeHint = %d x %d", sh.width(), sh.height());
// setText("Hello\nWorld");
- sh = tqsizeHint();
+ sh = sizeHint();
qWarning("SizeHint = %d x %d", sh.width(), sh.height());
- setMinimumSize(tqsizeHint());
+ setMinimumSize(sizeHint());
}
@@ -79,11 +79,11 @@ case 1:
i = KMessageBox::warningContinueCancel(w,
"You are about to <Print>.\n"
"Are you sure?",
- "Print", TQString::tqfromLatin1("&Print"), "dontask", false);
+ "Print", TQString::fromLatin1("&Print"), "dontask", false);
i = KMessageBox::warningContinueCancel(0,
"You are about to <Print>.\n"
"Are you sure?",
- "Print", TQString::tqfromLatin1("&Print"), "dontask", KMessageBox::AllowLink);
+ "Print", TQString::fromLatin1("&Print"), "dontask", KMessageBox::AllowLink);
i = KMessageBox::questionYesNo(0, "<p>Do you have a printer? thisisaverylongdkldhklghklghklashgkllasghkdlsghkldfghklsabla bla bbla bla. It also has <a href=http://www.kde.org>this URL</a>.</p>",
TQString("Bla"), TQString("Yes"), TQString("No"), "bla", KMessageBox::AllowLink);
break;
@@ -96,7 +96,7 @@ case 2:
case 3:
i = KMessageBox::questionYesNo(0,
"Does your printer support color or only black and white?",
- "Printer setup", TQString::tqfromLatin1("&Color"), TQString::tqfromLatin1("&Black & White"));
+ "Printer setup", TQString::fromLatin1("&Color"), TQString::fromLatin1("&Black & White"));
break;
case 4:
@@ -123,33 +123,33 @@ case 6:
i = KMessageBox::warningContinueCancel(0,
"You are about to print.\n"
"Are you sure?",
- "Print", TQString::tqfromLatin1("&Print"));
+ "Print", TQString::fromLatin1("&Print"));
break;
case 7:
i = KMessageBox::warningContinueCancel(0,
"You are about to <Print>.\n"
"Are you sure?",
- "Print", TQString::tqfromLatin1("&Print"), "dontask", false);
+ "Print", TQString::fromLatin1("&Print"), "dontask", false);
break;
case 8:
i = KMessageBox::warningYesNoCancel(0,
- "Your document tqcontains unsaved changes.\n"
+ "Your document contains unsaved changes.\n"
"Do you want to save your changes?\n");
break;
case 9:
i = KMessageBox::warningYesNoCancel(0,
- "Your document tqcontains unsaved changes.\n"
+ "Your document contains unsaved changes.\n"
"Do you want to save your changes?\n",
- TQString::tqfromLatin1("Close"));
+ TQString::fromLatin1("Close"));
break;
case 10:
i = KMessageBox::warningYesNoCancel(0,
- "Your document tqcontains unsaved changes.\n"
+ "Your document contains unsaved changes.\n"
"Do you want to save or discard your changes?\n",
- "Close", TQString::tqfromLatin1("&Save"), TQString::tqfromLatin1("&Discard") );
+ "Close", TQString::fromLatin1("&Save"), TQString::fromLatin1("&Discard") );
break;
case 11:
diff --git a/kdeui/tests/kpanelmenutest.cpp b/kdeui/tests/kpanelmenutest.cpp
index e081e467f..6f2d8f2be 100644
--- a/kdeui/tests/kpanelmenutest.cpp
+++ b/kdeui/tests/kpanelmenutest.cpp
@@ -20,7 +20,7 @@ TestWidget::TestWidget(TQWidget *parent, const char *name)
init();
setText("We added \"Client Test\" to kicker. Click the K Menu to check.");
- resize(tqsizeHint());
+ resize(sizeHint());
}
void TestWidget::init()
diff --git a/kdeui/tests/kpopuptest.cpp b/kdeui/tests/kpopuptest.cpp
index 3db71106b..96f4b3d32 100644
--- a/kdeui/tests/kpopuptest.cpp
+++ b/kdeui/tests/kpopuptest.cpp
@@ -24,7 +24,7 @@ public:
menu->insertItem("Item1");
menu->insertItem("Item2");
menu->insertSeparator();
- menu->insertItem("Quit", tqApp, TQT_SLOT(quit()));
+ menu->insertItem("Quit", qApp, TQT_SLOT(quit()));
}
};
diff --git a/kdeui/tests/krulertest.cpp b/kdeui/tests/krulertest.cpp
index b221ef397..ad2f5630a 100644
--- a/kdeui/tests/krulertest.cpp
+++ b/kdeui/tests/krulertest.cpp
@@ -55,7 +55,7 @@ KRulerTest::KRulerTest( const char *name )
{
mainframe = new TQFrame(this);
- tqlayout = new TQGridLayout(mainframe, 2, 2);
+ layout = new TQGridLayout(mainframe, 2, 2);
miniwidget = new TQFrame(mainframe);
miniwidget->setFrameStyle(TQFrame::WinPanel | TQFrame::Raised);
@@ -85,10 +85,10 @@ KRulerTest::KRulerTest( const char *name )
connect( bigwidget, TQT_SIGNAL(newHeight(int)),
TQT_SLOT(slotNewHeight(int)) );
- tqlayout->addWidget(miniwidget, 0, 0);
- tqlayout->addWidget(hruler, 0, 1);
- tqlayout->addWidget(vruler, 1, 0);
- tqlayout->addWidget(bigwidget, 1, 1);
+ layout->addWidget(miniwidget, 0, 0);
+ layout->addWidget(hruler, 0, 1);
+ layout->addWidget(vruler, 1, 0);
+ layout->addWidget(bigwidget, 1, 1);
mouse_message = new TQLabel("Press and hold mouse button\nfor pointer movement", bigwidget);
mouse_message->adjustSize();
@@ -140,7 +140,7 @@ KRulerTest::KRulerTest( const char *name )
beginMark = new KIntNumInput(0, lineEdit);
beginMark->setRange(-1000, 1000, 1, false);
beginMark->move(5, 15);
- beginMark->setFixedSize(beginMark->tqsizeHint());
+ beginMark->setFixedSize(beginMark->sizeHint());
connect(beginMark, TQT_SIGNAL(valueChanged(int)),
hruler, TQT_SLOT(slotNewOffset(int)) );
connect(beginMark, TQT_SIGNAL(valueChanged(int)),
@@ -148,7 +148,7 @@ KRulerTest::KRulerTest( const char *name )
endMark = new KIntNumInput(0, lineEdit);
endMark->setRange(-1000, 1000, 1, false);
endMark->move(5, 35);
- endMark->setFixedSize(endMark->tqsizeHint());
+ endMark->setFixedSize(endMark->sizeHint());
connect(endMark, TQT_SIGNAL(valueChanged(int)),
hruler, TQT_SLOT(slotEndOffset(int)) );
connect(endMark, TQT_SIGNAL(valueChanged(int)),
@@ -156,7 +156,7 @@ KRulerTest::KRulerTest( const char *name )
lengthInput = new KIntNumInput(0, lineEdit);
lengthInput->setRange(-1000, 1000, 1, false);
lengthInput->move(5, 55);
- lengthInput->setFixedSize(lengthInput->tqsizeHint());
+ lengthInput->setFixedSize(lengthInput->sizeHint());
connect(lengthInput, TQT_SIGNAL(valueChanged(int)),
hruler, TQT_SLOT(slotEndOffset(int)) );
connect(lengthInput, TQT_SIGNAL(valueChanged(int)),
@@ -169,21 +169,21 @@ KRulerTest::KRulerTest( const char *name )
transX = new KDoubleNumInput(0.0, vertrot);
transX->setRange(-1000, 1000, 1, false);
transX->move(5, 15);
- transX->setFixedSize(transX->tqsizeHint());
+ transX->setFixedSize(transX->sizeHint());
//transX->setLabel("transx", AlignLeft);
connect(transX, TQT_SIGNAL(valueChanged(double)),
TQT_SLOT(slotSetXTrans(double)) );
transY = new KDoubleNumInput(-12.0, vertrot);
transY->setRange(-1000, 1000, 1, false);
transY->move(5, 35);
- transY->setFixedSize(transY->tqsizeHint());
+ transY->setFixedSize(transY->sizeHint());
//transY->setLabel("transy", AlignLeft);
connect(transY, TQT_SIGNAL(valueChanged(double)),
TQT_SLOT(slotSetYTrans(double)) );
rotV = new KDoubleNumInput(90.0, vertrot);
rotV->setRange(-1000, 1000, 1, false);
rotV->move(5, 55);
- rotV->setFixedSize(rotV->tqsizeHint());
+ rotV->setFixedSize(rotV->sizeHint());
//rotV->setLabel("rot", AlignLeft);
connect(rotV, TQT_SIGNAL(valueChanged(double)),
TQT_SLOT(slotSetRotate(double)) );
@@ -221,7 +221,7 @@ KRulerTest::KRulerTest( const char *name )
KRulerTest::~KRulerTest()
{
- delete tqlayout;
+ delete layout;
delete hruler;
delete vruler;
delete miniwidget;
diff --git a/kdeui/tests/krulertest.h b/kdeui/tests/krulertest.h
index b21c5375f..fe552467c 100644
--- a/kdeui/tests/krulertest.h
+++ b/kdeui/tests/krulertest.h
@@ -74,7 +74,7 @@ private slots:
private:
KRuler *hruler, *vruler;
- TQGridLayout *tqlayout;
+ TQGridLayout *layout;
TQFrame *miniwidget, *bigwidget;
TQFrame *mainframe;
diff --git a/kdeui/tests/ktabwidgettest.cpp b/kdeui/tests/ktabwidgettest.cpp
index f67dd17a9..32ed5c89f 100644
--- a/kdeui/tests/ktabwidgettest.cpp
+++ b/kdeui/tests/ktabwidgettest.cpp
@@ -39,51 +39,51 @@ Test::Test( TQWidget* parent, const char *name )
mWidget->setTabReorderingEnabled( true );
TQWidget * grid = new TQWidget(this);
- TQGridLayout * gridtqlayout = new TQGridLayout( grid, 5, 2 );
+ TQGridLayout * gridlayout = new TQGridLayout( grid, 5, 2 );
TQPushButton * addTab = new TQPushButton( "Add Tab", grid );
- gridtqlayout->addWidget( addTab, 0, 0 );
+ gridlayout->addWidget( addTab, 0, 0 );
connect( addTab, TQT_SIGNAL( clicked() ), TQT_SLOT( addTab() ) );
TQPushButton * removeTab = new TQPushButton( "Remove Current Tab", grid );
- gridtqlayout->addWidget( removeTab, 0, 1 );
+ gridlayout->addWidget( removeTab, 0, 1 );
connect( removeTab, TQT_SIGNAL( clicked() ), TQT_SLOT( removeCurrentTab() ) );
mLeftButton = new TQCheckBox( "Show left button", grid );
- gridtqlayout->addWidget( mLeftButton, 1, 0 );
+ gridlayout->addWidget( mLeftButton, 1, 0 );
connect( mLeftButton, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleLeftButton(bool) ) );
mLeftButton->setChecked(true);
TQCheckBox * leftPopup = new TQCheckBox( "Enable left popup", grid );
- gridtqlayout->addWidget( leftPopup, 2, 0 );
+ gridlayout->addWidget( leftPopup, 2, 0 );
connect( leftPopup, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleLeftPopup(bool) ) );
leftPopup->setChecked(true);
mRightButton = new TQCheckBox( "Show right button", grid );
- gridtqlayout->addWidget( mRightButton, 1, 1 );
+ gridlayout->addWidget( mRightButton, 1, 1 );
connect( mRightButton, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleRightButton(bool) ) );
mRightButton->setChecked(true);
TQCheckBox * rightPopup = new TQCheckBox( "Enable right popup", grid );
- gridtqlayout->addWidget( rightPopup, 2, 1 );
+ gridlayout->addWidget( rightPopup, 2, 1 );
connect( rightPopup, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleRightPopup(bool) ) );
rightPopup->setChecked(true);
mTabsBottom = new TQCheckBox( "Show tabs at bottom", grid );
- gridtqlayout->addWidget( mTabsBottom, 3, 0 );
+ gridlayout->addWidget( mTabsBottom, 3, 0 );
connect( mTabsBottom, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabPosition(bool) ) );
- TQCheckBox * tabtqshape = new TQCheckBox( "Triangular tab tqshape", grid );
- gridtqlayout->addWidget( tabtqshape, 3, 1 );
- connect( tabtqshape, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabShape(bool) ) );
+ TQCheckBox * tabshape = new TQCheckBox( "Triangular tab shape", grid );
+ gridlayout->addWidget( tabshape, 3, 1 );
+ connect( tabshape, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabShape(bool) ) );
TQCheckBox *tabClose = new TQCheckBox( "Close button on icon hover", grid );
- gridtqlayout->addWidget( tabClose, 4, 0 );
+ gridlayout->addWidget( tabClose, 4, 0 );
connect( tabClose, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleCloseButtons(bool) ) );
tabClose->setChecked(true);
TQCheckBox * showlabels = new TQCheckBox( "Show labels", grid );
- gridtqlayout->addWidget( showlabels, 4, 1 );
+ gridlayout->addWidget( showlabels, 4, 1 );
connect( showlabels, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( toggleLabels(bool) ) );
}
diff --git a/kdeui/tests/kunbalancedgrdtest.cpp b/kdeui/tests/kunbalancedgrdtest.cpp
index 9f616496d..7f5b2cc78 100644
--- a/kdeui/tests/kunbalancedgrdtest.cpp
+++ b/kdeui/tests/kunbalancedgrdtest.cpp
@@ -159,7 +159,7 @@ void myTopWidget::rebalance()
if ((otime - itime )> 500)
{
- grds->tqrepaint(false);
+ grds->repaint(false);
itime = time.elapsed();
}
}
diff --git a/kdeui/tests/kwizardtest.cpp b/kdeui/tests/kwizardtest.cpp
index a96c9892a..91974263e 100644
--- a/kdeui/tests/kwizardtest.cpp
+++ b/kdeui/tests/kwizardtest.cpp
@@ -36,10 +36,10 @@ int main(int argc, char **argv)
TQWidget *p = new TQWidget;
TQString msg = TQString("This is page %1 out of 10").arg(i);
TQLabel *label = new TQLabel(msg, p);
- TQHBoxLayout *tqlayout = new TQHBoxLayout(p, 5);
- label->tqsetAlignment(Qt::AlignCenter);
+ TQHBoxLayout *layout = new TQHBoxLayout(p, 5);
+ label->setAlignment(Qt::AlignCenter);
label->setFixedSize(300, 200);
- tqlayout->addWidget(label);
+ layout->addWidget(label);
TQString title = TQString("%1. page").arg(i);
wiz->addPage(p, title);
wiz->setFinishEnabled(p, (i==10));