diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:16:20 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:16:20 -0600 |
| commit | dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5 (patch) | |
| tree | 4ebcd3dac0133d8d3fa880bbf83692c305b7350d /kcontrol/arts | |
| parent | 1a9478c6e1b77b05814af8fa02cd563a5da8946b (diff) | |
| download | tdebase-dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5.tar.gz tdebase-dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/arts')
| -rw-r--r-- | kcontrol/arts/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kcontrol/arts/Makefile.am | 2 | ||||
| -rw-r--r-- | kcontrol/arts/arts.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kcontrol/arts/CMakeLists.txt b/kcontrol/arts/CMakeLists.txt index 616b62070..aaf41edaa 100644 --- a/kcontrol/arts/CMakeLists.txt +++ b/kcontrol/arts/CMakeLists.txt @@ -29,6 +29,6 @@ install( FILES arts.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_kpart( kcm_arts AUTOMOC SOURCES arts.cpp generaltab.ui hardwaretab.ui krichtextlabel.cpp - LINK kio-shared kmid-shared + LINK kio-shared tdemid-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/arts/Makefile.am b/kcontrol/arts/Makefile.am index f4b68cfa1..3959f3109 100644 --- a/kcontrol/arts/Makefile.am +++ b/kcontrol/arts/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_arts.la kcm_arts_la_SOURCES = arts.cpp generaltab.ui hardwaretab.ui krichtextlabel.cpp kcm_arts_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_arts_la_LIBADD = $(LIB_KIO) $(LIB_KUTILS) -lkmid +kcm_arts_la_LIBADD = $(LIB_KIO) $(LIB_KUTILS) -ltdemid AM_CPPFLAGS = -I$(kde_includes)/arts $(all_includes) diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp index 86086cbd9..11002cb7f 100644 --- a/kcontrol/arts/arts.cpp +++ b/kcontrol/arts/arts.cpp @@ -48,7 +48,7 @@ #include <ksimpleconfig.h> #include <kstandarddirs.h> #include <kurlrequester.h> -#include <libkmid/deviceman.h> +#include <libtdemid/deviceman.h> #include "arts.h" @@ -158,7 +158,7 @@ KArtsModule::KArtsModule(TQWidget *parent, const char *name) general = new generalTab(tab); hardware = new hardwareTab(tab); //mixer = TDECModuleLoader::loadModule("kmixcfg", tab); - //midi = new KMidConfig(tab, "kmidconfig"); + //midi = new KMidConfig(tab, "tdemidconfig"); general->layout()->setMargin( KDialog::marginHint() ); hardware->layout()->setMargin( KDialog::marginHint() ); |