From a5430e4b98efd05937bd3bfe78c56eb826f145fa Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:19:22 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 kcontrol/tdefontinst/viewpart/FontViewPart.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'kcontrol/tdefontinst/viewpart/FontViewPart.cpp')

diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
index a95c4e4e6..d04d1b3dc 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
@@ -49,7 +49,7 @@
 #include <kmessagebox.h>
 #include <knuminput.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinputdialog.h>
 #include <kdialog.h>
 #include <kprinter.h>
@@ -85,7 +85,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
     itsToolsFrame->setFrameShape(TQFrame::NoFrame);
     previewFrame->setFrameShadow(kcm ? TQFrame::Sunken : TQFrame::Raised);
     previewFrame->setFrameShape(TQFrame::Panel);
-    setInstance(new TDEInstance("kfontview"));
+    setInstance(new TDEInstance("tdefontview"));
 
     itsPreview=new CFontPreview(previewFrame, "FontViewPart::Preview");
     itsPreview->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
@@ -113,7 +113,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
     itsPrintAction=KStdAction::print(this, TQT_SLOT(print()), actionCollection(), "print");
     itsPrintAction->setEnabled(false);
 
-    setXMLFile("kfontviewpart.rc");
+    setXMLFile("tdefontviewpart.rc");
     setWidget(itsFrame);
 }
 
-- 
cgit v1.2.3