From 5b8ab149469c8e186ee8b05d90c0103ae722dd85 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:23:24 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 kchart/csvimportdialog.cc                  | 6 +++---
 kchart/kchartBackgroundPixmapConfigPage.cc | 4 ++--
 kchart/kchart_part.cc                      | 4 ++--
 kchart/kchart_view.cc                      | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'kchart')

diff --git a/kchart/csvimportdialog.cc b/kchart/csvimportdialog.cc
index 31b0ee3f..814dcc53 100644
--- a/kchart/csvimportdialog.cc
+++ b/kchart/csvimportdialog.cc
@@ -62,7 +62,7 @@ CSVImportDialog::CSVImportDialog(TQWidget* parent, TQByteArray& fileArray)
     TQStringList encodings;
     encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
     encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
-    encodings += KGlobal::charsets()->descriptiveEncodingNames();
+    encodings += TDEGlobal::charsets()->descriptiveEncodingNames();
     // Add a few non-standard encodings, which might be useful for text files
     const TQString description(i18n("Descriptive encoding name","Other ( %1 )"));
     encodings << description.arg("Apple Roman"); // Apple
@@ -589,7 +589,7 @@ void CSVImportDialog::ignoreDuplicatesChanged(int)
 
 TQTextCodec* CSVImportDialog::getCodec(void) const
 {
-    const TQString strCodec( KGlobal::charsets()->encodingForName( m_dialog->comboBoxEncoding->currentText() ) );
+    const TQString strCodec( TDEGlobal::charsets()->encodingForName( m_dialog->comboBoxEncoding->currentText() ) );
     kdDebug(30502) << "Encoding: " << strCodec << endl;
 
     bool ok = false;
@@ -602,7 +602,7 @@ TQTextCodec* CSVImportDialog::getCodec(void) const
     }
     else
     {
-        codec = KGlobal::charsets()->codecForName( strCodec, ok );
+        codec = TDEGlobal::charsets()->codecForName( strCodec, ok );
     }
 
     // Still nothing?
diff --git a/kchart/kchartBackgroundPixmapConfigPage.cc b/kchart/kchartBackgroundPixmapConfigPage.cc
index 33bba83e..39ca1aae 100644
--- a/kchart/kchartBackgroundPixmapConfigPage.cc
+++ b/kchart/kchartBackgroundPixmapConfigPage.cc
@@ -181,7 +181,7 @@ void KChartBackgroundPixmapConfigPage::loadWallpaperFilesList()
    TQMap<TQString, TQPair<TQString, TQString> > papers;
 
    //search for .desktop files before searching for images without .desktop files
-   TQStringList lst =  KGlobal::dirs()->findAllResources("wallpaper", "*desktop", false, true);
+   TQStringList lst =  TDEGlobal::dirs()->findAllResources("wallpaper", "*desktop", false, true);
    TQStringList files;
    for (TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it)
    {
@@ -219,7 +219,7 @@ void KChartBackgroundPixmapConfigPage::loadWallpaperFilesList()
    }
 
    //now find any wallpapers that don't have a .desktop file
-   lst =  KGlobal::dirs()->findAllResources("wallpaper", "*", false, true);
+   lst =  TDEGlobal::dirs()->findAllResources("wallpaper", "*", false, true);
    for (TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it)
    {
       if ( !(*it).endsWith(".desktop") && files.grep(*it).empty() ) {
diff --git a/kchart/kchart_part.cc b/kchart/kchart_part.cc
index fa34dc20..477c4e41 100644
--- a/kchart/kchart_part.cc
+++ b/kchart/kchart_part.cc
@@ -724,8 +724,8 @@ void KChartPart::setChartDefaults()
   yAxis = m_params->axisParams( KDChartAxisParams::AxisPosLeft );
 
   // decimal symbol and thousands separator
-  yAxis.setAxisLabelsRadix( KGlobal::locale()->decimalSymbol(),
-			    KGlobal::locale()->thousandsSeparator() );
+  yAxis.setAxisLabelsRadix( TDEGlobal::locale()->decimalSymbol(),
+			    TDEGlobal::locale()->thousandsSeparator() );
 
   m_params->setAxisParams( KDChartAxisParams::AxisPosLeft, yAxis );
 
diff --git a/kchart/kchart_view.cc b/kchart/kchart_view.cc
index b009e1ca..cb94050c 100644
--- a/kchart/kchart_view.cc
+++ b/kchart/kchart_view.cc
@@ -356,7 +356,7 @@ void KChartView::slotRepaint()
 void KChartView::saveConfig()
 {
     kdDebug(35001) << "Save config..." << endl;
-    ((KChartPart*)koDocument())->saveConfig( KGlobal::config() );
+    ((KChartPart*)koDocument())->saveConfig( TDEGlobal::config() );
 }
 
 
@@ -364,8 +364,8 @@ void KChartView::loadConfig()
 {
     kdDebug(35001) << "Load config..." << endl;
 
-    KGlobal::config()->reparseConfiguration();
-    ((KChartPart*)koDocument())->loadConfig( KGlobal::config() );
+    TDEGlobal::config()->reparseConfiguration();
+    ((KChartPart*)koDocument())->loadConfig( TDEGlobal::config() );
 
     updateGuiTypeOfChart();
     //refresh chart when you load config
-- 
cgit v1.2.1