[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeartwork/kwin-styles
From: Laurent Montel <montel () kde ! org>
Date: 2005-10-27 16:18:44
Message-ID: 1130429924.698660.1163.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 474907 by mlaurent:
Fix other compile error
M +5 -5 cde/cdeclient.cpp
M +2 -2 glow/glowbutton.cpp
M +3 -3 glow/glowclient.cpp
M +3 -3 icewm/icewm.cpp
M +2 -2 kde1/kde1client.cpp
M +2 -2 kde1/kde1client.h
M +1 -1 riscos/Manager.cpp
M +4 -4 system/systemclient.cpp
--- trunk/KDE/kdeartwork/kwin-styles/cde/cdeclient.cpp #474906:474907
@@ -335,7 +335,7 @@
case 'M':
if ( ! button[BtnMenu] )
{
- button[BtnMenu] = new CdeButton( this, "menu", BtnMenu, \
i18n("Menu"), LeftButton|RightButton ); + button[BtnMenu] = \
new CdeButton( this, "menu", BtnMenu, i18n("Menu"), \
Qt::LeftButton|Qt::RightButton );
connect( button[BtnMenu], SIGNAL(pressed()), \
SLOT(menuButtonPressed()) );
connect( button[BtnMenu], SIGNAL(released()), \
SLOT(menuButtonReleased()) ); titleLayout->addWidget( button[BtnMenu] );
@@ -368,7 +368,7 @@
case 'A':
if ( (! button[BtnMax] ) && isMaximizable() )
{
- button[BtnMax] = new CdeButton(this, "maximize", BtnMax, \
i18n("Maximize"), LeftButton|MidButton|RightButton); + \
button[BtnMax] = new CdeButton(this, "maximize", BtnMax, i18n("Maximize"), \
Qt::LeftButton|Qt::MidButton|Qt::RightButton); connect(button[BtnMax], \
SIGNAL(clicked()), SLOT(maximizeButtonClicked()));
titleLayout->addWidget( button[BtnMax] );
@@ -722,13 +722,13 @@
void CdeClient::mouseDoubleClickEvent( QMouseEvent * e )
{
- if ( e->button() == LeftButton && titlebar->geometry().contains( e->pos() ) )
+ if ( e->button() == Qt::LeftButton && titlebar->geometry().contains( e->pos() ) \
) titlebarDblClickOperation();
}
void CdeClient::mousePressEvent( QMouseEvent * e )
{
- if ( e->button() == LeftButton && titlebar->geometry().contains( e->pos() ) )
+ if ( e->button() == Qt::LeftButton && titlebar->geometry().contains( e->pos() ) \
) {
if ( titlebarButtonMode )
{
@@ -746,7 +746,7 @@
void CdeClient::mouseReleaseEvent( QMouseEvent * e )
{
- if ( e->button() == LeftButton && titlebarPressed )
+ if ( e->button() == Qt::LeftButton && titlebarPressed )
{
titlebarPressed = false;
widget()->repaint(titlebar->geometry(), false);
--- trunk/KDE/kdeartwork/kwin-styles/glow/glowbutton.cpp #474906:474907
@@ -185,8 +185,8 @@
m_timer->stop();
m_pos = _steps;
repaint(false);
- // without pretending LeftButton, clicking on the button with MidButton
- // or RightButton would cause unwanted titlebar action
+ // without pretending Qt::LeftButton, clicking on the button with Qt::MidButton
+ // or Qt::RightButton would cause unwanted titlebar action
QMouseEvent me (e->type(), e->pos(), e->globalPos(),
(e->button()&m_realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state());
Q3Button::mousePressEvent(&me);
--- trunk/KDE/kdeartwork/kwin-styles/glow/glowclient.cpp #474906:474907
@@ -536,7 +536,7 @@
void GlowClient::mouseDoubleClickEvent( QMouseEvent *e )
{
- if(e->button() == LeftButton && _title_spacer->geometry().contains(e->pos()))
+ if(e->button() == Qt::LeftButton && _title_spacer->geometry().contains(e->pos()))
titlebarDblClickOperation();
}
@@ -653,7 +653,7 @@
QSize size = globals->theme()->buttonSize;
m_stickyButton = factory->createGlowButton(widget(),
- "StickyButton", isOnAllDesktops()?i18n("Not on all desktops"):i18n("On all \
desktops"), LeftButton|RightButton); + "StickyButton", \
isOnAllDesktops()?i18n("Not on all desktops"):i18n("On all desktops"), \
Qt::LeftButton|Qt::RightButton); m_stickyButton->setFixedSize(size);
connect(m_stickyButton, SIGNAL(clicked()), this, SLOT(toggleOnAllDesktops()));
m_buttonList.insert(m_buttonList.end(), m_stickyButton);
@@ -671,7 +671,7 @@
m_buttonList.insert(m_buttonList.end(), m_minimizeButton);
m_maximizeButton=factory->createGlowButton(widget(),
- "MaximizeButton", i18n("Maximize"), LeftButton|MidButton|RightButton);
+ "MaximizeButton", i18n("Maximize"), \
Qt::LeftButton|Qt::MidButton|Qt::RightButton); m_maximizeButton->setFixedSize(size);
connect(m_maximizeButton, SIGNAL(clicked()), this, SLOT(slotMaximize()));
m_buttonList.insert(m_buttonList.end(), m_maximizeButton);
--- trunk/KDE/kdeartwork/kwin-styles/icewm/icewm.cpp #474906:474907
@@ -982,7 +982,7 @@
if (showMenuButtonIcon) {
renderMenuIcons();
button[BtnSysMenu] = new IceWMButton(this, "menu",
- &menuButtonWithIconPix, false, i18n("Menu"), LeftButton|RightButton);
+ &menuButtonWithIconPix, false, i18n("Menu"), \
Qt::LeftButton|Qt::RightButton); }
else
button[BtnSysMenu] = new IceWMButton(this, "menu",
@@ -1011,7 +1011,7 @@
if ( validPixmaps(maximizePix) && !button[BtnMaximize] && isMaximizable() )
{
button[BtnMaximize] = new IceWMButton(this, "maximize",
- &maximizePix, false, i18n("Maximize"), LeftButton|MidButton|RightButton);
+ &maximizePix, false, i18n("Maximize"), \
Qt::LeftButton|Qt::MidButton|Qt::RightButton); hb->addWidget( button[BtnMaximize] );
connect( button[BtnMaximize], SIGNAL(clicked()),
this, SLOT(slotMaximize()));
@@ -1462,7 +1462,7 @@
void IceWMClient::mouseDoubleClickEvent( QMouseEvent * e )
{
- if( e->button() != LeftButton )
+ if( e->button() != Qt::LeftButton )
return;
QRect r;
--- trunk/KDE/kdeartwork/kwin-styles/kde1/kde1client.cpp #474906:474907
@@ -494,7 +494,7 @@
void StdClient::mouseDoubleClickEvent( QMouseEvent * e )
{
- if ( e->button() == LeftButton && titlebar->geometry().contains( e->pos() ) )
+ if ( e->button() == Qt::LeftButton && titlebar->geometry().contains( e->pos() ) \
) titlebarDblClickOperation();
}
@@ -654,7 +654,7 @@
void StdToolClient::mouseDoubleClickEvent( QMouseEvent * e )
{
- if ( e->button() == LeftButton && titlebar->geometry().contains( e->pos() ) )
+ if ( e->button() == Qt::LeftButton && titlebar->geometry().contains( e->pos() ) \
) titlebarDblClickOperation();
}
--- trunk/KDE/kdeartwork/kwin-styles/kde1/kde1client.h #474906:474907
@@ -117,13 +117,13 @@
void mousePressEvent( QMouseEvent* e )
{
last_button = e->button();
- QMouseEvent me ( e->type(), e->pos(), e->globalPos(), LeftButton, e->state() );
+ QMouseEvent me ( e->type(), e->pos(), e->globalPos(), Qt::LeftButton, e->state() );
QToolButton::mousePressEvent( &me );
}
void mouseReleaseEvent( QMouseEvent* e )
{
- QMouseEvent me ( e->type(), e->pos(), e->globalPos(), LeftButton, e->state() );
+ QMouseEvent me ( e->type(), e->pos(), e->globalPos(), Qt::LeftButton, e->state() );
QToolButton::mouseReleaseEvent( &me );
}
--- trunk/KDE/kdeartwork/kwin-styles/riscos/Manager.cpp #474906:474907
@@ -357,7 +357,7 @@
void Manager::mouseDoubleClickEvent(QMouseEvent *e)
{
- if (e->button() == LeftButton && titleSpacer_->geometry().contains(e->pos()))
+ if (e->button() == Qt::LeftButton && titleSpacer_->geometry().contains(e->pos()))
titlebarDblClickOperation();
}
--- trunk/KDE/kdeartwork/kwin-styles/system/systemclient.cpp #474906:474907
@@ -203,8 +203,8 @@
: Q3Button(parent->widget(), name)
{
setTipText(tip);
- setBackgroundMode( NoBackground );
- setCursor(ArrowCursor);
+ setBackgroundMode( Qt::NoBackground );
+ setCursor(Qt::ArrowCursor);
resize(14, 14);
if(bitmap)
setBitmap(bitmap);
@@ -614,14 +614,14 @@
void SystemClient::mouseDoubleClickEvent( QMouseEvent * e )
{
- if ( e->button() == LeftButton && titlebar->geometry().contains( e->pos() ) )
+ if ( e->button() == Qt::LeftButton && titlebar->geometry().contains( e->pos() ) )
titlebarDblClickOperation();
}
void SystemClient::maximizeChange()
{
unsigned char *minmax_bits;
- int l_max = KDecoration::options()->titleButtonsLeft().find('A');
+ int l_max = KDecoration::options()->titleButtonsLeft().count('A');
if (KDecoration::options()->customButtonPositions() && (l_max>-1))
minmax_bits = l_minmax_bits;
else
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic