summaryrefslogtreecommitdiffstats
path: root/kcontrol/icons
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/icons')
-rw-r--r--kcontrol/icons/icons.cpp56
-rw-r--r--kcontrol/icons/icons.h4
-rw-r--r--kcontrol/icons/iconthemes.cpp8
-rw-r--r--kcontrol/icons/iconthemes.h2
-rw-r--r--kcontrol/icons/main.cpp4
-rw-r--r--kcontrol/icons/main.h2
6 files changed, 38 insertions, 38 deletions
diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp
index 667ecaa22..57fe2669f 100644
--- a/kcontrol/icons/icons.cpp
+++ b/kcontrol/icons/icons.cpp
@@ -52,7 +52,7 @@ TDEIconConfig::TDEIconConfig(TQWidget *parent, const char *name)
KDialog::spacingHint());
g_vlay->addSpacing(fontMetrics().lineSpacing());
mpUsageList = new TQListBox(gbox);
- connect(mpUsageList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotUsage(int)));
+ connect(mpUsageList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotUsage(int)));
g_vlay->addWidget(mpUsageList);
KSeparator *sep = new KSeparator( KSeparator::HLine, this );
@@ -65,11 +65,11 @@ TDEIconConfig::TDEIconConfig(TQWidget *parent, const char *name)
TQPushButton *push;
mPreviewButton1 = addPreviewIcon(0, i18n("Default"), this, g_lay);
- connect(mPreviewButton1, TQT_SIGNAL(clicked()), TQT_SLOT(slotEffectSetup0()));
+ connect(mPreviewButton1, TQ_SIGNAL(clicked()), TQ_SLOT(slotEffectSetup0()));
mPreviewButton2 = addPreviewIcon(1, i18n("Active"), this, g_lay);
- connect(mPreviewButton2, TQT_SIGNAL(clicked()), TQT_SLOT(slotEffectSetup1()));
+ connect(mPreviewButton2, TQ_SIGNAL(clicked()), TQ_SLOT(slotEffectSetup1()));
mPreviewButton3 = addPreviewIcon(2, i18n("Disabled"), this, g_lay);
- connect(mPreviewButton3, TQT_SIGNAL(clicked()), TQT_SLOT(slotEffectSetup2()));
+ connect(mPreviewButton3, TQ_SIGNAL(clicked()), TQ_SLOT(slotEffectSetup2()));
m_pTab1 = new TQWidget(this, "General Tab");
top->addWidget(m_pTab1, 0, 1);
@@ -81,27 +81,27 @@ TDEIconConfig::TDEIconConfig(TQWidget *parent, const char *name)
// Size
TQLabel *lbl = new TQLabel(i18n("Size:"), m_pTab1);
lbl->setFixedSize(lbl->sizeHint());
- grid->addWidget(lbl, 0, 0, Qt::AlignLeft);
+ grid->addWidget(lbl, 0, 0, TQt::AlignLeft);
mpSizeBox = new TQComboBox(m_pTab1);
- connect(mpSizeBox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSize(int)));
+ connect(mpSizeBox, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSize(int)));
lbl->setBuddy(mpSizeBox);
- grid->addWidget(mpSizeBox, 0, 1, Qt::AlignLeft);
+ grid->addWidget(mpSizeBox, 0, 1, TQt::AlignLeft);
mpDPCheck = new TQCheckBox(i18n("Double-sized pixels"), m_pTab1);
- connect(mpDPCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDPCheck(bool)));
- grid->addMultiCellWidget(mpDPCheck, 1, 1, 0, 1, Qt::AlignLeft);
+ connect(mpDPCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotDPCheck(bool)));
+ grid->addMultiCellWidget(mpDPCheck, 1, 1, 0, 1, TQt::AlignLeft);
mpAnimatedCheck = new TQCheckBox(i18n("Animate icons"), m_pTab1);
- connect(mpAnimatedCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAnimatedCheck(bool)));
- grid->addMultiCellWidget(mpAnimatedCheck, 2, 2, 0, 1, Qt::AlignLeft);
+ connect(mpAnimatedCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAnimatedCheck(bool)));
+ grid->addMultiCellWidget(mpAnimatedCheck, 2, 2, 0, 1, TQt::AlignLeft);
mpRoundedCheck = new TQCheckBox(i18n("Rounded text selection"), m_pTab1);
- connect(mpRoundedCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRoundedCheck(bool)));
- grid->addMultiCellWidget(mpRoundedCheck, 3, 3, 0, 1, Qt::AlignLeft);
+ connect(mpRoundedCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotRoundedCheck(bool)));
+ grid->addMultiCellWidget(mpRoundedCheck, 3, 3, 0, 1, TQt::AlignLeft);
mpActiveEffectCheck = new TQCheckBox(i18n("Show icon activation effect"), m_pTab1);
- connect(mpActiveEffectCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotActiveEffect(bool)));
- grid->addMultiCellWidget(mpActiveEffectCheck, 4, 4, 0, 1, Qt::AlignLeft);
+ connect(mpActiveEffectCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotActiveEffect(bool)));
+ grid->addMultiCellWidget(mpActiveEffectCheck, 4, 4, 0, 1, TQt::AlignLeft);
top->activate();
@@ -123,13 +123,13 @@ TDEIconConfig::~TDEIconConfig()
TQPushButton *TDEIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget *parent, TQGridLayout *lay)
{
TQLabel *lab = new TQLabel(str, parent);
- lay->addWidget(lab, 1, i, Qt::AlignCenter);
+ lay->addWidget(lab, 1, i, TQt::AlignCenter);
mpPreview[i] = new TQLabel(parent);
mpPreview[i]->setAlignment(AlignCenter);
mpPreview[i]->setMinimumSize(105, 105);
lay->addWidget(mpPreview[i], 2, i);
TQPushButton *push = new TQPushButton(i18n("Set Effect..."), parent);
- lay->addWidget(push, 3, i, Qt::AlignCenter);
+ lay->addWidget(push, 3, i, TQt::AlignCenter);
return push;
}
@@ -689,7 +689,7 @@ TDEIconEffectSetupDialog::TDEIconEffectSetupDialog(const Effect &effect,
lbl = new TQLabel(i18n("&Effect:"), page);
lbl->setFixedSize(lbl->sizeHint());
- top->addWidget(lbl, 0, 0, Qt::AlignLeft);
+ top->addWidget(lbl, 0, 0, TQt::AlignLeft);
mpEffectBox = new TQListBox(page);
mpEffectBox->insertItem(i18n("No Effect"));
mpEffectBox->insertItem(i18n("To Gray"));
@@ -698,13 +698,13 @@ TDEIconEffectSetupDialog::TDEIconEffectSetupDialog(const Effect &effect,
mpEffectBox->insertItem(i18n("Desaturate"));
mpEffectBox->insertItem(i18n("To Monochrome"));
mpEffectBox->setMinimumWidth( 100 );
- connect(mpEffectBox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotEffectType(int)));
- top->addMultiCellWidget(mpEffectBox, 1, 2, 0, 0, Qt::AlignLeft);
+ connect(mpEffectBox, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotEffectType(int)));
+ top->addMultiCellWidget(mpEffectBox, 1, 2, 0, 0, TQt::AlignLeft);
lbl->setBuddy(mpEffectBox);
mpSTCheck = new TQCheckBox(i18n("&Semi-transparent"), page);
- connect(mpSTCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSTCheck(bool)));
- top->addWidget(mpSTCheck, 3, 0, Qt::AlignLeft);
+ connect(mpSTCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSTCheck(bool)));
+ top->addWidget(mpSTCheck, 3, 0, TQt::AlignLeft);
frame = new TQGroupBox(i18n("Preview"), page);
top->addMultiCellWidget(frame, 0, 1, 1, 1);
@@ -724,25 +724,25 @@ TDEIconEffectSetupDialog::TDEIconEffectSetupDialog(const Effect &effect,
mpEffectLabel = new TQLabel(i18n("&Amount:"), mpEffectGroup);
grid->addWidget(mpEffectLabel, 1, 0);
- mpEffectSlider = new TQSlider(0, 100, 5, 10, Qt::Horizontal, mpEffectGroup);
+ mpEffectSlider = new TQSlider(0, 100, 5, 10, TQt::Horizontal, mpEffectGroup);
mpEffectLabel->setBuddy( mpEffectSlider );
- connect(mpEffectSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotEffectValue(int)));
+ connect(mpEffectSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotEffectValue(int)));
grid->addWidget(mpEffectSlider, 1, 1);
mpEffectColor = new TQLabel(i18n("Co&lor:"), mpEffectGroup);
grid->addWidget(mpEffectColor, 2, 0);
mpEColButton = new KColorButton(mpEffectGroup);
mpEffectColor->setBuddy( mpEColButton );
- connect(mpEColButton, TQT_SIGNAL(changed(const TQColor &)),
- TQT_SLOT(slotEffectColor(const TQColor &)));
+ connect(mpEColButton, TQ_SIGNAL(changed(const TQColor &)),
+ TQ_SLOT(slotEffectColor(const TQColor &)));
grid->addWidget(mpEColButton, 2, 1);
mpEffectColor2 = new TQLabel(i18n("&Second color:"), mpEffectGroup);
grid->addWidget(mpEffectColor2, 3, 0);
mpECol2Button = new KColorButton(mpEffectGroup);
mpEffectColor2->setBuddy( mpECol2Button );
- connect(mpECol2Button, TQT_SIGNAL(changed(const TQColor &)),
- TQT_SLOT(slotEffectColor2(const TQColor &)));
+ connect(mpECol2Button, TQ_SIGNAL(changed(const TQColor &)),
+ TQ_SLOT(slotEffectColor2(const TQColor &)));
grid->addWidget(mpECol2Button, 3, 1);
init();
diff --git a/kcontrol/icons/icons.h b/kcontrol/icons/icons.h
index 2c00a16e5..3fe37a3a4 100644
--- a/kcontrol/icons/icons.h
+++ b/kcontrol/icons/icons.h
@@ -55,7 +55,7 @@ struct Effect
*/
class TDEIconConfig: public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
TDEIconConfig(TQWidget *parent, const char *name=0);
@@ -123,7 +123,7 @@ private:
class TDEIconEffectSetupDialog: public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
TDEIconEffectSetupDialog(const Effect &, const Effect &,
diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp
index 826f6300d..86d782a1b 100644
--- a/kcontrol/icons/iconthemes.cpp
+++ b/kcontrol/icons/iconthemes.cpp
@@ -82,15 +82,15 @@ IconThemesConfig::IconThemesConfig(TQWidget *parent, const char *name)
m_iconThemes->addColumn(i18n("Description"));
m_iconThemes->setAllColumnsShowFocus( true );
m_iconThemes->setFullWidth(true);
- connect(m_iconThemes,TQT_SIGNAL(selectionChanged(TQListViewItem *)),
- TQT_SLOT(themeSelected(TQListViewItem *)));
+ connect(m_iconThemes,TQ_SIGNAL(selectionChanged(TQListViewItem *)),
+ TQ_SLOT(themeSelected(TQListViewItem *)));
TQPushButton *installButton=new TQPushButton( i18n("Install New Theme..."),
this, "InstallNewTheme");
- connect(installButton,TQT_SIGNAL(clicked()),TQT_SLOT(installNewTheme()));
+ connect(installButton,TQ_SIGNAL(clicked()),TQ_SLOT(installNewTheme()));
m_removeButton=new TQPushButton( i18n("Remove Theme"),
this, "RemoveTheme");
- connect(m_removeButton,TQT_SIGNAL(clicked()),TQT_SLOT(removeSelectedTheme()));
+ connect(m_removeButton,TQ_SIGNAL(clicked()),TQ_SLOT(removeSelectedTheme()));
topLayout->addWidget(
new TQLabel(i18n("Select the icon theme you want to use:"), this));
diff --git a/kcontrol/icons/iconthemes.h b/kcontrol/icons/iconthemes.h
index ccb914846..424d58630 100644
--- a/kcontrol/icons/iconthemes.h
+++ b/kcontrol/icons/iconthemes.h
@@ -32,7 +32,7 @@ class TQStringList;
class IconThemesConfig : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
IconThemesConfig(TQWidget *parent = 0L, const char *name = 0L);
diff --git a/kcontrol/icons/main.cpp b/kcontrol/icons/main.cpp
index 359bfec91..214e85a70 100644
--- a/kcontrol/icons/main.cpp
+++ b/kcontrol/icons/main.cpp
@@ -45,11 +45,11 @@ IconModule::IconModule(TQWidget *parent, const char *name, const TQStringList &)
tab1 = new IconThemesConfig(this, "themes");
tab->addTab(tab1, i18n("&Theme"));
- connect(tab1, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+ connect(tab1, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
tab2 = new TDEIconConfig(this, "effects");
tab->addTab(tab2, i18n("Ad&vanced"));
- connect(tab2, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
+ connect(tab2, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool)));
TDEAboutData* about = new TDEAboutData("kcmicons", I18N_NOOP("Icons"), "3.0",
I18N_NOOP("Icons Control Panel Module"),
diff --git a/kcontrol/icons/main.h b/kcontrol/icons/main.h
index 840704351..eea944b6b 100644
--- a/kcontrol/icons/main.h
+++ b/kcontrol/icons/main.h
@@ -31,7 +31,7 @@
class IconModule : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
IconModule(TQWidget *parent, const char *name, const TQStringList &);