diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:18:54 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:18:54 -0600 |
| commit | 85d50dfcd13d7cfb07afcbca2ed46a4b747640ea (patch) | |
| tree | 62893006dbe753a2087a356bc37f1006b15e5b87 /digikam/imageplugins/coreplugin | |
| parent | a92eb961725ae34e44cdee1312cad40b8f2cfb58 (diff) | |
| download | digikam-85d50dfcd13d7cfb07afcbca2ed46a4b747640ea.tar.gz digikam-85d50dfcd13d7cfb07afcbca2ed46a4b747640ea.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'digikam/imageplugins/coreplugin')
18 files changed, 82 insertions, 82 deletions
diff --git a/digikam/imageplugins/coreplugin/autocorrectiontool.cpp b/digikam/imageplugins/coreplugin/autocorrectiontool.cpp index 1822f24c..e59cfaa9 100644 --- a/digikam/imageplugins/coreplugin/autocorrectiontool.cpp +++ b/digikam/imageplugins/coreplugin/autocorrectiontool.cpp @@ -125,16 +125,16 @@ AutoCorrectionTool::AutoCorrectionTool(TQObject* parent) TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); TQToolTip::add(linHistoButton, i18n("<p>Linear")); m_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(m_scaleBG); TQToolTip::add(logHistoButton, i18n("<p>Logarithmic")); m_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/imageplugins/coreplugin/bcgtool.cpp b/digikam/imageplugins/coreplugin/bcgtool.cpp index d696adb4..947057a6 100644 --- a/digikam/imageplugins/coreplugin/bcgtool.cpp +++ b/digikam/imageplugins/coreplugin/bcgtool.cpp @@ -124,16 +124,16 @@ BCGTool::BCGTool(TQObject* parent) TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); TQToolTip::add(linHistoButton, i18n("<p>Linear")); m_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(m_scaleBG); TQToolTip::add(logHistoButton, i18n("<p>Logarithmic")); m_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/imageplugins/coreplugin/bwsepiatool.cpp b/digikam/imageplugins/coreplugin/bwsepiatool.cpp index 0e00c079..54235710 100644 --- a/digikam/imageplugins/coreplugin/bwsepiatool.cpp +++ b/digikam/imageplugins/coreplugin/bwsepiatool.cpp @@ -215,16 +215,16 @@ BWSepiaTool::BWSepiaTool(TQObject* parent) TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); TQToolTip::add(linHistoButton, i18n("<p>Linear")); m_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(m_scaleBG); TQToolTip::add(logHistoButton, i18n("<p>Logarithmic")); m_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); @@ -1063,7 +1063,7 @@ void BWSepiaTool::blackAndWhiteConversion(uchar *data, int w, int h, bool sb, in void BWSepiaTool::slotLoadSettings() { - KURL loadFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("Black & White Settings File to Load")) ); if( loadFile.isEmpty() ) @@ -1139,7 +1139,7 @@ void BWSepiaTool::slotLoadSettings() void BWSepiaTool::slotSaveAsSettings() { - KURL saveFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("Black & White Settings File to Save"))); if( saveFile.isEmpty() ) diff --git a/digikam/imageplugins/coreplugin/hsl/hsltool.cpp b/digikam/imageplugins/coreplugin/hsl/hsltool.cpp index 6ab08bd2..a5f67217 100644 --- a/digikam/imageplugins/coreplugin/hsl/hsltool.cpp +++ b/digikam/imageplugins/coreplugin/hsl/hsltool.cpp @@ -128,16 +128,16 @@ HSLTool::HSLTool(TQObject* parent) TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); TQToolTip::add(linHistoButton, i18n("<p>Linear")); m_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(m_scaleBG); TQToolTip::add(logHistoButton, i18n("<p>Logarithmic")); m_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/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp index b33f96a2..c1955f46 100644 --- a/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp +++ b/digikam/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp @@ -111,16 +111,16 @@ ImageEffect_HSL::ImageEffect_HSL(TQWidget* parent) TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::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( m_scaleBG ); TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::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/imageplugins/coreplugin/iccprooftool.cpp b/digikam/imageplugins/coreplugin/iccprooftool.cpp index 58f88f57..421847e9 100644 --- a/digikam/imageplugins/coreplugin/iccprooftool.cpp +++ b/digikam/imageplugins/coreplugin/iccprooftool.cpp @@ -153,16 +153,16 @@ ICCProofTool::ICCProofTool(TQObject* parent) TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); TQToolTip::add(linHistoButton, i18n("<p>Linear")); m_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(m_scaleBG); TQToolTip::add(logHistoButton, i18n("<p>Logarithmic")); m_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); @@ -270,8 +270,8 @@ ICCProofTool::ICCProofTool(TQObject* parent) lcmsLogoLabel->setAlignment(AlignTop | AlignRight); lcmsLogoLabel->setText(TQString()); lcmsLogoLabel->setURL("http://www.littlecms.com"); - KGlobal::dirs()->addResourceType("logo-lcms", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("logo-lcms", "logo-lcms.png"); + TDEGlobal::dirs()->addResourceType("logo-lcms", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + 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")); @@ -537,7 +537,7 @@ ICCProofTool::~ICCProofTool() void ICCProofTool::readSettings() { - TQString defaultICCPath = KGlobalSettings::documentPath(); + TQString defaultICCPath = TDEGlobalSettings::documentPath(); KConfig* config = kapp->config(); // General settings of digiKam Color Management @@ -1186,7 +1186,7 @@ bool ICCProofTool::useDefaultProofProfile() void ICCProofTool::slotLoadSettings() { - KURL loadColorManagementFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadColorManagementFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString("*"), kapp->activeWindow(), TQString(i18n("Color Management Settings File to Load"))); if (loadColorManagementFile.isEmpty()) @@ -1263,7 +1263,7 @@ void ICCProofTool::slotLoadSettings() void ICCProofTool::slotSaveAsSettings() { - KURL saveColorManagementFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveColorManagementFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString(i18n("Color Management Settings File to Save"))); if (saveColorManagementFile.isEmpty()) diff --git a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp index d6fd9b84..f69e22d7 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_autocorrection.cpp @@ -118,16 +118,16 @@ ImageEffect_AutoCorrection::ImageEffect_AutoCorrection(TQWidget* parent) TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::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( m_scaleBG ); TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::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/imageplugins/coreplugin/imageeffect_bcg.cpp b/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp index 4e0d8003..de5240d8 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_bcg.cpp @@ -111,16 +111,16 @@ ImageEffect_BCG::ImageEffect_BCG(TQWidget* parent) TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::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( m_scaleBG ); TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::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/imageplugins/coreplugin/imageeffect_bwsepia.cpp b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp index 82028550..43064a8a 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp @@ -213,16 +213,16 @@ ImageEffect_BWSepia::ImageEffect_BWSepia(TQWidget* parent) TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::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( m_scaleBG ); TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::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); @@ -1069,7 +1069,7 @@ void ImageEffect_BWSepia::blackAndWhiteConversion(uchar *data, int w, int h, boo void ImageEffect_BWSepia::slotUser3() { - KURL loadFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Black & White Settings File to Load")) ); if( loadFile.isEmpty() ) @@ -1144,7 +1144,7 @@ void ImageEffect_BWSepia::slotUser3() void ImageEffect_BWSepia::slotUser2() { - KURL saveFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Black & White Settings File to Save")) ); if( saveFile.isEmpty() ) diff --git a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp index 366a3c63..29648a43 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp @@ -140,16 +140,16 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent) TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::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( m_scaleBG ); TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::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); @@ -256,8 +256,8 @@ ImageEffect_ICCProof::ImageEffect_ICCProof(TQWidget* parent) lcmsLogoLabel->setAlignment( AlignTop | AlignRight ); lcmsLogoLabel->setText(TQString()); lcmsLogoLabel->setURL("http://www.littlecms.com"); - KGlobal::dirs()->addResourceType("logo-lcms", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("logo-lcms", "logo-lcms.png"); + TDEGlobal::dirs()->addResourceType("logo-lcms", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + 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")); @@ -527,7 +527,7 @@ ImageEffect_ICCProof::~ImageEffect_ICCProof() void ImageEffect_ICCProof::readUserSettings() { - TQString defaultICCPath = KGlobalSettings::documentPath(); + TQString defaultICCPath = TDEGlobalSettings::documentPath(); KConfig* config = kapp->config(); // General settings of digiKam Color Management @@ -1162,7 +1162,7 @@ bool ImageEffect_ICCProof::useDefaultProofProfile() void ImageEffect_ICCProof::slotUser3() { - KURL loadColorManagementFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadColorManagementFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Color Management Settings File to Load")) ); if( loadColorManagementFile.isEmpty() ) @@ -1238,7 +1238,7 @@ void ImageEffect_ICCProof::slotUser3() void ImageEffect_ICCProof::slotUser2() { - KURL saveColorManagementFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveColorManagementFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Color Management Settings File to Save")) ); if( saveColorManagementFile.isEmpty() ) diff --git a/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp b/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp index a226c502..bc10ffac 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_redeye.cpp @@ -110,16 +110,16 @@ ImageEffect_RedEye::ImageEffect_RedEye(TQWidget* parent) TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::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( m_scaleBG ); TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::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/imageplugins/coreplugin/imageeffect_rgb.cpp b/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp index bac658dd..39dca76f 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_rgb.cpp @@ -109,16 +109,16 @@ ImageEffect_RGB::ImageEffect_RGB(TQWidget* parent) TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::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( m_scaleBG ); TQToolTip::add( logHistoButton, i18n( "<p>Logarithmic" ) ); m_scaleBG->insert(logHistoButton, Digikam::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/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp index e3cef1f3..954f49ad 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp +++ b/digikam/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp @@ -168,8 +168,8 @@ ImageEffect_RatioCrop::ImageEffect_RatioCrop(TQWidget* parent) m_imageSelectionWidget->getWidthStep(), true); m_centerWidth = new TQPushButton(cropSelection); - KGlobal::dirs()->addResourceType("centerwidth", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("centerwidth", "centerwidth.png"); + TDEGlobal::dirs()->addResourceType("centerwidth", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("centerwidth", "centerwidth.png"); m_centerWidth->setPixmap( TQPixmap( directory + "centerwidth.png" ) ); TQWhatsThis::add( m_centerWidth, i18n("<p>Set width position to center.")); @@ -192,8 +192,8 @@ ImageEffect_RatioCrop::ImageEffect_RatioCrop(TQWidget* parent) m_imageSelectionWidget->getHeightStep(), true); m_centerHeight = new TQPushButton(cropSelection); - KGlobal::dirs()->addResourceType("centerheight", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("centerheight", "centerheight.png"); + TDEGlobal::dirs()->addResourceType("centerheight", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("centerheight", "centerheight.png"); m_centerHeight->setPixmap( TQPixmap( directory + "centerheight.png" ) ); TQWhatsThis::add( m_centerHeight, i18n("<p>Set height position to center.")); diff --git a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp index 15c6789c..8c660bd6 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp +++ b/digikam/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp @@ -189,8 +189,8 @@ RatioCropTool::RatioCropTool(TQObject* parent) TQWhatsThis::add( m_widthInput, i18n("<p>Set here the width selection for cropping.")); m_centerWidth = new TQToolButton(cropSelection); - KGlobal::dirs()->addResourceType("centerwidth", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("centerwidth", "centerwidth.png"); + TDEGlobal::dirs()->addResourceType("centerwidth", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("centerwidth", "centerwidth.png"); m_centerWidth->setPixmap(TQPixmap(directory + "centerwidth.png")); TQWhatsThis::add(m_centerWidth, i18n("<p>Set width position to center.")); @@ -211,8 +211,8 @@ RatioCropTool::RatioCropTool(TQObject* parent) TQWhatsThis::add( m_heightInput, i18n("<p>Set here the height selection for cropping.")); m_centerHeight = new TQToolButton(cropSelection); - KGlobal::dirs()->addResourceType("centerheight", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("centerheight", "centerheight.png"); + TDEGlobal::dirs()->addResourceType("centerheight", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("centerheight", "centerheight.png"); m_centerHeight->setPixmap(TQPixmap(directory + "centerheight.png")); TQWhatsThis::add(m_centerHeight, i18n("<p>Set height position to center.")); diff --git a/digikam/imageplugins/coreplugin/redeyetool.cpp b/digikam/imageplugins/coreplugin/redeyetool.cpp index 4dfa4b5d..c5f59ed3 100644 --- a/digikam/imageplugins/coreplugin/redeyetool.cpp +++ b/digikam/imageplugins/coreplugin/redeyetool.cpp @@ -125,16 +125,16 @@ RedEyeTool::RedEyeTool(TQObject* parent) TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); TQToolTip::add(linHistoButton, i18n("<p>Linear")); m_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(m_scaleBG); TQToolTip::add(logHistoButton, i18n("<p>Logarithmic")); m_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/imageplugins/coreplugin/rgbtool.cpp b/digikam/imageplugins/coreplugin/rgbtool.cpp index bd3e6167..32d5803e 100644 --- a/digikam/imageplugins/coreplugin/rgbtool.cpp +++ b/digikam/imageplugins/coreplugin/rgbtool.cpp @@ -122,16 +122,16 @@ RGBTool::RGBTool(TQObject* parent) TQPushButton *linHistoButton = new TQPushButton(m_scaleBG); TQToolTip::add(linHistoButton, i18n("<p>Linear")); m_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(m_scaleBG); TQToolTip::add(logHistoButton, i18n("<p>Logarithmic")); m_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/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp index a8d26c9a..19e61a06 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp @@ -633,7 +633,7 @@ void ImageEffect_Sharpen::putFinalData(void) void ImageEffect_Sharpen::slotUser3() { - KURL loadRestorationFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadRestorationFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Photograph Refocus Settings File to Load")) ); if ( loadRestorationFile.isEmpty() ) @@ -669,7 +669,7 @@ void ImageEffect_Sharpen::slotUser3() void ImageEffect_Sharpen::slotUser2() { - KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Photograph Refocus Settings File to Save")) ); if ( saveRestorationFile.isEmpty() ) diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp b/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp index 63d571c7..e50594e4 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp @@ -678,7 +678,7 @@ void SharpenTool::putFinalData() void SharpenTool::slotLoadSettings() { - KURL loadRestorationFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadRestorationFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), TQT_TQWIDGET(kapp->activeWindow()), TQString( i18n("Photograph Refocus Settings File to Load")) ); if ( loadRestorationFile.isEmpty() ) @@ -714,7 +714,7 @@ void SharpenTool::slotLoadSettings() void SharpenTool::slotSaveAsSettings() { - KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), TQT_TQWIDGET(kapp->activeWindow()), TQString( i18n("Photograph Refocus Settings File to Save")) ); if ( saveRestorationFile.isEmpty() ) |
