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 | |
| 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')
41 files changed, 206 insertions, 206 deletions
diff --git a/digikam/imageplugins/adjustcurves/adjustcurves.cpp b/digikam/imageplugins/adjustcurves/adjustcurves.cpp index a39f8a75..57a601ee 100644 --- a/digikam/imageplugins/adjustcurves/adjustcurves.cpp +++ b/digikam/imageplugins/adjustcurves/adjustcurves.cpp @@ -153,16 +153,16 @@ AdjustCurveDialog::AdjustCurveDialog(TQWidget* parent) TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); m_scaleBG->insert(linHistoButton, Digikam::CurvesWidget::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::CurvesWidget::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); @@ -222,18 +222,18 @@ AdjustCurveDialog::AdjustCurveDialog(TQWidget* parent) m_curveType = new TQHButtonGroup(gboxSettings); m_curveFree = new TQPushButton(m_curveType); m_curveType->insert(m_curveFree, FreeDrawing); - KGlobal::dirs()->addResourceType("curvefree", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("curvefree", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("curvefree", "curvefree.png"); + directory = TDEGlobal::dirs()->findResourceDir("curvefree", "curvefree.png"); m_curveFree->setPixmap( TQPixmap( directory + "curvefree.png" ) ); m_curveFree->setToggleButton(true); TQToolTip::add( m_curveFree, i18n( "Curve free mode" ) ); TQWhatsThis::add( m_curveFree, i18n("<p>With this button, you can draw your curve free-hand with the mouse.")); m_curveSmooth = new TQPushButton(m_curveType); m_curveType->insert(m_curveSmooth, SmoothDrawing); - KGlobal::dirs()->addResourceType("curvemooth", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("curvemooth", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("curvemooth", "curvemooth.png"); + directory = TDEGlobal::dirs()->findResourceDir("curvemooth", "curvemooth.png"); m_curveSmooth->setPixmap( TQPixmap( directory + "curvemooth.png" ) ); m_curveSmooth->setToggleButton(true); TQToolTip::add( m_curveSmooth, i18n( "Curve smooth mode" ) ); @@ -247,9 +247,9 @@ AdjustCurveDialog::AdjustCurveDialog(TQWidget* parent) m_pickerColorButtonGroup = new TQHButtonGroup(gboxSettings); m_pickBlack = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickBlack, BlackTonal); - KGlobal::dirs()->addResourceType("color-picker-black", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("color-picker-black", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("color-picker-black", "color-picker-black.png"); + directory = TDEGlobal::dirs()->findResourceDir("color-picker-black", "color-picker-black.png"); m_pickBlack->setPixmap( TQPixmap( directory + "color-picker-black.png" ) ); m_pickBlack->setToggleButton(true); TQToolTip::add( m_pickBlack, i18n( "All channels shadow tone color picker" ) ); @@ -257,9 +257,9 @@ AdjustCurveDialog::AdjustCurveDialog(TQWidget* parent) "smooth curves point on Red, Green, Blue, and Luminosity channels.")); m_pickGray = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickGray, GrayTonal); - KGlobal::dirs()->addResourceType("color-picker-grey", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("color-picker-grey", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("color-picker-grey", "color-picker-grey.png"); + directory = TDEGlobal::dirs()->findResourceDir("color-picker-grey", "color-picker-grey.png"); m_pickGray->setPixmap( TQPixmap( directory + "color-picker-grey.png" ) ); m_pickGray->setToggleButton(true); TQToolTip::add( m_pickGray, i18n( "All channels middle tone color picker" ) ); @@ -267,9 +267,9 @@ AdjustCurveDialog::AdjustCurveDialog(TQWidget* parent) "smooth curves point on Red, Green, Blue, and Luminosity channels.")); m_pickWhite = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickWhite, WhiteTonal); - KGlobal::dirs()->addResourceType("color-picker-white", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("color-picker-white", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("color-picker-white", "color-picker-white.png"); + directory = TDEGlobal::dirs()->findResourceDir("color-picker-white", "color-picker-white.png"); m_pickWhite->setPixmap( TQPixmap( directory + "color-picker-white.png" ) ); m_pickWhite->setToggleButton(true); TQToolTip::add( m_pickWhite, i18n( "All channels highlight tone color picker" ) ); @@ -635,7 +635,7 @@ void AdjustCurveDialog::slotUser3() { KURL loadCurvesFile; - loadCurvesFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + loadCurvesFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Select Gimp Curves File to Load")) ); if( loadCurvesFile.isEmpty() ) @@ -657,7 +657,7 @@ void AdjustCurveDialog::slotUser2() { KURL saveCurvesFile; - saveCurvesFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + saveCurvesFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Gimp Curves File to Save")) ); if( saveCurvesFile.isEmpty() ) diff --git a/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp b/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp index cc92c831..51157233 100644 --- a/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp +++ b/digikam/imageplugins/adjustcurves/adjustcurvestool.cpp @@ -144,16 +144,16 @@ AdjustCurvesTool::AdjustCurvesTool(TQObject* parent) TQPushButton *linHistoButton = new TQPushButton( m_scaleBG ); TQToolTip::add( linHistoButton, i18n( "<p>Linear" ) ); m_scaleBG->insert(linHistoButton, CurvesWidget::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, CurvesWidget::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); @@ -209,18 +209,18 @@ AdjustCurvesTool::AdjustCurvesTool(TQObject* parent) m_curveType = new TQHButtonGroup(m_gboxSettings->plainPage()); m_curveFree = new TQPushButton(m_curveType); m_curveType->insert(m_curveFree, FreeDrawing); - KGlobal::dirs()->addResourceType("curvefree", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("curvefree", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("curvefree", "curvefree.png"); + directory = TDEGlobal::dirs()->findResourceDir("curvefree", "curvefree.png"); m_curveFree->setPixmap( TQPixmap( directory + "curvefree.png" ) ); m_curveFree->setToggleButton(true); TQToolTip::add( m_curveFree, i18n( "Curve free mode" ) ); TQWhatsThis::add( m_curveFree, i18n("<p>With this button, you can draw your curve free-hand with the mouse.")); m_curveSmooth = new TQPushButton(m_curveType); m_curveType->insert(m_curveSmooth, SmoothDrawing); - KGlobal::dirs()->addResourceType("curvemooth", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("curvemooth", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("curvemooth", "curvemooth.png"); + directory = TDEGlobal::dirs()->findResourceDir("curvemooth", "curvemooth.png"); m_curveSmooth->setPixmap( TQPixmap( directory + "curvemooth.png" ) ); m_curveSmooth->setToggleButton(true); TQToolTip::add( m_curveSmooth, i18n( "Curve smooth mode" ) ); @@ -234,9 +234,9 @@ AdjustCurvesTool::AdjustCurvesTool(TQObject* parent) m_pickerColorButtonGroup = new TQHButtonGroup(m_gboxSettings->plainPage()); m_pickBlack = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickBlack, BlackTonal); - KGlobal::dirs()->addResourceType("color-picker-black", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("color-picker-black", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("color-picker-black", "color-picker-black.png"); + directory = TDEGlobal::dirs()->findResourceDir("color-picker-black", "color-picker-black.png"); m_pickBlack->setPixmap( TQPixmap( directory + "color-picker-black.png" ) ); m_pickBlack->setToggleButton(true); TQToolTip::add( m_pickBlack, i18n( "All channels shadow tone color picker" ) ); @@ -244,9 +244,9 @@ AdjustCurvesTool::AdjustCurvesTool(TQObject* parent) "smooth curves point on Red, Green, Blue, and Luminosity channels.")); m_pickGray = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickGray, GrayTonal); - KGlobal::dirs()->addResourceType("color-picker-grey", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("color-picker-grey", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("color-picker-grey", "color-picker-grey.png"); + directory = TDEGlobal::dirs()->findResourceDir("color-picker-grey", "color-picker-grey.png"); m_pickGray->setPixmap( TQPixmap( directory + "color-picker-grey.png" ) ); m_pickGray->setToggleButton(true); TQToolTip::add( m_pickGray, i18n( "All channels middle tone color picker" ) ); @@ -254,9 +254,9 @@ AdjustCurvesTool::AdjustCurvesTool(TQObject* parent) "smooth curves point on Red, Green, Blue, and Luminosity channels.")); m_pickWhite = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickWhite, WhiteTonal); - KGlobal::dirs()->addResourceType("color-picker-white", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("color-picker-white", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("color-picker-white", "color-picker-white.png"); + directory = TDEGlobal::dirs()->findResourceDir("color-picker-white", "color-picker-white.png"); m_pickWhite->setPixmap( TQPixmap( directory + "color-picker-white.png" ) ); m_pickWhite->setToggleButton(true); TQToolTip::add( m_pickWhite, i18n( "All channels highlight tone color picker" ) ); @@ -619,7 +619,7 @@ void AdjustCurvesTool::slotLoadSettings() { KURL loadCurvesFile; - loadCurvesFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + loadCurvesFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("Select Gimp Curves File to Load")) ); if( loadCurvesFile.isEmpty() ) @@ -640,7 +640,7 @@ void AdjustCurvesTool::slotSaveAsSettings() { KURL saveCurvesFile; - saveCurvesFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + saveCurvesFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("Gimp Curves File to Save")) ); if( saveCurvesFile.isEmpty() ) diff --git a/digikam/imageplugins/adjustlevels/adjustlevels.cpp b/digikam/imageplugins/adjustlevels/adjustlevels.cpp index 8ffd3780..cca520c8 100644 --- a/digikam/imageplugins/adjustlevels/adjustlevels.cpp +++ b/digikam/imageplugins/adjustlevels/adjustlevels.cpp @@ -155,16 +155,16 @@ AdjustLevelDialog::AdjustLevelDialog(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,9 +256,9 @@ AdjustLevelDialog::AdjustLevelDialog(TQWidget* parent) m_pickerColorButtonGroup = new TQHButtonGroup(gboxSettings); m_pickBlack = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickBlack, BlackTonal); - KGlobal::dirs()->addResourceType("color-picker-black", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("color-picker-black", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("color-picker-black", "color-picker-black.png"); + directory = TDEGlobal::dirs()->findResourceDir("color-picker-black", "color-picker-black.png"); m_pickBlack->setPixmap( TQPixmap( directory + "color-picker-black.png" ) ); m_pickBlack->setToggleButton(true); TQToolTip::add( m_pickBlack, i18n( "All channels shadow tone color picker" ) ); @@ -266,9 +266,9 @@ AdjustLevelDialog::AdjustLevelDialog(TQWidget* parent) "levels input on Red, Green, Blue, and Luminosity channels.")); m_pickGray = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickGray, GrayTonal); - KGlobal::dirs()->addResourceType("color-picker-gray", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("color-picker-gray", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("color-picker-gray", "color-picker-gray.png"); + directory = TDEGlobal::dirs()->findResourceDir("color-picker-gray", "color-picker-gray.png"); m_pickGray->setPixmap( TQPixmap( directory + "color-picker-gray.png" ) ); m_pickGray->setToggleButton(true); TQToolTip::add( m_pickGray, i18n( "All channels middle tone color picker" ) ); @@ -276,9 +276,9 @@ AdjustLevelDialog::AdjustLevelDialog(TQWidget* parent) "levels input on Red, Green, Blue, and Luminosity channels.")); m_pickWhite = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickWhite, WhiteTonal); - KGlobal::dirs()->addResourceType("color-picker-white", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("color-picker-white", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("color-picker-white", "color-picker-white.png"); + directory = TDEGlobal::dirs()->findResourceDir("color-picker-white", "color-picker-white.png"); m_pickWhite->setPixmap( TQPixmap( directory + "color-picker-white.png" ) ); m_pickWhite->setToggleButton(true); TQToolTip::add( m_pickWhite, i18n( "All channels highlight tone color picker" ) ); @@ -768,7 +768,7 @@ void AdjustLevelDialog::slotUser3() { KURL loadLevelsFile; - loadLevelsFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + loadLevelsFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Select Gimp Levels File to Load")) ); if( loadLevelsFile.isEmpty() ) @@ -789,7 +789,7 @@ void AdjustLevelDialog::slotUser2() { KURL saveLevelsFile; - saveLevelsFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + saveLevelsFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Gimp Levels File to Save")) ); if( saveLevelsFile.isEmpty() ) diff --git a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp index aae7cc42..835ea942 100644 --- a/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp +++ b/digikam/imageplugins/adjustlevels/adjustlevelstool.cpp @@ -148,16 +148,16 @@ AdjustLevelsTool::AdjustLevelsTool(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); @@ -253,9 +253,9 @@ AdjustLevelsTool::AdjustLevelsTool(TQObject* parent) m_pickerColorButtonGroup = new TQHButtonGroup(m_gboxSettings->plainPage()); m_pickBlack = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickBlack, BlackTonal); - KGlobal::dirs()->addResourceType("color-picker-black", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("color-picker-black", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("color-picker-black", "color-picker-black.png"); + directory = TDEGlobal::dirs()->findResourceDir("color-picker-black", "color-picker-black.png"); m_pickBlack->setPixmap( TQPixmap( directory + "color-picker-black.png" ) ); m_pickBlack->setToggleButton(true); TQToolTip::add( m_pickBlack, i18n( "All channels shadow tone color picker" ) ); @@ -263,9 +263,9 @@ AdjustLevelsTool::AdjustLevelsTool(TQObject* parent) "levels input on Red, Green, Blue, and Luminosity channels.")); m_pickGray = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickGray, GrayTonal); - KGlobal::dirs()->addResourceType("color-picker-gray", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("color-picker-gray", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("color-picker-grey", "color-picker-grey.png"); + directory = TDEGlobal::dirs()->findResourceDir("color-picker-grey", "color-picker-grey.png"); m_pickGray->setPixmap( TQPixmap( directory + "color-picker-grey.png" ) ); m_pickGray->setToggleButton(true); TQToolTip::add( m_pickGray, i18n( "All channels middle tone color picker" ) ); @@ -273,9 +273,9 @@ AdjustLevelsTool::AdjustLevelsTool(TQObject* parent) "levels input on Red, Green, Blue, and Luminosity channels.")); m_pickWhite = new TQPushButton(m_pickerColorButtonGroup); m_pickerColorButtonGroup->insert(m_pickWhite, WhiteTonal); - KGlobal::dirs()->addResourceType("color-picker-white", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("color-picker-white", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("color-picker-white", "color-picker-white.png"); + directory = TDEGlobal::dirs()->findResourceDir("color-picker-white", "color-picker-white.png"); m_pickWhite->setPixmap( TQPixmap( directory + "color-picker-white.png" ) ); m_pickWhite->setToggleButton(true); TQToolTip::add( m_pickWhite, i18n( "All channels highlight tone color picker" ) ); @@ -751,7 +751,7 @@ void AdjustLevelsTool::slotLoadSettings() { KURL loadLevelsFile; - loadLevelsFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + loadLevelsFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("Select Gimp Levels File to Load")) ); if( loadLevelsFile.isEmpty() ) @@ -771,7 +771,7 @@ void AdjustLevelsTool::slotSaveAsSettings() { KURL saveLevelsFile; - saveLevelsFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + saveLevelsFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("Gimp Levels File to Save")) ); if( saveLevelsFile.isEmpty() ) diff --git a/digikam/imageplugins/border/bordertool.cpp b/digikam/imageplugins/border/bordertool.cpp index 42eeb1b2..2aee7f0e 100644 --- a/digikam/imageplugins/border/bordertool.cpp +++ b/digikam/imageplugins/border/bordertool.cpp @@ -646,9 +646,9 @@ TQString BorderTool::getBorderPath(int border) return TQString(); } - KGlobal::dirs()->addResourceType(pattern.ascii(), KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType(pattern.ascii(), TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - return (KGlobal::dirs()->findResourceDir(pattern.ascii(), pattern + ".png") + pattern + ".png" ); + return (TDEGlobal::dirs()->findResourceDir(pattern.ascii(), pattern + ".png") + pattern + ".png" ); } void BorderTool::slotPreserveAspectRatioToggled(bool b) diff --git a/digikam/imageplugins/border/imageeffect_border.cpp b/digikam/imageplugins/border/imageeffect_border.cpp index e1e841c7..75608065 100644 --- a/digikam/imageplugins/border/imageeffect_border.cpp +++ b/digikam/imageplugins/border/imageeffect_border.cpp @@ -644,9 +644,9 @@ TQString ImageEffect_Border::getBorderPath(int border) return TQString(); } - KGlobal::dirs()->addResourceType(pattern.ascii(), KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType(pattern.ascii(), TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - return (KGlobal::dirs()->findResourceDir(pattern.ascii(), pattern + ".png") + pattern + ".png" ); + return (TDEGlobal::dirs()->findResourceDir(pattern.ascii(), pattern + ".png") + pattern + ".png" ); } void ImageEffect_Border::slotPreserveAspectRatioToggled(bool b) diff --git a/digikam/imageplugins/channelmixer/channelmixer.cpp b/digikam/imageplugins/channelmixer/channelmixer.cpp index cf4b55ac..3a5ea7e4 100644 --- a/digikam/imageplugins/channelmixer/channelmixer.cpp +++ b/digikam/imageplugins/channelmixer/channelmixer.cpp @@ -147,16 +147,16 @@ ChannelMixerDialog::ChannelMixerDialog(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); @@ -626,7 +626,7 @@ void ChannelMixerDialog::slotUser3() int currentOutputChannel; bool monochrome; - loadGainsFileUrl = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + loadGainsFileUrl = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Select Gimp Gains Mixer File to Load")) ); if( loadGainsFileUrl.isEmpty() ) @@ -711,7 +711,7 @@ void ChannelMixerDialog::slotUser2() KURL saveGainsFileUrl; FILE *fp = 0L; - saveGainsFileUrl = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + saveGainsFileUrl = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Gimp Gains Mixer File to Save")) ); if( saveGainsFileUrl.isEmpty() ) diff --git a/digikam/imageplugins/channelmixer/channelmixertool.cpp b/digikam/imageplugins/channelmixer/channelmixertool.cpp index 0fe5cc5d..86598f07 100644 --- a/digikam/imageplugins/channelmixer/channelmixertool.cpp +++ b/digikam/imageplugins/channelmixer/channelmixertool.cpp @@ -141,16 +141,16 @@ ChannelMixerTool::ChannelMixerTool(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); @@ -618,7 +618,7 @@ void ChannelMixerTool::slotLoadSettings() int currentOutputChannel; bool monochrome; - loadGainsFileUrl = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + loadGainsFileUrl = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("Select Gimp Gains Mixer File to Load")) ); if( loadGainsFileUrl.isEmpty() ) @@ -702,7 +702,7 @@ void ChannelMixerTool::slotSaveAsSettings() KURL saveGainsFileUrl; FILE *fp = 0L; - saveGainsFileUrl = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + saveGainsFileUrl = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("Gimp Gains Mixer File to Save")) ); if( saveGainsFileUrl.isEmpty() ) diff --git a/digikam/imageplugins/colorfx/colorfxtool.cpp b/digikam/imageplugins/colorfx/colorfxtool.cpp index e4dc9858..c720aa9c 100644 --- a/digikam/imageplugins/colorfx/colorfxtool.cpp +++ b/digikam/imageplugins/colorfx/colorfxtool.cpp @@ -125,16 +125,16 @@ ColorFXTool::ColorFXTool(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/colorfx/imageeffect_colorfx.cpp b/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp index 839cdc3e..8b3a824c 100644 --- a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp +++ b/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp @@ -131,16 +131,16 @@ ImageEffect_ColorFX::ImageEffect_ColorFX(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/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() ) diff --git a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp index e508d856..99dee40a 100644 --- a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp +++ b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp @@ -167,8 +167,8 @@ ImageEffect_InPainting_Dialog::ImageEffect_InPainting_Dialog(TQWidget* parent) KURLLabel *cimgLogoLabel = new KURLLabel(firstPage); cimgLogoLabel->setText(TQString()); cimgLogoLabel->setURL("http://cimg.sourceforge.net"); - KGlobal::dirs()->addResourceType("logo-cimg", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); + TDEGlobal::dirs()->addResourceType("logo-cimg", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); cimgLogoLabel->setPixmap( TQPixmap( directory + "logo-cimg.png" ) ); TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website")); @@ -415,7 +415,7 @@ void ImageEffect_InPainting_Dialog::putFinalData(void) void ImageEffect_InPainting_Dialog::slotUser3() { - KURL loadInpaintingFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadInpaintingFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Photograph Inpainting Settings File to Load")) ); if( loadInpaintingFile.isEmpty() ) @@ -446,7 +446,7 @@ void ImageEffect_InPainting_Dialog::slotUser3() void ImageEffect_InPainting_Dialog::slotUser2() { - KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Photograph Inpainting Settings File to Save")) ); if( saveRestorationFile.isEmpty() ) diff --git a/digikam/imageplugins/inpainting/inpaintingtool.cpp b/digikam/imageplugins/inpainting/inpaintingtool.cpp index a9c29598..5eff3482 100644 --- a/digikam/imageplugins/inpainting/inpaintingtool.cpp +++ b/digikam/imageplugins/inpainting/inpaintingtool.cpp @@ -115,8 +115,8 @@ InPaintingTool::InPaintingTool(TQObject* parent) KURLLabel *cimgLogoLabel = new KURLLabel(firstPage); cimgLogoLabel->setText(TQString()); cimgLogoLabel->setURL("http://cimg.sourceforge.net"); - KGlobal::dirs()->addResourceType("logo-cimg", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); + TDEGlobal::dirs()->addResourceType("logo-cimg", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); cimgLogoLabel->setPixmap( TQPixmap( directory + "logo-cimg.png" ) ); TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website")); @@ -380,7 +380,7 @@ void InPaintingTool::putFinalData() void InPaintingTool::slotLoadSettings() { - KURL loadInpaintingFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadInpaintingFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("Photograph Inpainting Settings File to Load")) ); if( loadInpaintingFile.isEmpty() ) @@ -411,7 +411,7 @@ void InPaintingTool::slotLoadSettings() void InPaintingTool::slotSaveAsSettings() { - KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("Photograph Inpainting Settings File to Save")) ); if( saveRestorationFile.isEmpty() ) diff --git a/digikam/imageplugins/inserttext/fontchooserwidget.cpp b/digikam/imageplugins/inserttext/fontchooserwidget.cpp index bd6517ff..99077e28 100644 --- a/digikam/imageplugins/inserttext/fontchooserwidget.cpp +++ b/digikam/imageplugins/inserttext/fontchooserwidget.cpp @@ -294,13 +294,13 @@ FontChooserWidget::FontChooserWidget(TQWidget *parent, const char *name, vbox->addWidget( xlfdEdit ); // lets initialize the display if possible - setFont( KGlobalSettings::generalFont(), usingFixed ); + setFont( TDEGlobalSettings::generalFont(), usingFixed ); // check or uncheck or gray out the "relative" checkbox if( sizeIsRelativeState && sizeIsRelativeCheckBox ) setSizeIsRelative( *sizeIsRelativeState ); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver(config, TQString::fromLatin1("General")); showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false)); } diff --git a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp index 92e6030f..b2c1c57d 100644 --- a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp +++ b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp @@ -477,7 +477,7 @@ void ImageEffect_NoiseReduction::putFinalData(void) void ImageEffect_NoiseReduction::slotUser3() { - KURL loadRestorationFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadRestorationFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Photograph Noise Reduction Settings File to Load")) ); if ( loadRestorationFile.isEmpty() ) @@ -519,7 +519,7 @@ void ImageEffect_NoiseReduction::slotUser3() void ImageEffect_NoiseReduction::slotUser2() { - KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Photograph Noise Reduction Settings File to Save")) ); if ( saveRestorationFile.isEmpty() ) diff --git a/digikam/imageplugins/noisereduction/noisereductiontool.cpp b/digikam/imageplugins/noisereduction/noisereductiontool.cpp index 008483f4..c2cea094 100644 --- a/digikam/imageplugins/noisereduction/noisereductiontool.cpp +++ b/digikam/imageplugins/noisereduction/noisereductiontool.cpp @@ -462,7 +462,7 @@ void NoiseReductionTool::putFinalData() void NoiseReductionTool::slotLoadSettings() { - KURL loadRestorationFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadRestorationFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("Photograph Noise Reduction Settings File to Load")) ); if ( loadRestorationFile.isEmpty() ) @@ -503,7 +503,7 @@ void NoiseReductionTool::slotLoadSettings() void NoiseReductionTool::slotSaveAsSettings() { - KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("Photograph Noise Reduction Settings File to Save")) ); if ( saveRestorationFile.isEmpty() ) diff --git a/digikam/imageplugins/restoration/imageeffect_restoration.cpp b/digikam/imageplugins/restoration/imageeffect_restoration.cpp index fc21b242..20855ca2 100644 --- a/digikam/imageplugins/restoration/imageeffect_restoration.cpp +++ b/digikam/imageplugins/restoration/imageeffect_restoration.cpp @@ -99,8 +99,8 @@ ImageEffect_Restoration::ImageEffect_Restoration(TQWidget* parent) KURLLabel *cimgLogoLabel = new KURLLabel(firstPage); cimgLogoLabel->setText(TQString()); cimgLogoLabel->setURL("http://cimg.sourceforge.net"); - KGlobal::dirs()->addResourceType("logo-cimg", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); + TDEGlobal::dirs()->addResourceType("logo-cimg", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); cimgLogoLabel->setPixmap( TQPixmap( directory + "logo-cimg.png" ) ); TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website")); @@ -296,7 +296,7 @@ void ImageEffect_Restoration::putFinalData(void) void ImageEffect_Restoration::slotUser3() { - KURL loadRestorationFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadRestorationFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Photograph Restoration Settings File to Load")) ); if( loadRestorationFile.isEmpty() ) @@ -329,7 +329,7 @@ void ImageEffect_Restoration::slotUser3() void ImageEffect_Restoration::slotUser2() { - KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("Photograph Restoration Settings File to Save")) ); if( saveRestorationFile.isEmpty() ) diff --git a/digikam/imageplugins/restoration/restorationtool.cpp b/digikam/imageplugins/restoration/restorationtool.cpp index 0967a36d..aca6e4a0 100644 --- a/digikam/imageplugins/restoration/restorationtool.cpp +++ b/digikam/imageplugins/restoration/restorationtool.cpp @@ -90,8 +90,8 @@ RestorationTool::RestorationTool(TQObject* parent) KURLLabel *cimgLogoLabel = new KURLLabel(firstPage); cimgLogoLabel->setText(TQString()); cimgLogoLabel->setURL("http://cimg.sourceforge.net"); - KGlobal::dirs()->addResourceType("logo-cimg", KGlobal::dirs()->kde_default("data") + "digikam/data"); - TQString directory = KGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); + TDEGlobal::dirs()->addResourceType("logo-cimg", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + TQString directory = TDEGlobal::dirs()->findResourceDir("logo-cimg", "logo-cimg.png"); cimgLogoLabel->setPixmap( TQPixmap( directory + "logo-cimg.png" ) ); TQToolTip::add(cimgLogoLabel, i18n("Visit CImg library website")); @@ -303,7 +303,7 @@ void RestorationTool::putFinalData() void RestorationTool::slotLoadSettings() { - KURL loadRestorationFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadRestorationFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("Photograph Restoration Settings File to Load")) ); if( loadRestorationFile.isEmpty() ) @@ -336,7 +336,7 @@ void RestorationTool::slotLoadSettings() void RestorationTool::slotSaveAsSettings() { - KURL saveRestorationFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("Photograph Restoration Settings File to Save")) ); if( saveRestorationFile.isEmpty() ) diff --git a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp index 24de4a66..99a485ed 100644 --- a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp +++ b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp @@ -213,7 +213,7 @@ void ImageEffect_SuperImpose::readUserSettings() { KConfig* config = kapp->config(); config->setGroup("Album Settings"); - KURL albumDBUrl( config->readPathEntry("Album Path", KGlobalSettings::documentPath()) ); + KURL albumDBUrl( config->readPathEntry("Album Path", TDEGlobalSettings::documentPath()) ); config->setGroup("superimpose Tool Dialog"); config->setGroup("Template Superimpose Tool Settings"); m_templatesRootUrl.setPath( config->readEntry("Templates Root URL", albumDBUrl.path()) ); diff --git a/digikam/imageplugins/superimpose/superimposetool.cpp b/digikam/imageplugins/superimpose/superimposetool.cpp index 7e1f8a76..37c8a82a 100644 --- a/digikam/imageplugins/superimpose/superimposetool.cpp +++ b/digikam/imageplugins/superimpose/superimposetool.cpp @@ -205,7 +205,7 @@ void SuperImposeTool::readSettings() { KConfig* config = kapp->config(); config->setGroup("Album Settings"); - KURL albumDBUrl( config->readPathEntry("Album Path", KGlobalSettings::documentPath()) ); + KURL albumDBUrl( config->readPathEntry("Album Path", TDEGlobalSettings::documentPath()) ); config->setGroup("superimpose Tool"); config->setGroup("Template Superimpose Tool Settings"); m_templatesRootUrl.setPath( config->readEntry("Templates Root URL", albumDBUrl.path()) ); diff --git a/digikam/imageplugins/texture/imageeffect_texture.cpp b/digikam/imageplugins/texture/imageeffect_texture.cpp index 19b582d4..6e77e822 100644 --- a/digikam/imageplugins/texture/imageeffect_texture.cpp +++ b/digikam/imageplugins/texture/imageeffect_texture.cpp @@ -282,9 +282,9 @@ TQString ImageEffect_Texture::getTexturePath(int texture) break; } - KGlobal::dirs()->addResourceType(pattern.ascii(), KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType(pattern.ascii(), TDEGlobal::dirs()->kde_default("data") + "digikam/data"); - return (KGlobal::dirs()->findResourceDir(pattern.ascii(), pattern + ".png") + pattern + ".png" ); + return (TDEGlobal::dirs()->findResourceDir(pattern.ascii(), pattern + ".png") + pattern + ".png" ); } } // NameSpace DigikamTextureImagesPlugin diff --git a/digikam/imageplugins/texture/texturetool.cpp b/digikam/imageplugins/texture/texturetool.cpp index 0548813f..d2b1b87a 100644 --- a/digikam/imageplugins/texture/texturetool.cpp +++ b/digikam/imageplugins/texture/texturetool.cpp @@ -287,8 +287,8 @@ TQString TextureTool::getTexturePath(int texture) break; } - KGlobal::dirs()->addResourceType(pattern.ascii(), KGlobal::dirs()->kde_default("data") + "digikam/data"); - return (KGlobal::dirs()->findResourceDir(pattern.ascii(), pattern + ".png") + pattern + ".png" ); + TDEGlobal::dirs()->addResourceType(pattern.ascii(), TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + return (TDEGlobal::dirs()->findResourceDir(pattern.ascii(), pattern + ".png") + pattern + ".png" ); } } // NameSpace DigikamTextureImagesPlugin diff --git a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp index d4c759b0..a335d982 100644 --- a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp +++ b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp @@ -148,16 +148,16 @@ ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(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); @@ -229,8 +229,8 @@ ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(TQWidget* parent) "<b>Daylight D65</b>: overcast sky light (6500K).<p>" "<b>None</b>: no preset value.")); m_pickTemperature = new TQPushButton(gboxSettings); - KGlobal::dirs()->addResourceType("color-picker-grey", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("color-picker-grey", "color-picker-grey.png"); + TDEGlobal::dirs()->addResourceType("color-picker-grey", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("color-picker-grey", "color-picker-grey.png"); m_pickTemperature->setPixmap( TQPixmap( directory + "color-picker-grey.png" ) ); m_pickTemperature->setToggleButton(true); TQToolTip::add( m_pickTemperature, i18n( "Temperature tone color picker." ) ); @@ -768,7 +768,7 @@ void ImageEffect_WhiteBalance::writeUserSettings() // Load all settings. void ImageEffect_WhiteBalance::slotUser3() { - KURL loadWhiteBalanceFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadWhiteBalanceFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("White Color Balance Settings File to Load")) ); if( loadWhiteBalanceFile.isEmpty() ) @@ -811,7 +811,7 @@ void ImageEffect_WhiteBalance::slotUser3() // Save all settings. void ImageEffect_WhiteBalance::slotUser2() { - KURL saveWhiteBalanceFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveWhiteBalanceFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), this, TQString( i18n("White Color Balance Settings File to Save")) ); if( saveWhiteBalanceFile.isEmpty() ) diff --git a/digikam/imageplugins/whitebalance/whitebalancetool.cpp b/digikam/imageplugins/whitebalance/whitebalancetool.cpp index 8cd70fa2..91a15320 100644 --- a/digikam/imageplugins/whitebalance/whitebalancetool.cpp +++ b/digikam/imageplugins/whitebalance/whitebalancetool.cpp @@ -144,16 +144,16 @@ WhiteBalanceTool::WhiteBalanceTool(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); @@ -228,8 +228,8 @@ WhiteBalanceTool::WhiteBalanceTool(TQObject* parent) "<b>Daylight D65</b>: overcast sky light (6500K).<p>" "<b>None</b>: no preset value.")); m_pickTemperature = new TQPushButton(m_gboxSettings->plainPage()); - KGlobal::dirs()->addResourceType("color-picker-grey", KGlobal::dirs()->kde_default("data") + "digikam/data"); - directory = KGlobal::dirs()->findResourceDir("color-picker-grey", "color-picker-grey.png"); + TDEGlobal::dirs()->addResourceType("color-picker-grey", TDEGlobal::dirs()->kde_default("data") + "digikam/data"); + directory = TDEGlobal::dirs()->findResourceDir("color-picker-grey", "color-picker-grey.png"); m_pickTemperature->setPixmap( TQPixmap( directory + "color-picker-grey.png" ) ); m_pickTemperature->setToggleButton(true); TQToolTip::add( m_pickTemperature, i18n( "Temperature tone color picker." ) ); @@ -778,7 +778,7 @@ void WhiteBalanceTool::writeSettings() void WhiteBalanceTool::slotLoadSettings() { - KURL loadWhiteBalanceFile = KFileDialog::getOpenURL(KGlobalSettings::documentPath(), + KURL loadWhiteBalanceFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("White Color Balance Settings File to Load")) ); if( loadWhiteBalanceFile.isEmpty() ) @@ -820,7 +820,7 @@ void WhiteBalanceTool::slotLoadSettings() void WhiteBalanceTool::slotSaveAsSettings() { - KURL saveWhiteBalanceFile = KFileDialog::getSaveURL(KGlobalSettings::documentPath(), + KURL saveWhiteBalanceFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(), TQString( "*" ), kapp->activeWindow(), TQString( i18n("White Color Balance Settings File to Save")) ); if( saveWhiteBalanceFile.isEmpty() ) |