summaryrefslogtreecommitdiffstats
path: root/kcontrol/style
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/style')
-rw-r--r--kcontrol/style/kcmstyle.cpp82
-rw-r--r--kcontrol/style/kcmstyle.h4
-rw-r--r--kcontrol/style/keramik/keramikconf.cpp6
-rw-r--r--kcontrol/style/keramik/keramikconf.h2
-rw-r--r--kcontrol/style/menupreview.cpp5
-rw-r--r--kcontrol/style/menupreview.h3
-rw-r--r--kcontrol/style/styleconfdialog.cpp4
-rw-r--r--kcontrol/style/styleconfdialog.h2
-rw-r--r--kcontrol/style/stylepreview.ui4
-rw-r--r--kcontrol/style/stylepreview.ui.h6
10 files changed, 54 insertions, 64 deletions
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index a51a63e6b..27a599b09 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -156,12 +156,12 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
// Add Page1 (Style)
// -----------------
gbWidgetStyle = new TQGroupBox( i18n("Widget Style"), page1, "gbWidgetStyle" );
- gbWidgetStyle->setColumnLayout( 0, Qt::Vertical );
+ gbWidgetStyle->setColumnLayout( 0, TQt::Vertical );
gbWidgetStyle->layout()->setMargin( KDialog::marginHint() );
gbWidgetStyle->layout()->setSpacing( KDialog::spacingHint() );
gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->layout() );
- gbWidgetStyleLayout->setAlignment( Qt::AlignTop );
+ gbWidgetStyleLayout->setAlignment( TQt::AlignTop );
hbLayout = new TQHBoxLayout( KDialog::spacingHint(), "hbLayout" );
cbStyle = new KComboBox( gbWidgetStyle, "cbStyle" );
@@ -205,7 +205,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
gbWidgetStyleLayout->addSpacing(10);
TQGroupBox *gbPreview = new TQGroupBox( i18n( "Preview" ), page1 );
- gbPreview->setColumnLayout( 0, Qt::Vertical );
+ gbPreview->setColumnLayout( 0, TQt::Vertical );
gbPreview->layout()->setMargin( 0 );
gbPreview->layout()->setSpacing( KDialog::spacingHint() );
gbPreview->setFlat( true );
@@ -216,9 +216,9 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
page1Layout->addWidget( gbPreview );
// Connect all required stuff
- connect( cbStyle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(styleChanged()) );
- connect( cbStyle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateConfigButton()));
- connect( pbConfigStyle, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleSpecificConfig()));
+ connect( cbStyle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(styleChanged()) );
+ connect( cbStyle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateConfigButton()));
+ connect( pbConfigStyle, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleSpecificConfig()));
// Add Page2 (Effects)
// -------------------
@@ -304,7 +304,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
sliderBox = new TQVBox( menuContainer );
sliderBox->setSpacing( KDialog::spacingHint() );
sliderBox->setMargin( 0 );
- slOpacity = new TQSlider( 0, 100, 5, /*opacity*/ 90, Qt::Horizontal, sliderBox );
+ slOpacity = new TQSlider( 0, 100, 5, /*opacity*/ 90, TQt::Horizontal, sliderBox );
slOpacity->setTickmarks( TQSlider::Below );
slOpacity->setTickInterval( 10 );
TQHBox* box1 = new TQHBox( sliderBox );
@@ -338,13 +338,13 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
page2Layout->addItem( sp1 );
// Data flow stuff.
- connect( cbEnableEffects, TQT_SIGNAL(toggled(bool)), containerFrame, TQT_SLOT(setEnabled(bool)) );
- connect( cbEnableEffects, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(menuEffectChanged(bool)) );
- connect( slOpacity, TQT_SIGNAL(valueChanged(int)),menuPreview, TQT_SLOT(setOpacity(int)) );
- connect( comboMenuEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuEffectChanged()) );
- connect( comboMenuEffect, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(menuEffectChanged()) );
- connect( comboMenuEffectType, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuEffectTypeChanged()) );
- connect( comboMenuEffectType, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(menuEffectTypeChanged()) );
+ connect( cbEnableEffects, TQ_SIGNAL(toggled(bool)), containerFrame, TQ_SLOT(setEnabled(bool)) );
+ connect( cbEnableEffects, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(menuEffectChanged(bool)) );
+ connect( slOpacity, TQ_SIGNAL(valueChanged(int)),menuPreview, TQ_SLOT(setOpacity(int)) );
+ connect( comboMenuEffect, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuEffectChanged()) );
+ connect( comboMenuEffect, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(menuEffectChanged()) );
+ connect( comboMenuEffectType, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuEffectTypeChanged()) );
+ connect( comboMenuEffectType, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(menuEffectTypeChanged()) );
// Add Page3 (Miscellaneous)
// -------------------------
@@ -379,29 +379,29 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
load();
// Do all the setDirty connections.
- connect(cbStyle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty()));
+ connect(cbStyle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty()));
// Page2
- connect( cbEnableEffects, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty()));
- connect( cbEnableEffects, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setStyleDirty()));
- connect( comboTooltipEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setEffectsDirty()));
- connect( comboRubberbandEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty()));
- connect( comboComboEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setEffectsDirty()));
- connect( comboMenuEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty()));
- connect( comboMenuHandle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty()));
- connect( comboMenuEffectType, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty()));
- connect( slOpacity, TQT_SIGNAL(valueChanged(int)),this, TQT_SLOT(setStyleDirty()));
- connect( cbMenuShadow, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setStyleDirty()));
+ connect( cbEnableEffects, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty()));
+ connect( cbEnableEffects, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setStyleDirty()));
+ connect( comboTooltipEffect, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setEffectsDirty()));
+ connect( comboRubberbandEffect, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty()));
+ connect( comboComboEffect, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setEffectsDirty()));
+ connect( comboMenuEffect, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty()));
+ connect( comboMenuHandle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty()));
+ connect( comboMenuEffectType, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty()));
+ connect( slOpacity, TQ_SIGNAL(valueChanged(int)),this, TQ_SLOT(setStyleDirty()));
+ connect( cbMenuShadow, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setStyleDirty()));
// Page1 & Page3
- connect( cbHoverButtons, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setToolbarsDirty()));
- connect( cbTransparentToolbars, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setToolbarsDirty()));
- connect( cbEnableTooltips, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty()));
- connect( cbIconsOnButtons, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty()));
- connect( cbScrollablePopupMenus,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty()));
- connect( cbAutoHideAccelerators,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty()));
- connect( cbMenuAltKeyNavigation,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty()));
- connect( cbTearOffHandles, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty()));
- connect( comboToolbarIcons, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setToolbarsDirty()));
- connect( m_popupMenuDelay, TQT_SIGNAL(valueChanged(int)),this, TQT_SLOT(setStyleDirty()));
+ connect( cbHoverButtons, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setToolbarsDirty()));
+ connect( cbTransparentToolbars, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setToolbarsDirty()));
+ connect( cbEnableTooltips, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty()));
+ connect( cbIconsOnButtons, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty()));
+ connect( cbScrollablePopupMenus,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty()));
+ connect( cbAutoHideAccelerators,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty()));
+ connect( cbMenuAltKeyNavigation,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty()));
+ connect( cbTearOffHandles, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty()));
+ connect( comboToolbarIcons, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setToolbarsDirty()));
+ connect( m_popupMenuDelay, TQ_SIGNAL(valueChanged(int)),this, TQ_SLOT(setStyleDirty()));
addWhatsThis();
@@ -479,9 +479,9 @@ void KCMStyle::styleSpecificConfig()
dial->setMainWidget( pluginConfig );
//..and connect it to the wrapper
- connect(pluginConfig, TQT_SIGNAL(changed(bool)), dial, TQT_SLOT(setDirty(bool)));
- connect(dial, TQT_SIGNAL(defaults()), pluginConfig, TQT_SLOT(defaults()));
- connect(dial, TQT_SIGNAL(save()), pluginConfig, TQT_SLOT(save()));
+ connect(pluginConfig, TQ_SIGNAL(changed(bool)), dial, TQ_SLOT(setDirty(bool)));
+ connect(dial, TQ_SIGNAL(defaults()), pluginConfig, TQ_SLOT(defaults()));
+ connect(dial, TQ_SIGNAL(save()), pluginConfig, TQ_SLOT(save()));
if (dial->exec() == TQDialog::Accepted && dial->isDirty() ) {
// Force re-rendering of the preview, to apply settings
@@ -813,7 +813,7 @@ void KCMStyle::loadStyle( TDEConfig& config )
// they use QPopupMenus for the drop-down list!
// ##### Since Trolltech likes to seemingly copy & paste code,
- // TQStringList::findItem() doesn't have a Qt::StringComparisonMode field.
+ // TQStringList::findItem() doesn't have a TQt::StringComparisonMode field.
// We roll our own (yuck)
cfgStyle = cfgStyle.lower();
int item = 0;
@@ -851,7 +851,7 @@ void KCMStyle::styleChanged()
void KCMStyle::switchStyle(const TQString& styleName, bool force)
{
// Don't flicker the preview if the same style is chosen in the cb
- if (!force && appliedStyle && TQT_TQOBJECT(appliedStyle)->name() == styleName)
+ if (!force && appliedStyle && appliedStyle->name() == styleName)
return;
// Create an instance of the new style...
@@ -1157,5 +1157,3 @@ TQString KCMStyle::handbookSection() const
}
#include "kcmstyle.moc"
-
-// vim: set noet ts=4:
diff --git a/kcontrol/style/kcmstyle.h b/kcontrol/style/kcmstyle.h
index 4fb1065bf..c9ff560f7 100644
--- a/kcontrol/style/kcmstyle.h
+++ b/kcontrol/style/kcmstyle.h
@@ -62,7 +62,7 @@ struct StyleEntry {
class KCMStyle : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
KCMStyle( TQWidget* parent = 0, const char* name = 0 );
@@ -168,5 +168,3 @@ private:
};
#endif // __KCMSTYLE_H
-
-// vim: set noet ts=4:
diff --git a/kcontrol/style/keramik/keramikconf.cpp b/kcontrol/style/keramik/keramikconf.cpp
index 7fa6ef698..6ac4e6d4c 100644
--- a/kcontrol/style/keramik/keramikconf.cpp
+++ b/kcontrol/style/keramik/keramikconf.cpp
@@ -63,9 +63,9 @@ KeramikStyleConfig::KeramikStyleConfig(TQWidget* parent): TQWidget(parent)
origAnimProgressBar = s.readBoolEntry("/keramik/Settings/animateProgressBar", false);
animateProgressBar->setChecked(origAnimProgressBar);
- //connect(highlightLineEdits, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) );
- connect(highlightScrollBar, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) );
- connect(animateProgressBar, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) );
+ //connect(highlightLineEdits, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+ connect(highlightScrollBar, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+ connect(animateProgressBar, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
}
KeramikStyleConfig::~KeramikStyleConfig()
diff --git a/kcontrol/style/keramik/keramikconf.h b/kcontrol/style/keramik/keramikconf.h
index 6de7edb10..d129b78f7 100644
--- a/kcontrol/style/keramik/keramikconf.h
+++ b/kcontrol/style/keramik/keramikconf.h
@@ -28,7 +28,7 @@ class TQCheckBox;
class KeramikStyleConfig: public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
KeramikStyleConfig(TQWidget* parent);
~KeramikStyleConfig();
diff --git a/kcontrol/style/menupreview.cpp b/kcontrol/style/menupreview.cpp
index 9b5edb672..6d8514fc1 100644
--- a/kcontrol/style/menupreview.cpp
+++ b/kcontrol/style/menupreview.cpp
@@ -34,7 +34,7 @@ MenuPreview::MenuPreview( TQWidget* parent, int opacity, PreviewMode pvm )
pixBackground(NULL), pixOverlay(NULL), pixBlended(NULL)
{
setFixedSize(150, 150);
- setFocusPolicy( TQ_NoFocus );
+ setFocusPolicy( TQWidget::NoFocus );
mode = pvm;
if (opacity < 0) opacity = 0;
@@ -161,6 +161,3 @@ void MenuPreview::paintEvent( TQPaintEvent* /* pe */ )
}
#include "menupreview.moc"
-
-// vim: set noet ts=4:
-
diff --git a/kcontrol/style/menupreview.h b/kcontrol/style/menupreview.h
index e82b88f18..1f496d15a 100644
--- a/kcontrol/style/menupreview.h
+++ b/kcontrol/style/menupreview.h
@@ -26,7 +26,7 @@ class KPixmap;
class MenuPreview : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
enum PreviewMode {
@@ -56,6 +56,5 @@ private:
PreviewMode mode;
};
-// vim: set noet ts=4:
#endif // __MENUPREVIEW_H
diff --git a/kcontrol/style/styleconfdialog.cpp b/kcontrol/style/styleconfdialog.cpp
index 8cb426b3f..feb5deba7 100644
--- a/kcontrol/style/styleconfdialog.cpp
+++ b/kcontrol/style/styleconfdialog.cpp
@@ -29,8 +29,8 @@ StyleConfigDialog::StyleConfigDialog(TQWidget* parent, TQString styleName):
KDialogBase::Cancel)
{
m_dirty = false;
- connect( this, TQT_SIGNAL( defaultClicked() ), this, TQT_SIGNAL( defaults() ));
- connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SIGNAL( save() ));
+ connect( this, TQ_SIGNAL( defaultClicked() ), this, TQ_SIGNAL( defaults() ));
+ connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SIGNAL( save() ));
}
bool StyleConfigDialog::isDirty() const
diff --git a/kcontrol/style/styleconfdialog.h b/kcontrol/style/styleconfdialog.h
index 6555adee6..a9c5d26ef 100644
--- a/kcontrol/style/styleconfdialog.h
+++ b/kcontrol/style/styleconfdialog.h
@@ -26,7 +26,7 @@
class StyleConfigDialog: public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
StyleConfigDialog(TQWidget* parent, TQString styleName);
diff --git a/kcontrol/style/stylepreview.ui b/kcontrol/style/stylepreview.ui
index ed6d2e43a..6b2f2a51c 100644
--- a/kcontrol/style/stylepreview.ui
+++ b/kcontrol/style/stylepreview.ui
@@ -276,10 +276,10 @@
<include location="local" impldecl="in implementation">kdialog.h</include>
<include location="local" impldecl="in implementation">stylepreview.ui.h</include>
</includes>
-<Q_SLOTS>
+<slots>
<slot>init()</slot>
<slot returnType="bool">eventFilter( TQObject *, TQEvent * ev )</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="10"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/kcontrol/style/stylepreview.ui.h b/kcontrol/style/stylepreview.ui.h
index edf38650e..38f47ecee 100644
--- a/kcontrol/style/stylepreview.ui.h
+++ b/kcontrol/style/stylepreview.ui.h
@@ -33,14 +33,14 @@ void StylePreview::init()
{
// Ensure that the user can't toy with the child widgets.
// Method borrowed from Qt's qtconfig.
- TQObjectList* l = queryList(TQWIDGET_OBJECT_NAME_STRING);
+ TQObjectList* l = queryList("TQWidget");
TQObjectListIt it(*l);
TQObject* obj;
while ((obj = it.current()) != 0)
{
++it;
obj->installEventFilter(this);
- ((TQWidget*)obj)->setFocusPolicy(TQ_NoFocus);
+ ((TQWidget*)obj)->setFocusPolicy(TQWidget::NoFocus);
}
delete l;
}
@@ -65,5 +65,3 @@ bool StylePreview::eventFilter( TQObject* /* obj */, TQEvent* ev )
}
return FALSE;
}
-
-// vim: set noet ts=4:
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 21:35:08 +0000