diff options
| author | Slávek Banko <[email protected]> | 2019-05-02 01:32:05 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2019-05-02 01:32:19 +0200 |
| commit | 59c088d3aae47755abc5347446f8a9545029dfc8 (patch) | |
| tree | 9d65b1a0a7dab263ee0d7091485c629bfbf68911 /src | |
| parent | c2de969d25250c200e2e1143a8744b2776171f87 (diff) | |
| download | k9copy-59c088d3aae47755abc5347446f8a9545029dfc8.tar.gz k9copy-59c088d3aae47755abc5347446f8a9545029dfc8.zip | |
Fix FTBFS for build with --enable-final.
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit ced814784b055ce98204e74b54335f7a2f8ffe16)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/k9copy.cpp | 1 | ||||
| -rw-r--r-- | src/k9glwidget.cpp | 6 | ||||
| -rw-r--r-- | src/kviewmpeg2.cpp | 2 |
4 files changed, 10 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 9e22ef9..64116bf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,7 +23,7 @@ KDE_ICON = k9copy bin_PROGRAMS = k9copy # the application source, library search path, and link libraries -k9copy_SOURCES = configDlg.ui images.h k9copy.cpp k9copy.png k9glwidget.cpp \ +k9copy_SOURCES = configDlg.ui images.h k9copy.cpp k9glwidget.cpp \ k9langselect.cpp k9main.cpp k9mainw.ui k9mencodercmdgen.cpp k9mp4title.cpp k9play.cpp \ k9playbackoptions.cpp k9prefauthor.cpp k9prefdvd.cpp k9prefmencoder.cpp k9prefmpeg4.cpp \ k9prefpreview.cpp k9redirect.cpp k9settings.cpp k9titlefactor.cpp k9updatefactor.cpp \ diff --git a/src/k9copy.cpp b/src/k9copy.cpp index 76f77ac..b7ec0c0 100644 --- a/src/k9copy.cpp +++ b/src/k9copy.cpp @@ -527,3 +527,4 @@ void k9Copy::setEnabledCreateDVD(bool _state) { m_actions["create"]->setEnabled(_state); } +#include "k9copy.moc" diff --git a/src/k9glwidget.cpp b/src/k9glwidget.cpp index 2d536b1..d3e4d4e 100644 --- a/src/k9glwidget.cpp +++ b/src/k9glwidget.cpp @@ -19,6 +19,12 @@ #include <cstdlib> #include "ac.h" #include <X11/Xlib.h> +#if defined(Above) +#undef Above // defined in X.h, causes conflict with enum in tqslider.h +#endif +#if defined(Below) +#undef Below // defined in X.h, causes conflict with enum in tqslider.h +#endif k9GLWidget::k9GLWidget(TQWidget *parent, const char *name):TQGLWidget(parent, name) { XMapRaised(x11Display(),winId()); diff --git a/src/kviewmpeg2.cpp b/src/kviewmpeg2.cpp index 419d1eb..2433df3 100644 --- a/src/kviewmpeg2.cpp +++ b/src/kviewmpeg2.cpp @@ -227,3 +227,5 @@ void kViewMPEG2::closeEvent( TQCloseEvent* ce ) { void kViewMPEG2::sliderPressed() { lockSlider=true; } + +#include "kviewmpeg2.moc" |