summaryrefslogtreecommitdiffstats
path: root/interfaces
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-27 01:04:16 -0600
committerTimothy Pearson <[email protected]>2013-01-27 01:04:16 -0600
commit5159cd2beb2e87806a5b54e9991b7895285c9d3e (patch)
tree9b70e8be47a390f8f4d56ead812ab0c9dad88709 /interfaces
parentc17cb900dcf52b8bd6dc300d4f103392900ec2b4 (diff)
downloadtdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.tar.gz
tdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'interfaces')
-rw-r--r--interfaces/kio/CMakeLists.txt2
-rw-r--r--interfaces/kio/Makefile.am2
-rw-r--r--interfaces/kregexpeditor/Makefile.am2
-rw-r--r--interfaces/tdeimproxy/library/CMakeLists.txt4
-rw-r--r--interfaces/tdemediaplayer/CMakeLists.txt2
-rw-r--r--interfaces/tdemediaplayer/Makefile.am4
-rw-r--r--interfaces/tdemediaplayer/kfileaudiopreview/Makefile.am13
-rw-r--r--interfaces/tdemediaplayer/tdefileaudiopreview/CMakeLists.txt (renamed from interfaces/tdemediaplayer/kfileaudiopreview/CMakeLists.txt)12
-rw-r--r--interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am13
-rw-r--r--interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp (renamed from interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.cpp)12
-rw-r--r--interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h (renamed from interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.h)0
-rw-r--r--interfaces/tdescript/CMakeLists.txt6
-rw-r--r--interfaces/tdescript/Makefile.am2
-rw-r--r--interfaces/tdescript/sample/Makefile.am2
-rw-r--r--interfaces/tdescript/scriptloader.cpp2
-rw-r--r--interfaces/tdetexteditor/CMakeLists.txt4
-rw-r--r--interfaces/tdetexteditor/Makefile.am2
-rw-r--r--interfaces/tdetexteditor/configinterface.h2
-rw-r--r--interfaces/tdetexteditor/editorchooser.cpp2
19 files changed, 44 insertions, 44 deletions
diff --git a/interfaces/kio/CMakeLists.txt b/interfaces/kio/CMakeLists.txt
index efcecf65e..a8d8a2189 100644
--- a/interfaces/kio/CMakeLists.txt
+++ b/interfaces/kio/CMakeLists.txt
@@ -13,5 +13,5 @@
install( FILES
http.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kio )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/tdeio )
diff --git a/interfaces/kio/Makefile.am b/interfaces/kio/Makefile.am
index 8fad24200..daa98db05 100644
--- a/interfaces/kio/Makefile.am
+++ b/interfaces/kio/Makefile.am
@@ -1,3 +1,3 @@
-kioincludedir = $(includedir)/kio
+kioincludedir = $(includedir)/tdeio
kioinclude_HEADERS = http.h
diff --git a/interfaces/kregexpeditor/Makefile.am b/interfaces/kregexpeditor/Makefile.am
index 2007129da..4e8f5af2a 100644
--- a/interfaces/kregexpeditor/Makefile.am
+++ b/interfaces/kregexpeditor/Makefile.am
@@ -1,6 +1,6 @@
# $Id$
-INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir) $(all_includes)
include_HEADERS = kregexpeditorinterface.h
diff --git a/interfaces/tdeimproxy/library/CMakeLists.txt b/interfaces/tdeimproxy/library/CMakeLists.txt
index 9aa1f60ee..40974d722 100644
--- a/interfaces/tdeimproxy/library/CMakeLists.txt
+++ b/interfaces/tdeimproxy/library/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
- ${CMAKE_SOURCE_DIR}/kio/kio
+ ${CMAKE_SOURCE_DIR}/tdeio/tdeio
)
link_directories(
@@ -45,7 +45,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
VERSION 0.0.0
- LINK kio-shared
+ LINK tdeio-shared
DESTINATION ${LIB_INSTALL_DIR}
DEPENDENCIES dcopidl
)
diff --git a/interfaces/tdemediaplayer/CMakeLists.txt b/interfaces/tdemediaplayer/CMakeLists.txt
index 00ab7f3d9..0c9355560 100644
--- a/interfaces/tdemediaplayer/CMakeLists.txt
+++ b/interfaces/tdemediaplayer/CMakeLists.txt
@@ -10,7 +10,7 @@
#################################################
if( ARTS_FOUND )
- add_subdirectory( kfileaudiopreview )
+ add_subdirectory( tdefileaudiopreview )
endif( ARTS_FOUND )
include_directories(
diff --git a/interfaces/tdemediaplayer/Makefile.am b/interfaces/tdemediaplayer/Makefile.am
index 0b7aded07..91ed342bd 100644
--- a/interfaces/tdemediaplayer/Makefile.am
+++ b/interfaces/tdemediaplayer/Makefile.am
@@ -1,8 +1,8 @@
if include_ARTS
-kfileaudiopreview_subdir = kfileaudiopreview
+tdefileaudiopreview_subdir = tdefileaudiopreview
endif
-SUBDIRS = . $(kfileaudiopreview_subdir)
+SUBDIRS = . $(tdefileaudiopreview_subdir)
INCLUDES = -I$(srcdir)/.. $(all_includes)
lib_LTLIBRARIES = libtdemediaplayer.la
diff --git a/interfaces/tdemediaplayer/kfileaudiopreview/Makefile.am b/interfaces/tdemediaplayer/kfileaudiopreview/Makefile.am
deleted file mode 100644
index 4f88a0c87..000000000
--- a/interfaces/tdemediaplayer/kfileaudiopreview/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-INCLUDES = -I$(top_srcdir)/interfaces/ -I$(top_srcdir)/arts/kde -I$(includedir)/arts $(all_includes)
-METASOURCES = AUTO
-
-kde_module_LTLIBRARIES = kfileaudiopreview.la
-
-kfileaudiopreview_la_SOURCES = kfileaudiopreview.cpp
-kfileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
-kfileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/tdemediaplayer/libtdemediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
-
-noinst_HEADERS = kfileaudiopreview.h
-
-messages:
- $(XGETTEXT) $(kfileaudiopreview_la_SOURCES) -o $(podir)/kfileaudiopreview.pot
diff --git a/interfaces/tdemediaplayer/kfileaudiopreview/CMakeLists.txt b/interfaces/tdemediaplayer/tdefileaudiopreview/CMakeLists.txt
index 17485b65a..8e561e1f3 100644
--- a/interfaces/tdemediaplayer/kfileaudiopreview/CMakeLists.txt
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/CMakeLists.txt
@@ -19,9 +19,9 @@ include_directories(
${CMAKE_SOURCE_DIR}/interfaces
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
- ${CMAKE_SOURCE_DIR}/kio
- ${CMAKE_SOURCE_DIR}/kio/kio
- ${CMAKE_SOURCE_DIR}/kio/kfile
+ ${CMAKE_SOURCE_DIR}/tdeio
+ ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+ ${CMAKE_SOURCE_DIR}/tdeio/tdefile
${CMAKE_SOURCE_DIR}/arts/kde
)
@@ -31,12 +31,12 @@ link_directories(
)
-##### kfileaudiopreview #########################
+##### tdefileaudiopreview #########################
-set( target kfileaudiopreview )
+set( target tdefileaudiopreview )
set( ${target}_SRCS
- kfileaudiopreview.cpp
+ tdefileaudiopreview.cpp
)
tde_add_kpart( ${target} AUTOMOC
diff --git a/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am b/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am
new file mode 100644
index 000000000..d73cf545f
--- /dev/null
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am
@@ -0,0 +1,13 @@
+INCLUDES = -I$(top_srcdir)/interfaces/ -I$(top_srcdir)/arts/kde -I$(includedir)/arts $(all_includes)
+METASOURCES = AUTO
+
+kde_module_LTLIBRARIES = tdefileaudiopreview.la
+
+tdefileaudiopreview_la_SOURCES = tdefileaudiopreview.cpp
+tdefileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
+tdefileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/tdemediaplayer/libtdemediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE)
+
+noinst_HEADERS = tdefileaudiopreview.h
+
+messages:
+ $(XGETTEXT) $(tdefileaudiopreview_la_SOURCES) -o $(podir)/tdefileaudiopreview.pot
diff --git a/interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.cpp b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
index 1d83fc590..7dd746c4f 100644
--- a/interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
@@ -1,4 +1,4 @@
-#include "kfileaudiopreview.h"
+#include "tdefileaudiopreview.h"
#include <tqcheckbox.h>
#include <tqhbox.h>
@@ -6,7 +6,7 @@
#include <tqvgroupbox.h>
#include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klibloader.h>
#include <klocale.h>
#include <tdemediaplayer/player.h>
@@ -15,7 +15,7 @@
#include <kplayobjectfactory.h>
-#include <config-kfile.h>
+#include <config-tdefile.h>
class KFileAudioPreviewFactory : public KLibFactory
{
@@ -29,7 +29,7 @@ protected:
}
};
-K_EXPORT_COMPONENT_FACTORY( kfileaudiopreview, KFileAudioPreviewFactory )
+K_EXPORT_COMPONENT_FACTORY( tdefileaudiopreview, KFileAudioPreviewFactory )
///////////////////////////////////////////////////////////////////
@@ -56,7 +56,7 @@ public:
KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name )
: KPreviewWidgetBase( parent, name )
{
- TDEGlobal::locale()->insertCatalogue("kfileaudiopreview");
+ TDEGlobal::locale()->insertCatalogue("tdefileaudiopreview");
TQStringList formats = KDE::PlayObjectFactory::mimeTypes();
// ###
@@ -143,4 +143,4 @@ void KFileAudioPreview::toggleAuto( bool on )
void KFileAudioPreview::virtual_hook( int, void* )
{}
-#include "kfileaudiopreview.moc"
+#include "tdefileaudiopreview.moc"
diff --git a/interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.h b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h
index de48e4712..de48e4712 100644
--- a/interfaces/tdemediaplayer/kfileaudiopreview/kfileaudiopreview.h
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h
diff --git a/interfaces/tdescript/CMakeLists.txt b/interfaces/tdescript/CMakeLists.txt
index bcddb1068..6b57cdeb9 100644
--- a/interfaces/tdescript/CMakeLists.txt
+++ b/interfaces/tdescript/CMakeLists.txt
@@ -19,8 +19,8 @@ include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
- ${CMAKE_SOURCE_DIR}/kio
- ${CMAKE_SOURCE_DIR}/kio/kio
+ ${CMAKE_SOURCE_DIR}/tdeio
+ ${CMAKE_SOURCE_DIR}/tdeio/tdeio
)
link_directories(
@@ -51,6 +51,6 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
VERSION 0.0.0
- LINK kio-shared
+ LINK tdeio-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/interfaces/tdescript/Makefile.am b/interfaces/tdescript/Makefile.am
index 55d4cac35..03c7efc87 100644
--- a/interfaces/tdescript/Makefile.am
+++ b/interfaces/tdescript/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = . sample
-INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(all_includes)
#lib_LTLIBRARIES = libtdescriptloader.la libtdescript.la
lib_LTLIBRARIES = libtdescript.la
diff --git a/interfaces/tdescript/sample/Makefile.am b/interfaces/tdescript/sample/Makefile.am
index 77d39b28c..e20854c70 100644
--- a/interfaces/tdescript/sample/Makefile.am
+++ b/interfaces/tdescript/sample/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir)/interfaces -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/interfaces/tdescript $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir)/interfaces -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/interfaces/tdescript $(all_includes)
kde_module_LTLIBRARIES = libshellscript.la
diff --git a/interfaces/tdescript/scriptloader.cpp b/interfaces/tdescript/scriptloader.cpp
index 79fa2055a..1ff34f98a 100644
--- a/interfaces/tdescript/scriptloader.cpp
+++ b/interfaces/tdescript/scriptloader.cpp
@@ -23,7 +23,7 @@
#include <tdeparts/componentfactory.h>
#include <kglobal.h>
#include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdesktopfile.h>
#include <kstandarsdirs.h>
#include <kstdaccel.h>
diff --git a/interfaces/tdetexteditor/CMakeLists.txt b/interfaces/tdetexteditor/CMakeLists.txt
index a9d39edbb..0808a84f3 100644
--- a/interfaces/tdetexteditor/CMakeLists.txt
+++ b/interfaces/tdetexteditor/CMakeLists.txt
@@ -20,8 +20,8 @@ include_directories(
${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
- ${CMAKE_SOURCE_DIR}/kio
- ${CMAKE_SOURCE_DIR}/kio/kio
+ ${CMAKE_SOURCE_DIR}/tdeio
+ ${CMAKE_SOURCE_DIR}/tdeio/tdeio
${CMAKE_SOURCE_DIR}/kabc
${CMAKE_SOURCE_DIR}/interfaces
)
diff --git a/interfaces/tdetexteditor/Makefile.am b/interfaces/tdetexteditor/Makefile.am
index 5663bb761..fce0ec563 100644
--- a/interfaces/tdetexteditor/Makefile.am
+++ b/interfaces/tdetexteditor/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(top_srcdir)/interfaces -I$(top_builddir)/interfaces -I$(top_srcdir)/kabc -I$(top_builddir)/kabc $(all_includes)
+INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir) -I$(top_srcdir)/interfaces -I$(top_builddir)/interfaces -I$(top_srcdir)/kabc -I$(top_builddir)/kabc $(all_includes)
lib_LTLIBRARIES = libtdetexteditor.la
diff --git a/interfaces/tdetexteditor/configinterface.h b/interfaces/tdetexteditor/configinterface.h
index ed6a80d81..10a6173a0 100644
--- a/interfaces/tdetexteditor/configinterface.h
+++ b/interfaces/tdetexteditor/configinterface.h
@@ -57,7 +57,7 @@ class KTEXTEDITOR_EXPORT ConfigInterface
virtual void writeConfig () = 0;
/**
- Read/Write the config of the part to a given kconfig object
+ Read/Write the config of the part to a given tdeconfig object
to store the settings in a different place than the standard
*/
virtual void readConfig (TDEConfig *) = 0;
diff --git a/interfaces/tdetexteditor/editorchooser.cpp b/interfaces/tdetexteditor/editorchooser.cpp
index 807d342d0..ce493018d 100644
--- a/interfaces/tdetexteditor/editorchooser.cpp
+++ b/interfaces/tdetexteditor/editorchooser.cpp
@@ -3,7 +3,7 @@
#include <tqcombobox.h>
#include <ktrader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <tqstringlist.h>
#include <kservice.h>
#include <klocale.h>