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

---
 kdvi/dviRenderer.cpp    | 6 +++---
 kdvi/infodialog.cpp     | 2 +-
 kdvi/kdvi_multipage.cpp | 2 +-
 kdvi/kdvi_multipage.h   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kdvi')

diff --git a/kdvi/dviRenderer.cpp b/kdvi/dviRenderer.cpp
index dfa4c678..36c6bd0e 100644
--- a/kdvi/dviRenderer.cpp
+++ b/kdvi/dviRenderer.cpp
@@ -254,8 +254,8 @@ void dviRenderer::showThatSourceInformationIsPresent()
   // here. Most of the code is stolen from there.
   
   // Check if the 'Don't show again' feature was used
-  KConfig *config = kapp->config();
-  KConfigGroupSaver saver( config, "Notification Messages" );
+  TDEConfig *config = kapp->config();
+  TDEConfigGroupSaver saver( config, "Notification Messages" );
   bool showMsg = config->readBoolEntry( "KDVI-info_on_source_specials", true);
   
   if (showMsg) {
@@ -294,7 +294,7 @@ void dviRenderer::showThatSourceInformationIsPresent()
     
     showMsg = !checkbox->isChecked();
     if (!showMsg) {
-      KConfigGroupSaver saver( config, "Notification Messages" );
+      TDEConfigGroupSaver saver( config, "Notification Messages" );
       config->writeEntry( "KDVI-info_on_source_specials", showMsg);
     }
     config->sync();
diff --git a/kdvi/infodialog.cpp b/kdvi/infodialog.cpp
index 74f15608..652f89fa 100644
--- a/kdvi/infodialog.cpp
+++ b/kdvi/infodialog.cpp
@@ -68,7 +68,7 @@ void infoDialog::setDVIData(dvifile *dviFile)
 
     TQFile file(dviFile->filename);
     if (file.exists())
-      text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").arg(i18n("File Size")).arg(KIO::convertSize(file.size())));
+      text.append(TQString("<tr><td><b>%1</b></td> <td>%2</td></tr>").arg(i18n("File Size")).arg(TDEIO::convertSize(file.size())));
     else
       text.append(TQString("<tr><td><b> </b></td> <td>%1</td></tr>").arg(i18n("The file does no longer exist.")));
 
diff --git a/kdvi/kdvi_multipage.cpp b/kdvi/kdvi_multipage.cpp
index b1c29b63..ca370a83 100644
--- a/kdvi/kdvi_multipage.cpp
+++ b/kdvi/kdvi_multipage.cpp
@@ -198,7 +198,7 @@ TQStringList KDVIMultiPage::fileFormats() const
 }
 
 
-void KDVIMultiPage::addConfigDialogs(KConfigDialog* configDialog)
+void KDVIMultiPage::addConfigDialogs(TDEConfigDialog* configDialog)
 {
   static optionDialogFontsWidget* fontConfigWidget = 0;
   
diff --git a/kdvi/kdvi_multipage.h b/kdvi/kdvi_multipage.h
index a6c033b9..dba4b3d2 100644
--- a/kdvi/kdvi_multipage.h
+++ b/kdvi/kdvi_multipage.h
@@ -32,7 +32,7 @@ public:
   /// method and return true here.
   virtual bool isReadWrite() {return true;}
 
-  virtual void addConfigDialogs(KConfigDialog* configDialog);
+  virtual void addConfigDialogs(TDEConfigDialog* configDialog);
 
   static TDEAboutData* createAboutData();
 
-- 
cgit v1.2.1