diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:08:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:08:17 -0600 |
| commit | bc7dd1e9a7cfeef5970a295bd66b501b1fb3296c (patch) | |
| tree | ffb415bbd3e7501615307aab350b462cb0904ddd /src | |
| parent | 70a7a3094773362fb65043bdeb876375714f2547 (diff) | |
| download | k9copy-bc7dd1e9a7cfeef5970a295bd66b501b1fb3296c.tar.gz k9copy-bc7dd1e9a7cfeef5970a295bd66b501b1fb3296c.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/k9copy.cpp | 4 | ||||
| -rw-r--r-- | src/k9copy.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 4e49b22..e6cf850 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,12 +30,12 @@ k9copy_SOURCES = configDlg.ui images.h k9copy.cpp k9copy.png k9glwidget.cpp \ kconfigdlg.cpp kviewmpeg2.cpp kviewmpeg2.h langselectw.ui main.cpp mencoderCmdGen.ui \ playbackoptionsw.ui prefAuthor.ui prefDVD.ui prefMPEG4.ui prefMencoder.ui prefpreview.ui \ titlefactor.ui viewmpeg2.ui -k9copy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) +k9copy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS) k9copy_LDADD = $(top_builddir)/k9Mplayer/libk9mplayer.la \ $(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \ $(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \ $(top_builddir)/libdvdnav/libk9dvdnav.la $(top_builddir)/libk9copy/libk9copy.la \ - $(top_builddir)/dvdread/libdvdread.la $(LIB_TDEUI) -lkmdi $(LIBDL) + $(top_builddir)/dvdread/libdvdread.la $(LIB_TDEUI) -ltdemdi $(LIBDL) # this is where the desktop file will go shelldesktopdir = $(kde_appsdir)/Utilities diff --git a/src/k9copy.cpp b/src/k9copy.cpp index 8d0cc7a..cca96d5 100644 --- a/src/k9copy.cpp +++ b/src/k9copy.cpp @@ -21,8 +21,8 @@ #include <kaction.h> #include <kstdaction.h> #include <kdockwidget.h> -#include <kmdidefines.h> -#include <kmdichildarea.h> +#include <tdemdidefines.h> +#include <tdemdichildarea.h> #include <tqframe.h> #include <kkeydialog.h> #include <kedittoolbar.h> diff --git a/src/k9copy.h b/src/k9copy.h index c72bdda..4e33d8d 100644 --- a/src/k9copy.h +++ b/src/k9copy.h @@ -21,7 +21,7 @@ #include "k9common.h" #include "k9cddrive.h" #include <kapplication.h> -#include <kmdimainfrm.h> +#include <tdemdimainfrm.h> enum eStatusBarId {sbMessage=0,sbFactor=1}; |