summaryrefslogtreecommitdiffstats
path: root/digikam/utilities
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:18:54 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:18:54 -0600
commit85d50dfcd13d7cfb07afcbca2ed46a4b747640ea (patch)
tree62893006dbe753a2087a356bc37f1006b15e5b87 /digikam/utilities
parenta92eb961725ae34e44cdee1312cad40b8f2cfb58 (diff)
downloaddigikam-85d50dfcd13d7cfb07afcbca2ed46a4b747640ea.tar.gz
digikam-85d50dfcd13d7cfb07afcbca2ed46a4b747640ea.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'digikam/utilities')
-rw-r--r--digikam/utilities/cameragui/cameraui.cpp4
-rw-r--r--digikam/utilities/imageeditor/canvas/undocache.cpp2
-rw-r--r--digikam/utilities/imageeditor/editor/editortoolsettings.cpp2
-rw-r--r--digikam/utilities/imageeditor/editor/editorwindow.cpp6
-rw-r--r--digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp8
-rw-r--r--digikam/utilities/imageeditor/tools/imageprint.cpp2
-rw-r--r--digikam/utilities/imageeditor/tools/imageresize.cpp8
-rw-r--r--digikam/utilities/lighttable/lighttablebar.cpp8
-rw-r--r--digikam/utilities/lighttable/lighttablewindow.cpp4
-rw-r--r--digikam/utilities/setup/setupcamera.cpp4
-rw-r--r--digikam/utilities/setup/setupicc.cpp8
-rw-r--r--digikam/utilities/setup/setupmetadata.cpp4
-rw-r--r--digikam/utilities/slideshow/slideshow.cpp4
13 files changed, 32 insertions, 32 deletions
diff --git a/digikam/utilities/cameragui/cameraui.cpp b/digikam/utilities/cameragui/cameraui.cpp
index ab867f9..b9dfb4f 100644
--- a/digikam/utilities/cameragui/cameraui.cpp
+++ b/digikam/utilities/cameragui/cameraui.cpp
@@ -372,8 +372,8 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle,
pixmapLogo->setScaledContents( false );
pixmapLogo->setSizePolicy(TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum));
TQToolTip::add(pixmapLogo, i18n("Visit digiKam project website"));
- KGlobal::dirs()->addResourceType("logo-digikam", KGlobal::dirs()->kde_default("data") + "digikam/data");
- TQString directory = KGlobal::dirs()->findResourceDir("logo-digikam", "logo-digikam.png");
+ TDEGlobal::dirs()->addResourceType("logo-digikam", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
+ TQString directory = TDEGlobal::dirs()->findResourceDir("logo-digikam", "logo-digikam.png");
pixmapLogo->setPixmap( TQPixmap( directory + "logo-digikam.png" ) );
pixmapLogo->setFocusPolicy(TQ_NoFocus);
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( "<p>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( "<p>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() )
diff --git a/digikam/utilities/lighttable/lighttablebar.cpp b/digikam/utilities/lighttable/lighttablebar.cpp
index aab72dc..e271781 100644
--- a/digikam/utilities/lighttable/lighttablebar.cpp
+++ b/digikam/utilities/lighttable/lighttablebar.cpp
@@ -100,9 +100,9 @@ LightTableBar::LightTableBar(TQWidget* parent, int orientation, bool exifRotate)
// -- Load rating Pixmap ------------------------------------------
- KGlobal::dirs()->addResourceType("digikam_rating", KGlobal::dirs()->kde_default("data")
+ TDEGlobal::dirs()->addResourceType("digikam_rating", TDEGlobal::dirs()->kde_default("data")
+ "digikam/data");
- TQString ratingPixPath = KGlobal::dirs()->findResourceDir("digikam_rating", "rating.png");
+ TQString ratingPixPath = TDEGlobal::dirs()->findResourceDir("digikam_rating", "rating.png");
ratingPixPath += "/rating.png";
d->ratingPixmap = TQPixmap(ratingPixPath);
@@ -766,9 +766,9 @@ void LightTableBar::contentsDropEvent(TQDropEvent *e)
void LightTableBar::slotThemeChanged()
{
- KGlobal::dirs()->addResourceType("digikam_rating", KGlobal::dirs()->kde_default("data")
+ TDEGlobal::dirs()->addResourceType("digikam_rating", TDEGlobal::dirs()->kde_default("data")
+ "digikam/data");
- TQString ratingPixPath = KGlobal::dirs()->findResourceDir("digikam_rating", "rating.png");
+ TQString ratingPixPath = TDEGlobal::dirs()->findResourceDir("digikam_rating", "rating.png");
ratingPixPath += "/rating.png";
d->ratingPixmap = TQPixmap(ratingPixPath);
diff --git a/digikam/utilities/lighttable/lighttablewindow.cpp b/digikam/utilities/lighttable/lighttablewindow.cpp
index e7321fb..47f2abe 100644
--- a/digikam/utilities/lighttable/lighttablewindow.cpp
+++ b/digikam/utilities/lighttable/lighttablewindow.cpp
@@ -1508,7 +1508,7 @@ void LightTableWindow::slotEditKeys()
void LightTableWindow::slotConfToolbars()
{
- saveMainWindowSettings(KGlobal::config(), "LightTable Settings");
+ saveMainWindowSettings(TDEGlobal::config(), "LightTable Settings");
KEditToolbar dlg(factory(), this);
connect(&dlg, TQT_SIGNAL(newToolbarConfig()),
@@ -1519,7 +1519,7 @@ void LightTableWindow::slotConfToolbars()
void LightTableWindow::slotNewToolbarConfig()
{
- applyMainWindowSettings(KGlobal::config(), "LightTable Settings");
+ applyMainWindowSettings(TDEGlobal::config(), "LightTable Settings");
}
void LightTableWindow::slotSetup()
diff --git a/digikam/utilities/setup/setupcamera.cpp b/digikam/utilities/setup/setupcamera.cpp
index bb4963d..d2bfa84 100644
--- a/digikam/utilities/setup/setupcamera.cpp
+++ b/digikam/utilities/setup/setupcamera.cpp
@@ -116,8 +116,8 @@ SetupCamera::SetupCamera( TQWidget* parent )
KURLLabel *gphotoLogoLabel = new KURLLabel(this);
gphotoLogoLabel->setText(TQString());
gphotoLogoLabel->setURL("http://www.gphoto.org");
- KGlobal::dirs()->addResourceType("logo-gphoto", KGlobal::dirs()->kde_default("data") + "digikam/data");
- TQString directory = KGlobal::dirs()->findResourceDir("logo-gphoto", "logo-gphoto.png");
+ TDEGlobal::dirs()->addResourceType("logo-gphoto", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
+ TQString directory = TDEGlobal::dirs()->findResourceDir("logo-gphoto", "logo-gphoto.png");
gphotoLogoLabel->setPixmap( TQPixmap( directory + "logo-gphoto.png" ) );
TQToolTip::add(gphotoLogoLabel, i18n("Visit Gphoto project website"));
diff --git a/digikam/utilities/setup/setupicc.cpp b/digikam/utilities/setup/setupicc.cpp
index 0cdc4b3..0ee6857 100644
--- a/digikam/utilities/setup/setupicc.cpp
+++ b/digikam/utilities/setup/setupicc.cpp
@@ -165,8 +165,8 @@ SetupICC::SetupICC(TQWidget* parent, KDialogBase* dialog )
KURLLabel *lcmsLogoLabel = new KURLLabel(colorPolicy);
lcmsLogoLabel->setText(TQString());
lcmsLogoLabel->setURL("http://www.littlecms.com");
- KGlobal::dirs()->addResourceType("logo-lcms", KGlobal::dirs()->kde_default("data") + "digikam/data");
- TQString directory = KGlobal::dirs()->findResourceDir("logo-lcms", "logo-lcms.png");
+ TDEGlobal::dirs()->addResourceType("logo-lcms", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
+ TQString directory = TDEGlobal::dirs()->findResourceDir("logo-lcms", "logo-lcms.png");
lcmsLogoLabel->setPixmap( TQPixmap( directory + "logo-lcms.png" ) );
TQToolTip::add(lcmsLogoLabel, i18n("Visit Little CMS project website"));
@@ -493,8 +493,8 @@ void SetupICC::fillCombos(const TQString& path, bool report)
}
// Look the ICC color-space profile path include with digiKam dist.
- KGlobal::dirs()->addResourceType("profiles", KGlobal::dirs()->kde_default("data") + "digikam/profiles");
- TQString digiKamProfilesPath = KGlobal::dirs()->findResourceDir("profiles", "srgb.icm");
+ TDEGlobal::dirs()->addResourceType("profiles", TDEGlobal::dirs()->kde_default("data") + "digikam/profiles");
+ TQString digiKamProfilesPath = TDEGlobal::dirs()->findResourceDir("profiles", "srgb.icm");
TQDir digiKamProfilesDir(digiKamProfilesPath, "*.icc;*.icm", TQDir::Files);
const TQFileInfoList* digiKamFiles = digiKamProfilesDir.entryInfoList();
DDebug() << "Scanning ICC profiles included with digiKam: " << digiKamProfilesPath << endl;
diff --git a/digikam/utilities/setup/setupmetadata.cpp b/digikam/utilities/setup/setupmetadata.cpp
index fb1ba8c..251d72a 100644
--- a/digikam/utilities/setup/setupmetadata.cpp
+++ b/digikam/utilities/setup/setupmetadata.cpp
@@ -148,8 +148,8 @@ SetupMetadata::SetupMetadata(TQWidget* parent )
KURLLabel *exiv2LogoLabel = new KURLLabel(hbox);
exiv2LogoLabel->setText(TQString());
exiv2LogoLabel->setURL("http://www.exiv2.org");
- KGlobal::dirs()->addResourceType("logo-exiv2", KGlobal::dirs()->kde_default("data") + "digikam/data");
- TQString directory = KGlobal::dirs()->findResourceDir("logo-exiv2", "logo-exiv2.png");
+ TDEGlobal::dirs()->addResourceType("logo-exiv2", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
+ TQString directory = TDEGlobal::dirs()->findResourceDir("logo-exiv2", "logo-exiv2.png");
exiv2LogoLabel->setPixmap( TQPixmap( directory + "logo-exiv2.png" ) );
TQToolTip::add(exiv2LogoLabel, i18n("Visit Exiv2 project website"));
diff --git a/digikam/utilities/slideshow/slideshow.cpp b/digikam/utilities/slideshow/slideshow.cpp
index fe8cdce..19fa24b 100644
--- a/digikam/utilities/slideshow/slideshow.cpp
+++ b/digikam/utilities/slideshow/slideshow.cpp
@@ -104,7 +104,7 @@ SlideShow::SlideShow(const SlideShowSettings& settings)
// ---------------------------------------------------------------
#if KDE_IS_VERSION(3,2,0)
- TQRect deskRect = KGlobalSettings::desktopGeometry(this);
+ TQRect deskRect = TDEGlobalSettings::desktopGeometry(this);
d->deskX = deskRect.x();
d->deskY = deskRect.y();
d->deskWidth = deskRect.width();
@@ -407,7 +407,7 @@ void SlideShow::updatePixmap()
{
if (photoInfo.dateTime.isValid())
{
- str = KGlobal::locale()->formatDateTime(photoInfo.dateTime, true, true);
+ str = TDEGlobal::locale()->formatDateTime(photoInfo.dateTime, true, true);
printInfoText(p, offset, str);
}
}