diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:45:52 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:45:52 -0600 |
| commit | 6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef (patch) | |
| tree | 44659d1cc0c37eb995e572bc1b979e75a74210fb /kooka/kookaview.cpp | |
| parent | e2385b701b464dc2259fcd5f3819c98f2c8c4438 (diff) | |
| download | tdegraphics-6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef.tar.gz tdegraphics-6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kooka/kookaview.cpp')
| -rw-r--r-- | kooka/kookaview.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kooka/kookaview.cpp b/kooka/kookaview.cpp index 85a29d60..45f101f9 100644 --- a/kooka/kookaview.cpp +++ b/kooka/kookaview.cpp @@ -96,7 +96,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU m_mainWindow(parent), m_ocrResEdit(0) { - KIconLoader *loader = KGlobal::iconLoader(); + KIconLoader *loader = TDEGlobal::iconLoader(); scan_params = 0L; preview_canvas = 0L; @@ -294,7 +294,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU KookaView::~KookaView() { - saveProperties( KGlobal::config () ); + saveProperties( TDEGlobal::config () ); delete preview_canvas; kdDebug(28000)<< "Finished saving config data" << endl; @@ -438,7 +438,7 @@ void KookaView::loadStartupImage( void ) kdDebug( 28000) << "Starting to load startup image" << endl; /* Now set the configured stuff */ - KConfig *konf = KGlobal::config (); + KConfig *konf = TDEGlobal::config (); if( konf ) { konf->setGroup(GROUP_STARTUP); @@ -555,7 +555,7 @@ void KookaView::startOCR( KookaImage *img ) { if( ocrFabric == 0L ) { - ocrFabric = new KSANEOCR( m_mainDock, KGlobal::config() ); + ocrFabric = new KSANEOCR( m_mainDock, TDEGlobal::config() ); ocrFabric->setImageCanvas( img_canvas ); connect( ocrFabric, TQT_SIGNAL( newOCRResultText( const TQString& )), |