diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:08:35 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:08:35 -0600 |
| commit | 167ec17df581b4b82fa8adf31a1468c376ecaa22 (patch) | |
| tree | 2532d76b368956b4649f6bf7d6194c757cc8193d /src | |
| parent | fcd2e26c0a9bcc7a26591344d971b9e0e1932ce6 (diff) | |
| download | kchmviewer-167ec17df581b4b82fa8adf31a1468c376ecaa22.tar.gz kchmviewer-167ec17df581b4b82fa8adf31a1468c376ecaa22.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'src')
| -rw-r--r-- | src/kchmviewwindowmgr.cpp | 2 | ||||
| -rw-r--r-- | src/kde-qt.h | 2 | ||||
| -rw-r--r-- | src/kde/Makefile.am | 4 | ||||
| -rw-r--r-- | src/kde/kchmviewwindow_tdehtmlpart.cpp (renamed from src/kde/kchmviewwindow_khtmlpart.cpp) | 6 | ||||
| -rw-r--r-- | src/kde/kchmviewwindow_tdehtmlpart.h (renamed from src/kde/kchmviewwindow_khtmlpart.h) | 0 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/kchmviewwindowmgr.cpp b/src/kchmviewwindowmgr.cpp index a59aa5a..5be3640 100644 --- a/src/kchmviewwindowmgr.cpp +++ b/src/kchmviewwindowmgr.cpp @@ -30,7 +30,7 @@ #include "kchmviewwindow_qtextbrowser.h" #if defined (USE_KDE) - #include "kde/kchmviewwindow_khtmlpart.h" + #include "kde/kchmviewwindow_tdehtmlpart.h" #endif diff --git a/src/kde-qt.h b/src/kde-qt.h index ac6b5d2..0d65253 100644 --- a/src/kde-qt.h +++ b/src/kde-qt.h @@ -37,7 +37,7 @@ #include <klocale.h> #include <klistview.h> #include <kfiledialog.h> - #include <khtml_part.h> + #include <tdehtml_part.h> #include <ktabwidget.h> #include <kpopupmenu.h> #include <kmessagebox.h> diff --git a/src/kde/Makefile.am b/src/kde/Makefile.am index e095be6..8524867 100644 --- a/src/kde/Makefile.am +++ b/src/kde/Makefile.am @@ -1,6 +1,6 @@ lib_LIBRARIES=libkdeextra.a -libkdeextra_a_SOURCES = kchmdcopiface.cpp kchmdcopiface.skel kchmviewwindow_khtmlpart.cpp -noinst_HEADERS = kchmdcopiface.h kchmviewwindow_khtmlpart.h +libkdeextra_a_SOURCES = kchmdcopiface.cpp kchmdcopiface.skel kchmviewwindow_tdehtmlpart.cpp +noinst_HEADERS = kchmdcopiface.h kchmviewwindow_tdehtmlpart.h INCLUDES = $(QT_INCLUDES) $(CHM_INCLUDES) $(KDE_INCLUDES) $(LIBCHMFILE_INCLUDES) diff --git a/src/kde/kchmviewwindow_khtmlpart.cpp b/src/kde/kchmviewwindow_tdehtmlpart.cpp index a2f02e1..4ad2538 100644 --- a/src/kde/kchmviewwindow_khtmlpart.cpp +++ b/src/kde/kchmviewwindow_tdehtmlpart.cpp @@ -21,15 +21,15 @@ #include <tqclipboard.h> -#include <khtmlview.h> +#include <tdehtmlview.h> #include <kfinddialog.h> #include "kde-qt.h" #include "kchmmainwindow.h" #include "kchmconfig.h" -#include "kchmviewwindow_khtmlpart.h" +#include "kchmviewwindow_tdehtmlpart.h" -#include "kchmviewwindow_khtmlpart.moc" +#include "kchmviewwindow_tdehtmlpart.moc" TQWidget * KCHMViewWindow_KHTMLPart::getTQWidget() diff --git a/src/kde/kchmviewwindow_khtmlpart.h b/src/kde/kchmviewwindow_tdehtmlpart.h index b840b44..b840b44 100644 --- a/src/kde/kchmviewwindow_khtmlpart.h +++ b/src/kde/kchmviewwindow_tdehtmlpart.h |