summaryrefslogtreecommitdiffstats
path: root/ksplashml
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:58:25 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:58:25 -0600
commit2c01fd64ddde84a6d78b632f7f3b7c3560dc288c (patch)
tree65f4f4370cf4269757d7fa4d0f4d15996a1bf68f /ksplashml
parent73c08b592db45af554b9f21029bc549d70f683ab (diff)
downloadtdebase-2c01fd64ddde84a6d78b632f7f3b7c3560dc288c.tar.gz
tdebase-2c01fd64ddde84a6d78b632f7f3b7c3560dc288c.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab.
Diffstat (limited to 'ksplashml')
-rw-r--r--ksplashml/kcmksplash/installer.cpp14
-rw-r--r--ksplashml/kcmksplash/main.cpp2
-rw-r--r--ksplashml/themeengine/default/themelegacy.cpp4
-rw-r--r--ksplashml/themeengine/redmond/themeredmond.cpp6
-rw-r--r--ksplashml/themeengine/redmond/themeredmond.h2
-rw-r--r--ksplashml/themeengine/standard/themestandard.cpp2
-rw-r--r--ksplashml/themeengine/unified/themeunified.cpp2
7 files changed, 16 insertions, 16 deletions
diff --git a/ksplashml/kcmksplash/installer.cpp b/ksplashml/kcmksplash/installer.cpp
index fe60f603a..1b7a3afba 100644
--- a/ksplashml/kcmksplash/installer.cpp
+++ b/ksplashml/kcmksplash/installer.cpp
@@ -14,8 +14,8 @@
#include <tqdir.h>
#include <tqlabel.h>
-#include <layout.h>
-#include <textedit.h>
+#include <tqlayout.h>
+#include <tqtextedit.h>
#include "installer.h"
@@ -99,7 +99,7 @@ SplashInstaller::SplashInstaller (TQWidget *aParent, const char *aName, bool aIn
hbox->setStretchFactor( leftbox, 1 );
mThemesList = new ThemeListBox(this);
- mThemesList->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding );
+ mThemesList->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding );
connect(mThemesList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotSetTheme(int)));
connect(mThemesList, TQT_SIGNAL(filesDropped(const KURL::List&)), TQT_SLOT(slotFilesDropped(const KURL::List&)));
leftbox->addWidget(mThemesList);
@@ -120,16 +120,16 @@ SplashInstaller::SplashInstaller (TQWidget *aParent, const char *aName, bool aIn
hbox->setStretchFactor( rightbox, 3 );
mPreview = new TQLabel(this);
- mPreview->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
+ mPreview->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
mPreview->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
mPreview->setMinimumSize(TQSize(320,240));
- mPreview->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
+ mPreview->tqsetAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
rightbox->addWidget(mPreview);
rightbox->setStretchFactor( mPreview, 3 );
mText = new TQTextEdit(this);
- mText->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred );
- mText->setMinimumSize(mText->sizeHint());
+ mText->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred );
+ mText->setMinimumSize(mText->tqsizeHint());
mText->setReadOnly(true);
rightbox->addWidget(mText);
rightbox->setStretchFactor( mText, 1 );
diff --git a/ksplashml/kcmksplash/main.cpp b/ksplashml/kcmksplash/main.cpp
index ba6d50344..7b4557608 100644
--- a/ksplashml/kcmksplash/main.cpp
+++ b/ksplashml/kcmksplash/main.cpp
@@ -12,7 +12,7 @@
#include "config.h"
#endif
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtabwidget.h>
#include <kaboutdata.h>
diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp
index 77274da99..5e918cef3 100644
--- a/ksplashml/themeengine/default/themelegacy.cpp
+++ b/ksplashml/themeengine/default/themelegacy.cpp
@@ -164,7 +164,7 @@ void ThemeDefault::_initUi()
mProgressBar->setPaletteBackgroundPixmap( blimage );
bottom_label->setFixedWidth( QMAX(blimage.width(),tlimage.width()) );
- bottom_label->setFixedHeight( mLabel->sizeHint().height()+4 );
+ bottom_label->setFixedHeight( mLabel->tqsizeHint().height()+4 );
// 3 pixels of whitespace between the label and the progressbar.
mLabel->resize( bottom_label->width(), bottom_label->height() );
@@ -274,7 +274,7 @@ TQPixmap ThemeDefault::updateBarPixmap( int state )
p.drawPixmap(0, 0, *mInactivePixmap, 0, 0, tmp.width()-offs );
else
#endif
- p.drawPixmap(offs, 0, *mInactivePixmap, offs, 0);
+ p.tqdrawPixmap(offs, 0, *mInactivePixmap, offs, 0);
return tmp ;
}
diff --git a/ksplashml/themeengine/redmond/themeredmond.cpp b/ksplashml/themeengine/redmond/themeredmond.cpp
index 5c7118441..175863f74 100644
--- a/ksplashml/themeengine/redmond/themeredmond.cpp
+++ b/ksplashml/themeengine/redmond/themeredmond.cpp
@@ -199,11 +199,11 @@ void ThemeRedmond::_initUi()
kdmconfig->setGroup("X-*-Greeter");
TQString userPicsDir = kdmconfig->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces" ) + '/';
TQString fs = kdmconfig->readEntry( "FaceSource" );
- if (fs == TQString::fromLatin1("UserOnly"))
+ if (fs == TQString::tqfromLatin1("UserOnly"))
faceSource = fUserOnly;
- else if (fs == TQString::fromLatin1("PreferUser"))
+ else if (fs == TQString::tqfromLatin1("PreferUser"))
faceSource = fUserFirst;
- else if (fs == TQString::fromLatin1("PreferAdmin"))
+ else if (fs == TQString::tqfromLatin1("PreferAdmin"))
faceSource = fAdminFirst;
else
faceSource = fAdminOnly; // Admin Only
diff --git a/ksplashml/themeengine/redmond/themeredmond.h b/ksplashml/themeengine/redmond/themeredmond.h
index 6f8cc1550..3ae82031a 100644
--- a/ksplashml/themeengine/redmond/themeredmond.h
+++ b/ksplashml/themeengine/redmond/themeredmond.h
@@ -57,7 +57,7 @@ public slots:
if( mText != s )
{
mText = s;
- repaint( false );
+ tqrepaint( false );
}
};
diff --git a/ksplashml/themeengine/standard/themestandard.cpp b/ksplashml/themeengine/standard/themestandard.cpp
index 06582cd71..b0ceff516 100644
--- a/ksplashml/themeengine/standard/themestandard.cpp
+++ b/ksplashml/themeengine/standard/themestandard.cpp
@@ -20,7 +20,7 @@
#include <tqdesktopwidget.h>
#include <tqlabel.h>
-#include <palette.h>
+#include <tqpalette.h>
#include <tqpixmap.h>
#include <tqwidget.h>
diff --git a/ksplashml/themeengine/unified/themeunified.cpp b/ksplashml/themeengine/unified/themeunified.cpp
index 782753c82..e552e9909 100644
--- a/ksplashml/themeengine/unified/themeunified.cpp
+++ b/ksplashml/themeengine/unified/themeunified.cpp
@@ -80,7 +80,7 @@ void ThemeUnified::_initUi()
const TQRect rect = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
// Center the dialog
- TQSize sh = sizeHint();
+ TQSize sh = tqsizeHint();
TQRect rect1 = KGlobalSettings::desktopGeometry(TQCursor::pos());
move(rect1.x() + (rect1.width() - sh.width())/2, rect1.y() + (rect1.height() - sh.height())/2);
}