diff options
author | gregory guy <g-gregory@gmx.fr> | 2019-06-28 15:14:51 +0200 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2021-03-12 00:35:39 +0100 |
commit | eea71ca9ecdfbd4682054a86cc9bbf954af94693 (patch) | |
tree | ec6ffbfad0861bf4195509dfb13845aa4bb17085 /kommander/widgets | |
parent | 14a52daecece82f3be90c37de2873eb368cbe415 (diff) | |
download | tdewebdev-eea71ca9ecdfbd4682054a86cc9bbf954af94693.tar.gz tdewebdev-eea71ca9ecdfbd4682054a86cc9bbf954af94693.zip |
Conversion to the cmake building system.
Delete empty files (dummy.cpp, xsldbgconfig.h).
Remove hard-coded path for the kmdr-executor executable.
Replaced $TQTDIR/doc/html string path for TQTDOCDIR in kommander.
Add man pages taken from the Debian packaging.
Signed-off-by: gregory guy <gregory-tde@laposte.net>
Fix linking - kxsldbgcommon-static and kimagemapeditorcommon-static needs to be embedded.
Move the linking of xml and readline libraries to the appropriate static libraries.
Add build option WITH_QUANTA_CVSSERVICE.
Add a test whether the readline can be linked standalone or whether ncurses is needed.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 4c43d1fbb66a296958ed1d0dbddf3f8ac4466130)
Diffstat (limited to 'kommander/widgets')
-rw-r--r-- | kommander/widgets/CMakeLists.txt | 49 | ||||
-rw-r--r-- | kommander/widgets/aboutdialog.cpp | 5 | ||||
-rw-r--r-- | kommander/widgets/aboutdialog.h | 2 | ||||
-rw-r--r-- | kommander/widgets/dialog.cpp | 11 | ||||
-rw-r--r-- | kommander/widgets/fontdialog.cpp | 5 | ||||
-rw-r--r-- | kommander/widgets/fontdialog.h | 2 | ||||
-rw-r--r-- | kommander/widgets/popupmenu.cpp | 5 | ||||
-rw-r--r-- | kommander/widgets/popupmenu.h | 2 | ||||
-rw-r--r-- | kommander/widgets/toolbox.cpp | 5 | ||||
-rw-r--r-- | kommander/widgets/toolbox.h | 3 |
10 files changed, 84 insertions, 5 deletions
diff --git a/kommander/widgets/CMakeLists.txt b/kommander/widgets/CMakeLists.txt new file mode 100644 index 00000000..d4bacb99 --- /dev/null +++ b/kommander/widgets/CMakeLists.txt @@ -0,0 +1,49 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/kommander/widget + ${CMAKE_SOURCE_DIR}/kommander/factory + ${CMAKE_SOURCE_DIR}/kommander/plugin + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kommanderwidgets (shared) + +tde_add_library( kommanderwidgets SHARED AUTOMOC + + SOURCES + aboutdialog.cpp buttongroup.cpp + checkbox.cpp closebutton.cpp + combobox.cpp datepicker.cpp dialog.cpp + execbutton.cpp fileselector.cpp + fontdialog.cpp groupbox.cpp + konsole.cpp label.cpp + lineedit.cpp listbox.cpp + pixmaplabel.cpp plugin.cpp + popupmenu.cpp progressbar.cpp + radiobutton.cpp richtexteditor.cpp + scriptobject.cpp slider.cpp + spinboxint.cpp statusbar.cpp + subdialog.cpp table.cpp + tabwidget.cpp textbrowser.cpp + textedit.cpp timer.cpp + toolbox.cpp treewidget.cpp + wizard.cpp + LINK + tdeio-shared + kommanderwidget-shared + kommanderplugin-shared + kommanderfactory-static + + DESTINATION ${LIB_INSTALL_DIR} + + VERSION 0.0.0 +) diff --git a/kommander/widgets/aboutdialog.cpp b/kommander/widgets/aboutdialog.cpp index a9a8f77f..db473520 100644 --- a/kommander/widgets/aboutdialog.cpp +++ b/kommander/widgets/aboutdialog.cpp @@ -9,6 +9,11 @@ // Copyright: See COPYING file that comes with this distribution // // + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <tqfile.h> #include "aboutdialog.h" diff --git a/kommander/widgets/aboutdialog.h b/kommander/widgets/aboutdialog.h index 440541c8..37dedec4 100644 --- a/kommander/widgets/aboutdialog.h +++ b/kommander/widgets/aboutdialog.h @@ -21,7 +21,7 @@ class TDEAboutData; /** @author Andras Mantia <amantia@kdewebdev.org> */ -class AboutDialog : public TQLabel, public KommanderWidget +class KDE_EXPORT AboutDialog : public TQLabel, public KommanderWidget { Q_OBJECT diff --git a/kommander/widgets/dialog.cpp b/kommander/widgets/dialog.cpp index 4f73cedc..242d4ba4 100644 --- a/kommander/widgets/dialog.cpp +++ b/kommander/widgets/dialog.cpp @@ -13,6 +13,15 @@ * (at your option) any later version. * * * ***************************************************************************/ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#ifndef KMDR_EXECUTOR_PATH +#define KMDR_EXECUTOR_PATH "/usr/bin/kmdr-executor" +#endif + /* KDE INCLUDES */ #include <tdelocale.h> @@ -50,7 +59,7 @@ Dialog::Dialog(TQWidget *a_parent, const char *a_name, bool a_modal, int a_flags setStates(states); setDisplayStates(states); m_useShebang = false; - m_shebang = "#!/usr/bin/kmdr-executor"; + m_shebang = "#!" KMDR_EXECUTOR_PATH; m_firstShow = true; KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(D_focusWidget, "focusWidget(TQString widget)", i18n("The name of the widget having focus"), 1); diff --git a/kommander/widgets/fontdialog.cpp b/kommander/widgets/fontdialog.cpp index 419fc8d2..59a1e372 100644 --- a/kommander/widgets/fontdialog.cpp +++ b/kommander/widgets/fontdialog.cpp @@ -9,6 +9,11 @@ // Copyright: See COPYING file that comes with this distribution // // + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "fontdialog.h" #include "kommanderplugin.h" diff --git a/kommander/widgets/fontdialog.h b/kommander/widgets/fontdialog.h index c9e9e7ba..375e6cea 100644 --- a/kommander/widgets/fontdialog.h +++ b/kommander/widgets/fontdialog.h @@ -20,7 +20,7 @@ /** @author Andras Mantia <amantia@kdewebdev.org> */ -class FontDialog : public TQLabel, public KommanderWidget +class KDE_EXPORT FontDialog : public TQLabel, public KommanderWidget { Q_OBJECT diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp index 343526ae..7a570dd3 100644 --- a/kommander/widgets/popupmenu.cpp +++ b/kommander/widgets/popupmenu.cpp @@ -9,6 +9,11 @@ // Copyright: See COPYING file that comes with this distribution // // + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "popupmenu.h" #include "specials.h" diff --git a/kommander/widgets/popupmenu.h b/kommander/widgets/popupmenu.h index 7d691ff0..4bf073b8 100644 --- a/kommander/widgets/popupmenu.h +++ b/kommander/widgets/popupmenu.h @@ -22,7 +22,7 @@ class TDEPopupMenu; /** @author Andras Mantia <amantia@kdewebdev.org> */ -class PopupMenu : public TQLabel, public KommanderWidget +class KDE_EXPORT PopupMenu : public TQLabel, public KommanderWidget { Q_OBJECT diff --git a/kommander/widgets/toolbox.cpp b/kommander/widgets/toolbox.cpp index 6dfc8b89..4df6b78e 100644 --- a/kommander/widgets/toolbox.cpp +++ b/kommander/widgets/toolbox.cpp @@ -9,6 +9,11 @@ // Copyright: See COPYING file that comes with this distribution // // + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "toolbox.h" #include "kommanderplugin.h" #include "specials.h" diff --git a/kommander/widgets/toolbox.h b/kommander/widgets/toolbox.h index 1d253c90..b1563c13 100644 --- a/kommander/widgets/toolbox.h +++ b/kommander/widgets/toolbox.h @@ -18,7 +18,8 @@ /** @author Andras Mantia <amantia@kdewebdev.org> */ -class ToolBox : public TQToolBox, public KommanderWidget + +class KDE_EXPORT ToolBox : public TQToolBox, public KommanderWidget { Q_OBJECT |