Hello community, here is the log from the commit of package qtcurve-kde4 for openSUSE:Factory checked in at Wed May 18 09:25:23 CEST 2011.
-------- --- KDE/qtcurve-kde4/qtcurve-kde4.changes 2011-03-15 23:32:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/qtcurve-kde4/qtcurve-kde4.changes 2011-05-16 16:46:11.000000000 +0200 @@ -1,0 +2,10 @@ +Mon May 16 14:45:13 UTC 2011 - [email protected] + +- Update to 1.8.7 + 1. Fix QtDesigner crash when using transparent background - thanks to Friedemann Kleint. + 2. When installing background images, need to remove and previous files first (as QFile::copy will not overwrite files) + 3. Fix incorrent window-drag trigger when dragging dock widget title widgets (set via QDockWidget::setTitleBarWidget() ) + 4. Fix crash when opening style config dialog whilst kwin config dialog is open. + 5. Allow scrollbar sliders to be as thin as 5 pixels. At this setting, sliders will be squared. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- QtCurve-KDE4-1.8.6.tar.bz2 New: ---- QtCurve-KDE4-1.8.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-kde4.spec ++++++ --- /var/tmp/diff_new_pack.Z56Ak7/_old 2011-05-18 09:24:53.000000000 +0200 +++ /var/tmp/diff_new_pack.Z56Ak7/_new 2011-05-18 09:24:53.000000000 +0200 @@ -24,7 +24,7 @@ License: GPLv2+ Group: System/GUI/KDE Summary: QtCurve style for KDE 4 -Version: 1.8.6 +Version: 1.8.7 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: QtCurve-KDE4-%{version}.tar.bz2 ++++++ QtCurve-KDE4-1.8.6.tar.bz2 -> QtCurve-KDE4-1.8.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-1.8.6/CMakeLists.txt new/QtCurve-KDE4-1.8.7/CMakeLists.txt --- old/QtCurve-KDE4-1.8.6/CMakeLists.txt 2011-03-15 22:47:04.000000000 +0100 +++ new/QtCurve-KDE4-1.8.7/CMakeLists.txt 2011-04-06 21:22:59.000000000 +0200 @@ -8,7 +8,7 @@ set(CPACK_SOURCE_GENERATOR "TBZ2") set(CPACK_PACKAGE_VERSION_MAJOR "1") set(CPACK_PACKAGE_VERSION_MINOR "8") -set(CPACK_PACKAGE_VERSION_PATCH "6") +set(CPACK_PACKAGE_VERSION_PATCH "7") set(CPACK_PACKAGE_CONTACT "Craig Drummond <[email protected]>") set(QTCURVE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}") set(QTCURVE_VERSION_FULL "${QTCURVE_VERSION}.${CPACK_PACKAGE_VERSION_PATCH}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-1.8.6/ChangeLog new/QtCurve-KDE4-1.8.7/ChangeLog --- old/QtCurve-KDE4-1.8.6/ChangeLog 2011-03-15 22:47:04.000000000 +0100 +++ new/QtCurve-KDE4-1.8.7/ChangeLog 2011-04-06 21:22:59.000000000 +0200 @@ -1,3 +1,16 @@ +1.8.7 +----- +1. Fix QtDesigner crash when using transparent background - thanks to + Friedemann Kleint. +2. When installing background images, need to remove and previous files + first (as QFile::copy will not overwrite files) +3. Fix incorrent window-drag trigger when dragging dock widget title + widgets (set via QDockWidget::setTitleBarWidget() ) +4. Fix crash when opening style config dialog whilst kwin config dialog is + open. +5. Allow scrollbar sliders to be as thin as 5 pixels. At this setting, sliders + will be squared. + 1.8.6 ----- 1. Fix potential crash when using translucency and the raster engine. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-1.8.6/common/common.h new/QtCurve-KDE4-1.8.7/common/common.h --- old/QtCurve-KDE4-1.8.6/common/common.h 2011-03-15 22:47:04.000000000 +0100 +++ new/QtCurve-KDE4-1.8.7/common/common.h 2011-04-06 21:22:59.000000000 +0200 @@ -257,9 +257,11 @@ #define MIN_MENU_DELAY 0 #define MAX_MENU_DELAY 500 -#define DEFAULT_SLIDER_WIDTH 15 -#define MIN_SLIDER_WIDTH 11 -#define MAX_SLIDER_WIDTH 31 +#define DEFAULT_SLIDER_WIDTH 15 +#define MIN_SLIDER_WIDTH_ROUND 7 +#define MIN_SLIDER_WIDTH_THIN_GROOVE 9 +#define MIN_SLIDER_WIDTH 5 +#define MAX_SLIDER_WIDTH 31 #define SIZE_GRIP_SIZE 12 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-1.8.6/common/config_file.c new/QtCurve-KDE4-1.8.7/common/config_file.c --- old/QtCurve-KDE4-1.8.6/common/config_file.c 2011-03-15 22:47:04.000000000 +0100 +++ new/QtCurve-KDE4-1.8.7/common/config_file.c 2011-04-06 21:22:59.000000000 +0200 @@ -1555,6 +1555,12 @@ if(opts->sliderWidth<MIN_SLIDER_WIDTH || opts->sliderWidth>MAX_SLIDER_WIDTH) opts->sliderWidth=DEFAULT_SLIDER_WIDTH; + if(opts->sliderWidth<MIN_SLIDER_WIDTH_ROUND) + opts->square|=SQUARE_SB_SLIDER; + + if(opts->sliderWidth<MIN_SLIDER_WIDTH_THIN_GROOVE) + opts->thinSbarGroove=false; + if(opts->sliderWidth<DEFAULT_SLIDER_WIDTH) opts->sliderThumbs=LINE_NONE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-1.8.6/config/qtcurveconfig.cpp new/QtCurve-KDE4-1.8.7/config/qtcurveconfig.cpp --- old/QtCurve-KDE4-1.8.6/config/qtcurveconfig.cpp 2011-03-15 22:47:04.000000000 +0100 +++ new/QtCurve-KDE4-1.8.7/config/qtcurveconfig.cpp 2011-04-06 21:22:59.000000000 +0200 @@ -121,6 +121,22 @@ return QString(file).replace("//", "/"); } +static void removeFile(const QString &f) +{ + if(QFile::exists(f)) + QFile::remove(f); +} + +static void copyFile(const QString &src, const QString &dest) +{ + if(QFile::exists(src)) + { + // QFile::copy will not overwrite existing files. If destination exists, it needs to be removed first. + removeFile(dest); + QFile::copy(src, dest); + } +} + static QString installThemeFile(const QString &src, const QString &dest) { QString source(getThemeFile(src)), @@ -129,7 +145,7 @@ // printf("INST THM \"%s\" \"%s\"", source.toLatin1().constData(), destination.toLatin1().constData()); if(source!=destination) - QFile::copy(source, destination); + copyFile(source, destination); return name; } @@ -142,17 +158,14 @@ // printf("SAVE THM \"%s\" \"%s\"", source.toLatin1().constData(), destination.toLatin1().constData()); if(source!=destination) - QFile::copy(source, destination); + copyFile(source, destination); return destination; } static void removeInstalledThemeFile(const QString &file) { - QString f(qtcConfDir()+QLatin1String(THEME_IMAGE_PREFIX)+file); - - if(QFile::exists(f)) - QFile::remove(f); + removeFile(qtcConfDir()+QLatin1String(THEME_IMAGE_PREFIX)+file); } static void removeThemeImages(const QString &themeFile) @@ -1238,6 +1251,8 @@ setupGradientsTab(); setupPresets(currentStyle, defaultStyle); setupPreview(); + readyForPreview=true; + updatePreview(); } else { @@ -1245,9 +1260,6 @@ titleLabel->setVisible(false); stackList->setVisible(false); } - - readyForPreview=true; - updatePreview(); // KMainWindow dereferences KGlobal when it closes. When KGlobal's refs get to 0 it quits! // ...running kcmshell4 style does not seem to increase ref count of KGlobal - therefore we // do it here - otherwse kcmshell4 would exit immediately after QtCurve's config dialog was diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-1.8.6/style/blurhelper.cpp new/QtCurve-KDE4-1.8.7/style/blurhelper.cpp --- old/QtCurve-KDE4-1.8.6/style/blurhelper.cpp 2011-03-15 22:47:04.000000000 +0100 +++ new/QtCurve-KDE4-1.8.7/style/blurhelper.cpp 2011-04-06 21:22:59.000000000 +0200 @@ -86,11 +86,14 @@ case QEvent::Hide: { QWidget* widget( qobject_cast<QWidget*>( object ) ); - if( widget && isOpaque( widget ) && isTransparent( widget->window() ) ) + if( widget && isOpaque( widget ) ) { QWidget* window( widget->window() ); - _pendingWidgets.insert( window, window ); - delayedUpdate(); + if (window && isTransparent(window) && !_pendingWidgets.contains(window) ) + { + _pendingWidgets.insert( window, window ); + delayedUpdate(); + } } break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-1.8.6/style/windowmanager.cpp new/QtCurve-KDE4-1.8.7/style/windowmanager.cpp --- old/QtCurve-KDE4-1.8.6/style/windowmanager.cpp 2011-03-15 22:47:04.000000000 +0100 +++ new/QtCurve-KDE4-1.8.7/style/windowmanager.cpp 2011-04-06 21:22:59.000000000 +0200 @@ -79,7 +79,7 @@ #if QT_VERSION < 0x040600 QtCPointer & QtCPointer::operator=(QWidget *w) - { +{ widget_=w; if(widget_) Utils::addEventFilter(widget_, this); @@ -104,28 +104,28 @@ //_____________________________________________________________ WindowManager::WindowManager( QObject* parent ): QObject( parent ), - enabled_( true ), + _enabled( true ), #ifdef Q_WS_X11 - useWMMoveResize_( true ), + _useWMMoveResize( true ), #else - useWMMoveResize_( false ), + _useWMMoveResize( false ), #endif - dragMode_( WM_DRAG_NONE ), + _dragMode( WM_DRAG_NONE ), #ifdef QTC_QT_ONLY - dragDistance_( QApplication::startDragDistance() ), + _dragDistance( QApplication::startDragDistance() ), #else - dragDistance_( KGlobalSettings::dndEventDelay() ), + _dragDistance( KGlobalSettings::dndEventDelay() ), #endif - dragDelay_( QApplication::startDragTime() ), - dragAboutToStart_( false ), - dragInProgress_( false ), - locked_( false ), - cursorOverride_( false ) + _dragDelay( QApplication::startDragTime() ), + _dragAboutToStart( false ), + _dragInProgress( false ), + _locked( false ), + _cursorOverride( false ) { // install application wise event filter - appEventFilter_ = new AppEventFilter( this ); - qApp->installEventFilter( appEventFilter_ ); + _appEventFilter = new AppEventFilter( this ); + qApp->installEventFilter( _appEventFilter ); } @@ -178,18 +178,18 @@ void WindowManager::initializeWhiteList( const QStringList &list ) { - whiteList_.clear(); + _whiteList.clear(); // add user specified whitelisted classnames - whiteList_.insert( ExceptionId( "MplayerWindow" ) ); - whiteList_.insert( ExceptionId( "ViewSliders@kmix" ) ); - whiteList_.insert( ExceptionId( "Sidebar_Widget@konqueror" ) ); + _whiteList.insert( ExceptionId( "MplayerWindow" ) ); + _whiteList.insert( ExceptionId( "ViewSliders@kmix" ) ); + _whiteList.insert( ExceptionId( "Sidebar_Widget@konqueror" ) ); foreach( const QString& exception, list ) { ExceptionId id( exception ); if( !id.className().isEmpty() ) - { whiteList_.insert( exception ); } + { _whiteList.insert( exception ); } } } @@ -197,15 +197,16 @@ void WindowManager::initializeBlackList( const QStringList &list ) { - blackList_.clear(); - blackList_.insert( ExceptionId( "CustomTrackView@kdenlive" ) ); - blackList_.insert( ExceptionId( "MuseScore" ) ); + _blackList.clear(); + _blackList.insert( ExceptionId( "CustomTrackView@kdenlive" ) ); + _blackList.insert( ExceptionId( "MuseScore" ) ); foreach( const QString& exception, list ) { ExceptionId id( exception ); if( !id.className().isEmpty() ) - { blackList_.insert( exception ); } + { _blackList.insert( exception ); } } + } //_____________________________________________________________ @@ -220,11 +221,11 @@ break; case QEvent::MouseMove: - if ( object == target_.data() ) return mouseMoveEvent( object, event ); + if ( object == _target.data() ) return mouseMoveEvent( object, event ); break; case QEvent::MouseButtonRelease: - if ( target_ ) return mouseReleaseEvent( object, event ); + if ( _target ) return mouseReleaseEvent( object, event ); break; default: @@ -240,11 +241,11 @@ void WindowManager::timerEvent( QTimerEvent* event ) { - if( event->timerId() == dragTimer_.timerId() ) + if( event->timerId() == _dragTimer.timerId() ) { - dragTimer_.stop(); - if( target_ ) - { startDrag( target_.data(), globalDragPoint_ ); } + _dragTimer.stop(); + if( _target ) + { startDrag( _target.data(), _globalDragPoint ); } } else { @@ -279,14 +280,14 @@ if( !canDrag( widget, child, position ) ) return false; // save target and drag point - target_ = widget; - dragPoint_ = position; - globalDragPoint_ = mouseEvent->globalPos(); - dragAboutToStart_ = true; + _target = widget; + _dragPoint = position; + _globalDragPoint = mouseEvent->globalPos(); + _dragAboutToStart = true; // send a move event to the current child with same position // if received, it is caught to actually start the drag - QPoint localPoint( dragPoint_ ); + QPoint localPoint( _dragPoint ); if( child ) localPoint = child->mapFrom( widget, localPoint ); else child = widget; QMouseEvent localMouseEvent( QEvent::MouseMove, localPoint, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier ); @@ -304,34 +305,34 @@ Q_UNUSED( object ); // stop timer - if( dragTimer_.isActive() ) dragTimer_.stop(); + if( _dragTimer.isActive() ) _dragTimer.stop(); // cast event and check drag distance QMouseEvent *mouseEvent = static_cast<QMouseEvent*>( event ); - if( !dragInProgress_ ) + if( !_dragInProgress ) { - if( dragAboutToStart_ ) + if( _dragAboutToStart ) { - if( mouseEvent->globalPos() == globalDragPoint_ ) + if( mouseEvent->globalPos() == _globalDragPoint ) { // start timer, - dragAboutToStart_ = false; - if( dragTimer_.isActive() ) dragTimer_.stop(); - dragTimer_.start( dragDelay_, this ); + _dragAboutToStart = false; + if( _dragTimer.isActive() ) _dragTimer.stop(); + _dragTimer.start( _dragDelay, this ); } else resetDrag(); - } else if( QPoint( mouseEvent->globalPos() - globalDragPoint_ ).manhattanLength() >= dragDistance_ ) - { dragTimer_.start( 0, this ); } + } else if( QPoint( mouseEvent->globalPos() - _globalDragPoint ).manhattanLength() >= _dragDistance ) + { _dragTimer.start( 0, this ); } return true; } else if( !useWMMoveResize() ) { // use QWidget::move for the grabbing /* this works only if the sending object and the target are identical */ - QWidget* window( target_.data()->window() ); - window->move( window->pos() + mouseEvent->pos() - dragPoint_ ); + QWidget* window( _target.data()->window() ); + window->move( window->pos() + mouseEvent->pos() - _dragPoint ); return true; } else return false; @@ -354,15 +355,19 @@ // check widget if( !widget ) return false; - // all accepted default types + // accepted default types if( ( qobject_cast<QDialog*>( widget ) && widget->isWindow() ) || ( qobject_cast<QMainWindow*>( widget ) && widget->isWindow() ) || - qobject_cast<QGroupBox*>( widget ) || - qobject_cast<QMenuBar*>( widget ) || + qobject_cast<QGroupBox*>( widget ) ) + { return true; } + + // more accepted types, provided they are not dock widget titles + if( ( qobject_cast<QMenuBar*>( widget ) || qobject_cast<QTabBar*>( widget ) || qobject_cast<QStatusBar*>( widget ) || - qobject_cast<QToolBar*>( widget ) ) + qobject_cast<QToolBar*>( widget ) ) && + !isDockWidgetTitle( widget ) ) { return true; } if( widget->inherits( "KScreenSaver" ) && widget->inherits( "KCModule" ) ) @@ -418,7 +423,7 @@ // list-based blacklisted widgets QString appName( qApp->applicationName() ); - foreach( const ExceptionId& id, blackList_ ) + foreach( const ExceptionId& id, _blackList ) { if( !id.appName().isEmpty() && id.appName() != appName ) continue; if( id.className() == "*" && !id.appName().isEmpty() ) @@ -439,7 +444,7 @@ { QString appName( qApp->applicationName() ); - foreach( const ExceptionId& id, whiteList_ ) + foreach( const ExceptionId& id, _whiteList ) { if( !id.appName().isEmpty() && id.appName() != appName ) continue; if( widget->inherits( id.className().toLatin1() ) ) return true; @@ -585,8 +590,8 @@ else if( itemView->selectionMode() != QAbstractItemView::NoSelection && itemView->selectionMode() != QAbstractItemView::SingleSelection && - itemView->model()->rowCount() ) return false; - else if( itemView->indexAt( position ).isValid() ) return false; + itemView->model() && itemView->model()->rowCount() ) return false; + else if( itemView->model() && itemView->indexAt( position ).isValid() ) return false; } } else if( ( itemView = qobject_cast<QAbstractItemView*>( widget->parentWidget() ) ) ) { @@ -619,19 +624,19 @@ void WindowManager::resetDrag( void ) { - if( (!useWMMoveResize() ) && target_ && cursorOverride_ ) { + if( (!useWMMoveResize() ) && _target && _cursorOverride ) { qApp->restoreOverrideCursor(); - cursorOverride_ = false; + _cursorOverride = false; } - target_.clear(); - if( dragTimer_.isActive() ) dragTimer_.stop(); - dragPoint_ = QPoint(); - globalDragPoint_ = QPoint(); - dragAboutToStart_ = false; - dragInProgress_ = false; + _target.clear(); + if( _dragTimer.isActive() ) _dragTimer.stop(); + _dragPoint = QPoint(); + _globalDragPoint = QPoint(); + _dragAboutToStart = false; + _dragInProgress = false; } @@ -677,14 +682,14 @@ if( !useWMMoveResize() ) { - if( !cursorOverride_ ) + if( !_cursorOverride ) { qApp->setOverrideCursor( Qt::SizeAllCursor ); - cursorOverride_ = true; + _cursorOverride = true; } } - dragInProgress_ = true; + _dragInProgress = true; return; @@ -703,6 +708,20 @@ } //____________________________________________________________ + bool WindowManager::isDockWidgetTitle( const QWidget* widget ) const + { + + if( !widget ) return false; + if( const QDockWidget* dockWidget = qobject_cast<const QDockWidget*>( widget->parent() ) ) + { + + return widget == dockWidget->titleBarWidget(); + + } else return false; + + } + + //____________________________________________________________ bool WindowManager::AppEventFilter::eventFilter( QObject* object, QEvent* event ) { @@ -710,23 +729,23 @@ { // stop drag timer - if( parent_->dragTimer_.isActive() ) - { parent_->resetDrag(); } + if( _parent->_dragTimer.isActive() ) + { _parent->resetDrag(); } // unlock - if( parent_->isLocked() ) - { parent_->setLocked( false ); } + if( _parent->isLocked() ) + { _parent->setLocked( false ); } } - if( !parent_->enabled() ) return false; + if( !_parent->enabled() ) return false; /* if a drag is in progress, the widget will not receive any event we trigger on the first MouseMove or MousePress events that are received by any widget in the application to detect that the drag is finished */ - if( parent_->useWMMoveResize() && parent_->dragInProgress_ && parent_->target_ && ( event->type() == QEvent::MouseMove || event->type() == QEvent::MouseButtonPress ) ) + if( _parent->useWMMoveResize() && _parent->_dragInProgress && _parent->_target && ( event->type() == QEvent::MouseMove || event->type() == QEvent::MouseButtonPress ) ) { return appMouseEvent( object, event ); } return false; @@ -740,14 +759,14 @@ Q_UNUSED( object ); // store target window (see later) - QWidget* window( parent_->target_.data()->window() ); + QWidget* window( _parent->_target.data()->window() ); /* post some mouseRelease event to the target, in order to counter balance the mouse press that triggered the drag. Note that it triggers a resetDrag */ - QMouseEvent mouseEvent( QEvent::MouseButtonRelease, parent_->dragPoint_, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier ); - qApp->sendEvent( parent_->target_.data(), &mouseEvent ); + QMouseEvent mouseEvent( QEvent::MouseButtonRelease, _parent->_dragPoint, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier ); + qApp->sendEvent( _parent->_target.data(), &mouseEvent ); if( event->type() == QEvent::MouseMove ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-KDE4-1.8.6/style/windowmanager.h new/QtCurve-KDE4-1.8.7/style/windowmanager.h --- old/QtCurve-KDE4-1.8.6/style/windowmanager.h 2011-03-15 22:47:04.000000000 +0100 +++ new/QtCurve-KDE4-1.8.7/style/windowmanager.h 2011-04-06 21:22:59.000000000 +0200 @@ -46,7 +46,7 @@ { #if QT_VERSION < 0x040600 class QtCPointer : public QObject - { +{ public: QtCPointer(QWidget *w=0L) : widget_(w) {} QtCPointer & operator=(QWidget *w); @@ -107,35 +107,35 @@ //! enable state bool enabled( void ) const - { return enabled_; } + { return _enabled; } //! enable state void setEnabled( bool value ) - { enabled_ = value; } + { _enabled = value; } //! returns true if window manager is used for moving bool useWMMoveResize( void ) const - { return supportWMMoveResize() && useWMMoveResize_; } + { return supportWMMoveResize() && _useWMMoveResize; } //! use window manager for moving, when available void setUseWMMoveResize( bool value ) - { useWMMoveResize_ = value; } + { _useWMMoveResize = value; } //! drag mode int dragMode( void ) const - { return dragMode_; } + { return _dragMode; } //! drag mode void setDragMode( int value ) - { dragMode_ = value; } + { _dragMode = value; } //! drag distance (pixels) void setDragDistance( int value ) - { dragDistance_ = value; } + { _dragDistance = value; } //! drag delay (msec) void setDragDelay( int value ) - { dragDelay_ = value; } + { _dragDelay = value; } //! set list of whiteListed widgets /*! @@ -179,36 +179,39 @@ /*! right now this is true only for X11 */ bool supportWMMoveResize( void ) const; + //! utility function + bool isDockWidgetTitle( const QWidget* ) const; + //!@name lock //@{ void setLocked( bool value ) - { locked_ = value; } + { _locked = value; } //! lock bool isLocked( void ) const - { return locked_; } + { return _locked; } //@} private: //! enability - bool enabled_; + bool _enabled; //! use WM moveResize - bool useWMMoveResize_; + bool _useWMMoveResize; //! drag mode - int dragMode_; + int _dragMode; //! drag distance /*! this is copied from kwin::geometry */ - int dragDistance_; + int _dragDistance; //! drag delay /*! this is copied from kwin::geometry */ - int dragDelay_; + int _dragDelay; //! wrapper for exception id class ExceptionId: public QPair<QString, QString> @@ -240,48 +243,47 @@ it is read from options and is used to adjust per-app window dragging issues */ - ExceptionSet whiteList_; + ExceptionSet _whiteList; //! list of black listed special widgets /*! it is read from options and is used to adjust per-app window dragging issues */ - ExceptionSet blackList_; + ExceptionSet _blackList; //! drag point - QPoint dragPoint_; - QPoint globalDragPoint_; + QPoint _dragPoint; + QPoint _globalDragPoint; //! drag timer - QBasicTimer dragTimer_; - + QBasicTimer _dragTimer; //! target being dragged /*! QWeakPointer is used in case the target gets deleted while drag is in progress */ #if QT_VERSION < 0x040600 - QtCPointer target_; + QtCPointer _target; #else - QWeakPointer<QWidget> target_; + QWeakPointer<QWidget> _target; #endif //! true if drag is about to start - bool dragAboutToStart_; + bool _dragAboutToStart; //! true if drag is in progress - bool dragInProgress_; + bool _dragInProgress; //! true if drag is locked - bool locked_; + bool _locked; //! cursor override /*! used to keep track of application cursor being overridden when dragging in non-WM mode */ - bool cursorOverride_; + bool _cursorOverride; //! provide application-wise event filter /*! it us used to unlock dragging and make sure event look is properly restored - after a drag has occured + after a drag has occurred */ class AppEventFilter: public QObject { @@ -291,7 +293,7 @@ //! constructor AppEventFilter( WindowManager* parent ): QObject( parent ), - parent_( parent ) + _parent( parent ) {} //! event filter @@ -306,12 +308,12 @@ private: //! parent - WindowManager* parent_; + WindowManager* _parent; }; //! application event filter - AppEventFilter* appEventFilter_; + AppEventFilter* _appEventFilter; //! allow access of all private members to the app event filter friend class AppEventFilter; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
