From 3c5631f74d1c75204f950140331e10f739082ee9 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:33:36 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 kruler/klineal.cpp | 8 ++++----
 kruler/klineal.h   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kruler')

diff --git a/kruler/klineal.cpp b/kruler/klineal.cpp
index b539f6e9..7123fe04 100644
--- a/kruler/klineal.cpp
+++ b/kruler/klineal.cpp
@@ -94,7 +94,7 @@ KLineal::KLineal(TQWidget*parent,const char* name):KMainWindow(parent,name){
   mCurrentCursor = mNorthCursor;
   setMinimumSize(60,60);
   setMaximumSize(8000,8000);
-  KConfig *cfg = kapp->config();
+  TDEConfig *cfg = kapp->config();
   TQColor defaultColor = DEFAULT_RULER_COLOR;
   TQFont defaultFont(TDEGlobalSettings::generalFont().family(), 8);
   defaultFont.setPixelSize(8);
@@ -420,7 +420,7 @@ void KLineal::setColor(const TQColor &color) {
 * save the ruler color to the config file
 */
 void KLineal::saveSettings() {
-  KConfig *cfg = kapp->config(); // new KConfig(locateLocal("config", kapp->name()+"rc"));
+  TDEConfig *cfg = kapp->config(); // new TDEConfig(locateLocal("config", kapp->name()+"rc"));
   if (cfg) {
       TQColor color = mColor;
       cfg->setGroup(CFG_GROUP_SETTINGS);
@@ -747,14 +747,14 @@ void KLineal::paintEvent(TQPaintEvent * /*inEvent*/) {
   painter.end();
 }
 
-void KLineal::readProperties(KConfig *cfg) {
+void KLineal::readProperties(TDEConfig *cfg) {
     mOrientation = cfg->readNumEntry("Orientation", South);
     setupCursor();
     setupBackground();
     repaint();
 }
 
-void KLineal::saveProperties(KConfig* cfg) {
+void KLineal::saveProperties(TDEConfig* cfg) {
     cfg->writeEntry("Orientation", mOrientation);
 }
 
diff --git a/kruler/klineal.h b/kruler/klineal.h
index 31c948ae..b2622e0a 100644
--- a/kruler/klineal.h
+++ b/kruler/klineal.h
@@ -56,8 +56,8 @@ protected:
   void setupBackground();
 
   // session management
-  virtual void saveProperties( KConfig *config );
-  virtual void readProperties( KConfig *config );
+  virtual void saveProperties( TDEConfig *config );
+  virtual void readProperties( TDEConfig *config );
 
 private:
   void drawScale(TQPainter &painter);
-- 
cgit v1.2.1