summaryrefslogtreecommitdiffstats
path: root/twin/clients/kwmtheme
diff options
context:
space:
mode:
Diffstat (limited to 'twin/clients/kwmtheme')
-rw-r--r--twin/clients/kwmtheme/cli_installer/main.cpp16
-rw-r--r--twin/clients/kwmtheme/kwmthemeclient.cpp28
-rw-r--r--twin/clients/kwmtheme/kwmthemeclient.h2
3 files changed, 23 insertions, 23 deletions
diff --git a/twin/clients/kwmtheme/cli_installer/main.cpp b/twin/clients/kwmtheme/cli_installer/main.cpp
index c67a2d227..4533cf3e8 100644
--- a/twin/clients/kwmtheme/cli_installer/main.cpp
+++ b/twin/clients/kwmtheme/cli_installer/main.cpp
@@ -73,36 +73,36 @@ int main(int argc, char **argv)
input.setGroup("Window Border");
output->setGroup("General");
- tmpStr = input.readEntry("shapePixmapTop");
+ tmpStr = input.readEntry("tqshapePixmapTop");
if(!tmpStr.isEmpty()){
copy(srcStr+tmpStr, localDirStr+tmpStr);
}
output->writeEntry("wm_top", tmpStr, true, true);
- tmpStr = input.readEntry("shapePixmapBottom");
+ tmpStr = input.readEntry("tqshapePixmapBottom");
if(!tmpStr.isEmpty())
copy(srcStr+tmpStr, localDirStr+tmpStr);
output->writeEntry("wm_bottom", tmpStr, true, true);
- tmpStr = input.readEntry("shapePixmapLeft");
+ tmpStr = input.readEntry("tqshapePixmapLeft");
if(!tmpStr.isEmpty())
copy(srcStr+tmpStr, localDirStr+tmpStr);
output->writeEntry("wm_left", tmpStr, true, true);
- tmpStr = input.readEntry("shapePixmapRight");
+ tmpStr = input.readEntry("tqshapePixmapRight");
if(!tmpStr.isEmpty())
copy(srcStr+tmpStr, localDirStr+tmpStr);
output->writeEntry("wm_right", tmpStr, true, true);
- tmpStr = input.readEntry("shapePixmapTopLeft");
+ tmpStr = input.readEntry("tqshapePixmapTopLeft");
if(!tmpStr.isEmpty())
copy(srcStr+tmpStr, localDirStr+tmpStr);
output->writeEntry("wm_topleft", tmpStr, true, true);
- tmpStr = input.readEntry("shapePixmapTopRight");
+ tmpStr = input.readEntry("tqshapePixmapTopRight");
if(!tmpStr.isEmpty())
copy(srcStr+tmpStr, localDirStr+tmpStr);
output->writeEntry("wm_topright", tmpStr, true, true);
- tmpStr = input.readEntry("shapePixmapBottomLeft");
+ tmpStr = input.readEntry("tqshapePixmapBottomLeft");
if(!tmpStr.isEmpty())
copy(srcStr+tmpStr, localDirStr+tmpStr);
output->writeEntry("wm_bottomleft", tmpStr, true, true);
- tmpStr = input.readEntry("shapePixmapBottomRight");
+ tmpStr = input.readEntry("tqshapePixmapBottomRight");
if(!tmpStr.isEmpty())
copy(srcStr+tmpStr, localDirStr+tmpStr);
output->writeEntry("wm_bottomright", tmpStr, true, true);
diff --git a/twin/clients/kwmtheme/kwmthemeclient.cpp b/twin/clients/kwmtheme/kwmthemeclient.cpp
index 59b471e25..5d5e462f7 100644
--- a/twin/clients/kwmtheme/kwmthemeclient.cpp
+++ b/twin/clients/kwmtheme/kwmthemeclient.cpp
@@ -1,7 +1,7 @@
#include <kconfig.h>
#include "kwmthemeclient.h"
#include <kglobal.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqdrawutil.h>
#include <tqpainter.h>
#include <kpixmapeffect.h>
@@ -231,7 +231,7 @@ void MyButton::drawButtonLabel(TQPainter *p)
int offset = (isDown() && ((pixmap()->width() >= width()) ||
(pixmap()->height() >= height()))) ? 1 : 0;
style().drawItem(p, TQRect( offset, offset, width(), height() ),
- AlignCenter, colorGroup(),
+ AlignCenter, tqcolorGroup(),
true, pixmap(), TQString::null);
}
}
@@ -364,7 +364,7 @@ void KWMThemeClient::drawTitle(TQPainter &dest)
p.begin(&buffer);
if(titleSunken){
- qDrawShadeRect(&p, r, options()->colorGroup(KDecorationOptions::ColorFrame, isActive()),
+ qDrawShadeRect(&p, r, options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()),
true, 1, 0);
r.setRect(r.x()+1, r.y()+1, r.width()-2, r.height()-2);
}
@@ -384,7 +384,7 @@ void KWMThemeClient::drawTitle(TQPainter &dest)
p.drawTiledPixmap(r, *fill);
}
else{
- p.fillRect(r, options()->colorGroup(KDecorationOptions::ColorTitleBar, isActive()).
+ p.fillRect(r, options()->tqcolorGroup(KDecorationOptions::ColorTitleBar, isActive()).
brush(TQColorGroup::Button));
}
p.setFont(options()->font(isActive()));
@@ -402,12 +402,12 @@ void KWMThemeClient::drawTitle(TQPainter &dest)
void KWMThemeClient::resizeEvent( TQResizeEvent* )
{
doShape();
- widget()->repaint();
+ widget()->tqrepaint();
}
void KWMThemeClient::captionChange()
{
- widget()->repaint( titlebar->geometry(), false );
+ widget()->tqrepaint( titlebar->geometry(), false );
}
void KWMThemeClient::paintEvent( TQPaintEvent *)
@@ -557,7 +557,7 @@ void KWMThemeClient::paintEvent( TQPaintEvent *)
}
drawTitle(p);
- TQColor c = widget()->colorGroup().background();
+ TQColor c = widget()->tqcolorGroup().background();
// KWM evidently had a 1 pixel border around the client window. We
// emulate it here, but should be removed at some point in order to
@@ -576,10 +576,10 @@ void KWMThemeClient::paintEvent( TQPaintEvent *)
void KWMThemeClient::doShape()
{
- TQBitmap shapemask(width(), height());
- shapemask.fill(color0);
+ TQBitmap tqshapemask(width(), height());
+ tqshapemask.fill(color0);
TQPainter p;
- p.begin(&shapemask);
+ p.begin(&tqshapemask);
p.setBrush(color1);
p.setPen(color1);
int x,y;
@@ -740,14 +740,14 @@ void KWMThemeClient::doShape()
}
}
p.fillRect(maxExtent-1, maxExtent-1, width()-2*maxExtent+2, height()-2*maxExtent+2, color1);
- setMask(shapemask);
+ setMask(tqshapemask);
}
void KWMThemeClient::showEvent(TQShowEvent *)
{
doShape();
- widget()->repaint(false);
+ widget()->tqrepaint(false);
}
void KWMThemeClient::mouseDoubleClickEvent( TQMouseEvent * e )
@@ -868,9 +868,9 @@ bool KWMThemeClient::eventFilter( TQObject* o, TQEvent* e )
}
}
-TQSize KWMThemeClient::minimumSize() const
+TQSize KWMThemeClient::tqminimumSize() const
{
- return widget()->minimumSize().expandedTo( TQSize( 100, 50 ));
+ return widget()->tqminimumSize().expandedTo( TQSize( 100, 50 ));
}
void KWMThemeClient::resize( const TQSize& s )
diff --git a/twin/clients/kwmtheme/kwmthemeclient.h b/twin/clients/kwmtheme/kwmthemeclient.h
index 58db3d14f..e51bfe6d1 100644
--- a/twin/clients/kwmtheme/kwmthemeclient.h
+++ b/twin/clients/kwmtheme/kwmthemeclient.h
@@ -30,7 +30,7 @@ public:
~KWMThemeClient(){;}
void init();
void resize( const TQSize& s );
- TQSize minimumSize() const;
+ TQSize tqminimumSize() const;
void borders( int& left, int& right, int& top, int& bottom ) const;
protected:
void doShape();
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-25 22:32:11 +0000