From 85d50dfcd13d7cfb07afcbca2ed46a4b747640ea Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:18:54 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- digikam/utilities/imageeditor/canvas/undocache.cpp | 2 +- digikam/utilities/imageeditor/editor/editortoolsettings.cpp | 2 +- digikam/utilities/imageeditor/editor/editorwindow.cpp | 6 +++--- digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp | 8 ++++---- digikam/utilities/imageeditor/tools/imageprint.cpp | 2 +- digikam/utilities/imageeditor/tools/imageresize.cpp | 8 ++++---- 6 files changed, 14 insertions(+), 14 deletions(-) (limited to 'digikam/utilities/imageeditor') diff --git a/digikam/utilities/imageeditor/canvas/undocache.cpp b/digikam/utilities/imageeditor/canvas/undocache.cpp index 4323fca..b772be2 100644 --- a/digikam/utilities/imageeditor/canvas/undocache.cpp +++ b/digikam/utilities/imageeditor/canvas/undocache.cpp @@ -66,7 +66,7 @@ UndoCache::UndoCache() TQString cacheDir; cacheDir = locateLocal("cache", - KGlobal::instance()->aboutData()->programName() + '/'); + TDEGlobal::instance()->aboutData()->programName() + '/'); d->cachePrefix = TQString("%1undocache-%2") .arg(cacheDir) diff --git a/digikam/utilities/imageeditor/editor/editortoolsettings.cpp b/digikam/utilities/imageeditor/editor/editortoolsettings.cpp index f46759d..47a6a83 100644 --- a/digikam/utilities/imageeditor/editor/editortoolsettings.cpp +++ b/digikam/utilities/imageeditor/editor/editortoolsettings.cpp @@ -254,7 +254,7 @@ TQSize EditorToolSettings::minimumSizeHint() const // Do not touch vertical size hint. // Limit to 40% of the desktop width. TQSize hint = TQScrollView::minimumSizeHint(); - TQRect desktopRect = KGlobalSettings::desktopGeometry(d->mainVBox); + TQRect desktopRect = TDEGlobalSettings::desktopGeometry(d->mainVBox); hint.setWidth(TQMIN(d->mainVBox->minimumSizeHint().width(), desktopRect.width() * 2 / 5)); return hint; } diff --git a/digikam/utilities/imageeditor/editor/editorwindow.cpp b/digikam/utilities/imageeditor/editor/editorwindow.cpp index bfe6d90..8e90ec6 100644 --- a/digikam/utilities/imageeditor/editor/editorwindow.cpp +++ b/digikam/utilities/imageeditor/editor/editorwindow.cpp @@ -699,7 +699,7 @@ void EditorWindow::slotAboutToShowRedoMenu() void EditorWindow::slotConfToolbars() { - saveMainWindowSettings(KGlobal::config(), "ImageViewer Settings"); + saveMainWindowSettings(TDEGlobal::config(), "ImageViewer Settings"); KEditToolbar dlg(factory(), this); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), @@ -710,7 +710,7 @@ void EditorWindow::slotConfToolbars() void EditorWindow::slotNewToolbarConfig() { - applyMainWindowSettings(KGlobal::config(), "ImageViewer Settings"); + applyMainWindowSettings(TDEGlobal::config(), "ImageViewer Settings"); } void EditorWindow::slotIncreaseZoom() @@ -757,7 +757,7 @@ void EditorWindow::slotZoomSelected() void EditorWindow::slotZoomTextChanged(const TQString &txt) { bool r = false; - double zoom = KGlobal::locale()->readNumber(txt, &r) / 100.0; + double zoom = TDEGlobal::locale()->readNumber(txt, &r) / 100.0; if (r && zoom > 0.0) m_stackView->setZoomFactor(zoom); } diff --git a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp index 1981276..f2fb84a 100644 --- a/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp +++ b/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp @@ -197,16 +197,16 @@ RawSettingsBox::RawSettingsBox(const KURL& url, TQWidget *parent) TQPushButton *linHistoButton = new TQPushButton( d->scaleBG ); TQToolTip::add( linHistoButton, i18n( "

Linear" ) ); d->scaleBG->insert(linHistoButton, HistogramWidget::LinScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-lin", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); + TDEGlobal::dirs()->addResourceType("histogram-lin", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("histogram-lin", "histogram-lin.png"); linHistoButton->setPixmap( TQPixmap( directory + "histogram-lin.png" ) ); linHistoButton->setToggleButton(true); TQPushButton *logHistoButton = new TQPushButton( d->scaleBG ); TQToolTip::add( logHistoButton, i18n( "

Logarithmic" ) ); d->scaleBG->insert(logHistoButton, HistogramWidget::LogScaleHistogram); - KGlobal::dirs()->addResourceType("histogram-log", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); + TDEGlobal::dirs()->addResourceType("histogram-log", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("histogram-log", "histogram-log.png"); logHistoButton->setPixmap( TQPixmap( directory + "histogram-log.png" ) ); logHistoButton->setToggleButton(true); diff --git a/digikam/utilities/imageeditor/tools/imageprint.cpp b/digikam/utilities/imageeditor/tools/imageprint.cpp index ce22813..4b0cba0 100644 --- a/digikam/utilities/imageeditor/tools/imageprint.cpp +++ b/digikam/utilities/imageeditor/tools/imageprint.cpp @@ -149,7 +149,7 @@ bool ImagePrint::printImageWithTQt() p.begin( &m_printer ); TQPaintDeviceMetrics metrics( &m_printer ); - p.setFont( KGlobalSettings::generalFont() ); + p.setFont( TDEGlobalSettings::generalFont() ); TQFontMetrics fm = p.fontMetrics(); int w, h; // will be set to the width and height of the printer diff --git a/digikam/utilities/imageeditor/tools/imageresize.cpp b/digikam/utilities/imageeditor/tools/imageresize.cpp index 81b59ef..24ea5b6 100644 --- a/digikam/utilities/imageeditor/tools/imageresize.cpp +++ b/digikam/utilities/imageeditor/tools/imageresize.cpp @@ -212,9 +212,9 @@ ImageResize::ImageResize(TQWidget* parent) d->cimgLogoLabel = new KURLLabel(firstPage); d->cimgLogoLabel->setText(TQString()); d->cimgLogoLabel->setURL("http://cimg.sourceforge.net"); - KGlobal::dirs()->addResourceType("logo-cimg", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("logo-cimg", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); + TQString directory = TDEGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); d->cimgLogoLabel->setPixmap( TQPixmap( directory + "logo-cimg.png" ) ); TQToolTip::add(d->cimgLogoLabel, i18n("Visit CImg library website")); @@ -603,7 +603,7 @@ void ImageResize::customEvent(TQCustomEvent *event) void ImageResize::slotUser3() { - KURL loadBlowupFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadBlowupFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Photograph Resizing Settings File to Load")) ); if( loadBlowupFile.isEmpty() ) @@ -630,7 +630,7 @@ void ImageResize::slotUser3() void ImageResize::slotUser2() { - KURL saveBlowupFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveBlowupFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Photograph Resizing Settings File to Save")) ); if( saveBlowupFile.isEmpty() ) -- cgit v1.2.3