From 59bf3e99b0e84a0c5c58951b169b1f993e24cc51 Mon Sep 17 00:00:00 2001 From: gregory guy Date: Mon, 10 Dec 2018 14:00:25 +0100 Subject: [PATCH] conversion to the cmake building system Signed-off-by: gregory guy (cherry picked from commit ff65124f320219e7947b4db6e6613856941c2852) --- CMakeLists.txt | 78 ++++++++++++ ConfigureChecks.cmake | 56 +++++++++ config.h.cmake | 8 ++ doc/CMakeLists.txt | 1 + doc/de/CMakeLists.txt | 1 + doc/en/CMakeLists.txt | 1 + doc/fr/CMakeLists.txt | 1 + doc/man/CMakeLists.txt | 5 + doc/man/kvpnc.1 | 69 ++++++++++ doc/sv/CMakeLists.txt | 1 + doc/tdeioslave/CMakeLists.txt | 1 + doc/tdeioslave/en/CMakeLists.txt | 1 + doc/tdeioslave/en/pcf/CMakeLists.txt | 1 + po/CMakeLists.txt | 1 + src/CMakeLists.txt | 119 ++++++++++++++++++ src/addnetworkroutedialog.cpp | 1 + src/ciscocertificateenrollment.cpp | 2 +- src/configconnectoptions.cpp | 1 + src/configdaemonoptions.cpp | 2 + src/configdebugoptions.cpp | 2 +- src/confighelperprogramoptions.cpp | 2 +- src/configlogoptions.cpp | 1 + src/debugoutputtextedit.cpp | 2 + src/enterpassworddialog.cpp | 2 + src/enterxauthinteractivepasscodedialog.cpp | 2 + src/generateopenvpnkeydialog.cpp | 2 + src/icons/CMakeLists.txt | 1 + src/importcertificatedialog.cpp | 2 + src/importopenvpnprofiledialog.cpp | 1 + src/importprofiledialog.cpp | 1 + src/kfeedback.cpp | 2 +- src/kvpnc.cpp | 1 + src/kvpncimportprofileselectiondialog.cpp | 1 + src/kvpnckicker.cpp | 2 + src/logviewerdialog.cpp | 1 + src/manageciscocert.cpp | 1 + src/networkinterface.cpp | 2 + src/newprofiledialog.cpp | 1 + src/newprofilewizard.cpp | 2 +- src/openvpnmanagementhandler.cpp | 2 + src/preferencesdialog.cpp | 2 + src/profilecertoptions.cpp | 2 +- src/profileciscooptions.cpp | 2 +- src/profilecmdexecafterconnectoptions.cpp | 2 +- src/profilecmdexecafterdisconnectoptions.cpp | 2 +- src/profilecmdexecbeforeconnectoptions.cpp | 2 +- src/profilecmdexecbeforedisconnectoptions.cpp | 2 +- src/profilegeneraloptions.cpp | 2 +- src/profileipsecoptions.cpp | 4 +- src/profilenetworkgeneraloptions.cpp | 2 + src/profilenetworkhttpproxyoptions.cpp | 2 +- src/profilenetworknatoptions.cpp | 1 + src/profilenetworkrouteoptions.cpp | 2 +- src/profilenetworkvirtualipoptions.cpp | 2 +- src/profileopenvpnoptions.cpp | 2 +- src/profilepptpoptions.cpp | 2 +- src/profilepskoptions.cpp | 1 + src/profileracoonoptions.cpp | 2 + src/profilesmartcardoptions.cpp | 2 +- src/profilesshoptions.cpp | 2 + src/profileuseroptions.cpp | 2 +- src/profilevtunoptions.cpp | 2 + src/toolinfo.cpp | 2 +- src/utils.cpp | 2 + 64 files changed, 410 insertions(+), 21 deletions(-) create mode 100644 CMakeLists.txt create mode 100644 ConfigureChecks.cmake create mode 100644 config.h.cmake create mode 100644 doc/CMakeLists.txt create mode 100644 doc/de/CMakeLists.txt create mode 100644 doc/en/CMakeLists.txt create mode 100644 doc/fr/CMakeLists.txt create mode 100644 doc/man/CMakeLists.txt create mode 100644 doc/man/kvpnc.1 create mode 100644 doc/sv/CMakeLists.txt create mode 100644 doc/tdeioslave/CMakeLists.txt create mode 100644 doc/tdeioslave/en/CMakeLists.txt create mode 100644 doc/tdeioslave/en/pcf/CMakeLists.txt create mode 100644 po/CMakeLists.txt create mode 100644 src/CMakeLists.txt create mode 100644 src/icons/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..6bdb518 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,78 @@ +############################################ +# # +# Improvements and feedbacks are welcome # +# # +# This file is released under GPL >= 3 # +# # +############################################ + + +cmake_minimum_required( VERSION 2.8 ) + + +#### general package setup + +project( kvpnc ) +set( VERSION R14.1.0 ) + + +#### include essential cmake modules + +include( FindPkgConfig ) +include( CheckFunctionExists ) +include( CheckIncludeFile ) +include( CheckLibraryExists ) +include( CheckCSourceCompiles ) +include( CheckCXXSourceCompiles ) + + +#### include our cmake modules + +set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) +include( TDEMacros ) + + +##### setup install paths + +include( TDESetupPaths ) +tde_setup_paths( ) + + +##### optional stuff + +option( WITH_ALL_OPTIONS "Enable all optional support" OFF ) +option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} ) + + +##### user requested modules + +option( BUILD_ALL "Build all" ON ) +option( BUILD_DOC "Build documentation" ${BUILD_ALL} ) +option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} ) + + +##### configure checks + +include( ConfigureChecks.cmake ) + + +###### global compiler settings + +add_definitions( -DHAVE_CONFIG_H -UQT_NO_ASCII_CAST ) + +set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" ) +set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" ) +set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" ) + + +##### directories + +add_subdirectory( src ) +tde_conditional_add_subdirectory( BUILD_DOC doc ) +tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po ) + + + +##### write configure files + +configure_file( config.h.cmake config.h @ONLY ) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake new file mode 100644 index 0000000..0551eef --- /dev/null +++ b/ConfigureChecks.cmake @@ -0,0 +1,56 @@ +########################################### +# # +# Improvements and feedback are welcome # +# # +# This file is released under GPL >= 3 # +# # +########################################### + + +# required stuff +find_package( TQt ) +find_package( TDE ) + +tde_setup_architecture_flags( ) + +include(TestBigEndian) +test_big_endian(WORDS_BIGENDIAN) + + +##### check for gcc visibility support + +if( WITH_GCC_VISIBILITY ) + if( NOT UNIX ) + tde_message_fatal( "gcc visibility support was requested, but your system is not *NIX" ) + endif( NOT UNIX ) + set( __KDE_HAVE_GCC_VISIBILITY 1 ) + set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden") + set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden") +endif( WITH_GCC_VISIBILITY ) + + +#### check for functions + +find_library( LIBGCRYPT_LIBRARIES gcrypt ) +if( LIBGCRYPT_LIBRARIES ) + message( STATUS "Found libgcrypt: ${LIBGCRYPT_LIBRARIES}" ) + set( ADDITIONAL_LIBS ${ADDITIONAL_LIBS} ${LIBGCRYPT_LIBRARIES} ) + else() + tde_message_fatal( "The libgcrypt library hasn't been found on your system!" ) +endif( LIBGCRYPT_LIBRARIES ) + + +##### gettext + +if( BUILD_TRANSLATIONS ) + include( FindGettext ) + if( GETTEXT_FOUND ) + set( MSGFMT_EXECUTABLE ${GETTEXT_MSGFMT_EXECUTABLE} + CACHE FILEPATH "path to msgfmt executable" ) + endif( GETTEXT_FOUND ) + + if( NOT MSGFMT_EXECUTABLE ) + tde_message_fatal( "msgfmt is required but was not found on your system." ) + endif( NOT MSGFMT_EXECUTABLE ) +endif( BUILD_TRANSLATIONS ) + diff --git a/config.h.cmake b/config.h.cmake new file mode 100644 index 0000000..61ede3a --- /dev/null +++ b/config.h.cmake @@ -0,0 +1,8 @@ +#define VERSION "@VERSION@" + +// Defined if you have fvisibility and fvisibility-inlines-hidden support. +#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1 + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@ diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt new file mode 100644 index 0000000..6d0aa9f --- /dev/null +++ b/doc/CMakeLists.txt @@ -0,0 +1 @@ +tde_auto_add_subdirectories( ) diff --git a/doc/de/CMakeLists.txt b/doc/de/CMakeLists.txt new file mode 100644 index 0000000..eca4bd4 --- /dev/null +++ b/doc/de/CMakeLists.txt @@ -0,0 +1 @@ +tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG de ) diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt new file mode 100644 index 0000000..ffa59a8 --- /dev/null +++ b/doc/en/CMakeLists.txt @@ -0,0 +1 @@ +tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG en ) diff --git a/doc/fr/CMakeLists.txt b/doc/fr/CMakeLists.txt new file mode 100644 index 0000000..495f168 --- /dev/null +++ b/doc/fr/CMakeLists.txt @@ -0,0 +1 @@ +tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG fr ) diff --git a/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt new file mode 100644 index 0000000..8512250 --- /dev/null +++ b/doc/man/CMakeLists.txt @@ -0,0 +1,5 @@ +INSTALL( + FILES ${PROJECT_NAME}.1 + DESTINATION ${MAN_INSTALL_DIR}/man1 + COMPONENT doc +) diff --git a/doc/man/kvpnc.1 b/doc/man/kvpnc.1 new file mode 100644 index 0000000..48c4750 --- /dev/null +++ b/doc/man/kvpnc.1 @@ -0,0 +1,69 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH KVPNC 1 "novembre 16, 2005" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +kvpnc \- vpn clients frontend for TDE +.SH SYNOPSIS +.B kvpnc +.RI [ options ] +.br +.SH DESCRIPTION +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBkvpnc\fP is a TDE frontend for various vpn clients. +.br +It supports : +.br + * Cisco-compatible VPN client (vpnc) +.br + * IPSec (freeswan, openswan, racoon) +.br + * Point-to-Point Tunneling Protocol (PPTP) client (pptp-linux) +.br + * Virtual Private Network daemon (openvpn) +.SH OPTIONS +All TDE and Qt programs accept some common command\-line options. +.br +Kvpnc has no application\-specific options. +.PP +.TP +\fB\-\-help\fR +Show help about options +.TP +\fB\-\-help\-qt\fR +Show Qt specific options +.TP +\fB\-\-help\-tde\fR +Show TDE specific options +.TP +\fB\-\-help\-all\fR +Show all options +.TP +\fB\-\-author\fR +Show author information +.TP +\fB\-v\fR, \fB\-\-version\fR +Show version information +.TP +\fB\-\-license\fR +Show license information +.SH AUTHOR +kvpnc was written by Christoph Thielecke . +.PP +This manual page was written by Fathi Boudra , +for the Debian project (but may be used by others). diff --git a/doc/sv/CMakeLists.txt b/doc/sv/CMakeLists.txt new file mode 100644 index 0000000..bc04ab0 --- /dev/null +++ b/doc/sv/CMakeLists.txt @@ -0,0 +1 @@ +tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG sv ) diff --git a/doc/tdeioslave/CMakeLists.txt b/doc/tdeioslave/CMakeLists.txt new file mode 100644 index 0000000..c938175 --- /dev/null +++ b/doc/tdeioslave/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory( en ) diff --git a/doc/tdeioslave/en/CMakeLists.txt b/doc/tdeioslave/en/CMakeLists.txt new file mode 100644 index 0000000..a87ea53 --- /dev/null +++ b/doc/tdeioslave/en/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory( pcf ) diff --git a/doc/tdeioslave/en/pcf/CMakeLists.txt b/doc/tdeioslave/en/pcf/CMakeLists.txt new file mode 100644 index 0000000..d9da7d1 --- /dev/null +++ b/doc/tdeioslave/en/pcf/CMakeLists.txt @@ -0,0 +1 @@ +tde_create_handbook( DESTINATION tdeioslave/pcf ) diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt new file mode 100644 index 0000000..f5a2e1b --- /dev/null +++ b/po/CMakeLists.txt @@ -0,0 +1 @@ +tde_create_translation( LANG auto OUTPUT_NAME ${PROJECT_NAME} ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..f1b99af --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,119 @@ +add_subdirectory( icons ) + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kvpnc (executable) + +tde_add_executable( ${PROJECT_NAME} AUTOMOC + + SOURCES + kvpnc.skel + addnetworkroutedialogbase.ui ciscocertificateenrollmentbase.ui + ciscocertificateenrollmentdatadialogbase.ui + ciscocertificateenrollmentfinishwidgetbase.ui + configconnectoptionsbase.ui configdaemonoptionsbase.ui + configdebugoptionsbase.ui configgeneraloptions.ui + confighelperprogramoptionsbase.ui configlogoptionsbase.ui + displaycertdialogbase.ui enterpassworddialogbase.ui + enterxauthinteractivepasscodedialogbase.ui + generateopenvpnkeydialogbase.ui helpdialog.cpp helpdialogbase.ui + importcertificatedialogbase.ui importopenvpnprofiledialogbase.ui + importprofiledialogbase.ui kvpncimportprofileselectiondialogbase.ui + logviewerdialogbase.ui mainviewbase.ui manageciscocertbase.ui + newprofiledialogbase.ui newprofilewizardauthselection.ui + newprofilewizardcert.ui newprofilewizardciscomanually.ui + newprofilewizardciscoselection.ui newprofilewizardconnectionstatuscheck.ui + newprofilewizardconnectoptions.ui newprofilewizardfreeswan.ui + newprofilewizardgeneral.ui newprofilewizardnat.ui + newprofilewizardnetwork.ui newprofilewizardnetworkroute.ui + newprofilewizardopenvpn.ui newprofilewizardopenvpnauth.ui + newprofilewizardopenvpnselection.ui newprofilewizardp12certselection.ui + newprofilewizardpptp.ui newprofilewizardpsk.ui newprofilewizardracoon.ui + newprofilewizardstart.ui newprofilewizardtypeselection.ui + newprofilewizarduser.ui profilecertoptionsbase.ui + profileciscooptionsbase.ui profilecmdexecafterconnectoptionsbase.ui + profilecmdexecafterdisconnectoptionsbase.ui + profilecmdexecbeforeconnectoptionsbase.ui + profilecmdexecbeforedisconnectoptionsbase.ui + profilegeneraloptionsbase.ui profileipsecoptionsbase.ui + profilenetworkgeneraloptionsbase.ui profilenetworkhttpproxyoptionsbase.ui + profilenetworknatoptionsbase.ui profilenetworkrouteoptionsbase.ui + profilenetworkvirtualipoptionsbase.ui profileopenvpnoptionsbase.ui + profilepptpoptionsbase.ui profilepskoptionsbase.ui + profileracoonoptionsbase.ui profilesmartcardoptionsbase.ui + profilesshoptionsbase.ui profileuseroptionsbase.ui + profilevtunoptionsbase.ui toolsinfowidgetbase.ui + addnetworkroutedialog.cpp ciscocertificateenrollment.cpp + ciscocertificateenrollmentdatadialog.cpp ciscopasswddecoder.cpp + configdebugoptions.cpp configconnectoptions.cpp configdaemonoptions.cpp + confighelperprogramoptions.cpp configlogoptions.cpp debugoutputtextedit.cpp + displaycertdialog.cpp enterpassworddialog.cpp + enterxauthinteractivepasscodedialog.cpp generateopenvpnkeydialog.cpp + importcertificatedialog.cpp importipsecprofiledialog.cpp + importopenvpnprofiledialog.cpp importprofiledialog.cpp + kfeedback.cpp kvpnc.cpp kvpncconfig.cpp kvpncimportprofileselectiondialog.cpp + kvpnckicker.cpp listviewtooltip.cpp logviewerdialog.cpp main.cpp + mainview.cpp manageciscocert.cpp networkinterface.cpp newprofiledialog.cpp + newprofilewizard.cpp openvpnmanagementhandler.cpp preferencesdialog.cpp + profilecertoptions.cpp profileciscooptions.cpp + profilecmdexecafterconnectoptions.cpp profilecmdexecafterdisconnectoptions.cpp + profilecmdexecbeforeconnectoptions.cpp profilecmdexecbeforedisconnectoptions.cpp + profilegeneraloptions.cpp profileipsecoptions.cpp + profilenetworkgeneraloptions.cpp profilenetworkhttpproxyoptions.cpp + profilenetworknatoptions.cpp profilenetworkrouteoptions.cpp + profilenetworkvirtualipoptions.cpp profileopenvpnoptions.cpp + profilepptpoptions.cpp profilepskoptions.cpp profileracoonoptions.cpp + profilesmartcardoptions.cpp profilesshoptions.cpp profileuseroptions.cpp + profilevtunoptions.cpp toolinfo.cpp toolsinfodialog.cpp utils.cpp + vpnaccountdata.cpp vpntypesinfodialog.cpp widgetnotifyhelper.cpp + LINK + tdeui-shared + tdecore-shared + tdeio-shared + tdewalletclient-shared + ${LIBGCRYPT_LIBRARIES} + + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### other data + + +install( + PROGRAMS ping_check.sh + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME} +) + +install( + FILES + eventsrc + kvpncui.rc + newprofilewizard.png + newprofilewizard_final.png + ovpn.protocol + + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME} +) + +install( + FILES pcf.protocol + DESTINATION ${SERVICES_INSTALL_DIR} +) + +install( + FILES ${PROJECT_NAME}.desktop + DESTINATION ${XDG_APPS_INSTALL_DIR} +) diff --git a/src/addnetworkroutedialog.cpp b/src/addnetworkroutedialog.cpp index 4f2716f..d10fd31 100644 --- a/src/addnetworkroutedialog.cpp +++ b/src/addnetworkroutedialog.cpp @@ -115,3 +115,4 @@ void AddNetworkRouteDialog::dialogChanged() dialogModified=true; } +#include "addnetworkroutedialog.moc" diff --git a/src/ciscocertificateenrollment.cpp b/src/ciscocertificateenrollment.cpp index 5b308da..69b3fd3 100644 --- a/src/ciscocertificateenrollment.cpp +++ b/src/ciscocertificateenrollment.cpp @@ -739,4 +739,4 @@ void CiscoCertificateEnrollment::readFromStderr_cancel() // sucess=-1; } - +#include "ciscocertificateenrollment.moc" diff --git a/src/configconnectoptions.cpp b/src/configconnectoptions.cpp index 887bcda..555e2d9 100644 --- a/src/configconnectoptions.cpp +++ b/src/configconnectoptions.cpp @@ -56,3 +56,4 @@ void ConfigConnectOptions::dialogChanged() dialogModified=true; } +#include "configconnectoptions.moc" diff --git a/src/configdaemonoptions.cpp b/src/configdaemonoptions.cpp index 3593cf2..e313cc7 100644 --- a/src/configdaemonoptions.cpp +++ b/src/configdaemonoptions.cpp @@ -93,3 +93,5 @@ void ConfigDaemonOptions::dialogChanged() // std::cout << "ConfigDaemonOptions::dialogChanged()" << std::endl; dialogModified=true; } + +#include "configdaemonoptions.moc" diff --git a/src/configdebugoptions.cpp b/src/configdebugoptions.cpp index a705feb..768ad85 100644 --- a/src/configdebugoptions.cpp +++ b/src/configdebugoptions.cpp @@ -40,7 +40,7 @@ void ConfigDebugOptions::dialogChanged() dialogModified=true; } - +#include "configdebugoptions.moc" diff --git a/src/confighelperprogramoptions.cpp b/src/confighelperprogramoptions.cpp index 49ead5e..0fef0b6 100644 --- a/src/confighelperprogramoptions.cpp +++ b/src/confighelperprogramoptions.cpp @@ -39,4 +39,4 @@ void ConfigHelperProgramOptions::dialogChanged() dialogModified=true; } - +#include "confighelperprogramoptions.moc" diff --git a/src/configlogoptions.cpp b/src/configlogoptions.cpp index 97e400c..432581c 100644 --- a/src/configlogoptions.cpp +++ b/src/configlogoptions.cpp @@ -96,3 +96,4 @@ void ConfigLogOptions::dialogChanged() dialogModified=true; } +#include "configlogoptions.moc" diff --git a/src/debugoutputtextedit.cpp b/src/debugoutputtextedit.cpp index cdc8c09..2cd881b 100644 --- a/src/debugoutputtextedit.cpp +++ b/src/debugoutputtextedit.cpp @@ -53,3 +53,5 @@ void DebugOutputTextEdit::append ( const TQString & text ) { KTextBrowser::append(text); } + +#include "debugoutputtextedit.moc" diff --git a/src/enterpassworddialog.cpp b/src/enterpassworddialog.cpp index c9e76e0..909f171 100644 --- a/src/enterpassworddialog.cpp +++ b/src/enterpassworddialog.cpp @@ -92,3 +92,5 @@ void EnterUsernamePasswordDialog::accept() } + +#include "enterpassworddialog.moc" diff --git a/src/enterxauthinteractivepasscodedialog.cpp b/src/enterxauthinteractivepasscodedialog.cpp index ac9d732..859b788 100644 --- a/src/enterxauthinteractivepasscodedialog.cpp +++ b/src/enterxauthinteractivepasscodedialog.cpp @@ -51,3 +51,5 @@ void EnterXauthInteractivePasscodeDialog::accept() { TQDialog::accept(); } } + +#include "enterxauthinteractivepasscodedialog.moc" diff --git a/src/generateopenvpnkeydialog.cpp b/src/generateopenvpnkeydialog.cpp index 88890fd..31b5cfb 100644 --- a/src/generateopenvpnkeydialog.cpp +++ b/src/generateopenvpnkeydialog.cpp @@ -133,3 +133,5 @@ void GenerateOpenvpnKeyDialog::readStdErr() //} } } + +#include "generateopenvpnkeydialog.moc" diff --git a/src/icons/CMakeLists.txt b/src/icons/CMakeLists.txt new file mode 100644 index 0000000..63f765b --- /dev/null +++ b/src/icons/CMakeLists.txt @@ -0,0 +1 @@ +tde_install_icons( ) diff --git a/src/importcertificatedialog.cpp b/src/importcertificatedialog.cpp index 5cc77ab..e3873ab 100644 --- a/src/importcertificatedialog.cpp +++ b/src/importcertificatedialog.cpp @@ -1360,3 +1360,5 @@ void ImportCertificateDialog::removePrivateKey() importSuccess=false; } } + +#include "importcertificatedialog.moc" diff --git a/src/importopenvpnprofiledialog.cpp b/src/importopenvpnprofiledialog.cpp index 29a759d..01c56ac 100644 --- a/src/importopenvpnprofiledialog.cpp +++ b/src/importopenvpnprofiledialog.cpp @@ -1134,3 +1134,4 @@ void ImportOpenvpnProfileDialog::canAccept() TQDialog::accept(); } +#include "importopenvpnprofiledialog.moc" diff --git a/src/importprofiledialog.cpp b/src/importprofiledialog.cpp index 49d343c..1b4640c 100644 --- a/src/importprofiledialog.cpp +++ b/src/importprofiledialog.cpp @@ -599,3 +599,4 @@ void ImportProfileDialog::canAccept() TQDialog::accept(); } +#include "importprofiledialog.moc" diff --git a/src/kfeedback.cpp b/src/kfeedback.cpp index 09a4697..c24d922 100644 --- a/src/kfeedback.cpp +++ b/src/kfeedback.cpp @@ -496,6 +496,6 @@ KFeedbackAnswer::stateChange( bool newState ) } } - +#include "kfeedback.moc" // EOF diff --git a/src/kvpnc.cpp b/src/kvpnc.cpp index 5b904fd..84d1541 100644 --- a/src/kvpnc.cpp +++ b/src/kvpnc.cpp @@ -25218,3 +25218,4 @@ TQStringList KVpnc::getProfileTypes() return ProfileTypes; } +#include "kvpnc.moc" diff --git a/src/kvpncimportprofileselectiondialog.cpp b/src/kvpncimportprofileselectiondialog.cpp index 65d0c66..46445b0 100644 --- a/src/kvpncimportprofileselectiondialog.cpp +++ b/src/kvpncimportprofileselectiondialog.cpp @@ -43,3 +43,4 @@ void KvpncImportProfileSelectionDialog::importAllToggled() allSelected=!allSelected; } +#include "kvpncimportprofileselectiondialog.moc" diff --git a/src/kvpnckicker.cpp b/src/kvpnckicker.cpp index afc9cd2..89fd67d 100644 --- a/src/kvpnckicker.cpp +++ b/src/kvpnckicker.cpp @@ -82,3 +82,5 @@ void KVpncKicker::initDockWindow() { TDEPopupMenu* KVpncKicker::menu() { return contextMenu(); } + +#include "kvpnckicker.moc" diff --git a/src/logviewerdialog.cpp b/src/logviewerdialog.cpp index 556738a..7390d0f 100644 --- a/src/logviewerdialog.cpp +++ b/src/logviewerdialog.cpp @@ -273,3 +273,4 @@ void LogViewerDialog::findLogEntryClicked() find(main->SearchLineEdit->text()); } +#include "logviewerdialog.moc" diff --git a/src/manageciscocert.cpp b/src/manageciscocert.cpp index dc336f1..242d137 100644 --- a/src/manageciscocert.cpp +++ b/src/manageciscocert.cpp @@ -382,3 +382,4 @@ void ManageCiscoCert::doContextMenuAction ( int action) showCertClicked(); } +#include "manageciscocert.moc" diff --git a/src/networkinterface.cpp b/src/networkinterface.cpp index 4c9d291..25d01eb 100644 --- a/src/networkinterface.cpp +++ b/src/networkinterface.cpp @@ -562,3 +562,5 @@ void NetworkInterface::readFromStderr_interfaceip() //std::cerr << "dbg err: " << line << std::endl; } } + +#include "networkinterface.moc" diff --git a/src/newprofiledialog.cpp b/src/newprofiledialog.cpp index 2ff41e9..e2801ba 100644 --- a/src/newprofiledialog.cpp +++ b/src/newprofiledialog.cpp @@ -667,3 +667,4 @@ void NewProfileDialog::passwordContentChanged() main->CheckUserPass->setChecked(false); } +#include "newprofiledialog.moc" diff --git a/src/newprofilewizard.cpp b/src/newprofilewizard.cpp index f00b514..a5e872d 100644 --- a/src/newprofilewizard.cpp +++ b/src/newprofilewizard.cpp @@ -4005,4 +4005,4 @@ void NewProfileWizard::useDomainInResolvConfToggled(bool) newprofilewizardpptppagecontent->DomainInResolvConfLineedit->setEnabled( false ); } - +#include "newprofilewizard.moc" diff --git a/src/openvpnmanagementhandler.cpp b/src/openvpnmanagementhandler.cpp index 1559816..db84c55 100644 --- a/src/openvpnmanagementhandler.cpp +++ b/src/openvpnmanagementhandler.cpp @@ -923,3 +923,5 @@ void OpenvpnManagementHandler::hostFound() } } + +#include "openvpnmanagementhandler.moc" diff --git a/src/preferencesdialog.cpp b/src/preferencesdialog.cpp index d3bb53e..137557d 100644 --- a/src/preferencesdialog.cpp +++ b/src/preferencesdialog.cpp @@ -7145,3 +7145,5 @@ void PreferencesDialog::slotProfileCreated(TQString Name) profileChanged( Name ); } + +#include "preferencesdialog.moc" diff --git a/src/profilecertoptions.cpp b/src/profilecertoptions.cpp index 9e5e4ce..705e998 100644 --- a/src/profilecertoptions.cpp +++ b/src/profilecertoptions.cpp @@ -59,7 +59,7 @@ void ProfileCertOptions::useSpecialServerCertificateToggled(bool) } } - +#include "profilecertoptions.moc" diff --git a/src/profileciscooptions.cpp b/src/profileciscooptions.cpp index 99c31d3..42bd5a1 100644 --- a/src/profileciscooptions.cpp +++ b/src/profileciscooptions.cpp @@ -40,6 +40,6 @@ void ProfileCiscoOptions::dialogChanged() dialogModified=true; } - +#include "profileciscooptions.moc" diff --git a/src/profilecmdexecafterconnectoptions.cpp b/src/profilecmdexecafterconnectoptions.cpp index f2c08ae..e2a8d94 100644 --- a/src/profilecmdexecafterconnectoptions.cpp +++ b/src/profilecmdexecafterconnectoptions.cpp @@ -60,5 +60,5 @@ void ProfileCmdExecAfterConnectOptions::dialogChanged() dialogModified=true; } - +#include "profilecmdexecafterconnectoptions.moc" diff --git a/src/profilecmdexecafterdisconnectoptions.cpp b/src/profilecmdexecafterdisconnectoptions.cpp index 97b0afe..19dc144 100644 --- a/src/profilecmdexecafterdisconnectoptions.cpp +++ b/src/profilecmdexecafterdisconnectoptions.cpp @@ -52,5 +52,5 @@ void ProfileCmdExecAfterDisconnectOptions::dialogChanged() dialogModified=true; } - +#include "profilecmdexecafterdisconnectoptions.moc" diff --git a/src/profilecmdexecbeforeconnectoptions.cpp b/src/profilecmdexecbeforeconnectoptions.cpp index aaf4277..e0cab96 100644 --- a/src/profilecmdexecbeforeconnectoptions.cpp +++ b/src/profilecmdexecbeforeconnectoptions.cpp @@ -50,4 +50,4 @@ void ProfileCmdExecBeforeConnectOptions::dialogChanged() dialogModified=true; } - +#include "profilecmdexecbeforeconnectoptions.moc" diff --git a/src/profilecmdexecbeforedisconnectoptions.cpp b/src/profilecmdexecbeforedisconnectoptions.cpp index 5123b50..f321780 100644 --- a/src/profilecmdexecbeforedisconnectoptions.cpp +++ b/src/profilecmdexecbeforedisconnectoptions.cpp @@ -49,4 +49,4 @@ void ProfileCmdExecBeforeDisconnectOptions::dialogChanged() dialogModified=true; } - +#include "profilecmdexecbeforedisconnectoptions.moc" diff --git a/src/profilegeneraloptions.cpp b/src/profilegeneraloptions.cpp index cbc2d6c..fd84090 100644 --- a/src/profilegeneraloptions.cpp +++ b/src/profilegeneraloptions.cpp @@ -46,7 +46,7 @@ void ProfileGeneralOptions::dialogChanged() dialogModified=true; } - +#include "profilegeneraloptions.moc" diff --git a/src/profileipsecoptions.cpp b/src/profileipsecoptions.cpp index b0ec594..5b347b9 100644 --- a/src/profileipsecoptions.cpp +++ b/src/profileipsecoptions.cpp @@ -17,7 +17,7 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "profileipsecoptions.h" + #include "profileipsecoptions.h" #include @@ -130,3 +130,5 @@ void ProfileIpsecOptions::usePfsToogled(bool) else PerfectForwardSecrecyCombobox->setEnabled(false); } + +#include "profileipsecoptions.moc" diff --git a/src/profilenetworkgeneraloptions.cpp b/src/profilenetworkgeneraloptions.cpp index 1a3a84e..1a9b21c 100644 --- a/src/profilenetworkgeneraloptions.cpp +++ b/src/profilenetworkgeneraloptions.cpp @@ -128,3 +128,5 @@ void ProfileNetworkGeneralOptions::useNetworkToggled(bool) else UseRemoteNetworkGroupBox->setEnabled(false); } + +#include "profilenetworkgeneraloptions.moc" diff --git a/src/profilenetworkhttpproxyoptions.cpp b/src/profilenetworkhttpproxyoptions.cpp index 664f631..9ab1b70 100644 --- a/src/profilenetworkhttpproxyoptions.cpp +++ b/src/profilenetworkhttpproxyoptions.cpp @@ -97,7 +97,7 @@ void ProfileNetworkHttpProxyOptions::dialogChanged() dialogModified=true; } - +#include "profilenetworkhttpproxyoptions.moc" diff --git a/src/profilenetworknatoptions.cpp b/src/profilenetworknatoptions.cpp index da6015d..b885893 100644 --- a/src/profilenetworknatoptions.cpp +++ b/src/profilenetworknatoptions.cpp @@ -68,3 +68,4 @@ void ProfileNetworkNatOptions::dialogChanged() dialogModified=true; } +#include "profilenetworknatoptions.moc" diff --git a/src/profilenetworkrouteoptions.cpp b/src/profilenetworkrouteoptions.cpp index 31ff501..b8686bd 100644 --- a/src/profilenetworkrouteoptions.cpp +++ b/src/profilenetworkrouteoptions.cpp @@ -224,4 +224,4 @@ void ProfileNetworkRouteOptions::dialogChanged() dialogModified=true; } - +#include "profilenetworkrouteoptions.moc" diff --git a/src/profilenetworkvirtualipoptions.cpp b/src/profilenetworkvirtualipoptions.cpp index fe9c862..3b40b05 100644 --- a/src/profilenetworkvirtualipoptions.cpp +++ b/src/profilenetworkvirtualipoptions.cpp @@ -83,4 +83,4 @@ void ProfileNetworkVirtualIpOptions::useVirtualSubnetsToggled(bool) VirtualSubnetsLineEdit->setEnabled(false); } - +#include "profilenetworkvirtualipoptions.moc" diff --git a/src/profileopenvpnoptions.cpp b/src/profileopenvpnoptions.cpp index 1c6a797..584663c 100644 --- a/src/profileopenvpnoptions.cpp +++ b/src/profileopenvpnoptions.cpp @@ -174,4 +174,4 @@ void ProfileOpenvpnOptions::dialogChanged() dialogModified=true; } - +#include "profileopenvpnoptions.moc" diff --git a/src/profilepptpoptions.cpp b/src/profilepptpoptions.cpp index 407017e..811fd0e 100644 --- a/src/profilepptpoptions.cpp +++ b/src/profilepptpoptions.cpp @@ -68,6 +68,6 @@ void ProfilePptpOptions::dialogChanged() dialogModified=true; } - +#include "profilepptpoptions.moc" diff --git a/src/profilepskoptions.cpp b/src/profilepskoptions.cpp index 236a10c..4778240 100644 --- a/src/profilepskoptions.cpp +++ b/src/profilepskoptions.cpp @@ -66,3 +66,4 @@ void ProfilePskOptions::dialogChanged() dialogModified=true; } +#include "profilepskoptions.moc" diff --git a/src/profileracoonoptions.cpp b/src/profileracoonoptions.cpp index b9e310d..9eb2d7b 100644 --- a/src/profileracoonoptions.cpp +++ b/src/profileracoonoptions.cpp @@ -96,3 +96,5 @@ void ProfileRacoonOptions::remoteIDTypeToggled(const TQString& text) RemoteIDLabel->setDisabled(false); } } + +#include "profileracoonoptions.moc" diff --git a/src/profilesmartcardoptions.cpp b/src/profilesmartcardoptions.cpp index 667bee7..609fd57 100644 --- a/src/profilesmartcardoptions.cpp +++ b/src/profilesmartcardoptions.cpp @@ -73,7 +73,7 @@ void ProfileSmartcardOptions::dialogChanged() dialogModified=true; } - +#include "profilesmartcardoptions.moc" diff --git a/src/profilesshoptions.cpp b/src/profilesshoptions.cpp index f923651..2f41eb3 100644 --- a/src/profilesshoptions.cpp +++ b/src/profilesshoptions.cpp @@ -96,3 +96,5 @@ void ProfileSshOptions::useSshConfigRemoteScriptToggled(bool) else SshConfigRemoteScriptLineEdit->setEnabled(false); } + +#include "profilesshoptions.moc" diff --git a/src/profileuseroptions.cpp b/src/profileuseroptions.cpp index c8c29e2..75445a0 100644 --- a/src/profileuseroptions.cpp +++ b/src/profileuseroptions.cpp @@ -51,4 +51,4 @@ void ProfileUserOptions::dialogChanged() dialogModified=true; } - +#include "profileuseroptions.moc" diff --git a/src/profilevtunoptions.cpp b/src/profilevtunoptions.cpp index 8f57d55..2a9784d 100644 --- a/src/profilevtunoptions.cpp +++ b/src/profilevtunoptions.cpp @@ -51,3 +51,5 @@ void ProfileVtunOptions::dialogChanged() // std::cout << "ProfileVtunOptions::dialogChanged()" << std::endl; dialogModified=true; } + +#include "profilevtunoptions.moc" diff --git a/src/toolinfo.cpp b/src/toolinfo.cpp index ddd6f31..5b3e157 100644 --- a/src/toolinfo.cpp +++ b/src/toolinfo.cpp @@ -639,4 +639,4 @@ void ToolInfo::processFinished() collectOpenvpnCapabilitiesRunning=false; } - +#include "toolinfo.moc" diff --git a/src/utils.cpp b/src/utils.cpp index ec8b799..4409ac3 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -1910,3 +1910,5 @@ int Utils::dottedIpv4Netmask2NetmaskBytes(TQString dottedIpv4Netmask) } return byteSetCount; } + +#include "utils.moc"