TDE
/
twin-style-crystal
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/twin-style-crystal
0
0
Fork 0
Code Issues Releases Wiki Activity

rename the following methods:

Browse Source 
tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kwin-style-crystal@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 529c1ea243
commit 4e5e357168
7 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File

10
client/config/crystalconfig.cc
Unescape View File

@ -45,12 +45,12 @@
#include "crystalconfig.h"
CrystalConfig::CrystalConfig(KConfig*, TQWidget* tqparent)
: TQObject(tqparent), config_(0), dialog_(0)
CrystalConfig::CrystalConfig(KConfig*, TQWidget* parent)
: TQObject(parent), config_(0), dialog_(0)
{
config_ = new KConfig("kwincrystalrc");
dialog_ = new ConfigDialog(tqparent);
dialog_ = new ConfigDialog(parent);
dialog_->show();
connect(dialog_->titlealign, TQT_SIGNAL(clicked(int)),this, TQT_SLOT(selectionChanged(int)));
@ -376,8 +376,8 @@ void CrystalConfig::defaults()
extern "C"
{
TQObject* allocate_config(KConfig* config, TQWidget* tqparent) {
return (new CrystalConfig(config, tqparent));
TQObject* allocate_config(KConfig* config, TQWidget* parent) {
return (new CrystalConfig(config, parent));
}
}

2
client/config/crystalconfig.h
Unescape View File

@ -37,7 +37,7 @@ class CrystalConfig : public TQObject
Q_OBJECT
TQ_OBJECT
public:
CrystalConfig(KConfig* config, TQWidget* tqparent);
CrystalConfig(KConfig* config, TQWidget* parent);
~CrystalConfig();
signals:

4
client/crystalbutton.cpp
Unescape View File

@ -29,10 +29,10 @@
#include "imageholder.h"
CrystalButton::CrystalButton(CrystalClient *tqparent, const char *name,
CrystalButton::CrystalButton(CrystalClient *parent, const char *name,
const TQString& tip, ButtonType type,
ButtonImage *vimage)
: TQButton(tqparent->widget(), name), client_(tqparent), type_(type), image(vimage), lastmouse_(0)
: TQButton(parent->widget(), name), client_(parent), type_(type), image(vimage), lastmouse_(0)
{
setBackgroundMode(NoBackground);
resetSize(false);

2
client/crystalbutton.h
Unescape View File

@ -34,7 +34,7 @@ class CrystalButton : public TQButton
TQ_OBJECT
public:
CrystalButton(CrystalClient *tqparent=0, const char *name=0,
CrystalButton(CrystalClient *parent=0, const char *name=0,
const TQString &tip=NULL,
ButtonType type=ButtonHelp,
ButtonImage *vimage=NULL);

54
client/crystalclient.cc
Unescape View File

@ -818,40 +818,40 @@ void CrystalClient::updateMask()
int cornersFlag = ::factory->roundCorners;
int r(width());
int b(height());
TQRegion tqmask;
TQRegion mask;
tqmask=TQRegion(widget()->rect());
mask=TQRegion(widget()->rect());
// Remove top-left corner.
if(cornersFlag & TOP_LEFT) {
tqmask -= TQRegion(0, 0, 5, 1);
tqmask -= TQRegion(0, 1, 3, 1);
tqmask -= TQRegion(0, 2, 2, 1);
tqmask -= TQRegion(0, 3, 1, 2);
mask -= TQRegion(0, 0, 5, 1);
mask -= TQRegion(0, 1, 3, 1);
mask -= TQRegion(0, 2, 2, 1);
mask -= TQRegion(0, 3, 1, 2);
}
// Remove top-right corner.
if(cornersFlag & TOP_RIGHT) {
tqmask -= TQRegion(r - 5, 0, 5, 1);
tqmask -= TQRegion(r - 3, 1, 3, 1);
tqmask -= TQRegion(r - 2, 2, 2, 1);
tqmask -= TQRegion(r - 1, 3, 1, 2);
mask -= TQRegion(r - 5, 0, 5, 1);
mask -= TQRegion(r - 3, 1, 3, 1);
mask -= TQRegion(r - 2, 2, 2, 1);
mask -= TQRegion(r - 1, 3, 1, 2);
}
// Remove bottom-left corner.
if(cornersFlag & BOT_LEFT) {
tqmask -= TQRegion(0, b - 5, 1, 3);
tqmask -= TQRegion(0, b - 3, 2, 1);
tqmask -= TQRegion(0, b - 2, 3, 1);
tqmask -= TQRegion(0, b - 1, 5, 1);
mask -= TQRegion(0, b - 5, 1, 3);
mask -= TQRegion(0, b - 3, 2, 1);
mask -= TQRegion(0, b - 2, 3, 1);
mask -= TQRegion(0, b - 1, 5, 1);
}
// Remove bottom-right corner.
if(cornersFlag & BOT_RIGHT) {
tqmask -= TQRegion(r - 5, b - 1, 5, 1);
tqmask -= TQRegion(r - 3, b - 2, 3, 1);
tqmask -= TQRegion(r - 2, b - 3, 2, 1);
tqmask -= TQRegion(r - 1, b - 5, 1, 2);
mask -= TQRegion(r - 5, b - 1, 5, 1);
mask -= TQRegion(r - 3, b - 2, 3, 1);
mask -= TQRegion(r - 2, b - 3, 2, 1);
mask -= TQRegion(r - 1, b - 5, 1, 2);
}
setMask(tqmask);
setMask(mask);
}
CrystalButton* CrystalClient::addButtons(TQBoxLayout *tqlayout, const TQString& s)
@ -1147,19 +1147,19 @@ bool CrystalClient::eventFilter(TQObject *obj, TQEvent *e)
void CrystalClient::ClientWindows(Window* v_frame,Window* v_wrapper,Window *v_client)
{
Window root=0,frame=0,wrapper=0,client=0,tqparent=0,*tqchildren=NULL;
Window root=0,frame=0,wrapper=0,client=0,parent=0,*tqchildren=NULL;
uint numc;
if (v_frame) *v_frame=0;
if (v_wrapper) *v_wrapper=0;
if (v_client) *v_client=0;
// Our Deco is the child of a frame, get our tqparent
// Our Deco is the child of a frame, get our parent
if (XQueryTree(qt_xdisplay(),widget()->winId(),&root,&frame,&tqchildren,&numc) == 0)
return;
if (tqchildren!=NULL)XFree(tqchildren);
tqchildren=NULL;
// frame has two tqchildren, us and a wrapper, get the wrapper
if (XQueryTree(qt_xdisplay(),frame,&root,&tqparent,&tqchildren,&numc)==0)
if (XQueryTree(qt_xdisplay(),frame,&root,&parent,&tqchildren,&numc)==0)
return;
for (uint i=0;i<numc;i++)
@ -1170,7 +1170,7 @@ void CrystalClient::ClientWindows(Window* v_frame,Window* v_wrapper,Window *v_cl
tqchildren=NULL;
// wrapper has only one child, which is the client. We want this!!
if (XQueryTree(qt_xdisplay(),wrapper,&root,&tqparent,&tqchildren,&numc)==0)
if (XQueryTree(qt_xdisplay(),wrapper,&root,&parent,&tqchildren,&numc)==0)
return;
if (numc==1)client=tqchildren[0];
if (tqchildren!=NULL)XFree(tqchildren);
@ -1409,7 +1409,7 @@ void CrystalClient::paintEvent(TQPaintEvent*)
int r=(width());
int b=(height());
// Draw edge of top-left corner inside the area removed by the tqmask.
// Draw edge of top-left corner inside the area removed by the mask.
if(cornersFlag & TOP_LEFT) {
painter.setPen(c1);
painter.drawPoint(3, 1);
@ -1419,7 +1419,7 @@ void CrystalClient::paintEvent(TQPaintEvent*)
painter.drawPoint(1, 4);
}
// Draw edge of top-right corner inside the area removed by the tqmask.
// Draw edge of top-right corner inside the area removed by the mask.
if(cornersFlag & TOP_RIGHT) {
painter.setPen(c1);
painter.drawPoint(r - 5, 1);
@ -1429,7 +1429,7 @@ void CrystalClient::paintEvent(TQPaintEvent*)
painter.drawPoint(r - 2, 4);
}
// Draw edge of bottom-left corner inside the area removed by the tqmask.
// Draw edge of bottom-left corner inside the area removed by the mask.
if(cornersFlag & BOT_LEFT) {
painter.setPen(c2);
painter.drawPoint(1, b - 5);
@ -1439,7 +1439,7 @@ void CrystalClient::paintEvent(TQPaintEvent*)
painter.drawPoint(4, b - 2);
}
// Draw edge of bottom-right corner inside the area removed by the tqmask.
// Draw edge of bottom-right corner inside the area removed by the mask.
if(cornersFlag & BOT_RIGHT) {
painter.setPen(c2);
painter.drawPoint(r - 2, b - 5);

4
client/myrootpixmap.cc
Unescape View File

@ -38,8 +38,8 @@ KMyRootPixmap::KMyRootPixmap( TQWidget * widget, const char *name )
init();
}
KMyRootPixmap::KMyRootPixmap( TQWidget *, TQObject *tqparent, const char *name )
: TQObject( tqparent, name ? name : "KMyRootPixmap" )
KMyRootPixmap::KMyRootPixmap( TQWidget *, TQObject *parent, const char *name )
: TQObject( parent, name ? name : "KMyRootPixmap" )
{
init();
}

2
client/myrootpixmap.h
Unescape View File

@ -33,7 +33,7 @@ class KMyRootPixmap: public TQObject
public:
KMyRootPixmap( TQWidget *target=NULL, const char *name=0 );
KMyRootPixmap( TQWidget *target, TQObject *tqparent, const char *name=0 );
KMyRootPixmap( TQWidget *target, TQObject *parent, const char *name=0 );
virtual ~KMyRootPixmap();

Write Preview
Loading…
Cancel
Save