summaryrefslogtreecommitdiffstats
path: root/kcontrol/icons
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/icons')
-rw-r--r--kcontrol/icons/icons.cpp40
-rw-r--r--kcontrol/icons/iconthemes.cpp2
-rw-r--r--kcontrol/icons/main.cpp2
3 files changed, 22 insertions, 22 deletions
diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp
index 4c7ff34c3..4fc8df5fc 100644
--- a/kcontrol/icons/icons.cpp
+++ b/kcontrol/icons/icons.cpp
@@ -15,7 +15,7 @@
#include <tqcombobox.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqslider.h>
#include <kapplication.h>
@@ -80,7 +80,7 @@ KIconConfig::KIconConfig(TQWidget *parent, const char *name)
// Size
TQLabel *lbl = new TQLabel(i18n("Size:"), m_pTab1);
- lbl->setFixedSize(lbl->sizeHint());
+ lbl->setFixedSize(lbl->tqsizeHint());
grid->addWidget(lbl, 0, 0, Qt::AlignLeft);
mpSizeBox = new TQComboBox(m_pTab1);
connect(mpSizeBox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSize(int)));
@@ -105,8 +105,8 @@ KIconConfig::KIconConfig(TQWidget *parent, const char *name)
top->activate();
- mpSystrayConfig = new KSimpleConfig( TQString::fromLatin1( "systemtray_panelappletrc" ));
- mpKickerConfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" ));
+ mpSystrayConfig = new KSimpleConfig( TQString::tqfromLatin1( "systemtray_panelappletrc" ));
+ mpKickerConfig = new KSimpleConfig( TQString::tqfromLatin1( "kickerrc" ));
init();
read();
@@ -125,7 +125,7 @@ TQPushButton *KIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget *
TQLabel *lab = new TQLabel(str, parent);
lay->addWidget(lab, 1, i, Qt::AlignCenter);
mpPreview[i] = new TQLabel(parent);
- mpPreview[i]->setAlignment(AlignCenter);
+ mpPreview[i]->tqsetAlignment(AlignCenter);
mpPreview[i]->setMinimumSize(105, 105);
lay->addWidget(mpPreview[i], 2, i);
TQPushButton *push = new TQPushButton(i18n("Set Effect..."), parent);
@@ -302,12 +302,12 @@ void KIconConfig::apply()
if (mpUsageList->currentText() == i18n("Panel Buttons")) {
mpSizeBox->clear();
- mpSizeBox->insertItem(TQString().setNum(16));
- mpSizeBox->insertItem(TQString().setNum(22));
- mpSizeBox->insertItem(TQString().setNum(32));
- mpSizeBox->insertItem(TQString().setNum(48));
- mpSizeBox->insertItem(TQString().setNum(64));
- mpSizeBox->insertItem(TQString().setNum(128));
+ mpSizeBox->insertItem(TQString().tqsetNum(16));
+ mpSizeBox->insertItem(TQString().tqsetNum(22));
+ mpSizeBox->insertItem(TQString().tqsetNum(32));
+ mpSizeBox->insertItem(TQString().tqsetNum(48));
+ mpSizeBox->insertItem(TQString().tqsetNum(64));
+ mpSizeBox->insertItem(TQString().tqsetNum(128));
for (i=0;i<(mpSizeBox->count());i++) {
if (mpSizeBox->text(i) == TQString().setNum(mQuickLaunchSize)) {
mpSizeBox->setCurrentItem(i);
@@ -316,12 +316,12 @@ void KIconConfig::apply()
}
else if (mpUsageList->currentText() == i18n("System Tray Icons")) {
mpSizeBox->clear();
- mpSizeBox->insertItem(TQString().setNum(16));
- mpSizeBox->insertItem(TQString().setNum(22));
- mpSizeBox->insertItem(TQString().setNum(32));
- mpSizeBox->insertItem(TQString().setNum(48));
- mpSizeBox->insertItem(TQString().setNum(64));
- mpSizeBox->insertItem(TQString().setNum(128));
+ mpSizeBox->insertItem(TQString().tqsetNum(16));
+ mpSizeBox->insertItem(TQString().tqsetNum(22));
+ mpSizeBox->insertItem(TQString().tqsetNum(32));
+ mpSizeBox->insertItem(TQString().tqsetNum(48));
+ mpSizeBox->insertItem(TQString().tqsetNum(64));
+ mpSizeBox->insertItem(TQString().tqsetNum(128));
for (i=0;i<(mpSizeBox->count());i++) {
if (mpSizeBox->text(i) == TQString().setNum(mSysTraySize)) {
mpSizeBox->setCurrentItem(i);
@@ -335,7 +335,7 @@ void KIconConfig::apply()
if (mUsage < KIcon::LastGroup) {
for (it=mAvSizes[mUsage].begin(), i=0; it!=mAvSizes[mUsage].end(); ++it, i++)
{
- mpSizeBox->insertItem(TQString().setNum(*it));
+ mpSizeBox->insertItem(TQString().tqsetNum(*it));
dw = abs(mSizes[mUsage] - *it);
if (dw < delta)
{
@@ -688,7 +688,7 @@ KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect,
top->setRowStretch(1,1);
lbl = new TQLabel(i18n("&Effect:"), page);
- lbl->setFixedSize(lbl->sizeHint());
+ lbl->setFixedSize(lbl->tqsizeHint());
top->addWidget(lbl, 0, 0, Qt::AlignLeft);
mpEffectBox = new TQListBox(page);
mpEffectBox->insertItem(i18n("No Effect"));
@@ -713,7 +713,7 @@ KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect,
grid->setRowStretch(1, 1);
mpPreview = new TQLabel(frame);
- mpPreview->setAlignment(AlignCenter);
+ mpPreview->tqsetAlignment(AlignCenter);
mpPreview->setMinimumSize(105, 105);
grid->addWidget(mpPreview, 1, 0);
diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp
index 8e96a5619..5d7f924a9 100644
--- a/kcontrol/icons/iconthemes.cpp
+++ b/kcontrol/icons/iconthemes.cpp
@@ -22,7 +22,7 @@
#include <unistd.h>
#include <tqfileinfo.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqpushbutton.h>
diff --git a/kcontrol/icons/main.cpp b/kcontrol/icons/main.cpp
index aa83d61e0..396a6ee4f 100644
--- a/kcontrol/icons/main.cpp
+++ b/kcontrol/icons/main.cpp
@@ -21,7 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <layout.h>
+#include <tqlayout.h>
#include <kgenericfactory.h>
#include <kaboutdata.h>