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

---
 src/Makefile.am       | 2 +-
 src/katemdi.h         | 4 ++--
 src/ktechlabkateui.rc | 2 +-
 src/ktechlabtextui.rc | 2 +-
 src/ktechlabui.rc     | 2 +-
 src/textview.cpp      | 6 +++---
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index 2200020..c386dc9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,7 @@ ktechlab_LDADD = $(top_builddir)/src/gui/libgui.la \
 	$(top_builddir)/src/mechanics/libmechanics.la $(top_builddir)/src/electronics/libelectronics.la \
 	$(top_builddir)/src/electronics/simulation/libelements.la $(top_builddir)/src/electronics/components/libcomponents.la \
 	$(top_builddir)/src/languages/liblanguages.la $(top_builddir)/src/drawparts/libdrawparts.la \
-	$(top_builddir)/src/core/libcore.la -lkutils -lktexteditor $(LIB_KFILE) $(LIB_TDEPRINT) $(LIB_QT) $(LIB_GPSIM)
+	$(top_builddir)/src/core/libcore.la -ltdeutils -ltdetexteditor $(LIB_KFILE) $(LIB_TDEPRINT) $(LIB_QT) $(LIB_GPSIM)
 
 # which sources should be compiled for ktechlab
 ktechlab_SOURCES = ktechlab.cpp node.cpp connector.cpp itemlibrary.cpp \
diff --git a/src/katemdi.h b/src/katemdi.h
index c17881e..7a74e65 100644
--- a/src/katemdi.h
+++ b/src/katemdi.h
@@ -21,9 +21,9 @@
 #ifndef __KATE_MDI_H__
 #define __KATE_MDI_H__
 
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 
-#include <kmultitabbar.h>
+#include <tdemultitabbar.h>
 
 #include <tqdict.h>
 #include <tqintdict.h>
diff --git a/src/ktechlabkateui.rc b/src/ktechlabkateui.rc
index 9d901f1..876baec 100644
--- a/src/ktechlabkateui.rc
+++ b/src/ktechlabkateui.rc
@@ -95,7 +95,7 @@
 		<Action name="bookmarks" group="bookmarks_merge"/>
 	</MenuBar>
 	
-	<!--<Menu name="ktexteditor_popup">
+	<!--<Menu name="tdetexteditor_popup">
 		<Action name="edit_undo" group="popup_operations" />
 		<Action name="edit_redo" group="popup_operations" />
 		<Separator group="popup_operations" />
diff --git a/src/ktechlabtextui.rc b/src/ktechlabtextui.rc
index 0c35801..8fa38a5 100644
--- a/src/ktechlabtextui.rc
+++ b/src/ktechlabtextui.rc
@@ -62,7 +62,7 @@
 		</Menu>
 	</MenuBar>
 	
-	<!--<Menu name="ktexteditor_popup">
+	<!--<Menu name="tdetexteditor_popup">
 		<Action name="edit_undo" group="popup_operations" />
 		<Action name="edit_redo" group="popup_operations" />
 		<Separator group="popup_operations" />
diff --git a/src/ktechlabui.rc b/src/ktechlabui.rc
index ade29e5..664126b 100644
--- a/src/ktechlabui.rc
+++ b/src/ktechlabui.rc
@@ -117,7 +117,7 @@
 		<ActionList name="component_actionlist"/>
 	</Menu>
 	
-	<Menu name="ktexteditor_popup">
+	<Menu name="tdetexteditor_popup">
 		<Action name="edit_undo" group="popup_operations" />
 		<Action name="edit_redo" group="popup_operations" />
 		<Separator group="popup_operations" />
diff --git a/src/textview.cpp b/src/textview.cpp
index 309ac6a..d6692c5 100644
--- a/src/textview.cpp
+++ b/src/textview.cpp
@@ -23,8 +23,8 @@
 #include "variablelabel.h"
 #include "viewiface.h"
 
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/texthintinterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/texthintinterface.h>
 
 // #include "kateview.h"
 #include <kdebug.h>
@@ -93,7 +93,7 @@ TextView::TextView( TextDocument * textDocument, ViewContainer *viewContainer, u
 	
 	m_statusBar->insertItem( "", ViewStatusBar::LineCol );
 	
-	m_view->installPopup( static_cast<TQPopupMenu*>( p_ktechlab->factory()->container( "ktexteditor_popup", p_ktechlab ) ) );
+	m_view->installPopup( static_cast<TQPopupMenu*>( p_ktechlab->factory()->container( "tdetexteditor_popup", p_ktechlab ) ) );
 		
 	connect( m_view, TQT_SIGNAL(cursorPositionChanged()),	this, TQT_SLOT(slotCursorPositionChanged()) );
 	connect( m_view, TQT_SIGNAL(gotFocus(Kate::View*)),		this, TQT_SLOT(setFocused()) );
-- 
cgit v1.2.3