summaryrefslogtreecommitdiffstats
path: root/kwin/clients/modernsystem
diff options
context:
space:
mode:
Diffstat (limited to 'kwin/clients/modernsystem')
-rw-r--r--kwin/clients/modernsystem/config/config.cpp10
-rw-r--r--kwin/clients/modernsystem/config/config.h18
-rw-r--r--kwin/clients/modernsystem/modernsys.cpp20
3 files changed, 24 insertions, 24 deletions
diff --git a/kwin/clients/modernsystem/config/config.cpp b/kwin/clients/modernsystem/config/config.cpp
index 8a94c1748..f5260ba7d 100644
--- a/kwin/clients/modernsystem/config/config.cpp
+++ b/kwin/clients/modernsystem/config/config.cpp
@@ -47,7 +47,7 @@ ModernSysConfig::ModernSysConfig(KConfig* conf, TQWidget* parent) : TQObject(par
connect(cbShowHandle, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged()));
sliderBox = new TQVBox(handleBox);
- handleSizeSlider = new TQSlider(0, 4, 1, 0, TQSlider::Horizontal, sliderBox);
+ handleSizeSlider = new TQSlider(0, 4, 1, 0, Qt::Horizontal, sliderBox);
TQWhatsThis::add(handleSizeSlider,
i18n("Here you can change the size of the resize handle."));
handleSizeSlider->setTickInterval(1);
@@ -59,11 +59,11 @@ ModernSysConfig::ModernSysConfig(KConfig* conf, TQWidget* parent) : TQObject(par
bool rtl = kapp->reverseLayout();
label1 = new TQLabel(i18n("Small"), hbox);
- label1->setAlignment(rtl ? AlignRight : AlignLeft);
+ label1->tqsetAlignment(rtl ? AlignRight : AlignLeft);
label2 = new TQLabel(i18n("Medium"), hbox);
- label2->setAlignment(AlignHCenter);
+ label2->tqsetAlignment(AlignHCenter);
label3 = new TQLabel(i18n("Large"), hbox);
- label3->setAlignment(rtl ? AlignLeft : AlignRight);
+ label3->tqsetAlignment(rtl ? AlignLeft : AlignRight);
vbox->addWidget(handleBox);
vbox->addStretch(1);
@@ -104,7 +104,7 @@ void ModernSysConfig::load(KConfig* /*conf*/)
handleSizeSlider->setEnabled(i);
handleWidth = clientrc->readUnsignedNumEntry("HandleWidth", 6);
handleSize = clientrc->readUnsignedNumEntry("HandleSize", 30);
- handleSizeSlider->setValue(QMIN((handleWidth - 6) / 2, 4));
+ handleSizeSlider->setValue(TQMIN((handleWidth - 6) / 2, 4));
}
diff --git a/kwin/clients/modernsystem/config/config.h b/kwin/clients/modernsystem/config/config.h
index dcf4a588f..3a04573cf 100644
--- a/kwin/clients/modernsystem/config/config.h
+++ b/kwin/clients/modernsystem/config/config.h
@@ -8,7 +8,7 @@
#include <tqslider.h>
#include <tqlabel.h>
-class ModernSysConfig : public QObject
+class ModernSysConfig : public TQObject
{
Q_OBJECT
@@ -30,16 +30,16 @@ class ModernSysConfig : public QObject
private:
KConfig *clientrc;
- QWidget *mainw;
- QVBoxLayout *vbox;
+ TQWidget *mainw;
+ TQVBoxLayout *vbox;
TQWidget *handleBox;
TQCheckBox *cbShowHandle;
- QVBox *sliderBox;
- QSlider *handleSizeSlider;
- QHBox *hbox;
- QLabel *label1;
- QLabel *label2;
- QLabel *label3;
+ TQVBox *sliderBox;
+ TQSlider *handleSizeSlider;
+ TQHBox *hbox;
+ TQLabel *label1;
+ TQLabel *label2;
+ TQLabel *label3;
unsigned handleWidth;
unsigned handleSize;
diff --git a/kwin/clients/modernsystem/modernsys.cpp b/kwin/clients/modernsystem/modernsys.cpp
index ce7545cdf..30344d75c 100644
--- a/kwin/clients/modernsystem/modernsys.cpp
+++ b/kwin/clients/modernsystem/modernsys.cpp
@@ -171,20 +171,20 @@ static void create_pixmaps()
KPixmapEffect::VerticalGradient);
}
// buttons
- TQColorGroup btnColor(options()->colorGroup(KDecoration::ColorButtonBg, true));
+ TQColorGroup btnColor(options()->tqcolorGroup(KDecoration::ColorButtonBg, true));
buttonPix = new TQPixmap(14, 15);
make_button_fx(btnColor, buttonPix);
buttonPixDown = new TQPixmap(14, 15);
make_button_fx(btnColor, buttonPixDown, true);
- btnColor = options()->colorGroup(KDecoration::ColorButtonBg, false);
+ btnColor = options()->tqcolorGroup(KDecoration::ColorButtonBg, false);
iButtonPix = new TQPixmap(14, 15);
make_button_fx(btnColor, iButtonPix);
iButtonPixDown = new TQPixmap(14, 15);
make_button_fx(btnColor, iButtonPixDown, true);
- if(qGray(btnColor.background().rgb()) < 150)
+ if(tqGray(btnColor.background().rgb()) < 150)
buttonFg = new TQColor(Qt::white);
else
buttonFg = new TQColor(Qt::black);
@@ -515,7 +515,7 @@ void ModernSys::recalcTitleBuffer()
p.drawTiledPixmap(0, 0, width(), title_height+2, *aUpperGradient);
else
p.fillRect(0, 0, width(), title_height+2,
- options()->colorGroup(ColorTitleBar, true).
+ options()->tqcolorGroup(ColorTitleBar, true).
brush(TQColorGroup::Button));
TQRect t = titleRect(); // titlebar->geometry();
@@ -554,7 +554,7 @@ void ModernSys::updateCaption()
void ModernSys::drawRoundFrame(TQPainter &p, int x, int y, int w, int h)
{
kDrawRoundButton(&p, x, y, w, h,
- options()->colorGroup(ColorFrame, isActive()), false);
+ options()->tqcolorGroup(ColorFrame, isActive()), false);
}
@@ -570,9 +570,9 @@ void ModernSys::paintEvent( TQPaintEvent* )
TQPainter p( widget() );
TQRect t = titleRect(); // titlebar->geometry();
- TQBrush fillBrush(widget()->colorGroup().brush(TQColorGroup::Background).pixmap() ?
- widget()->colorGroup().brush(TQColorGroup::Background) :
- options()->colorGroup(ColorFrame, isActive()).
+ TQBrush fillBrush(widget()->tqcolorGroup().tqbrush(TQColorGroup::Background).pixmap() ?
+ widget()->tqcolorGroup().brush(TQColorGroup::Background) :
+ options()->tqcolorGroup(ColorFrame, isActive()).
brush(TQColorGroup::Button));
p.fillRect(1, title_height+3, width()-2, height()-(title_height+3), fillBrush);
@@ -586,7 +586,7 @@ void ModernSys::paintEvent( TQPaintEvent* )
int h = height() - hw;
// titlebar
- TQColorGroup g = options()->colorGroup(ColorTitleBar, isActive());
+ TQColorGroup g = options()->tqcolorGroup(ColorTitleBar, isActive());
if(isActive()){
p.drawPixmap(1, 1, titleBuffer, 0, 0, w-2, title_height+2);
}
@@ -609,7 +609,7 @@ void ModernSys::paintEvent( TQPaintEvent* )
p.drawLine(0, title_height+2, w-2, title_height+2);
// frame
- g = options()->colorGroup(ColorFrame, isActive());
+ g = options()->tqcolorGroup(ColorFrame, isActive());
p.setPen(g.light());
p.drawLine(1, title_height+3, 1, h-2);
p.setPen(g.dark());
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-26 12:47:30 +0000