From 00b4f54142276b0e2272ca56e48558551ab7b2b0 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 26 Jan 2013 13:17:19 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 kpdf/CMakeLists.txt                       | 2 +-
 kpdf/core/generator_pdf/generator_pdf.cpp | 2 +-
 kpdf/part.cpp                             | 2 +-
 kpdf/part.h                               | 4 ++--
 kpdf/shell/CMakeLists.txt                 | 2 +-
 kpdf/shell/Makefile.am                    | 2 +-
 kpdf/shell/shell.cpp                      | 2 +-
 kpdf/shell/shell.h                        | 2 +-
 kpdf/ui/pageview.cpp                      | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'kpdf')

diff --git a/kpdf/CMakeLists.txt b/kpdf/CMakeLists.txt
index 5b76c014..ccef1e04 100644
--- a/kpdf/CMakeLists.txt
+++ b/kpdf/CMakeLists.txt
@@ -45,7 +45,7 @@ tde_add_kpart( libkpdfpart AUTOMOC
   LINK
     kpdfconf-static kpdfui-static kpdfcore-static generatorkimgio-static
     generatorpdf-static xpdf-static goo-static splash-static fofi-static
-    kutils-shared tdeprint-shared kparts-shared ${PAPER_LIBRARY} ${XFT_LIBRARIES}
+    tdeutils-shared tdeprint-shared tdeparts-shared ${PAPER_LIBRARY} ${XFT_LIBRARIES}
   DEPENDENCIES kpdfconf-static
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kpdf/core/generator_pdf/generator_pdf.cpp b/kpdf/core/generator_pdf/generator_pdf.cpp
index 2f1f857f..1f03d9c0 100644
--- a/kpdf/core/generator_pdf/generator_pdf.cpp
+++ b/kpdf/core/generator_pdf/generator_pdf.cpp
@@ -20,7 +20,7 @@
 #include <klistview.h>
 #include <klocale.h>
 #include <kpassdlg.h>
-#include <kwallet.h>
+#include <tdewallet.h>
 #include <kprinter.h>
 #include <ktempfile.h>
 #include <kmessagebox.h>
diff --git a/kpdf/part.cpp b/kpdf/part.cpp
index d20498fb..f36d6ce5 100644
--- a/kpdf/part.cpp
+++ b/kpdf/part.cpp
@@ -42,7 +42,7 @@
 #include <tdeprint/kprintdialogpage.h>
 #include <kstdaction.h>
 #include <tdeversion.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
 #include <kurldrag.h>
 #include <kfiledialog.h>
 #include <kmessagebox.h>
diff --git a/kpdf/part.h b/kpdf/part.h
index a7a65799..426c89f4 100644
--- a/kpdf/part.h
+++ b/kpdf/part.h
@@ -16,8 +16,8 @@
 #ifndef _KPDF_PART_H_
 #define _KPDF_PART_H_
 
-#include <kparts/browserextension.h>
-#include <kparts/part.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/part.h>
 #include <tqguardedptr.h>
 #include "core/document.h"
 #include "core/observer.h"
diff --git a/kpdf/shell/CMakeLists.txt b/kpdf/shell/CMakeLists.txt
index 59f84caa..74553840 100644
--- a/kpdf/shell/CMakeLists.txt
+++ b/kpdf/shell/CMakeLists.txt
@@ -31,6 +31,6 @@ install( FILES shell.rc DESTINATION ${DATA_INSTALL_DIR}/kpdf )
 
 tde_add_executable( kpdf AUTOMOC
   SOURCES main.cpp shell.cpp
-  LINK kparts-shared
+  LINK tdeparts-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kpdf/shell/Makefile.am b/kpdf/shell/Makefile.am
index ed901f6e..8ee058b4 100644
--- a/kpdf/shell/Makefile.am
+++ b/kpdf/shell/Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
 bin_PROGRAMS = kpdf
 
 kpdf_SOURCES = main.cpp shell.cpp
-kpdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kpdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kpdf_LDADD   = $(LIB_KPARTS)
 
 EXTRA_DIST = kpdf.desktop
diff --git a/kpdf/shell/shell.cpp b/kpdf/shell/shell.cpp
index ed0fc8fc..5491321e 100644
--- a/kpdf/shell/shell.cpp
+++ b/kpdf/shell/shell.cpp
@@ -31,7 +31,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmenubar.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kio/netaccess.h>
 #include <kmainwindowiface.h>
 
diff --git a/kpdf/shell/shell.h b/kpdf/shell/shell.h
index b6bbf499..6fc2a21e 100644
--- a/kpdf/shell/shell.h
+++ b/kpdf/shell/shell.h
@@ -20,7 +20,7 @@
 #include <config.h>
 #endif
 
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 
 namespace KPDF
 {
diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp
index cc40fdb2..7b4d0e75 100644
--- a/kpdf/ui/pageview.cpp
+++ b/kpdf/ui/pageview.cpp
@@ -650,7 +650,7 @@ void PageView::keyPressEvent( TQKeyEvent * e )
     if ( ( !d->mouseSelectionRect.isNull() && e->key() != TQt::Key_Escape ) || d->mouseMidStartY != -1 )
         return;
 
-    // handle 'find as you type' (based on khtml/khtmlview.cpp)
+    // handle 'find as you type' (based on tdehtml/tdehtmlview.cpp)
     if( d->typeAheadActive )
     {
         // backspace: remove a char and search or terminates search
-- 
cgit v1.2.3