From 6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:45:52 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kolourpaint/kpdocumentsaveoptionswidget.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kolourpaint/kpdocumentsaveoptionswidget.cpp') diff --git a/kolourpaint/kpdocumentsaveoptionswidget.cpp b/kolourpaint/kpdocumentsaveoptionswidget.cpp index 219d65ca..b602494f 100644 --- a/kolourpaint/kpdocumentsaveoptionswidget.cpp +++ b/kolourpaint/kpdocumentsaveoptionswidget.cpp @@ -157,7 +157,7 @@ void kpDocumentSaveOptionsPreviewDialog::setFilePixmapAndSize (const TQPixmap &p const TQString alternateText6 = i18n ("%1B (%2%)"); const TQString alternateText7 = i18n ("%1B (approx. %2%)"); m_fileSizeLabel->setText (i18n ("%1 bytes (approx. %2%)") - .arg (KGlobal::locale ()->formatLong (m_fileSize)) + .arg (TDEGlobal::locale ()->formatLong (m_fileSize)) .arg (percent)); } @@ -742,7 +742,7 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes) this, TQT_SLOT (hidePreview ())); - KConfigGroupSaver cfgGroupSaver (KGlobal::config (), kpSettingsGroupPreviewSave); + KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupPreviewSave); KConfigBase *cfg = cfgGroupSaver.config (); if (cfg->hasKey (kpSettingPreviewSaveUpdateDelay)) @@ -769,7 +769,7 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes) #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET kdDebug () << "\tread cfg preview dialog last rel geometry" << endl; #endif - KConfigGroupSaver cfgGroupSaver (KGlobal::config (), kpSettingsGroupPreviewSave); + KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupPreviewSave); KConfigBase *cfg = cfgGroupSaver.config (); m_previewDialogLastRelativeGeometry = cfg->readRectEntry ( @@ -845,7 +845,7 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes) { m_updatePreviewDialogLastRelativeGeometryTimer->stop (); - KConfigGroupSaver cfgGroupSaver (KGlobal::config (), kpSettingsGroupPreviewSave); + KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupPreviewSave); KConfigBase *cfg = cfgGroupSaver.config (); cfg->writeEntry (kpSettingPreviewSaveGeometry, m_previewDialogLastRelativeGeometry); -- cgit v1.2.3