diff options
37 files changed, 69 insertions, 57 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f47fac..b8ce5bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,6 +36,8 @@ include( CheckCXXSourceCompiles ) include( TDEMacros ) +enable_testing() + ##### setup install paths ####################### @@ -49,9 +51,9 @@ option( WITH_ALL_OPTIONS "Enable all sane optional stuff" OFF ) option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} ) option( WITH_ARTS "Enable aRts support" ${WITH_ALL_OPTIONS} ) option( WITH_SDL "Enable SDL support" ${WITH_ALL_OPTIONS} ) +option( WITH_SSL "Enable SSL support (build cert tdefile-plugin)" ON ) option( WITH_BERKELEY_DB "Enable Berkeley DB support" ${WITH_ALL_OPTIONS} ) option( WITH_XMMS "Enable xmms support" OFF ) -option( WITH_TEST "Build tests" OFF ) ##### options comments ########################## @@ -61,8 +63,9 @@ option( WITH_TEST "Build tests" OFF ) # with xmms # WITH_ARTS affects konq-plugins/sidebar/mediaplayer, noatun plugins # WITH_SDL affects noatun plugins +# WITH_SSL affects tdefile-plugins +# WITH_SSL requires tdelibs build WITH_SSL=ON # WITH_BERKELEY_DB affects noatun plugins -# WITH_TEST affects konq-plugins/fsview # NOTE: WITH_XMMS supports only obsolte xmms version 1 @@ -99,9 +102,6 @@ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" ) set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" ) set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" ) -if( WITH_TEST ) - enable_testing() -endif( WITH_TEST ) ##### tdeaddons directories ##################### diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 3f7d582..025bcf8 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -13,6 +13,7 @@ tde_setup_architecture_flags( ) +include(CheckCXXSymbolExists) include(TestBigEndian) test_big_endian(WORDS_BIGENDIAN) @@ -85,3 +86,16 @@ if( BUILD_NOATUN_PLUGINS ) endif( ) endif( WITH_BERKELEY_DB ) endif( BUILD_NOATUN_PLUGINS ) + + +if( BUILD_TDEFILE_PLUGINS AND WITH_SSL ) + # FIXME: There should be a better way to check for SSL support in tdelibs, but at the time of + # writing tdelibs doesn't seam to provide one. <2025-08-11 Fat-Zer> + tde_save_and_set( CMAKE_REQUIRED_INCLUDES ${TDE_INCLUDE_DIR} ) + check_cxx_symbol_exists( "KSSL_HAVE_SSL" "ksslconfig.h" KSSL_HAVE_SSL ) + tde_restore( CMAKE_REQUIRED_INCLUDES ) + + if( NOT KSSL_HAVE_SSL ) + tde_message_fatal( "SSL is requested, but tdelibs on your system was build without SSL support" ) + endif( ) +endif( ) diff --git a/kate/htmltools/plugin_katehtmltools.cpp b/kate/htmltools/plugin_katehtmltools.cpp index 3ab22e4..4a78f60 100644 --- a/kate/htmltools/plugin_katehtmltools.cpp +++ b/kate/htmltools/plugin_katehtmltools.cpp @@ -20,7 +20,7 @@ #include <klineeditdlg.h> #include <tdeaction.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <cassert> #include <kdebug.h> diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp index a203f57..1ddcc4f 100644 --- a/kate/make/plugin_katemake.cpp +++ b/kate/make/plugin_katemake.cpp @@ -44,7 +44,7 @@ #include <kcursor.h> #include <kdebug.h> #include <kdockwidget.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <tdemessagebox.h> #include <tdestandarddirs.h> diff --git a/kate/textfilter/plugin_katetextfilter.cpp b/kate/textfilter/plugin_katetextfilter.cpp index 0cb992f..c5fe261 100644 --- a/kate/textfilter/plugin_katetextfilter.cpp +++ b/kate/textfilter/plugin_katetextfilter.cpp @@ -19,7 +19,7 @@ #include "plugin_katetextfilter.moc" #include <tdeaction.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <klineeditdlg.h> #include <tdemessagebox.h> #include <tdelocale.h> diff --git a/kate/xmlcheck/plugin_katexmlcheck.cpp b/kate/xmlcheck/plugin_katexmlcheck.cpp index 1b98555..9fa439e 100644 --- a/kate/xmlcheck/plugin_katexmlcheck.cpp +++ b/kate/xmlcheck/plugin_katexmlcheck.cpp @@ -44,7 +44,7 @@ #include <kcursor.h> #include <kdebug.h> #include <kdockwidget.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <tdemessagebox.h> #include <tdestandarddirs.h> diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp index e60f4ec..99cb9b6 100644 --- a/kate/xmltools/plugin_katexmltools.cpp +++ b/kate/xmltools/plugin_katexmltools.cpp @@ -96,7 +96,7 @@ TODO: #include <kdebug.h> #include <tdefiledialog.h> #include <tdeglobal.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeio/job.h> #include <tdelocale.h> #include <tdemessagebox.h> diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp index 3e8924b..48db1e3 100644 --- a/kicker-applets/kolourpicker/kolourpicker.cpp +++ b/kicker-applets/kolourpicker/kolourpicker.cpp @@ -33,7 +33,7 @@ $Id$ #include <tdeglobal.h> #include <tdelocale.h> #include <kiconloader.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeconfig.h> #include <tdeaboutdata.h> #include <tdeaboutapplication.h> diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp index ad194fe..d43b6a4 100644 --- a/konq-plugins/akregator/akregatorplugin.cpp +++ b/konq-plugins/akregator/akregatorplugin.cpp @@ -28,7 +28,7 @@ #include <kmimetype.h> #include <kdebug.h> #include <tdeaction.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <konq_popupmenu.h> #include <tdepopupmenu.h> diff --git a/konq-plugins/arkplugin/arkplugin.cpp b/konq-plugins/arkplugin/arkplugin.cpp index 9c06948..a28f7b0 100644 --- a/konq-plugins/arkplugin/arkplugin.cpp +++ b/konq-plugins/arkplugin/arkplugin.cpp @@ -25,7 +25,7 @@ #include <kmimetype.h> #include <kdebug.h> #include <tdeaction.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <konq_popupmenu.h> #include <tdepopupmenu.h> diff --git a/konq-plugins/autorefresh/autorefresh.cpp b/konq-plugins/autorefresh/autorefresh.cpp index 0650424..7ad51f4 100644 --- a/konq-plugins/autorefresh/autorefresh.cpp +++ b/konq-plugins/autorefresh/autorefresh.cpp @@ -7,7 +7,7 @@ #include <kdebug.h> #include "autorefresh.h" #include <tdeaction.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kiconloader.h> #include <tqmessagebox.h> #include <tdelocale.h> diff --git a/konq-plugins/babelfish/plugin_babelfish.cpp b/konq-plugins/babelfish/plugin_babelfish.cpp index 8d432c9..0d6512e 100644 --- a/konq-plugins/babelfish/plugin_babelfish.cpp +++ b/konq-plugins/babelfish/plugin_babelfish.cpp @@ -21,7 +21,7 @@ #include "plugin_babelfish.h" #include <tdeaction.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdemessagebox.h> #include <tdelocale.h> #include <tdeconfig.h> diff --git a/konq-plugins/crashes/crashesplugin.cpp b/konq-plugins/crashes/crashesplugin.cpp index a14cff5..d71d769 100644 --- a/konq-plugins/crashes/crashesplugin.cpp +++ b/konq-plugins/crashes/crashesplugin.cpp @@ -22,7 +22,7 @@ #include <tdeaction.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdehtml_part.h> #include <kgenericfactory.h> diff --git a/konq-plugins/dirfilter/dirfilterplugin.cpp b/konq-plugins/dirfilter/dirfilterplugin.cpp index a2f7e6f..dd1b21d 100644 --- a/konq-plugins/dirfilter/dirfilterplugin.cpp +++ b/konq-plugins/dirfilter/dirfilterplugin.cpp @@ -30,7 +30,7 @@ #include <kdebug.h> #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaction.h> #include <tdepopupmenu.h> diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp index 958c2ca..2319ab6 100644 --- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp +++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp @@ -3,7 +3,7 @@ #include "domtreeview.h" #include <tdeaction.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <klibloader.h> #include <kdebug.h> diff --git a/konq-plugins/fsview/CMakeLists.txt b/konq-plugins/fsview/CMakeLists.txt index 87350b6..82f6a55 100644 --- a/konq-plugins/fsview/CMakeLists.txt +++ b/konq-plugins/fsview/CMakeLists.txt @@ -40,19 +40,17 @@ tde_add_executable( fsview AUTOMOC ##### scantest (test) ########################### -# FIXME: replace this after adding specific tde macro -if( WITH_TEST ) - tde_add_executable( scantest - SOURCES scantest.cpp - LINK tdeio-shared fsview-static ) - set_property( SOURCE scantest.cpp APPEND - PROPERTY COMPILE_DEFINITIONS - FSVIEW_SCANTEST_DIRECTORY="${CMAKE_BINARY_DIR}" ) - - add_test( scantest ${CMAKE_CURRENT_BINARY_DIR}/scantest ) -endif( WITH_TEST ) +tde_add_check_executable( scantest + SOURCES scantest.cpp + LINK tdeio-shared fsview-static + TEST +) +set_property( SOURCE scantest.cpp APPEND + PROPERTY COMPILE_DEFINITIONS + FSVIEW_SCANTEST_DIRECTORY="${CMAKE_BINARY_DIR}" +) ##### libfsviewpart (kpart) ##################### diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp index 28433ba..30b100c 100644 --- a/konq-plugins/fsview/fsview_part.cpp +++ b/konq-plugins/fsview/fsview_part.cpp @@ -24,7 +24,7 @@ #include <tqtimer.h> #include <tqwhatsthis.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdefiledialog.h> #include <tdefileitem.h> #include <tdeparts/genericfactory.h> diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp index 9f3c56e..34c3685 100644 --- a/konq-plugins/kuick/kuick_plugin.cpp +++ b/konq-plugins/kuick/kuick_plugin.cpp @@ -23,7 +23,7 @@ #include <tdeapplication.h> #include <tdeaction.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kiconloader.h> #include <tdeimproxy.h> #include <tdelocale.h> diff --git a/konq-plugins/minitools/minitoolsplugin.cpp b/konq-plugins/minitools/minitoolsplugin.cpp index 19177c2..9f5d090 100644 --- a/konq-plugins/minitools/minitoolsplugin.cpp +++ b/konq-plugins/minitools/minitoolsplugin.cpp @@ -24,7 +24,7 @@ #include <tdeaction.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdehtml_part.h> #include <kgenericfactory.h> diff --git a/konq-plugins/rellinks/plugin_rellinks.cpp b/konq-plugins/rellinks/plugin_rellinks.cpp index 48e3f95..894eb2a 100644 --- a/konq-plugins/rellinks/plugin_rellinks.cpp +++ b/konq-plugins/rellinks/plugin_rellinks.cpp @@ -38,7 +38,7 @@ #include <tdehtml_part.h> #include <tdehtmlview.h> #include <kiconloader.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <tdepopupmenu.h> #include <tdeshortcut.h> diff --git a/konq-plugins/rsync/rsyncplugin.cpp b/konq-plugins/rsync/rsyncplugin.cpp index 8fbd456..e307e61 100644 --- a/konq-plugins/rsync/rsyncplugin.cpp +++ b/konq-plugins/rsync/rsyncplugin.cpp @@ -36,7 +36,7 @@ #include <kdebug.h> #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <twin.h> #include <kurl.h> diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp index 5bdb373..a5b894c 100644 --- a/konq-plugins/searchbar/searchbar.cpp +++ b/konq-plugins/searchbar/searchbar.cpp @@ -26,7 +26,7 @@ #include <tdeaction.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kgenericfactory.h> #include <tdeglobal.h> #include <tdehtml_part.h> @@ -497,7 +497,7 @@ void SearchBarPlugin::configurationChanged() } else { - KDesktopFile file("searchproviders/" + engine + ".desktop", true, "services"); + TDEDesktopFile file("searchproviders/" + engine + ".desktop", true, "services"); m_providerName = file.readName(); } diff --git a/konq-plugins/sidebar/delicious/plugin.h b/konq-plugins/sidebar/delicious/plugin.h index 77837a1..8f6e1c4 100644 --- a/konq-plugins/sidebar/delicious/plugin.h +++ b/konq-plugins/sidebar/delicious/plugin.h @@ -28,7 +28,7 @@ #include <tdeparts/part.h> #include <tdeparts/factory.h> #include <tdeparts/browserextension.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <dcopobject.h> class TQString; diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp index d1daa3a..e8cf2be 100644 --- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp @@ -27,7 +27,7 @@ #include <tdehtmlview.h> #include <tdelocale.h> #include <tdeapplication.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <ktrader.h> #include <krun.h> #include <tdefilemetainfo.h> @@ -152,8 +152,8 @@ void DefaultPlugin::loadApplications(DOM::HTMLElement node) else{ DOM::DOMString innerHTML; - if(KDesktopFile::isDesktopFile(item->url().path())){ //Desktop file - KDesktopFile desktop(url.path(), true); + if(TDEDesktopFile::isDesktopFile(item->url().path())){ //Desktop file + TDEDesktopFile desktop(url.path(), true); if(desktop.hasApplicationType ()){ MetabarWidget::addEntry(innerHTML, i18n("Run %1").arg(desktop.readName()), "desktop://" + url.path(), desktop.readIcon()); diff --git a/konq-plugins/sidebar/metabar/src/metabar.cpp b/konq-plugins/sidebar/metabar/src/metabar.cpp index bf7b241..5f21fa3 100644 --- a/konq-plugins/sidebar/metabar/src/metabar.cpp +++ b/konq-plugins/sidebar/metabar/src/metabar.cpp @@ -1,4 +1,4 @@ -#include <kinstance.h> +#include <tdeinstance.h> #include <tqstring.h> #include <kimageio.h> #include <tdelocale.h> diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp index ddf6928..3a5826b 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp @@ -46,7 +46,7 @@ #include <ktrader.h> #include <tdelocale.h> #include <krun.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kpropertiesdialog.h> #include <tdeaction.h> #include <tdeactioncollection.h> @@ -356,8 +356,8 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg if(protocol == "desktop"){ TQString path = url.path(); - if(KDesktopFile::isDesktopFile(path)){ - KRun::run(new KDesktopFile(path, true), KURL::List()); + if(TDEDesktopFile::isDesktopFile(path)){ + KRun::run(new TDEDesktopFile(path, true), KURL::List()); } } diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.cpp b/konq-plugins/sidebar/newsticker/sidebar_news.cpp index f701ae2..f8c1ee8 100644 --- a/konq-plugins/sidebar/newsticker/sidebar_news.cpp +++ b/konq-plugins/sidebar/newsticker/sidebar_news.cpp @@ -33,7 +33,7 @@ #include <tdeapplication.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kiconloader.h> #include <tdemacros.h> #include "sidebar_news.h" @@ -53,7 +53,7 @@ namespace KSB_News { // get the application icon // FIXME: as konqueror knows the icon there might be a possibility to // access the already present TQPixmap - KDesktopFile desktopFile(desktopName, true); + TDEDesktopFile desktopFile(desktopName, true); TQString iconName = desktopFile.readIcon(); TDEIconLoader iconLoader; m_appIcon = iconLoader.loadIcon(iconName, TDEIcon::Small); diff --git a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp index 70a2ac5..fe8515b 100644 --- a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp +++ b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp @@ -24,7 +24,7 @@ #include <tdeconfig.h> #include <tdeglobal.h> #include <tdehtml_part.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <tdemessagebox.h> #include <tdepopupmenu.h> diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp index 2edeb8d..2028dae 100644 --- a/konq-plugins/uachanger/uachangerplugin.cpp +++ b/konq-plugins/uachanger/uachangerplugin.cpp @@ -31,7 +31,7 @@ #include <tdeconfig.h> #include <tdeio/job.h> #include <kservice.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdepopupmenu.h> #include <dcopref.h> #include <tdehtml_part.h> diff --git a/konq-plugins/validators/plugin_validators.cpp b/konq-plugins/validators/plugin_validators.cpp index 04a46b9..57d0666 100644 --- a/konq-plugins/validators/plugin_validators.cpp +++ b/konq-plugins/validators/plugin_validators.cpp @@ -26,7 +26,7 @@ /* $Id$ */ -#include <kinstance.h> +#include <tdeinstance.h> #include <tdemessagebox.h> #include <tdelocale.h> #include <tdeaction.h> diff --git a/konq-plugins/webarchiver/archivedialog.cpp b/konq-plugins/webarchiver/archivedialog.cpp index 63ccfe3..04da91b 100644 --- a/konq-plugins/webarchiver/archivedialog.cpp +++ b/konq-plugins/webarchiver/archivedialog.cpp @@ -22,7 +22,7 @@ #include <tqwidget.h> #include <tdehtml_part.h> #include "archiveviewbase.h" -#include <kinstance.h> +#include <tdeinstance.h> #include <tdetempfile.h> #include <ktar.h> diff --git a/konq-plugins/webarchiver/plugin_webarchiver.cpp b/konq-plugins/webarchiver/plugin_webarchiver.cpp index eee557c..82e8593 100644 --- a/konq-plugins/webarchiver/plugin_webarchiver.cpp +++ b/konq-plugins/webarchiver/plugin_webarchiver.cpp @@ -33,7 +33,7 @@ #include <tqfile.h> #include <tdeaction.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdefiledialog.h> #include <tdemessagebox.h> diff --git a/noatun-plugins/synaescope/main.cpp b/noatun-plugins/synaescope/main.cpp index 4871d81..f2f3304 100644 --- a/noatun-plugins/synaescope/main.cpp +++ b/noatun-plugins/synaescope/main.cpp @@ -172,7 +172,7 @@ void warning(const char *str, bool) // fprintf(stderr,"(reason for error: %s)\n",strerror(errno)); } -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include <tdeconfig.h> diff --git a/noatun-plugins/tippercanoe/main.cpp b/noatun-plugins/tippercanoe/main.cpp index 24e81b9..46820e7 100644 --- a/noatun-plugins/tippercanoe/main.cpp +++ b/noatun-plugins/tippercanoe/main.cpp @@ -156,7 +156,7 @@ void warning(const char *, bool) fprintf(stderr,"(reason for error: %s)\n",strerror(errno));*/ } -#include <kinstance.h> +#include <tdeinstance.h> int main() { fcntl(STDIN_FILENO, F_SETFL, fcntl(STDIN_FILENO, F_GETFL) & ~O_NONBLOCK); diff --git a/noatun-plugins/tyler/main.cpp b/noatun-plugins/tyler/main.cpp index 40f639d..4cab74e 100644 --- a/noatun-plugins/tyler/main.cpp +++ b/noatun-plugins/tyler/main.cpp @@ -15,7 +15,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -#include <kinstance.h> +#include <tdeinstance.h> extern "C" { diff --git a/tdefile-plugins/CMakeLists.txt b/tdefile-plugins/CMakeLists.txt index 28a1363..945018e 100644 --- a/tdefile-plugins/CMakeLists.txt +++ b/tdefile-plugins/CMakeLists.txt @@ -6,4 +6,4 @@ add_subdirectory( desktop ) add_subdirectory( folder ) add_subdirectory( lnk ) add_subdirectory( mhtml ) -add_subdirectory( cert ) +tde_conditional_add_subdirectory( WITH_SSL cert ) diff --git a/tdefile-plugins/desktop/tdefile_desktop.cpp b/tdefile-plugins/desktop/tdefile_desktop.cpp index cc3ce93..fa9eb1e 100644 --- a/tdefile-plugins/desktop/tdefile_desktop.cpp +++ b/tdefile-plugins/desktop/tdefile_desktop.cpp @@ -23,7 +23,7 @@ #include <tdelocale.h> #include <kgenericfactory.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kmimetype.h> typedef KGenericFactory<KDotDesktopPlugin> DotDesktopFactory; @@ -66,7 +66,7 @@ bool KDotDesktopPlugin::readInfo( KFileMetaInfo& info, uint ) if ( info.path().isEmpty() ) // remote file return false; - KDesktopFile file(info.path(), true); + TDEDesktopFile file(info.path(), true); TQString s; |