From 0ea54195f4400f13a5cc109feee4b3779fbd2f0f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 01:05:57 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- kregexpeditor/CMakeLists.txt | 4 ++-- kregexpeditor/editorwindow.cpp | 2 +- kregexpeditor/verifybuttons.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'kregexpeditor') diff --git a/kregexpeditor/CMakeLists.txt b/kregexpeditor/CMakeLists.txt index 1ebb963..777fcaa 100644 --- a/kregexpeditor/CMakeLists.txt +++ b/kregexpeditor/CMakeLists.txt @@ -41,7 +41,7 @@ add_definitions( tde_add_executable( kregexpeditor AUTOMOC SOURCES main.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${BIN_INSTALL_DIR} LINK kregexpeditorcommon-shared ) @@ -77,7 +77,7 @@ tde_add_library( kregexpeditorcommon SHARED AUTOMOC emacsregexpconverter.cpp regexphighlighter.cpp util.cpp VERSION 1.0.0 - LINK kio-shared tdemultiformlistbox-static + LINK tdeio-shared tdemultiformlistbox-static kwidgetstreamer-static DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kregexpeditor/editorwindow.cpp b/kregexpeditor/editorwindow.cpp index 26b2559..e6a92e7 100644 --- a/kregexpeditor/editorwindow.cpp +++ b/kregexpeditor/editorwindow.cpp @@ -22,7 +22,7 @@ #else #include #include -// #include +// #include #include #include #include "editorwindow.moc" diff --git a/kregexpeditor/verifybuttons.cpp b/kregexpeditor/verifybuttons.cpp index 65e4735..ed47b7c 100644 --- a/kregexpeditor/verifybuttons.cpp +++ b/kregexpeditor/verifybuttons.cpp @@ -23,7 +23,7 @@ #include #include "verifybuttons.moc" #include -#include +#include #include #include #endif -- cgit v1.2.1