diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:45:52 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:45:52 -0600 |
| commit | 6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef (patch) | |
| tree | 44659d1cc0c37eb995e572bc1b979e75a74210fb /ksnapshot | |
| parent | e2385b701b464dc2259fcd5f3819c98f2c8c4438 (diff) | |
| download | tdegraphics-6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef.tar.gz tdegraphics-6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'ksnapshot')
| -rw-r--r-- | ksnapshot/ksnapshot.cpp | 6 | ||||
| -rw-r--r-- | ksnapshot/ksnapshot.h | 2 | ||||
| -rw-r--r-- | ksnapshot/regiongrabber.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ksnapshot/ksnapshot.cpp b/ksnapshot/ksnapshot.cpp index e5237351..a6e1abcb 100644 --- a/ksnapshot/ksnapshot.cpp +++ b/ksnapshot/ksnapshot.cpp @@ -94,7 +94,7 @@ KSnapshot::KSnapshot(TQWidget *parent, const char *name, bool grabCurrent) grabber->releaseMouse(); grabber->hide(); - KConfig *conf=KGlobal::config(); + KConfig *conf=TDEGlobal::config(); conf->setGroup("GENERAL"); mainWidget->setDelay(conf->readNumEntry("delay",0)); mainWidget->setMode( conf->readNumEntry( "mode", 0 ) ); @@ -110,7 +110,7 @@ KSnapshot::KSnapshot(TQWidget *parent, const char *name, bool grabCurrent) connect( &updateTimer, TQT_SIGNAL( timeout() ), TQT_TQOBJECT(this), TQT_SLOT( updatePreview() ) ); TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( updateCaption() ) ); - KHelpMenu *helpMenu = new KHelpMenu(this, KGlobal::instance()->aboutData(), false); + KHelpMenu *helpMenu = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false); TQPushButton *helpButton = actionButton( Help ); helpButton->setPopup(helpMenu->menu()); @@ -361,7 +361,7 @@ void KSnapshot::slotWindowGrabbed( const TQPixmap &pix ) void KSnapshot::closeEvent( TQCloseEvent * e ) { - KConfig *conf=KGlobal::config(); + KConfig *conf=TDEGlobal::config(); conf->setGroup("GENERAL"); conf->writeEntry("delay",mainWidget->delay()); conf->writeEntry("mode",mainWidget->mode()); diff --git a/ksnapshot/ksnapshot.h b/ksnapshot/ksnapshot.h index a0490c9f..4ccaaeb6 100644 --- a/ksnapshot/ksnapshot.h +++ b/ksnapshot/ksnapshot.h @@ -74,7 +74,7 @@ class KSnapshotPreview : public TQLabel void mouseMoveEvent(TQMouseEvent * e) { if (mClickPt != TQPoint(0, 0) && - (e->pos() - mClickPt).manhattanLength() > KGlobalSettings::dndEventDelay()) + (e->pos() - mClickPt).manhattanLength() > TDEGlobalSettings::dndEventDelay()) { mClickPt = TQPoint(0, 0); emit startDrag(); diff --git a/ksnapshot/regiongrabber.cpp b/ksnapshot/regiongrabber.cpp index 101f3ef6..9db7ed2f 100644 --- a/ksnapshot/regiongrabber.cpp +++ b/ksnapshot/regiongrabber.cpp @@ -57,7 +57,7 @@ void SizeTip::positionTip( const TQRect &rect ) if ( rect.intersects( tipRect ) ) { - TQRect deskR = KGlobalSettings::desktopGeometry( TQPoint( 0, 0 ) ); + TQRect deskR = TDEGlobalSettings::desktopGeometry( TQPoint( 0, 0 ) ); tipRect.moveCenter( TQPoint( deskR.width()/2, deskR.height()/2 ) ); if ( !rect.contains( tipRect, true ) && rect.intersects( tipRect ) ) |