summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--style/config/lipstikconf.cpp66
-rw-r--r--style/lipstik.cpp4
2 files changed, 35 insertions, 35 deletions
diff --git a/style/config/lipstikconf.cpp b/style/config/lipstikconf.cpp
index 08785ce..5e67d9f 100644
--- a/style/config/lipstikconf.cpp
+++ b/style/config/lipstikconf.cpp
@@ -56,20 +56,20 @@ extern "C"
LipstikStyleConfig::LipstikStyleConfig(TQWidget* parent): TQWidget(parent)
{
- TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 0, 0);
+ TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0);
TQGridLayout* tabLayout = new TQGridLayout(this, 2, 1, 10);
KGlobal::locale()->insertCatalogue("kstyle_lipstik_config");
///Init tabs
TQTabWidget *tabWidget = new TQTabWidget(this);
- tqlayout->addWidget(tabWidget);
+ layout->addWidget(tabWidget);
///Init tab1
TQWidget *page1 = new TQWidget(tabWidget);
- tqlayout = new TQVBoxLayout(page1);
+ layout = new TQVBoxLayout(page1);
tabWidget->insertTab(page1, i18n("Configuration"));
- tqlayout->addLayout(tabLayout);
+ layout->addLayout(tabLayout);
///General group
TQVGroupBox *generalGrp = new TQVGroupBox(i18n("General"), page1);
@@ -110,7 +110,7 @@ LipstikStyleConfig::LipstikStyleConfig(TQWidget* parent): TQWidget(parent)
flatStripe = new TQCheckBox(i18n("Flatten Stripe"), menusGrp);
customMenuStripeColor = new TQCheckBox(i18n("Custom Stripe color :"), menusGrp);
TQHBox *menuColorBox = new TQHBox(menusGrp);
- menuColorBox->tqlayout()->addItem(new TQSpacerItem(20, 0, TQSizePolicy::Fixed, TQSizePolicy::Minimum) );
+ menuColorBox->layout()->addItem(new TQSpacerItem(20, 0, TQSizePolicy::Fixed, TQSizePolicy::Minimum) );
menuStripeColor = new KColorButton(menuColorBox);
@@ -171,22 +171,22 @@ LipstikStyleConfig::LipstikStyleConfig(TQWidget* parent): TQWidget(parent)
customFocusHighlightColor = new TQCheckBox(i18n("Input fields highlight :"), otherGrp);
TQHBox *hbox1 = new TQHBox(otherGrp);
- hbox1->tqlayout()->addItem(new TQSpacerItem(20, 0, TQSizePolicy::Fixed, TQSizePolicy::Minimum) );
+ hbox1->layout()->addItem(new TQSpacerItem(20, 0, TQSizePolicy::Fixed, TQSizePolicy::Minimum) );
focusHighlightColor = new KColorButton(hbox1);
customOverHighlightColor = new TQCheckBox(i18n("Mouse hover highlight :"), otherGrp);
TQHBox *hbox2 = new TQHBox(otherGrp);
- hbox2->tqlayout()->addItem(new TQSpacerItem(20, 0, TQSizePolicy::Fixed, TQSizePolicy::Minimum) );
+ hbox2->layout()->addItem(new TQSpacerItem(20, 0, TQSizePolicy::Fixed, TQSizePolicy::Minimum) );
overHighlightColor = new KColorButton(hbox2);
customCheckMarkColor = new TQCheckBox(i18n("Checkmark/Radiobuttons :"), otherGrp);
TQHBox *hbox3 = new TQHBox(otherGrp);
- hbox3->tqlayout()->addItem(new TQSpacerItem(20, 0, TQSizePolicy::Fixed, TQSizePolicy::Minimum) );
+ hbox3->layout()->addItem(new TQSpacerItem(20, 0, TQSizePolicy::Fixed, TQSizePolicy::Minimum) );
checkMarkColor = new KColorButton(hbox3);
customTabHighlightColor = new TQCheckBox(i18n("Active tab highlight :"), otherGrp);
TQHBox *hbox4 = new TQHBox(otherGrp);
- hbox4->tqlayout()->addItem(new TQSpacerItem(20, 0, TQSizePolicy::Fixed, TQSizePolicy::Minimum) );
+ hbox4->layout()->addItem(new TQSpacerItem(20, 0, TQSizePolicy::Fixed, TQSizePolicy::Minimum) );
tabHighlightColor = new KColorButton(hbox4);
tabLayout->addWidget(otherGrp,1,2,0);
@@ -211,7 +211,7 @@ LipstikStyleConfig::LipstikStyleConfig(TQWidget* parent): TQWidget(parent)
TQLabel* pcbsdLabel;
TQLabel* othersLabel;
- tqlayout = new TQVBoxLayout(page2, 10, -1);
+ layout = new TQVBoxLayout(page2, 10, -1);
tabWidget->insertTab(page2, i18n("About"));
@@ -267,29 +267,29 @@ LipstikStyleConfig::LipstikStyleConfig(TQWidget* parent): TQWidget(parent)
othersLabel = new TQLabel(page2);
othersLabel->setText(i18n("Special thanks to Dominique and all the kde-look.org users."));
- tqlayout->add(lipstikLabel);
- tqlayout->add(authorLabel);
- tqlayout->add(authorAddressLabel);
- tqlayout->add(authorWebLabel);
-
- tqlayout->addSpacing(10);
- tqlayout->add(plastikLabel);
-
- tqlayout->addSpacing(10);
- tqlayout->add(alsoLabel);
- tqlayout->add(cuLabel);
- tqlayout->add(dnLabel);
- tqlayout->add(pqLabel);
- tqlayout->add(cxLabel);
- tqlayout->add(kpLabel);
- tqlayout->add(blLabel);
- tqlayout->add(ksLabel);
- tqlayout->add(peLabel);
-
- tqlayout->addSpacing(10);
- tqlayout->add(bastianLabel);
- tqlayout->add(pcbsdLabel);
- tqlayout->add(othersLabel);
+ layout->add(lipstikLabel);
+ layout->add(authorLabel);
+ layout->add(authorAddressLabel);
+ layout->add(authorWebLabel);
+
+ layout->addSpacing(10);
+ layout->add(plastikLabel);
+
+ layout->addSpacing(10);
+ layout->add(alsoLabel);
+ layout->add(cuLabel);
+ layout->add(dnLabel);
+ layout->add(pqLabel);
+ layout->add(cxLabel);
+ layout->add(kpLabel);
+ layout->add(blLabel);
+ layout->add(ksLabel);
+ layout->add(peLabel);
+
+ layout->addSpacing(10);
+ layout->add(bastianLabel);
+ layout->add(pcbsdLabel);
+ layout->add(othersLabel);
///Populate!
TQSettings s;
diff --git a/style/lipstik.cpp b/style/lipstik.cpp
index a77387c..4eb3d6f 100644
--- a/style/lipstik.cpp
+++ b/style/lipstik.cpp
@@ -1236,7 +1236,7 @@ void LipstikStyle::renderTab(TQPainter *p,
// fake the panel border edge for tabs which are aligned left-most
// (i.e. only if there is no widget in the corner of the tabwidget!)
if(isFirst&&!reverseLayout&&!cornerWidget)
- // normal tqlayout
+ // normal layout
{
if (!bottom) {
p->setPen(alphaBlendColors(g.background(), getColor(g,PanelContour), 50) );
@@ -1258,7 +1258,7 @@ void LipstikStyle::renderTab(TQPainter *p,
p->drawPoint(Rb.x()+1, Rb.bottom() );
}
} else if(isFirst&&reverseLayout&&!cornerWidget)
- // reverse tqlayout
+ // reverse layout
{
if (!bottom) {
p->setPen(alphaBlendColors(g.background(), getColor(g,PanelContour), 50) );