summaryrefslogtreecommitdiffstats
path: root/digikam/imageplugins/adjustcurves
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:18:54 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:18:54 -0600
commit85d50dfcd13d7cfb07afcbca2ed46a4b747640ea (patch)
tree62893006dbe753a2087a356bc37f1006b15e5b87 /digikam/imageplugins/adjustcurves
parenta92eb961725ae34e44cdee1312cad40b8f2cfb58 (diff)
downloaddigikam-85d50dfcd13d7cfb07afcbca2ed46a4b747640ea.tar.gz
digikam-85d50dfcd13d7cfb07afcbca2ed46a4b747640ea.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'digikam/imageplugins/adjustcurves')
-rw-r--r--digikam/imageplugins/adjustcurves/adjustcurves.cpp32
-rw-r--r--digikam/imageplugins/adjustcurves/adjustcurvestool.cpp32
2 files changed, 32 insertions, 32 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() )