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

---
 kviewshell/tdemultipage.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'kviewshell/tdemultipage.cpp')

diff --git a/kviewshell/tdemultipage.cpp b/kviewshell/tdemultipage.cpp
index d08dead7..0b2b83fd 100644
--- a/kviewshell/tdemultipage.cpp
+++ b/kviewshell/tdemultipage.cpp
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
@@ -20,7 +20,7 @@
 #include <tqvbox.h>
 
 #include "documentWidget.h"
-#include "marklist.h"
+#include "martdelist.h"
 #include "tableOfContents.h"
 #include "kprintDialogPage_pageoptions.h"
 #include "kvsprefs.h"
@@ -66,7 +66,7 @@ KMultiPage::KMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject
   connect(tableOfContents, TQT_SIGNAL(gotoPage(const Anchor&)), this, TQT_SLOT(gotoPage(const Anchor&)));
   
   // Create MarkList
-  _markList = new MarkList(sideBar, "marklist");
+  _markList = new MarkList(sideBar, "martdelist");
   sideBar->addItem(_markList, TQIconSet(SmallIcon("thumbnail")), i18n("Thumbnails"));
 
   // Restore state of the sidebar
@@ -898,7 +898,7 @@ void KMultiPage::updateWidgetSize(const PageNumber& pageNumber)
     }
   }
 
-  // Update marklist
+  // Update martdelist
   markList()->updateWidgetSize(pageNumber);
 }
 
-- 
cgit v1.2.3