diff options
Diffstat (limited to 'kio/kio')
-rw-r--r-- | kio/kio/CMakeLists.txt | 4 | ||||
-rw-r--r-- | kio/kio/Makefile.am | 6 | ||||
-rw-r--r-- | kio/kio/kdatatool.cpp | 2 | ||||
-rw-r--r-- | kio/kio/kfilemetainfo.cpp | 2 | ||||
-rw-r--r-- | kio/kio/kimageio.cpp | 4 | ||||
-rw-r--r-- | kio/kio/kimageiofactory.h | 2 | ||||
-rw-r--r-- | kio/kio/kmimetype.cpp | 6 | ||||
-rw-r--r-- | kio/kio/kmimetype.h | 2 | ||||
-rw-r--r-- | kio/kio/kmimetypechooser.cpp | 2 | ||||
-rw-r--r-- | kio/kio/kprotocolinfo.h | 4 | ||||
-rw-r--r-- | kio/kio/kservice.cpp | 8 | ||||
-rw-r--r-- | kio/kio/kservice.h | 2 | ||||
-rw-r--r-- | kio/kio/kservicefactory.cpp | 6 | ||||
-rw-r--r-- | kio/kio/kservicefactory.h | 2 | ||||
-rw-r--r-- | kio/kio/kservicegroup.cpp | 2 | ||||
-rw-r--r-- | kio/kio/kservicegroup.h | 6 | ||||
-rw-r--r-- | kio/kio/kservicegroupfactory.cpp | 6 | ||||
-rw-r--r-- | kio/kio/kservicegroupfactory.h | 2 | ||||
-rw-r--r-- | kio/kio/kservicetype.cpp | 4 | ||||
-rw-r--r-- | kio/kio/kservicetype.h | 2 | ||||
-rw-r--r-- | kio/kio/kservicetypefactory.cpp | 6 | ||||
-rw-r--r-- | kio/kio/kservicetypefactory.h | 2 | ||||
-rw-r--r-- | kio/kio/ktrader.h | 2 | ||||
-rw-r--r-- | kio/kio/kurifilter.cpp | 2 | ||||
-rw-r--r-- | kio/kio/kuserprofile.cpp | 2 | ||||
-rw-r--r-- | kio/kio/metainfojob.cpp | 2 |
26 files changed, 45 insertions, 45 deletions
diff --git a/kio/kio/CMakeLists.txt b/kio/kio/CMakeLists.txt index 25d4fad83..1a2c3a263 100644 --- a/kio/kio/CMakeLists.txt +++ b/kio/kio/CMakeLists.txt @@ -90,9 +90,9 @@ tde_add_library( ${target} STATIC_PIC AUTOMOC ) -##### ksycoca ################################### +##### tdesycoca ################################### -set( target ksycoca ) +set( target tdesycoca ) set( ${target}_SRCS kdirwatch.cpp kfileshare.cpp ksambashare.cpp diff --git a/kio/kio/Makefile.am b/kio/kio/Makefile.am index 2034a33b6..63d5fc5d8 100644 --- a/kio/kio/Makefile.am +++ b/kio/kio/Makefile.am @@ -20,11 +20,11 @@ AM_CPPFLAGS = -D_LARGEFILE64_SOURCE INCLUDES= -I$(top_srcdir) -I$(srcdir)/.. -I$(top_srcdir)/tdecore/network -I$(srcdir)/../kssl -I../kssl -I$(srcdir)/../../interfaces $(all_includes) $(SSL_INCLUDES) -noinst_LTLIBRARIES = libkiocore.la libksycoca.la +noinst_LTLIBRARIES = libkiocore.la libtdesycoca.la # convenience lib - no LDFLAGS or LIBADD ! -libksycoca_la_SOURCES = \ +libtdesycoca_la_SOURCES = \ kdirwatch.cpp \ kfileshare.cpp ksambashare.cpp knfsshare.cpp \ ktrader.cpp ktraderparse.cpp ktraderparsetree.cpp \ @@ -43,7 +43,7 @@ libksycoca_la_SOURCES = \ kfilemetainfo.cpp kdcopservicestarter.cpp \ dataslave.cpp dataprotocol.cpp #if USE_POSIX_ACL - libksycoca_la_SOURCES += kacl.cpp posixacladdons.cpp + libtdesycoca_la_SOURCES += kacl.cpp posixacladdons.cpp #endif include_HEADERS = \ diff --git a/kio/kio/kdatatool.cpp b/kio/kio/kdatatool.cpp index 17a220541..08630d110 100644 --- a/kio/kio/kdatatool.cpp +++ b/kio/kio/kdatatool.cpp @@ -26,7 +26,7 @@ #include <kinstance.h> #include <ktrader.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <tqpixmap.h> #include <tqfile.h> diff --git a/kio/kio/kfilemetainfo.cpp b/kio/kio/kfilemetainfo.cpp index 85fb1a37f..a5d34fa07 100644 --- a/kio/kio/kfilemetainfo.cpp +++ b/kio/kio/kfilemetainfo.cpp @@ -27,7 +27,7 @@ #include <ktrader.h> #include <kstaticdeleter.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kuserprofile.h> #include <kdebug.h> #include <kmimetype.h> diff --git a/kio/kio/kimageio.cpp b/kio/kio/kimageio.cpp index cdbaa8ea3..e983cb945 100644 --- a/kio/kio/kimageio.cpp +++ b/kio/kio/kimageio.cpp @@ -24,8 +24,8 @@ #include <klibloader.h> #include <kglobal.h> #include <kmimetype.h> -#include <ksycocaentry.h> -#include <ksycoca.h> +#include <tdesycocaentry.h> +#include <tdesycoca.h> #include <kdebug.h> #include <kstaticdeleter.h> diff --git a/kio/kio/kimageiofactory.h b/kio/kio/kimageiofactory.h index 603ef2c0e..6d2d15940 100644 --- a/kio/kio/kimageiofactory.h +++ b/kio/kio/kimageiofactory.h @@ -8,7 +8,7 @@ #ifndef SSK_KIMGIOFACTORY_H #define SSK_KIMGIOFACTORY_H -#include "ksycocafactory.h" +#include "tdesycocafactory.h" #include "kimageio.h" class KImageIOFormat; diff --git a/kio/kio/kmimetype.cpp b/kio/kio/kmimetype.cpp index 397fbc9e9..c6f879a73 100644 --- a/kio/kio/kmimetype.cpp +++ b/kio/kio/kmimetype.cpp @@ -56,7 +56,7 @@ #include <ksimpleconfig.h> #include <kstandarddirs.h> #include <kurl.h> -#include <ksycoca.h> +#include <tdesycoca.h> #include <kde_file.h> template class KSharedPtr<KMimeType>; @@ -144,7 +144,7 @@ KMimeType::Ptr KMimeType::mimeType( const TQString& _name ) if ( !mime || !mime->isType( KST_KMimeType ) ) { - // When building ksycoca, findServiceTypeByName doesn't create an object + // When building tdesycoca, findServiceTypeByName doesn't create an object // but returns one from a dict. if ( !KSycoca::self()->isBuilding() ) delete mime; @@ -426,7 +426,7 @@ void KMimeType::save( TQDataStream& _str ) { KServiceType::save( _str ); // Warning adding/removing fields here involves a binary incompatible change - update version - // number in ksycoca.h + // number in tdesycoca.h _str << m_lstPatterns; } diff --git a/kio/kio/kmimetype.h b/kio/kio/kmimetype.h index 8302fa8da..19a846b46 100644 --- a/kio/kio/kmimetype.h +++ b/kio/kio/kmimetype.h @@ -29,7 +29,7 @@ #include <kicontheme.h> #include <kurl.h> -#include <ksycocatype.h> +#include <tdesycocatype.h> #include <kservicetype.h> class KSimpleConfig; diff --git a/kio/kio/kmimetypechooser.cpp b/kio/kio/kmimetypechooser.cpp index b22bbd8dc..8ab3a69ee 100644 --- a/kio/kio/kmimetypechooser.cpp +++ b/kio/kio/kmimetypechooser.cpp @@ -25,7 +25,7 @@ #include <kmimetype.h> #include <kprocess.h> #include <krun.h> -#include <ksycoca.h> +#include <tdesycoca.h> #include <tqlabel.h> #include <tqlayout.h> diff --git a/kio/kio/kprotocolinfo.h b/kio/kio/kprotocolinfo.h index 8ce7ce500..10addc610 100644 --- a/kio/kio/kprotocolinfo.h +++ b/kio/kio/kprotocolinfo.h @@ -24,8 +24,8 @@ #include <tqdatastream.h> #include <kurl.h> -#include <ksycocaentry.h> -#include <ksycocatype.h> +#include <tdesycocaentry.h> +#include <tdesycocatype.h> /** * Information about I/O (Internet, etc.) protocols supported by KDE. diff --git a/kio/kio/kservice.cpp b/kio/kio/kservice.cpp index a5216981f..547df4651 100644 --- a/kio/kio/kservice.cpp +++ b/kio/kio/kservice.cpp @@ -51,7 +51,7 @@ #include "kservicetypefactory.h" #include "kservicetype.h" #include "kuserprofile.h" -#include "ksycoca.h" +#include "tdesycoca.h" class KService::KServicePrivate { @@ -336,7 +336,7 @@ void KService::load( TQDataStream& s ) // WARNING: IN KDE 3.x THIS NEEDS TO REMAIN COMPATIBLE WITH KDE 2.x! // !! This data structure should remain binary compatible at all times !! // You may add new fields at the end. Make sure to update the version - // number in ksycoca.h + // number in tdesycoca.h s >> m_strType >> m_strName >> m_strExec >> m_strIcon >> term >> m_strTerminalOptions >> m_strPath >> m_strComment >> m_lstServiceTypes >> def >> m_mapProps @@ -369,7 +369,7 @@ void KService::save( TQDataStream& s ) // WARNING: IN KDE 3.x THIS NEEDS TO REMAIN COMPATIBLE WITH KDE 2.x! // !! This data structure should remain binary compatible at all times !! // You may add new fields at the end. Make sure to update the version - // number in ksycoca.h + // number in tdesycoca.h s << m_strType << m_strName << m_strExec << m_strIcon << term << m_strTerminalOptions << m_strPath << m_strComment << m_lstServiceTypes << def << m_mapProps @@ -879,7 +879,7 @@ void KService::virtual_hook( int id, void* data ) void KService::rebuildKSycoca(TQWidget *parent) { - KServiceProgressDialog dlg(parent, "ksycoca_progress", + KServiceProgressDialog dlg(parent, "tdesycoca_progress", i18n("Updating System Configuration"), i18n("Updating system configuration.")); diff --git a/kio/kio/kservice.h b/kio/kio/kservice.h index 800bacf11..4db478ba6 100644 --- a/kio/kio/kservice.h +++ b/kio/kio/kservice.h @@ -25,7 +25,7 @@ #include <tqvariant.h> #include <kicontheme.h> -#include "ksycocaentry.h" +#include "tdesycocaentry.h" class TQDataStream; class KDesktopFile; diff --git a/kio/kio/kservicefactory.cpp b/kio/kio/kservicefactory.cpp index c5784e65a..f4646fa75 100644 --- a/kio/kio/kservicefactory.cpp +++ b/kio/kio/kservicefactory.cpp @@ -17,9 +17,9 @@ **/ #include "kservicefactory.h" -#include "ksycoca.h" -#include "ksycocatype.h" -#include "ksycocadict.h" +#include "tdesycoca.h" +#include "tdesycocatype.h" +#include "tdesycocadict.h" #include "kservice.h" #include <tqstring.h> diff --git a/kio/kio/kservicefactory.h b/kio/kio/kservicefactory.h index 2fd9dd822..4e6df6534 100644 --- a/kio/kio/kservicefactory.h +++ b/kio/kio/kservicefactory.h @@ -23,7 +23,7 @@ #include <tqstringlist.h> #include "kservice.h" -#include "ksycocafactory.h" +#include "tdesycocafactory.h" #include <assert.h> class KSycoca; diff --git a/kio/kio/kservicegroup.cpp b/kio/kio/kservicegroup.cpp index e85991f82..2e27c99b0 100644 --- a/kio/kio/kservicegroup.cpp +++ b/kio/kio/kservicegroup.cpp @@ -29,7 +29,7 @@ #include "kservicegroupfactory.h" #include "kservicegroup.h" #include "kservice.h" -#include "ksycoca.h" +#include "tdesycoca.h" class KServiceGroup::Private { diff --git a/kio/kio/kservicegroup.h b/kio/kio/kservicegroup.h index 8e2fa42e6..f2cd5a09f 100644 --- a/kio/kio/kservicegroup.h +++ b/kio/kio/kservicegroup.h @@ -28,8 +28,8 @@ #include <kdesktopfile.h> #include <ksortablevaluelist.h> -#include "ksycocaentry.h" -#include "ksycocatype.h" +#include "tdesycocaentry.h" +#include "tdesycocatype.h" #include "kservice.h" class KBuildServiceGroupFactory; @@ -144,7 +144,7 @@ public: /** * Returns true if the NoDisplay flag was set, i.e. if this - * group should be hidden from menus, while still being in ksycoca. + * group should be hidden from menus, while still being in tdesycoca. * @return true to hide this service group, false to display it * @since 3.1 */ diff --git a/kio/kio/kservicegroupfactory.cpp b/kio/kio/kservicegroupfactory.cpp index d27fab3e2..56ec0c07f 100644 --- a/kio/kio/kservicegroupfactory.cpp +++ b/kio/kio/kservicegroupfactory.cpp @@ -17,9 +17,9 @@ **/ #include "kservicegroupfactory.h" -#include "ksycoca.h" -#include "ksycocatype.h" -#include "ksycocadict.h" +#include "tdesycoca.h" +#include "tdesycocatype.h" +#include "tdesycocadict.h" #include "kservice.h" #include <tqstring.h> diff --git a/kio/kio/kservicegroupfactory.h b/kio/kio/kservicegroupfactory.h index 5fad77ce6..77bc7c042 100644 --- a/kio/kio/kservicegroupfactory.h +++ b/kio/kio/kservicegroupfactory.h @@ -22,7 +22,7 @@ #include <tqstringlist.h> #include "kservicegroup.h" -#include "ksycocafactory.h" +#include "tdesycocafactory.h" #include <assert.h> class KSycoca; diff --git a/kio/kio/kservicetype.cpp b/kio/kio/kservicetype.cpp index 994495921..8565029ee 100644 --- a/kio/kio/kservicetype.cpp +++ b/kio/kio/kservicetype.cpp @@ -18,7 +18,7 @@ **/ #include "kservice.h" -#include "ksycoca.h" +#include "tdesycoca.h" #include "kservicetype.h" #include "kservicetypefactory.h" #include "kservicefactory.h" @@ -138,7 +138,7 @@ KServiceType::save( TQDataStream& _str ) KSycocaEntry::save( _str ); // !! This data structure should remain binary compatible at all times !! // You may add new fields at the end. Make sure to update the version - // number in ksycoca.h + // number in tdesycoca.h _str << m_strName << m_strIcon << m_strComment << m_mapProps << m_mapPropDefs << (TQ_INT8)m_bValid; } diff --git a/kio/kio/kservicetype.h b/kio/kio/kservicetype.h index f17eb0394..b1cad7284 100644 --- a/kio/kio/kservicetype.h +++ b/kio/kio/kservicetype.h @@ -21,7 +21,7 @@ #ifndef __kservicetype_h__ #define __kservicetype_h__ -#include "ksycocaentry.h" +#include "tdesycocaentry.h" #include "kservice.h" #include <tqstring.h> diff --git a/kio/kio/kservicetypefactory.cpp b/kio/kio/kservicetypefactory.cpp index f7c0f5969..ecf527384 100644 --- a/kio/kio/kservicetypefactory.cpp +++ b/kio/kio/kservicetypefactory.cpp @@ -17,9 +17,9 @@ **/ #include "kservicetypefactory.h" -#include "ksycoca.h" -#include "ksycocatype.h" -#include "ksycocadict.h" +#include "tdesycoca.h" +#include "tdesycocatype.h" +#include "tdesycocadict.h" #include "kservicetype.h" #include "kmimetype.h" #include "kuserprofile.h" diff --git a/kio/kio/kservicetypefactory.h b/kio/kio/kservicetypefactory.h index b1a3c5dab..e18630b2c 100644 --- a/kio/kio/kservicetypefactory.h +++ b/kio/kio/kservicetypefactory.h @@ -25,7 +25,7 @@ #include <tqstringlist.h> #include <tqvaluevector.h> -#include "ksycocafactory.h" +#include "tdesycocafactory.h" #include "kmimetype.h" class KSycoca; diff --git a/kio/kio/ktrader.h b/kio/kio/ktrader.h index 772f0be3a..98891b48d 100644 --- a/kio/kio/ktrader.h +++ b/kio/kio/ktrader.h @@ -36,7 +36,7 @@ * A few examples will make this a lot more clear. * * Say you have an application that will display HTML. In this - * example, you don't want to link to khtml... and furthermore, you + * example, you don't want to link to tdehtml... and furthermore, you * really don't care if the HTML browser is ours or not, as long as * it works. The way that you formulate your query as well as the way * that you execute the browser depends on whether or not you want the diff --git a/kio/kio/kurifilter.cpp b/kio/kio/kurifilter.cpp index d1425e9eb..5c50f4fa9 100644 --- a/kio/kio/kurifilter.cpp +++ b/kio/kio/kurifilter.cpp @@ -26,7 +26,7 @@ #include <kmimetype.h> #include <klibloader.h> #include <kstaticdeleter.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #ifdef HAVE_ELFICON #include <tqimage.h> diff --git a/kio/kio/kuserprofile.cpp b/kio/kio/kuserprofile.cpp index efc4cbae3..b413b3cd5 100644 --- a/kio/kio/kuserprofile.cpp +++ b/kio/kio/kuserprofile.cpp @@ -98,7 +98,7 @@ void KServiceTypeProfile::initStatic() //static void KServiceTypeProfile::clear() { - // HACK ksycoca may open the dummy db, in such case the first call to ksycoca + // HACK tdesycoca may open the dummy db, in such case the first call to tdesycoca // in initStatic() leads to closing the dummy db and clear() being called // in the middle of it, making s_lstProfiles be NULL if( s_lstProfiles == NULL || s_lstProfiles->count() == 0 ) diff --git a/kio/kio/metainfojob.cpp b/kio/kio/metainfojob.cpp index 3787fac80..d28914f20 100644 --- a/kio/kio/metainfojob.cpp +++ b/kio/kio/metainfojob.cpp @@ -25,7 +25,7 @@ #include <kdebug.h> #include <kfilemetainfo.h> #include <kio/kservice.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <tqtimer.h> |