diff options
Diffstat (limited to 'tdeio')
368 files changed, 3772 insertions, 4404 deletions
diff --git a/tdeio/CMakeL10n.txt b/tdeio/CMakeL10n.txt index c25fe7c6b..673cfe390 100644 --- a/tdeio/CMakeL10n.txt +++ b/tdeio/CMakeL10n.txt @@ -6,3 +6,16 @@ tde_l10n_create_template( ) tde_l10n_auto_add_subdirectories( ) + +tde_l10n_create_template( + CATALOG "desktop_files/tdeio-desktops/" + SOURCES *.desktop *.protocol + EXCLUDES tests/ + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) + +tde_l10n_create_template( + CATALOG "desktop_files/tdeio-kpac-eventsrc/" + SOURCES_DESKTOP misc/kpac/eventsrc + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/tdeio/CMakeLists.txt b/tdeio/CMakeLists.txt index c59b8a39d..26bfc53aa 100644 --- a/tdeio/CMakeLists.txt +++ b/tdeio/CMakeLists.txt @@ -44,17 +44,36 @@ add_custom_target( install( FILES tdeio.magic ${CMAKE_CURRENT_BINARY_DIR}/tdeio.magic.mgc DESTINATION ${CONFIG_INSTALL_DIR}/magic ) -install( FILES +tde_create_translated_desktop( + SOURCE application.desktop kurifilterplugin.desktop kcomprfilter.desktop kscan.desktop kdatatool.desktop tdefileplugin.desktop tdecmodule.desktop - DESTINATION ${SERVICETYPES_INSTALL_DIR} ) + DESTINATION ${SERVICETYPES_INSTALL_DIR} + PO_DIR tdeio-desktops +) install( FILES tdeioslave.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) + install( PROGRAMS useragent.pl proxytype.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) -install( FILES renamedlgplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) -install( FILES kpasswdserver.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) -install( FILES data.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) + +tde_create_translated_desktop( + SOURCE renamedlgplugin.desktop + DESTINATION ${SERVICETYPES_INSTALL_DIR} + PO_DIR tdeio-desktops +) + +tde_create_translated_desktop( + SOURCE kpasswdserver.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/kded + PO_DIR tdeio-desktops +) + +tde_create_translated_desktop( + SOURCE data.protocol + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR tdeio-desktops +) if( HAVE_ELFICON ) @@ -66,12 +85,13 @@ endif( HAVE_ELFICON ) set( target tdeio ) -configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy.cpp COPYONLY ) +configure_file( ${TDE_CMAKE_TEMPLATES}/tde_dummy_cpp.cmake dummy.cpp COPYONLY ) tde_add_library( ${target} SHARED SOURCES ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp VERSION 14.0.0 EMBED kssl-static tdeiocore-static tdesycoca-static kbookmarks-static tdefile-static ${ELFICON_STATIC_LIB} - LINK ltdlc-static tdeui-shared tdesu-shared tdewalletclient-shared ${LIBR_LIBRARIES} ${ACL_LIBRARIES} + LINK tdeui-shared tdewalletclient-shared + LINK_PRIVATE ltdlc-static tdesu-shared ${LIBR_LIBRARIES} ${ACL_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/tdeio/Mainpage.dox b/tdeio/Mainpage.dox index 057833148..493ed76fc 100644 --- a/tdeio/Mainpage.dox +++ b/tdeio/Mainpage.dox @@ -12,7 +12,7 @@ * This library also implements the System Configuration Cache (KSycoca). * * KMimeType: - * The notion of a file type, already existing in Trinity-1.x + * The notion of a file type, already existing in KDE-1.x * * KService: * To a mimetype are bound one or more applications, now called services. diff --git a/tdeio/Makefile.am b/tdeio/Makefile.am index 67a074f2a..b82616c8d 100644 --- a/tdeio/Makefile.am +++ b/tdeio/Makefile.am @@ -61,7 +61,7 @@ dummy.cpp: messages: $(EXTRACTRC) `find . ../tdeioslave -name "*.rc" -o -name "*.ui"` > rc.cpp - $(XGETTEXT) `find . ../tdeioslave -name "*.cpp" -o -name "*.cc" -o -name "*.h"` -o $(podir)/tdeio.pot + $(XGETTEXT) `find . ../tdeioslave -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio.pot rm -f rc.cpp SUFFIXES = .magic .magic.mgc diff --git a/tdeio/application.desktop b/tdeio/application.desktop index 014bc56c3..c3a3dfacf 100644 --- a/tdeio/application.desktop +++ b/tdeio/application.desktop @@ -2,89 +2,6 @@ Type=ServiceType X-TDE-ServiceType=Application Name=Application -Name[af]=Program -Name[ar]=تطبيق -Name[az]=Proqram -Name[be]=Праграма -Name[bg]=Програма -Name[bn]=অ্যাপলিকেশন -Name[br]=Arload -Name[bs]=Program -Name[ca]=Aplicació -Name[cs]=Aplikace -Name[csb]=Programa -Name[cy]=Cymhwysiad -Name[da]=Program -Name[de]=Programm -Name[el]=Εφαρμογή -Name[eo]=Aplikaĵo -Name[es]=Aplicación -Name[et]=Rakendus -Name[eu]=Aplikazioa -Name[fa]=کاربرد -Name[fi]=Sovellus -Name[fy]=Applikaasje -Name[ga]=Feidhmchlár -Name[gl]=Aplicación -Name[he]=יישום -Name[hi]=अनुप्रयोग -Name[hr]=Aplikacija -Name[hu]=alkalmazás -Name[id]=Aplikasi -Name[is]=Forrit -Name[it]=Applicazione -Name[ja]=アプリケーション -Name[ka]=პროგრამა -Name[kk]=Қолданба -Name[km]=កម្មវិធី -Name[ko]=응용 프로그램 -Name[lb]=Programm -Name[lt]=Programa -Name[lv]=Aplikācija -Name[mi]=Utauta -Name[mk]=Апликација -Name[mn]=Программ -Name[ms]=Aplikasi -Name[mt]=Programm -Name[nb]=Program -Name[nds]=Programm -Name[ne]=अनुप्रयोग -Name[nl]=Toepassing -Name[nn]=Program -Name[nso]=Tshomiso -Name[oc]=Aplicacions -Name[pa]=ਕਾਰਜ -Name[pl]=Program -Name[pt]=Aplicação -Name[pt_BR]=Aplicativo -Name[ro]=Aplicaţie -Name[ru]=Приложение -Name[rw]=Porogaramu -Name[se]=Prográmma -Name[sk]=Aplikácia -Name[sl]=Program -Name[sq]=Aplikacion -Name[sr]=Програм -Name[sr@Latn]=Program -Name[ss]=Sicelo -Name[sv]=Program -Name[ta]=பயன்பாடு -Name[te]=కార్యక్రమం -Name[tg]=Гузориш -Name[th]=แอพพลิเคชัน -Name[tr]=Uygulama -Name[tt]=Yazılım -Name[uk]=Програма -Name[uz]=Dastur -Name[uz@cyrillic]=Дастур -Name[ven]=Apulifikhesheni -Name[vi]=Ứng dụng -Name[wa]=Programe -Name[xh]=Isicelo -Name[zh_CN]=应用程序 -Name[zh_HK]=應用程式 -Name[zh_TW]=應用程式 -Name[zu]=Umyaleli [PropertyDef::NoDisplay] Type=bool @@ -127,4 +44,3 @@ Type=bool [PropertyDef::X-TDE-Protocols] Type=TQStringList - diff --git a/tdeio/bookmarks/CMakeLists.txt b/tdeio/bookmarks/CMakeLists.txt index 93121cbac..30ab617a2 100644 --- a/tdeio/bookmarks/CMakeLists.txt +++ b/tdeio/bookmarks/CMakeLists.txt @@ -41,15 +41,14 @@ install( FILES set( target kbookmarks ) set( ${target}_SRCS - kbookmark.cc kbookmarkbar.cc kbookmarkdrag.cc kbookmarkexporter.cc - kbookmarkimporter.cc kbookmarkmanager.cc kbookmarkmenu.cc - kbookmarkimporter_crash.cc kbookmarkimporter_opera.cc - kbookmarkimporter_ie.cc kbookmarkimporter_ns.cc - kbookmarkimporter_kde1.cc kbookmarkdombuilder.cc + kbookmark.cpp kbookmarkbar.cpp kbookmarkdrag.cpp kbookmarkexporter.cpp + kbookmarkimporter.cpp kbookmarkmanager.cpp kbookmarkmenu.cpp + kbookmarkimporter_crash.cpp kbookmarkimporter_opera.cpp + kbookmarkimporter_ie.cpp kbookmarkimporter_ns.cpp + kbookmarkimporter_kde1.cpp kbookmarkdombuilder.cpp kbookmarkmanager.skel kbookmarknotifier.skel ) tde_add_library( ${target} STATIC_PIC AUTOMOC SOURCES ${${target}_SRCS} - DEPENDENCIES dcopidl ) diff --git a/tdeio/bookmarks/Makefile.am b/tdeio/bookmarks/Makefile.am index e1ec3a8df..d3bf34b93 100644 --- a/tdeio/bookmarks/Makefile.am +++ b/tdeio/bookmarks/Makefile.am @@ -31,10 +31,10 @@ include_HEADERS = \ kbookmarkimporter_crash.h kbookmarkimporter_opera.h kbookmarkimporter_ie.h \ kbookmarkimporter_ns.h kbookmarkimporter_kde1.h kbookmarkdombuilder.h libkbookmarks_la_SOURCES = \ - kbookmark.cc kbookmarkbar.cc kbookmarkdrag.cc kbookmarkexporter.cc \ - kbookmarkimporter.cc kbookmarkmanager.cc kbookmarkmenu.cc \ - kbookmarkimporter_crash.cc kbookmarkimporter_opera.cc kbookmarkimporter_ie.cc \ - kbookmarkimporter_ns.cc kbookmarkimporter_kde1.cc kbookmarkdombuilder.cc \ + kbookmark.cpp kbookmarkbar.cpp kbookmarkdrag.cpp kbookmarkexporter.cpp \ + kbookmarkimporter.cpp kbookmarkmanager.cpp kbookmarkmenu.cpp \ + kbookmarkimporter_crash.cpp kbookmarkimporter_opera.cpp kbookmarkimporter_ie.cpp \ + kbookmarkimporter_ns.cpp kbookmarkimporter_kde1.cpp kbookmarkdombuilder.cpp \ kbookmarkmanager.skel kbookmarknotifier.skel include $(top_srcdir)/admin/Doxyfile.am diff --git a/tdeio/bookmarks/dptrtemplate.h b/tdeio/bookmarks/dptrtemplate.h index dbc059e7e..8787b275f 100644 --- a/tdeio/bookmarks/dptrtemplate.h +++ b/tdeio/bookmarks/dptrtemplate.h @@ -1,5 +1,3 @@ -// -*- c-basic-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2003 Alexander Kellett <lypanov@kde.org> diff --git a/tdeio/bookmarks/kbookmark.cc b/tdeio/bookmarks/kbookmark.cpp index 0da05be4f..1e8bf8f7a 100644 --- a/tdeio/bookmarks/kbookmark.cc +++ b/tdeio/bookmarks/kbookmark.cpp @@ -1,5 +1,3 @@ -// -*- c-basic-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE libraries Copyright (C) 2000 David Faure <faure@kde.org> Copyright (C) 2003 Alexander Kellett <lypanov@kde.org> diff --git a/tdeio/bookmarks/kbookmark.h b/tdeio/bookmarks/kbookmark.h index 4e5dc9149..309910c44 100644 --- a/tdeio/bookmarks/kbookmark.h +++ b/tdeio/bookmarks/kbookmark.h @@ -1,5 +1,3 @@ -// -*- c-basic-offset: 4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE libraries Copyright (C) 2000 David Faure <faure@kde.org> diff --git a/tdeio/bookmarks/kbookmarkbar.cc b/tdeio/bookmarks/kbookmarkbar.cpp index 5c5f64ecc..ca4d5d8c0 100644 --- a/tdeio/bookmarks/kbookmarkbar.cc +++ b/tdeio/bookmarks/kbookmarkbar.cpp @@ -1,5 +1,3 @@ -// -*- c-basic-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 1999 Kurt Granroth <granroth@kde.org> Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> @@ -98,8 +96,8 @@ KBookmarkBar::KBookmarkBar( KBookmarkManager* mgr, dptr()->m_actions.setAutoDelete( true ); - connect( mgr, TQT_SIGNAL( changed(const TQString &, const TQString &) ), - TQT_SLOT( slotBookmarksChanged(const TQString &) ) ); + connect( mgr, TQ_SIGNAL( changed(const TQString &, const TQString &) ), + TQ_SLOT( slotBookmarksChanged(const TQString &) ) ); KBookmarkGroup toolbar = getToolbar(); fillBookmarkBar( toolbar ); @@ -200,8 +198,8 @@ void KBookmarkBar::fillBookmarkBar(KBookmarkGroup & parent) else { TDEAction *action = new KBookmarkAction( text, bm.icon(), 0, m_actionCollection, 0 ); - connect(action, TQT_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )), - this, TQT_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) )); + connect(action, TQ_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )), + this, TQ_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) )); action->setProperty( "url", bm.url().url() ); action->setProperty( "address", bm.address() ); @@ -229,10 +227,10 @@ void KBookmarkBar::fillBookmarkBar(KBookmarkGroup & parent) KBookmarkMenu *menu = new KBookmarkMenu(CURRENT_MANAGER(), m_pOwner, action->popupMenu(), m_actionCollection, false, addEntriesBookmarkBar, bm.address()); - connect(menu, TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu * ) ), - this, TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu * ) )); - connect(menu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState) ), - this, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState) )); + connect(menu, TQ_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu * ) ), + this, TQ_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu * ) )); + connect(menu, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState) ), + this, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState) )); menu->fillBookmarkMenu(); action->plug(m_toolBar); m_lstSubMenus.append( menu ); @@ -267,7 +265,7 @@ void KBookmarkBar::slotBookmarkSelected( TDEAction::ActivationReason /*reason*/, void KBookmarkBar::slotBookmarkSelected() { - slotBookmarkSelected(TDEAction::ToolBarActivation, Qt::NoButton); + slotBookmarkSelected(TDEAction::ToolBarActivation, TQt::NoButton); } static const int const_sepId = -9999; // FIXME this is ugly, @@ -458,7 +456,7 @@ bool KBookmarkBar::eventFilter( TQObject *o, TQEvent *e ) // FIXME, see how this holds up on an empty toolbar _a = handleToolbarMouseButton( mev->pos(), dptr()->m_actions, m_pManager, pt ); - if (_a && mev->button() == Qt::RightButton) + if (_a && mev->button() == TQt::RightButton) { dptr()->m_highlightedAddress = _a->property("address").toString(); KBookmark bookmark = m_pManager->findByAddress( dptr()->m_highlightedAddress ); diff --git a/tdeio/bookmarks/kbookmarkbar.h b/tdeio/bookmarks/kbookmarkbar.h index 93241cdaf..7e8190d7b 100644 --- a/tdeio/bookmarks/kbookmarkbar.h +++ b/tdeio/bookmarks/kbookmarkbar.h @@ -1,5 +1,3 @@ -// -*- c-basic-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 1999 Kurt Granroth <granroth@kde.org> @@ -41,7 +39,7 @@ class TQPopupMenu; */ class TDEIO_EXPORT KBookmarkBar : public TQObject { - Q_OBJECT + TQ_OBJECT friend class RMB; public: diff --git a/tdeio/bookmarks/kbookmarkdombuilder.cc b/tdeio/bookmarks/kbookmarkdombuilder.cpp index 5c0882d05..2fddaa861 100644 --- a/tdeio/bookmarks/kbookmarkdombuilder.cc +++ b/tdeio/bookmarks/kbookmarkdombuilder.cpp @@ -36,14 +36,14 @@ KBookmarkDomBuilder::~KBookmarkDomBuilder() { } void KBookmarkDomBuilder::connectImporter(const TQObject *importer) { - connect(importer, TQT_SIGNAL( newBookmark(const TQString &, const TQCString &, const TQString &) ), - TQT_SLOT( newBookmark(const TQString &, const TQCString &, const TQString &) )); - connect(importer, TQT_SIGNAL( newFolder(const TQString &, bool, const TQString &) ), - TQT_SLOT( newFolder(const TQString &, bool, const TQString &) )); - connect(importer, TQT_SIGNAL( newSeparator() ), - TQT_SLOT( newSeparator() ) ); - connect(importer, TQT_SIGNAL( endFolder() ), - TQT_SLOT( endFolder() ) ); + connect(importer, TQ_SIGNAL( newBookmark(const TQString &, const TQCString &, const TQString &) ), + TQ_SLOT( newBookmark(const TQString &, const TQCString &, const TQString &) )); + connect(importer, TQ_SIGNAL( newFolder(const TQString &, bool, const TQString &) ), + TQ_SLOT( newFolder(const TQString &, bool, const TQString &) )); + connect(importer, TQ_SIGNAL( newSeparator() ), + TQ_SLOT( newSeparator() ) ); + connect(importer, TQ_SIGNAL( endFolder() ), + TQ_SLOT( endFolder() ) ); } void KBookmarkDomBuilder::newBookmark( diff --git a/tdeio/bookmarks/kbookmarkdombuilder.h b/tdeio/bookmarks/kbookmarkdombuilder.h index 44fe7b170..185904c09 100644 --- a/tdeio/bookmarks/kbookmarkdombuilder.h +++ b/tdeio/bookmarks/kbookmarkdombuilder.h @@ -28,7 +28,7 @@ * @since 3.2 */ class TDEIO_EXPORT KBookmarkDomBuilder : public TQObject { - Q_OBJECT + TQ_OBJECT public: KBookmarkDomBuilder(const KBookmarkGroup &group, KBookmarkManager *); virtual ~KBookmarkDomBuilder(); diff --git a/tdeio/bookmarks/kbookmarkdrag.cc b/tdeio/bookmarks/kbookmarkdrag.cpp index d13893eed..d5cf6cb47 100644 --- a/tdeio/bookmarks/kbookmarkdrag.cc +++ b/tdeio/bookmarks/kbookmarkdrag.cpp @@ -1,5 +1,3 @@ -// -*- c-basic-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE libraries Copyright (C) 2000 David Faure <faure@kde.org> diff --git a/tdeio/bookmarks/kbookmarkdrag.h b/tdeio/bookmarks/kbookmarkdrag.h index 016bd6849..1b4010603 100644 --- a/tdeio/bookmarks/kbookmarkdrag.h +++ b/tdeio/bookmarks/kbookmarkdrag.h @@ -1,5 +1,3 @@ -// -*- c-basic-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE libraries Copyright (C) 2000 David Faure <faure@kde.org> diff --git a/tdeio/bookmarks/kbookmarkexporter.cc b/tdeio/bookmarks/kbookmarkexporter.cpp index ee33612a2..7f4dca67f 100644 --- a/tdeio/bookmarks/kbookmarkexporter.cc +++ b/tdeio/bookmarks/kbookmarkexporter.cpp @@ -1,5 +1,3 @@ -// -*- c-basic-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE libraries Copyright (C) 2003 Alexander Kellett <lypanov@kde.org> diff --git a/tdeio/bookmarks/kbookmarkexporter.h b/tdeio/bookmarks/kbookmarkexporter.h index 68e8f475a..a19385a71 100644 --- a/tdeio/bookmarks/kbookmarkexporter.h +++ b/tdeio/bookmarks/kbookmarkexporter.h @@ -1,5 +1,3 @@ -// -*- c-basic-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE libraries Copyright (C) 1996-1998 Martin R. Jones <mjones@kde.org> Copyright (C) 2000 David Faure <faure@kde.org> diff --git a/tdeio/bookmarks/kbookmarkimporter.cc b/tdeio/bookmarks/kbookmarkimporter.cpp index 513f89b40..3eb13a501 100644 --- a/tdeio/bookmarks/kbookmarkimporter.cc +++ b/tdeio/bookmarks/kbookmarkimporter.cpp @@ -1,5 +1,3 @@ -// -*- c-basic-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE libraries Copyright (C) 2003 Alexander Kellett <lypanov@kde.org> @@ -72,14 +70,14 @@ void KXBELBookmarkImporterImpl::visitLeave(const KBookmarkGroup &) void KBookmarkImporterBase::setupSignalForwards(TQObject *src, TQObject *dst) { - connect(src, TQT_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) ), - dst, TQT_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) )); - connect(src, TQT_SIGNAL( newFolder( const TQString &, bool, const TQString & ) ), - dst, TQT_SIGNAL( newFolder( const TQString &, bool, const TQString & ) )); - connect(src, TQT_SIGNAL( newSeparator() ), - dst, TQT_SIGNAL( newSeparator() ) ); - connect(src, TQT_SIGNAL( endFolder() ), - dst, TQT_SIGNAL( endFolder() ) ); + connect(src, TQ_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) ), + dst, TQ_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) )); + connect(src, TQ_SIGNAL( newFolder( const TQString &, bool, const TQString & ) ), + dst, TQ_SIGNAL( newFolder( const TQString &, bool, const TQString & ) )); + connect(src, TQ_SIGNAL( newSeparator() ), + dst, TQ_SIGNAL( newSeparator() ) ); + connect(src, TQ_SIGNAL( endFolder() ), + dst, TQ_SIGNAL( endFolder() ) ); } KBookmarkImporterBase* KBookmarkImporterBase::factory( const TQString &type ) diff --git a/tdeio/bookmarks/kbookmarkimporter.h b/tdeio/bookmarks/kbookmarkimporter.h index 6a038e03b..25c223bcb 100644 --- a/tdeio/bookmarks/kbookmarkimporter.h +++ b/tdeio/bookmarks/kbookmarkimporter.h @@ -1,5 +1,3 @@ -// -*- c-basic-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE libraries Copyright (C) 2000 David Faure <faure@kde.org> @@ -24,7 +22,7 @@ #include <tqdom.h> #include <tqcstring.h> #include <tqstringlist.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include "kbookmark.h" @@ -36,7 +34,7 @@ */ class TDEIO_EXPORT KBookmarkImporterBase : public TQObject { - Q_OBJECT + TQ_OBJECT public: KBookmarkImporterBase() {} virtual ~KBookmarkImporterBase() {} @@ -86,7 +84,7 @@ private: */ class TDEIO_EXPORT KXBELBookmarkImporterImpl : public KBookmarkImporterBase, protected KBookmarkGroupTraverser { - Q_OBJECT + TQ_OBJECT public: KXBELBookmarkImporterImpl() {} virtual void parse(); diff --git a/tdeio/bookmarks/kbookmarkimporter_crash.cc b/tdeio/bookmarks/kbookmarkimporter_crash.cpp index 9b0cacf25..ed8620a85 100644 --- a/tdeio/bookmarks/kbookmarkimporter_crash.cc +++ b/tdeio/bookmarks/kbookmarkimporter_crash.cpp @@ -1,5 +1,3 @@ -// -*- c-basic-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE libraries Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org> @@ -25,7 +23,7 @@ #include <tdelocale.h> #include <kdebug.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqfile.h> #include <tqdir.h> #include <tqstring.h> @@ -97,7 +95,7 @@ TQStringList TDECrashBookmarkImporterImpl::getCrashLogs() { TQMap<TQString, bool> activeLogs; - DCOPClient* dcop = kapp->dcopClient(); + DCOPClient* dcop = tdeApp->dcopClient(); QCStringList apps = dcop->registeredApplications(); for ( QCStringList::Iterator it = apps.begin(); it != apps.end(); ++it ) diff --git a/tdeio/bookmarks/kbookmarkimporter_crash.h b/tdeio/bookmarks/kbookmarkimporter_crash.h index ab3e43aea..d3818f3a8 100644 --- a/tdeio/bookmarks/kbookmarkimporter_crash.h +++ b/tdeio/bookmarks/kbookmarkimporter_crash.h @@ -1,5 +1,3 @@ -// -*- c-basic-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE libraries Copyright (C) 2002 Alexander Kellett <lypanov@kde.org> @@ -25,8 +23,8 @@ #include <tqcstring.h> #include <tqstringlist.h> #include <tqmap.h> -#include <ksimpleconfig.h> -#include <kdemacros.h> +#include <tdesimpleconfig.h> +#include <tdemacros.h> #include "kbookmarkimporter.h" @@ -36,7 +34,7 @@ */ class TDEIO_EXPORT_DEPRECATED TDECrashBookmarkImporter : public TQObject { - Q_OBJECT + TQ_OBJECT public: TDECrashBookmarkImporter( const TQString & fileName ) : m_fileName(fileName) {} ~TDECrashBookmarkImporter() {} diff --git a/tdeio/bookmarks/kbookmarkimporter_ie.cc b/tdeio/bookmarks/kbookmarkimporter_ie.cpp index d588517a3..966775e89 100644 --- a/tdeio/bookmarks/kbookmarkimporter_ie.cc +++ b/tdeio/bookmarks/kbookmarkimporter_ie.cpp @@ -1,5 +1,3 @@ -// -*- c-basic-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE libraries Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org> diff --git a/tdeio/bookmarks/kbookmarkimporter_ie.h b/tdeio/bookmarks/kbookmarkimporter_ie.h index b1b7c651c..245968cbc 100644 --- a/tdeio/bookmarks/kbookmarkimporter_ie.h +++ b/tdeio/bookmarks/kbookmarkimporter_ie.h @@ -1,5 +1,3 @@ -// -*- c-basic-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE libraries Copyright (C) 2002 Alexander Kellett <lypanov@kde.org> @@ -24,8 +22,8 @@ #include <tqdom.h> #include <tqcstring.h> #include <tqstringlist.h> -#include <ksimpleconfig.h> -#include <kdemacros.h> +#include <tdesimpleconfig.h> +#include <tdemacros.h> #include <kbookmarkimporter.h> @@ -35,7 +33,7 @@ */ class TDEIO_EXPORT_DEPRECATED KIEBookmarkImporter : public TQObject { - Q_OBJECT + TQ_OBJECT public: KIEBookmarkImporter( const TQString & fileName ) : m_fileName(fileName) {} ~KIEBookmarkImporter() {} diff --git a/tdeio/bookmarks/kbookmarkimporter_kde1.cc b/tdeio/bookmarks/kbookmarkimporter_kde1.cpp index 95937f890..31a68ad73 100644 --- a/tdeio/bookmarks/kbookmarkimporter_kde1.cc +++ b/tdeio/bookmarks/kbookmarkimporter_kde1.cpp @@ -1,5 +1,3 @@ -// -*- c-basic-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE libraries Copyright (C) 2000 David Faure <faure@kde.org> @@ -94,7 +92,7 @@ void KBookmarkImporter::scanIntern( TQDomElement & parentElem, const TQString & || (res->name() == "media/builtin-trash") || (res->name() == "media/builtin-webbrowser") ) { - KSimpleConfig cfg( file.path(), true ); + TDESimpleConfig cfg( file.path(), true ); cfg.setDesktopGroup(); TQString type = cfg.readEntry( "Type" ); // Is it really a bookmark file ? @@ -106,7 +104,7 @@ void KBookmarkImporter::scanIntern( TQDomElement & parentElem, const TQString & else if ( res->name() == "text/plain") { // maybe its an IE Favourite.. - KSimpleConfig cfg( file.path(), true ); + TDESimpleConfig cfg( file.path(), true ); TQStringList grp = cfg.groupList().grep( "internetshortcut", false ); if ( grp.count() == 0 ) continue; @@ -124,7 +122,7 @@ void KBookmarkImporter::scanIntern( TQDomElement & parentElem, const TQString & } void KBookmarkImporter::parseBookmark( TQDomElement & parentElem, TQCString _text, - KSimpleConfig& _cfg, const TQString &_group ) + TDESimpleConfig& _cfg, const TQString &_group ) { if ( !_group.isEmpty() ) _cfg.setGroup( _group ); diff --git a/tdeio/bookmarks/kbookmarkimporter_kde1.h b/tdeio/bookmarks/kbookmarkimporter_kde1.h index 5af4f04e9..0cabcb6cc 100644 --- a/tdeio/bookmarks/kbookmarkimporter_kde1.h +++ b/tdeio/bookmarks/kbookmarkimporter_kde1.h @@ -1,5 +1,3 @@ -// -*- c-basic-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE libraries Copyright (C) 2000 David Faure <faure@kde.org> @@ -24,7 +22,7 @@ #include <tqdom.h> #include <tqcstring.h> #include <tqstringlist.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> /** * A class for importing the previous bookmarks (desktop files) @@ -41,7 +39,7 @@ public: private: void scanIntern( TQDomElement & parentElem, const TQString & _path ); void parseBookmark( TQDomElement & parentElem, TQCString _text, - KSimpleConfig& _cfg, const TQString &_group ); + TDESimpleConfig& _cfg, const TQString &_group ); TQDomDocument * m_pDoc; TQStringList m_lstParsedDirs; }; diff --git a/tdeio/bookmarks/kbookmarkimporter_ns.cc b/tdeio/bookmarks/kbookmarkimporter_ns.cpp index 29960ce51..6e27f364b 100644 --- a/tdeio/bookmarks/kbookmarkimporter_ns.cc +++ b/tdeio/bookmarks/kbookmarkimporter_ns.cpp @@ -1,5 +1,3 @@ -// -*- c-basic-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE libraries Copyright (C) 1996-1998 Martin R. Jones <mjones@kde.org> Copyright (C) 2000 David Faure <faure@kde.org> diff --git a/tdeio/bookmarks/kbookmarkimporter_ns.h b/tdeio/bookmarks/kbookmarkimporter_ns.h index 10844fc63..d3987feef 100644 --- a/tdeio/bookmarks/kbookmarkimporter_ns.h +++ b/tdeio/bookmarks/kbookmarkimporter_ns.h @@ -1,5 +1,3 @@ -// -*- c-basic-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE libraries Copyright (C) 2000 David Faure <faure@kde.org> @@ -24,8 +22,8 @@ #include <tqdom.h> #include <tqcstring.h> #include <tqstringlist.h> -#include <ksimpleconfig.h> -#include <kdemacros.h> +#include <tdesimpleconfig.h> +#include <tdemacros.h> #include "kbookmarkimporter.h" #include "kbookmarkexporter.h" @@ -36,7 +34,7 @@ */ class TDEIO_EXPORT_DEPRECATED KNSBookmarkImporter : public TQObject { - Q_OBJECT + TQ_OBJECT public: KNSBookmarkImporter( const TQString & fileName ) : m_fileName(fileName) {} ~KNSBookmarkImporter() {} diff --git a/tdeio/bookmarks/kbookmarkimporter_opera.cc b/tdeio/bookmarks/kbookmarkimporter_opera.cpp index 0609c7a3b..6f95b399e 100644 --- a/tdeio/bookmarks/kbookmarkimporter_opera.cc +++ b/tdeio/bookmarks/kbookmarkimporter_opera.cpp @@ -1,5 +1,3 @@ -// -*- c-basic-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE libraries Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org> diff --git a/tdeio/bookmarks/kbookmarkimporter_opera.h b/tdeio/bookmarks/kbookmarkimporter_opera.h index f6f1028b1..af552308e 100644 --- a/tdeio/bookmarks/kbookmarkimporter_opera.h +++ b/tdeio/bookmarks/kbookmarkimporter_opera.h @@ -1,5 +1,3 @@ -// -*- c-basic-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE libraries Copyright (C) 2002 Alexander Kellett <lypanov@kde.org> @@ -24,7 +22,7 @@ #include <tqdom.h> #include <tqcstring.h> #include <tqstringlist.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kbookmarkimporter.h> @@ -34,7 +32,7 @@ */ class TDEIO_EXPORT_DEPRECATED KOperaBookmarkImporter : public TQObject { - Q_OBJECT + TQ_OBJECT public: KOperaBookmarkImporter( const TQString & fileName ) : m_fileName(fileName) {} ~KOperaBookmarkImporter() {} diff --git a/tdeio/bookmarks/kbookmarkmanager.cc b/tdeio/bookmarks/kbookmarkmanager.cpp index 47f8c152a..8a73b2b31 100644 --- a/tdeio/bookmarks/kbookmarkmanager.cc +++ b/tdeio/bookmarks/kbookmarkmanager.cpp @@ -1,5 +1,3 @@ -// -*- c-basic-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE libraries Copyright (C) 2000 David Faure <faure@kde.org> Copyright (C) 2003 Alexander Kellett <lypanov@kde.org> @@ -25,12 +23,12 @@ #include "kbookmarkimporter.h" #include <kdebug.h> #include <krun.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ksavefile.h> #include <dcopref.h> #include <tqregexp.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdelocale.h> #include <tdeapplication.h> #include <dcopclient.h> diff --git a/tdeio/bookmarks/kbookmarkmanager.h b/tdeio/bookmarks/kbookmarkmanager.h index 3ce6d572c..fa44f5329 100644 --- a/tdeio/bookmarks/kbookmarkmanager.h +++ b/tdeio/bookmarks/kbookmarkmanager.h @@ -1,5 +1,3 @@ -// -*- c-basic-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE libraries Copyright (C) 2000 David Faure <faure@kde.org> @@ -52,7 +50,7 @@ */ class TDEIO_EXPORT KBookmarkManager : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP protected: /** @@ -352,9 +350,9 @@ protected: */ class TDEIO_EXPORT KExtendedBookmarkOwner : public TQObject, virtual public KBookmarkOwner { - Q_OBJECT + TQ_OBJECT public: - typedef TQValueList<QPair<TQString,TQString> > QStringPairList; + typedef TQValueList<TQPair<TQString,TQString> > QStringPairList; public slots: void fillBookmarksList( KExtendedBookmarkOwner::QStringPairList & list ) { emit signalFillBookmarksList( list ); }; signals: diff --git a/tdeio/bookmarks/kbookmarkmenu.cc b/tdeio/bookmarks/kbookmarkmenu.cpp index 6e3450677..6eedb2ca0 100644 --- a/tdeio/bookmarks/kbookmarkmenu.cc +++ b/tdeio/bookmarks/kbookmarkmenu.cpp @@ -1,5 +1,3 @@ -// -*- c-basic-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> @@ -96,9 +94,9 @@ KBookmarkMenu::KBookmarkMenu( KBookmarkManager* mgr, if (m_actionCollection) { m_actionCollection->setHighlightingEnabled(true); - disconnect( m_actionCollection, TQT_SIGNAL( actionHighlighted( TDEAction * ) ), 0, 0 ); - connect( m_actionCollection, TQT_SIGNAL( actionHighlighted( TDEAction * ) ), - this, TQT_SLOT( slotActionHighlighted( TDEAction * ) ) ); + disconnect( m_actionCollection, TQ_SIGNAL( actionHighlighted( TDEAction * ) ), 0, 0 ); + connect( m_actionCollection, TQ_SIGNAL( actionHighlighted( TDEAction * ) ), + this, TQ_SLOT( slotActionHighlighted( TDEAction * ) ) ); } m_bNSBookmark = m_parentAddress.isNull(); @@ -106,20 +104,20 @@ KBookmarkMenu::KBookmarkMenu( KBookmarkManager* mgr, { //kdDebug(7043) << "KBookmarkMenu::KBookmarkMenu " << this << " address : " << m_parentAddress << endl; - connect( _parentMenu, TQT_SIGNAL( aboutToShow() ), - TQT_SLOT( slotAboutToShow() ) ); + connect( _parentMenu, TQ_SIGNAL( aboutToShow() ), + TQ_SLOT( slotAboutToShow() ) ); if ( KBookmarkSettings::self()->m_contextmenu ) { (void) _parentMenu->contextMenu(); - connect( _parentMenu, TQT_SIGNAL( aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*) ), - this, TQT_SLOT( slotAboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*) )); + connect( _parentMenu, TQ_SIGNAL( aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*) ), + this, TQ_SLOT( slotAboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*) )); } if ( m_bIsRoot ) { - connect( m_pManager, TQT_SIGNAL( changed(const TQString &, const TQString &) ), - TQT_SLOT( slotBookmarksChanged(const TQString &) ) ); + connect( m_pManager, TQ_SIGNAL( changed(const TQString &, const TQString &) ), + TQ_SLOT( slotBookmarksChanged(const TQString &) ) ); } } @@ -256,12 +254,12 @@ void RMB::fillContextMenu( TQPopupMenu* contextMenu, const TQString & address, i // TODO rename these, but, message freeze... umm... // if (bookmark.isGroup()) { - id = contextMenu->insertItem( SmallIcon("bookmark_add"), i18n( "Add Bookmark Here" ), recv, TQT_SLOT(slotRMBActionInsert(int)) ); + id = contextMenu->insertItem( SmallIcon("bookmark_add"), i18n( "Add Bookmark Here" ), recv, TQ_SLOT(slotRMBActionInsert(int)) ); contextMenu->setItemParameter( id, val ); /* } else { - id = contextMenu->insertItem( SmallIcon("bookmark_add"), i18n( "Add Bookmark Here" ), recv, TQT_SLOT(slotRMBActionInsert(int)) ); + id = contextMenu->insertItem( SmallIcon("bookmark_add"), i18n( "Add Bookmark Here" ), recv, TQ_SLOT(slotRMBActionInsert(int)) ); contextMenu->setItemParameter( id, val ); }*/ } @@ -273,24 +271,24 @@ void RMB::fillContextMenu2( TQPopupMenu* contextMenu, const TQString & address, int id; if (bookmark.isGroup()) { - id = contextMenu->insertItem( i18n( "Open Folder in Bookmark Editor" ), recv, TQT_SLOT(slotRMBActionEditAt(int)) ); + id = contextMenu->insertItem( i18n( "Open Folder in Bookmark Editor" ), recv, TQ_SLOT(slotRMBActionEditAt(int)) ); contextMenu->setItemParameter( id, val ); contextMenu->insertSeparator(); - id = contextMenu->insertItem( SmallIcon("edit-delete"), i18n( "Delete Folder" ), recv, TQT_SLOT(slotRMBActionRemove(int)) ); + id = contextMenu->insertItem( SmallIcon("edit-delete"), i18n( "Delete Folder" ), recv, TQ_SLOT(slotRMBActionRemove(int)) ); contextMenu->setItemParameter( id, val ); contextMenu->insertSeparator(); - id = contextMenu->insertItem( i18n( "Properties" ), recv, TQT_SLOT(slotRMBActionProperties(int)) ); + id = contextMenu->insertItem( i18n( "Properties" ), recv, TQ_SLOT(slotRMBActionProperties(int)) ); contextMenu->setItemParameter( id, val ); } else { - id = contextMenu->insertItem( i18n( "Copy Link Address" ), recv, TQT_SLOT(slotRMBActionCopyLocation(int)) ); + id = contextMenu->insertItem( i18n( "Copy Link Address" ), recv, TQ_SLOT(slotRMBActionCopyLocation(int)) ); contextMenu->setItemParameter( id, val ); contextMenu->insertSeparator(); - id = contextMenu->insertItem( SmallIcon("edit-delete"), i18n( "Delete Bookmark" ), recv, TQT_SLOT(slotRMBActionRemove(int)) ); + id = contextMenu->insertItem( SmallIcon("edit-delete"), i18n( "Delete Bookmark" ), recv, TQ_SLOT(slotRMBActionRemove(int)) ); contextMenu->setItemParameter( id, val ); contextMenu->insertSeparator(); - id = contextMenu->insertItem( i18n( "Properties" ), recv, TQT_SLOT(slotRMBActionProperties(int)) ); + id = contextMenu->insertItem( i18n( "Properties" ), recv, TQ_SLOT(slotRMBActionProperties(int)) ); contextMenu->setItemParameter( id, val ); } } @@ -403,9 +401,9 @@ void RMB::slotRMBActionCopyLocation( int val ) if ( !bookmark.isGroup() ) { - kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), + tdeApp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), TQClipboard::Selection ); - kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), + tdeApp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), TQClipboard::Clipboard ); } } @@ -480,7 +478,7 @@ void KBookmarkMenu::refill() void KBookmarkMenu::addAddBookmarksList() { - if (!kapp->authorizeTDEAction("bookmarks")) + if (!tdeApp->authorizeTDEAction("bookmarks")) return; TQString title = i18n( "Bookmark Tabs as Folder..." ); @@ -489,7 +487,7 @@ void KBookmarkMenu::addAddBookmarksList() "bookmarks_list_add", 0, this, - TQT_SLOT( slotAddBookmarksList() ), + TQ_SLOT( slotAddBookmarksList() ), m_actionCollection, m_bIsRoot ? "add_bookmarks_list" : 0 ); paAddBookmarksList->setToolTip( i18n( "Add a folder of bookmarks for all open tabs." ) ); @@ -500,7 +498,7 @@ void KBookmarkMenu::addAddBookmarksList() void KBookmarkMenu::addAddBookmark() { - if (!kapp->authorizeTDEAction("bookmarks")) + if (!tdeApp->authorizeTDEAction("bookmarks")) return; TQString title = i18n( "Add Bookmark" ); @@ -509,7 +507,7 @@ void KBookmarkMenu::addAddBookmark() "bookmark_add", m_bIsRoot && m_bAddShortcuts ? TDEStdAccel::addBookmark() : TDEShortcut(), this, - TQT_SLOT( slotAddBookmark() ), + TQ_SLOT( slotAddBookmark() ), m_actionCollection, m_bIsRoot ? "add_bookmark" : 0 ); paAddBookmarks->setToolTip( i18n( "Add a bookmark for the current document" ) ); @@ -520,10 +518,10 @@ void KBookmarkMenu::addAddBookmark() void KBookmarkMenu::addEditBookmarks() { - if (!kapp->authorizeTDEAction("bookmarks")) + if (!tdeApp->authorizeTDEAction("bookmarks")) return; - TDEAction * m_paEditBookmarks = KStdAction::editBookmarks( m_pManager, TQT_SLOT( slotEditBookmarks() ), + TDEAction * m_paEditBookmarks = KStdAction::editBookmarks( m_pManager, TQ_SLOT( slotEditBookmarks() ), m_actionCollection, "edit_bookmarks" ); m_paEditBookmarks->plug( m_parentMenu ); m_paEditBookmarks->setToolTip( i18n( "Edit your bookmark collection in a separate window" ) ); @@ -532,7 +530,7 @@ void KBookmarkMenu::addEditBookmarks() void KBookmarkMenu::addNewFolder() { - if (!kapp->authorizeTDEAction("bookmarks")) + if (!tdeApp->authorizeTDEAction("bookmarks")) return; TQString title = i18n( "&New Bookmark Folder..." ); @@ -544,7 +542,7 @@ void KBookmarkMenu::addNewFolder() "folder-new", //"folder", 0, this, - TQT_SLOT( slotNewFolder() ), + TQ_SLOT( slotNewFolder() ), m_actionCollection ); paNewFolder->setToolTip( i18n( "Create a new bookmark folder in this menu" ) ); @@ -555,7 +553,7 @@ void KBookmarkMenu::addNewFolder() void KBookmarkMenu::fillBookmarkMenu() { - if (!kapp->authorizeTDEAction("bookmarks")) + if (!tdeApp->authorizeTDEAction("bookmarks")) return; if ( m_bIsRoot ) @@ -609,11 +607,11 @@ void KBookmarkMenu::fillBookmarkMenu() new KBookmarkMenu( m_pManager, m_pOwner, actionMenu->popupMenu(), m_actionCollection, false, m_bAddBookmark, TQString::null ); - connect( subMenu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ), - this, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) )); + connect( subMenu, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ), + this, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) )); m_lstSubMenus.append(subMenu); - connect(actionMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), subMenu, TQT_SLOT(slotNSLoad())); + connect(actionMenu->popupMenu(), TQ_SIGNAL(aboutToShow()), subMenu, TQ_SLOT(slotNSLoad())); } } @@ -639,8 +637,8 @@ void KBookmarkMenu::fillBookmarkMenu() { //kdDebug(7043) << "Creating URL bookmark menu item for " << bm.text() << endl; TDEAction * action = new KBookmarkAction( text, bm.icon(), 0, m_actionCollection, 0 ); - connect(action, TQT_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )), - this, TQT_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) )); + connect(action, TQ_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )), + this, TQ_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) )); action->setProperty( "url", bm.url().url() ); action->setProperty( "address", bm.address() ); @@ -666,10 +664,10 @@ void KBookmarkMenu::fillBookmarkMenu() m_bAddBookmark, bm.address() ); - connect(subMenu, TQT_SIGNAL( aboutToShowContextMenu( const KBookmark &, TQPopupMenu * ) ), - this, TQT_SIGNAL( aboutToShowContextMenu( const KBookmark &, TQPopupMenu * ) )); - connect(subMenu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ), - this, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) )); + connect(subMenu, TQ_SIGNAL( aboutToShowContextMenu( const KBookmark &, TQPopupMenu * ) ), + this, TQ_SIGNAL( aboutToShowContextMenu( const KBookmark &, TQPopupMenu * ) )); + connect(subMenu, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ), + this, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) )); m_lstSubMenus.append( subMenu ); } } @@ -758,7 +756,7 @@ void KBookmarkMenu::slotBookmarkSelected( TDEAction::ActivationReason /*reason*/ void KBookmarkMenu::slotBookmarkSelected() { - slotBookmarkSelected(TDEAction::PopupMenuActivation, Qt::NoButton); + slotBookmarkSelected(TDEAction::PopupMenuActivation, TQt::NoButton); } KExtendedBookmarkOwner* KBookmarkMenu::extOwner() @@ -769,7 +767,7 @@ KExtendedBookmarkOwner* KBookmarkMenu::extOwner() void KBookmarkMenu::slotNSLoad() { // only fill menu once - m_parentMenu->disconnect(TQT_SIGNAL(aboutToShow())); + m_parentMenu->disconnect(TQ_SIGNAL(aboutToShow())); // not NSImporter, but kept old name for BC reasons KBookmarkMenuNSImporter importer( m_pManager, this, m_actionCollection ); @@ -848,10 +846,10 @@ KBookmarkEditDialog::KBookmarkEditDialog(const TQString& title, const TQString& if ( editType == InsertionMode ) { m_folderTree = KBookmarkFolderTree::createTree( m_mgr, m_main, name, m_address ); - connect( m_folderTree, TQT_SIGNAL( doubleClicked(TQListViewItem*) ), - this, TQT_SLOT( slotDoubleClicked(TQListViewItem*) ) ); + connect( m_folderTree, TQ_SIGNAL( doubleClicked(TQListViewItem*) ), + this, TQ_SLOT( slotDoubleClicked(TQListViewItem*) ) ); vbox->addWidget( m_folderTree ); - connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotUser1() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( slotUser1() ) ); } } @@ -1045,12 +1043,12 @@ void KBookmarkMenuNSImporter::openBookmarks( const TQString &location, const TQS void KBookmarkMenuNSImporter::connectToImporter(const TQObject &importer) { - connect( &importer, TQT_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) ), - TQT_SLOT( newBookmark( const TQString &, const TQCString &, const TQString & ) ) ); - connect( &importer, TQT_SIGNAL( newFolder( const TQString &, bool, const TQString & ) ), - TQT_SLOT( newFolder( const TQString &, bool, const TQString & ) ) ); - connect( &importer, TQT_SIGNAL( newSeparator() ), TQT_SLOT( newSeparator() ) ); - connect( &importer, TQT_SIGNAL( endFolder() ), TQT_SLOT( endFolder() ) ); + connect( &importer, TQ_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) ), + TQ_SLOT( newBookmark( const TQString &, const TQCString &, const TQString & ) ) ); + connect( &importer, TQ_SIGNAL( newFolder( const TQString &, bool, const TQString & ) ), + TQ_SLOT( newFolder( const TQString &, bool, const TQString & ) ) ); + connect( &importer, TQ_SIGNAL( newSeparator() ), TQ_SLOT( newSeparator() ) ); + connect( &importer, TQ_SIGNAL( endFolder() ), TQ_SLOT( endFolder() ) ); } void KBookmarkMenuNSImporter::newBookmark( const TQString & text, const TQCString & url, const TQString & ) @@ -1058,8 +1056,8 @@ void KBookmarkMenuNSImporter::newBookmark( const TQString & text, const TQCStrin TQString _text = KStringHandler::csqueeze(text); _text.replace( '&', "&&" ); TDEAction * action = new KBookmarkAction(_text, "text-html", 0, 0, "", m_actionCollection, 0); - connect(action, TQT_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )), - m_menu, TQT_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) )); + connect(action, TQ_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )), + m_menu, TQ_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) )); action->setProperty( "url", url ); action->setToolTip( url ); action->plug( mstack.top()->m_parentMenu ); @@ -1076,8 +1074,8 @@ void KBookmarkMenuNSImporter::newFolder( const TQString & text, bool, const TQSt KBookmarkMenu *subMenu = new KBookmarkMenu( m_pManager, m_menu->m_pOwner, actionMenu->popupMenu(), m_actionCollection, false, m_menu->m_bAddBookmark, TQString::null ); - connect( subMenu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ), - m_menu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) )); + connect( subMenu, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ), + m_menu, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) )); mstack.top()->m_lstSubMenus.append( subMenu ); mstack.push(subMenu); diff --git a/tdeio/bookmarks/kbookmarkmenu.h b/tdeio/bookmarks/kbookmarkmenu.h index aeed441b0..77a5c19e4 100644 --- a/tdeio/bookmarks/kbookmarkmenu.h +++ b/tdeio/bookmarks/kbookmarkmenu.h @@ -1,5 +1,3 @@ -// -*- c-basic-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> @@ -78,7 +76,7 @@ namespace TDEIO { class Job; } */ class TDEIO_EXPORT KBookmarkMenu : public TQObject { - Q_OBJECT + TQ_OBJECT friend class KBookmarkMenuNSImporter; friend class RMB; public: @@ -240,7 +238,7 @@ protected: */ class TDEIO_EXPORT KBookmarkMenuNSImporter : public TQObject { - Q_OBJECT + TQ_OBJECT public: KBookmarkMenuNSImporter( KBookmarkManager* mgr, KBookmarkMenu * menu, TDEActionCollection * act ) : m_menu(menu), m_actionCollection(act), m_pManager(mgr) {} diff --git a/tdeio/bookmarks/kbookmarkmenu_p.h b/tdeio/bookmarks/kbookmarkmenu_p.h index b47af8ebf..7439a556b 100644 --- a/tdeio/bookmarks/kbookmarkmenu_p.h +++ b/tdeio/bookmarks/kbookmarkmenu_p.h @@ -1,5 +1,3 @@ -// -*- c-basic-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE project Copyright (C) 2003 Alexander Kellett <lypanov@kde.org> @@ -53,7 +51,7 @@ class KBookmarkBar; class TDEPopupMenu; class KImportedBookmarksActionMenu : public TDEActionMenu { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString type READ type WRITE setType ) TQ_PROPERTY( TQString location READ location WRITE setLocation ) public: @@ -74,7 +72,7 @@ public: }; class KBookmarkActionMenu : public TDEActionMenu { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString url READ url WRITE setUrl ) TQ_PROPERTY( TQString address READ address WRITE setAddress ) TQ_PROPERTY( bool readOnly READ readOnly WRITE setReadOnly ) @@ -99,7 +97,7 @@ public: }; class KBookmarkAction : public TDEAction { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString url READ url WRITE setUrl ) TQ_PROPERTY( TQString address READ address WRITE setAddress ) public: @@ -137,7 +135,7 @@ public: class KBookmarkEditDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: typedef enum { ModifyMode, InsertionMode } BookmarkEditType; diff --git a/tdeio/bookmarks/kbookmarknotifier.h b/tdeio/bookmarks/kbookmarknotifier.h index f99e570bc..038b3565b 100644 --- a/tdeio/bookmarks/kbookmarknotifier.h +++ b/tdeio/bookmarks/kbookmarknotifier.h @@ -1,5 +1,3 @@ -// -*- c-basic-offset:4; indent-tabs-mode:nil -*- -// vim: set ts=4 sts=4 sw=4 et: /* This file is part of the KDE libraries Copyright (C) 2001, 2003 Alexander Kellett <lypanov@kde.org> diff --git a/tdeio/data.protocol b/tdeio/data.protocol index 37a32a99f..df120809a 100644 --- a/tdeio/data.protocol +++ b/tdeio/data.protocol @@ -6,65 +6,6 @@ reading=true Icon=www Class=:internet Description=A tdeioslave for data URIs (rfc2397) -Description[af]= ´n tdeioslave vir data URIs (rfc2397) -Description[be]=Модуль tdeioslave для URI з даннямі (rfc2397) -Description[br]=Ur tdeioslave evit an URIoù roadoù (rfc2397) -Description[bs]=Kioslave za data URIs (rfc2397) -Description[ca]=Un tdeioslave per a URIs de dades (rfc2397) -Description[cs]=Kioslave pro datová URI (rfc2397) -Description[csb]=Plugins protokółu pòdôwków URI (rfc2397) -Description[da]=En tdeioslave for data-URI'er (rfc2397) -Description[de]=Ein-/Ausgabemodul für Daten-URIs (rfc2397) -Description[el]=Ένα tdeioslave για URI δεδομένων (rfc2397) -Description[es]=Un tdeioslave para datos URIs (rfc2397) -Description[et]=Andme-URI-de I/O-moodul (rfc2397) -Description[eu]=Datuen URLen (rfc2397) tdeioslave-a -Description[fa]=یک tdeioslave برای URIهای داده )rfc2397( -Description[fi]=tdeioslave data URI:lle (rfc2397) -Description[fr]=Un module d'entrée / sortie pour les URI de données (rfc2397) -Description[fy]=In tdeioslave foar data-URI-adresse (rfc2397) -Description[gl]=Un tdeioslave para URIs de dados (rfc2397) -Description[hi]=डाटा यूआरआई (आरएफसी2397) के लिए एक के-आई-ओ-स्लेव -Description[hr]=tdeioslave za podatkovne URI-ije (rfc2397) -Description[hu]=TDE-protokoll adat-URI-k használataához (RFC 2397) -Description[id]=Kioslave for URI data (rfc2397) -Description[is]=tdeioslave fyrir gagnaslóðir (rfc2397) -Description[it]=Un tdeioslave per il protocollo di URI di dati (rfc2397) -Description[ja]=データ URIs (rfc2397) の tdeioslave -Description[ka]=URI მონაცემთა (rfc2397) დამმუშავებელი -Description[kk]=URI деректерді өңдеу tdeioslave модулі (rfc2397) -Description[km]=tdeioslave មួយសម្រាប់ទិន្នន័យ URIs (rfc2397) -Description[lb]=E tdeioslave fir Donnéen-URIs (rfc2397) -Description[lt]=Antrinė TDE programa duomenų URI (rfc2397) -Description[mk]=tdeio-служител за податочни URI (rfc2397) -Description[ms]=Kioslave untuk URI data (rfc2397) -Description[nb]=tdeioslave for data URI-er (rfc2397) -Description[nds]=In-/Utgaavmoduul för Daten-URIs (rfc2397) -Description[ne]=डेटा URIs का लागि किओस्लेभ (rfc2397) -Description[nl]=Een tdeioslave voor data-URI-adressen (rfc2397) -Description[nn]=A tdeioslave for data URI-ar (rfc2397) -Description[pa]= ਡਾਟਾ URI ਲਈ tdeioslave(rfc2397) -Description[pl]=Wtyczka protokołu URI danych (rfc2397) -Description[pt]=Um 'tdeioslave' para URIs data (rfc2397) -Description[pt_BR]=Uma implementação para o protocolo de URIs de dados (rfc2397) -Description[ro]=Un dispozitiv de I/E pentru URI-urile de date (rfc2397) -Description[ru]=Обработчик URI данных (rfc2397) -Description[rw]=Kioslave y'ibyatanzwe URI (rfc2397) -Description[se]=kiošláva dáhta-URI:aid várás (rfc2397) -Description[sk]=IO klient pre dátové URI (rfc2397) -Description[sl]=tdeioslave za podatkovne URI-je (rfc2397) -Description[sr]=tdeioslave за URI-ије података (rfc2397) -Description[sr@Latn]=tdeioslave za URI-ije podataka (rfc2397) -Description[sv]=En I/O-slav för datawebbadresser (RFC 2397) -Description[ta]=தரவு வலைமனைகளுக்கான ஒரு tdeioslave (rfc2397) -Description[te]=దత్తాంశం యుఆరైల కొరకు కెఐఓబానిస (rfc2397) -Description[tg]=tdeioslave барои URIs (rfc2397) -Description[th]=tdeioslave สำหรับข้อมูล URIs (rfc2397) -Description[tr]= Veri adresleri için bir tdeioslave (rfc2397) -Description[tt]=Biremle URI öçen tdeioslave (rfc2397) -Description[uk]=Підлеглий В/В для адрес (URI) даних (rfc2397) -Description[vi]=Một tdeioslave cho các địa điểm URI kiểu dữ liệu (rfc2397). -Description[zh_CN]=data URI(rfc2397) 的 tdeioslave X-DocPath=tdeioslave/data/index.html URIMode=rawuri defaultMimetype=application/octet-stream diff --git a/tdeio/httpfilter/CMakeLists.txt b/tdeio/httpfilter/CMakeLists.txt index b40f10fdc..70564652e 100644 --- a/tdeio/httpfilter/CMakeLists.txt +++ b/tdeio/httpfilter/CMakeLists.txt @@ -24,7 +24,7 @@ include_directories( set( target httpfilter ) set( ${target}_SRCS - httpfilter.cc + httpfilter.cpp ) tde_add_library( ${target} STATIC_PIC AUTOMOC diff --git a/tdeio/httpfilter/Makefile.am b/tdeio/httpfilter/Makefile.am index 2da25d1b6..b80ed9d71 100644 --- a/tdeio/httpfilter/Makefile.am +++ b/tdeio/httpfilter/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = $(all_includes) METASOURCES = AUTO noinst_LTLIBRARIES = libhttpfilter.la -libhttpfilter_la_SOURCES = httpfilter.cc +libhttpfilter_la_SOURCES = httpfilter.cpp libhttpfilter_la_LIBADD = $(LIBZ) libhttpfilter_la_LDFLAGS = $(all_libraries) diff --git a/tdeio/httpfilter/httpfilter.cc b/tdeio/httpfilter/httpfilter.cpp index 0f6a45790..a2ed52f43 100644 --- a/tdeio/httpfilter/httpfilter.cc +++ b/tdeio/httpfilter/httpfilter.cpp @@ -37,8 +37,8 @@ void HTTPFilterBase::chain(HTTPFilterBase *previous) { last = previous; - connect(last, TQT_SIGNAL(output(const TQByteArray &)), - this, TQT_SLOT(slotInput(const TQByteArray &))); + connect(last, TQ_SIGNAL(output(const TQByteArray &)), + this, TQ_SLOT(slotInput(const TQByteArray &))); } HTTPFilterChain::HTTPFilterChain() @@ -55,14 +55,14 @@ HTTPFilterChain::addFilter(HTTPFilterBase *filter) } else { - disconnect(last, TQT_SIGNAL(output(const TQByteArray &)), 0, 0); + disconnect(last, TQ_SIGNAL(output(const TQByteArray &)), 0, 0); filter->chain(last); } last = filter; - connect(filter, TQT_SIGNAL(output(const TQByteArray &)), - this, TQT_SIGNAL(output(const TQByteArray &))); - connect(filter, TQT_SIGNAL(error(int, const TQString &)), - this, TQT_SIGNAL(error(int, const TQString &))); + connect(filter, TQ_SIGNAL(output(const TQByteArray &)), + this, TQ_SIGNAL(output(const TQByteArray &))); + connect(filter, TQ_SIGNAL(error(int, const TQString &)), + this, TQ_SIGNAL(error(int, const TQString &))); } void diff --git a/tdeio/httpfilter/httpfilter.h b/tdeio/httpfilter/httpfilter.h index 520a1c627..ee71a6ecd 100644 --- a/tdeio/httpfilter/httpfilter.h +++ b/tdeio/httpfilter/httpfilter.h @@ -35,7 +35,7 @@ class HTTPFilterBase : public TQObject { - Q_OBJECT + TQ_OBJECT public: HTTPFilterBase(); ~HTTPFilterBase(); @@ -55,7 +55,7 @@ protected: class HTTPFilterChain : public HTTPFilterBase { - Q_OBJECT + TQ_OBJECT public: HTTPFilterChain(); @@ -70,7 +70,7 @@ private: class HTTPFilterMD5 : public HTTPFilterBase { - Q_OBJECT + TQ_OBJECT public: HTTPFilterMD5(); @@ -86,7 +86,7 @@ private: class HTTPFilterGZip : public HTTPFilterBase { - Q_OBJECT + TQ_OBJECT public: HTTPFilterGZip(); ~HTTPFilterGZip(); @@ -111,7 +111,7 @@ protected: class HTTPFilterDeflate : public HTTPFilterGZip { - Q_OBJECT + TQ_OBJECT public: HTTPFilterDeflate(); }; diff --git a/tdeio/kcomprfilter.desktop b/tdeio/kcomprfilter.desktop index 017bf987d..e1a12ff72 100644 --- a/tdeio/kcomprfilter.desktop +++ b/tdeio/kcomprfilter.desktop @@ -2,81 +2,3 @@ Type=ServiceType X-TDE-ServiceType=TDECompressionFilter Name=TDE Compression Filter -Name[af]=TDE Kompakteer Filter -Name[az]=TDE Sıxışdırma Filtri -Name[bg]=Компресиращ филтър -Name[bn]=কে.ডি.ই. সংকোচন ফিল্টার -Name[bs]=TDE filter za kompresovanje -Name[ca]=Filtre de compressió per al TDE -Name[cs]=Kompresní filtr TDE -Name[csb]=Filter kòmpresëji TDE -Name[cy]=Hidl Cywasgiad TDE -Name[da]=TDE Komprimeringsfilter -Name[de]=TDE-Komprimierungsfilter -Name[el]=Φίλτρο συμπίεσης του TDE -Name[eo]=TDE-kunpremo-filtrilo -Name[es]=Filtro de compresión de TDE -Name[et]=TDE pakkimise filter -Name[eu]=TDEren konpresio-iragazkia -Name[fa]=پالایۀ فشردهسازی TDE -Name[fi]=TDE:n pakkaussuodin -Name[fr]=Filtre de compression de TDE -Name[fy]=TDE kompresjefilter -Name[ga]=Scagaire Comhbhrúite TDE -Name[gl]=Filtro de Compresón de TDE -Name[he]=מסנן הדחיסה של TDE -Name[hi]=केडीई कंप्रेशन फ़िल्टर -Name[hr]=TDE filtr kompresije -Name[hu]=TDE tömörítésszűrő -Name[id]=Filter Kompresi TDE -Name[is]=TDE þjöppunarsía -Name[it]=Filtro di compressione TDE -Name[ja]=TDE 圧縮フィルタ -Name[ka]=TDE-ს შეკუმშვის ფილტრი -Name[kk]=TDE сығу сүзгісі -Name[km]=តម្រងបង្ហាប់ TDE -Name[ko]=TDE 압축 거르개 -Name[lb]=TDE-Kompressiounsfilter -Name[lt]=TDE suspaudimo filtras -Name[lv]=TDE Kompresijas FIltrs -Name[mk]=TDE филтер за компресија -Name[mn]=TDE-шахагчийн шүүлтүүр -Name[ms]=Penapis Pemadatan TDE -Name[mt]=Filtru tal-kompressjoni TDE -Name[nb]=Komprimeringsfilter for TDE -Name[nds]=TDE-Komprimerenfilter -Name[ne]=TDE सङ्खुचन फिल्टर -Name[nl]=TDE Compressiefilter -Name[nn]=TDE Kompresjonsfilter -Name[nso]=Sesekodi sa Pitleletso ya TDE -Name[pa]=TDE ਨਪੀੜਨ ਫਿਲਟਰ -Name[pl]=Filtr kompresji TDE -Name[pt]=Filtro de Compressão do TDE -Name[pt_BR]=Filtro de compressão do TDE -Name[ro]=Filtru de compresie TDE -Name[ru]=Фильтр сжатия TDE -Name[rw]=Muyunguruzi y'Iyegeranya TDE -Name[se]=TDE čoahkkáibáhkkenfilter -Name[sk]=TDE filter pre kompresiu -Name[sl]=Filter za stiskanje s TDE -Name[sq]=Filter për Ngjeshje - TDE -Name[sr]=TDE-ов компресиони филтер -Name[sr@Latn]=TDE-ov kompresioni filter -Name[ss]=Sisefo seminyenalisa se TDE -Name[sv]=TDE-kompressionsfilter -Name[ta]=கேடிஇ அழுத்த வடிகட்டி -Name[te]=కెడిఈ సంక్షిప్తపరిచె గలని -Name[tg]=TDE Газполои Фушурдашуда -Name[th]=ตัวกรองการบีบอัดของ TDE -Name[tr]=TDE Sıkıştırma Filtresi -Name[tt]=TDE'nıñ Qısu Sözgeçe -Name[uk]=Фільтр стискання TDE -Name[uz]=TDE qisish filteri -Name[uz@cyrillic]=TDE қисиш филтери -Name[ven]=Filithara yau tsikeledza ya TDE -Name[vi]=Bộ lọc nén TDE -Name[xh]=Isihluzi Sodibaniso se TDE -Name[zh_CN]=TDE 压缩过滤程序 -Name[zh_HK]=TDE 壓縮過濾器 -Name[zh_TW]=TDE 壓縮過濾器 -Name[zu]=Ihluzo Lokunciphisa le-TDE diff --git a/tdeio/kdatatool.desktop b/tdeio/kdatatool.desktop index a58357d41..381c93f94 100644 --- a/tdeio/kdatatool.desktop +++ b/tdeio/kdatatool.desktop @@ -2,86 +2,6 @@ Type=ServiceType X-TDE-ServiceType=KDataTool Comment=TDE Data Tool -Comment[af]=TDE Data Program -Comment[ar]=أداة كيدي للبيانات -Comment[az]=TDE Verilənlər Vasitəsi -Comment[be]=Інструмент працы з даннямі TDE -Comment[bn]=কে.ডি.ই তথ্য টুল -Comment[br]=Ostilh roadoù evit TDE -Comment[bs]=TDE alat za podatke -Comment[ca]=Eina per a la gestió de dades per al TDE -Comment[cs]=Datový nástroj TDE -Comment[csb]=Nôrzãdze pòdôwków TDE -Comment[cy]=Erfyn Data TDE -Comment[da]=TDE-dataværktøj -Comment[de]=TDE-Datenprogramm -Comment[el]=Εργαλείο δεδομένων του TDE -Comment[eo]=Datumilo -Comment[es]=Herramienta TDE de datos -Comment[et]=TDE andmete rakendus -Comment[eu]=TDEren datuen tresna -Comment[fa]=ابزار دادۀ TDE -Comment[fi]=TDE:n datatyökalu -Comment[fr]=Outil de données TDE -Comment[fy]=TDE data-helpprogramma -Comment[ga]=Uirlis Sonraí TDE -Comment[gl]=Ferramenta de Dados de TDE -Comment[he]=כלי נתונים של TDE -Comment[hi]=केडीई डाटा टूल -Comment[hr]=TDE alat za podatke -Comment[hu]=TDE adatkezelő segédprogram -Comment[id]=Tool Data TDE -Comment[is]=TDE gagnatól -Comment[it]=Strumenti dati di TDE -Comment[ja]=TDE データツール -Comment[ka]=TDE-ს მონაცემების დამმუშავებელი -Comment[kk]=TDE дерек өңдеу құралы -Comment[km]=ឧបករណ៍ទិន្នន័យ TDE -Comment[ko]=TDE 자료 연장 -Comment[lb]=TDE-Donnéen-Hëllefsprogramm -Comment[lt]=TDE duomenų priemonė -Comment[lv]=TDE Datu Rīks -Comment[mk]=TDE податочна алатка -Comment[mn]=TDE-Өгөгдөл боловсруулах программ -Comment[ms]=Alatan Data TDE -Comment[mt]=Għodda għal data TDE -Comment[nb]=TDE Dataverktøy -Comment[nds]=TDE-Datenwarktüüch -Comment[ne]=TDE डेटा उपकरण -Comment[nl]=TDE Data-hulpprogramma -Comment[nn]=TDE Dataverktøy -Comment[nso]=Sebereka sa Data ya TDE -Comment[pa]=TDE ਡਾਟਾ ਸੰਦ -Comment[pl]=Narzędzie danych TDE -Comment[pt]=Ferramenta de Dados do TDE -Comment[pt_BR]=Ferramenta de Dados do TDE -Comment[ro]=Utilitar de date TDE -Comment[ru]=Утилита обработки информации TDE -Comment[rw]=Igikoresho cy'Ibyatanzwe TDE -Comment[se]=TDE dáhtareaidu -Comment[sk]=Dátový nástroj TDE -Comment[sl]=Podatkovno orodje za TDE -Comment[sq]=Vegla për të Dhëna - TDE -Comment[sr]=TDE-ов алат за податке -Comment[sr@Latn]=TDE-ov alat za podatke -Comment[ss]=Lithulusi lemniningwane lengakahlutwa ye TDE -Comment[sv]=TDE-dataverktyg -Comment[ta]=கேடிஇ தகவல் கருவி -Comment[te]=కెడిఈ దత్తాంశం పనిముట్టు -Comment[tg]=TDE Асбоби Сана -Comment[th]=เครื่องมือข้อมูลของ TDE -Comment[tr]=TDE Veri Aracı -Comment[tt]=TDE'nıñ Eşkärtü Qoralı -Comment[uk]=Засіб роботи з даними TDE -Comment[uz]=TDE maʼlumot vositasi -Comment[uz@cyrillic]=TDE маълумот воситаси -Comment[ven]=Tshishumiswa tsha data tsha TDE -Comment[vi]=Công cụ dữ liệu TDE. -Comment[xh]=Isihluzi se Data ye TDE -Comment[zh_CN]=TDE 数据工具 -Comment[zh_HK]=TDE 資料工具 -Comment[zh_TW]=TDE 資料工具 -Comment[zu]=Ithuluzi Ledata le-TDE [PropertyDef::Commands] Type=TQStringList diff --git a/tdeio/kpasswdserver.desktop b/tdeio/kpasswdserver.desktop index e3882d110..540f0e177 100644 --- a/tdeio/kpasswdserver.desktop +++ b/tdeio/kpasswdserver.desktop @@ -1,154 +1,7 @@ [Desktop Entry] Type=Service Name=KDED Password Module -Name[af]=KDED Wagwoord Module -Name[ar]=وحدة كلمة سر KDED -Name[az]=KDED Şifrə Modulu -Name[be]=Модуль захавання пароляў KDED -Name[bg]=Модул за пароли KDED -Name[bn]=KDED পাসওয়ার্ড মডিউল -Name[br]=Mollad tremenger KDED -Name[bs]=KDED šifra modul -Name[ca]=Mòdul de contrasenya KDED -Name[cs]=KDED modul pro hesla -Name[csb]=Parole -Name[cy]=Modiwl Cyfrinair KDED -Name[da]=KDED-kodeordsmodul -Name[de]=Passwort-Zwischenspeicherung -Name[el]=Άρθρωμα κωδικού πρόσβασης του KDED -Name[eo]=KDED-pasvortmodulo -Name[es]=Módulo de contraseña de KDED -Name[et]=KDED parooli moodul -Name[eu]=KDEDren pasahitz-modulua -Name[fa]=پیمانۀ اسم رمز KDED -Name[fi]=KDED-salasanamoduuli -Name[fr]=Module de mot de passe KDED -Name[fy]=KDED-wachtwurdmodule -Name[ga]=Modúl Fhocail Fhaire KDED -Name[gl]=Módulo de Contrasinais de KDED -Name[he]=מודול סיסמה של KDED -Name[hi]=KDED पासवर्ड घटक (मॉड्यूल) -Name[hr]=KDED modul za lozinke -Name[hu]=KDED jelszómodul -Name[id]=Modul Password KDED -Name[is]=KDED Lykilorðaeining -Name[it]=Modulo password di KDED -Name[ja]=KDED パスワードモジュール -Name[ka]=KDED პაროლების მოდული -Name[kk]=KDED пароль модулі -Name[km]=ម៉ូឌុលពាក្យសម្ងាត់ KDED -Name[ko]=KDED 열쇠글 모듈 -Name[lb]=KDED-Passwuertmodul -Name[lt]=KDED slaptažodžių modulis -Name[lv]=KDED paroļu modulis -Name[mk]=KDED модул за лозинка -Name[mn]=KDED-Тест модул -Name[ms]=Modul Kata laluan KDED -Name[mt]=Modulu tal-passwords KDED -Name[nb]=KDED Passordmodul -Name[nds]=KDED-Passwoortmoduul -Name[ne]=KDED पासवर्ड मोड्युल -Name[nl]=KDED-wachtwoordmodule -Name[nn]=KDED-passordmodul -Name[nso]=Seripa sa Lentsuphetiso la KDED -Name[pa]=KDED ਗੁਪਤ-ਕੋਡ ਮੈਡੀਊਲ -Name[pl]=Hasła -Name[pt]=Módulo de Senhas do KDED -Name[pt_BR]=Módulo de Senha do KDED -Name[ro]=Modul parolă KDED -Name[ru]=Служба паролей -Name[rw]=Igice cy'Ijambobanga KDED -Name[se]=KDED beassansátni-moduvla -Name[sk]=Modul hesla KDED -Name[sl]=Geselni modul KDED -Name[sq]=Modula për Parullë(Password) - KDED -Name[sr]=KDED модул за лозинке -Name[sr@Latn]=KDED modul za lozinke -Name[sv]=KDED-lösenordsmodul -Name[ta]=KDED கடவுச்சொல் பகுதி -Name[te]=కెడిఈ పాస్ వర్డ్ మాడ్యూల్ -Name[tg]=KDED Модули номи шаб -Name[th]=โมดูลรหัสผ่าน KDED -Name[tr]=KDED Parola Modülü -Name[tt]=KDED'nıñ Sersüz Modulı -Name[uk]=Модуль паролів KDED -Name[uz]=KDED maxfiy soʻz moduli -Name[uz@cyrillic]=KDED махфий сўз модули -Name[ven]=Modulu wa phasewede ya KDED -Name[vi]=Mô-đun mật khẩu KDED -Name[wa]=Module di screts po KDED -Name[xh]=Igama lokugqitha le Sicatshulwa se KDED -Name[zh_CN]=KDED 密码模块 -Name[zh_HK]=KDED 密碼模組 -Name[zh_TW]=KDED 密碼模組 -Name[zu]=Ingxenye Yegama lokudlula le-KDED Comment=Password caching support -Comment[af]=Wagwoord kasberging ondersteuning -Comment[be]=Падтрымка захоўвання пароляў -Comment[bg]=Кеширане на пароли -Comment[bn]=পাসওয়ার্ড ক্যাশ-এ রাখা সমর্থন করে -Comment[bs]=Podrška za keširanje šifre -Comment[ca]=Permet l'ús de memòria cau de contrasenyes -Comment[cs]=Podpora pro kešování hesel -Comment[csb]=Spamiãtôwanié môlowëch parolów -Comment[da]=Understøttelse for caching af kodeord -Comment[de]=Verwaltet zwischengespeicherte Passwörter in KDED -Comment[el]=Υποστήριξη προσωρινής αποθήκευσης κωδικού πρόσβασης -Comment[eo]=Subteno por kaŝmemorigo de pasvortoj -Comment[es]=Soporte de caché de contraseñas -Comment[et]=Parooli meelespidamise toetus -Comment[eu]=Pasahitzen cachearen euskarria -Comment[fa]=پشتیبانی از مخفی کردن اسم رمز -Comment[fi]=Salasanojen välimuistituki -Comment[fr]=Gestion du cache des mots de passe -Comment[fy]=Wachtwurd caching stype -Comment[gl]=Soporte de cacheado de contrasinais -Comment[he]=תמיכה בשמירת ססמאות במטמון -Comment[hi]=पासवर्ड कैचिंग समर्थन -Comment[hr]=Podrška međuspremanja lozinki -Comment[hu]=Jelszóelmentési támogatás -Comment[id]=Dukungan penyimpanan password -Comment[is]=Skyndiminni fyrir lykilorð -Comment[it]=Supporto per la memorizzazione temporanea delle password -Comment[ja]=パスワードキャッシュサポート -Comment[ka]=პაროლის ბუფერირება -Comment[kk]=KDED парольдерді басқару -Comment[km]=ទ្រទ្រង់ការរក្សាទុកពាក្យសម្ងាត់នៅក្នុងឃ្លាំងសម្ងាត់ -Comment[lb]=Ënnerstëtzung fir d'Zwëschespäichere vu Passwierder -Comment[lt]=Slaptažodžių krepšio palaikymas -Comment[mk]=Поддршка за кеширање на лозинки -Comment[ms]=Sokongan Penyimpan Kata Laluan -Comment[nb]=Støtte for passordlagring -Comment[nds]=Ünnerstütten för't Twischenspiekern vun Passwöör -Comment[ne]=पासवर्ड क्यासिङ समर्थन -Comment[nl]=Ondersteuning voor het tussentijds bewaren van wachtwoorden -Comment[nn]=Støtte for passordlagring -Comment[pa]=ਗੁਪਤ-ਕੋਡ ਕੈਚੇਇੰਗ ਸਹਾਇਤਾ -Comment[pl]=Zapamiętywanie haseł lokalnych -Comment[pt]=Suporte a 'cache' de senhas -Comment[pt_BR]=Suporte de cache das senhas -Comment[ro]=Suport pentru memorarea parolelor -Comment[ru]=Управление паролями KDED -Comment[rw]=Ifasha ry'uguhisha ijambobanga -Comment[se]=Beassansáni gaskarádjama doarjja -Comment[sk]=Podpora ukladania hesiel -Comment[sl]=Podpora prepomnjenju gesel -Comment[sr]=Подршка за кеширање лозинки -Comment[sr@Latn]=Podrška za keširanje lozinki -Comment[sv]=Stöd för lösenordscache -Comment[ta]=கடவுச்சொல் சேமிக்க ஆதரவு -Comment[te]=పాస్ వర్డులను దాయుటకు సహకరించును -Comment[tg]=Дастгирии Ҳофизаи Гузарвожа -Comment[th]=สนับสนุนการจดจำรหัสผ่าน -Comment[tr]=Parola önbellekleme desteği -Comment[tt]=Sersüz alxäterläw totu -Comment[uk]=Підтримка кешування паролів -Comment[uz]=Maxfiy soʻzlarni keshda saqlash -Comment[uz@cyrillic]=Махфий сўзларни кэшда сақлаш -Comment[vi]=Cách hỗ trợ khả năng lưu tạm mật khẩu. -Comment[zh_CN]=密码缓存支持 -Comment[zh_HK]=密碼暫存支援 -Comment[zh_TW]=密碼暫存(cache)支援 X-TDE-ServiceTypes=KDEDModule X-TDE-ModuleType=Library X-TDE-Library=kpasswdserver diff --git a/tdeio/kpasswdserver/CMakeLists.txt b/tdeio/kpasswdserver/CMakeLists.txt index 1d54ddc95..4cdc76591 100644 --- a/tdeio/kpasswdserver/CMakeLists.txt +++ b/tdeio/kpasswdserver/CMakeLists.txt @@ -38,6 +38,5 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} LINK tdeinit_kded-shared - DEPENDENCIES dcopidl DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/tdeio/kpasswdserver/kpasswdserver.cpp b/tdeio/kpasswdserver/kpasswdserver.cpp index 075843259..4a578db0e 100644 --- a/tdeio/kpasswdserver/kpasswdserver.cpp +++ b/tdeio/kpasswdserver/kpasswdserver.cpp @@ -37,13 +37,13 @@ #include <tdewallet.h> #include "config.h" -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/X.h> #include <X11/Xlib.h> #endif extern "C" { - KDE_EXPORT KDEDModule *create_kpasswdserver(const TQCString &name) + TDE_EXPORT KDEDModule *create_kpasswdserver(const TQCString &name) { return new KPasswdServer(name); } @@ -76,8 +76,8 @@ KPasswdServer::KPasswdServer(const TQCString &name) m_authPending.setAutoDelete(true); m_seqNr = 0; m_wallet = 0; - connect(this, TQT_SIGNAL(windowUnregistered(long)), - this, TQT_SLOT(removeAuthForWindowId(long))); + connect(this, TQ_SIGNAL(windowUnregistered(long)), + this, TQ_SLOT(removeAuthForWindowId(long))); } KPasswdServer::~KPasswdServer() @@ -187,7 +187,7 @@ KPasswdServer::checkAuthInfo(TDEIO::AuthInfo info, long windowId, unsigned long kdDebug(130) << "KPasswdServer::checkAuthInfo: User= " << info.username << ", WindowId = " << windowId << endl; if( usertime != 0 ) - kapp->updateUserTimestamp( usertime ); + tdeApp->updateUserTimestamp( usertime ); TQString key = createCacheKey(info); @@ -256,7 +256,7 @@ KPasswdServer::queryAuthInfo(TDEIO::AuthInfo info, TQString errorMsg, long windo if ( !info.password.isEmpty() ) // should we really allow the caller to pre-fill the password? kdDebug(130) << "password was set by caller" << endl; if( usertime != 0 ) - kapp->updateUserTimestamp( usertime ); + tdeApp->updateUserTimestamp( usertime ); TQString key = createCacheKey(info); Request *request = new Request; @@ -279,7 +279,7 @@ KPasswdServer::queryAuthInfo(TDEIO::AuthInfo info, TQString errorMsg, long windo m_authPending.append(request); if (m_authPending.count() == 1) - TQTimer::singleShot(0, this, TQT_SLOT(processRequest())); + TQTimer::singleShot(0, this, TQ_SLOT(processRequest())); return info; } @@ -386,7 +386,7 @@ KPasswdServer::processRequest() if (hasWalletData) dlg.setKeepPassword( true ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 XSetTransientForHint( tqt_xdisplay(), dlg.winId(), request->windowId); #endif @@ -493,7 +493,7 @@ KPasswdServer::processRequest() } if (m_authPending.count()) - TQTimer::singleShot(0, this, TQT_SLOT(processRequest())); + TQTimer::singleShot(0, this, TQ_SLOT(processRequest())); } diff --git a/tdeio/kpasswdserver/kpasswdserver.h b/tdeio/kpasswdserver/kpasswdserver.h index 71aab3859..c31e64449 100644 --- a/tdeio/kpasswdserver/kpasswdserver.h +++ b/tdeio/kpasswdserver/kpasswdserver.h @@ -38,7 +38,7 @@ namespace TDEWallet { class KPasswdServer : public KDEDModule { - Q_OBJECT + TQ_OBJECT K_DCOP public: KPasswdServer(const TQCString &); diff --git a/tdeio/kscan.desktop b/tdeio/kscan.desktop index 8d3a026fb..2a5a5faed 100644 --- a/tdeio/kscan.desktop +++ b/tdeio/kscan.desktop @@ -2,18 +2,3 @@ Type=ServiceType X-TDE-ServiceType=KScan/KScanDialog Name=KScan -Name[bn]=কে-স্ক্যান -Name[cy]=KSgan -Name[eo]=Bildciferecigo -Name[is]=KScan myndlesari -Name[ka]=სკანერი -Name[ko]=K스캔 -Name[nso]=KTebelelo -Name[pl]=Skan -Name[ru]=Сканер -Name[rw]=KGusikana -Name[sv]=Kscan -Name[ta]=Kவருடல் -Name[te]=కేస్కేన్ -Name[th]=สแกนภาพ - K -Name[ven]=U nanga ha K diff --git a/tdeio/kssl/CMakeLists.txt b/tdeio/kssl/CMakeLists.txt index a2c9f00d6..bb49a0ea6 100644 --- a/tdeio/kssl/CMakeLists.txt +++ b/tdeio/kssl/CMakeLists.txt @@ -42,14 +42,14 @@ install( FILES set( target kssl ) set( ${target}_SRCS - kssl.cc ksslcertificatehome.cc ksslsettings.cc - ksslcertificate.cc ksslconnectioninfo.cc ksslcertificatefactory.cc - ksslcertificatecache.cc ksslpeerinfo.cc ksslinfodlg.cc - ksslcertdlg.cc ksslutils.cc kopenssl.cc ksslpkcs12.cc - ksslcertchain.cc ksslkeygen.cc ksslx509v3.cc - ksslsigners.cc ksslpkcs7.cc ksslpemcallback.cc - ksslx509map.cc ksslsession.cc keygenwizard.ui - keygenwizard2.ui ksmimecrypto.cc ksslcsessioncache.cc + kssl.cpp ksslcertificatehome.cpp ksslsettings.cpp + ksslcertificate.cpp ksslconnectioninfo.cpp ksslcertificatefactory.cpp + ksslcertificatecache.cpp ksslpeerinfo.cpp ksslinfodlg.cpp + ksslcertdlg.cpp ksslutils.cpp kopenssl.cpp ksslpkcs12.cpp + ksslcertchain.cpp ksslkeygen.cpp ksslx509v3.cpp + ksslsigners.cpp ksslpkcs7.cpp ksslpemcallback.cpp + ksslx509map.cpp ksslsession.cpp keygenwizard.ui + keygenwizard2.ui ksmimecrypto.cpp ksslcsessioncache.cpp ) tde_add_library( ${target} STATIC_PIC AUTOMOC diff --git a/tdeio/kssl/Makefile.am b/tdeio/kssl/Makefile.am index 5d57ab7ab..1f9038be7 100644 --- a/tdeio/kssl/Makefile.am +++ b/tdeio/kssl/Makefile.am @@ -40,31 +40,31 @@ noinst_HEADERS = ksslcsessioncache.h libkssl_la_SOURCES = \ - kssl.cc \ - ksslcertificatehome.cc \ - ksslsettings.cc \ - ksslcertificate.cc \ - ksslconnectioninfo.cc \ - ksslcertificatefactory.cc \ - ksslcertificatecache.cc \ - ksslpeerinfo.cc \ - ksslinfodlg.cc \ - ksslcertdlg.cc \ - ksslutils.cc \ - kopenssl.cc \ - ksslpkcs12.cc \ - ksslcertchain.cc \ - ksslkeygen.cc \ - ksslx509v3.cc \ - ksslsigners.cc \ - ksslpkcs7.cc \ - ksslpemcallback.cc \ - ksslx509map.cc \ - ksslsession.cc \ + kssl.cpp \ + ksslcertificatehome.cpp \ + ksslsettings.cpp \ + ksslcertificate.cpp \ + ksslconnectioninfo.cpp \ + ksslcertificatefactory.cpp \ + ksslcertificatecache.cpp \ + ksslpeerinfo.cpp \ + ksslinfodlg.cpp \ + ksslcertdlg.cpp \ + ksslutils.cpp \ + kopenssl.cpp \ + ksslpkcs12.cpp \ + ksslcertchain.cpp \ + ksslkeygen.cpp \ + ksslx509v3.cpp \ + ksslsigners.cpp \ + ksslpkcs7.cpp \ + ksslpemcallback.cpp \ + ksslx509map.cpp \ + ksslsession.cpp \ keygenwizard.ui \ keygenwizard2.ui \ - ksmimecrypto.cc \ - ksslcsessioncache.cc + ksmimecrypto.cpp \ + ksslcsessioncache.cpp SUBDIRS = kssl diff --git a/tdeio/kssl/kopenssl.cc b/tdeio/kssl/kopenssl.cpp index a009bd7e9..96e4473a2 100644 --- a/tdeio/kssl/kopenssl.cc +++ b/tdeio/kssl/kopenssl.cpp @@ -33,6 +33,8 @@ #include <unistd.h> #include "kopenssl.h" +#define STRINGIFY(x) #x + #define GET_CRYPTOLIB_SYMBOL(a) ((_cryptoLib->hasSymbol(a)) ? _cryptoLib->symbol(a) : NULL) #define GET_SSLLIB_SYMBOL(a) ((_sslLib->hasSymbol(a)) ? _sslLib->symbol(a) : NULL) @@ -343,10 +345,18 @@ TDEConfig *cfg; libnamesc << "cygcrypto.dll" << "libcrypto.dll" << ""; -#else +#else /* !OpenBSD && !CygWin */ + +#ifdef Q_OS_SOLARIS + + libpaths << "/" SYSTEM_LIBDIR KDELIBSUFF "/" + << "/usr/" SYSTEM_LIBDIR KDELIBSUFF "/" + << ""; +#else /* default */ + libpaths - #ifdef _AIX - << "/opt/freeware/lib/" + #ifdef _AIX + << "/opt/freeware/lib/" #endif << "/usr/" SYSTEM_LIBDIR "/" << "/usr/ssl/" SYSTEM_LIBDIR "/" @@ -355,43 +365,52 @@ TDEConfig *cfg; << "/usr/local/ssl/" SYSTEM_LIBDIR "/" << "/opt/openssl/" SYSTEM_LIBDIR "/" << "/" SYSTEM_LIBDIR "/" - << ""; + << ""; +#endif /* default */ // FIXME: #define here for the various OS types to optimize libnamess #ifdef hpux - << "libssl.sl" - #elif defined(_AIX) - << "libssl.a(libssl.so.0)" + << "libssl.sl" + #elif defined(_AIX) + << "libssl.a(libssl.so.0)" #elif defined(__APPLE__) << "libssl.dylib" << "libssl.0.9.dylib" - #else - #ifdef SHLIB_VERSION_NUMBER - << "libssl.so." SHLIB_VERSION_NUMBER - #endif - << "libssl.so" - << "libssl.so.0" - #endif + #else + #ifdef OPENSSL_SHLIB_VERSION + << "libssl.so." STRINGIFY(OPENSSL_SHLIB_VERSION) + #endif + #ifdef SHLIB_VERSION_NUMBER + << "libssl.so." SHLIB_VERSION_NUMBER + #endif + << "libssl.so" + << "libssl.so.3" + << "libssl.so.0" + #endif ; libnamesc - #ifdef hpux - << "libcrypto.sl" - #elif defined(_AIX) - << "libcrypto.a(libcrypto.so.0)" + #ifdef hpux + << "libcrypto.sl" + #elif defined(_AIX) + << "libcrypto.a(libcrypto.so.0)" #elif defined(__APPLE__) << "libcrypto.dylib" << "libcrypto.0.9.dylib" #else - #ifdef SHLIB_VERSION_NUMBER - << "libcrypto.so." SHLIB_VERSION_NUMBER - #endif - << "libcrypto.so" - << "libcrypto.so.0" - #endif + #ifdef OPENSSL_SHLIB_VERSION + << "libcrypto.so." STRINGIFY(OPENSSL_SHLIB_VERSION) + #endif + #ifdef SHLIB_VERSION_NUMBER + << "libcrypto.so." SHLIB_VERSION_NUMBER + #endif + << "libcrypto.so" + << "libcrypto.so.3" + << "libcrypto.so.0" + #endif ; -#endif +#endif /* __OpenBSD__ */ for (TQStringList::Iterator it = libpaths.begin(); it != libpaths.end(); @@ -635,7 +654,8 @@ TDEConfig *cfg; K_SSLv3_client_method = (SSL_METHOD *(*)()) GET_SSLLIB_SYMBOL("SSLv3_client_method"); K_TLS_client_method = (SSL_METHOD *(*)()) GET_SSLLIB_SYMBOL("TLS_client_method"); if (!K_TLS_client_method) K_TLS_client_method = (SSL_METHOD *(*)()) GET_SSLLIB_SYMBOL("SSLv23_client_method"); - K_SSL_get_peer_certificate = (X509 *(*)(SSL *)) GET_SSLLIB_SYMBOL("SSL_get_peer_certificate"); + K_SSL_get_peer_certificate = (X509 *(*)(SSL *)) GET_SSLLIB_SYMBOL("SSL_get1_peer_certificate"); + if (!K_SSL_get_peer_certificate) K_SSL_get_peer_certificate = (X509 *(*)(SSL *)) GET_SSLLIB_SYMBOL("SSL_get_peer_certificate"); K_SSL_CIPHER_get_bits = (int (*)(SSL_CIPHER *,int *)) GET_SSLLIB_SYMBOL("SSL_CIPHER_get_bits"); K_SSL_CIPHER_get_version = (char * (*)(SSL_CIPHER *)) GET_SSLLIB_SYMBOL("SSL_CIPHER_get_version"); K_SSL_CIPHER_get_name = (const char * (*)(SSL_CIPHER *)) GET_SSLLIB_SYMBOL("SSL_CIPHER_get_name"); diff --git a/tdeio/kssl/kopenssl.h b/tdeio/kssl/kopenssl.h index 312aef2c8..986ecdc86 100644 --- a/tdeio/kssl/kopenssl.h +++ b/tdeio/kssl/kopenssl.h @@ -27,7 +27,7 @@ class KOpenSSLProxyPrivate; #include <klibloader.h> -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #include "ksslconfig_win.h" #else #include "ksslconfig.h" @@ -56,14 +56,14 @@ class KOpenSSLProxyPrivate; #define STACK _STACK #endif #endif -#endif - -#include <kstaticdeleter.h> #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) typedef int (*X509_STORE_CTX_verify_cb)(int, X509_STORE_CTX *); typedef int X509_LOOKUP_TYPE; #endif +#endif // KSSL_HAVE_SSL + +#include <kstaticdeleter.h> /** * Dynamically load and wrap OpenSSL. @@ -1063,15 +1063,15 @@ public: # undef X509_STORE_CTX_set_chain # undef SSLv23_client_method #endif - STACK *sk_dup(const STACK *s) KDE_DEPRECATED; - void sk_free(STACK *s) KDE_DEPRECATED; - STACK *sk_new(int (*cmp)()) KDE_DEPRECATED; - int sk_num(STACK *s) KDE_DEPRECATED; - char *sk_pop(STACK *s) KDE_DEPRECATED; - int sk_push(STACK *s, char *d) KDE_DEPRECATED; - char *sk_value(STACK *s, int n) KDE_DEPRECATED; - void X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* x) KDE_DEPRECATED; - SSL_METHOD *SSLv23_client_method() KDE_DEPRECATED; + STACK *sk_dup(const STACK *s) TDE_DEPRECATED; + void sk_free(STACK *s) TDE_DEPRECATED; + STACK *sk_new(int (*cmp)()) TDE_DEPRECATED; + int sk_num(STACK *s) TDE_DEPRECATED; + char *sk_pop(STACK *s) TDE_DEPRECATED; + int sk_push(STACK *s, char *d) TDE_DEPRECATED; + char *sk_value(STACK *s, int n) TDE_DEPRECATED; + void X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* x) TDE_DEPRECATED; + SSL_METHOD *SSLv23_client_method() TDE_DEPRECATED; #endif diff --git a/tdeio/kssl/ksmimecrypto.cc b/tdeio/kssl/ksmimecrypto.cpp index 92318b9f0..92318b9f0 100644 --- a/tdeio/kssl/ksmimecrypto.cc +++ b/tdeio/kssl/ksmimecrypto.cpp diff --git a/tdeio/kssl/kssl.cc b/tdeio/kssl/kssl.cpp index 0f34a55da..9131ce8d9 100644 --- a/tdeio/kssl/kssl.cc +++ b/tdeio/kssl/kssl.cpp @@ -40,7 +40,7 @@ #include "kssl.h" #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ksock.h> #include <ksockaddr.h> diff --git a/tdeio/kssl/kssl.h b/tdeio/kssl/kssl.h index 37ee5017b..ec4fb9842 100644 --- a/tdeio/kssl/kssl.h +++ b/tdeio/kssl/kssl.h @@ -177,7 +177,7 @@ public: * @param proxy is the IP or hostname of the proxy server * @deprecated */ - void setProxyUse(bool active, TQString realIP = TQString::null, int realPort = 0, TQString proxy = TQString::null) KDE_DEPRECATED; + void setProxyUse(bool active, TQString realIP = TQString::null, int realPort = 0, TQString proxy = TQString::null) TDE_DEPRECATED; /** * Set the peer hostname to be used for certificate verification. diff --git a/tdeio/kssl/kssl/LETSENCRYPT b/tdeio/kssl/kssl/LETSENCRYPT new file mode 100644 index 000000000..ec1fe3cb3 --- /dev/null +++ b/tdeio/kssl/kssl/LETSENCRYPT @@ -0,0 +1,3 @@ +Lets Encrypt certificates support is provided via ISRG's X1+X2 root certificates. + +Read more here: https://letsencrypt.org/certificates/ diff --git a/tdeio/kssl/kssl/caroot/ca-bundle.crt b/tdeio/kssl/kssl/caroot/ca-bundle.crt index 31409b62f..31ef23fb0 100644 --- a/tdeio/kssl/kssl/caroot/ca-bundle.crt +++ b/tdeio/kssl/kssl/caroot/ca-bundle.crt @@ -2971,3 +2971,1014 @@ OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJDIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+ hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ubDgEj8Z+7fNzcbBGXJbLy tGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u -----END CERTIFICATE----- + +-----BEGIN CERTIFICATE----- +MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM +MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD +QTAeFw0wMjA2MTExMDQ2MzlaFw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBM +MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD +QTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6xwS7TT3zNJc4YPk/E +jG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdLkKWo +ePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GI +ULdtlkIJ89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapu +Ob7kky/ZR6By6/qmW6/KUz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUg +AKpoC6EahQGcxEZjgoi2IrHu/qpGWX7PNSzVttpd90gzFFS269lvzs2I1qsb2pY7 +HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA +uI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+GXYkHAQa +TOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTg +xSvgGrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1q +CjqTE5s7FCMTY5w/0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5x +O/fIR/RpbxXyEV6DHpx8Uq79AtoSqFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs +6GAqm4VKQPNriiTsBhYscw== +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE----- +MIICjTCCAXWgAwIBAgIDAQAhMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM +MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD +QTAeFw0wMjA3MTIxNjMxNTNaFw0xMjA3MTIxNjMxNTNaMEMxCzAJBgNVBAYTAlBM +MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xFzAVBgNVBAMTDkNlcnR1bSBM +ZXZlbCBJMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCl73pZ9DFcn7Qy0qBZ +K+So18cav7drUrJ8SiYOlDDVskt81+eIcL/4FelTSGjuAOvYdmm+HGYG998RPB0i +Z+Ak67vXFJ537vRWOcu6aMjNuAwu8BOdc5eSgB0Y8X4+3LOYfugtaZa8mrEQ8Hit +0yLE9UBcU9J+4PmkVGecmZ8jZQIDAQABoxMwETAPBgNVHRMBAf8EBTADAQH/MA0G +CSqGSIb3DQEBBQUAA4IBAQAlDS4aTmgK0YgmUvt/3zN7G2/ZrtBBCtONlUvC69c7 +TmLJWJ842y2AH7ryNXXkcsn6p0ZBTrTJ2tA2y/j2PXJeXrCkK/qAJIpM0l4u0MT7 +enY5akasduHp2NXMP9vDlgMy7elU2s3nkOT79gfh5XttC+5D/x4JDNi1DMAA9hk1 +6DK4zWmDVfjkiP/G3fEndtJgNDQsyqnaQ3E3bljv3f1KJTjZUvtA2Ml6MP2hFRhg +ZPsxuhW8QXidQYNiua1h7XUUiPiERLDLWZmfY6dxGrHXjSTx3shHNaQM0qkDs9gS +6UK8uWJN2bf2YBnvGmzy0IQvx5wDCH7h8AdaBD6DgIG1 +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE----- +MIICjjCCAXagAwIBAgIDAQAiMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM +MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD +QTAeFw0wMjA3MTIxNjMyMDNaFw0xMjA3MTIxNjMyMDNaMEQxCzAJBgNVBAYTAlBM +MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xGDAWBgNVBAMTD0NlcnR1bSBM +ZXZlbCBJSTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyMQSaN5fA94hNE46 +bMKpGUb5yIPEowReGZzGttYBQnC6oUOy+iM3md8WerzXeBKf7iIZEDW2HAp7BKhS +4rMB6taxT07vDtkNfEKwOk6X7dODw6KY4mxnzjmjh5pf2feKKJ3MoZxi2HAz2a6J +vHKFMq8dAlGL2GBtLvzlFp2jwkMCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zAN +BgkqhkiG9w0BAQUFAAOCAQEAWo3wgy+/0B7UiTCu4Wn1rvGRXIUtbPNp4Bc4PP/i +1q6pPheIe0ooCopuqnDX9maTHhZeNpnApgCUSbyw71EaOremD7HjWXASRUTylhwL +5FdSx+D6MgF2uW9uwZ+NErkeRJYT2aRXe5FBOVIseC4g93Ay0D8Hg50MkAC5pQqW ++8GSszT94NzT7ppIaMtq53PZpUtLGiL3UBZ5vUJ5pE4lLKD7Ce+pXzZevy/MnkMG +D1L7LgjRWL17OcMlASFETyUTajNjvxMy+oM4C22rwHRh2WQrvgw5MO+Q3UyYA1r5 +VrSaqgQ1g06ZcQt+mhzoc2swlOSwm8iis8H6orR8xmCWrA== +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE----- +MIICjzCCAXegAwIBAgIDAQAjMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM +MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD +QTAeFw0wMjA3MTIxNjMyMTdaFw0xMjA3MTIxNjMyMTdaMEUxCzAJBgNVBAYTAlBM +MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xGTAXBgNVBAMTEENlcnR1bSBM +ZXZlbCBJSUkwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALZjBbfGFmlsLjPe +pWaDwG0LqhF11lWKabaHi1sQhK3qomHY7Em7qpL11dUQ1vsMcnnpzz/J0AEH6KDh ++yAyXV1SE/tVToLYYByZK+JGacLYIYF9aCwV8AhqyzOGurO5QX6vLboXB2WNnwmX +hyNVKUgnUVy4ktAR2qZJIw5Bjsn/AgMBAAGjEzARMA8GA1UdEwEB/wQFMAMBAf8w +DQYJKoZIhvcNAQEFBQADggEBAIsLt3vKCZqd/gui45ovm3FSO6FLjzzq4pagPvbN +nZ39HrhRaCpqkHDAj71L5L27U3eW2D4ILL0iUmZadbC4i3at/PUL9mjhGlajcCN8 +EF6IXGT87Tbcii735jRaaXSbEY4YhNOg9DPBoD4uJMkA8Z0Y/6lYmk4S6KUMCzzt +t5zZBiWjdd08yFi5VGMvpE74KVOMdMa3JNVaR0XvT0Q8yXo1XKCrY9OFIxnhVgDb +hzr9fwjKWDwu8kxhT9khAETm0BU2Buu+CTasaJdT/bBR2YEx9qcN7XyXTeDtkOO5 +QeGSqFgzquwjWEbKhf7l/e+efdRCg+ikH3O5snHB6iS+dgg= +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE----- +MIICjjCCAXagAwIBAgIDAQAkMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM +MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD +QTAeFw0wMjA3MTIxNjMyMzVaFw0xMjA3MTIxNjMyMzVaMEQxCzAJBgNVBAYTAlBM +MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xGDAWBgNVBAMTD0NlcnR1bSBM +ZXZlbCBJVjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAmyb1lKqCAKE4juAy +6lpVNUl6aJ2DuWPSiJ3BBk3/6ty6I4Lr2Dpy1b1vjVelhaFsVKEDgK2JyQlk9XMq +LPZI2Ql166mJiPKFg77aY/W78EcQfGyjnRvVcs0tG40mAs/p84OEpFcVe/RSqDrD +/D7R01u+Wj5xLl0PUsFplIGDbikCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zAN +BgkqhkiG9w0BAQUFAAOCAQEAPS99JujKGVRfa50TKfieq+uK1SxjidErYaZTb3cJ +NNfQDYn6nk4lnrnab5EUVhO/NegP2yIu3YOnZGfxFDhvVozMTKKAB5r5XKOvzsP9 +9C9578PVMLozucfUMCSwau7Z4l5uuQOHuzjzlVLCibbbf4RwfvZ7hh5sB5c0pNbw +RQq64RXQUUEvul/W9gUeT9ISHOsASGTq+HJ5i7vNARjukEAXW/maqs9vyTWWbGVI +1FSOnVyteymq4Xk+9YlIyNPNyacgnsMnU72XKBLDS0KJdhIWALFAZI4dSh5WZNuW +ZguUnEmeH81lLbR+p/N3iuN8+oSo8UXik92jxeUY2tQJUA== +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE----- +MIIEuDCCA6CgAwIBAgIBBDANBgkqhkiG9w0BAQUFADCBtDELMAkGA1UEBhMCQlIx +EzARBgNVBAoTCklDUC1CcmFzaWwxPTA7BgNVBAsTNEluc3RpdHV0byBOYWNpb25h +bCBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWFjYW8gLSBJVEkxETAPBgNVBAcTCEJy +YXNpbGlhMQswCQYDVQQIEwJERjExMC8GA1UEAxMoQXV0b3JpZGFkZSBDZXJ0aWZp +Y2Fkb3JhIFJhaXogQnJhc2lsZWlyYTAeFw0wMTExMzAxMjU4MDBaFw0xMTExMzAy +MzU5MDBaMIG0MQswCQYDVQQGEwJCUjETMBEGA1UEChMKSUNQLUJyYXNpbDE9MDsG +A1UECxM0SW5zdGl0dXRvIE5hY2lvbmFsIGRlIFRlY25vbG9naWEgZGEgSW5mb3Jt +YWNhbyAtIElUSTERMA8GA1UEBxMIQnJhc2lsaWExCzAJBgNVBAgTAkRGMTEwLwYD +VQQDEyhBdXRvcmlkYWRlIENlcnRpZmljYWRvcmEgUmFpeiBCcmFzaWxlaXJhMIIB +IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPMudwX/hvm+Uh2b/lQAcHVA +isamaLkWdkwP9/S/tOKIgRrL6Oy+ZIGlOUdd6uYtk9Ma/3pUpgcfNAj0vYm5gsyj +Qo9emsc+x6m4VWwk9iqMZSCK5EQkAq/Ut4n7KuLE1+gdftwdIgxfUsPt4CyNrY50 +QV57KM2UT8x5rrmzEjr7TICGpSUAl2gVqe6xaii+bmYR1QrmWaBSAG59LrkrjrYt +bRhFboUDe1DK+6T8s5L6k8c8okpbHpa9veMztDVC9sPJ60MWXh6anVKo1UcLcbUR +yEeNvZneVRKAAU6ouwdjDvwlsaKydFKwed0ToQ47bmUKgcm+wV3eTRk36UOnTwID +AQABo4HSMIHPME4GA1UdIARHMEUwQwYFYEwBAQAwOjA4BggrBgEFBQcCARYsaHR0 +cDovL2FjcmFpei5pY3BicmFzaWwuZ292LmJyL0RQQ2FjcmFpei5wZGYwPQYDVR0f +BDYwNDAyoDCgLoYsaHR0cDovL2FjcmFpei5pY3BicmFzaWwuZ292LmJyL0xDUmFj +cmFpei5jcmwwHQYDVR0OBBYEFIr68VeEERM1kEL6V0lUaQ2kxPA3MA8GA1UdEwEB +/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAZA5c1 +U/hgIh6OcgLAfiJgFWpvmDZWqlV30/bHFpj8iBobJSm5uDpt7TirYh1Uxe3fQaGl +YjJe+9zd+izPRbBqXPVQA34EXcwk4qpWuf1hHriWfdrx8AcqSqr6CuQFwSr75Fos +SzlwDADa70mT7wZjAmQhnZx2xJ6wfWlT9VQfS//JYeIc7Fue2JNLd00UOSMMaiK/ +t79enKNHEA2fupH3vEigf5Eh4bVAN5VohrTm6MY53x7XQZZr1ME7a55lFEnSeT0u +mlOAjR2mAbvSM5X5oSZNrmetdzyTj2flCM8CC7MLab0kkdngRIlUBGHF1/S5nmPb +K+9A46sd33oqK8n8 +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE----- +MIIG2jCCBcKgAwIBAgIDFc/9MA0GCSqGSIb3DQEBBQUAMIGsMQswCQYDVQQGEwJE +RTEhMB8GA1UEChMYRGV1dHNjaGVzIEZvcnNjaHVuZ3NuZXR6MRYwFAYDVQQLEw1E +Rk4tQ0VSVCBHbWJIMRAwDgYDVQQLEwdERk4tUENBMS0wKwYDVQQDEyRERk4gVG9w +bGV2ZWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEmNl +cnRpZnlAcGNhLmRmbi5kZTAeFw0wMTEyMDExMjExMTZaFw0xMDAxMzExMjExMTZa +MIGsMQswCQYDVQQGEwJERTEhMB8GA1UEChMYRGV1dHNjaGVzIEZvcnNjaHVuZ3Nu +ZXR6MRYwFAYDVQQLEw1ERk4tQ0VSVCBHbWJIMRAwDgYDVQQLEwdERk4tUENBMS0w +KwYDVQQDEyRERk4gVG9wbGV2ZWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxITAf +BgkqhkiG9w0BCQEWEmNlcnRpZnlAcGNhLmRmbi5kZTCCASIwDQYJKoZIhvcNAQEB +BQADggEPADCCAQoCggEBAMF5rhMt6zmhxK5oWPwT2FG7Up7T5DovHSD/YKPIRxsv +DWmC4dTzByIBLnOmEflk+5KAqAYao6eY1qF0hR4WiS4DjCsn7l3zNo/4i2eF4EmG +EksBygb4tRlTThcO7heFX+Du5qFoks+ONqa70RlwOr2l53KVwjMXBCtCLFSKRLVu +xeh5+Smkm+FuOmwEugndM2n74Djjyf9DCOaHGZrHwVDh+Vpy5Ny4bKCSboujRxd5 +NxsStUshDVbTeS3B8TuzAJbywYWEE7erox+7WTfQr8ivSCBhrNJ36VRjAb8hiV9I +uy2TmJYo2oPyC8a3eM3xj9Ku2IW3tS2zpfiIzt9xvFMCAwEAAaOCAwEwggL9MA8G +A1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFAYL+rX4SHijILELPs+g0MTRf33QMIHb +BgNVHSMEgdMwgdCAFAYL+rX4SHijILELPs+g0MTRf33QoYGypIGvMIGsMQswCQYD +VQQGEwJERTEhMB8GA1UEChMYRGV1dHNjaGVzIEZvcnNjaHVuZ3NuZXR6MRYwFAYD +VQQLEw1ERk4tQ0VSVCBHbWJIMRAwDgYDVQQLEwdERk4tUENBMS0wKwYDVQQDEyRE +Rk4gVG9wbGV2ZWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxITAfBgkqhkiG9w0B +CQEWEmNlcnRpZnlAcGNhLmRmbi5kZYIDFc/9MAsGA1UdDwQEAwIBBjARBglghkgB +hvhCAQEEBAMCAAcwgaUGA1UdHwSBnTCBmjBLoEmgR4ZFaHR0cDovL3d3dy5kZm4t +cGNhLmRlL2NlcnRpZmljYXRpb24veDUwOS9nMS9kYXRhL2NybHMvcm9vdC1jYS1j +cmwuY3J4MEugSaBHhkVodHRwOi8vd3d3LmRmbi1wY2EuZGUvY2VydGlmaWNhdGlv +bi94NTA5L2cxL2RhdGEvY3Jscy9yb290LWNhLWNybC5jcmwwOAYJYIZIAYb4QgED +BCsWKWh0dHBzOi8vd3d3LmRmbi1wY2EuZGUvY2dpL2NoZWNrLXJldi5jZ2k/MEsG +CWCGSAGG+EIBCAQ+FjxodHRwOi8vd3d3LmRmbi1wY2EuZGUvY2VydGlmaWNhdGlv +bi9wb2xpY2llcy94NTA5cG9saWN5Lmh0bWwwOAYJYIZIAYb4QgENBCsWKVRoZSBE +Rk4gVG9wLUxldmVsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MGQGA1UdIARdMFsw +WQYLKwYBBAHZGoIsAQEwSjBIBggrBgEFBQcCARY8aHR0cDovL3d3dy5kZm4tcGNh +LmRlL2NlcnRpZmljYXRpb24vcG9saWNpZXMveDUwOXBvbGljeS5odG1sMA0GCSqG +SIb3DQEBBQUAA4IBAQAmbai6JMt7nkuavyvxKzLGn04Gyt0zKrp8zmERp4inktvY +7p+vkaomYu2QYC7cHq0tlrPXQQhhetjiXGb+36aJtHDkEA0NwrJzYnHgPsvx7z0w +ysENP4wxf97KsSWm07RY+f6/gIQF7Je7CW30Rzq7N6R0NMBs32mJgdn3ntqlFNw3 +Nbs050FEjPNq54RdawlJo85x+w+QJd7uQM4yZjHpRhvwgte9Ge1UqCUdpMsLHzeM +KJ0B9GhwIIqOJCMiPgKjcUBrn6ehSX70POvXvjjE2+FzhPGTyTkS474d2UCAnL9q +hPrdWXzBjOumOjhJutT1aecm9eljlshmh1cNen00 +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE----- +MIIDwzCCAyygAwIBAgIBADANBgkqhkiG9w0BAQQFADCBmDELMAkGA1UEBhMCQVQx +EDAOBgNVBAgTB0F1c3RyaWExDzANBgNVBAcTBlZpZW5uYTFCMEAGA1UEChM5QXJn +ZSBEYXRlbiBPZXN0ZXJyZWljaGlzY2hlIEdlc2VsbHNjaGFmdCBmdWVyIERhdGVu +c2NodXR6MSIwIAYJKoZIhvcNAQkBFhNhLWNlcnRAYXJnZWRhdGVuLmF0MB4XDTAx +MDIxMjExMzAzMFoXDTA5MDIxMjExMzAzMFowgZgxCzAJBgNVBAYTAkFUMRAwDgYD +VQQIEwdBdXN0cmlhMQ8wDQYDVQQHEwZWaWVubmExQjBABgNVBAoTOUFyZ2UgRGF0 +ZW4gT2VzdGVycmVpY2hpc2NoZSBHZXNlbGxzY2hhZnQgZnVlciBEYXRlbnNjaHV0 +ejEiMCAGCSqGSIb3DQEJARYTYS1jZXJ0QGFyZ2VkYXRlbi5hdDCBnzANBgkqhkiG +9w0BAQEFAAOBjQAwgYkCgYEAwgsHqoNtmmrJ86+e1I4hOVBaL4kokqKN2IPOIL+1 +XwY8vfOOUfPEdhWpaC0ldt7VYrksgDiUccgH0FROANWK2GkfKMDzjjXHysR04uEb +Om7Kqjqn0nproOGkFG+QvBZgs+Ws+HXNFJA6V76fU4+JXq4452LSK4Lr5YcBquu3 +NJECAwEAAaOCARkwggEVMB0GA1UdDgQWBBQ0j59zH/G31zRjgK1y2P//tSAWZjCB +xQYDVR0jBIG9MIG6gBQ0j59zH/G31zRjgK1y2P//tSAWZqGBnqSBmzCBmDELMAkG +A1UEBhMCQVQxEDAOBgNVBAgTB0F1c3RyaWExDzANBgNVBAcTBlZpZW5uYTFCMEAG +A1UEChM5QXJnZSBEYXRlbiBPZXN0ZXJyZWljaGlzY2hlIEdlc2VsbHNjaGFmdCBm +dWVyIERhdGVuc2NodXR6MSIwIAYJKoZIhvcNAQkBFhNhLWNlcnRAYXJnZWRhdGVu +LmF0ggEAMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMBEGCWCGSAGG+EIBAQQE +AwICBDANBgkqhkiG9w0BAQQFAAOBgQBFuJYncqMYB6gXQS3eDOI90BEHfFTKy/dV +AV+K7QdAYikWmqgBheRdPKddJdccPy/Zl/p3ZT7GhDyC5f3wZjcuu8AJ27BNwbCA +x54dgxgCNcyPm79nY8MRtEdEpoRGdSsFKJemz6hpXM++MWFciyrRWIIA44XB0Gv3 +US0spjsDPQ== +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE----- +MIICtzCCAiACAQAwDQYJKoZIhvcNAQEEBQAwgaMxCzAJBgNVBAYTAkVTMRIwEAYD +VQQIEwlCQVJDRUxPTkExEjAQBgNVBAcTCUJBUkNFTE9OQTEZMBcGA1UEChMQSVBT +IFNlZ3VyaWRhZCBDQTEYMBYGA1UECxMPQ2VydGlmaWNhY2lvbmVzMRcwFQYDVQQD +Ew5JUFMgU0VSVklET1JFUzEeMBwGCSqGSIb3DQEJARYPaXBzQG1haWwuaXBzLmVz +MB4XDTk4MDEwMTIzMjEwN1oXDTA5MTIyOTIzMjEwN1owgaMxCzAJBgNVBAYTAkVT +MRIwEAYDVQQIEwlCQVJDRUxPTkExEjAQBgNVBAcTCUJBUkNFTE9OQTEZMBcGA1UE +ChMQSVBTIFNlZ3VyaWRhZCBDQTEYMBYGA1UECxMPQ2VydGlmaWNhY2lvbmVzMRcw +FQYDVQQDEw5JUFMgU0VSVklET1JFUzEeMBwGCSqGSIb3DQEJARYPaXBzQG1haWwu +aXBzLmVzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsT1J0nznqjtwlxLyY +XZhkJAk8IbPMGbWOlI6H0fg3PqHILVikgDVboXVsHUUMH2Fjal5vmwpMwci4YSM1 +gf/+rHhwLWjhOgeYlQJU3c0jt4BT18g3RXIGJBK6E2Ehim51KODFDzT9NthFf+G4 +Nu+z4cYgjui0OLzhPvYR3oydAQIDAQABMA0GCSqGSIb3DQEBBAUAA4GBACzzw3lY +JN7GO9HgQmm47mSzPWIBubOE3yN93ZjPEKn+ANgilgUTB1RXxafey9m4iEL2mdsU +dx+2/iU94aI+A6mB0i1sR/WWRowiq8jMDQ6XXotBtDvECgZAHd1G9AHduoIuPD14 +cJ58GNCr+Lh3B0Zx8coLY1xq+XKU1QFPoNtC +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE----- +MIIEZDCCA0ygAwIBAgIQRL4Mi1AAJLQR0zYwS8AzdzANBgkqhkiG9w0BAQUFADCB +ozELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug +Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho +dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xKzApBgNVBAMTIlVUTi1VU0VSRmlyc3Qt +TmV0d29yayBBcHBsaWNhdGlvbnMwHhcNOTkwNzA5MTg0ODM5WhcNMTkwNzA5MTg1 +NzQ5WjCBozELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0 +IExha2UgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYD +VQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xKzApBgNVBAMTIlVUTi1VU0VS +Rmlyc3QtTmV0d29yayBBcHBsaWNhdGlvbnMwggEiMA0GCSqGSIb3DQEBAQUAA4IB +DwAwggEKAoIBAQCz+5Gh5DZVhawGNFugmliy+LUPBXeDrjKxdpJo7CNKyXY/45y2 +N3kDuatpjQclthln5LAbGHNhSuh+zdMvZOOmfAz6F4CjDUeJT1FxL+78P/m4FoCH +iZMlIJpDgmkkdihZNaEdwH+DBmQWICzTSaSFtMBhf1EI+GgVkYDLpdXuOzr0hARe +YFmnjDRy7rh4xdE7EkpvfmUnuaRVxblvQ6TFHSyZwFKkeEwVs0CYCGtDxgGwenv1 +axwiP8vv/6jQOkt2FZ7S0cYu49tXGzKiuG/ohqY/cKvlcJKrRB5AUPuco2LkbG6g +yN7igEL66S/ozjIEj3yNtxyjNTwV3Z7DrpelAgMBAAGjgZEwgY4wCwYDVR0PBAQD +AgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFPqGydvguul49Uuo1hXf8NPh +ahQ8ME8GA1UdHwRIMEYwRKBCoECGPmh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9V +VE4tVVNFUkZpcnN0LU5ldHdvcmtBcHBsaWNhdGlvbnMuY3JsMA0GCSqGSIb3DQEB +BQUAA4IBAQCk8yXM0dSRgyLQzDKrm5ZONJFUICU0YV8qAhXhi6r/fWRRzwr/vH3Y +IWp4yy9Rb/hCHTO967V7lMPDqaAt39EpHx3+jz+7qEUqf9FuVSTiuwL7MT++6Lzs +QCv4AdRWOOTKRIK1YSAhZ2X28AvnNPilwpyjXEAfhZOVBt5P1CeptqX8Fs1zMT+4 +ZSfP1FMa8Kxun08FDAOBp4QpxFq9ZFdyrTvPNximmMatBrTcCKME1SmklpoSZ0qM +YEWd8SOasACcaLWYUNPvji6SZbFIPiG+FTAqDbUMo2s/rn9X9R+WfN9v3YIwLGUb +QErNaLly7HF27FSOH4UMAWr6pjisH8SE +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE----- +MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCB +kzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug +Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho +dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZBgNVBAMTElVUTiAtIERBVEFDb3Jw +IFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBaMIGTMQswCQYDVQQG +EwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYD +VQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cu +dXNlcnRydXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjAN +BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6 +E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ysraP6LnD43m77VkIVni5c7yPeIbkFdicZ +D0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlowHDyUwDAXlCCpVZvNvlK +4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA9P4yPykq +lXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulW +bfXv33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQAB +o4GrMIGoMAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRT +MtGzz3/64PGgXYVOktKeRR20TzA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3Js +LnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dDLmNybDAqBgNVHSUEIzAhBggr +BgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3DQEBBQUAA4IB +AQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft +Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyj +j98C5OBxOvG0I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVH +KWss5nbZqSl9Mt3JNjy9rjXxEZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv +2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwPDPafepE39peC4N1xaf92P2BNPM/3 +mfnGV/TJVTl4uix5yaaIK/QI +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE----- +MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb +MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow +GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj +YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL +MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE +BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM +GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP +ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua +BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe +3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4 +YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR +rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm +ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU +oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF +MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v +QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t +b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF +AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q +GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz +Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2 +G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi +l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3 +smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg== +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE----- +MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEb +MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow +GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRp +ZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVow +fjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G +A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAiBgNV +BAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEB +BQADggEPADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPM +cm3ye5drswfxdySRXyWP9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3S +HpR7LZQdqnXXs5jLrLxkU0C8j6ysNstcrbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996 +CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rCoznl2yY4rYsK7hljxxwk +3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3Vp6ea5EQz +6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNV +HQ4EFgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1Ud +EwEB/wQFMAMBAf8wgYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2Rv +Y2EuY29tL1NlY3VyZUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRw +Oi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmww +DQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm4J4oqF7Tt/Q0 +5qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj +Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtI +gKvcnDe4IRRLDXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJ +aD61JlfutuC23bkpgHl9j6PwpCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDl +izeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1HRR3B7Hzs/Sk= +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE----- +MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEb +MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow +GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0 +aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEwMDAwMDBaFw0yODEyMzEyMzU5NTla +MH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO +BgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUwIwYD +VQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0B +AQEFAAOCAQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWW +fnJSoBVC21ndZHoa0Lh73TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMt +TGo87IvDktJTdyR0nAducPy9C1t2ul/y/9c3S0pgePfw+spwtOpZqqPOSC+pw7IL +fhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6juljatEPmsbS9Is6FARW +1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsSivnkBbA7 +kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0G +A1UdDgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYD +VR0TAQH/BAUwAwEB/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21v +ZG9jYS5jb20vVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRo +dHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMu +Y3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8NtwuleGFTQQuS9/ +HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32 +pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxIS +jBc/lDb+XbDABHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+ +xqFx7D+gIIxmOom0jtTYsU0lR+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/Atyjcn +dBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O9y5Xt5hwXsjEeLBi +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE----- +MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCB +lzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug +Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho +dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3Qt +SGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgxOTIyWjCBlzELMAkG +A1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEe +MBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8v +d3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdh +cmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn +0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlIwrthdBKWHTxqctU8EGc6Oe0rE81m65UJ +M6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFdtqdt++BxF2uiiPsA3/4a +MXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8i4fDidNd +oI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqI +DsjfPe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9Ksy +oUhbAgMBAAGjgbkwgbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYD +VR0OBBYEFKFyXyYbKJhDlV0HN9WFlp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0 +dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNFUkZpcnN0LUhhcmR3YXJlLmNy +bDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUFBwMGBggrBgEF +BQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM +//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28Gpgoiskli +CE7/yMgUsogWXecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gE +CJChicsZUN/KHAG8HQQZexB2lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t +3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kniCrVWFCVH/A7HFe7fRQ5YiuayZSS +KqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67nfhmqA== +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE----- +MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCB +kzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug +Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho +dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZBgNVBAMTElVUTiAtIERBVEFDb3Jw +IFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBaMIGTMQswCQYDVQQG +EwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYD +VQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cu +dXNlcnRydXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjAN +BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6 +E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ysraP6LnD43m77VkIVni5c7yPeIbkFdicZ +D0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlowHDyUwDAXlCCpVZvNvlK +4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA9P4yPykq +lXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulW +bfXv33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQAB +o4GrMIGoMAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRT +MtGzz3/64PGgXYVOktKeRR20TzA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3Js +LnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dDLmNybDAqBgNVHSUEIzAhBggr +BgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3DQEBBQUAA4IB +AQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft +Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyj +j98C5OBxOvG0I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVH +KWss5nbZqSl9Mt3JNjy9rjXxEZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv +2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwPDPafepE39peC4N1xaf92P2BNPM/3 +mfnGV/TJVTl4uix5yaaIK/QI +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE----- +MIIEojCCA4qgAwIBAgIQRL4Mi1AAJLQR0zYlJWfJiTANBgkqhkiG9w0BAQUFADCB +rjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug +Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho +dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xNjA0BgNVBAMTLVVUTi1VU0VSRmlyc3Qt +Q2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBFbWFpbDAeFw05OTA3MDkxNzI4NTBa +Fw0xOTA3MDkxNzM2NThaMIGuMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAV +BgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5l +dHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRydXN0LmNvbTE2MDQGA1UE +AxMtVVROLVVTRVJGaXJzdC1DbGllbnQgQXV0aGVudGljYXRpb24gYW5kIEVtYWls +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsjmFpPJ9q0E7YkY3rs3B +YHW8OWX5ShpHornMSMxqmNVNNRm5pELlzkniii8efNIxB8dOtINknS4p1aJkxIW9 +hVE1eaROaJB7HHqkkqgX8pgV8pPMyaQylbsMTzC9mKALi+VuG6JG+ni8om+rWV6l +L8/K2m2qL+usobNqqrcuZzWLeeEeaYji5kbNoKXqvgvOdjp6Dpvq/NonWz1zHyLm +SGHGTPNpsaguG7bUMSAsvIKKjqQOpdeJQ/wWWq8dcdcRWdq6hw2v+vPhwvCkxWeM +1tZUOt4KpLoDd7NlyP0e03RiqhjKaJMeoYV+9Udly/hNVyh00jT/MLbu9mIwFIws +6wIDAQABo4G5MIG2MAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud +DgQWBBSJgmd9xJ0mcABLtFBIfN49rgRufTBYBgNVHR8EUTBPME2gS6BJhkdodHRw +Oi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLVVTRVJGaXJzdC1DbGllbnRBdXRoZW50 +aWNhdGlvbmFuZEVtYWlsLmNybDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH +AwQwDQYJKoZIhvcNAQEFBQADggEBALFtYV2mGn98q0rkMPxTbyUkxsrt4jFcKw7u +7mFVbwQ+zznexRtJlOTrIEy05p5QLnLZjfWqo7NK2lYcYJeA3IKirUq9iiv/Cwm0 +xtcgBEXkzYABurorbs6q15L+5K/r9CYdFip/bDCVNy8zEqx/3cfREYxRmLLQo5HQ +rfafnoOTHh1CuEava2bwm3/q4wMC5QJRwarVNZ1yQAOJujEdxRBoUp7fooXFXAim +eOZTT7Hot9MUnpOmw2TjrH5xzbyf6QMbzPvprDHBr3wVdAKZw7JHpsIyYdfHb0gk +USeh1YdV8nuPmD0Wnu51tvjQjvLzxq4oW6fw8zYX/MMF08oDSlQ= +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE----- +MIIEZjCCA06gAwIBAgIQRL4Mi1AAJLQR0zYt4LNfGzANBgkqhkiG9w0BAQUFADCB +lTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug +Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho +dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHTAbBgNVBAMTFFVUTi1VU0VSRmlyc3Qt +T2JqZWN0MB4XDTk5MDcwOTE4MzEyMFoXDTE5MDcwOTE4NDAzNlowgZUxCzAJBgNV +BAYTAlVTMQswCQYDVQQIEwJVVDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkxHjAc +BgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEhMB8GA1UECxMYaHR0cDovL3d3 +dy51c2VydHJ1c3QuY29tMR0wGwYDVQQDExRVVE4tVVNFUkZpcnN0LU9iamVjdDCC +ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6qgT+jo2F4qjEAVZURnicP +HxzfOpuCaDDASmEd8S8O+r5596Uj71VRloTN2+O5bj4x2AogZ8f02b+U60cEPgLO +KqJdhwQJ9jCdGIqXsqoc/EHSoTbL+z2RuufZcDX65OeQw5ujm9M89RKZd7G3CeBo +5hy485RjiGpq/gt2yb70IuRnuasaXnfBhQfdDWy/7gbHd2pBnqcP1/vulBe3/IW+ +pKvEHDHd17bR5PDv3xaPslKT16HUiaEHLr/hARJCHhrh2JU022R5KP+6LhHC5ehb +kkj7RwvCbNqtMoNB86XlQXD9ZZBt+vpRxPm9lisZBCzTbafc8H9vg2XiaquHhnUC +AwEAAaOBrzCBrDALBgNVHQ8EBAMCAcYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E +FgQU2u1kdBScFDyr3ZmpvVsoTYs8ydgwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDov +L2NybC51c2VydHJ1c3QuY29tL1VUTi1VU0VSRmlyc3QtT2JqZWN0LmNybDApBgNV +HSUEIjAgBggrBgEFBQcDAwYIKwYBBQUHAwgGCisGAQQBgjcKAwQwDQYJKoZIhvcN +AQEFBQADggEBAAgfUrE3RHjb/c652pWWmKpVZIC1WkDdIaXFwfNfLEzIR1pp6ujw +NTX00CXzyKakh0q9G7FzCL3Uw8q2NbtZhncxzaeAFK4T7/yxSPlrJSUtUbYsbUXB +mMiKVl0+7kNOPmsnjtA6S4ULX9Ptaqd1y9Fahy85dRNacrACgZ++8A+EVCBibGnU +4U3GDZlDAQ0Slox4nb9QorFEqmrPF3rPbw/U+CRVX/A0FklmPlBGyWNxODFiuGK5 +81OtbLUrohKqGU8J2l7nk8aOFAj+8DCAGKCGhU3IfdeLA/5u1fedFqySLKAj5ZyR +Uh+U3xeUc8OzwcFxBSAAeL0TUh2oPs0AH8g= +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE----- +MIIDIDCCAgigAwIBAgIBJDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP +MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MxIENBMB4XDTAx +MDQwNjEwNDkxM1oXDTIxMDQwNjEwNDkxM1owOTELMAkGA1UEBhMCRkkxDzANBgNV +BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMSBDQTCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBALWJHytPZwp5/8Ue+H887dF+2rDNbS82rDTG +29lkFwhjMDMiikzujrsPDUJVyZ0upe/3p4zDq7mXy47vPxVnqIJyY1MPQYx9EJUk +oVqlBvqSV536pQHydekfvFYmUk54GWVYVQNYwBSujHxVX3BbdyMGNpfzJLWaRpXk +3w0LBUXl0fIdgrvGE+D+qnr9aTCU89JFhfzyMlsy3uhsXR/LpCJ0sICOXZT3BgBL +qdReLjVQCfOAl/QMF6452F/NM8EcyonCIvdFEu1eEpOdY6uCLrnrQkFEy0oaAIIN +nvmLVz5MxxftLItyM19yejhW1ebZrgUaHXVFsculJRwSVzb9IjcCAwEAAaMzMDEw +DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQIR+IMi/ZTiFIwCwYDVR0PBAQDAgEG +MA0GCSqGSIb3DQEBBQUAA4IBAQCLGrLJXWG04bkruVPRsoWdd44W7hE928Jj2VuX +ZfsSZ9gqXLar5V7DtxYvyOirHYr9qxp81V9jz9yw3Xe5qObSIjiHBxTZ/75Wtf0H +DjxVyhbMp6Z3N/vbXB9OWQaHowND9Rart4S9Tu+fMTfwRvFAttEMpWT4Y14h21VO +TzF2nBBhjrZTOqMRvq9tfB69ri3iDGnHhVNoomG6xT60eVR4ngrHAr5i0RGCS2Uv +kVrCqIexVmiUefkl98HVrhq4uz2PqYo4Ffdz0Fpg0YCw8NzVUM1O7pJIae2yIx4w +zMiUyLb1O4Z/P6Yun/Y+LLWSlj7fLJOK/4GMDw9ZIRlXvVWa +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE----- +MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP +MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAx +MDQwNjA3Mjk0MFoXDTIxMDQwNjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNV +BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3/Ei9vX+ALTU74W+o +Z6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybTdXnt +5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s +3TmVToMGf+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2Ej +vOr7nQKV0ba5cTppCD8PtOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu +8nYybieDwnPz3BjotJPqdURrBGAgcVeHnfO+oJAjPYok4doh28MCAwEAAaMzMDEw +DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITTXjwwCwYDVR0PBAQDAgEG +MA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt0jSv9zil +zqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/ +3DEIcbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvD +FNr450kkkdAdavphOe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6 +Tk6ezAyNlNzZRZxe7EJQY670XcSxEtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2 +ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLHllpwrN9M +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE----- +MIIFTzCCBLigAwIBAgIBaDANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUx +ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0 +b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTQwMgYDVQQD +EytOZXRMb2NrIEV4cHJlc3N6IChDbGFzcyBDKSBUYW51c2l0dmFueWtpYWRvMB4X +DTk5MDIyNTE0MDgxMVoXDTE5MDIyMDE0MDgxMVowgZsxCzAJBgNVBAYTAkhVMREw +DwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9u +c2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE0MDIGA1UEAxMr +TmV0TG9jayBFeHByZXNzeiAoQ2xhc3MgQykgVGFudXNpdHZhbnlraWFkbzCBnzAN +BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA6+ywbGGKIyWvYCDj2Z/8kwvbXY2wobNA +OoLO/XXgeDIDhlqGlZHtU/qdQPzm6N3ZW3oDvV3zOwzDUXmbrVWg6dADEK8KuhRC +2VImESLH0iDMgqSaqf64gXadarfSNnU+sYYJ9m5tfk63euyucYT2BDMIJTLrdKwW +RMbkQJMdf60CAwEAAaOCAp8wggKbMBIGA1UdEwEB/wQIMAYBAf8CAQQwDgYDVR0P +AQH/BAQDAgAGMBEGCWCGSAGG+EIBAQQEAwIABzCCAmAGCWCGSAGG+EIBDQSCAlEW +ggJNRklHWUVMRU0hIEV6ZW4gdGFudXNpdHZhbnkgYSBOZXRMb2NrIEtmdC4gQWx0 +YWxhbm9zIFN6b2xnYWx0YXRhc2kgRmVsdGV0ZWxlaWJlbiBsZWlydCBlbGphcmFz +b2sgYWxhcGphbiBrZXN6dWx0LiBBIGhpdGVsZXNpdGVzIGZvbHlhbWF0YXQgYSBO +ZXRMb2NrIEtmdC4gdGVybWVrZmVsZWxvc3NlZy1iaXp0b3NpdGFzYSB2ZWRpLiBB +IGRpZ2l0YWxpcyBhbGFpcmFzIGVsZm9nYWRhc2FuYWsgZmVsdGV0ZWxlIGF6IGVs +b2lydCBlbGxlbm9yemVzaSBlbGphcmFzIG1lZ3RldGVsZS4gQXogZWxqYXJhcyBs +ZWlyYXNhIG1lZ3RhbGFsaGF0byBhIE5ldExvY2sgS2Z0LiBJbnRlcm5ldCBob25s +YXBqYW4gYSBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIGNpbWVuIHZhZ3kg +a2VyaGV0byBheiBlbGxlbm9yemVzQG5ldGxvY2submV0IGUtbWFpbCBjaW1lbi4g +SU1QT1JUQU5UISBUaGUgaXNzdWFuY2UgYW5kIHRoZSB1c2Ugb2YgdGhpcyBjZXJ0 +aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIHRoZSBOZXRMb2NrIENQUyBhdmFpbGFibGUg +YXQgaHR0cHM6Ly93d3cubmV0bG9jay5uZXQvZG9jcyBvciBieSBlLW1haWwgYXQg +Y3BzQG5ldGxvY2submV0LjANBgkqhkiG9w0BAQQFAAOBgQAQrX/XDDKACtiG8XmY +ta3UzbM2xJZIwVzNmtkFLp++UOv0JhQQLdRmF/iewSf98e3ke0ugbLWrmldwpu2g +pO0u9f38vf5NNwgMvOOWgyL1SRt/Syu0VMGAfJlOHdCM7tCs5ZL6dVb+ZKATj7i4 +Fp1hBWeAyNDYpQcCNJgEjTME1A== +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE----- +MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhV +MRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMe +TmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0 +dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFzcyBB +KSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oXDTE5MDIxOTIzMTQ0 +N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhC +dWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQu +MRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBL +b3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSMD7tM9DceqQWC2ObhbHDqeLVu0ThEDaiD +zl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZz+qMkjvN9wfcZnSX9EUi +3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC/tmwqcm8 +WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LY +Oph7tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2Esi +NCubMvJIH5+hCoR64sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCC +ApswDgYDVR0PAQH/BAQDAgAGMBIGA1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4 +QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1GSUdZRUxFTSEgRXplbiB0 +YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pvbGdhbHRhdGFz +aSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu +IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtm +ZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMg +ZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVs +amFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJhc2EgbWVndGFsYWxoYXRv +IGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBhIGh0dHBzOi8vd3d3 +Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVub3J6 +ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1 +YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3Qg +dG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRs +b2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNAbmV0bG9jay5uZXQuMA0G +CSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5ayZrU3/b39/zcT0mwBQO +xmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjPytoUMaFP +0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQ +QeJBCWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxk +f1qbFFgBJ34TUMdrKuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK +8CtmdWOMovsEPoMOmzbwGOQmIMOM8CgHrTwXZoi1/baI +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE----- +MIIFSzCCBLSgAwIBAgIBaTANBgkqhkiG9w0BAQQFADCBmTELMAkGA1UEBhMCSFUx +ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0 +b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTIwMAYDVQQD +EylOZXRMb2NrIFV6bGV0aSAoQ2xhc3MgQikgVGFudXNpdHZhbnlraWFkbzAeFw05 +OTAyMjUxNDEwMjJaFw0xOTAyMjAxNDEwMjJaMIGZMQswCQYDVQQGEwJIVTERMA8G +A1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRvbnNh +Z2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxMjAwBgNVBAMTKU5l +dExvY2sgVXpsZXRpIChDbGFzcyBCKSBUYW51c2l0dmFueWtpYWRvMIGfMA0GCSqG +SIb3DQEBAQUAA4GNADCBiQKBgQCx6gTsIKAjwo84YM/HRrPVG/77uZmeBNwcf4xK +gZjupNTKihe5In+DCnVMm8Bp2GQ5o+2So/1bXHQawEfKOml2mrriRBf8TKPV/riX +iK+IA4kfpPIEPsgHC+b5sy96YhQJRhTKZPWLgLViqNhr1nGTLbO/CVRY7QbrqHvc +Q7GhaQIDAQABo4ICnzCCApswEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNVHQ8BAf8E +BAMCAAYwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1G +SUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFu +b3MgU3pvbGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBh +bGFwamFuIGtlc3p1bHQuIEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExv +Y2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGln +aXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0 +IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJh +c2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGph +biBhIGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJo +ZXRvIGF6IGVsbGVub3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBP +UlRBTlQhIFRoZSBpc3N1YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmlj +YXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBo +dHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNA +bmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4GBAATbrowXr/gOkDFOzT4JwG06 +sPgzTEdM43WIEJessDgVkcYplswhwG08pXTP2IKlOcNl40JwuyKQ433bNXbhoLXa +n3BukxowOR0w2y7jfLKRstE3Kfq51hdcR0/jHTjrn9V7lagonhVK0dHQKwCXoOKS +NitjrFgBazMpUIaD8QFI +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE-----
+MIICiTCCAfKgAwIBAgIEN4dnrDANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJi
+ZTERMA8GA1UEChMIQmVsZ2Fjb20xDDAKBgNVBAsTA01UTTEkMCIGA1UEAxMbQmVs
+Z2Fjb20gRS1UcnVzdCBQcmltYXJ5IENBMR8wHQYKCZImiZPyLGQBAxQPaW5mb0Bl
+LXRydXN0LmJlMB4XDTk4MTEwNDEzMDQzOVoXDTEwMDEyMTEzMDQzOVowdTELMAkG
+A1UEBhMCYmUxETAPBgNVBAoTCEJlbGdhY29tMQwwCgYDVQQLEwNNVE0xJDAiBgNV
+BAMTG0JlbGdhY29tIEUtVHJ1c3QgUHJpbWFyeSBDQTEfMB0GCgmSJomT8ixkAQMU
+D2luZm9AZS10cnVzdC5iZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqtm5
+s9VPak3FQdB7BGFqi3GBB9pk41huJ1XCrc4XsPz6ko0I8Bxy/7LDMf7gaoeXTMxD
+V6coeTq1g12kHWrxasU+FCIdWQZv8KYxd9ywSTjmywwP/qpyNIjaKDohWu50Kxuk
+21sTFrVzX8OujNLAPj2wy/Dsi4YLwsFEGFpjqNUCAwEAAaMmMCQwDwYDVR0TBAgw
+BgEB/wIBATARBglghkgBhvhCAQEEBAMCAAcwDQYJKoZIhvcNAQEFBQADgYEAerKx
+pbF9M+nC4RvO05OMfwH9Gx1amq6rB1Ev7Ymr3VBCux//SrWknLFhKQpM6oNZSY2v
+hmnXgaxHqqRxblnvynxqblSK2qiSyfVms3lf1IsBniFjRjWTpcJfImIDcB1jI+hr
+SB0jECfY9t9HorrsgFBKbMRwpnrkdCJ/9oRiMn8=
+-----END CERTIFICATE-----
+ + +-----BEGIN CERTIFICATE----- +MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCB +gjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEk +MCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRY +UmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQxMTAxMTcx +NDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3 +dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2Vy +dmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB +dXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS6 +38eMpSe2OAtp87ZOqCwuIR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCP +KZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMxfoArtYzAQDsRhtDLooY2YKTVMIJt2W7Q +DxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FEzG+gSqmUsE3a56k0enI4 +qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqsAxcZZPRa +JSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNVi +PvryxS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0P +BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASs +jVy16bYbMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0 +eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQEwDQYJKoZIhvcNAQEFBQAD +ggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc/Kh4ZzXxHfAR +vbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt +qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLa +IR9NmXmd4c8nnxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSy +i6mx5O+aGtA9aZnuqCij4Tyz8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQ +O+7ETPTsJ3xCwnR8gooJybQDJbw= +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE-----
+MIIFGTCCBAGgAwIBAgIEPki9xDANBgkqhkiG9w0BAQUFADAxMQswCQYDVQQGEwJE
+SzEMMAoGA1UEChMDVERDMRQwEgYDVQQDEwtUREMgT0NFUyBDQTAeFw0wMzAyMTEw
+ODM5MzBaFw0zNzAyMTEwOTA5MzBaMDExCzAJBgNVBAYTAkRLMQwwCgYDVQQKEwNU
+REMxFDASBgNVBAMTC1REQyBPQ0VTIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEArGL2YSCyz8DGhdfjeebM7fI5kqSXLmSjhFuHnEz9pPPEXyG9VhDr
+2y5h7JNp46PMvZnDBfwGuMo2HP6QjklMxFaaL1a8z3sM8W9Hpg1DTeLpHTk0zY0s
+2RKY+ePhwUp8hjjEqcRhiNJerxomTdXkoCJHhNlktxmW/OwZ5LKXJk5KTMuPJItU
+GBxIYXvViGjaXbXqzRowwYCDdlCqT9HU3Tjw7xb04QxQBr/q+3pJoSgrHPb8FTKj
+dGqPqcNiKXEx5TukYBdedObaE+3pHx8b0bJoc8YQNHVGEBDjkAB2QMuLt0MJIf+r
+TpPGWOmlgtt3xDqZsXKVSQTwtyv6e1mO3QIDAQABo4ICNzCCAjMwDwYDVR0TAQH/
+BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwgewGA1UdIASB5DCB4TCB3gYIKoFQgSkB
+AQEwgdEwLwYIKwYBBQUHAgEWI2h0dHA6Ly93d3cuY2VydGlmaWthdC5kay9yZXBv
+c2l0b3J5MIGdBggrBgEFBQcCAjCBkDAKFgNUREMwAwIBARqBgUNlcnRpZmlrYXRl
+ciBmcmEgZGVubmUgQ0EgdWRzdGVkZXMgdW5kZXIgT0lEIDEuMi4yMDguMTY5LjEu
+MS4xLiBDZXJ0aWZpY2F0ZXMgZnJvbSB0aGlzIENBIGFyZSBpc3N1ZWQgdW5kZXIg
+T0lEIDEuMi4yMDguMTY5LjEuMS4xLjARBglghkgBhvhCAQEEBAMCAAcwgYEGA1Ud
+HwR6MHgwSKBGoESkQjBAMQswCQYDVQQGEwJESzEMMAoGA1UEChMDVERDMRQwEgYD
+VQQDEwtUREMgT0NFUyBDQTENMAsGA1UEAxMEQ1JMMTAsoCqgKIYmaHR0cDovL2Ny
+bC5vY2VzLmNlcnRpZmlrYXQuZGsvb2Nlcy5jcmwwKwYDVR0QBCQwIoAPMjAwMzAy
+MTEwODM5MzBagQ8yMDM3MDIxMTA5MDkzMFowHwYDVR0jBBgwFoAUYLWF7FZkfhIZ
+J2cdUBVLc647+RIwHQYDVR0OBBYEFGC1hexWZH4SGSdnHVAVS3OuO/kSMB0GCSqG
+SIb2fQdBAAQQMA4bCFY2LjA6NC4wAwIEkDANBgkqhkiG9w0BAQUFAAOCAQEACrom
+JkbTc6gJ82sLMJn9iuFXehHTuJTXCRBuo7E4A9G28kNBKWKnctj7fAXmMXAnVBhO
+inxO5dHKjHiIzxvTkIvmI/gLDjNDfZziChmPyQE+dF10yYscA+UYyAFMP8uXBV2Y
+caaYb7Z8vTd/vuGTJW1v8AqtFxjhA7wHKcitJuj4YfD9IQl+mo6paH1IYnK9AOoB
+mbgGglGBTvH1tJFUuSN6AJqfXY3gPGS5GhKSKseCRHI53OI8xthV9RVOyAUO28bQ
+YqbsFbS1AoLbrIyigfCbmTH1ICCoiGEKB5+U/NDXG8wuF/MEJ3Zn61SD/aSQfgY9
+BKNDLdr8C2LqL19iUw==
+-----END CERTIFICATE-----
+ + +-----BEGIN CERTIFICATE----- +MIIG0TCCBbmgAwIBAgIBezANBgkqhkiG9w0BAQUFADCByTELMAkGA1UEBhMCSFUx +ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0 +b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMUIwQAYDVQQD +EzlOZXRMb2NrIE1pbm9zaXRldHQgS296amVneXpvaSAoQ2xhc3MgUUEpIFRhbnVz +aXR2YW55a2lhZG8xHjAcBgkqhkiG9w0BCQEWD2luZm9AbmV0bG9jay5odTAeFw0w +MzAzMzAwMTQ3MTFaFw0yMjEyMTUwMTQ3MTFaMIHJMQswCQYDVQQGEwJIVTERMA8G +A1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRvbnNh +Z2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxQjBABgNVBAMTOU5l +dExvY2sgTWlub3NpdGV0dCBLb3pqZWd5em9pIChDbGFzcyBRQSkgVGFudXNpdHZh +bnlraWFkbzEeMBwGCSqGSIb3DQEJARYPaW5mb0BuZXRsb2NrLmh1MIIBIjANBgkq +hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx1Ilstg91IRVCacbvWy5FPSKAtt2/Goq +eKvld/Bu4IwjZ9ulZJm53QE+b+8tmjwi8F3JV6BVQX/yQ15YglMxZc4e8ia6AFQe +r7C8HORSjKAyr7c3sVNnaHRnUPYtLmTeriZ539+Zhqurf4XsoPuAzPS4DB6TRWO5 +3Lhbm+1bOdRfYrCnjnxmOCyqsQhjF2d9zL2z8cM/z1A57dEZgxXbhxInlrfa6uWd +vLrqOU+L73Sa58XQ0uqGURzk/mQIKAR5BevKxXEOC++r6uwSEaEYBTJp0QwsGj0l +mT+1fMptsK6ZmfoIYOcZwvK9UdPM0wKswREMgM6r3JSda6M5UzrWhQIDAMV9o4IC +wDCCArwwEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNVHQ8BAf8EBAMCAQYwggJ1Bglg +hkgBhvhCAQ0EggJmFoICYkZJR1lFTEVNISBFemVuIHRhbnVzaXR2YW55IGEgTmV0 +TG9jayBLZnQuIE1pbm9zaXRldHQgU3pvbGdhbHRhdGFzaSBTemFiYWx5emF0YWJh +biBsZWlydCBlbGphcmFzb2sgYWxhcGphbiBrZXN6dWx0LiBBIG1pbm9zaXRldHQg +ZWxla3Ryb25pa3VzIGFsYWlyYXMgam9naGF0YXMgZXJ2ZW55ZXN1bGVzZW5laywg +dmFsYW1pbnQgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYSBNaW5vc2l0ZXR0IFN6 +b2xnYWx0YXRhc2kgU3phYmFseXphdGJhbiwgYXogQWx0YWxhbm9zIFN6ZXJ6b2Rl +c2kgRmVsdGV0ZWxla2JlbiBlbG9pcnQgZWxsZW5vcnplc2kgZWxqYXJhcyBtZWd0 +ZXRlbGUuIEEgZG9rdW1lbnR1bW9rIG1lZ3RhbGFsaGF0b2sgYSBodHRwczovL3d3 +dy5uZXRsb2NrLmh1L2RvY3MvIGNpbWVuIHZhZ3kga2VyaGV0b2sgYXogaW5mb0Bu +ZXRsb2NrLm5ldCBlLW1haWwgY2ltZW4uIFdBUk5JTkchIFRoZSBpc3N1YW5jZSBh +bmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGFyZSBzdWJqZWN0IHRvIHRo +ZSBOZXRMb2NrIFF1YWxpZmllZCBDUFMgYXZhaWxhYmxlIGF0IGh0dHBzOi8vd3d3 +Lm5ldGxvY2suaHUvZG9jcy8gb3IgYnkgZS1tYWlsIGF0IGluZm9AbmV0bG9jay5u +ZXQwHQYDVR0OBBYEFAlqYhaSsFq7VQ7LdTI6MuWyIckoMA0GCSqGSIb3DQEBBQUA +A4IBAQCRalCc23iBmz+LQuM7/KbD7kPgz/PigDVJRXYC4uMvBcXxKufAQTPGtpvQ +MznNwNuhrWw3AkxYQTvyl5LGSKjN5Yo5iWH5Upfpvfb5lHTocQ68d4bDBsxafEp+ +NFAwLvt/MpqNPfMgW/hqyobzMUwsWYACff44yTB1HLdV47yfuqhthCgFdbOLDcCR +VCHnpgu0mfVRQdzNo0ci2ccBgcTcR08m6h/t280NmPSjnLRzMkqWmf68f8glWPhY +83ZmiVSkpj7EUFy6iRiCdUgh0k8T6GB+B3bbELVR5qq5aKrN9p2QdRLqOBrKROi3 +macqaJVmlaut74nLYKkGEsaUR+ko +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE----- +MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEh +MB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBE +YWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3 +MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRo +ZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3Mg +MiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggEN +ADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCA +PVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6w +wdhFJ2+qN1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXi +EqITLdiOr18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMY +avx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+ +YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLE +sNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h +/t2oatTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5 +IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmlj +YXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD +ggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYXMP80kWNy +OO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKtI3lpjbi2Tc7P +TMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ +HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mER +dEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5Cuf +ReYNnyicsbkqWletNw+vHX/bvZ8= +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE----- +MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzEl +MCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMp +U3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQw +NjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBoMQswCQYDVQQGEwJVUzElMCMGA1UE +ChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZp +ZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqGSIb3 +DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf +8MOh2tTYbitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN ++lq2cwQlZut3f+dZxkqZJRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0 +X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVmepsZGD3/cVE8MC5fvj13c7JdBmzDI1aa +K4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSNF4Azbl5KXZnJHoe0nRrA +1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HFMIHCMB0G +A1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fR +zt0fhvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0 +YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBD +bGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8w +DQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGsafPzWdqbAYcaT1epoXkJKtv3 +L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLMPUxA2IGvd56D +eruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl +xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynp +VSJYACPq4xJDKVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEY +WQPJIrSPnNVeKtelttQKbfi3QBFGmh95DmK/D5fs4C8fF5Q= +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE-----
+MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
+MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
+YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
+R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
+9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
+fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
+iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
+1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
+bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
+MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
+ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
+uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
+Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
+tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
+PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
+hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
+5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
+-----END CERTIFICATE-----
+ + +-----BEGIN CERTIFICATE-----
+MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEW
+MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFs
+IENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3Qg
+R2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDvPE1A
+PRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/NTL8
+Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hL
+TytCOb1kLUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL
+5mkWRxHCJ1kDs6ZgwiFAVvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7
+S4wMcoKK+xfNAGw6EzywhIdLFnopsk/bHdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe
+2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNHK266ZUap
+EBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6td
+EPx7srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv
+/NgdRN3ggX+d6YvhZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywN
+A0ZF66D0f0hExghAzN4bcLUprbqLOzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0
+abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkCx1YAzUm5s2x7UwQa4qjJqhIF
+I8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqFH4z1Ir+rzoPz
+4iIprn2DQKi6bA==
+-----END CERTIFICATE-----
+
+ + +-----BEGIN CERTIFICATE-----
+MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEW
+MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVy
+c2FsIENBMB4XDTA0MDMwNDA1MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UE
+BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xHjAcBgNVBAMTFUdlb1RydXN0
+IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKYV
+VaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9tJPi8
+cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTT
+QjOgNB0eRXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFh
+F7em6fgemdtzbvQKoiFs7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2v
+c7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d8Lsrlh/eezJS/R27tQahsiFepdaVaH/w
+mZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7VqnJNk22CDtucvc+081xd
+VHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3CgaRr0BHdCX
+teGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZ
+f9hBZ3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfRe
+Bi9Fi1jUIxaS5BZuKGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+
+nhutxx9z3SxPGWX9f5NAEC7S8O08ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB
+/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0XG0D08DYj3rWMB8GA1UdIwQY
+MBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG
+9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
+aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fX
+IwjhmF7DWgh2qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzyn
+ANXH/KttgCJwpQzgXQQpAvvLoJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0z
+uzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsKxr2EoyNB3tZ3b4XUhRxQ4K5RirqN
+Pnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxFKyDuSN/n3QmOGKja
+QI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2DFKW
+koRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9
+ER/frslKxfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQt
+DF4JbAiXfKM9fJP/P6EUp8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/Sfuvm
+bJxPgWp6ZKy7PtXny3YuxadIwVyQD8vIP/rmMuGNG2+k5o7Y+SlIis5z/iw=
+-----END CERTIFICATE-----
+
+ + +-----BEGIN CERTIFICATE-----
+MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEW
+MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVy
+c2FsIENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYD
+VQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1
+c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
+AQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0DE81
+WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUG
+FF+3Qs17j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdq
+XbboW0W63MOhBW9Wjo8QJqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxL
+se4YuU6W3Nx2/zu+z18DwPw76L5GG//aQMJS9/7jOvdqdzXQ2o3rXhhqMcceujwb
+KNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2WP0+GfPtDCapkzj4T8Fd
+IgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP20gaXT73
+y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRt
+hAAnZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgoc
+QIgfksILAAX/8sgCSqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4
+Lt1ZrtmhN79UNdxzMk+MBB4zsslG8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAfBgNV
+HSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8EBAMCAYYwDQYJ
+KoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
+dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQ
+L1EuxBRa3ugZ4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgr
+Fg5fNuH8KrUwJM/gYwx7WBr+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSo
+ag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpqA1Ihn0CoZ1Dy81of398j9tx4TuaY
+T1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpgY+RdM4kX2TGq2tbz
+GDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiPpm8m
+1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJV
+OCiNUW7dFGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH
+6aLcr34YEoP9VhdBLtUpgn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwX
+QMAJKOSLakhT2+zNVVXxxvjpoixMptEmX36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
+-----END CERTIFICATE----- + +-----BEGIN CERTIFICATE-----
+MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJC
+TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0
+aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0
+aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAzMTkxODMzMzNaFw0yMTAzMTcxODMz
+MzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUw
+IwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVR
+dW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Yp
+li4kVEAkOPcahdxYTMukJ0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2D
+rOpm2RgbaIr1VxqYuvXtdj182d6UajtLF8HVj71lODqV0D1VNk7feVcxKh7YWWVJ
+WCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeLYzcS19Dsw3sgQUSj7cug
+F+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWenAScOospU
+xbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCC
+Ak4wPQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVv
+dmFkaXNvZmZzaG9yZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREw
+ggENMIIBCQYJKwYBBAG+WAABMIH7MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNl
+IG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBh
+c3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFy
+ZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
+Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYI
+KwYBBQUHAgEWFmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3T
+KbkGGew5Oanwl4Rqy+/fMIGuBgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rq
+y+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1p
+dGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYD
+VQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6tlCL
+MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSk
+fnIYj9lofFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf8
+7C9TqnN7Az10buYWnuulLsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1R
+cHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2xgI4JVrmcGmD+XcHXetwReNDWXcG31a0y
+mQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi5upZIof4l/UO/erMkqQW
+xFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi5nrQNiOK
+SnQ2+Q==
+-----END CERTIFICATE-----
+ + +-----BEGIN CERTIFICATE----- +MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsx +CzAJBgNVBAYTAkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRp +ZmljYWNpw7NuIERpZ2l0YWwgLSBDZXJ0aWPDoW1hcmEgUy5BLjEjMCEGA1UEAwwa +QUMgUmHDrXogQ2VydGljw6FtYXJhIFMuQS4wHhcNMDYxMTI3MjA0NjI5WhcNMzAw +NDAyMjE0MjAyWjB7MQswCQYDVQQGEwJDTzFHMEUGA1UECgw+U29jaWVkYWQgQ2Ft +ZXJhbCBkZSBDZXJ0aWZpY2FjacOzbiBEaWdpdGFsIC0gQ2VydGljw6FtYXJhIFMu +QS4xIzAhBgNVBAMMGkFDIFJhw616IENlcnRpY8OhbWFyYSBTLkEuMIICIjANBgkq +hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq2uJo1PMSCMI+8PPUZYILrgIem08kBeG +qentLhM0R7LQcNzJPNCNyu5LF6vQhbCnIwTLqKL85XXbQMpiiY9QngE9JlsYhBzL +fDe3fezTf3MZsGqy2IiKLUV0qPezuMDU2s0iiXRNWhU5cxh0T7XrmafBHoi0wpOQ +Y5fzp6cSsgkiBzPZkc0OnB8OIMfuuzONj8LSWKdf/WU34ojC2I+GdV75LaeHM/J4 +Ny+LvB2GNzmxlPLYvEqcgxhaBvzz1NS6jBUJJfD5to0EfhcSM2tXSExP2yYe68yQ +54v5aHxwD6Mq0Do43zeX4lvegGHTgNiRg0JaTASJaBE8rF9ogEHMYELODVoqDA+b +MMCm8Ibbq0nXl21Ii/kDwFJnmxL3wvIumGVC2daa49AZMQyth9VXAnow6IYm+48j +ilSH5L887uvDdUhfHjlvgWJsxS3EF1QZtzeNnDeRyPYL1epjb4OsOMLzP96a++Ej +YfDIJss2yKHzMI+ko6Kh3VOz3vCaMh+DkXkwwakfU5tTohVTP92dsxA7SH2JD/zt +A/X7JWR1DhcZDY8AFmd5ekD8LVkH2ZD6mq093ICK5lw1omdMEWux+IBkAC1vImHF +rEsm5VoQgpukg3s0956JkSCXjrdCx2bD0Omk1vUgjcTDlaxECp1bczwmPS9KvqfJ +pxAe+59QafMCAwEAAaOB5jCB4zAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE +AwIBBjAdBgNVHQ4EFgQU0QnQ6dfOeXRU+Tows/RtLAMDG2gwgaAGA1UdIASBmDCB +lTCBkgYEVR0gADCBiTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5jZXJ0aWNhbWFy +YS5jb20vZHBjLzBaBggrBgEFBQcCAjBOGkxMaW1pdGFjaW9uZXMgZGUgZ2FyYW50 +7WFzIGRlIGVzdGUgY2VydGlmaWNhZG8gc2UgcHVlZGVuIGVuY29udHJhciBlbiBs +YSBEUEMuMA0GCSqGSIb3DQEBBQUAA4ICAQBclLW4RZFNjmEfAygPU3zmpFmps4p6 +xbD/CHwso3EcIRNnoZUSQDWDg4902zNc8El2CoFS3UnUmjIz75uny3XlesuXEpBc +unvFm9+7OSPI/5jOCk0iAUgHforA1SBClETvv3eiiWdIG0ADBaGJ7M9i4z0ldma/ +Jre7Ir5v/zlXdLp6yQGVwZVR6Kss+LGGIOk/yzVb0hfpKv6DExdA7ohiZVvVO2Dp +ezy4ydV/NgIlqmjCMRW3MGXrfx1IebHPOeJCgBbT9ZMj/EyXyVo3bHwi2ErN0o42 +gzmRkBDI8ck1fj+404HGIGQatlDCIaR43NAvO2STdPCWkPHv+wlaNECW8DYSwaN0 +jJN+Qd53i+yG2dIPPy3RzECiiWZIHiCznCNZc6lEc7wkeZBWN7PGKX6jD/EpOe9+ +XCgycDWs2rjIdWb8m0w5R44bb5tNAlQiM+9hup4phO9OSzNHdpdqy35f/RWmnkJD +W2ZaiogN9xa5P1FlK2Zqi9E4UqLWRhH6/JocdJ6PlwsCT2TG9WjTSy3/pDceiz+/ +RL5hRqGEPQgnTIEgd4kI6mdAXmwIUV80WoyWaM3X94nCHNMyAK9Sy9NgWyo6R35r +MDOhYil/SrnhLecUIw4OGEfhefwVVdCx/CVxY3UzHCMrr1zZ7Ud3YA47Dx7SwNxk +BYn8eNZcLCZDqQ== +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE----- +MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw +TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh +cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4 +WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu +ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY +MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc +h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+ +0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U +A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW +T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH +B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC +B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv +KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn +OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn +jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw +qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI +rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV +HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq +hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL +ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ +3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK +NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5 +ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur +TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC +jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc +oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq +4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA +mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d +emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc= +-----END CERTIFICATE----- + + +-----BEGIN CERTIFICATE----- +MIICGzCCAaGgAwIBAgIQQdKd0XLq7qeAwSxs6S+HUjAKBggqhkjOPQQDAzBPMQsw +CQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2gg +R3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBYMjAeFw0yMDA5MDQwMDAwMDBaFw00 +MDA5MTcxNjAwMDBaME8xCzAJBgNVBAYTAlVTMSkwJwYDVQQKEyBJbnRlcm5ldCBT +ZWN1cml0eSBSZXNlYXJjaCBHcm91cDEVMBMGA1UEAxMMSVNSRyBSb290IFgyMHYw +EAYHKoZIzj0CAQYFK4EEACIDYgAEzZvVn4CDCuwJSvMWSj5cz3es3mcFDR0HttwW ++1qLFNvicWDEukWVEYmO6gbf9yoWHKS5xcUy4APgHoIYOIvXRdgKam7mAHf7AlF9 +ItgKbppbd9/w+kHsOdx1ymgHDB/qo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0T +AQH/BAUwAwEB/zAdBgNVHQ4EFgQUfEKWrt5LSDv6kviejM9ti6lyN5UwCgYIKoZI +zj0EAwMDaAAwZQIwe3lORlCEwkSHRhtFcP9Ymd70/aTSVaYgLXTWNLxBo1BfASdW +tL4ndQavEi51mI38AjEAi/V3bNTIZargCyzuFJ0nN6T5U6VR5CmD1/iQMVtCnwr1 +/q4AaOeMSQ+2b1tbFfLn +-----END CERTIFICATE----- + diff --git a/tdeio/kssl/kssl/isrg-root-x1.pem b/tdeio/kssl/kssl/isrg-root-x1.pem new file mode 100644 index 000000000..b85c8037f --- /dev/null +++ b/tdeio/kssl/kssl/isrg-root-x1.pem @@ -0,0 +1,31 @@ +-----BEGIN CERTIFICATE----- +MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw +TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh +cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4 +WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu +ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY +MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc +h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+ +0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U +A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW +T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH +B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC +B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv +KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn +OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn +jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw +qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI +rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV +HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq +hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL +ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ +3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK +NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5 +ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur +TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC +jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc +oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq +4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA +mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d +emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc= +-----END CERTIFICATE----- diff --git a/tdeio/kssl/kssl/isrg-root-x2.pem b/tdeio/kssl/kssl/isrg-root-x2.pem new file mode 100644 index 000000000..7d903edc9 --- /dev/null +++ b/tdeio/kssl/kssl/isrg-root-x2.pem @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICGzCCAaGgAwIBAgIQQdKd0XLq7qeAwSxs6S+HUjAKBggqhkjOPQQDAzBPMQsw +CQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2gg +R3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBYMjAeFw0yMDA5MDQwMDAwMDBaFw00 +MDA5MTcxNjAwMDBaME8xCzAJBgNVBAYTAlVTMSkwJwYDVQQKEyBJbnRlcm5ldCBT +ZWN1cml0eSBSZXNlYXJjaCBHcm91cDEVMBMGA1UEAxMMSVNSRyBSb290IFgyMHYw +EAYHKoZIzj0CAQYFK4EEACIDYgAEzZvVn4CDCuwJSvMWSj5cz3es3mcFDR0HttwW ++1qLFNvicWDEukWVEYmO6gbf9yoWHKS5xcUy4APgHoIYOIvXRdgKam7mAHf7AlF9 +ItgKbppbd9/w+kHsOdx1ymgHDB/qo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0T +AQH/BAUwAwEB/zAdBgNVHQ4EFgQUfEKWrt5LSDv6kviejM9ti6lyN5UwCgYIKoZI +zj0EAwMDaAAwZQIwe3lORlCEwkSHRhtFcP9Ymd70/aTSVaYgLXTWNLxBo1BfASdW +tL4ndQavEi51mI38AjEAi/V3bNTIZargCyzuFJ0nN6T5U6VR5CmD1/iQMVtCnwr1 +/q4AaOeMSQ+2b1tbFfLn +-----END CERTIFICATE----- diff --git a/tdeio/kssl/kssl/ksslcalist b/tdeio/kssl/kssl/ksslcalist index a0761cf4a..50ef61257 100644 --- a/tdeio/kssl/kssl/ksslcalist +++ b/tdeio/kssl/kssl/ksslcalist @@ -785,3 +785,225 @@ x509=MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCQ0gxFTA site=true email=true code=true + +[subject=C = PL, O = Unizeto Sp. z o.o., CN = Certum CA] +x509=MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBDQTAeFw0wMjA2MTExMDQ2MzlaFw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6xwS7TT3zNJc4YPk/EjG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdLkKWoePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GIULdtlkIJ89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapuOb7kky/ZR6By6/qmW6/KUz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUgAKpoC6EahQGcxEZjgoi2IrHu/qpGWX7PNSzVttpd90gzFFS269lvzs2I1qsb2pY7HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAuI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+GXYkHAQaTOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTgxSvgGrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1qCjqTE5s7FCMTY5w/0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5xO/fIR/RpbxXyEV6DHpx8Uq79AtoSqFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs6GAqm4VKQPNriiTsBhYscw== +site=true +email=true +code=false + +[subject=C = PL, O = Unizeto Sp. z o.o., CN = Certum Level I] +x509=MIICjTCCAXWgAwIBAgIDAQAhMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBDQTAeFw0wMjA3MTIxNjMxNTNaFw0xMjA3MTIxNjMxNTNaMEMxCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xFzAVBgNVBAMTDkNlcnR1bSBMZXZlbCBJMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCl73pZ9DFcn7Qy0qBZK+So18cav7drUrJ8SiYOlDDVskt81+eIcL/4FelTSGjuAOvYdmm+HGYG998RPB0iZ+Ak67vXFJ537vRWOcu6aMjNuAwu8BOdc5eSgB0Y8X4+3LOYfugtaZa8mrEQ8Hit0yLE9UBcU9J+4PmkVGecmZ8jZQIDAQABoxMwETAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAlDS4aTmgK0YgmUvt/3zN7G2/ZrtBBCtONlUvC69c7TmLJWJ842y2AH7ryNXXkcsn6p0ZBTrTJ2tA2y/j2PXJeXrCkK/qAJIpM0l4u0MT7enY5akasduHp2NXMP9vDlgMy7elU2s3nkOT79gfh5XttC+5D/x4JDNi1DMAA9hk16DK4zWmDVfjkiP/G3fEndtJgNDQsyqnaQ3E3bljv3f1KJTjZUvtA2Ml6MP2hFRhgZPsxuhW8QXidQYNiua1h7XUUiPiERLDLWZmfY6dxGrHXjSTx3shHNaQM0qkDs9gS6UK8uWJN2bf2YBnvGmzy0IQvx5wDCH7h8AdaBD6DgIG1 +site=true +email=true +code=false + +[subject=C = PL, O = Unizeto Sp. z o.o., CN = Certum Level II] +x509=MIICjjCCAXagAwIBAgIDAQAiMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBDQTAeFw0wMjA3MTIxNjMyMDNaFw0xMjA3MTIxNjMyMDNaMEQxCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xGDAWBgNVBAMTD0NlcnR1bSBMZXZlbCBJSTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyMQSaN5fA94hNE46bMKpGUb5yIPEowReGZzGttYBQnC6oUOy+iM3md8WerzXeBKf7iIZEDW2HAp7BKhS4rMB6taxT07vDtkNfEKwOk6X7dODw6KY4mxnzjmjh5pf2feKKJ3MoZxi2HAz2a6JvHKFMq8dAlGL2GBtLvzlFp2jwkMCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAWo3wgy+/0B7UiTCu4Wn1rvGRXIUtbPNp4Bc4PP/i1q6pPheIe0ooCopuqnDX9maTHhZeNpnApgCUSbyw71EaOremD7HjWXASRUTylhwL5FdSx+D6MgF2uW9uwZ+NErkeRJYT2aRXe5FBOVIseC4g93Ay0D8Hg50MkAC5pQqW+8GSszT94NzT7ppIaMtq53PZpUtLGiL3UBZ5vUJ5pE4lLKD7Ce+pXzZevy/MnkMGD1L7LgjRWL17OcMlASFETyUTajNjvxMy+oM4C22rwHRh2WQrvgw5MO+Q3UyYA1r5VrSaqgQ1g06ZcQt+mhzoc2swlOSwm8iis8H6orR8xmCWrA== +site=true +email=true +code=false + +[subject=C = PL, O = Unizeto Sp. z o.o., CN = Certum Level III] +x509=MIICjzCCAXegAwIBAgIDAQAjMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBDQTAeFw0wMjA3MTIxNjMyMTdaFw0xMjA3MTIxNjMyMTdaMEUxCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xGTAXBgNVBAMTEENlcnR1bSBMZXZlbCBJSUkwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALZjBbfGFmlsLjPepWaDwG0LqhF11lWKabaHi1sQhK3qomHY7Em7qpL11dUQ1vsMcnnpzz/J0AEH6KDh+yAyXV1SE/tVToLYYByZK+JGacLYIYF9aCwV8AhqyzOGurO5QX6vLboXB2WNnwmXhyNVKUgnUVy4ktAR2qZJIw5Bjsn/AgMBAAGjEzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIsLt3vKCZqd/gui45ovm3FSO6FLjzzq4pagPvbNnZ39HrhRaCpqkHDAj71L5L27U3eW2D4ILL0iUmZadbC4i3at/PUL9mjhGlajcCN8EF6IXGT87Tbcii735jRaaXSbEY4YhNOg9DPBoD4uJMkA8Z0Y/6lYmk4S6KUMCzztt5zZBiWjdd08yFi5VGMvpE74KVOMdMa3JNVaR0XvT0Q8yXo1XKCrY9OFIxnhVgDbhzr9fwjKWDwu8kxhT9khAETm0BU2Buu+CTasaJdT/bBR2YEx9qcN7XyXTeDtkOO5QeGSqFgzquwjWEbKhf7l/e+efdRCg+ikH3O5snHB6iS+dgg= +site=true +email=true +code=false + +[subject=C = PL, O = Unizeto Sp. z o.o., CN = Certum Level IV] +x509=MIICjjCCAXagAwIBAgIDAQAkMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBDQTAeFw0wMjA3MTIxNjMyMzVaFw0xMjA3MTIxNjMyMzVaMEQxCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xGDAWBgNVBAMTD0NlcnR1bSBMZXZlbCBJVjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAmyb1lKqCAKE4juAy6lpVNUl6aJ2DuWPSiJ3BBk3/6ty6I4Lr2Dpy1b1vjVelhaFsVKEDgK2JyQlk9XMqLPZI2Ql166mJiPKFg77aY/W78EcQfGyjnRvVcs0tG40mAs/p84OEpFcVe/RSqDrD/D7R01u+Wj5xLl0PUsFplIGDbikCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAPS99JujKGVRfa50TKfieq+uK1SxjidErYaZTb3cJNNfQDYn6nk4lnrnab5EUVhO/NegP2yIu3YOnZGfxFDhvVozMTKKAB5r5XKOvzsP99C9578PVMLozucfUMCSwau7Z4l5uuQOHuzjzlVLCibbbf4RwfvZ7hh5sB5c0pNbwRQq64RXQUUEvul/W9gUeT9ISHOsASGTq+HJ5i7vNARjukEAXW/maqs9vyTWWbGVI1FSOnVyteymq4Xk+9YlIyNPNyacgnsMnU72XKBLDS0KJdhIWALFAZI4dSh5WZNuWZguUnEmeH81lLbR+p/N3iuN8+oSo8UXik92jxeUY2tQJUA== +site=true +email=true +code=false + +[subject=C = BR, O = ICP-Brasil, OU = Instituto Nacional de Tecnologia da Informacao - ITI, L = Brasilia, ST = DF, CN = Autoridade Certificadora Raiz Brasileira] +x509=MIIEuDCCA6CgAwIBAgIBBDANBgkqhkiG9w0BAQUFADCBtDELMAkGA1UEBhMCQlIxEzARBgNVBAoTCklDUC1CcmFzaWwxPTA7BgNVBAsTNEluc3RpdHV0byBOYWNpb25hbCBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWFjYW8gLSBJVEkxETAPBgNVBAcTCEJyYXNpbGlhMQswCQYDVQQIEwJERjExMC8GA1UEAxMoQXV0b3JpZGFkZSBDZXJ0aWZpY2Fkb3JhIFJhaXogQnJhc2lsZWlyYTAeFw0wMTExMzAxMjU4MDBaFw0xMTExMzAyMzU5MDBaMIG0MQswCQYDVQQGEwJCUjETMBEGA1UEChMKSUNQLUJyYXNpbDE9MDsGA1UECxM0SW5zdGl0dXRvIE5hY2lvbmFsIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbyAtIElUSTERMA8GA1UEBxMIQnJhc2lsaWExCzAJBgNVBAgTAkRGMTEwLwYDVQQDEyhBdXRvcmlkYWRlIENlcnRpZmljYWRvcmEgUmFpeiBCcmFzaWxlaXJhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPMudwX/hvm+Uh2b/lQAcHVAisamaLkWdkwP9/S/tOKIgRrL6Oy+ZIGlOUdd6uYtk9Ma/3pUpgcfNAj0vYm5gsyjQo9emsc+x6m4VWwk9iqMZSCK5EQkAq/Ut4n7KuLE1+gdftwdIgxfUsPt4CyNrY50QV57KM2UT8x5rrmzEjr7TICGpSUAl2gVqe6xaii+bmYR1QrmWaBSAG59LrkrjrYtbRhFboUDe1DK+6T8s5L6k8c8okpbHpa9veMztDVC9sPJ60MWXh6anVKo1UcLcbURyEeNvZneVRKAAU6ouwdjDvwlsaKydFKwed0ToQ47bmUKgcm+wV3eTRk36UOnTwIDAQABo4HSMIHPME4GA1UdIARHMEUwQwYFYEwBAQAwOjA4BggrBgEFBQcCARYsaHR0cDovL2FjcmFpei5pY3BicmFzaWwuZ292LmJyL0RQQ2FjcmFpei5wZGYwPQYDVR0fBDYwNDAyoDCgLoYsaHR0cDovL2FjcmFpei5pY3BicmFzaWwuZ292LmJyL0xDUmFjcmFpei5jcmwwHQYDVR0OBBYEFIr68VeEERM1kEL6V0lUaQ2kxPA3MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAZA5c1U/hgIh6OcgLAfiJgFWpvmDZWqlV30/bHFpj8iBobJSm5uDpt7TirYh1Uxe3fQaGlYjJe+9zd+izPRbBqXPVQA34EXcwk4qpWuf1hHriWfdrx8AcqSqr6CuQFwSr75FosSzlwDADa70mT7wZjAmQhnZx2xJ6wfWlT9VQfS//JYeIc7Fue2JNLd00UOSMMaiK/t79enKNHEA2fupH3vEigf5Eh4bVAN5VohrTm6MY53x7XQZZr1ME7a55lFEnSeT0umlOAjR2mAbvSM5X5oSZNrmetdzyTj2flCM8CC7MLab0kkdngRIlUBGHF1/S5nmPbK+9A46sd33oqK8n8 +site=true +email=true +code=false + +[subject=C = DE, O = Deutsches Forschungsnetz, OU = DFN-CERT GmbH, OU = DFN-PCA, CN = DFN Toplevel Certification Authority, emailAddress = certify@pca.dfn.de] +x509=MIIG2jCCBcKgAwIBAgIDFc/9MA0GCSqGSIb3DQEBBQUAMIGsMQswCQYDVQQGEwJERTEhMB8GA1UEChMYRGV1dHNjaGVzIEZvcnNjaHVuZ3NuZXR6MRYwFAYDVQQLEw1ERk4tQ0VSVCBHbWJIMRAwDgYDVQQLEwdERk4tUENBMS0wKwYDVQQDEyRERk4gVG9wbGV2ZWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEmNlcnRpZnlAcGNhLmRmbi5kZTAeFw0wMTEyMDExMjExMTZaFw0xMDAxMzExMjExMTZaMIGsMQswCQYDVQQGEwJERTEhMB8GA1UEChMYRGV1dHNjaGVzIEZvcnNjaHVuZ3NuZXR6MRYwFAYDVQQLEw1ERk4tQ0VSVCBHbWJIMRAwDgYDVQQLEwdERk4tUENBMS0wKwYDVQQDEyRERk4gVG9wbGV2ZWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEmNlcnRpZnlAcGNhLmRmbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMF5rhMt6zmhxK5oWPwT2FG7Up7T5DovHSD/YKPIRxsvDWmC4dTzByIBLnOmEflk+5KAqAYao6eY1qF0hR4WiS4DjCsn7l3zNo/4i2eF4EmGEksBygb4tRlTThcO7heFX+Du5qFoks+ONqa70RlwOr2l53KVwjMXBCtCLFSKRLVuxeh5+Smkm+FuOmwEugndM2n74Djjyf9DCOaHGZrHwVDh+Vpy5Ny4bKCSboujRxd5NxsStUshDVbTeS3B8TuzAJbywYWEE7erox+7WTfQr8ivSCBhrNJ36VRjAb8hiV9Iuy2TmJYo2oPyC8a3eM3xj9Ku2IW3tS2zpfiIzt9xvFMCAwEAAaOCAwEwggL9MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFAYL+rX4SHijILELPs+g0MTRf33QMIHbBgNVHSMEgdMwgdCAFAYL+rX4SHijILELPs+g0MTRf33QoYGypIGvMIGsMQswCQYDVQQGEwJERTEhMB8GA1UEChMYRGV1dHNjaGVzIEZvcnNjaHVuZ3NuZXR6MRYwFAYDVQQLEw1ERk4tQ0VSVCBHbWJIMRAwDgYDVQQLEwdERk4tUENBMS0wKwYDVQQDEyRERk4gVG9wbGV2ZWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEmNlcnRpZnlAcGNhLmRmbi5kZYIDFc/9MAsGA1UdDwQEAwIBBjARBglghkgBhvhCAQEEBAMCAAcwgaUGA1UdHwSBnTCBmjBLoEmgR4ZFaHR0cDovL3d3dy5kZm4tcGNhLmRlL2NlcnRpZmljYXRpb24veDUwOS9nMS9kYXRhL2NybHMvcm9vdC1jYS1jcmwuY3J4MEugSaBHhkVodHRwOi8vd3d3LmRmbi1wY2EuZGUvY2VydGlmaWNhdGlvbi94NTA5L2cxL2RhdGEvY3Jscy9yb290LWNhLWNybC5jcmwwOAYJYIZIAYb4QgEDBCsWKWh0dHBzOi8vd3d3LmRmbi1wY2EuZGUvY2dpL2NoZWNrLXJldi5jZ2k/MEsGCWCGSAGG+EIBCAQ+FjxodHRwOi8vd3d3LmRmbi1wY2EuZGUvY2VydGlmaWNhdGlvbi9wb2xpY2llcy94NTA5cG9saWN5Lmh0bWwwOAYJYIZIAYb4QgENBCsWKVRoZSBERk4gVG9wLUxldmVsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MGQGA1UdIARdMFswWQYLKwYBBAHZGoIsAQEwSjBIBggrBgEFBQcCARY8aHR0cDovL3d3dy5kZm4tcGNhLmRlL2NlcnRpZmljYXRpb24vcG9saWNpZXMveDUwOXBvbGljeS5odG1sMA0GCSqGSIb3DQEBBQUAA4IBAQAmbai6JMt7nkuavyvxKzLGn04Gyt0zKrp8zmERp4inktvY7p+vkaomYu2QYC7cHq0tlrPXQQhhetjiXGb+36aJtHDkEA0NwrJzYnHgPsvx7z0wysENP4wxf97KsSWm07RY+f6/gIQF7Je7CW30Rzq7N6R0NMBs32mJgdn3ntqlFNw3Nbs050FEjPNq54RdawlJo85x+w+QJd7uQM4yZjHpRhvwgte9Ge1UqCUdpMsLHzeMKJ0B9GhwIIqOJCMiPgKjcUBrn6ehSX70POvXvjjE2+FzhPGTyTkS474d2UCAnL9qhPrdWXzBjOumOjhJutT1aecm9eljlshmh1cNen00 +site=true +email=true +code=false + +[subject=C = AT, ST = Austria, L = Vienna, O = Arge Daten Oesterreichische Gesellschaft fuer Datenschutz, emailAddress = a-cert@argedaten.at] +x509=MIIDwzCCAyygAwIBAgIBADANBgkqhkiG9w0BAQQFADCBmDELMAkGA1UEBhMCQVQxEDAOBgNVBAgTB0F1c3RyaWExDzANBgNVBAcTBlZpZW5uYTFCMEAGA1UEChM5QXJnZSBEYXRlbiBPZXN0ZXJyZWljaGlzY2hlIEdlc2VsbHNjaGFmdCBmdWVyIERhdGVuc2NodXR6MSIwIAYJKoZIhvcNAQkBFhNhLWNlcnRAYXJnZWRhdGVuLmF0MB4XDTAxMDIxMjExMzAzMFoXDTA5MDIxMjExMzAzMFowgZgxCzAJBgNVBAYTAkFUMRAwDgYDVQQIEwdBdXN0cmlhMQ8wDQYDVQQHEwZWaWVubmExQjBABgNVBAoTOUFyZ2UgRGF0ZW4gT2VzdGVycmVpY2hpc2NoZSBHZXNlbGxzY2hhZnQgZnVlciBEYXRlbnNjaHV0ejEiMCAGCSqGSIb3DQEJARYTYS1jZXJ0QGFyZ2VkYXRlbi5hdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwgsHqoNtmmrJ86+e1I4hOVBaL4kokqKN2IPOIL+1XwY8vfOOUfPEdhWpaC0ldt7VYrksgDiUccgH0FROANWK2GkfKMDzjjXHysR04uEbOm7Kqjqn0nproOGkFG+QvBZgs+Ws+HXNFJA6V76fU4+JXq4452LSK4Lr5YcBquu3NJECAwEAAaOCARkwggEVMB0GA1UdDgQWBBQ0j59zH/G31zRjgK1y2P//tSAWZjCBxQYDVR0jBIG9MIG6gBQ0j59zH/G31zRjgK1y2P//tSAWZqGBnqSBmzCBmDELMAkGA1UEBhMCQVQxEDAOBgNVBAgTB0F1c3RyaWExDzANBgNVBAcTBlZpZW5uYTFCMEAGA1UEChM5QXJnZSBEYXRlbiBPZXN0ZXJyZWljaGlzY2hlIEdlc2VsbHNjaGFmdCBmdWVyIERhdGVuc2NodXR6MSIwIAYJKoZIhvcNAQkBFhNhLWNlcnRAYXJnZWRhdGVuLmF0ggEAMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMBEGCWCGSAGG+EIBAQQEAwICBDANBgkqhkiG9w0BAQQFAAOBgQBFuJYncqMYB6gXQS3eDOI90BEHfFTKy/dVAV+K7QdAYikWmqgBheRdPKddJdccPy/Zl/p3ZT7GhDyC5f3wZjcuu8AJ27BNwbCAx54dgxgCNcyPm79nY8MRtEdEpoRGdSsFKJemz6hpXM++MWFciyrRWIIA44XB0Gv3US0spjsDPQ== +site=true +email=true +code=false + +[subject=C = ES, ST = BARCELONA, L = BARCELONA, O = IPS Seguridad CA, OU = Certificaciones, CN = IPS SERVIDORES, emailAddress = ips@mail.ips.es] +x509=MIICtzCCAiACAQAwDQYJKoZIhvcNAQEEBQAwgaMxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCQVJDRUxPTkExEjAQBgNVBAcTCUJBUkNFTE9OQTEZMBcGA1UEChMQSVBTIFNlZ3VyaWRhZCBDQTEYMBYGA1UECxMPQ2VydGlmaWNhY2lvbmVzMRcwFQYDVQQDEw5JUFMgU0VSVklET1JFUzEeMBwGCSqGSIb3DQEJARYPaXBzQG1haWwuaXBzLmVzMB4XDTk4MDEwMTIzMjEwN1oXDTA5MTIyOTIzMjEwN1owgaMxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCQVJDRUxPTkExEjAQBgNVBAcTCUJBUkNFTE9OQTEZMBcGA1UEChMQSVBTIFNlZ3VyaWRhZCBDQTEYMBYGA1UECxMPQ2VydGlmaWNhY2lvbmVzMRcwFQYDVQQDEw5JUFMgU0VSVklET1JFUzEeMBwGCSqGSIb3DQEJARYPaXBzQG1haWwuaXBzLmVzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsT1J0nznqjtwlxLyYXZhkJAk8IbPMGbWOlI6H0fg3PqHILVikgDVboXVsHUUMH2Fjal5vmwpMwci4YSM1gf/+rHhwLWjhOgeYlQJU3c0jt4BT18g3RXIGJBK6E2Ehim51KODFDzT9NthFf+G4Nu+z4cYgjui0OLzhPvYR3oydAQIDAQABMA0GCSqGSIb3DQEBBAUAA4GBACzzw3lYJN7GO9HgQmm47mSzPWIBubOE3yN93ZjPEKn+ANgilgUTB1RXxafey9m4iEL2mdsUdx+2/iU94aI+A6mB0i1sR/WWRowiq8jMDQ6XXotBtDvECgZAHd1G9AHduoIuPD14cJ58GNCr+Lh3B0Zx8coLY1xq+XKU1QFPoNtC +site=true +email=false +code=false + +[subject=C = US, ST = UT, L = Salt Lake City, O = The USERTRUST Network, OU = http://www.usertrust.com, CN = UTN-USERFirst-Network Applications] +x509=MIIEZDCCA0ygAwIBAgIQRL4Mi1AAJLQR0zYwS8AzdzANBgkqhkiG9w0BAQUFADCBozELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xKzApBgNVBAMTIlVUTi1VU0VSRmlyc3QtTmV0d29yayBBcHBsaWNhdGlvbnMwHhcNOTkwNzA5MTg0ODM5WhcNMTkwNzA5MTg1NzQ5WjCBozELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xKzApBgNVBAMTIlVUTi1VU0VSRmlyc3QtTmV0d29yayBBcHBsaWNhdGlvbnMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCz+5Gh5DZVhawGNFugmliy+LUPBXeDrjKxdpJo7CNKyXY/45y2N3kDuatpjQclthln5LAbGHNhSuh+zdMvZOOmfAz6F4CjDUeJT1FxL+78P/m4FoCHiZMlIJpDgmkkdihZNaEdwH+DBmQWICzTSaSFtMBhf1EI+GgVkYDLpdXuOzr0hAReYFmnjDRy7rh4xdE7EkpvfmUnuaRVxblvQ6TFHSyZwFKkeEwVs0CYCGtDxgGwenv1axwiP8vv/6jQOkt2FZ7S0cYu49tXGzKiuG/ohqY/cKvlcJKrRB5AUPuco2LkbG6gyN7igEL66S/ozjIEj3yNtxyjNTwV3Z7DrpelAgMBAAGjgZEwgY4wCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFPqGydvguul49Uuo1hXf8NPhahQ8ME8GA1UdHwRIMEYwRKBCoECGPmh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNFUkZpcnN0LU5ldHdvcmtBcHBsaWNhdGlvbnMuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCk8yXM0dSRgyLQzDKrm5ZONJFUICU0YV8qAhXhi6r/fWRRzwr/vH3YIWp4yy9Rb/hCHTO967V7lMPDqaAt39EpHx3+jz+7qEUqf9FuVSTiuwL7MT++6LzsQCv4AdRWOOTKRIK1YSAhZ2X28AvnNPilwpyjXEAfhZOVBt5P1CeptqX8Fs1zMT+4ZSfP1FMa8Kxun08FDAOBp4QpxFq9ZFdyrTvPNximmMatBrTcCKME1SmklpoSZ0qMYEWd8SOasACcaLWYUNPvji6SZbFIPiG+FTAqDbUMo2s/rn9X9R+WfN9v3YIwLGUbQErNaLly7HF27FSOH4UMAWr6pjisH8SE +site=true +email=true +code=false + +[subject=C = US, ST = UT, L = Salt Lake City, O = The USERTRUST Network, OU = http://www.usertrust.com, CN = UTN - DATACorp SGC] +x509=MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZBgNVBAMTElVUTiAtIERBVEFDb3JwIFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBaMIGTMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRydXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ysraP6LnD43m77VkIVni5c7yPeIbkFdicZD0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlowHDyUwDAXlCCpVZvNvlK4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA9P4yPykqlXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulWbfXv33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQABo4GrMIGoMAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRTMtGzz3/64PGgXYVOktKeRR20TzA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dDLmNybDAqBgNVHSUEIzAhBggrBgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3DQEBBQUAA4IBAQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowftGzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyjj98C5OBxOvG0I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVHKWss5nbZqSl9Mt3JNjy9rjXxEZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwPDPafepE39peC4N1xaf92P2BNPM/3mfnGV/TJVTl4uix5yaaIK/QI +site=true +email=false +code=false + +[subject=C = GB, ST = Greater Manchester, L = Salford, O = Comodo CA Limited, CN = AAA Certificate Services] +x509= MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe 3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4 YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2 G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3 smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg== +site=true +email=true +code=false + +[subject=C = GB, ST = Greater Manchester, L = Salford, O = Comodo CA Limited, CN = Secure Certificate Services] +x509= MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEb MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRp ZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVow fjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAiBgNV BAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEB BQADggEPADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPM cm3ye5drswfxdySRXyWP9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3S HpR7LZQdqnXXs5jLrLxkU0C8j6ysNstcrbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996 CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rCoznl2yY4rYsK7hljxxwk 3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3Vp6ea5EQz 6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNV HQ4EFgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1Ud EwEB/wQFMAMBAf8wgYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2Rv Y2EuY29tL1NlY3VyZUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRw Oi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmww DQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm4J4oqF7Tt/Q0 5qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtI gKvcnDe4IRRLDXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJ aD61JlfutuC23bkpgHl9j6PwpCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDl izeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1HRR3B7Hzs/Sk= +site=true +email=true +code=false + +[subject=C = GB, ST = Greater Manchester, L = Salford, O = Comodo CA Limited, CN = Trusted Certificate Services] +x509= MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEb MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0 aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEwMDAwMDBaFw0yODEyMzEyMzU5NTla MH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO BgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUwIwYD VQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0B AQEFAAOCAQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWW fnJSoBVC21ndZHoa0Lh73TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMt TGo87IvDktJTdyR0nAducPy9C1t2ul/y/9c3S0pgePfw+spwtOpZqqPOSC+pw7IL fhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6juljatEPmsbS9Is6FARW 1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsSivnkBbA7 kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0G A1UdDgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYD VR0TAQH/BAUwAwEB/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21v ZG9jYS5jb20vVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRo dHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMu Y3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8NtwuleGFTQQuS9/ HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32 pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxIS jBc/lDb+XbDABHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+ xqFx7D+gIIxmOom0jtTYsU0lR+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/Atyjcn dBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O9y5Xt5hwXsjEeLBi +site=true +email=true +code=false + +[subject=C = US, ST = UT, L = Salt Lake City, O = The USERTRUST Network, OU = http://www.usertrust.com, CN = UTN-USERFirst-Hardware] +x509= MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCB lzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3Qt SGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgxOTIyWjCBlzELMAkG A1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEe MBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8v d3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdh cmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn 0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlIwrthdBKWHTxqctU8EGc6Oe0rE81m65UJ M6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFdtqdt++BxF2uiiPsA3/4a MXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8i4fDidNd oI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqI DsjfPe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9Ksy oUhbAgMBAAGjgbkwgbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYD VR0OBBYEFKFyXyYbKJhDlV0HN9WFlp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0 dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNFUkZpcnN0LUhhcmR3YXJlLmNy bDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUFBwMGBggrBgEF BQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM //bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28Gpgoiskli CE7/yMgUsogWXecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gE CJChicsZUN/KHAG8HQQZexB2lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t 3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kniCrVWFCVH/A7HFe7fRQ5YiuayZSS KqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67nfhmqA== +site=true +email=false +code=false + +[subject=C = US, ST = UT, L = Salt Lake City, O = The USERTRUST Network, OU = http://www.usertrust.com, CN = UTN - DATACorp SGC] +x509= MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCB kzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZBgNVBAMTElVUTiAtIERBVEFDb3Jw IFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBaMIGTMQswCQYDVQQG EwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYD VQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cu dXNlcnRydXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjAN BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6 E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ysraP6LnD43m77VkIVni5c7yPeIbkFdicZ D0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlowHDyUwDAXlCCpVZvNvlK 4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA9P4yPykq lXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulW bfXv33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQAB o4GrMIGoMAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRT MtGzz3/64PGgXYVOktKeRR20TzA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3Js LnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dDLmNybDAqBgNVHSUEIzAhBggr BgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3DQEBBQUAA4IB AQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyj j98C5OBxOvG0I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVH KWss5nbZqSl9Mt3JNjy9rjXxEZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv 2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwPDPafepE39peC4N1xaf92P2BNPM/3 mfnGV/TJVTl4uix5yaaIK/QI +site=true +email=false +code=false + +[subject=C = US, ST = UT, L = Salt Lake City, O = The USERTRUST Network, OU = http://www.usertrust.com, CN = UTN-USERFirst-Client Authentication and Email] +x509= MIIEojCCA4qgAwIBAgIQRL4Mi1AAJLQR0zYlJWfJiTANBgkqhkiG9w0BAQUFADCB rjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xNjA0BgNVBAMTLVVUTi1VU0VSRmlyc3Qt Q2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBFbWFpbDAeFw05OTA3MDkxNzI4NTBa Fw0xOTA3MDkxNzM2NThaMIGuMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAV BgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5l dHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRydXN0LmNvbTE2MDQGA1UE AxMtVVROLVVTRVJGaXJzdC1DbGllbnQgQXV0aGVudGljYXRpb24gYW5kIEVtYWls MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsjmFpPJ9q0E7YkY3rs3B YHW8OWX5ShpHornMSMxqmNVNNRm5pELlzkniii8efNIxB8dOtINknS4p1aJkxIW9 hVE1eaROaJB7HHqkkqgX8pgV8pPMyaQylbsMTzC9mKALi+VuG6JG+ni8om+rWV6l L8/K2m2qL+usobNqqrcuZzWLeeEeaYji5kbNoKXqvgvOdjp6Dpvq/NonWz1zHyLm SGHGTPNpsaguG7bUMSAsvIKKjqQOpdeJQ/wWWq8dcdcRWdq6hw2v+vPhwvCkxWeM 1tZUOt4KpLoDd7NlyP0e03RiqhjKaJMeoYV+9Udly/hNVyh00jT/MLbu9mIwFIws 6wIDAQABo4G5MIG2MAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud DgQWBBSJgmd9xJ0mcABLtFBIfN49rgRufTBYBgNVHR8EUTBPME2gS6BJhkdodHRw Oi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLVVTRVJGaXJzdC1DbGllbnRBdXRoZW50 aWNhdGlvbmFuZEVtYWlsLmNybDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH AwQwDQYJKoZIhvcNAQEFBQADggEBALFtYV2mGn98q0rkMPxTbyUkxsrt4jFcKw7u 7mFVbwQ+zznexRtJlOTrIEy05p5QLnLZjfWqo7NK2lYcYJeA3IKirUq9iiv/Cwm0 xtcgBEXkzYABurorbs6q15L+5K/r9CYdFip/bDCVNy8zEqx/3cfREYxRmLLQo5HQ rfafnoOTHh1CuEava2bwm3/q4wMC5QJRwarVNZ1yQAOJujEdxRBoUp7fooXFXAim eOZTT7Hot9MUnpOmw2TjrH5xzbyf6QMbzPvprDHBr3wVdAKZw7JHpsIyYdfHb0gk USeh1YdV8nuPmD0Wnu51tvjQjvLzxq4oW6fw8zYX/MMF08oDSlQ= +site=true +email=true +code=false + +[subject=C = US, ST = UT, L = Salt Lake City, O = The USERTRUST Network, OU = http://www.usertrust.com, CN = UTN-USERFirst-Object] +x509= MIIEZjCCA06gAwIBAgIQRL4Mi1AAJLQR0zYt4LNfGzANBgkqhkiG9w0BAQUFADCB lTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHTAbBgNVBAMTFFVUTi1VU0VSRmlyc3Qt T2JqZWN0MB4XDTk5MDcwOTE4MzEyMFoXDTE5MDcwOTE4NDAzNlowgZUxCzAJBgNV BAYTAlVTMQswCQYDVQQIEwJVVDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkxHjAc BgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEhMB8GA1UECxMYaHR0cDovL3d3 dy51c2VydHJ1c3QuY29tMR0wGwYDVQQDExRVVE4tVVNFUkZpcnN0LU9iamVjdDCC ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6qgT+jo2F4qjEAVZURnicP HxzfOpuCaDDASmEd8S8O+r5596Uj71VRloTN2+O5bj4x2AogZ8f02b+U60cEPgLO KqJdhwQJ9jCdGIqXsqoc/EHSoTbL+z2RuufZcDX65OeQw5ujm9M89RKZd7G3CeBo 5hy485RjiGpq/gt2yb70IuRnuasaXnfBhQfdDWy/7gbHd2pBnqcP1/vulBe3/IW+ pKvEHDHd17bR5PDv3xaPslKT16HUiaEHLr/hARJCHhrh2JU022R5KP+6LhHC5ehb kkj7RwvCbNqtMoNB86XlQXD9ZZBt+vpRxPm9lisZBCzTbafc8H9vg2XiaquHhnUC AwEAAaOBrzCBrDALBgNVHQ8EBAMCAcYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E FgQU2u1kdBScFDyr3ZmpvVsoTYs8ydgwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDov L2NybC51c2VydHJ1c3QuY29tL1VUTi1VU0VSRmlyc3QtT2JqZWN0LmNybDApBgNV HSUEIjAgBggrBgEFBQcDAwYIKwYBBQUHAwgGCisGAQQBgjcKAwQwDQYJKoZIhvcN AQEFBQADggEBAAgfUrE3RHjb/c652pWWmKpVZIC1WkDdIaXFwfNfLEzIR1pp6ujw NTX00CXzyKakh0q9G7FzCL3Uw8q2NbtZhncxzaeAFK4T7/yxSPlrJSUtUbYsbUXB mMiKVl0+7kNOPmsnjtA6S4ULX9Ptaqd1y9Fahy85dRNacrACgZ++8A+EVCBibGnU 4U3GDZlDAQ0Slox4nb9QorFEqmrPF3rPbw/U+CRVX/A0FklmPlBGyWNxODFiuGK5 81OtbLUrohKqGU8J2l7nk8aOFAj+8DCAGKCGhU3IfdeLA/5u1fedFqySLKAj5ZyR Uh+U3xeUc8OzwcFxBSAAeL0TUh2oPs0AH8g= +site=false +email=false +code=true + +[subject=C = FI, O = Sonera, CN = Sonera Class1 CA] +x509=MIIDIDCCAgigAwIBAgIBJDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MxIENBMB4XDTAxMDQwNjEwNDkxM1oXDTIxMDQwNjEwNDkxM1owOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALWJHytPZwp5/8Ue+H887dF+2rDNbS82rDTG29lkFwhjMDMiikzujrsPDUJVyZ0upe/3p4zDq7mXy47vPxVnqIJyY1MPQYx9EJUkoVqlBvqSV536pQHydekfvFYmUk54GWVYVQNYwBSujHxVX3BbdyMGNpfzJLWaRpXk3w0LBUXl0fIdgrvGE+D+qnr9aTCU89JFhfzyMlsy3uhsXR/LpCJ0sICOXZT3BgBLqdReLjVQCfOAl/QMF6452F/NM8EcyonCIvdFEu1eEpOdY6uCLrnrQkFEy0oaAIINnvmLVz5MxxftLItyM19yejhW1ebZrgUaHXVFsculJRwSVzb9IjcCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQIR+IMi/ZTiFIwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQCLGrLJXWG04bkruVPRsoWdd44W7hE928Jj2VuXZfsSZ9gqXLar5V7DtxYvyOirHYr9qxp81V9jz9yw3Xe5qObSIjiHBxTZ/75Wtf0HDjxVyhbMp6Z3N/vbXB9OWQaHowND9Rart4S9Tu+fMTfwRvFAttEMpWT4Y14h21VOTzF2nBBhjrZTOqMRvq9tfB69ri3iDGnHhVNoomG6xT60eVR4ngrHAr5i0RGCS2UvkVrCqIexVmiUefkl98HVrhq4uz2PqYo4Ffdz0Fpg0YCw8NzVUM1O7pJIae2yIx4wzMiUyLb1O4Z/P6Yun/Y+LLWSlj7fLJOK/4GMDw9ZIRlXvVWa +site=true +email=true +code=false + +[subject=C = FI, O = Sonera, CN = Sonera Class2 CA] +x509=MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAxMDQwNjA3Mjk0MFoXDTIxMDQwNjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3/Ei9vX+ALTU74W+oZ6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybTdXnt5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s3TmVToMGf+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2EjvOr7nQKV0ba5cTppCD8PtOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu8nYybieDwnPz3BjotJPqdURrBGAgcVeHnfO+oJAjPYok4doh28MCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITTXjwwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt0jSv9zilzqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/3DEIcbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvDFNr450kkkdAdavphOe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6Tk6ezAyNlNzZRZxe7EJQY670XcSxEtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLHllpwrN9M +site=true +email=true +code=false + +[subject=C = HU, L = Budapest, O = NetLock Halozatbiztonsagi Kft., OU = Tanusitvanykiadok, CN = NetLock Expressz (Class C) Tanusitvanykiado] +x509=MIIFTzCCBLigAwIBAgIBaDANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTQwMgYDVQQDEytOZXRMb2NrIEV4cHJlc3N6IChDbGFzcyBDKSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNTE0MDgxMVoXDTE5MDIyMDE0MDgxMVowgZsxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE0MDIGA1UEAxMrTmV0TG9jayBFeHByZXNzeiAoQ2xhc3MgQykgVGFudXNpdHZhbnlraWFkbzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA6+ywbGGKIyWvYCDj2Z/8kwvbXY2wobNAOoLO/XXgeDIDhlqGlZHtU/qdQPzm6N3ZW3oDvV3zOwzDUXmbrVWg6dADEK8KuhRC2VImESLH0iDMgqSaqf64gXadarfSNnU+sYYJ9m5tfk63euyucYT2BDMIJTLrdKwWRMbkQJMdf60CAwEAAaOCAp8wggKbMBIGA1UdEwEB/wQIMAYBAf8CAQQwDgYDVR0PAQH/BAQDAgAGMBEGCWCGSAGG+EIBAQQEAwIABzCCAmAGCWCGSAGG+EIBDQSCAlEWggJNRklHWUVMRU0hIEV6ZW4gdGFudXNpdHZhbnkgYSBOZXRMb2NrIEtmdC4gQWx0YWxhbm9zIFN6b2xnYWx0YXRhc2kgRmVsdGV0ZWxlaWJlbiBsZWlydCBlbGphcmFzb2sgYWxhcGphbiBrZXN6dWx0LiBBIGhpdGVsZXNpdGVzIGZvbHlhbWF0YXQgYSBOZXRMb2NrIEtmdC4gdGVybWVrZmVsZWxvc3NlZy1iaXp0b3NpdGFzYSB2ZWRpLiBBIGRpZ2l0YWxpcyBhbGFpcmFzIGVsZm9nYWRhc2FuYWsgZmVsdGV0ZWxlIGF6IGVsb2lydCBlbGxlbm9yemVzaSBlbGphcmFzIG1lZ3RldGVsZS4gQXogZWxqYXJhcyBsZWlyYXNhIG1lZ3RhbGFsaGF0byBhIE5ldExvY2sgS2Z0LiBJbnRlcm5ldCBob25sYXBqYW4gYSBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIGNpbWVuIHZhZ3kga2VyaGV0byBheiBlbGxlbm9yemVzQG5ldGxvY2submV0IGUtbWFpbCBjaW1lbi4gSU1QT1JUQU5UISBUaGUgaXNzdWFuY2UgYW5kIHRoZSB1c2Ugb2YgdGhpcyBjZXJ0aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIHRoZSBOZXRMb2NrIENQUyBhdmFpbGFibGUgYXQgaHR0cHM6Ly93d3cubmV0bG9jay5uZXQvZG9jcyBvciBieSBlLW1haWwgYXQgY3BzQG5ldGxvY2submV0LjANBgkqhkiG9w0BAQQFAAOBgQAQrX/XDDKACtiG8XmYta3UzbM2xJZIwVzNmtkFLp++UOv0JhQQLdRmF/iewSf98e3ke0ugbLWrmldwpu2gpO0u9f38vf5NNwgMvOOWgyL1SRt/Syu0VMGAfJlOHdCM7tCs5ZL6dVb+ZKATj7i4Fp1hBWeAyNDYpQcCNJgEjTME1A== +site=true +email=true +code=false + +[subject=C = HU, ST = Hungary, L = Budapest, O = NetLock Halozatbiztonsagi Kft., OU = Tanusitvanykiadok, CN = NetLock Kozjegyzoi (Class A) Tanusitvanykiado] +x509=MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oXDTE5MDIxOTIzMTQ0N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSMD7tM9DceqQWC2ObhbHDqeLVu0ThEDaiDzl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZz+qMkjvN9wfcZnSX9EUi3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC/tmwqcm8WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LYOph7tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2EsiNCubMvJIH5+hCoR64sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCCApswDgYDVR0PAQH/BAQDAgAGMBIGA1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1GSUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pvbGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQuIEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJhc2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBhIGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVub3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5ayZrU3/b39/zcT0mwBQOxmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjPytoUMaFP0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQQeJBCWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxkf1qbFFgBJ34TUMdrKuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK8CtmdWOMovsEPoMOmzbwGOQmIMOM8CgHrTwXZoi1/baI +site=true +email=true +code=false + +[subject=C = HU, L = Budapest, O = NetLock Halozatbiztonsagi Kft., OU = Tanusitvanykiadok, CN = NetLock Uzleti (Class B) Tanusitvanykiado] +x509=MIIFSzCCBLSgAwIBAgIBaTANBgkqhkiG9w0BAQQFADCBmTELMAkGA1UEBhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTIwMAYDVQQDEylOZXRMb2NrIFV6bGV0aSAoQ2xhc3MgQikgVGFudXNpdHZhbnlraWFkbzAeFw05OTAyMjUxNDEwMjJaFw0xOTAyMjAxNDEwMjJaMIGZMQswCQYDVQQGEwJIVTERMA8GA1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRvbnNhZ2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxMjAwBgNVBAMTKU5ldExvY2sgVXpsZXRpIChDbGFzcyBCKSBUYW51c2l0dmFueWtpYWRvMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCx6gTsIKAjwo84YM/HRrPVG/77uZmeBNwcf4xKgZjupNTKihe5In+DCnVMm8Bp2GQ5o+2So/1bXHQawEfKOml2mrriRBf8TKPV/riXiK+IA4kfpPIEPsgHC+b5sy96YhQJRhTKZPWLgLViqNhr1nGTLbO/CVRY7QbrqHvcQ7GhaQIDAQABo4ICnzCCApswEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNVHQ8BAf8EBAMCAAYwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1GSUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pvbGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQuIEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJhc2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBhIGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVub3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4GBAATbrowXr/gOkDFOzT4JwG06sPgzTEdM43WIEJessDgVkcYplswhwG08pXTP2IKlOcNl40JwuyKQ433bNXbhoLXan3BukxowOR0w2y7jfLKRstE3Kfq51hdcR0/jHTjrn9V7lagonhVK0dHQKwCXoOKSNitjrFgBazMpUIaD8QFI +site=true +email=true +code=false + +[subject=C = be, O = Belgacom, OU = MTM, CN = Belgacom E-Trust Primary CA, mail = info@e-trust.be] +x509=MIICiTCCAfKgAwIBAgIEN4dnrDANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJiZTERMA8GA1UEChMIQmVsZ2Fjb20xDDAKBgNVBAsTA01UTTEkMCIGA1UEAxMbQmVsZ2Fjb20gRS1UcnVzdCBQcmltYXJ5IENBMR8wHQYKCZImiZPyLGQBAxQPaW5mb0BlLXRydXN0LmJlMB4XDTk4MTEwNDEzMDQzOVoXDTEwMDEyMTEzMDQzOVowdTELMAkGA1UEBhMCYmUxETAPBgNVBAoTCEJlbGdhY29tMQwwCgYDVQQLEwNNVE0xJDAiBgNVBAMTG0JlbGdhY29tIEUtVHJ1c3QgUHJpbWFyeSBDQTEfMB0GCgmSJomT8ixkAQMUD2luZm9AZS10cnVzdC5iZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqtm5s9VPak3FQdB7BGFqi3GBB9pk41huJ1XCrc4XsPz6ko0I8Bxy/7LDMf7gaoeXTMxDV6coeTq1g12kHWrxasU+FCIdWQZv8KYxd9ywSTjmywwP/qpyNIjaKDohWu50Kxuk21sTFrVzX8OujNLAPj2wy/Dsi4YLwsFEGFpjqNUCAwEAAaMmMCQwDwYDVR0TBAgwBgEB/wIBATARBglghkgBhvhCAQEEBAMCAAcwDQYJKoZIhvcNAQEFBQADgYEAerKxpbF9M+nC4RvO05OMfwH9Gx1amq6rB1Ev7Ymr3VBCux//SrWknLFhKQpM6oNZSY2vhmnXgaxHqqRxblnvynxqblSK2qiSyfVms3lf1IsBniFjRjWTpcJfImIDcB1jI+hrSB0jECfY9t9HorrsgFBKbMRwpnrkdCJ/9oRiMn8= +site=true +email=true +code=false + +[subject=C = US, OU = www.xrampsecurity.com, O = XRamp Security Services Inc, CN = XRamp Global Certification Authority] +x509=MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQxMTAxMTcxNDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS638eMpSe2OAtp87ZOqCwuIR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCPKZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMxfoArtYzAQDsRhtDLooY2YKTVMIJt2W7QDxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FEzG+gSqmUsE3a56k0enI4qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqsAxcZZPRaJSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNViPvryxS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASsjVy16bYbMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQEwDQYJKoZIhvcNAQEFBQADggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc/Kh4ZzXxHfARvbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxtqZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLaIR9NmXmd4c8nnxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSyi6mx5O+aGtA9aZnuqCij4Tyz8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQO+7ETPTsJ3xCwnR8gooJybQDJbw= +site=true +email=true +code=false + +[subject=C = DK, O = TDC, CN = TDC OCES CA] +x509=MIIFGTCCBAGgAwIBAgIEPki9xDANBgkqhkiG9w0BAQUFADAxMQswCQYDVQQGEwJESzEMMAoGA1UEChMDVERDMRQwEgYDVQQDEwtUREMgT0NFUyBDQTAeFw0wMzAyMTEwODM5MzBaFw0zNzAyMTEwOTA5MzBaMDExCzAJBgNVBAYTAkRLMQwwCgYDVQQKEwNUREMxFDASBgNVBAMTC1REQyBPQ0VTIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArGL2YSCyz8DGhdfjeebM7fI5kqSXLmSjhFuHnEz9pPPEXyG9VhDr2y5h7JNp46PMvZnDBfwGuMo2HP6QjklMxFaaL1a8z3sM8W9Hpg1DTeLpHTk0zY0s2RKY+ePhwUp8hjjEqcRhiNJerxomTdXkoCJHhNlktxmW/OwZ5LKXJk5KTMuPJItUGBxIYXvViGjaXbXqzRowwYCDdlCqT9HU3Tjw7xb04QxQBr/q+3pJoSgrHPb8FTKjdGqPqcNiKXEx5TukYBdedObaE+3pHx8b0bJoc8YQNHVGEBDjkAB2QMuLt0MJIf+rTpPGWOmlgtt3xDqZsXKVSQTwtyv6e1mO3QIDAQABo4ICNzCCAjMwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwgewGA1UdIASB5DCB4TCB3gYIKoFQgSkBAQEwgdEwLwYIKwYBBQUHAgEWI2h0dHA6Ly93d3cuY2VydGlmaWthdC5kay9yZXBvc2l0b3J5MIGdBggrBgEFBQcCAjCBkDAKFgNUREMwAwIBARqBgUNlcnRpZmlrYXRlciBmcmEgZGVubmUgQ0EgdWRzdGVkZXMgdW5kZXIgT0lEIDEuMi4yMDguMTY5LjEuMS4xLiBDZXJ0aWZpY2F0ZXMgZnJvbSB0aGlzIENBIGFyZSBpc3N1ZWQgdW5kZXIgT0lEIDEuMi4yMDguMTY5LjEuMS4xLjARBglghkgBhvhCAQEEBAMCAAcwgYEGA1UdHwR6MHgwSKBGoESkQjBAMQswCQYDVQQGEwJESzEMMAoGA1UEChMDVERDMRQwEgYDVQQDEwtUREMgT0NFUyBDQTENMAsGA1UEAxMEQ1JMMTAsoCqgKIYmaHR0cDovL2NybC5vY2VzLmNlcnRpZmlrYXQuZGsvb2Nlcy5jcmwwKwYDVR0QBCQwIoAPMjAwMzAyMTEwODM5MzBagQ8yMDM3MDIxMTA5MDkzMFowHwYDVR0jBBgwFoAUYLWF7FZkfhIZJ2cdUBVLc647+RIwHQYDVR0OBBYEFGC1hexWZH4SGSdnHVAVS3OuO/kSMB0GCSqGSIb2fQdBAAQQMA4bCFY2LjA6NC4wAwIEkDANBgkqhkiG9w0BAQUFAAOCAQEACromJkbTc6gJ82sLMJn9iuFXehHTuJTXCRBuo7E4A9G28kNBKWKnctj7fAXmMXAnVBhOinxO5dHKjHiIzxvTkIvmI/gLDjNDfZziChmPyQE+dF10yYscA+UYyAFMP8uXBV2YcaaYb7Z8vTd/vuGTJW1v8AqtFxjhA7wHKcitJuj4YfD9IQl+mo6paH1IYnK9AOoBmbgGglGBTvH1tJFUuSN6AJqfXY3gPGS5GhKSKseCRHI53OI8xthV9RVOyAUO28bQYqbsFbS1AoLbrIyigfCbmTH1ICCoiGEKB5+U/NDXG8wuF/MEJ3Zn61SD/aSQfgY9BKNDLdr8C2LqL19iUw== +site=true +email=true +code=false + +[subject=C = HU, L = Budapest, O = NetLock Halozatbiztonsagi Kft., OU = Tanusitvanykiadok, CN = NetLock Minositett Kozjegyzoi (Class QA) Tanusitvanykiado, emailAddress = info@netlock.hu] +x509= MIIG0TCCBbmgAwIBAgIBezANBgkqhkiG9w0BAQUFADCByTELMAkGA1UEBhMCSFUx ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0 b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMUIwQAYDVQQD EzlOZXRMb2NrIE1pbm9zaXRldHQgS296amVneXpvaSAoQ2xhc3MgUUEpIFRhbnVz aXR2YW55a2lhZG8xHjAcBgkqhkiG9w0BCQEWD2luZm9AbmV0bG9jay5odTAeFw0w MzAzMzAwMTQ3MTFaFw0yMjEyMTUwMTQ3MTFaMIHJMQswCQYDVQQGEwJIVTERMA8G A1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRvbnNh Z2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxQjBABgNVBAMTOU5l dExvY2sgTWlub3NpdGV0dCBLb3pqZWd5em9pIChDbGFzcyBRQSkgVGFudXNpdHZh bnlraWFkbzEeMBwGCSqGSIb3DQEJARYPaW5mb0BuZXRsb2NrLmh1MIIBIjANBgkq hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx1Ilstg91IRVCacbvWy5FPSKAtt2/Goq eKvld/Bu4IwjZ9ulZJm53QE+b+8tmjwi8F3JV6BVQX/yQ15YglMxZc4e8ia6AFQe r7C8HORSjKAyr7c3sVNnaHRnUPYtLmTeriZ539+Zhqurf4XsoPuAzPS4DB6TRWO5 3Lhbm+1bOdRfYrCnjnxmOCyqsQhjF2d9zL2z8cM/z1A57dEZgxXbhxInlrfa6uWd vLrqOU+L73Sa58XQ0uqGURzk/mQIKAR5BevKxXEOC++r6uwSEaEYBTJp0QwsGj0l mT+1fMptsK6ZmfoIYOcZwvK9UdPM0wKswREMgM6r3JSda6M5UzrWhQIDAMV9o4IC wDCCArwwEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNVHQ8BAf8EBAMCAQYwggJ1Bglg hkgBhvhCAQ0EggJmFoICYkZJR1lFTEVNISBFemVuIHRhbnVzaXR2YW55IGEgTmV0 TG9jayBLZnQuIE1pbm9zaXRldHQgU3pvbGdhbHRhdGFzaSBTemFiYWx5emF0YWJh biBsZWlydCBlbGphcmFzb2sgYWxhcGphbiBrZXN6dWx0LiBBIG1pbm9zaXRldHQg ZWxla3Ryb25pa3VzIGFsYWlyYXMgam9naGF0YXMgZXJ2ZW55ZXN1bGVzZW5laywg dmFsYW1pbnQgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYSBNaW5vc2l0ZXR0IFN6 b2xnYWx0YXRhc2kgU3phYmFseXphdGJhbiwgYXogQWx0YWxhbm9zIFN6ZXJ6b2Rl c2kgRmVsdGV0ZWxla2JlbiBlbG9pcnQgZWxsZW5vcnplc2kgZWxqYXJhcyBtZWd0 ZXRlbGUuIEEgZG9rdW1lbnR1bW9rIG1lZ3RhbGFsaGF0b2sgYSBodHRwczovL3d3 dy5uZXRsb2NrLmh1L2RvY3MvIGNpbWVuIHZhZ3kga2VyaGV0b2sgYXogaW5mb0Bu ZXRsb2NrLm5ldCBlLW1haWwgY2ltZW4uIFdBUk5JTkchIFRoZSBpc3N1YW5jZSBh bmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGFyZSBzdWJqZWN0IHRvIHRo ZSBOZXRMb2NrIFF1YWxpZmllZCBDUFMgYXZhaWxhYmxlIGF0IGh0dHBzOi8vd3d3 Lm5ldGxvY2suaHUvZG9jcy8gb3IgYnkgZS1tYWlsIGF0IGluZm9AbmV0bG9jay5u ZXQwHQYDVR0OBBYEFAlqYhaSsFq7VQ7LdTI6MuWyIckoMA0GCSqGSIb3DQEBBQUA A4IBAQCRalCc23iBmz+LQuM7/KbD7kPgz/PigDVJRXYC4uMvBcXxKufAQTPGtpvQ MznNwNuhrWw3AkxYQTvyl5LGSKjN5Yo5iWH5Upfpvfb5lHTocQ68d4bDBsxafEp+ NFAwLvt/MpqNPfMgW/hqyobzMUwsWYACff44yTB1HLdV47yfuqhthCgFdbOLDcCR VCHnpgu0mfVRQdzNo0ci2ccBgcTcR08m6h/t280NmPSjnLRzMkqWmf68f8glWPhY 83ZmiVSkpj7EUFy6iRiCdUgh0k8T6GB+B3bbELVR5qq5aKrN9p2QdRLqOBrKROi3 macqaJVmlaut74nLYKkGEsaUR+ko +site=true +email=true +code=false + +[subject=C = US, O = "The Go Daddy Group, Inc.", OU = Go Daddy Class 2 Certification Authority] +x509=MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+qN1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiOr18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLEsNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h/t2oatTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYXMP80kWNyOO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKtI3lpjbi2Tc7PTMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQHmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mERdEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5CufReYNnyicsbkqWletNw+vHX/bvZ8= +site=true +email=true +code=false + +[subject=C = US, O = "Starfield Technologies, Inc.", OU = Starfield Class 2 Certification Authority] +x509=MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwNjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBoMQswCQYDVQQGEwJVUzElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqGSIb3DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf8MOh2tTYbitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN+lq2cwQlZut3f+dZxkqZJRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVmepsZGD3/cVE8MC5fvj13c7JdBmzDI1aaK4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSNF4Azbl5KXZnJHoe0nRrA1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HFMIHCMB0GA1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fRzt0fhvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGsafPzWdqbAYcaT1epoXkJKtv3L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLMPUxA2IGvd56Deruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJlxy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynpVSJYACPq4xJDKVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3QBFGmh95DmK/D5fs4C8fF5Q= +site=true +email=true +code=false + +[subject=C = US, O = GeoTrust Inc., CN = GeoTrust Global CA] +x509=MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9iYWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3QgR2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD99BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdqfnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDviS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoWMPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTAephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1luMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKInZ57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfStQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcFPseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Unhw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw== +site=true +email=true +code=false + +[subject=C = US, O = GeoTrust Inc., CN = GeoTrust Global CA 2] +x509=MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDvPE1APRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/NTL8Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hLTytCOb1kLUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL5mkWRxHCJ1kDs6ZgwiFAVvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7S4wMcoKK+xfNAGw6EzywhIdLFnopsk/bHdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNHK266ZUapEBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6tdEPx7srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv/NgdRN3ggX+d6YvhZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywNA0ZF66D0f0hExghAzN4bcLUprbqLOzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkCx1YAzUm5s2x7UwQa4qjJqhIFI8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqFH4z1Ir+rzoPz4iIprn2DQKi6bA== +site=true +email=true +code=false + +[subject=C = US, O = GeoTrust Inc., CN = GeoTrust Universal CA] +x509=MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVyc2FsIENBMB4XDTA0MDMwNDA1MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xHjAcBgNVBAMTFUdlb1RydXN0IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKYVVaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9tJPi8cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTTQjOgNB0eRXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFhF7em6fgemdtzbvQKoiFs7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2vc7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d8Lsrlh/eezJS/R27tQahsiFepdaVaH/wmZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7VqnJNk22CDtucvc+081xdVHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3CgaRr0BHdCXteGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZf9hBZ3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfReBi9Fi1jUIxaS5BZuKGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+nhutxx9z3SxPGWX9f5NAEC7S8O08ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0XG0D08DYj3rWMB8GA1UdIwQYMBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRcaanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fXIwjhmF7DWgh2qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzynANXH/KttgCJwpQzgXQQpAvvLoJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0zuzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsKxr2EoyNB3tZ3b4XUhRxQ4K5RirqNPnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxFKyDuSN/n3QmOGKjaQI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2DFKWkoRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9ER/frslKxfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQtDF4JbAiXfKM9fJP/P6EUp8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/SfuvmbJxPgWp6ZKy7PtXny3YuxadIwVyQD8vIP/rmMuGNG2+k5o7Y+SlIis5z/iw= +site=true +email=true +code=false + +[subject=C = US, O = GeoTrust Inc., CN = GeoTrust Universal CA 2] +x509=MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0DE81WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUGFF+3Qs17j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdqXbboW0W63MOhBW9Wjo8QJqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxLse4YuU6W3Nx2/zu+z18DwPw76L5GG//aQMJS9/7jOvdqdzXQ2o3rXhhqMcceujwbKNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2WP0+GfPtDCapkzj4T8FdIgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP20gaXT73y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRthAAnZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgocQIgfksILAAX/8sgCSqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4Lt1ZrtmhN79UNdxzMk+MBB4zsslG8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAfBgNVHSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+zdXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQL1EuxBRa3ugZ4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgrFg5fNuH8KrUwJM/gYwx7WBr+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSoag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpqA1Ihn0CoZ1Dy81of398j9tx4TuaYT1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpgY+RdM4kX2TGq2tbzGDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiPpm8m1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJVOCiNUW7dFGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH6aLcr34YEoP9VhdBLtUpgn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwXQMAJKOSLakhT2+zNVVXxxvjpoixMptEmX36vWkzaH6byHCx+rgIW0lbQL1dTR+iS +site=true +email=true +code=false + +[subject=C = BM, O = QuoVadis Limited, OU = Root Certification Authority, CN = QuoVadis Root Certification Authority] +x509=MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJCTTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAzMTkxODMzMzNaFw0yMTAzMTcxODMzMzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Ypli4kVEAkOPcahdxYTMukJ0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2DrOpm2RgbaIr1VxqYuvXtdj182d6UajtLF8HVj71lODqV0D1VNk7feVcxKh7YWWVJWCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeLYzcS19Dsw3sgQUSj7cugF+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWenAScOospUxbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCCAk4wPQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVvdmFkaXNvZmZzaG9yZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREwggENMIIBCQYJKwYBBAG+WAABMIH7MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNlIG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJhY3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYIKwYBBQUHAgEWFmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3TKbkGGew5Oanwl4Rqy+/fMIGuBgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rqy+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6tlCLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSkfnIYj9lofFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf87C9TqnN7Az10buYWnuulLsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1RcHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2xgI4JVrmcGmD+XcHXetwReNDWXcG31a0ymQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi5upZIof4l/UO/erMkqQWxFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi5nrQNiOKSnQ2+Q== +site=true +email=true +code=false + +[subject=C = CO, O = Sociedad Cameral de Certificaci\C3\B3n Digital - Certic\C3\A1mara S.A., CN = AC Ra\C3\ADz Certic\C3\A1mara S.A.] +x509=MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNVBAYTAkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRpZmljYWNpw7NuIERpZ2l0YWwgLSBDZXJ0aWPDoW1hcmEgUy5BLjEjMCEGA1UEAwwaQUMgUmHDrXogQ2VydGljw6FtYXJhIFMuQS4wHhcNMDYxMTI3MjA0NjI5WhcNMzAwNDAyMjE0MjAyWjB7MQswCQYDVQQGEwJDTzFHMEUGA1UECgw+U29jaWVkYWQgQ2FtZXJhbCBkZSBDZXJ0aWZpY2FjacOzbiBEaWdpdGFsIC0gQ2VydGljw6FtYXJhIFMuQS4xIzAhBgNVBAMMGkFDIFJhw616IENlcnRpY8OhbWFyYSBTLkEuMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq2uJo1PMSCMI+8PPUZYILrgIem08kBeGqentLhM0R7LQcNzJPNCNyu5LF6vQhbCnIwTLqKL85XXbQMpiiY9QngE9JlsYhBzLfDe3fezTf3MZsGqy2IiKLUV0qPezuMDU2s0iiXRNWhU5cxh0T7XrmafBHoi0wpOQY5fzp6cSsgkiBzPZkc0OnB8OIMfuuzONj8LSWKdf/WU34ojC2I+GdV75LaeHM/J4Ny+LvB2GNzmxlPLYvEqcgxhaBvzz1NS6jBUJJfD5to0EfhcSM2tXSExP2yYe68yQ54v5aHxwD6Mq0Do43zeX4lvegGHTgNiRg0JaTASJaBE8rF9ogEHMYELODVoqDA+bMMCm8Ibbq0nXl21Ii/kDwFJnmxL3wvIumGVC2daa49AZMQyth9VXAnow6IYm+48jilSH5L887uvDdUhfHjlvgWJsxS3EF1QZtzeNnDeRyPYL1epjb4OsOMLzP96a++EjYfDIJss2yKHzMI+ko6Kh3VOz3vCaMh+DkXkwwakfU5tTohVTP92dsxA7SH2JD/ztA/X7JWR1DhcZDY8AFmd5ekD8LVkH2ZD6mq093ICK5lw1omdMEWux+IBkAC1vImHFrEsm5VoQgpukg3s0956JkSCXjrdCx2bD0Omk1vUgjcTDlaxECp1bczwmPS9KvqfJpxAe+59QafMCAwEAAaOB5jCB4zAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU0QnQ6dfOeXRU+Tows/RtLAMDG2gwgaAGA1UdIASBmDCBlTCBkgYEVR0gADCBiTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5jZXJ0aWNhbWFyYS5jb20vZHBjLzBaBggrBgEFBQcCAjBOGkxMaW1pdGFjaW9uZXMgZGUgZ2FyYW507WFzIGRlIGVzdGUgY2VydGlmaWNhZG8gc2UgcHVlZGVuIGVuY29udHJhciBlbiBsYSBEUEMuMA0GCSqGSIb3DQEBBQUAA4ICAQBclLW4RZFNjmEfAygPU3zmpFmps4p6xbD/CHwso3EcIRNnoZUSQDWDg4902zNc8El2CoFS3UnUmjIz75uny3XlesuXEpBcunvFm9+7OSPI/5jOCk0iAUgHforA1SBClETvv3eiiWdIG0ADBaGJ7M9i4z0ldma/Jre7Ir5v/zlXdLp6yQGVwZVR6Kss+LGGIOk/yzVb0hfpKv6DExdA7ohiZVvVO2Dpezy4ydV/NgIlqmjCMRW3MGXrfx1IebHPOeJCgBbT9ZMj/EyXyVo3bHwi2ErN0o42gzmRkBDI8ck1fj+404HGIGQatlDCIaR43NAvO2STdPCWkPHv+wlaNECW8DYSwaN0jJN+Qd53i+yG2dIPPy3RzECiiWZIHiCznCNZc6lEc7wkeZBWN7PGKX6jD/EpOe9+XCgycDWs2rjIdWb8m0w5R44bb5tNAlQiM+9hup4phO9OSzNHdpdqy35f/RWmnkJDW2ZaiogN9xa5P1FlK2Zqi9E4UqLWRhH6/JocdJ6PlwsCT2TG9WjTSy3/pDceiz+/RL5hRqGEPQgnTIEgd4kI6mdAXmwIUV80WoyWaM3X94nCHNMyAK9Sy9NgWyo6R35rMDOhYil/SrnhLecUIw4OGEfhefwVVdCx/CVxY3UzHCMrr1zZ7Ud3YA47Dx7SwNxkBYn8eNZcLCZDqQ== +site=true +email=true +code=false + +[subject=C = US, O = Internet Security Research Group, CN = ISRG Root X1] +x509=MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAwTzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2VhcmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBYMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygch77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6UA5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sWT8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyHB5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UCB5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUvKBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWnOlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTnjh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbwqHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CIrU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkqhkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZLubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KKNFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7UrTkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdCjNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVcoyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPAmRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57demyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc= +site=true +email=true +code=false + +[subject=C = US, O = Internet Security Research Group, CN = ISRG Root X2] +x509=MIICGzCCAaGgAwIBAgIQQdKd0XLq7qeAwSxs6S+HUjAKBggqhkjOPQQDAzBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBYMjAeFw0yMDA5MDQwMDAwMDBaFw00MDA5MTcxNjAwMDBaME8xCzAJBgNVBAYTAlVTMSkwJwYDVQQKEyBJbnRlcm5ldCBTZWN1cml0eSBSZXNlYXJjaCBHcm91cDEVMBMGA1UEAxMMSVNSRyBSb290IFgyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEzZvVn4CDCuwJSvMWSj5cz3es3mcFDR0HttwW+1qLFNvicWDEukWVEYmO6gbf9yoWHKS5xcUy4APgHoIYOIvXRdgKam7mAHf7AlF9ItgKbppbd9/w+kHsOdx1ymgHDB/qo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUfEKWrt5LSDv6kviejM9ti6lyN5UwCgYIKoZIzj0EAwMDaAAwZQIwe3lORlCEwkSHRhtFcP9Ymd70/aTSVaYgLXTWNLxBo1BfASdWtL4ndQavEi51mI38AjEAi/V3bNTIZargCyzuFJ0nN6T5U6VR5CmD1/iQMVtCnwr1/q4AaOeMSQ+2b1tbFfLn +site=true +email=true +code=false diff --git a/tdeio/kssl/kssl/localcerts b/tdeio/kssl/kssl/localcerts index 150763522..cb39efb99 100644 --- a/tdeio/kssl/kssl/localcerts +++ b/tdeio/kssl/kssl/localcerts @@ -34,3 +34,5 @@ GeoTrust_Universal_CA.pem GeoTrust_Universal_CA2.pem quovadis.pem ac_offline_raiz_certicamara.pem +isrg-root-x1.pem +isrg-root-x2.pem diff --git a/tdeio/kssl/ksslcertchain.cc b/tdeio/kssl/ksslcertchain.cpp index 4f14e4be1..4f14e4be1 100644 --- a/tdeio/kssl/ksslcertchain.cc +++ b/tdeio/kssl/ksslcertchain.cpp diff --git a/tdeio/kssl/ksslcertchain.h b/tdeio/kssl/ksslcertchain.h index eb6c27d44..960bcfbb4 100644 --- a/tdeio/kssl/ksslcertchain.h +++ b/tdeio/kssl/ksslcertchain.h @@ -23,7 +23,7 @@ #include <tqglobal.h> #include <tqptrlist.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQString; class TQCString; @@ -95,7 +95,7 @@ public: * @param chain the certificate chain * @deprecated */ - void setChain(TQStringList chain) KDE_DEPRECATED; + void setChain(TQStringList chain) TDE_DEPRECATED; /** * Set the certificate chain as a list of base64 encoded X.509 diff --git a/tdeio/kssl/ksslcertdlg.cc b/tdeio/kssl/ksslcertdlg.cpp index 7431d4c0a..6f0d7b5a0 100644 --- a/tdeio/kssl/ksslcertdlg.cc +++ b/tdeio/kssl/ksslcertdlg.cpp @@ -74,11 +74,11 @@ KSSLCertDlg::KSSLCertDlg(TQWidget *parent, const char *name, bool modal) _ok = new KPushButton(i18n("Send certificate"), this); h->addWidget(_ok); - connect(_ok, TQT_SIGNAL(clicked()), TQT_SLOT(slotSend())); + connect(_ok, TQ_SIGNAL(clicked()), TQ_SLOT(slotSend())); d->p_pb_dontsend = new KPushButton(i18n("Do not send a certificate"), this); h->addWidget(d->p_pb_dontsend); - connect(d->p_pb_dontsend, TQT_SIGNAL(clicked()), TQT_SLOT(slotDont())); + connect(d->p_pb_dontsend, TQ_SIGNAL(clicked()), TQ_SLOT(slotDont())); #ifndef TQT_NO_WIDGET_TOPEXTRA setCaption(i18n("TDE SSL Certificate Dialog")); diff --git a/tdeio/kssl/ksslcertdlg.h b/tdeio/kssl/ksslcertdlg.h index 8d6f3d777..73300ec9d 100644 --- a/tdeio/kssl/ksslcertdlg.h +++ b/tdeio/kssl/ksslcertdlg.h @@ -41,7 +41,7 @@ class TQPushButton; * @short KDE X.509 Certificate Dialog */ class TDEIO_EXPORT KSSLCertDlg : public KDialog { - Q_OBJECT + TQ_OBJECT public: /** * Construct a KSSL certificate dialog @@ -65,7 +65,7 @@ public: * @param sendChecked send the checked item to the remote host * @deprecated */ - void setup(TQStringList certs, bool saveChecked = false, bool sendChecked = true) KDE_DEPRECATED; + void setup(TQStringList certs, bool saveChecked = false, bool sendChecked = true) TDE_DEPRECATED; /** * Setup the dialog. Call this before you display the dialog. diff --git a/tdeio/kssl/ksslcertificate.cc b/tdeio/kssl/ksslcertificate.cpp index edf877496..d3f784fec 100644 --- a/tdeio/kssl/ksslcertificate.cc +++ b/tdeio/kssl/ksslcertificate.cpp @@ -35,7 +35,7 @@ #include "ksslcertchain.h" #include "ksslutils.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kmdcodec.h> #include <tdelocale.h> #include <tqdatetime.h> @@ -1033,7 +1033,7 @@ unsigned char *p = cert; // FIXME: return code! d->kossl->i2d_X509(getCert(), &p); - // encode it into a QString + // encode it into a TQString qba.duplicate((const char*)cert, certlen); delete[] cert; #endif diff --git a/tdeio/kssl/ksslcertificate.h b/tdeio/kssl/ksslcertificate.h index 67f6a808d..cce931867 100644 --- a/tdeio/kssl/ksslcertificate.h +++ b/tdeio/kssl/ksslcertificate.h @@ -49,7 +49,7 @@ class KSSLX509V3; #include <tdelibs_export.h> -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #include "ksslconfig_win.h" #else #include "ksslconfig.h" diff --git a/tdeio/kssl/ksslcertificatecache.cc b/tdeio/kssl/ksslcertificatecache.cpp index 2eecd66d6..226e21c71 100644 --- a/tdeio/kssl/ksslcertificatecache.cc +++ b/tdeio/kssl/ksslcertificatecache.cpp @@ -286,7 +286,7 @@ TQStringList KSSLCertificateCache::getHostList(KSSLCertificate& cert) { "cacheGetHostList(KSSLCertificate)", data, rettype, retval); - if (rc && rettype == TQSTRINGLIST_OBJECT_NAME_STRING) { + if (rc && rettype == "TQStringList") { TQDataStream retStream(retval, IO_ReadOnly); TQStringList drc; retStream >> drc; @@ -347,7 +347,7 @@ TQStringList KSSLCertificateCache::getKDEKeyByEmail(const TQString &email) { "getKDEKeyByEmail(TQString)", data, rettype, retval); - if (rc && rettype == TQSTRINGLIST_OBJECT_NAME_STRING) { + if (rc && rettype == "TQStringList") { TQDataStream retStream(retval, IO_ReadOnly); TQStringList drc; retStream >> drc; diff --git a/tdeio/kssl/ksslcertificatefactory.cc b/tdeio/kssl/ksslcertificatefactory.cpp index 66e272ced..66e272ced 100644 --- a/tdeio/kssl/ksslcertificatefactory.cc +++ b/tdeio/kssl/ksslcertificatefactory.cpp diff --git a/tdeio/kssl/ksslcertificatehome.cc b/tdeio/kssl/ksslcertificatehome.cpp index 39470c5ab..d6c11b20b 100644 --- a/tdeio/kssl/ksslcertificatehome.cc +++ b/tdeio/kssl/ksslcertificatehome.cpp @@ -23,12 +23,12 @@ #include <ksslpkcs12.h> #include <kresolver.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> using namespace KNetwork; TQStringList KSSLCertificateHome::getCertificateList() { -KSimpleConfig cfg("ksslcertificates", false); +TDESimpleConfig cfg("ksslcertificates", false); TQStringList list = cfg.groupList(); TQString defaultstr("<default>"); TQString blankstr(""); @@ -42,9 +42,9 @@ return list; // KDE 4: make it const TQString & void KSSLCertificateHome::setDefaultCertificate(TQString name, TQString host, bool send, bool prompt) { -KSimpleConfig cfg("ksslauthmap", false); +TDESimpleConfig cfg("ksslauthmap", false); -#ifdef Q_WS_WIN //temporary +#ifdef TQ_WS_WIN //temporary cfg.setGroup(host); #else cfg.setGroup(KResolver::domainToAscii(host)); @@ -80,7 +80,7 @@ return true; bool KSSLCertificateHome::addCertificate(KSSLPKCS12 *cert, TQString passToStore) { if (!cert) return false; -KSimpleConfig cfg("ksslcertificates", false); +TDESimpleConfig cfg("ksslcertificates", false); cfg.setGroup(cert->name()); cfg.writeEntry("PKCS12Base64", cert->toString()); @@ -109,7 +109,7 @@ bool KSSLCertificateHome::deleteCertificate(KSSLPKCS12 *cert) { bool KSSLCertificateHome::deleteCertificateByName(const TQString &name) { if (name.isEmpty()) return false; -KSimpleConfig cfg("ksslcertificates", false); +TDESimpleConfig cfg("ksslcertificates", false); bool ok = cfg.deleteGroup(name); cfg.sync(); @@ -119,7 +119,7 @@ return ok; // KDE 4: make it const TQString & KSSLPKCS12* KSSLCertificateHome::getCertificateByName(TQString name, TQString password) { -KSimpleConfig cfg("ksslcertificates", false); +TDESimpleConfig cfg("ksslcertificates", false); if (!cfg.hasGroup(name)) return NULL; cfg.setGroup(name); @@ -130,7 +130,7 @@ KSimpleConfig cfg("ksslcertificates", false); // KDE 4: make it const TQString & KSSLPKCS12* KSSLCertificateHome::getCertificateByName(TQString name) { -KSimpleConfig cfg("ksslcertificates", false); +TDESimpleConfig cfg("ksslcertificates", false); if (!cfg.hasGroup(name)) return NULL; cfg.setGroup(name); @@ -141,7 +141,7 @@ KSimpleConfig cfg("ksslcertificates", false); // KDE 4: make it const TQString & bool KSSLCertificateHome::hasCertificateByName(TQString name) { -KSimpleConfig cfg("ksslcertificates", false); +TDESimpleConfig cfg("ksslcertificates", false); if (!cfg.hasGroup(name)) return false; return true; } @@ -154,9 +154,9 @@ KSSLPKCS12* KSSLCertificateHome::getCertificateByHost(TQString host, TQString pa // KDE 4: make it const TQString & TQString KSSLCertificateHome::getDefaultCertificateName(TQString host, KSSLAuthAction *aa) { -KSimpleConfig cfg("ksslauthmap", false); +TDESimpleConfig cfg("ksslauthmap", false); -#ifdef Q_WS_WIN //temporary +#ifdef TQ_WS_WIN //temporary if (!cfg.hasGroup(host)) { #else if (!cfg.hasGroup(KResolver::domainToAscii(host))) { @@ -164,7 +164,7 @@ KSimpleConfig cfg("ksslauthmap", false); if (aa) *aa = AuthNone; return TQString::null; } else { -#ifdef Q_WS_WIN //temporary +#ifdef TQ_WS_WIN //temporary cfg.setGroup(host); #else cfg.setGroup(KResolver::domainToAscii(host)); @@ -206,7 +206,7 @@ return cfg.readEntry("DefaultCert", ""); // KDE 4: make it const TQString & KSSLPKCS12* KSSLCertificateHome::getDefaultCertificate(TQString password, KSSLAuthAction *aa) { TQString name = KSSLCertificateHome::getDefaultCertificateName(aa); -KSimpleConfig cfg("ksslcertificates", false); +TDESimpleConfig cfg("ksslcertificates", false); if (name.isEmpty()) return NULL; @@ -218,7 +218,7 @@ KSimpleConfig cfg("ksslcertificates", false); KSSLPKCS12* KSSLCertificateHome::getDefaultCertificate(KSSLAuthAction *aa) { TQString name = KSSLCertificateHome::getDefaultCertificateName(aa); -KSimpleConfig cfg("ksslcertificates", false); +TDESimpleConfig cfg("ksslcertificates", false); if (name.isEmpty()) return NULL; @@ -230,7 +230,7 @@ KSimpleConfig cfg("ksslcertificates", false); // KDE 4: make it const TQString & void KSSLCertificateHome::setDefaultCertificate(TQString name, bool send, bool prompt) { -KSimpleConfig cfg("ksslauthmap", false); +TDESimpleConfig cfg("ksslauthmap", false); cfg.setGroup("<default>"); cfg.writeEntry("defaultCertificate", name); diff --git a/tdeio/kssl/ksslconnectioninfo.cc b/tdeio/kssl/ksslconnectioninfo.cpp index ccc7fc780..ccc7fc780 100644 --- a/tdeio/kssl/ksslconnectioninfo.cc +++ b/tdeio/kssl/ksslconnectioninfo.cpp diff --git a/tdeio/kssl/ksslcsessioncache.cc b/tdeio/kssl/ksslcsessioncache.cpp index d39638717..710ce8f21 100644 --- a/tdeio/kssl/ksslcsessioncache.cc +++ b/tdeio/kssl/ksslcsessioncache.cpp @@ -26,7 +26,7 @@ #include <kstaticdeleter.h> #include <kurl.h> -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #include "ksslconfig_win.h" #else #include "ksslconfig.h" @@ -54,7 +54,7 @@ #ifdef KSSL_HAVE_SSL -typedef QPair<TQString,TQString> KSSLCSession; +typedef TQPair<TQString,TQString> KSSLCSession; typedef TQPtrList<KSSLCSession> KSSLCSessions; static KSSLCSessions *sessions = 0L; diff --git a/tdeio/kssl/kssldefs.h b/tdeio/kssl/kssldefs.h index c33664b14..d981bf136 100644 --- a/tdeio/kssl/kssldefs.h +++ b/tdeio/kssl/kssldefs.h @@ -20,7 +20,7 @@ #ifndef __kssldefs_h #define __kssldefs_h -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #include "ksslconfig_win.h" #else #include "ksslconfig.h" diff --git a/tdeio/kssl/ksslinfodlg.cc b/tdeio/kssl/ksslinfodlg.cpp index 59581905d..2e0b80399 100644 --- a/tdeio/kssl/ksslinfodlg.cc +++ b/tdeio/kssl/ksslinfodlg.cpp @@ -33,13 +33,13 @@ #include <tdeapplication.h> #include <tdeglobal.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kiconloader.h> #include <tdeglobalsettings.h> #include <ksqueezedtextlabel.h> #include <kurllabel.h> #include <kstdguiitem.h> -//#include <kstandarddirs.h> +//#include <tdestandarddirs.h> //#include <krun.h> #include <kcombobox.h> #include "ksslcertificate.h" @@ -107,12 +107,12 @@ KSSLInfoDlg::KSSLInfoDlg(bool secureConnection, TQWidget *parent, const char *na if (KSSL::doesSSLWork()) { button = new KPushButton(KGuiItem(i18n("C&ryptography Configuration..."),"configure"), this); - connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(launchConfig())); + connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(launchConfig())); buttonLayout->addWidget( button ); } button = new KPushButton(KStdGuiItem::close(), this); - connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(close())); + connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(close())); buttonLayout->addWidget( button ); button->setFocus(); @@ -188,7 +188,7 @@ void KSSLInfoDlg::setup(KSSLCertificate *cert, layout->addWidget(new TQLabel(i18n("Chain:"), this), 0, 0); d->_chain = new KComboBox(this); layout->addMultiCellWidget(d->_chain, 1, 1, 0, 1); - connect(d->_chain, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChain(int))); + connect(d->_chain, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChain(int))); d->_chain->clear(); @@ -285,14 +285,14 @@ void KSSLInfoDlg::displayCert(KSSLCertificate *x) { d->_serialNum->setText(x->getSerialNumber()); cspl = d->_validFrom->palette(); - if (x->getQDTNotBefore() > TQDateTime::currentDateTime(Qt::UTC)) + if (x->getQDTNotBefore() > TQDateTime::currentDateTime(TQt::UTC)) cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); else cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); d->_validFrom->setPalette(cspl); d->_validFrom->setText(x->getNotBefore()); cspl = d->_validUntil->palette(); - if (x->getQDTNotAfter() < TQDateTime::currentDateTime(Qt::UTC)) + if (x->getQDTNotAfter() < TQDateTime::currentDateTime(TQt::UTC)) cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); else cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); d->_validUntil->setPalette(cspl); @@ -317,8 +317,8 @@ void KSSLInfoDlg::displayCert(KSSLCertificate *x) { ksv = ksvl.first(); if (ksv == KSSLCertificate::SelfSigned) { - if (x->getQDTNotAfter() > TQDateTime::currentDateTime(Qt::UTC) && - x->getQDTNotBefore() < TQDateTime::currentDateTime(Qt::UTC)) { + if (x->getQDTNotAfter() > TQDateTime::currentDateTime(TQt::UTC) && + x->getQDTNotBefore() < TQDateTime::currentDateTime(TQt::UTC)) { if (KSSLSigners().useForSSL(*x)) ksv = KSSLCertificate::Ok; } else { @@ -411,40 +411,40 @@ void KSSLCertBox::setValues(TQString certName, TQWidget *mailCatcher) { TQLabel *label = 0L; if (!(tmp = cert.getValue("O")).isEmpty()) { label = new TQLabel(i18n("Organization:"), _frame); - label->setAlignment(Qt::AlignLeft | Qt::AlignTop); + label->setAlignment(TQt::AlignLeft | TQt::AlignTop); (new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText); } if (!(tmp = cert.getValue("OU")).isEmpty()) { label = new TQLabel(i18n("Organizational unit:"), _frame); - label->setAlignment(Qt::AlignLeft | Qt::AlignTop); + label->setAlignment(TQt::AlignLeft | TQt::AlignTop); (new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText); } if (!(tmp = cert.getValue("L")).isEmpty()) { label = new TQLabel(i18n("Locality:"), _frame); - label->setAlignment(Qt::AlignLeft | Qt::AlignTop); + label->setAlignment(TQt::AlignLeft | TQt::AlignTop); (new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText); } if (!(tmp = cert.getValue("ST")).isEmpty()) { label = new TQLabel(i18n("Federal State","State:"), _frame); - label->setAlignment(Qt::AlignLeft | Qt::AlignTop); + label->setAlignment(TQt::AlignLeft | TQt::AlignTop); (new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText); } if (!(tmp = cert.getValue("C")).isEmpty()) { label = new TQLabel(i18n("Country:"), _frame); - label->setAlignment(Qt::AlignLeft | Qt::AlignTop); + label->setAlignment(TQt::AlignLeft | TQt::AlignTop); (new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText); } if (!(tmp = cert.getValue("CN")).isEmpty()) { label = new TQLabel(i18n("Common name:"), _frame); - label->setAlignment(Qt::AlignLeft | Qt::AlignTop); + label->setAlignment(TQt::AlignLeft | TQt::AlignTop); (new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText); } if (!(tmp = cert.getValue("Email")).isEmpty()) { label = new TQLabel(i18n("Email:"), _frame); - label->setAlignment(Qt::AlignLeft | Qt::AlignTop); + label->setAlignment(TQt::AlignLeft | TQt::AlignTop); if (mailCatcher) { KURLLabel *mail = new KURLLabel(tmp, tmp, _frame); - connect(mail, TQT_SIGNAL(leftClickedURL(const TQString &)), mailCatcher, TQT_SLOT(mailClicked(const TQString &))); + connect(mail, TQ_SIGNAL(leftClickedURL(const TQString &)), mailCatcher, TQ_SLOT(mailClicked(const TQString &))); } else { label = new TQLabel(tmp, _frame); label->setTextFormat(TQt::PlainText); @@ -465,12 +465,11 @@ TQScrollView *KSSLInfoDlg::buildCertInfo(const TQString &certName) { } void KSSLInfoDlg::urlClicked(const TQString &url) { - kapp->invokeBrowser(url); + tdeApp->invokeBrowser(url); } void KSSLInfoDlg::mailClicked(const TQString &url) { - kapp->invokeMailer(url, TQString::null); + tdeApp->invokeMailer(url, TQString::null); } #include "ksslinfodlg.moc" -// vim: ts=4 sw=4 et diff --git a/tdeio/kssl/ksslinfodlg.h b/tdeio/kssl/ksslinfodlg.h index c73afbba1..9f8a731c0 100644 --- a/tdeio/kssl/ksslinfodlg.h +++ b/tdeio/kssl/ksslinfodlg.h @@ -48,7 +48,7 @@ class KSSLCertChain; * @short KDE SSL Information Dialog */ class TDEIO_EXPORT KSSLInfoDlg : public KDialog { - Q_OBJECT + TQ_OBJECT public: /** * Construct a KSSL Information Dialog diff --git a/tdeio/kssl/ksslkeygen.cc b/tdeio/kssl/ksslkeygen.cpp index 86fe4717d..595b4ebcd 100644 --- a/tdeio/kssl/ksslkeygen.cc +++ b/tdeio/kssl/ksslkeygen.cpp @@ -29,7 +29,7 @@ #include <tdemessagebox.h> #include <kopenssl.h> #include <kprogress.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdetempfile.h> #include <tdewallet.h> @@ -51,9 +51,9 @@ KSSLKeyGen::KSSLKeyGen(TQWidget *parent, const char *name, bool modal) setHelpEnabled(page1, false); setHelpEnabled(page2, false); setFinishEnabled(page2, false); - connect(page2->_password1, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotPassChanged())); - connect(page2->_password2, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotPassChanged())); - connect(finishButton(), TQT_SIGNAL(clicked()), TQT_SLOT(slotGenerate())); + connect(page2->_password1, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotPassChanged())); + connect(page2->_password2, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotPassChanged())); + connect(finishButton(), TQ_SIGNAL(clicked()), TQ_SLOT(slotGenerate())); #else // tell him he doesn't have SSL #endif diff --git a/tdeio/kssl/ksslkeygen.h b/tdeio/kssl/ksslkeygen.h index 5bb99a593..13b38071a 100644 --- a/tdeio/kssl/ksslkeygen.h +++ b/tdeio/kssl/ksslkeygen.h @@ -42,7 +42,7 @@ class KGWizardPage2; * @short KDE Key Generation Dialog */ class TDEIO_EXPORT KSSLKeyGen : public KWizard { - Q_OBJECT + TQ_OBJECT public: /** * Construct a keygen dialog. diff --git a/tdeio/kssl/ksslpeerinfo.cc b/tdeio/kssl/ksslpeerinfo.cpp index d1c2d00fc..8e265cdb9 100644 --- a/tdeio/kssl/ksslpeerinfo.cc +++ b/tdeio/kssl/ksslpeerinfo.cpp @@ -30,7 +30,7 @@ #include <ksockaddr.h> #include <kextsock.h> #include <netsupp.h> -#ifndef Q_WS_WIN //TODO kresolver not ported +#ifndef TQ_WS_WIN //TODO kresolver not ported #include "kresolver.h" #endif @@ -62,7 +62,7 @@ void KSSLPeerInfo::setPeerHost(TQString realHost) { while(d->peerHost.endsWith(".")) d->peerHost.truncate(d->peerHost.length()-1); -#ifdef Q_WS_WIN //TODO kresolver not ported +#ifdef TQ_WS_WIN //TODO kresolver not ported d->peerHost = d->peerHost.lower(); #else d->peerHost = TQString::fromLatin1(KNetwork::KResolver::domainToAscii(d->peerHost)); diff --git a/tdeio/kssl/ksslpemcallback.cc b/tdeio/kssl/ksslpemcallback.cpp index 584020c0f..584020c0f 100644 --- a/tdeio/kssl/ksslpemcallback.cc +++ b/tdeio/kssl/ksslpemcallback.cpp diff --git a/tdeio/kssl/ksslpkcs12.cc b/tdeio/kssl/ksslpkcs12.cpp index 08bc54a0b..08bc54a0b 100644 --- a/tdeio/kssl/ksslpkcs12.cc +++ b/tdeio/kssl/ksslpkcs12.cpp diff --git a/tdeio/kssl/ksslpkcs12.h b/tdeio/kssl/ksslpkcs12.h index c9dff0d82..14eb23376 100644 --- a/tdeio/kssl/ksslpkcs12.h +++ b/tdeio/kssl/ksslpkcs12.h @@ -21,7 +21,7 @@ #ifndef _KSSLPKCS12_H #define _KSSLPKCS12_H -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #include "ksslconfig_win.h" #else #include "ksslconfig.h" diff --git a/tdeio/kssl/ksslpkcs7.cc b/tdeio/kssl/ksslpkcs7.cpp index bced75e80..bced75e80 100644 --- a/tdeio/kssl/ksslpkcs7.cc +++ b/tdeio/kssl/ksslpkcs7.cpp diff --git a/tdeio/kssl/ksslpkcs7.h b/tdeio/kssl/ksslpkcs7.h index c94b7bc7a..3a88cb647 100644 --- a/tdeio/kssl/ksslpkcs7.h +++ b/tdeio/kssl/ksslpkcs7.h @@ -21,7 +21,7 @@ #ifndef _KSSLPKCS7_H #define _KSSLPKCS7_H -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #include "ksslconfig_win.h" #else #include "ksslconfig.h" diff --git a/tdeio/kssl/ksslsession.cc b/tdeio/kssl/ksslsession.cpp index 3c80233f1..7d597146a 100644 --- a/tdeio/kssl/ksslsession.cc +++ b/tdeio/kssl/ksslsession.cpp @@ -55,7 +55,7 @@ unsigned char *p = csess; return TQString::null; } - // encode it into a QString + // encode it into a TQString qba.duplicate((const char*)csess, slen); delete[] csess; rc = KCodecs::base64Encode(qba); diff --git a/tdeio/kssl/ksslsettings.cc b/tdeio/kssl/ksslsettings.cpp index 090eaef4f..354120d8d 100644 --- a/tdeio/kssl/ksslsettings.cc +++ b/tdeio/kssl/ksslsettings.cpp @@ -30,11 +30,10 @@ #include <unistd.h> #include <tqfile.h> -#include <tqsortedlist.h> #include "ksslsettings.h" #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> // this hack provided by Malte Starostik to avoid glibc/openssl bug diff --git a/tdeio/kssl/ksslsettings.h b/tdeio/kssl/ksslsettings.h index 18b55331f..47b0de345 100644 --- a/tdeio/kssl/ksslsettings.h +++ b/tdeio/kssl/ksslsettings.h @@ -120,19 +120,19 @@ public: * Do not use this * @deprecated */ - bool warnOnSelfSigned() const KDE_DEPRECATED; + bool warnOnSelfSigned() const TDE_DEPRECATED; /** * Do not use this * @deprecated */ - bool warnOnRevoked() const KDE_DEPRECATED; + bool warnOnRevoked() const TDE_DEPRECATED; /** * Do not use this * @deprecated */ - bool warnOnExpired() const KDE_DEPRECATED; + bool warnOnExpired() const TDE_DEPRECATED; /** * Does the user want to use the Entropy Gathering Daemon? diff --git a/tdeio/kssl/ksslsigners.cc b/tdeio/kssl/ksslsigners.cpp index 028ddf555..2392f4a36 100644 --- a/tdeio/kssl/ksslsigners.cc +++ b/tdeio/kssl/ksslsigners.cpp @@ -199,7 +199,7 @@ TQStringList KSSLSigners::list() { "caList()", data, rettype, retval); - if (rc && rettype == TQSTRINGLIST_OBJECT_NAME_STRING) { + if (rc && rettype == "TQStringList") { TQDataStream retStream(retval, IO_ReadOnly); retStream >> drc; } @@ -218,7 +218,7 @@ TQString KSSLSigners::getCert(TQString subject) { "caGetCert(TQString)", data, rettype, retval); - if (rc && rettype == TQSTRING_OBJECT_NAME_STRING) { + if (rc && rettype == "TQString") { TQDataStream retStream(retval, IO_ReadOnly); retStream >> drc; } diff --git a/tdeio/kssl/ksslutils.cc b/tdeio/kssl/ksslutils.cpp index 2e6e3a303..2e6e3a303 100644 --- a/tdeio/kssl/ksslutils.cc +++ b/tdeio/kssl/ksslutils.cpp diff --git a/tdeio/kssl/ksslutils.h b/tdeio/kssl/ksslutils.h index 58a817e83..5fa05a023 100644 --- a/tdeio/kssl/ksslutils.h +++ b/tdeio/kssl/ksslutils.h @@ -20,9 +20,9 @@ #ifndef _INCLUDE_KSSLUTILS_H #define _INCLUDE_KSSLUTILS_H -#include <kdemacros.h> +#include <tdemacros.h> -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #include "ksslconfig_win.h" #else #include "ksslconfig.h" @@ -45,10 +45,10 @@ class TQDateTime; * * @param tm the OpenSSL ASN1_UTCTIME pointer * - * @return the date formatted in a QString + * @return the date formatted in a TQString * @see ASN1_UTCTIME_QDateTime */ -KDE_EXPORT TQString ASN1_UTCTIME_QString(ASN1_UTCTIME *tm); +TDE_EXPORT TQString ASN1_UTCTIME_QString(ASN1_UTCTIME *tm); /** * Convert an ASN1 UTCTIME value to a TQDateTime. Uses TDELocale settings. @@ -58,7 +58,7 @@ KDE_EXPORT TQString ASN1_UTCTIME_QString(ASN1_UTCTIME *tm); * * @return the date formatted in a QDateTime */ -KDE_EXPORT TQDateTime ASN1_UTCTIME_QDateTime(ASN1_UTCTIME *tm, int *isGmt); +TDE_EXPORT TQDateTime ASN1_UTCTIME_QDateTime(ASN1_UTCTIME *tm, int *isGmt); /** @@ -66,9 +66,9 @@ KDE_EXPORT TQDateTime ASN1_UTCTIME_QDateTime(ASN1_UTCTIME *tm, int *isGmt); * * @param aint the OpenSSL ASN1_INTEGER pointer * - * @return the number formatted in a QString + * @return the number formatted in a TQString */ -KDE_EXPORT TQString ASN1_INTEGER_QString(ASN1_INTEGER *aint); +TDE_EXPORT TQString ASN1_INTEGER_QString(ASN1_INTEGER *aint); #endif diff --git a/tdeio/kssl/ksslx509map.cc b/tdeio/kssl/ksslx509map.cpp index 7896fdfcf..7896fdfcf 100644 --- a/tdeio/kssl/ksslx509map.cc +++ b/tdeio/kssl/ksslx509map.cpp diff --git a/tdeio/kssl/ksslx509v3.cc b/tdeio/kssl/ksslx509v3.cpp index a3310b9db..a3310b9db 100644 --- a/tdeio/kssl/ksslx509v3.cc +++ b/tdeio/kssl/ksslx509v3.cpp diff --git a/tdeio/kurifilterplugin.desktop b/tdeio/kurifilterplugin.desktop index 5882b35ca..c44e01ff6 100644 --- a/tdeio/kurifilterplugin.desktop +++ b/tdeio/kurifilterplugin.desktop @@ -2,83 +2,3 @@ Type=ServiceType X-TDE-ServiceType=KURIFilter/Plugin Name=Enhanced Browsing Plugin -Name[af]=Verbeterde Blaaiïng Inprop module -Name[ar]=ملحقات التصفح المحسن -Name[az]=Təkmilləşmiş Səyyah Əlavəsi -Name[bg]=Разширена приставка за преглед -Name[bn]=উন্নত ব্রাউজিং প্লাগ-ইন -Name[br]=Lugant Furchal Gwellaet -Name[bs]=Dodatak za napredno pretraživanje -Name[ca]=Connector de navegació millorada -Name[cs]=Modul rozšířeného procházení -Name[csb]=Mòduł do rozszérzónégò przezeraniô -Name[cy]=Ategyn Pori Hwylusach -Name[da]=Udvidet netsøgnings-plugin -Name[de]=Erweitertes Browser-Modul -Name[el]=Πρόσθετο βελτιωμένης εξερεύνησης -Name[eo]=progresinta TTTum-kromaĵo -Name[es]=Plugin de Navegación Mejorada -Name[et]=Täiustatud brausimise plugin -Name[eu]=Arakatze plugin hobetua -Name[fa]=وصلۀ مرور افزوده -Name[fi]=Laajennettu selauslisäosa -Name[fr]=Module externe de navigation avancée -Name[fy]=Plugin foar effisjinter browsen -Name[ga]=Breiseán le haghaidh Brabhsála Feabhsaithe -Name[gl]=Plugin de Navegación Mellorada -Name[he]=תוסף לגלישה משופרת -Name[hi]=एनहैंस्ड ब्राउसिंग प्लगइन -Name[hr]=Napredni dodatak za pretraživanje -Name[hu]=Továbbfejlesztett böngészés bővítőmodul -Name[id]=Plugin Browsing yang disempurnakan -Name[is]=Íforrit fyrir vafrara-endurbætur -Name[it]=Plugin di navigazione avanzata -Name[ja]=拡張ブラウズプラグイン -Name[ka]=დეტალური ჩვენების მოდული -Name[kk]=Жетілдірген шарлау модулі -Name[km]=កម្មវិធីជំនួយរុករកដែលបានធ្វើឲ្យប្រសើរ -Name[ko]=더 나은 찾아가기 플러그인 -Name[lb]=Erweiderte Browser-Plugin -Name[lt]=Išplėstinio naršymo priedas -Name[lv]=Uzlabotas Pārlūkošanas spraudnis -Name[mk]=Приклучок за напредно разгледување -Name[mn]=Өргөтгөсөн Хөтлөгчийн Plugin -Name[ms]=Plug masuk Pelayar Ekstra -Name[mt]=Plagin għal browsing estiż -Name[nb]=Programtillegg for utvidet nettlesing -Name[nds]=Nettkiekverwiedern-Plugin -Name[ne]=विस्तारित ब्राउजिङ प्लगइन -Name[nl]=Verbeterd Browsen Plugin -Name[nn]=Programtillegg for forbetring av nettlesaren -Name[nso]=Tsenyo yeo e Hlohleleditswego ya Boinyakisi -Name[oc]=Branquament de navegacion amilhorada -Name[pa]=ਵਾਧੂ ਝਲਕਾਰਾ ਪਲੱਗਿੰਨ -Name[pl]=Moduł do rozszerzonego przeglądania -Name[pt]=Navegação Melhorada -Name[pt_BR]=Plug-in de navegação melhorada -Name[ro]=Modul de navigare avansată -Name[ru]=Модуль расширенного просмотра -Name[rw]=Icomeka ry'Ishakisha Ritunganyijwe -Name[se]=Njuovžilut fierbmádatlogadeami lassemoduvla -Name[sk]=Modul rozšíreného prehliadača -Name[sl]=Vstavek za izboljšano brskanje -Name[sq]=Shtojcë e Përmirësuar për Shfletim -Name[sr]=Прикључак за побољшано претраживање -Name[sr@Latn]=Priključak za poboljšano pretraživanje -Name[sv]=Utökad webbläsning -Name[ta]=மேம்படுத்திய உலாவும் சொருகுப்பொருள் -Name[te]=అభివ్రుద్దిపరచిన బ్రౌజింగ్ ప్లగిన్ -Name[tg]=Баланд Кардан -Name[th]=ปลั๊กอินการเรียกดูที่เสริมความสามารถ -Name[tr]=Gelişmiş Tarayıcı Eklentisi -Name[tt]=Kiñäytelgän Küsätü Östämäse -Name[uk]=Втулок розширеної навігації -Name[uz]=Tezlashtirilgan veb-koʻrish plagini -Name[uz@cyrillic]=Тезлаштирилган веб-кўриш плагини -Name[ven]=Pulagini ya burausu yo engedzhwaho -Name[vi]=Bộ cầm phít duyệt tăng cường -Name[xh]=Iplagi yangaphakathi Ekhangela iincwadi Enyusiweyo -Name[zh_CN]=增强的浏览插件 -Name[zh_HK]=增強功能的瀏覽外掛程式 -Name[zh_TW]=增強的瀏覽外掛程式 -Name[zu]=I-plugin Yomcingi Weqophela eliphezulu diff --git a/tdeio/misc/CMakeLists.txt b/tdeio/misc/CMakeLists.txt index fc145ee87..ad25c8e0d 100644 --- a/tdeio/misc/CMakeLists.txt +++ b/tdeio/misc/CMakeLists.txt @@ -46,12 +46,15 @@ install( FILES uiserver.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdeio ) ##### other data ################################ -install(FILES +tde_create_translated_desktop( + SOURCE tdeio_uiserver.desktop tdemailservice.protocol telnet.protocol rlogin.protocol rtsp.protocol ssh.protocol mms.protocol mmst.protocol mmsu.protocol pnm.protocol rtspt.protocol rtspu.protocol - DESTINATION ${SERVICES_INSTALL_DIR} ) + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR tdeio-desktops +) install( FILES fileshareset DESTINATION ${BIN_INSTALL_DIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE SETUID ) @@ -68,7 +71,6 @@ set( ${target}_SRCS tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} LINK tdeio-shared - DEPENDENCIES dcopidl ) diff --git a/tdeio/misc/kpac/CMakeLists.txt b/tdeio/misc/kpac/CMakeLists.txt index 14af52de1..a98625dc6 100644 --- a/tdeio/misc/kpac/CMakeLists.txt +++ b/tdeio/misc/kpac/CMakeLists.txt @@ -30,8 +30,17 @@ link_directories( ##### other data ################################ -install(FILES proxyscout.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) -install(FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/proxyscout ) +tde_create_translated_desktop( + SOURCE proxyscout.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/kded + PO_DIR tdeio-desktops +) + +tde_create_translated_desktop( + SOURCE eventsrc + DESTINATION ${DATA_INSTALL_DIR}/proxyscout + PO_DIR tdeio-kpac-eventsrc +) ##### kded_proxyscout ########################### @@ -50,7 +59,6 @@ set( ${target}_SKELS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} LINK tdeinit_kded-shared kjs-shared ${RESOLV_LIBRARIES} - DEPENDENCIES dcopidl DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/tdeio/misc/kpac/dhcp.h b/tdeio/misc/kpac/dhcp.h index 41643ae3a..0b9d9f5aa 100644 --- a/tdeio/misc/kpac/dhcp.h +++ b/tdeio/misc/kpac/dhcp.h @@ -73,6 +73,3 @@ struct dhcp_msg #define DHCP_OPT_END 0xff #endif - -/* vim: ts=4 sw=4 noet - */ diff --git a/tdeio/misc/kpac/discovery.cpp b/tdeio/misc/kpac/discovery.cpp index 533c4fcca..4e1bab960 100644 --- a/tdeio/misc/kpac/discovery.cpp +++ b/tdeio/misc/kpac/discovery.cpp @@ -42,7 +42,7 @@ #include <tqtimer.h> #include <tdelocale.h> -#include <kprocio.h> +#include <tdeprocio.h> #include <kurl.h> #include "discovery.moc" @@ -51,14 +51,14 @@ namespace KPAC { Discovery::Discovery( TQObject* parent ) : Downloader( parent ), - m_helper( new KProcIO ) + m_helper( new TDEProcIO ) { - connect( m_helper, TQT_SIGNAL( readReady( KProcIO* ) ), TQT_SLOT( helperOutput() ) ); - connect( m_helper, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( failed() ) ); + connect( m_helper, TQ_SIGNAL( readReady( TDEProcIO* ) ), TQ_SLOT( helperOutput() ) ); + connect( m_helper, TQ_SIGNAL( processExited( TDEProcess* ) ), TQ_SLOT( failed() ) ); *m_helper << "kpac_dhcp_helper"; if ( !m_helper->start() ) - TQTimer::singleShot( 0, this, TQT_SLOT( failed() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( failed() ) ); } bool Discovery::initHostName() @@ -143,5 +143,3 @@ namespace KPAC download( KURL( line.stripWhiteSpace() ) ); } } - -// vim: ts=4 sw=4 et diff --git a/tdeio/misc/kpac/discovery.h b/tdeio/misc/kpac/discovery.h index a1443ad8c..b701d8b74 100644 --- a/tdeio/misc/kpac/discovery.h +++ b/tdeio/misc/kpac/discovery.h @@ -25,13 +25,13 @@ #include "downloader.h" -class KProcIO; +class TDEProcIO; namespace KPAC { class Discovery : public Downloader { - Q_OBJECT + TQ_OBJECT public: Discovery( TQObject* ); @@ -45,11 +45,9 @@ namespace KPAC bool initHostName(); bool checkDomain() const; - KProcIO* m_helper; + TDEProcIO* m_helper; TQString m_hostname; }; } #endif // KPAC_DISCOVERY_H - -// vim: ts=4 sw=4 et diff --git a/tdeio/misc/kpac/downloader.cpp b/tdeio/misc/kpac/downloader.cpp index 483e836cb..30857df0c 100644 --- a/tdeio/misc/kpac/downloader.cpp +++ b/tdeio/misc/kpac/downloader.cpp @@ -44,9 +44,9 @@ namespace KPAC m_scriptURL = url; TDEIO::TransferJob* job = TDEIO::get( url, false, false ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( result( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( result( TDEIO::Job* ) ) ); } void Downloader::failed() @@ -85,5 +85,3 @@ namespace KPAC } } } - -// vim: ts=4 sw=4 et diff --git a/tdeio/misc/kpac/downloader.h b/tdeio/misc/kpac/downloader.h index 808e09378..d2264f8b2 100644 --- a/tdeio/misc/kpac/downloader.h +++ b/tdeio/misc/kpac/downloader.h @@ -31,7 +31,7 @@ namespace KPAC { class Downloader : public TQObject { - Q_OBJECT + TQ_OBJECT public: Downloader( TQObject* ); @@ -60,5 +60,3 @@ namespace KPAC } #endif // KPAC_DOWNLOADER_H - -// vim: ts=4 sw=4 et diff --git a/tdeio/misc/kpac/eventsrc b/tdeio/misc/kpac/eventsrc index c44443a03..2638739a2 100644 --- a/tdeio/misc/kpac/eventsrc +++ b/tdeio/misc/kpac/eventsrc @@ -1,530 +1,18 @@ [!Global!] IconName=proxy Comment=Automatic Proxy Configuration -Comment[af]=Outomatiese Proksie Opstelling -Comment[ar]=تهيئة آلية للخادم الوكيل -Comment[az]=Avtomatik Vəkil Quraşdırılması -Comment[bg]=Автоматично настройване на прокси сървъра -Comment[bn]=স্বয়ংক্রিয় প্রক্সি কনফিগারেশন -Comment[br]=Kefluniadur emgefreekh ar proksi -Comment[bs]=Automatsko podešavanje proxy-ja -Comment[ca]=Configuració automàtica del servidor d'intercanvi -Comment[cs]=Automatické nastavení proxy -Comment[csb]=Aùtokònfigùracëjô pòstrzédnika -Comment[cy]=Ffurweddiad Awtomatig o'r Dirprwy -Comment[da]=Automatisk proxy-indstilling -Comment[de]=Autom. Proxy-Einrichtung -Comment[el]=Αυτόματη ρύθμιση διαμεσολαβητή -Comment[eo]=Aŭtomata Prokuragordo -Comment[es]=Configuración automática del Proxy -Comment[et]=Automaatne proxy konfigureerimine -Comment[eu]=Proxy-aren konfigurazio automatikoa -Comment[fa]=پیکربندی خودکار پیشکار -Comment[fi]=Automaattiset proxy-asetukset -Comment[fr]=Configuration automatique du serveur mandataire -Comment[fy]=Automatyske proxy ynstelling -Comment[ga]=Uathchumraíocht an tSeachfhreastalaí -Comment[gl]=Configuración Automática do Proxy -Comment[he]=הגדרות פרוקסי אוטומטיות -Comment[hi]=स्वचलित प्रॉक्सी कॉन्फ़िगरेटर -Comment[hr]=Automatsko podešavanje proxyja -Comment[hu]=Automatikus proxybeállítás -Comment[id]=Konfigurasi Proxi Otomatis -Comment[is]=Sjálfvirkar stillingar milliþjóns -Comment[it]=Configurazione automatica proxy -Comment[ja]=自動プロキシ設定 -Comment[ka]=პროქსის თვითგამართვა -Comment[kk]=Автоматты түрде проксиді баптау -Comment[km]=ការកំណត់រចនាសម្ព័ន្ធប្រូកស៊ីដោយស្វ័យប្រវត្តិ -Comment[ko]=스스로 프록시 설정 -Comment[lb]=Automatesch Proxy-Configuratioun -Comment[lt]=Automatinis proxy derinimas -Comment[mk]=Автоматска конфигурација на прокси -Comment[mn]=Автомат итгэмжилэгчийн тохиргоо -Comment[ms]=Penyelarasan Proksi Automatik -Comment[nb]=Automatisk mellomtjenerinnstilling -Comment[nds]=Proxy automaatsch instellen -Comment[ne]=स्वचालित प्रोक्सी कन्फिगरेसन -Comment[nl]=Automatische proxyconfiguratie -Comment[nn]=Automatisk mellomtenaroppsett -Comment[pa]=ਸਵੈ-ਚਾਲਤ ਪਰਾਕਸੀ ਸੰਰਚਨਾ -Comment[pl]=Autokonfiguracja pośrednika -Comment[pt]=Configuração Automática do 'Proxy' -Comment[pt_BR]=Configuração Automática do Proxy -Comment[ro]=Configurare automată "proxy" -Comment[ru]=Автонастройка прокси -Comment[rw]=Iboneza rya Nyabubasha Ryikoresha -Comment[se]=Automáhtalaš gaskabálváheiveheapmi -Comment[sk]=Automatická konfigurácia proxy -Comment[sl]=Samodejne nastavitve posrednika -Comment[sq]=Kofigurimi Automatik i Proxy-t -Comment[sr]=Аутоматско подешавање проксија -Comment[sr@Latn]=Automatsko podešavanje proksija -Comment[sv]=Automatisk proxyinställning -Comment[ta]=தானியக்க பதிலாள் வடிவமைப்பு -Comment[te]=స్వయంచాలిత ప్రాక్సీ రూపకరణం -Comment[tg]=Шакли Автоматӣ Вакил Кардашуда -Comment[th]=ปรับแต่งพร็อกซีอัตโนมัติ -Comment[tr]=Otomatik Vekil Sunucu Yapılandırması -Comment[tt]=Proxy'nı Aqıllı Caylaw -Comment[uk]=Автоматичне визначення проксі сервера -Comment[uz]=Proksini avtomatik ravishda moslash -Comment[uz@cyrillic]=Проксини автоматик равишда мослаш -Comment[vi]=Cấu hình ủy nhiệm tự động. -Comment[wa]=Apontiaedje otomatike do procsi -Comment[zh_CN]=自动代理配置 -Comment[zh_HK]=自動代理組態 -Comment[zh_TW]=自動代理組態 [script-error] Name=Invalid proxy script -Name[af]=Ongeldige proksie skrip -Name[ar]=نص برمجي غير صالح -Name[az]=Hökmsüz vəkil skripti -Name[bg]=Невалиден скрипт за прокси сървъра -Name[bn]=অবৈধ প্রক্সি স্ক্রিপ্ট -Name[br]=N'eo ket mat an urzhiaoug proksi -Name[bs]=Neispravna proxy skripta -Name[ca]=Script del servidor intermedi no vàlid -Name[cs]=Neplatný proxy skript -Name[csb]=Falszëwi skript pòstrzédnika -Name[cy]=Sgript dirprwy annilys -Name[da]=Ugyldigt proxy-script -Name[de]=Ungültiges Proxy-Skript -Name[el]=Μη έγκυρο σενάριο διαμεσολαβητή -Name[eo]=Nevalida prokurila skripto -Name[es]=Procedimiento inválido del proxy -Name[et]=Vigane proxy skript -Name[eu]=Proxy-aren script baliogabea -Name[fa]=دستنوشتۀ پیشکار نامعتبر -Name[fi]=Virheellinen proxy-skripti -Name[fr]=Script de serveur mandataire non valable -Name[fy]=Unjildich proxy skript -Name[ga]=Script neamhbhailí seachfhreastalaí -Name[gl]=Guión de proxy inválido -Name[he]=תסריט Proxy לא תקין -Name[hi]=अवैध प्रॉक्सी स्क्रिप्ट -Name[hr]=Neispravna proxy skripta -Name[hu]=Érvénytelen proxy-szkript -Name[id]=Skrip proxi tidak sah -Name[is]=Ógild milliþjónsskrifta -Name[it]=Script proxy non valido -Name[ja]=無効なプロキシスクリプト -Name[ka]=პროქსის მცდარი სკრიპტი -Name[kk]=Жарамсыз прокси скрипті -Name[km]=ស្គ្រីបប្រូកស៊ីមិនត្រឹមត្រូវ -Name[ko]=올바르지 않은 프록시 스크립트 -Name[lb]=Ongültegt Proxy-Skript -Name[lt]=Blogas proxy scenarijas -Name[mk]=Невалидна прокси скрипта -Name[mn]=Хүчингүй итгэмжилэгч скрипт -Name[ms]=Skrip proksi tidak sah -Name[nb]=Ugyldig mellomtjenerskript -Name[nds]=Proxyskript gellt nich -Name[ne]=अवैद्य प्रोक्सी स्क्रिप्ट -Name[nl]=Ongeldig proxyscript -Name[nn]=Ugyldig mellomtenarskript -Name[pa]=ਗਲਤ ਪਰਾਕਸੀ ਸਕ੍ਰਿਪਟ -Name[pl]=Niepoprawny skrypt pośrednika -Name[pt]=Configuração de 'proxy' inválida -Name[pt_BR]=Script de proxy inválido -Name[ro]=Script "proxy" eronat -Name[ru]=Неверный скрипт прокси -Name[rw]=Inyandikoporogaramu ya Nyabubasha ntiyemewe -Name[se]=Gustohis gaskabálváskripta -Name[sk]=Zlý proxy skript -Name[sl]=Neveljaven posredniški skript -Name[sq]=Proxy Skripta është e gabuar -Name[sr]=Неисправна прокси скрипта -Name[sr@Latn]=Neispravna proksi skripta -Name[sv]=Ogiltigt proxyskript -Name[ta]=செல்லாத பதிலாள் எழுத்தாக்கம் -Name[te]=చెల్లని ప్రాక్సీ స్క్రిప్ట్ -Name[tg]=Дастнависи вакил кардашуда ношоям -Name[th]=สคริปต์ของพร็อกซี ไม่ถูกต้อง -Name[tr]=Geçersiz vekil sunucu betiği -Name[tt]=Proxy ämerlege bozıq -Name[uk]=Неправильний скрипт для проксі -Name[uz]=Proksi skripti haqiqiy emas -Name[uz@cyrillic]=Прокси скрипти ҳақиқий эмас -Name[vi]=Tập lệnh ủy nhiệm không hợp lệ -Name[zh_CN]=无效的代理脚本 -Name[zh_HK]=不合法的代理伺服器 script -Name[zh_TW]=不合法 proxy 命令稿檔案 Comment=The downloaded proxy configuration script is invalid -Comment[af]=Die proksie skipt wat afgelaai was is ongeldig -Comment[ar]=النص البرمجي الذي تم تنزيله غير صالح -Comment[az]=Endirilən vəkil quraşdırma skripti kökmsüzdür -Comment[bg]=Изтегленият скрипт за настройване на прокси сървъра е невалиден -Comment[bn]=ডাউনলোড করা প্রক্সি কনফিগারেশন স্ক্রিপ্টটি অবৈধ -Comment[br]=N'eo ket mat urzhiaoug kefluniadur ar proksi -Comment[bs]=Downloadovana skripta za podešavanje proxy-ja je neispravna -Comment[ca]=L'script de configuració del servidor intermedi descarregat no és vàlid -Comment[cs]=Stažený konfigurační skript pro proxy je neplatný -Comment[csb]=Zladowóny skript kònfigùracëji pòstrzédnika je falszëwi -Comment[cy]=Mae'r sgript ffurfweddu'r dirprwy a chafodd ei lawrlwytho yn annilys -Comment[da]=Det hentede proxy-indstillingsscript er ugyldigt -Comment[de]=Das heruntergeladene Proxy-Einrichtungsskript ist nicht verwendbar -Comment[el]=Το σενάριο ρύθμισης διαμεσολαβητή που λήφθηκε δεν είναι έγκυρο -Comment[eo]=La ŝarĝita prokuragordoskript estas nevalida -Comment[es]=El procedimiento descargado para la configuración del proxy es inválido -Comment[et]=Allalaaditud proxy seadistuse skript on vigane -Comment[eu]=Deskargatutako proxy-aren konfigurazioko script-a baliogabea da -Comment[fa]=دستنوشتۀ پیکربندی پیشکار بارگیریشده، نامعتبر است -Comment[fi]=Ladattu proxy-asetusskripti on virheellinen -Comment[fr]=Le script téléchargé de configuration du serveur mandataire n'est pas valable -Comment[fy]=It ynladen proxy ynstellings skript is ûnjildich -Comment[ga]=Is neamhbhailí í script chumraíocht an tseachfhreastalaí a íosluchtaíodh -Comment[gl]=O guión de configuración descarregado do proxy non é válido -Comment[he]=תסריט הגדרת הפרוקסי שהורד לא תקין -Comment[hi]=ङाउनलोडेड प्रॉक्सी कॉन्फ़िगरेटर स्क्रिप्ट अवैध है। -Comment[hr]=Preuzeta skripta konfiguriranja proxyja je neispravna -Comment[hu]=A letöltött proxybeállító szkript érvénytelen -Comment[id]=Skrip konfigurasi proxy yang diunduh tidak valid -Comment[is]=Sótt milliþjónsskrifta er ógild -Comment[it]=Lo script di configurazione proxy scaricato non è valido -Comment[ja]=ダウンロードされたプロキシ設定スクリプトは無効です。 -Comment[ka]=პროქსის გამართვის ჩამოტვირთული სკრიპტი მცდარია -Comment[kk]=Жүктеп алынған прокси баптау скрипті жарамсыз -Comment[km]=ស្គ្រីបកំណត់រចនាសម្ព័ន្ធប្រូកស៊ីដែលបានទាញយក មិនត្រឹមត្រូវឡើយ -Comment[ko]=내려받은 프록시 설정 스크립트가 올바르지 않습니다. -Comment[lb]=D'Proxy-Configuratiounsskript, dat erofgelude gouf, ass ongülteg -Comment[lt]=Atsisiųstas proxy derinimo scenarijus yra blogas -Comment[mk]=Симнатата скрипта за конфигурација на прокси е навалидна -Comment[mn]=Татагдсан итгэмжилэгч тохируулгын скрипт хүчингүй -Comment[ms]=Skrip penyelarasan proksi yang dimuat turun tidak sah -Comment[nb]=Det nedlastede skriptet for mellomtjener-innstillinger er ugyldig -Comment[nds]=Dat Skript för't Instellen vun den Proxy gellt nich -Comment[ne]=डाउनलोड गरिएको प्रोक्सी कन्फिगरेसन स्क्रिप्ट अवैद्य छ -Comment[nl]=Het opgehaalde proxyconfiguratiescript is ongeldig -Comment[nn]=Det nedlasta skriptet for mellomtenaroppsett er ugyldig -Comment[pa]=ਡਾਊਨਲੋਡ ਪਰਾਕਸੀ ਸੰਰਚਨਾ ਸਕ੍ਰਿਪਟ ਜਾਇਜ਼ ਨਹੀਂ ਹੈ -Comment[pl]=Pobrany skrypt konfiguracji pośrednika jest nieprawidłowy -Comment[pt]=A configuração do 'proxy' transferida é inválida -Comment[pt_BR]=O script de configuração do proxy baixado é inválido -Comment[ro]=Scriptul de configurare "proxy" este eronat -Comment[ru]=Загруженный скрипт настройки прокси содержит ошибки -Comment[rw]=inyandikoporogaramu y'iboneza rya Nyabubasha yakuruwe ntiyemewe -Comment[se]=Viežžojuvvon gaskabálváskripta lea gustomeahttun -Comment[sk]=Stiahnutý konfiguračný skript proxy nie je správny -Comment[sl]=Naložen nastavitveni skript posrednika je neveljaven -Comment[sq]=Skripta për Konfigurimin e Proxy-t ishte e gabuar -Comment[sr]=Преузета скрипта за подешавање проксија је неисправна -Comment[sr@Latn]=Preuzeta skripta za podešavanje proksija je neispravna -Comment[sv]=Det nerladdade proxyinställningsskriptet är ogiltigt -Comment[ta]=இறக்கப்பட்ட பதிலாள் வடிவமைப்பு எழுத்தாக்கம் செல்லாது -Comment[te]=డౌన్ లోడ్ చేయబడిన్ ప్రాక్సీ రూపకరణపు స్క్రిప్ట్ చెల్లదు -Comment[tg]=Шакли дастнависи вакил кардашуда ношоям фаровир -Comment[th]=สคริปต์สำหรับการปรับแต่งพร็อกซีที่ดาวน์โหลดมาไม่ถูกต้อง -Comment[tr]=Vekil sunucu yapılandırma dosyası geçersiz -Comment[tt]=Proxy caylaw öçen iñderelgän ämerlek bozıq bulğan -Comment[uk]=Звантажений скрипт для визначення проксі сервера неправильний -Comment[uz]=Proksini moslash uchun yozib olingan skript haqiqiy emas -Comment[uz@cyrillic]=Проксини мослаш учун ёзиб олинган скрипт ҳақиқий эмас -Comment[vi]=Tập lệnh cấu hình ủy nhiệm đã được tải xuống không phải là hợp lệ. -Comment[zh_CN]=下载的代理配置脚本是无效的 -Comment[zh_HK]=剛下載的代理伺服器組態 script 語法有誤 -Comment[zh_TW]=代理組態的 script 檔案語法有誤 default_presentation=16 [download-error] Name=Script download error -Name[af]=Skrip aflaai fout -Name[ar]=خطأ أثناء تنزيل النص البرمجي -Name[az]=Skript endirmə xətası -Name[be]=Памылка сцягвання сцэнара -Name[bg]=Грешка при изтегляне на скрипта -Name[bn]=স্ক্রিপ্ট ডাউনলোডে সমস্যা -Name[br]=Fazi en ur enkargañ an urzhiaoug -Name[bs]=Greška pri downloadu skripte -Name[ca]=Error descàrrega de l'script -Name[cs]=Chyba ve stažení skriptu -Name[csb]=Fela zladënkù skriptu -Name[cy]=Gwall wrth lawrlwytho'r sgript -Name[da]=Script download-fejl -Name[de]=Fehler beim Herunterladen des Skripts -Name[el]=Σφάλμα λήψης σεναρίου -Name[eo]=Skripta ŝarĝeraro -Name[es]=Error de descarga del procedimiento -Name[et]=Viga skripti allalaadimisel -Name[eu]=Errorea script-a deskargatzean -Name[fa]=خطای بارگیری دستنوشته -Name[fi]=Skriptin latausvirhe -Name[fr]=Erreur de téléchargement du script -Name[fy]=Skript ynlaad flater -Name[ga]=Earráid íoslódála scripte -Name[gl]=Erro de descarga do guión -Name[he]=שגיאה בהורדת התסריט -Name[hi]=स्क्रिप्ट डाउनलोड त्रुटि -Name[hr]=Pogreška pri preuzimanju skripte -Name[hu]=Szkriptletöltési hiba -Name[id]=Kesalahan mengambil skrip -Name[is]=Villa við hleðslu skriftu -Name[it]=Errore di scaricamento script -Name[ja]=スクリプトのダウンロードエラー -Name[ka]=სკრიპტის ჩამოტვირთვის შეცდოამ -Name[kk]=Скриптті жүктеп алу қатесі -Name[km]=កំហុសទាញយកស្គ្រីប -Name[ko]=스크립트 내려받기 오류 -Name[lb]=Feeler beim Erofluede vum Skript -Name[lt]=scenarijaus atsisiuntimo klaida -Name[lv]=Skripta lejuplādes kļūda -Name[mk]=Грешка при симнување на скрипта -Name[mn]=Скрипт татахад алдаа -Name[ms]=Ralat muat turun skrip -Name[nb]=Skript nedlastingsfeil -Name[nds]=Skript-Daallaadfehler -Name[ne]=स्क्रिप्ट डाउनलोड त्रुटि -Name[nl]=Fout bij downloaden van script -Name[nn]=Feil ved skriptnedlasting -Name[pa]=ਸਕ੍ਰਿਪਟ ਡਾਊਨਲੋਡ ਗਲਤੀ -Name[pl]=Błąd pobierania skryptu -Name[pt]=Erro de transferência da configuração -Name[pt_BR]=Erro de download de script -Name[ro]=Eroare de transfer a scriptului -Name[ru]=Ошибка загрузки скрипта -Name[rw]=Ikosa ry'ikurura inyandikoporogaramu -Name[se]=Meattáhus skripta vieččadettiin -Name[sk]=Chyba počas sťahovania skriptu -Name[sl]=Napaka nalaganju skripta -Name[sq]=Skripta nuk pat sukses të Ngarkohet -Name[sr]=Грешка приликом преузимања скрипте -Name[sr@Latn]=Greška prilikom preuzimanja skripte -Name[sv]=Nerladdningsfel för skript -Name[ta]=எழுத்தாக்கத்தை இறக்கும்போது பிழை -Name[te]=స్క్రిప్ట్ డౌన్ లోడ్ దోషం -Name[tg]=Хатои дастнавис фаровир -Name[th]=ข้อผิดพลาดในการดาวน์โหลดสคริปต์ -Name[tr]=Betik indirme hatası -Name[tt]=Ämerlek iñderü xatarı -Name[uk]=Помилка звантаження скрипту -Name[uz]=Skriptni yozib olishda xato roʻy berdi -Name[uz@cyrillic]=Скриптни ёзиб олишда хато рўй берди -Name[vi]=Lỗi tải xuống tập lệnh -Name[zh_CN]=脚本下载错误 -Name[zh_HK]=Script 下載錯誤 -Name[zh_TW]=Script 下載錯誤 Comment=The proxy configuration script could not be downloaded -Comment[af]=Die proksie opstelling skrip kon nie afgelaai word nie -Comment[ar]=تعذر تنزيل النص البرمجي لإعداد الخادم الوكيل -Comment[az]=VƏkil qurğuları skripti endirilə bilmədi -Comment[bg]=Скриптът за настройване на прокси сървъра не може да бъде изтеглен -Comment[bn]=প্রক্সি কনফিগারেশন স্ক্রিপ্ট ডাউনলোড করা যায়নি -Comment[br]=Ne m'eus ket enkargañ urzhiaoug kefluniadur ar proksi -Comment[bs]=Nisam mogao downloadovati skriptu za podešavanje proxy-ja -Comment[ca]=L'script de configuració del servidor intermedi no es pot descarregar -Comment[cs]=Nelze stáhnout konfigurační skript pro proxy -Comment[csb]=Nie je mòżno zladowac skriptu kònfiguracëji pòstrzédnika -Comment[cy]=Y sgript ffurfweddu'r dirprwy -Comment[da]=Proxy-indstillingsscriptet kunne ikke hentes -Comment[de]=Das Proxy-Einrichtungsskript lässt sich nicht herunterladen -Comment[el]=Το σενάριο ρύθμισης διαμεσολαβητή ήταν αδύνατο να ανακτηθεί -Comment[eo]=Ne eblas ŝarĝi la prokuragordoskripton -Comment[es]=El procedimiento de configuración del proxy no se pudo descargar -Comment[et]=Proxy seadistuse skripti ei õnnestu alla laadida -Comment[eu]=Proxy-aren konfigurazioko script-a ezin izan da deskargatu -Comment[fa]=دستنوشتۀ پیکربندی پیشکار بارگیری نشد -Comment[fi]=Proxyn asetusskriptiä ei voitu ladata -Comment[fr]=Le script de configuration du serveur mandataire n'a pas pu être téléchargé -Comment[fy]=It ynladen fan de proxy ynstellings skript is net slagge -Comment[ga]=Níorbh fhéidir script chumraíochta an tseachfhreastalaí a íoslódáil -Comment[gl]=Non se pudo descarregar o guión de configuración do proxy -Comment[he]=לא יכול להוריד את תסריט הגדרות הפרוקסי -Comment[hi]=प्रॉक्सी कॉन्फ़िगरेशन स्क्रिप्ट डाउनलोड नही की जा सकी। -Comment[hr]=Skripta konfiguriranja proxyja nije mogla biti preuzetom s Interneta -Comment[hu]=A proxybeállító szkript letöltése nem sikerült -Comment[id]= Skrip konfigurasi proxy tidak dapat diunduh -Comment[is]=Gat ekki sótt stillingaskriftu milliþjóns -Comment[it]=Impossibile scaricare lo script di configurazione proxy -Comment[ja]=プロキシ設定スクリプトをダウンロードできませんでした -Comment[ka]=პროქსის გამართვის სკრიპტის ჩამოტვირთვა ვერ ხერხდება -Comment[kk]=Бұл прокси скрипт жүктеп алынбайды -Comment[km]=មិនអាចទាញយកស្គ្រីបកំណត់រចនាសម្ព័ន្ធប្រូកស៊ី -Comment[ko]=프록시 설정 스크립트를 내려받지 못합니다 -Comment[lb]=D'Proxy-Konfiguratiounsskript konnt net erofgeluede ginn -Comment[lt]=Proxy derinimo scenarijus negali būti atsisiųstas -Comment[mk]=Скриптата за конфигурација на прокси не можеше да се симне -Comment[mn]=Итгэмжилэгч тохиргооны скрипт татагдахгүй байна -Comment[ms]=Skrip penyelarasan proksi tidak boleh dimuat turun -Comment[nb]=Klarte ikke å laste ned skiptet for mellomtjener-innstillinger -Comment[nds]=Dat Skript för't Instellen vun den Proxy lett sik nich daalladen -Comment[ne]=प्रोक्सी कन्फिगरेसन स्क्रिप्ट डाउनलोड हुन सक्ने छैन -Comment[nl]=Het proxyconfiguratiescript kon niet worden opgehaald -Comment[nn]=Klarte ikkje lasta ned skript for mellomtenaroppsett -Comment[pa]=ਪਰਾਕਸੀ ਸੰਰਚਨਾ ਸਕ੍ਰਿਪਟ ਨੂੰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ -Comment[pl]=Nie można pobrać skryptu konfiguracji pośrednika -Comment[pt]=A configuração do 'proxy' não pôde ser transferida -Comment[pt_BR]=O script de configuração do proxy não pode ser carregado -Comment[ro]=Nu am putut transfera scriptul de configurare "proxy" -Comment[ru]=Не удаётся загрузить скрипт настройки прокси -Comment[rw]=Inyandikoporogaramu y'iboneza rya Nyabubasha ntiyashoboye gukururwa -Comment[se]=Ii sáhttán gaskbálváheivehanskripta viežžat -Comment[sk]=Nebolo možné stiahnúť konfiguračný skript pre proxy -Comment[sl]=Nastavitveni skript posrednika ni mogel biti naložen -Comment[sq]=Skripta për Konfigurimin e Proxy-t nuk pat sukses të ngarkohet -Comment[sr]=Скрипта за подешавање проксија не може бити преузета -Comment[sr@Latn]=Skripta za podešavanje proksija ne može biti preuzeta -Comment[sv]=Proxyinställningsskriptet kunde inte laddas ner -Comment[ta]=பதிலாள் வடிவமைப்பு எழுத்தாக்கத்தை இறக்க முடியவில்லை -Comment[te]=ప్రాక్సీ రూపకరణపు స్క్రిప్ట్ ని డౌన్ లోడ్ చేయలేకపోయాం -Comment[tg]=Шакли дастнависи вакил кардашуда фаровир наметавонад -Comment[th]=ไม่สามารถดาวน์โหลดสคริปต์สำหรับปรับแต่งพร็อกซีได้ -Comment[tr]=Vekil sunucu yapılandırma dosyası indirilemedi -Comment[tt]=Bu proxy caylaw ämerlegen iñderep bulmadı -Comment[uk]=Не вдається звантажити скрипт для визначення проксі сервера -Comment[uz]=Proksini moslash uchun skriptni yozib olib boʻlmadi -Comment[uz@cyrillic]=Проксини мослаш учун скриптни ёзиб олиб бўлмади -Comment[vi]=Không thể tải xuống tập lệnh cấu hình ủy nhiệm. -Comment[zh_CN]=代理配置脚本无法下载 -Comment[zh_HK]=無法取得代理伺服器組態 script 檔案 -Comment[zh_TW]=無法取得代理組態 script 檔案 default_presentation=16 [evaluation-error] Name=Script evaluation error -Name[af]=Skrip evaluasie fout -Name[ar]=خطأ في تقييم النص البرمجي -Name[az]=Skript icra xətası -Name[bg]=Грешка при обработка на скрипта -Name[bn]=স্ক্রিপ্ট চালানোয় সমস্যা -Name[bs]=Greška pri procjeni skripte -Name[ca]=Error en l'avaluació de l'script -Name[cs]=Chyba v analýze skriptu -Name[csb]=Fela zrëszëniô skriptu -Name[cy]=Gwall wrth werthuso'r sgript -Name[da]=Script evalueringsfejl -Name[de]=Skript-Überprüfungsfehler -Name[el]=Σφάλμα επικύρωσης σεναρίου -Name[eo]=Skripta ruleraro -Name[es]=Error de evaluación del procedimiento -Name[et]=Viga skripti käivitamisel -Name[eu]=Script-aren ebaluazioko errorea -Name[fa]=خطای ارزیابی دستنوشته -Name[fi]=Skriptin määritysvirhe -Name[fr]=Erreur d'évaluation du script -Name[fy]=Beoardiele skript flater -Name[ga]=Earráid agus an script á luacháil -Name[gl]=Erro de evaluación do guión -Name[he]=שגיאת הרצה בתסריט -Name[hi]=स्क्रिप्ट इवेल्यूएशन त्रुटि -Name[hr]=Pogreška pri procjenjivanju skripte -Name[hu]=Szkriptkiértékelési hiba -Name[id]=Kesalahan menjalankan skrip -Name[is]=Túlkunarvilla skriftu -Name[it]=Errore di valutazione script -Name[ja]=スクリプト評価エラー -Name[ka]=სკრიპტის დამუშავების შეცდომა -Name[kk]=Скрипт талдау қатесі -Name[km]=កំហុសវាយតម្លៃរបស់ស្គ្រីប -Name[ko]=스크립트 평가 오류 -Name[lb]=Feeler beim Evaluéieren vum Skript -Name[lt]=Scenarijaus analizės klaida -Name[mk]=Грешка при евалуација на скрипта -Name[mn]=Скрипт үнэлэхэд алдаа -Name[ms]=Ralat penilaian skrip -Name[nb]=Skript evalueringsfeil -Name[nds]=Skript-Pröövfehler -Name[ne]=स्क्रिप्ट मूल्यांकन त्रुटि -Name[nl]=Fout bij evalueren van script -Name[nn]=Feil ved skriptevaluering -Name[pa]=ਸਕ੍ਰਿਪਟ ਏਵੂਲੇਸ਼ਨ ਗਲਤੀ -Name[pl]=Błąd wykonywania skryptu -Name[pt]=Erro de avaliação da configuração -Name[pt_BR]=Erro de avaliação de script -Name[ro]=Eroare de analiză a scriptului -Name[ru]=Ошибка разбора скрипта -Name[rw]=Ikosa ry'isuzuma ry'inyandikoporogaramu -Name[sk]=Chyba kontroly skriptu -Name[sl]=Napaka pri ocenjevanju skripta -Name[sq]=Gabim i vlerësimit të skriptës -Name[sr]=Грешка приликом израчунавања у скрипти -Name[sr@Latn]=Greška prilikom izračunavanja u skripti -Name[sv]=Utvärderingsfel för skript -Name[ta]=எழுத்தாக்க மதிப்பீட்டுப் பிழை -Name[te]=స్క్రిప్ట్ నిర్వహణ దోషం -Name[tg]=Фикри хатои дастнавис -Name[th]=ข้อผิดพลาดในการประเมินสคริปต์ -Name[tr]=Betik çalıştırma hatası -Name[tt]=Ämerlek eçtälegen uqığanda xata çıqtı -Name[uk]=Помилка виконання скрипту -Name[uz]=Skriptni tekshirishda xato roʻy berdi -Name[uz@cyrillic]=Скриптни текширишда хато рўй берди -Name[vi]=Lỗi định lượng tập lệnh -Name[zh_CN]=脚本求值错误 -Name[zh_HK]=Script 執行錯誤 -Name[zh_TW]=Script 執行錯誤 Comment=There was an error executing the proxy configuration script -Comment[af]=Daar was 'n fout met die uitvoer van die proksie opstell skrip -Comment[ar]=لقد حصل خطأ كبير أدى الى خروج البرنامج -Comment[az]=Vəkil qurğuları skripti işə salınırkən xəta baş verdi -Comment[bg]=Грешка по време на изпълнение на скрипта за настройване на прокси сървъра -Comment[bn]=প্রক্সি কনফিগারেশন স্ক্রিপ্ট চালাতে সমস্যা দেখা দিয়েছে -Comment[br]=Degouezhet ez eus ur fazi en ur seveniñ urzhiaoug kefluniadur ar proksi -Comment[bs]=Došlo je do greške pri izvršavanju skripte za podešavanje proxy-ja -Comment[ca]=Hi ha hagut un error executant l'script de configuració del servidor intermedi -Comment[cs]=Nastala chyba při spouštění konfiguračního skriptu proxy -Comment[csb]=Pòkôza sã fela, òb czas zrëszëniô skriptu kònfigùracëji pòstrzédnika -Comment[cy]=Digwyddodd gwall wrth weithredu'r sgript ffurfweddu'r dirprwy -Comment[da]=Der opstod en fejl ved kørslen af proxy-indstillingsscriptet -Comment[de]=Fehler beim Ausführen des Proxy-Einrichtungsskripts -Comment[el]=Συνέβη ένα σφάλμα στην εκτέλεση του σεναρίου ρύθμισης διαμεσολαβητή -Comment[eo]=Okazis eraro dum rulo de la prokuragordoskripto -Comment[es]=Se produjo un error al ejecutarse el procedimiento de configuración del proxy -Comment[et]=Ilmnes tõsine viga proxy seadistuse skripti käivitamisel -Comment[eu]=Errorea gertatu da proxy-a konfiguratzeko script-ean -Comment[fa]=هنگام اجرای دستنوشتۀ پیکربندی پیشکار، خطایی وجود داشت -Comment[fi]=Proxy-skriptin suorittamisessa tapahtui virhe -Comment[fr]=Une erreur s'est produite lors de l'exécution du script de configuration du serveur mandataire -Comment[fy]=Der wie in flater by it útfoeren fan de proxy ynstellings skript -Comment[ga]=Tharla earráid agus script chumraíocht an tseachfhreastalaí á rith -Comment[gl]=Houbo un erro executando o guión de configuración do proxi -Comment[he]=אירעה שגיאה בעת הרצת תסריט הגדרות בפרוקסי -Comment[hi]=प्रॉक्सी कॉन्फ़िगरेशन स्क्रिप्ट चलाने में त्रुटि हुई -Comment[hr]=Došlo je do pogreške pri izvršavanju konfiguracijske skripte proxyja -Comment[hu]=Hiba történt a proxybeállító szkript végrehajtása közben -Comment[id]=Kesalahan sewaktu menjalankan skrip konfigurasi proxy -Comment[is]=Það kom upp villa við keyrslu stillingaskriftu milliþjóns -Comment[it]=Si è verificato un errore durante l'esecuzione dello script di configurazione proxy -Comment[ja]=プロキシ設定スクリプトの実行中にエラーが発生しました -Comment[ka]=პროქსის გამართვის სკრიპტის გამოყენების შეცდომა -Comment[kk]=Прокси баптау скриптті орындау кезінде қате пайда болды -Comment[km]=មានកំហុសមួយក្នុងការប្រតិបត្តិស្គ្រីបកំណត់រចនាសម្ព័ន្ធប្រូកស៊ី -Comment[ko]=프록시 설정 스크리트를 실행하는데 문제가 있습니다 -Comment[lb]=Et gouf e Feeler beim Ausféiere vum Proxy-Konfiguratiounsskript -Comment[lt]=Paleidžiant proxy derinimo scenarijų įvyko klaida -Comment[mk]=Имаше грешка при извршувањето на скриптата за конфигурација на прокси -Comment[mn]=итгэмжилэгч тохируулгын скрипт ажиллуулж байхад алдаа -Comment[ms]=Terdapat ralat melaksanakan skrip penyelarasan proksi -Comment[nb]=Det oppsto en alvorlig feil under kjøringen av skriptet for mellomtjener-innstillinger -Comment[nds]=Bi't Utföhren vun dat Proxy-Instellenskript hett dat en Fehler geven -Comment[ne]=प्रोक्सी कन्फिगरेसन स्क्रिप्ट कार्यान्वयन गर्दा त्रुटि थियो -Comment[nl]=Er deed zich een fout voor tijdens het uitvoeren van het proxyconfiguratiescript -Comment[nn]=Feil ved køyring av skript for mellomtenaroppsett -Comment[pa]=ਪਰਾਕਸੀ ਸੰਰਚਨਾ ਸਕ੍ਰਿਪਟ ਚਲਾਉਣ ਵਿੱਚ ਗਲਤੀ ਆਈ ਹੈ -Comment[pl]=Wystąpił błąd w czasie wykonywania skryptu konfiguracji pośrednika -Comment[pt]=Ocorreu um erro ao efectuar a configuração do 'proxy' -Comment[pt_BR]=Ocorreu um erro ao executar o script de configuração do proxy. -Comment[ro]=A apărut o eroare la execuţia scriptului de configurare "proxy" -Comment[ru]=Ошибка при выполнении скрипта настройки прокси -Comment[rw]=Habaye ikosa mu gutangiza inyandikoporogaramu y'iboneza rya Nyabubasha -Comment[se]=Meattáhus vuojedettiin gaskabálváheivehanskripta -Comment[sk]=Vyskytla sa chyba počas spustenia konfiguračného skriptu proxy -Comment[sl]=Prišlo je do napake pri izvajanju nastavitvenega skripta posrednika -Comment[sq]=Është paraqitur një gabim gjatë ekzekutimit të skriptës për konfigurimin e proxy-t -Comment[sr]=Десила се грешка приликом извршавања скрипте за подешавање проксија -Comment[sr@Latn]=Desila se greška prilikom izvršavanja skripte za podešavanje proksija -Comment[sv]=Fel uppstod vid körning av proxyinställningsskriptet -Comment[ta]=பதிலாள் வடிவமைப்பு எழுத்தாக்கத்தை செயல்படுத்தும்போது ஒரு பிழை நேர்ந்தது -Comment[te]=ప్రాక్సీ రూపకరణపు స్క్రిప్ట్ నిర్వహణలొ దోషం వున్నది -Comment[tg]=Хато фаразани дар шакли дастнависи вакил кардашуда -Comment[th]=เกิดข้อผิดพลาดในการสั่งให้สคริปต์ปรับแต่งพร็อกซีทำงาน -Comment[tr]=Vekil sunucu yapılandırma dosyası çalıştırılamadı -Comment[tt]=Proxy caylaw ämerelegen eşlätkändä xata çıqtı -Comment[uk]=Виникла помилка при спробі виконати скрипт для визначення проксі сервера -Comment[uz]=Proksini moslash uchun skriptni ishga tushirishda xato roʻy berdi -Comment[uz@cyrillic]=Проксини мослаш учун скриптни ишга туширишда хато рўй берди -Comment[vi]=Gặp lỗi khi thực hiện tập lệnh cấu hình ủy nhiệm. -Comment[zh_CN]=执行代理配置脚本出现错误 -Comment[zh_HK]=代理伺服器組態檔案執行錯誤 -Comment[zh_TW]=proxy 代理組態檔案執行錯誤 default_presentation=0 diff --git a/tdeio/misc/kpac/kpac_dhcp_helper.c b/tdeio/misc/kpac/kpac_dhcp_helper.c index 906e89dfa..710d586ed 100644 --- a/tdeio/misc/kpac/kpac_dhcp_helper.c +++ b/tdeio/misc/kpac/kpac_dhcp_helper.c @@ -224,6 +224,3 @@ int main() close(sock); exit(1); } - -/* vim: ts=4 sw=4 noet - */ diff --git a/tdeio/misc/kpac/proxyscout.cpp b/tdeio/misc/kpac/proxyscout.cpp index dfb682005..76722c8d4 100644 --- a/tdeio/misc/kpac/proxyscout.cpp +++ b/tdeio/misc/kpac/proxyscout.cpp @@ -34,7 +34,7 @@ namespace KPAC { ProxyScout::QueuedRequest::QueuedRequest( const KURL& u ) - : transaction( kapp->dcopClient()->beginTransaction() ), + : transaction( tdeApp->dcopClient()->beginTransaction() ), url( u ) { } @@ -105,8 +105,8 @@ namespace KPAC default: return false; } - connect( m_downloader, TQT_SIGNAL( result( bool ) ), - TQT_SLOT( downloadResult( bool ) ) ); + connect( m_downloader, TQ_SIGNAL( result( bool ) ), + TQ_SLOT( downloadResult( bool ) ) ); return true; } @@ -130,12 +130,12 @@ namespace KPAC for ( RequestQueue::ConstIterator it = m_requestQueue.begin(); it != m_requestQueue.end(); ++it ) { - TQCString type = TQSTRING_OBJECT_NAME_STRING; + TQCString type = "TQString"; TQByteArray data; TQDataStream ds( data, IO_WriteOnly ); if ( success ) ds << handleRequest( ( *it ).url ); else ds << TQString( "DIRECT" ); - kapp->dcopClient()->endTransaction( ( *it ).transaction, type, data ); + tdeApp->dcopClient()->endTransaction( ( *it ).transaction, type, data ); } m_requestQueue.clear(); m_downloader->deleteLater(); @@ -187,10 +187,8 @@ namespace KPAC return "DIRECT"; } - extern "C" KDE_EXPORT KDEDModule* create_proxyscout( const TQCString& name ) + extern "C" TDE_EXPORT KDEDModule* create_proxyscout( const TQCString& name ) { return new ProxyScout( name ); } } - -// vim: ts=4 sw=4 et diff --git a/tdeio/misc/kpac/proxyscout.desktop b/tdeio/misc/kpac/proxyscout.desktop index 8dfa62c14..0563bead6 100644 --- a/tdeio/misc/kpac/proxyscout.desktop +++ b/tdeio/misc/kpac/proxyscout.desktop @@ -1,128 +1,7 @@ [Desktop Entry] Type=Service Name=Proxy Scout -Name[af]=Proksie Verkenner -Name[az]=Vəkil Skout -Name[bg]=Проучване на прокси сървъри -Name[bn]=প্রক্সি স্কাউট -Name[ca]=Explorador del servidor intermedi -Name[cs]=Proxy vyhledávač -Name[csb]=Pòstrzédnik (proxy) -Name[cy]=Arweinydd Dirprwy -Name[de]=Automatische Proxy-Einrichtung -Name[el]=Διαμεσολαβητής Scout -Name[eo]=Prokurilo -Name[es]=Explorador del proxy -Name[fa]=پیشکار Scout -Name[fi]=Proxy-tiedustelija -Name[fy]=Proxy ferkenner -Name[gl]=Proxy Explorador -Name[he]=מחפש שרתי Proxy -Name[hi]= प्रॉक्सी स्काउट -Name[hr]=Proxy izvidnik -Name[is]=Milliþjóns leitari -Name[it]=Esploratore proxy -Name[ja]=プロキシを探す -Name[ka]=პროქსის თვითგამართვა -Name[kk]=Проксиді автобапату -Name[ko]=프록시 찾기 -Name[lb]=Proxy-Scout -Name[lt]=Proxy paieška -Name[mk]=Прокси скаут -Name[mn]=Итгэмжилэгчийн зам хайгч -Name[ms]=Scout Proksi -Name[nb]=Mellomtjenerspeiding -Name[ne]=प्रोक्सी स्काउट -Name[nn]=Mellomtenarspeiding -Name[pa]=ਪਰਾਕਸੀ ਸਕਾਊਟ -Name[pl]=Pośrednik (proxy) -Name[pt]=Escuteiro do 'Proxy' -Name[pt_BR]=Saída do Proxy -Name[ru]=Автонастройка прокси -Name[rw]=Igifasha Nyabubasha -Name[se]=Gaskabálvaohci -Name[sk]=Prieskumník proxy -Name[sr]=Прокси извиђач -Name[sr@Latn]=Proksi izviđač -Name[sv]=Proxy-scout -Name[ta]=பதிலாள் தேடு -Name[te]=ప్రాక్సీ వేగు -Name[tg]=Разведкачӣ Вакил Кардашуда -Name[tr]=Vekil Sunucu -Name[tt]=Proxy Saqçısı -Name[uk]=Розвідник проксі сервера -Name[uz]=Proksi skaut -Name[uz@cyrillic]=Прокси скаут -Name[zh_CN]=代理搜索 Comment=Automatic proxy configuration -Comment[af]=Outomatiese proksie opstelling -Comment[bg]=Автоматично настройване на прокси сървъра -Comment[bn]=স্বয়ংক্রিয় প্রক্সি কনফিগারেশন -Comment[br]=Kefluniadur emgefreekh ar proksi -Comment[bs]=Automatsko podešavanje proxy-ja -Comment[ca]=Configuració automàtica de l'intermediari -Comment[cs]=Automatické nastavení proxy -Comment[csb]=Aòtokònfigùracëjô pòstrzédnika -Comment[cy]=Ffurweddiad Awtomatig o'r Dirprwy -Comment[da]=Automatisk proxy-indstilling -Comment[de]=Sucht nach einem Proxy-Server und richtet ihn ein -Comment[el]=Αυτόματη ρύθμιση διαμεσολαβητή -Comment[eo]=Aŭtomata Prokuragordo -Comment[es]=Configuración automática del Proxy -Comment[et]=Automaatne proxy konfigureerimine -Comment[eu]=Proxy-aren konfigurazio automatikoa -Comment[fa]=پیکربندی خودکار پیشکار -Comment[fi]=Automaattiset proxy-asetukset -Comment[fr]=Configuration automatique du serveur mandataire -Comment[fy]=Automatyske proxy ynstelling -Comment[ga]=Uathchumraíocht an tseachfhreastalaí -Comment[gl]=Configuración Automática do Proxi -Comment[he]=הגדרות מתווך אוטומטיות -Comment[hi]=स्वचालित प्रॉक्सी कॉन्फ़िगरेशन -Comment[hr]=Automatsko konfiguriranje proxyja -Comment[hu]=Automatikus proxybeállítás -Comment[id]=Konfigurasi proxi otomatis -Comment[is]=Sjálfvirkar stillingar milliþjóns -Comment[it]=Configurazione automatica proxy -Comment[ja]=自動プロキシ設定 -Comment[ka]=პროქსის თვითგამართვა -Comment[kk]=Проксиді автоматты түрде бапату -Comment[km]=ការកំណត់រចនាសម្ព័ន្ធប្រូកស៊ីដោយស្វ័យប្រវត្តិ -Comment[lb]=Automatesch Proxy-Configuratioun -Comment[lt]=Automatinis proxy derinimas -Comment[mk]=Автоматска конфигурација на прокси -Comment[ms]=Penyelarasan Proksi Automatik -Comment[nb]=Automatisk mellomtjeneroppsett -Comment[nds]=Proxy automaatsch instellen -Comment[ne]=स्वचालित प्रोक्सी कन्फिगरेसन -Comment[nl]=Automatische proxyconfiguratie -Comment[nn]=Automatisk mellomtenaroppsett -Comment[pa]=ਸਵੈ-ਚਾਲਿਤ ਪਰਾਕਸੀ ਸੰਰਚਨਾ -Comment[pl]=Autokonfiguracja pośrednika -Comment[pt]=Configuração automática de 'proxy' -Comment[pt_BR]=Configuração automática do proxy -Comment[ro]=Configurare automată pentru proxy -Comment[ru]=Автонастройка прокси-сервера -Comment[rw]=Iboneza rya Nyabubasha Yikoresha -Comment[se]=Automáhtalaš gaskabálváheiveheapmi -Comment[sk]=Automatická konfigurácia proxy -Comment[sl]=Samodejne nastavitve posrednika -Comment[sr]=Аутоматско подешавање проксија -Comment[sr@Latn]=Automatsko podešavanje proksija -Comment[sv]=Automatisk proxyinställning -Comment[ta]=தானியக்க பதிலாள் வடிவமைப்பு -Comment[te]=స్వయంచాలక ప్రాక్సీ రూపకరణం -Comment[tg]=Танзими прокси бо автоматикӣ -Comment[th]=การปรับแต่งพร็อกซีอัตโนมัติ -Comment[tr]=Otomatik vekil sunucu yapılandırması -Comment[tt]=Proxy'nıñ üzzihenle caylanu -Comment[uk]=Автоматичне визначення проксі сервера -Comment[uz]=Proksini avtomatik ravishda moslash -Comment[uz@cyrillic]=Проксини автоматик равишда мослаш -Comment[vi]=Cấu hình ủy nhiệm tự động. -Comment[zh_CN]=自动代理配置 -Comment[zh_HK]=自動代理伺服器組態 -Comment[zh_TW]=自動代理組態 X-TDE-ServiceTypes=KDEDModule X-TDE-ModuleType=Library X-TDE-Library=proxyscout diff --git a/tdeio/misc/kpac/proxyscout.h b/tdeio/misc/kpac/proxyscout.h index 78c8fc237..524ee5f43 100644 --- a/tdeio/misc/kpac/proxyscout.h +++ b/tdeio/misc/kpac/proxyscout.h @@ -38,7 +38,7 @@ namespace KPAC class ProxyScout : public KDEDModule { - Q_OBJECT + TQ_OBJECT K_DCOP public: ProxyScout( const TQCString& ); @@ -78,5 +78,3 @@ namespace KPAC } #endif // KPAC_PROXYSCOUT_H - -// vim: ts=4 sw=4 et diff --git a/tdeio/misc/kpac/script.cpp b/tdeio/misc/kpac/script.cpp index fa1201382..6891d37a7 100644 --- a/tdeio/misc/kpac/script.cpp +++ b/tdeio/misc/kpac/script.cpp @@ -447,11 +447,11 @@ namespace KPAC throw Error( "No such function FindProxyForURL" ); KURL cleanUrl = url; - cleanUrl.setPass(QString()); - cleanUrl.setUser(QString()); + cleanUrl.setPass(TQString()); + cleanUrl.setUser(TQString()); if (cleanUrl.protocol().lower() == "https") { - cleanUrl.setPath(QString()); - cleanUrl.setQuery(QString()); + cleanUrl.setPath(TQString()); + cleanUrl.setQuery(TQString()); } Object thisObj; @@ -469,5 +469,3 @@ namespace KPAC return retval.toString( exec ).qstring(); } } - -// vim: ts=4 sw=4 et diff --git a/tdeio/misc/kpac/script.h b/tdeio/misc/kpac/script.h index 49ba0b6a3..a9c1113d1 100644 --- a/tdeio/misc/kpac/script.h +++ b/tdeio/misc/kpac/script.h @@ -52,5 +52,3 @@ namespace KPAC } #endif // KPAC_SCRIPT_H - -// vim: ts=4 sw=4 et diff --git a/tdeio/misc/kssld/CMakeLists.txt b/tdeio/misc/kssld/CMakeLists.txt index 813ce44f0..cb2c98c42 100644 --- a/tdeio/misc/kssld/CMakeLists.txt +++ b/tdeio/misc/kssld/CMakeLists.txt @@ -28,7 +28,11 @@ link_directories( ##### other data ################################ -install(FILES kssld.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) +tde_create_translated_desktop( + SOURCE kssld.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/kded + PO_DIR tdeio-desktops +) ##### kded_kssld ########################### @@ -42,6 +46,5 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} LINK tdeinit_kded-shared - DEPENDENCIES dcopidl DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/tdeio/misc/kssld/kssld.cpp b/tdeio/misc/kssld/kssld.cpp index a376ebfac..bf377aec3 100644 --- a/tdeio/misc/kssld/kssld.cpp +++ b/tdeio/misc/kssld/kssld.cpp @@ -28,7 +28,7 @@ #include "kssld.h" #include <tdeconfig.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <ksslcertchain.h> #include <ksslcertificate.h> #include <ksslcertificatehome.h> @@ -41,9 +41,8 @@ #include <pwd.h> #include <unistd.h> #include <tqfile.h> -#include <tqsortedlist.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tqdatetime.h> @@ -53,11 +52,11 @@ // See design notes at end extern "C" { - KDE_EXPORT KDEDModule *create_kssld(const TQCString &name) { + TDE_EXPORT KDEDModule *create_kssld(const TQCString &name) { return new KSSLD(name); } - KDE_EXPORT void *__kde_do_unload; + TDE_EXPORT void *__kde_do_unload; } @@ -115,7 +114,7 @@ static void updatePoliciesConfig(TDEConfig *cfg) { KSSLD::KSSLD(const TQCString &name) : KDEDModule(name) { // ----------------------- FOR THE CACHE ------------------------------------ - cfg = new KSimpleConfig("ksslpolicies", false); + cfg = new TDESimpleConfig("ksslpolicies", false); cfg->setGroup("General"); if (2 != cfg->readNumEntry("policies version", 0)) { ::updatePoliciesConfig(cfg); @@ -168,7 +167,7 @@ KSSLCNode *node; for (node = certList.first(); node; node = certList.next()) { // First convert to a binary format and then write the // tdeconfig entry write the (CN, policy, cert) to - // KSimpleConfig + // TDESimpleConfig cfg->setGroup(node->cert->getMD5Digest()); cfg->writeEntry("Certificate", node->cert->toString()); cfg->writeEntry("Policy", node->policy); @@ -206,7 +205,7 @@ KSSLCNode *node; void KSSLD::cacheReload() { cacheClearList(); delete cfg; - cfg = new KSimpleConfig("ksslpolicies", false); + cfg = new TDESimpleConfig("ksslpolicies", false); cacheLoadDefaultPolicies(); } @@ -287,7 +286,7 @@ KSSLCNode *node; if ( !node->permanent ) { node->expires = TQDateTime::currentDateTime(); // FIXME: make this configurable - node->expires = TQT_TQDATETIME_OBJECT(node->expires.addSecs(5)); + node->expires = node->expires.addSecs(5); } else { node->expires = node->cert->getQDTNotAfter(); // set to certs expiry date } @@ -310,7 +309,7 @@ KSSLCNode *node; if (!permanent) { n->expires = TQDateTime::currentDateTime(); - n->expires = TQT_TQDATETIME_OBJECT(n->expires.addSecs(5)); + n->expires = n->expires.addSecs(5); } else { if ( !n->expires.isValid() ) n->expires = n->cert->getQDTNotAfter(); // set to certs expiry date diff --git a/tdeio/misc/kssld/kssld.desktop b/tdeio/misc/kssld/kssld.desktop index 0930930c9..de2f189dc 100644 --- a/tdeio/misc/kssld/kssld.desktop +++ b/tdeio/misc/kssld/kssld.desktop @@ -7,150 +7,4 @@ X-TDE-FactoryName=kssld X-TDE-Kded-autoload=false X-TDE-Kded-load-on-demand=true Name=KSSL Daemon Module -Name[af]=Kssl Bediener Module -Name[ar]=وحدة مراقب KSSL -Name[az]=KSSL Demon Modulu -Name[be]=Модуль сервіса KSSL -Name[bg]=Демон KSSL -Name[bn]=KSSL ডিমন মডিউল -Name[br]=Mollad an diaoul KSSL -Name[ca]=Mòdul del dimoni KSSL -Name[cs]=Modul démona KSSL -Name[csb]=KSSL -Name[cy]=Modiwl Daemon KSSL -Name[da]=KSSL Dæmonmodul -Name[de]=SSL-Dienst -Name[el]=Άρθρωμα δαίμονα KSSL -Name[eo]=SSL-demono-modulo -Name[es]=Módulo de demonio KSSL -Name[et]=KSSL deemoni moodul -Name[eu]=KSSL daemon modulua -Name[fa]=پیمانۀ شبح KSSL -Name[fi]=KSSL-palvelinmoduuli -Name[fr]=Module démon KSSL -Name[ga]=Modúl Deamhain KSSL -Name[gl]=Módulo do Demo KSSL -Name[he]=מודול תהליך הרקע של SSL -Name[hi]=KSSL ङेमन घटक -Name[hr]=Modul KSSL demona -Name[hu]=KSSL szolgáltatásmodul -Name[id]=Modul Daemon KSSL -Name[is]=KSSL þjónseining -Name[it]=Modulo demone KSSL -Name[ja]=KSSL デーモンモジュール -Name[ka]=KSSL გუშაგის მოდული -Name[kk]=KSSL қызметтің модулі -Name[km]=ម៉ូឌុល Daemon KSSL -Name[ko]=KSSL 데몬 모듈 -Name[lb]=KSSL-Dämonmodul -Name[lt]=KSSL tarnybos modulis -Name[lv]=KSSL Dēmona Modulis -Name[mn]=KSSL Daemon Modul -Name[ms]=Modul Daemon KSSL -Name[mt]=Modulu daemon KSSL -Name[nb]=KSSL nisse-modul -Name[nds]=KSSL-Dämoon -Name[ne]=KSSL डेइमन मोड्युल -Name[nl]=KSSL daemon-module -Name[nn]=KSSL-nissemodul -Name[nso]=Seripa sa Daemon ya KSSL -Name[pa]=KSSL ਡਾਇਮੋਨ ਮੈਡੀਊਲ -Name[pl]=KSSL -Name[pt]=Módulo do Servidor de KSSL -Name[pt_BR]=Módulo do Serviço do KSSL -Name[ro]=Modul demon KSSL -Name[ru]=Служба KSSL -Name[rw]=Igice Dayimoni KSSL -Name[se]=KSSL-bálvámoduvla -Name[sk]=Modul démona KSSL -Name[sl]=Strežniški modul KSSL -Name[sq]=Demoni për Modulin KSSL -Name[sr]=KSSL демон модул -Name[sr@Latn]=KSSL demon modul -Name[sv]=KSSL-demonmodul -Name[ta]=KSSL டெமான் பகுதி -Name[te]=కెఎస్ ఎస్ ఎల్ సూత్రధారి మాడ్యూల్ -Name[tg]=Модули Демон KSSL -Name[th]=โมดูลเดมอน KSSL -Name[tr]=KSSL Program Modülü -Name[tt]=KSSL Xezmäteneñ Modulı -Name[uk]=Модуль демону KSSL -Name[uz]=KSSL xizmatining moduli -Name[uz@cyrillic]=KSSL хизматининг модули -Name[ven]=Modulu wa Daemon wa KSSL -Name[vi]=Mô-đun trình nền KSSL -Name[xh]=Isicatshulwa se KSSL Daemon -Name[zh_CN]=KSSL 守护进程模块 -Name[zh_HK]=KSSL 伺服程式模組 -Name[zh_TW]=KSSL 伺服程式模組 -Name[zu]=Ingxenye ye-daemon ye-KSSL Comment=KSSL daemon module for KDED -Comment[af]=KSSL bediener module vir KDED -Comment[be]=Модуль сервіса KSSL для KDED -Comment[bg]=Модул демон за KSSL за KDED -Comment[bn]=KDED-র জন্য KSSL ডিমন মডিউল -Comment[br]=Mollad an diaoul KSSL evit KDED -Comment[bs]=KSSL Daemon Module za KDED -Comment[ca]=Mòdul del dimoni KSSL per a KDED -Comment[cs]=Modul démona KSSL pro KDED -Comment[csb]=Ùsłëżnota SSL w KDED -Comment[da]=KSSL Dæmonmodul for KDED -Comment[de]=Unterstützung für SSL-Verschlüsselung in KDED -Comment[el]=Άρθρωμα δαίμονα KSSL για το KDED -Comment[eo]=SSL-demono-modulo por KDED -Comment[es]=Módulo de demonio KSSL para KDED -Comment[et]=KDED KSSL deemoni moodul -Comment[eu]=KSSL daemon modulua KDEDrako -Comment[fa]=پیمانۀ شبح KSSL برای KDED -Comment[fi]=KSSL-palvelinmoduuli KDED:lle -Comment[fr]=Module démon KSSL pour KDED -Comment[fy]=KSSL daemon module foar KDED -Comment[ga]=Modúl deamhain KSSL le haghaidh KDED -Comment[gl]=Módulo do Demo KSSL para KDED -Comment[he]=מודול תהליך רקע של SSL עבור KDED -Comment[hi]=केडीईडी के लिए केएसएसएल डेमन मॉड्यूल -Comment[hr]=KSSL demon modul za KDED -Comment[hu]=KSSL szolgáltatásmodul a KDED-hez -Comment[id]=Modul daemon KSSL untuk KDED -Comment[is]=KSSL þjónseining fyrir KDED -Comment[it]=Modulo demone KSSL per KDED -Comment[ja]=KDED 用 の KSSL デーモンモジュール -Comment[ka]=KSSL გუშაგის მოდული KDED-სთვის -Comment[kk]=KDED KSSL куәліктерді басқару қызметтің модулі -Comment[km]=ម៉ូឌុល daemon KSSL សម្រាប់ KDED -Comment[lb]=KSSL-Dämonmodul fir KDED -Comment[lt]=KSSL tarnybos modulis, skirtas KDED -Comment[lv]=KSSL Dēmona Modulis priekš KDED -Comment[mk]=KSSL даемон модул за KDED -Comment[ms]=Modul Daemon KSSL untuk KDED -Comment[nb]=KSSL nissemodul for KDED -Comment[nds]=KSSL-Dämoonmoduul för KDED -Comment[ne]=KDED का लागि डेइमन मोड्युल KSSL -Comment[nl]=KSSL daemon-module voor KDED -Comment[nn]=KSSL-nissemodul for KDED -Comment[pa]=KDED ਲਈ KSSL ਪੇਸ਼ਕਾਰੀ -Comment[pl]=Obsługa SSL w KDED -Comment[pt]=Módulo servidor de KSSL para o KDED -Comment[pt_BR]=Módulo de serviço KSSL para o KDED -Comment[ro]=Modul demon KSSL pentru KDED -Comment[ru]=Управление сертификатами SSL -Comment[rw]=Igice cya dayimoni KSSL cya KDED -Comment[se]=KDED:a KSSL-bálvámoduvla -Comment[sk]=Modul démona KSSL pre KDED -Comment[sl]=Strežniški modul KSSL za KDED -Comment[sr]=KSSL демон модул за KDED -Comment[sr@Latn]=KSSL demon modul za KDED -Comment[sv]=KSSL-demonmodul för KDED -Comment[ta]=KDEDக்கான KSSL டெமான் பகுதி -Comment[te]=కెడిఈడి కొరకు కెఎస్ ఎస్ ఎల్ సూత్రధారి మాడ్యూల్ -Comment[tg]=Модули Демон KSSL брои KDED -Comment[th]=โมดูลเดมอน KSSL สำหรับ KDED -Comment[tr]=KDED için KSSL program biirmi -Comment[tt]=KDED öçen KSSL xezmät -Comment[uk]=Модуль демону KSSL для KDED -Comment[uz]=KDED uchun KSSL xizmatining moduli -Comment[uz@cyrillic]=KDED учун KSSL хизматининг модули -Comment[vi]=Mô-đun trình nền KSSL cho KDED. -Comment[zh_CN]=KDED 的 KSSL 守护进程模块 -Comment[zh_HK]=KDED 使用的 SSL 伺服程式模組 -Comment[zh_TW]=KDED 使用的 KSSL 伺服程式模組 diff --git a/tdeio/misc/kssld/kssld.h b/tdeio/misc/kssld/kssld.h index 028a30809..981ed7ad6 100644 --- a/tdeio/misc/kssld/kssld.h +++ b/tdeio/misc/kssld/kssld.h @@ -32,13 +32,13 @@ #include <tqptrvector.h> -class KSimpleConfig; +class TDESimpleConfig; class KSSLCNode; class KOpenSSLProxy; class KSSLD : public KDEDModule { - Q_OBJECT + TQ_OBJECT K_DCOP public: @@ -136,7 +136,7 @@ private: void cacheLoadDefaultPolicies(); // for the cache portion: - KSimpleConfig *cfg; + TDESimpleConfig *cfg; TQPtrList<KSSLCNode> certList; // Our pointer to OpenSSL diff --git a/tdeio/misc/mms.protocol b/tdeio/misc/mms.protocol index 065172c08..37f865554 100644 --- a/tdeio/misc/mms.protocol +++ b/tdeio/misc/mms.protocol @@ -9,66 +9,5 @@ reading=false Icon=www Class=:internet Description=Microsoft Media Server Protocol -Description[af]=Microsoft Media Bediener Protokol -Description[be]=Пратакол Microsoft Media Server -Description[bn]=মাইক্রোসফ্ট মিডিয়া সার্ভার প্রোটোকল -Description[bs]=Microsoft Media Server protokol -Description[ca]=Protocol Microsoft Media Server -Description[cs]=Microsoft Media Server protokol -Description[csb]=Protokól Microsoft Media Server -Description[da]=Microsoft Medieserver-protokol -Description[de]=Microsoft Media Server Protokoll -Description[el]=Πρωτόκολλο Microsoft Media Server -Description[es]=Protocolo Microsoft Media Server -Description[et]=Microsoft Media Server protokoll -Description[eu]=Microsoft Media Server protokoloa -Description[fa]=قرارداد کارساز رسانۀ میکروسافت -Description[fi]=Microsoft Media -palvelinprotokolla -Description[fr]=Protocole Microsoft Media Server -Description[gl]=Protocolo Microsoft Media Server -Description[he]=שרת פרוטוקול של מדייה של מיקרוספט -Description[hi]=माइक्रोसॉफ़्ट मीडिया सर्वर प्रोटोकॉल -Description[hr]=Protokol Microsoft Media poslužitelja -Description[hu]=MMS protokoll -Description[id]=Protokol Server Microsoft Media -Description[is]=Microsoft Media Server samskiptaregla -Description[it]=Protocollo Microsoft Media Server -Description[ja]=Microsoft メディアサーバプロトコル -Description[ka]=Microsoft Media Server პროტოკოლი -Description[kk]=Microsoft Media Server протоколы -Description[km]=ពិធីការម៉ាស៊ីនបម្រី Microsoft Media -Description[lb]=Microsoft-Media Server-Protokoll -Description[lt]=Microsoft media serverio protokolas -Description[lv]=Microsoft Media Server protokols -Description[mk]=Microsoft Media Server-протокол -Description[ms]=Protokol Pelayan Media Microsoft -Description[nds]=Microsoft-Medienserverprotokoll -Description[ne]=माइक्रोसफ्ट मिडिया सर्भर प्रोटोकल -Description[nl]=Microsoft Media Server-protocol -Description[nn]=Microsoft Media Server-protokoll -Description[pa]=Microsoft Media ਸਰਵਰ ਪ੍ਰੋਟੋਕਾਲ -Description[pl]=Protokół Microsoft Media Server -Description[pt]=Protocolo Microsoft Media Server -Description[pt_BR]=Protocolo do Microsoft Media Server -Description[ro]=Protocol Microsoft Media Server -Description[ru]=Протокол Microsoft Media Server -Description[rw]=Porotokole Igihuza Seriveri ya Microsoft -Description[se]=Microsoft Media Server-protokolla -Description[sk]=Protokol pre Microsoft Media Server -Description[sl]=Protokol Microsoft Media Server -Description[sr]=Microsoft Media Server протокол -Description[sr@Latn]=Microsoft Media Server protokol -Description[sv]=Microsoft mediaserver-protokoll -Description[ta]=மைக்ரோசாப்ட் ஊடக சேவக நெறிமுறை -Description[te]=మైక్రొసాఫ్ట్ మీడియా సెర్వర్ ప్రొటొకాల్ -Description[tg]=Протоколи медиа сервер барои Microsoft -Description[th]=โปรโตคอลสำหรับเซิรฟเวอร์จัดการสื่อของไมโครซอฟต์ (MMS) -Description[tr]=Microsoft Media Server Protokolü -Description[tt]=Microsoft Media Server Protokolı -Description[uk]=Протокол медіа сервера Microsoft -Description[vi]=Giao thức trình phục vụ phương tiện Microsoft™. -Description[zh_CN]=Microsoft 媒体服务器协议 -Description[zh_HK]=Microsoft Media Server 協定 -Description[zh_TW]=Microsoft Media Server 協定 URIMode=url X-DocPath=tdeioslave/mms/index.html diff --git a/tdeio/misc/tdeio_uiserver.desktop b/tdeio/misc/tdeio_uiserver.desktop index 21c14931d..b1b34b41a 100644 --- a/tdeio/misc/tdeio_uiserver.desktop +++ b/tdeio/misc/tdeio_uiserver.desktop @@ -1,99 +1,8 @@ [Desktop Entry] Type=Service -Name=tdeio_uiserver -Name[de]=Server der graphischen Oberfläche -Name[fy]=Kio_uiserver -Name[ja]=tdeio_uiサーバ -Name[mn]=График гадаргуугийн сервер -Name[nds]=tdeio_uiserver, Server för de graafsche Böversiet -Name[nl]=Kio_uiserver -Name[nso]=tdeio_uiseabi -Name[ro]=Kio_uiserver -Name[sv]=Kio-gränssnittsserver -Name[ta]=tdeio_uiசேவையகம் -Name[te]=కేఐఓ_యుఐసెర్వర్ Exec=tdeio_uiserver +Name=tdeio_uiserver Comment=TDE's Progress Info UI server -Comment[af]=TDE se vordering inligting UI bediener -Comment[ar]=خادم معلومات تقدم واجهة كيدي -Comment[az]=TDE'nin İrəliləmə Bilgisi İstifadaçi Ara Üz Vericisi -Comment[be]=Сервер паведамленняў аб выкананні дзеянняў -Comment[bg]=Сървър за отчитане на прогреса (TDE's Progress Info UI server) -Comment[bn]=কে.ডি.ই. অগ্রগতি তথ্য UI সার্ভার -Comment[br]=Servijer stlenn EA Progress TDE -Comment[bs]=TDEov Progess Info UI server -Comment[ca]=Servidor d'informació de progrés del TDE -Comment[cs]=UI server zobrazující informace o průběhu -Comment[csb]=Serwer wëdowiédzë ò pòkròkù procesë -Comment[cy]=Gweinydd UI TDE i Ddangos Cynnydd -Comment[da]=TDE's fremgangsinfo-UI-server -Comment[de]=Ein UI-Server, der Fortschrittsinformationen darstellt -Comment[el]=Εξυπηρετητής πληροφοριών προόδου περιβάλλοντος χρήσης του TDE -Comment[eo]=Progresinforma servo -Comment[es]=Servidor UI de información de progreso de TDE -Comment[et]=TDE edenemise info UI server -Comment[eu]=TDEren aurrerapen-informazioen UI zerbitzaria -Comment[fa]=اطلاعات پیشرفت کارساز UI TDE -Comment[fi]=TDE:n edistymispalkin käyttöliittymäpalvelin -Comment[fr]=Serveur graphique d'infos de progression de TDE -Comment[fy]=TDE's tsjinner foar ynformaasje oer de fuortgong -Comment[gl]=Servidor UI de Información de Progreso de TDE -Comment[he]=שרת ממשק מידע ההתקדמות של TDE -Comment[hi]=केडीई का प्रोग्रेस जानकारी UI सर्वर -Comment[hr]=TDEov Progess Info UI poslužitelj -Comment[hu]=TDE folyamatinformációs kiszolgáló -Comment[id]=Perkembangan TDE mengenai info server UI -Comment[is]=Þjónn sem sýnir framvindu ferla -Comment[it]=Server informazioni avanzamento di TDE -Comment[ja]=TDE 進捗情報 UI サーバ -Comment[ka]=TDE-ს მონაცემთა გადაცემის სერვერი -Comment[kk]=TDE деректерді алу-беруді бақылау сервері -Comment[km]=ម៉ាស៊ីនបម្រើ UI នៃព័ត៌មានវឌ្ឍនភាពរបស់ TDE -Comment[ko]=TDE에서 보다 발전된 정보 UI 서버 -Comment[lb]=UI-Server vu TDE, dee Fortschrëttsinformatiounen uweist -Comment[lt]=TDE eigos informacijos UI serveris -Comment[lv]=TDE Progresa Info UI serveris -Comment[mk]=TDE сервер за информации за прогресот -Comment[mn]=Прогресс мэдээллээр дүрслэгдсэн хэрэглэгчийн харьцах хэсгийн сервер -Comment[ms]=Pelayan Info UI TDE -Comment[mt]=Server tal-progress tal-UI TDE -Comment[nb]=TDE UI-tjener for framgangsinfo -Comment[nds]=Server för graafsche Vörankamen-Informatschonen -Comment[ne]=TDE को प्रगति सूचना UI सर्भर -Comment[nl]=TDE's server voor informatie over de voortgang. -Comment[nn]=TDE UI-tenar for framgangsinfo -Comment[nso]=Seabi sa UI ya Tshedimoso ya Tswelopele ya TDE -Comment[oc]=Servor d'informacion de progress TDE -Comment[pa]=TDE ਦੀ ਤਰੱਕੀ ਜਾਣਕਾਰੀ UI ਸਰਵਰ -Comment[pl]=Serwer informacji o postępie procesu -Comment[pt]=Servidor de informações sobre o progresso das operações -Comment[pt_BR]=Servidor de informação de progresso do TDE -Comment[ro]=Server informaţii de progres TDE -Comment[ru]=Сервер монитора передачи данных TDE -Comment[rw]=Amakuru y'Aho bigeze ya TDE Seriveri UI -Comment[se]=TDE:a ovdánandieđuid UI-bálvá -Comment[sk]=TDE Progres Info UI server -Comment[sl]=Strežnik TDE's Progress Info UI -Comment[sq]=UI Shërbyesi për Informimin e Progresit të TDEs -Comment[sr]=TDE-ов UI сервер информација о напретку -Comment[sr@Latn]=TDE-ov UI server informacija o napretku -Comment[sv]=TDE:s server för förloppsinformation -Comment[ta]=கேடிஇயின் முன்னேற்ற தகவல் முகப்புப் சேவையகம் -Comment[te]=కెడిఈ యొక్క ప్రగతి సమాచార యూఐ సెర్వర్ -Comment[tg]=Инкишофи TDE's Info UI Сервер -Comment[th]=เซิร์ฟเวอร์แสดงข้อมูลความคืบหน้าของ TDE -Comment[tr]=TDE'nin İlerleme Bilgisi arayüz sunucusu -Comment[tt]=TDE'nıñ Alğakiteşne Küzätü servere -Comment[uk]=Сервер графічного інтерфейсу інформації про розвиток TDE -Comment[uz]=TDE'ning maʼlumot uzatishni nazorat qilish serveri -Comment[uz@cyrillic]=TDE'нинг маълумот узатишни назорат қилиш сервери -Comment[ven]=UI siva ya mafhungo a mwelaphanda a TDE -Comment[vi]=Trình phục vụ giao diện người dùng cho thông tin tiến hành của TDE. -Comment[xh]=Umcedisi we UI Wenqubela Yenkcukacha we TDE -Comment[zh_CN]=TDE 的进度信息用户界面服务器 -Comment[zh_HK]=TDE 的進度資訊介面伺服程式 -Comment[zh_TW]=TDE 的進度資訊使用者介面伺服器 -Comment[zu]=Umlekeleli we-UI Yolwazi Lwenqubo lwe-TDE X-TDE-ServiceTypes= # It is a server X-DCOP-ServiceType=Unique diff --git a/tdeio/misc/tdesendbugmail/main.cpp b/tdeio/misc/tdesendbugmail/main.cpp index bf3099094..d1e8ae483 100644 --- a/tdeio/misc/tdesendbugmail/main.cpp +++ b/tdeio/misc/tdesendbugmail/main.cpp @@ -122,8 +122,8 @@ int main(int argc, char **argv) { SMTP *sm = new SMTP; BugMailer bm(sm); - TQObject::connect(sm, TQT_SIGNAL(messageSent()), &bm, TQT_SLOT(slotSend())); - TQObject::connect(sm, TQT_SIGNAL(error(int)), &bm, TQT_SLOT(slotError(int))); + TQObject::connect(sm, TQ_SIGNAL(messageSent()), &bm, TQ_SLOT(slotSend())); + TQObject::connect(sm, TQ_SIGNAL(error(int)), &bm, TQ_SLOT(slotError(int))); sm->setServerHost(server); sm->setPort(25); sm->setSenderAddress(fromaddr); diff --git a/tdeio/misc/tdesendbugmail/main.h b/tdeio/misc/tdesendbugmail/main.h index 39d424bef..f06088694 100644 --- a/tdeio/misc/tdesendbugmail/main.h +++ b/tdeio/misc/tdesendbugmail/main.h @@ -6,7 +6,7 @@ class SMTP; class BugMailer : public TQObject { - Q_OBJECT + TQ_OBJECT public: BugMailer(SMTP* s) : TQObject(0, "mailer"), sm(s) {} diff --git a/tdeio/misc/tdesendbugmail/smtp.cpp b/tdeio/misc/tdesendbugmail/smtp.cpp index 470f24050..ae507e76a 100644 --- a/tdeio/misc/tdesendbugmail/smtp.cpp +++ b/tdeio/misc/tdesendbugmail/smtp.cpp @@ -38,12 +38,12 @@ SMTP::SMTP(char *serverhost, unsigned short int port, int timeout) kdDebug() << "SMTP object created" << endl; - connect(&connectTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(connectTimerTick())); - connect(&timeOutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(connectTimedOut())); - connect(&interactTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(interactTimedOut())); + connect(&connectTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(connectTimerTick())); + connect(&timeOutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(connectTimedOut())); + connect(&interactTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(interactTimedOut())); // some sendmail will give 'duplicate helo' error, quick fix for now - connect(this, TQT_SIGNAL(messageSent()), TQT_SLOT(closeConnection())); + connect(this, TQ_SIGNAL(messageSent()), TQ_SLOT(closeConnection())); } SMTP::~SMTP() @@ -175,8 +175,8 @@ void SMTP::connectTimerTick(void) state = INIT; serverState = NONE; - connect(sock, TQT_SIGNAL(readEvent(TDESocket *)), this, TQT_SLOT(socketRead(TDESocket *))); - connect(sock, TQT_SIGNAL(closeEvent(TDESocket *)), this, TQT_SLOT(socketClose(TDESocket *))); + connect(sock, TQ_SIGNAL(readEvent(TDESocket *)), this, TQ_SLOT(socketRead(TDESocket *))); + connect(sock, TQ_SIGNAL(closeEvent(TDESocket *)), this, TQ_SLOT(socketClose(TDESocket *))); // sock->enableRead(true); timeOutTimer.stop(); kdDebug() << "connected" << endl; @@ -233,8 +233,8 @@ void SMTP::socketRead(TDESocket *socket) void SMTP::socketClose(TDESocket *socket) { timeOutTimer.stop(); - disconnect(sock, TQT_SIGNAL(readEvent(TDESocket *)), this, TQT_SLOT(socketRead(TDESocket *))); - disconnect(sock, TQT_SIGNAL(closeEvent(TDESocket *)), this, TQT_SLOT(socketClose(TDESocket *))); + disconnect(sock, TQ_SIGNAL(readEvent(TDESocket *)), this, TQ_SLOT(socketRead(TDESocket *))); + disconnect(sock, TQ_SIGNAL(closeEvent(TDESocket *)), this, TQ_SLOT(socketClose(TDESocket *))); socket->enableRead(false); kdDebug() << "connection terminated" << endl; connected = false; diff --git a/tdeio/misc/tdesendbugmail/smtp.h b/tdeio/misc/tdesendbugmail/smtp.h index acdb4a3c3..3d00b4c1a 100644 --- a/tdeio/misc/tdesendbugmail/smtp.h +++ b/tdeio/misc/tdesendbugmail/smtp.h @@ -37,9 +37,9 @@ int SMTPClientStatus[] = { #define SMTP_READ_BUFFER_SIZE 256 -class SMTP:public QObject +class SMTP:public TQObject { - Q_OBJECT + TQ_OBJECT public: SMTP(char *serverhost = 0, unsigned short int port = 0, int timeout = DEFAULT_SMTP_TIMEOUT); ~SMTP(); diff --git a/tdeio/misc/tdetelnetservice.cpp b/tdeio/misc/tdetelnetservice.cpp index bf175bdc9..8435f7c07 100644 --- a/tdeio/misc/tdetelnetservice.cpp +++ b/tdeio/misc/tdetelnetservice.cpp @@ -26,8 +26,8 @@ #include <tdecmdlineargs.h> #include <kdebug.h> #include <tdelocale.h> -#include <kprocess.h> -#include <ksimpleconfig.h> +#include <tdeprocess.h> +#include <tdesimpleconfig.h> static const TDECmdLineOptions options[] = { @@ -108,5 +108,3 @@ int main(int argc, char **argv) return 0; } - -// vim: ts=4 sw=4 noet diff --git a/tdeio/misc/tdewalletd/CMakeLists.txt b/tdeio/misc/tdewalletd/CMakeLists.txt index 2d0d2ef28..78149218f 100644 --- a/tdeio/misc/tdewalletd/CMakeLists.txt +++ b/tdeio/misc/tdewalletd/CMakeLists.txt @@ -29,7 +29,11 @@ link_directories( ##### other data ################################ -install(FILES tdewalletd.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) +tde_create_translated_desktop( + SOURCE tdewalletd.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/kded + PO_DIR tdeio-desktops +) #### kded_tdewalletd ############################## @@ -44,6 +48,5 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} LINK tdeinit_kded-shared tdewalletbackend-shared - DEPENDENCIES dcopidl DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui b/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui index a02d5def7..8f72031e3 100644 --- a/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui +++ b/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui @@ -140,15 +140,12 @@ <include location="global" impldecl="in declaration">kactivelabel.h</include> <include location="local" impldecl="in implementation">kbetterthankdialogbase.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="private">clicked()</slot> <slot>setLabel( const TQString & label )</slot> <slot access="private">init()</slot> <slot access="protected">accept()</slot> <slot access="protected">reject()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kactivelabel.h</includehint> -</includehints> </UI> diff --git a/tdeio/misc/tdewalletd/ktimeout.cpp b/tdeio/misc/tdewalletd/ktimeout.cpp index c431ecf69..25108bdc5 100644 --- a/tdeio/misc/tdewalletd/ktimeout.cpp +++ b/tdeio/misc/tdewalletd/ktimeout.cpp @@ -52,7 +52,7 @@ void KTimeout::addTimer(int id, int timeout) { } TQTimer *t = new TQTimer; - connect(t, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout())); + connect(t, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout())); t->start(timeout); _timers.insert(id, t); } diff --git a/tdeio/misc/tdewalletd/ktimeout.h b/tdeio/misc/tdewalletd/ktimeout.h index 441e4ed77..0aced67ae 100644 --- a/tdeio/misc/tdewalletd/ktimeout.h +++ b/tdeio/misc/tdewalletd/ktimeout.h @@ -28,7 +28,7 @@ // @internal class KTimeout : public TQObject { - Q_OBJECT + TQ_OBJECT public: KTimeout(int size = 29); virtual ~KTimeout(); diff --git a/tdeio/misc/tdewalletd/tdewalletd.cpp b/tdeio/misc/tdewalletd/tdewalletd.cpp index 0aaec0f9a..dc1d95ced 100644 --- a/tdeio/misc/tdewalletd/tdewalletd.cpp +++ b/tdeio/misc/tdewalletd/tdewalletd.cpp @@ -36,7 +36,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kpassdlg.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdewalletentry.h> #include <twin.h> @@ -51,7 +51,7 @@ #include <assert.h> extern "C" { - KDE_EXPORT KDEDModule *create_tdewalletd(const TQCString &name) { + TDE_EXPORT KDEDModule *create_tdewalletd(const TQCString &name) { return new TDEWalletD(name); } } @@ -92,17 +92,17 @@ TDEWalletD::TDEWalletD(const TQCString &name) _timeouts = new KTimeout(17); _closeIdle = false; _idleTime = 0; - connect(_timeouts, TQT_SIGNAL(timedOut(int)), this, TQT_SLOT(timedOut(int))); + connect(_timeouts, TQ_SIGNAL(timedOut(int)), this, TQ_SLOT(timedOut(int))); reconfigure(); TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet"); connect(TDEApplication::dcopClient(), - TQT_SIGNAL(applicationRemoved(const TQCString&)), + TQ_SIGNAL(applicationRemoved(const TQCString&)), this, - TQT_SLOT(slotAppUnregistered(const TQCString&))); + TQ_SLOT(slotAppUnregistered(const TQCString&))); _dw = new KDirWatch(this, "TDEWallet Directory Watcher"); _dw->addDir(TDEGlobal::dirs()->saveLocation("tdewallet")); _dw->startScan(true); - connect(_dw, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(emitWalletListDirty())); + connect(_dw, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(emitWalletListDirty())); } @@ -229,7 +229,7 @@ void TDEWalletD::openAsynchronous(const TQString& wallet, const TQCString& retur DCOPRef(appid, returnObject).send("walletOpenResult", 0); - TQTimer::singleShot(0, this, TQT_SLOT(processTransactions())); + TQTimer::singleShot(0, this, TQ_SLOT(processTransactions())); checkActiveDialog(); } @@ -266,7 +266,7 @@ int TDEWalletD::open(const TQString& wallet, uint wId) { xact->wId = wId; xact->tType = TDEWalletTransaction::Open; xact->modal = true; // mark dialogs as modal, the app has blocking wait - TQTimer::singleShot(0, this, TQT_SLOT(processTransactions())); + TQTimer::singleShot(0, this, TQ_SLOT(processTransactions())); checkActiveDialog(); return 0; // process later } @@ -283,7 +283,7 @@ void TDEWalletD::setupDialog( TQWidget* dialog, WId wId, const TQCString& appid, kdWarning() << "Application '" << appid << "' using tdewallet without parent window!" << endl; // allow dialog activation even if it interrupts, better than trying hacks // with keeping the dialog on top or on all desktops - kapp->updateUserTimestamp(); + tdeApp->updateUserTimestamp(); } if( modal ) KWin::setState( dialog->winId(), NET::Modal ); @@ -301,7 +301,7 @@ void TDEWalletD::setupDialog( TQWidget* dialog, WId wId, const TQCString& appid, void TDEWalletD::checkActiveDialog() { if( !activeDialog || !activeDialog->isShown()) return; - kapp->updateUserTimestamp(); + tdeApp->updateUserTimestamp(); KWin::setState( activeDialog->winId(), NET::KeepAbove ); KWin::setOnAllDesktops( activeDialog->winId(), true ); KWin::forceActiveWindow( activeDialog->winId()); @@ -386,7 +386,7 @@ int TDEWalletD::tryOpen(const TQString& wallet, const TQCString& password) _tryOpenBlocked.start (30 * 1000, true /*single shot*/); if (++_failed > 5) { _failed = 0; - TQTimer::singleShot(0, this, TQT_SLOT(notifyFailures())); + TQTimer::singleShot(0, this, TQ_SLOT(notifyFailures())); } rc = -1; @@ -627,7 +627,7 @@ void TDEWalletD::changePassword(const TQString& wallet, uint wId) { _transactions.append(xact); - TQTimer::singleShot(0, this, TQT_SLOT(processTransactions())); + TQTimer::singleShot(0, this, TQ_SLOT(processTransactions())); checkActiveDialog(); } @@ -801,7 +801,7 @@ bool TDEWalletD::isOpen(int handle) { if (rc == 0 && ++_failed > 5) { _failed = 0; - TQTimer::singleShot(0, this, TQT_SLOT(notifyFailures())); + TQTimer::singleShot(0, this, TQ_SLOT(notifyFailures())); } else if (rc != 0) { _failed = 0; } @@ -1229,7 +1229,7 @@ TDEWallet::Backend *TDEWalletD::getWallet(const TQCString& appid, int handle) { if (++_failed > 5) { _failed = 0; - TQTimer::singleShot(0, this, TQT_SLOT(notifyFailures())); + TQTimer::singleShot(0, this, TQ_SLOT(notifyFailures())); } return 0L; diff --git a/tdeio/misc/tdewalletd/tdewalletd.desktop b/tdeio/misc/tdewalletd/tdewalletd.desktop index ce27b419d..7c06c38b9 100644 --- a/tdeio/misc/tdewalletd/tdewalletd.desktop +++ b/tdeio/misc/tdewalletd/tdewalletd.desktop @@ -7,145 +7,4 @@ X-TDE-FactoryName=tdewalletd X-TDE-Kded-autoload=false X-TDE-Kded-load-on-demand=true Name=TDEWallet Daemon Module -Name[af]=KBeursie Bediener Module -Name[ar]=مراقب وحدة TDEWallet -Name[az]=TDEWallet Demon Modulu -Name[be]=Модуль сервіса TDEWallet -Name[bg]=Демон Портфейл -Name[bn]=কে-ওয়ালেট ডিমন মডিউল -Name[br]=Mollad an diaoul TDEWallet -Name[ca]=Mòdul del dimoni TDEWallet -Name[cs]=Modul démona TDEWallet -Name[csb]=Pòrtfel -Name[cy]=Modiwl Daemon KWaled -Name[da]=TDEWallet Dæmonmodul -Name[de]=Digitale Brieftasche -Name[el]=Άρθρωμα δαίμονα TDEWallet -Name[eo]=Sekreteja demono-modulo -Name[es]=Módulo de demonio TDEWallet -Name[et]=TDEWalleti deemoni moodul -Name[eu]=TDEWallet daemon modulua -Name[fa]=پیمانه شبح TDEWallet -Name[fi]=TDEWallet-palvelinmoduuli -Name[fr]=Module démon TDEWallet -Name[ga]=Modúl Deamhain TDEWallet -Name[gl]=Módulo do Demo TDEWallet -Name[he]=מודול תהליך הרקע של TDEWallet -Name[hi]=केवैलट डेमन मॉड्यूल -Name[hr]=Modul TDEWallet demona -Name[hu]=TDEWallet szolgáltatás -Name[id]=Modul Daemon TDEWallet -Name[is]=TDEWallet þjónseining -Name[it]=Modulo demone TDEWallet -Name[ja]=TDEWallet デーモンモジュール -Name[ka]=TDEWallet გუშაგის მოდული -Name[kk]=TDEWallet әмиян қызметтің модулі -Name[km]=ម៉ូឌុល Daemon TDEWallet -Name[ko]=K지갑 데몬 모듈 -Name[lb]=TDEWallet-Dämonmodul -Name[lt]=TDE slaptažodinių tarnybos modulis -Name[lv]=TDEWallet Dēmona Modulis -Name[mn]=TDEWallet Daemon Модул -Name[ms]=Modul Daemon TDEWallet -Name[nb]=TDEWallet nisseprogramtillegg -Name[nds]=TDEWallet-Dämoon -Name[ne]=TDEWallet डेइमन मोड्युल -Name[nl]=TDEWallet daemon-module -Name[nn]=TDEWallet-nissemodul -Name[pa]=TDEWallet ਪੇਸ਼ਕਾਰੀ ਮੈਡੀਊਲ -Name[pl]=Portfel -Name[pt]=Módulo do Servidor do TDEWallet -Name[pt_BR]=Módulo do Serviço do TDEWallet -Name[ro]=Modul demon TDEWallet -Name[ru]=Служба бумажника -Name[rw]=Igice Dayimoni KUruhago -Name[se]=TDEWallet-bálvámoduvla -Name[sk]=Modul démona TDEWallet -Name[sl]=Modul demona TDEListnica -Name[sq]=Demoni për Modulin TDEWallet -Name[sr]=TDEWallet демон модул -Name[sr@Latn]=TDEWallet demon modul -Name[sv]=TDEwallet-demonmodul -Name[ta]=TDEWallet டெமான் பகுதி -Name[te]=కెవాలెట్ సూత్రధారి మాడ్యూల్ -Name[tg]=Модули Демон TDEWallet -Name[th]=โมดูลเดมอน TDEWallet -Name[tr]=TDEWallet Program Modülü -Name[tt]=TDEWallet Xezmäteneñ Modulı -Name[uk]=Модуль демону TDEWallet -Name[uz]=TDEWallet xizmatining moduli -Name[uz@cyrillic]=TDEWallet хизматининг модули -Name[vi]=Mô-đun trình nền TDEWallet -Name[zh_CN]=TDEWallet 守护进程模块 -Name[zh_HK]=TDEWallet 伺服程式模組 -Name[zh_TW]=TDEWallet 服務程式模組 Comment=TDEWallet daemon module for KDED -Comment[af]=KBeursie bediener module vir KDED -Comment[be]=Модуль сервіса TDEWallet для KDED -Comment[bg]=Модул демон за системата Портфейл за KDED -Comment[bn]=KDED-র জন্য কে-ওয়ালেট ডিমন মডিউল -Comment[br]=Mollad an diaoul TDEWallet evit KDED -Comment[bs]=TDEWallet daemon modul za KDED -Comment[ca]=Mòdul del dimoni TDEWallet per a KDED -Comment[cs]=Modul démona TDEWallet pro KDED -Comment[csb]=Mòduł TDEWallet w KDED -Comment[da]=TDEWallet Dæmonmodul for KDED -Comment[de]=Unterstützung für die digitale Brieftasche "TDEWallet" -Comment[el]=Άρθρωμα δαίμονα TDEWallet για το KDED -Comment[eo]=Sekreteja demono-modulo por KDED -Comment[es]=Módulo de demonio TDEWallet para KDED -Comment[et]=KDED TDEWalleti deemoni moodul -Comment[eu]=TDEWallet daemon modulua KDEDrako -Comment[fa]=پیمانۀ شبح TDEWallet برای KDED -Comment[fi]=TDEWallet palvelinmoduuli KDED:lle -Comment[fr]=Module démon TDEWallet pour KDED -Comment[fy]=TDEWallet daemon module foar KDED -Comment[ga]=Modúl deamhain TDEWallet le haghaidh KDED -Comment[gl]=Demo de TDEWallet para KDED -Comment[he]=מודול תהליך רקע של TDEWallet עבור KDED -Comment[hi]=केडीईडी के लिए के-वॉलेट डेमन मॉड्यूल -Comment[hr]=TDEWallet demon modul za KDED -Comment[hu]=TDEWallet szolgáltatásmodul a KDED-hez -Comment[id]=Modul daemon TDEWallet untuk KDED -Comment[is]=TDEWallet þjónseining fyrir KDED -Comment[it]=Modulo demone TDEWallet per KDED -Comment[ja]=KDED 用の TDEWallet デーモンモジュール -Comment[ka]=KSSL მოდული TDE-სთვის -Comment[kk]=TDE TDEWallet әмиянін басқару қызметтің модулі -Comment[km]=ម៉ូឌុល daemon TDEWallet សម្រាប់ KDED -Comment[lb]=TDEWallet-Dämonmodul fir KDED -Comment[lt]=TDE slaptažodinių tarnybos modulis skirtas KDED -Comment[lv]=TDEWallet Dēmona Modulis priekš KDED -Comment[mk]=TDEWallet даемон модул за KDED -Comment[ms]=Modul Daemon TDEWallet untuk KDED -Comment[nb]=TDEWallet nissemodul for KDED -Comment[nds]=TDEWallet-Dämoonmoduul för KDED -Comment[ne]=KDED का लागि डेइमन मोड्युल TDEWallet -Comment[nl]=TDEWallet daemon-module voor KDED -Comment[nn]=TDEWallet-nissemodul for KDED -Comment[pa]=KDED ਲਈ TDEWallet ਪੇਸ਼ਕਾਰੀ ਮੈਡੀਊਲ -Comment[pl]=Moduł TDEWallet w KDED -Comment[pt]=Módulo servidor do TDEWallet para o KDED -Comment[pt_BR]=Módulo do serviço de carteira para o TDE -Comment[ro]=Modul demon TDEWallet pentru KDED -Comment[ru]=Управление бумажником TDE -Comment[rw]=Igice cya dayimoni KUruhago cya KDED -Comment[se]=KDED:a TDEWallet-bálvámoduvla -Comment[sk]=Modul démona TDEWallet pre KDED -Comment[sl]=Modul demona TDEListnica za KDED -Comment[sr]=TDEWallet демон модул за KDED -Comment[sr@Latn]=TDEWallet demon modul za KDED -Comment[sv]=TDEwallet-demonmodul för KDED -Comment[ta]=KDEDக்கான TDEWallet Daemon தொகுதி -Comment[te]=కెడిఈడి కొరకు కెవాలెట్ సూత్రధారి మాడ్యూల్ -Comment[tg]=Модули Демон TDEWallet барои KDED -Comment[th]=โมดูลเดมอน TDEWallet สำหรับ KDED -Comment[tr]=KDED için TDEWallet program modülü -Comment[tt]=KDED öçen TDEWallet xezmäteneñ modulı -Comment[uk]=Модуль демону торбинок TDEWallet для KDED -Comment[uz]=KDED uchun TDEWallet xizmatining moduli -Comment[uz@cyrillic]=KDED учун TDEWallet хизматининг модули -Comment[vi]=Mô-đun trình nền TDEWallet cho KDED. -Comment[zh_CN]=KDED 的 TDEWallet 守护进程模块 -Comment[zh_HK]=KDED 的 TDEWallet 伺服程式模組 -Comment[zh_TW]=KDED 的 TDEWallet 服務程式模組 diff --git a/tdeio/misc/tdewalletd/tdewalletd.h b/tdeio/misc/tdewalletd/tdewalletd.h index c35ebc630..65e77771e 100644 --- a/tdeio/misc/tdewalletd/tdewalletd.h +++ b/tdeio/misc/tdewalletd/tdewalletd.h @@ -40,7 +40,7 @@ class KTimeout; class TDEWalletTransaction; class TDEWalletD : public KDEDModule { - Q_OBJECT + TQ_OBJECT K_DCOP public: TDEWalletD(const TQCString &name); diff --git a/tdeio/misc/tdewalletd/tdewalletwizard.ui b/tdeio/misc/tdewalletd/tdewalletwizard.ui index 3e034bac1..1cad5f4a0 100644 --- a/tdeio/misc/tdewalletd/tdewalletwizard.ui +++ b/tdeio/misc/tdewalletd/tdewalletwizard.ui @@ -534,12 +534,12 @@ <include location="global" impldecl="in implementation">tdelocale.h</include> <include location="local" impldecl="in implementation">tdewalletwizard.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="private">passwordPageUpdate()</slot> <slot access="private">init()</slot> <slot>setAdvanced()</slot> <slot>setBasic()</slot> <slot access="private">destroy()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp index c929028db..59d436c35 100644 --- a/tdeio/misc/uiserver.cpp +++ b/tdeio/misc/uiserver.cpp @@ -17,7 +17,6 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -// -*- mode: c++; c-basic-offset: 4 -*- #include <tqtimer.h> @@ -27,8 +26,8 @@ #include <ksqueezedtextlabel.h> #include <tdeconfig.h> -#include <kstandarddirs.h> -#include <kuniqueapplication.h> +#include <tdestandarddirs.h> +#include <tdeuniqueapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <tdeglobal.h> @@ -95,11 +94,11 @@ class UIServerSystemTray:public KSystemTray :KSystemTray(uis) { TDEPopupMenu* pop= contextMenu(); - pop->insertItem(i18n("Settings..."), uis, TQT_SLOT(slotConfigure())); - pop->insertItem(i18n("Remove"), uis, TQT_SLOT(slotRemoveSystemTrayIcon())); + pop->insertItem(i18n("Settings..."), uis, TQ_SLOT(slotConfigure())); + pop->insertItem(i18n("Remove"), uis, TQ_SLOT(slotRemoveSystemTrayIcon())); setPixmap(loadIcon("document-save")); //actionCollection()->action("file_quit")->setEnabled(true); - KStdAction::quit(TQT_TQOBJECT(uis), TQT_SLOT(slotQuit()), actionCollection()); + KStdAction::quit(uis, TQ_SLOT(slotQuit()), actionCollection()); } }; @@ -194,8 +193,8 @@ ProgressItem::ProgressItem( ListProgress* view, TQListViewItem *after, TQCString // create dialog, but don't show it defaultProgress = new TDEIO::DefaultProgress( false ); defaultProgress->setOnlyClean( true ); - connect ( defaultProgress, TQT_SIGNAL( stopped() ), this, TQT_SLOT( slotCanceled() ) ); - connect ( &m_showTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT(slotShowDefaultProgress()) ); + connect ( defaultProgress, TQ_SIGNAL( stopped() ), this, TQ_SLOT( slotCanceled() ) ); + connect ( &m_showTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT(slotShowDefaultProgress()) ); if ( showDefault ) { m_showTimer.start( 500, true ); @@ -479,7 +478,7 @@ ListProgress::ListProgress (TQWidget *parent, const char *name) //used for squeezing the text in local file name and url m_squeezer=new KSqueezedTextLabel(this); m_squeezer->hide(); - connect(header(),TQT_SIGNAL(sizeChange(int,int,int)),this,TQT_SLOT(columnWidthChanged(int))); + connect(header(),TQ_SIGNAL(sizeChange(int,int,int)),this,TQ_SLOT(columnWidthChanged(int))); } @@ -596,11 +595,11 @@ UIServer::UIServer() // setup toolbar toolBar()->insertButton("edit-delete", TOOL_CANCEL, - TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), - TQT_SLOT(slotCancelCurrent()), FALSE, i18n("Cancel")); + TQ_SIGNAL(clicked()), this, + TQ_SLOT(slotCancelCurrent()), false, i18n("Cancel")); toolBar()->insertButton("configure", TOOL_CONFIGURE, - TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), - TQT_SLOT(slotConfigure()), true, i18n("Settings...")); + TQ_SIGNAL(clicked()), this, + TQ_SLOT(slotConfigure()), true, i18n("Settings...")); toolBar()->setBarPos( TDEToolBar::Left ); @@ -615,18 +614,18 @@ UIServer::UIServer() setCentralWidget( listProgress ); - connect( listProgress, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelection() ) ); - connect( listProgress, TQT_SIGNAL( executed( TQListViewItem* ) ), - TQT_SLOT( slotToggleDefaultProgress( TQListViewItem* ) ) ); - connect( listProgress, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem *, const TQPoint &)), - TQT_SLOT(slotShowContextMenu(TDEListView*, TQListViewItem *, const TQPoint&))); + connect( listProgress, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelection() ) ); + connect( listProgress, TQ_SIGNAL( executed( TQListViewItem* ) ), + TQ_SLOT( slotToggleDefaultProgress( TQListViewItem* ) ) ); + connect( listProgress, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem *, const TQPoint &)), + TQ_SLOT(slotShowContextMenu(TDEListView*, TQListViewItem *, const TQPoint&))); // setup animation timer updateTimer = new TQTimer( this ); - connect( updateTimer, TQT_SIGNAL( timeout() ), - TQT_SLOT( slotUpdate() ) ); + connect( updateTimer, TQ_SIGNAL( timeout() ), + TQ_SLOT( slotUpdate() ) ); m_bUpdateNewJob=false; setCaption(i18n("Progress Dialog")); @@ -676,10 +675,10 @@ void UIServer::slotShowContextMenu(TDEListView*, TQListViewItem* item, const TQP if (m_contextMenu==0) { m_contextMenu=new TQPopupMenu(this); - m_idCancelItem = m_contextMenu->insertItem(i18n("Cancel Job"), this, TQT_SLOT(slotCancelCurrent())); -// m_contextMenu->insertItem(i18n("Toggle Progress"), this, TQT_SLOT(slotToggleDefaultProgress())); + m_idCancelItem = m_contextMenu->insertItem(i18n("Cancel Job"), this, TQ_SLOT(slotCancelCurrent())); +// m_contextMenu->insertItem(i18n("Toggle Progress"), this, TQ_SLOT(slotToggleDefaultProgress())); m_contextMenu->insertSeparator(); - m_contextMenu->insertItem(i18n("Settings..."), this, TQT_SLOT(slotConfigure())); + m_contextMenu->insertItem(i18n("Settings..."), this, TQ_SLOT(slotConfigure())); } if ( item ) item->setSelected( true ); @@ -708,9 +707,9 @@ void UIServer::slotConfigure() if (m_configDialog==0) { m_configDialog=new ProgressConfigDialog(0); -// connect(m_configDialog,TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotCancelConfig())); - connect(m_configDialog,TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotApplyConfig())); - connect(m_configDialog,TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotApplyConfig())); +// connect(m_configDialog,TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(slotCancelConfig())); + connect(m_configDialog,TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotApplyConfig())); + connect(m_configDialog,TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotApplyConfig())); } m_configDialog->m_showSystemTrayCb->setChecked(m_showSystemTray); m_configDialog->m_keepOpenCb->setChecked(m_keepListOpen); @@ -761,8 +760,8 @@ int UIServer::newJob( TQCString observerAppId, bool showProgress ) bool show = !m_bShowList && showProgress; ProgressItem *item = new ProgressItem( listProgress, it.current(), observerAppId, s_jobId, show ); - connect( item, TQT_SIGNAL( jobCanceled( ProgressItem* ) ), - TQT_SLOT( slotJobCanceled( ProgressItem* ) ) ); + connect( item, TQ_SIGNAL( jobCanceled( ProgressItem* ) ), + TQ_SLOT( slotJobCanceled( ProgressItem* ) ) ); if ( m_bShowList && !updateTimer->isActive() ) updateTimer->start( 1000 ); @@ -1038,7 +1037,7 @@ void UIServer::slotJobCanceled( ProgressItem *item ) { void UIServer::slotQuit() { m_shuttingDown = true; - kapp->quit(); + tdeApp->quit(); } void UIServer::slotUpdate() { @@ -1136,11 +1135,11 @@ void UIServer::slotSelection() { for ( ; it.current(); ++it ) { if ( it.current()->isSelected() ) { - toolBar()->setItemEnabled( TOOL_CANCEL, TRUE); + toolBar()->setItemEnabled( TOOL_CANCEL, true); return; } } - toolBar()->setItemEnabled( TOOL_CANCEL, FALSE); + toolBar()->setItemEnabled( TOOL_CANCEL, false); } // This code is deprecated, slaves go to Observer::openPassDlg now, @@ -1206,7 +1205,7 @@ void UIServer::showSSLInfoDialog(const TQString &url, const TDEIO::MetaData &met meta["ssl_cipher_bits"].toInt(), KSSLCertificate::KSSLValidation(meta["ssl_cert_state"].toInt())); kdDebug(7024) << "Showing SSL Info dialog" << endl; -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN if( mainwindow != 0 ) KWin::setMainWindow( kid, mainwindow ); #endif @@ -1234,7 +1233,7 @@ KSSLCertDlgRet UIServer::showSSLCertDialog(const TQString& host, const TQStringL kcd->setupDialog(certList); kcd->setHost(host); kdDebug(7024) << "Showing SSL certificate dialog" << endl; -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN if( mainwindow != 0 ) KWin::setMainWindow( kcd, mainwindow ); #endif @@ -1361,7 +1360,7 @@ void UIServer::resizeEvent(TQResizeEvent* e) bool UIServer::queryClose() { - if (( !m_shuttingDown ) && !kapp->sessionSaving()) { + if (( !m_shuttingDown ) && !tdeApp->sessionSaving()) { hide(); return false; } @@ -1375,7 +1374,7 @@ UIServer* UIServer::createInstance() //------------------------------------------------------------ -extern "C" KDE_EXPORT int kdemain(int argc, char **argv) +extern "C" TDE_EXPORT int kdemain(int argc, char **argv) { TDELocale::setMainCatalogue("tdelibs"); // GS 5/2001 - I changed the name to "TDE" to make it look better @@ -1389,15 +1388,15 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) TDECmdLineArgs::init( argc, argv, &aboutdata ); // TDECmdLineArgs::addCmdLineOptions( options ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); - if (!KUniqueApplication::start()) + if (!TDEUniqueApplication::start()) { kdDebug(7024) << "tdeio_uiserver is already running!" << endl; return (0); } - KUniqueApplication app; + TDEUniqueApplication app; // This app is started automatically, no need for session management app.disableSessionManagement(); diff --git a/tdeio/misc/uiserver.h b/tdeio/misc/uiserver.h index 05b15ba18..8ba492da5 100644 --- a/tdeio/misc/uiserver.h +++ b/tdeio/misc/uiserver.h @@ -57,7 +57,7 @@ struct ListProgressColumnConfig */ class TDEIO_EXPORT ListProgress : public TDEListView { - Q_OBJECT + TQ_OBJECT public: @@ -105,7 +105,7 @@ protected: */ class TDEIO_EXPORT ProgressItem : public TQObject, public TQListViewItem { - Q_OBJECT + TQ_OBJECT public: ProgressItem( ListProgress* view, TQListViewItem *after, TQCString app_id, int job_id, @@ -217,7 +217,7 @@ class UIServerSystemTray; class TDEIO_EXPORT UIServer : public TDEMainWindow, public DCOPObject { K_DCOP - Q_OBJECT + TQ_OBJECT UIServer(); virtual ~UIServer(); @@ -425,6 +425,4 @@ private: static int s_jobId; friend class no_bogus_warning_from_gcc; }; - -// -*- mode: c++; c-basic-offset: 2 -*- #endif diff --git a/tdeio/renamedlgplugin.desktop b/tdeio/renamedlgplugin.desktop index d6a9f8f1f..3bac0f76d 100644 --- a/tdeio/renamedlgplugin.desktop +++ b/tdeio/renamedlgplugin.desktop @@ -2,83 +2,3 @@ Type=ServiceType X-TDE-ServiceType=RenameDlg/Plugin Comment=Plugin for the Rename Dialog -Comment[af]=Inplak vir die Herbenaam Dialoog -Comment[ar]=ملحق لمربع حوار إعادة التسمية -Comment[az]=Yenidən Adlandırma Dialoqu Üçün Əlavə -Comment[bg]=Приставка за диалога за преименуване -Comment[bn]=পরিবর্তন -Comment[bs]=Dodatak za Rename dijalog -Comment[ca]=Connector per al diàleg de reanomenar -Comment[cs]=Modul pro přejmenovávací dialog -Comment[csb]=Pligins dialogòwegò òkna Zmianë miona -Comment[cy]=Ategyn am yr Ymgom Ail-enwi -Comment[da]=Plugin til omdøbningsdialog -Comment[de]=Erweiterung für den Umbenennen-Dialog -Comment[el]=Πρόσθετο για το διάλογο μετονομασίας -Comment[en_GB]=Plugin for the Rename Dialogue -Comment[eo]=Kromaĵo por la alinoma dialogo -Comment[es]=Plugin para el diálogo de renombrado -Comment[et]=Ümbernimetamise dialoogi plugin -Comment[eu]=Berrizendatze elkarrizketa-koadroen plugin-a -Comment[fa]=وصله برای محاورۀ تغییر نام -Comment[fi]=Lisäosa uudelleennimeämisikkunalle -Comment[fr]=Module externe pour la boîte de dialogue de renommage -Comment[fy]=Plugin foar it 'Omneame'-dialooch -Comment[ga]=Breiseán le haghaidh na dialóige athainmnithe -Comment[gl]=Plugin para o Diálogo de Renomeamento -Comment[he]=תוסף לדו־שיח שינוי השם -Comment[hi]=रीनेम डायलॉग के लिए प्लगइन -Comment[hr]=Dodatak dijaloga za preimenovanja -Comment[hu]=Bővítőmodul az átnevezési párbeszédablakhoz -Comment[id]=Plugin untuk Dialog Ubah Nama -Comment[is]=Íforrit fyrir 'endurnefna' gluggann -Comment[it]=Plugin per la finestra di dialogo "rinomina" -Comment[ja]=名前変更ダイアログ用プラグイン -Comment[ka]=გადარქმევის დიალოგის მოდული -Comment[kk]=Атауын өзгерту диалогтың модулі -Comment[km]=កម្មវិធីជំនួយខាងក្នុងសម្រាប់ប្រអប់ ប្តូរឈ្មោះ -Comment[ko]=이름 바꾸기 대화창용 플러그인 -Comment[lb]=Plugin fir den Ëmbenennen-Dialog -Comment[lt]=Priedas pervadinimo dialogui -Comment[lv]=Spraudnis Pārsaukšanas Dialogam -Comment[mk]=Приклучок за дијалогот за преименување -Comment[mn]=Нэр өөрчилөх-Диалогийн Plugin -Comment[ms]=Plug masuk untuk namakan semula Dialog -Comment[mt]=Plugin għad-djalogu biex tbiddel l-isem -Comment[nb]=Programtillegg for omnavningsdialogen -Comment[nds]=Plugin för den Ümnömen-Dialoog -Comment[ne]=पुन: नामकरण संवादका लागि प्लगइन -Comment[nl]=Plugin voor de 'Hernoemen'-dialoog -Comment[nn]=Tillegg til dialogen for namnebyte -Comment[nso]=Tsenyo ya Poledisano ya Theoleswa -Comment[pa]=ਨਾਂ-ਤਬਦੀਲੀ ਪੁੱਛਗਿੱਛ ਤਾਕੀ ਲਈ ਪਲੱਗਿੰਨ -Comment[pl]=Wtyczka do okna dialogowego Zmiana nazwy -Comment[pt]='Plugin' para a Janela de Mudança do Nome -Comment[pt_BR]=Plug-in para o Diálogo Renomear -Comment[ro]=Modul pentru dialogul de redenumire -Comment[ru]=Модуль для диалога переименования -Comment[rw]=Icomeka ry'Ikiganiro cyo guhindura izina -Comment[se]=Lassemoduvla nammarievdadanláseža várás -Comment[sk]=Modul pre premenovací dialóg -Comment[sl]=Vstavek za pogovorno okno za preimenovanje -Comment[sq]=Shtojca për Dialogun Riemrim -Comment[sr]=Прикључак за дијалог за преименовање -Comment[sr@Latn]=Priključak za dijalog za preimenovanje -Comment[sv]=Insticksprogram för Byt namn-dialogrutan -Comment[ta]=மறுபெயரிடல் உரையாடலுக்கான சொருகுப்பொருள் -Comment[te]=పేరు మార్చు సంభాషణ కొరకు ప్లగిన్ -Comment[tg]=Барои Тирезаи Диалогӣ Номи Нав Гузоштани Пайвастан -Comment[th]=ปลั๊กอินสำหรับกล่องเปลี่ยนชื่อ -Comment[tr]=Yeniden İsimlendir İletişim Kutusu İçin Eklenti -Comment[tt]=İsem Quşu Dialogı öçen Östämä -Comment[uk]=Втулок для діалогу перейменування -Comment[uz]=Nomini oʻzgartirish dialogi uchun plagin -Comment[uz@cyrillic]=Номини ўзгартириш диалоги учун плагин -Comment[ven]=Pulagini uitela u rinulula nyambedzano -Comment[vi]=Bộ cầm phít cho hộp thoại thay đổi tên. -Comment[wa]=Tchôke-divins pol purnea di rlomaedje -Comment[xh]=Iplagi yangaphakathi Yencoko yababini Yokunika igama elitsha -Comment[zh_CN]=重命名对话的插件 -Comment[zh_HK]=更名對話盒的外掛程式 -Comment[zh_TW]=更名對話盒的外掛程式 -Comment[zu]=I-plugin Yengxoxo Yokuqamba kabusha diff --git a/tdeio/tdecmodule.desktop b/tdeio/tdecmodule.desktop index 5cbe9b786..fad154052 100644 --- a/tdeio/tdecmodule.desktop +++ b/tdeio/tdecmodule.desktop @@ -2,87 +2,6 @@ Type=ServiceType X-TDE-ServiceType=TDECModule Name=TDE Control Module -Name[af]=TDE Beheer Module -Name[ar]=وحدة تحكم كيدي -Name[az]=TDE İdarə Modulu -Name[be]=Модуль кіравання TDE -Name[bg]=Контролен модул на TDE -Name[bn]=কে.ডি.ই. নিয়ন্ত্রণ মডিউল -Name[br]=Mollad kreizenn ren TDE -Name[bs]=TDE kontrolni modul -Name[ca]=Mòdul de control del TDE -Name[cs]=Ovládací modul TDE -Name[csb]=Kòntrolny mòduł pùltu TDE -Name[cy]=Modiwl Rheolaeth TDE -Name[da]=TDE-kontrolmodul -Name[de]=TDE-Kontrollmodul -Name[el]=Άρθρωμα ελέγχου του TDE -Name[eo]=TDE Agordmodulo -Name[es]=Módulo de control de TDE -Name[et]=TDE juhtimismoodul -Name[eu]=TDEren kontrol-modulua -Name[fa]=پیمانۀ کنترل TDE -Name[fi]=TDE:n ohjausmoduuli -Name[fr]=Module de configuration de TDE -Name[fy]=TDE konfiguraasjemodule -Name[ga]=Modúl Rialaithe TDE -Name[gl]=Módulo de Controlo de TDE -Name[he]=מודול תצורה של TDE -Name[hi]=केडीई नियंत्रण घटक -Name[hr]=TDE kontrolni modul -Name[hu]=TDE beállítómodul -Name[id]=Modul Kontrol TDE -Name[is]=TDE stjórneining -Name[it]=Modulo di controllo TDE -Name[ja]=TDE コントロールモジュール -Name[ka]=TDE-ს კონტროლის პულტი -Name[kk]=TDE басқару модулі -Name[km]=ម៉ូឌុលត្រួតពិនិត្យរបស់ TDE -Name[ko]=TDE 제어 모듈 -Name[lb]=TDE-Kontrollmodul -Name[lt]=TDE valdymo modulis -Name[lv]=TDE kontroles modulis -Name[mk]=TDE Контролен Модул -Name[mn]=TDED-Хяналтын Модул -Name[ms]=Modul Kawalan TDE -Name[nb]=TDE kontrollpanel-modul -Name[nds]=TDE-Kuntrullmoduul -Name[ne]=TDE नियन्त्रण मोड्युल -Name[nl]=TDE Configuratiemodule -Name[nn]=TDE-kontrollmodul -Name[nso]=Seripa sa Taolo ya TDE -Name[pa]=TDE ਕੰਟਰੋਲ ਮੈਡੀਊਲ -Name[pl]=Moduł centrum sterowania TDE -Name[pt]=Módulo de Controlo do TDE -Name[pt_BR]=Módulo de Controle do TDE -Name[ro]=Modul de control TDE -Name[ru]=Модуль управления TDE -Name[rw]=Igice cy'Igenzura TDE -Name[se]=TDE stivrrenmoduvla -Name[sk]=Ovládací modul TDE -Name[sl]=Nadzorni modul TDE -Name[sq]=Modula Kontrolues - TDE -Name[sr]=TDE-ов контролни модул -Name[sr@Latn]=TDE-ov kontrolni modul -Name[ss]=Sahluko sekulawula se TDE -Name[sv]=TDE-inställningsmodul -Name[ta]=கேடிஇ கட்டுப்பாட்டு கூறு -Name[te]=కెడిఈ నియంత్రణ మాడ్యూల్ -Name[tg]=Модулӣ TDE Control -Name[th]=โมดูลควบคุมของ TDE -Name[tr]=TDE Kontrol Modülü -Name[tt]=TDE İdärä Modulı -Name[uk]=Модуль центра керування TDE -Name[uz]=TDE boshqaruv moduli -Name[uz@cyrillic]=TDE бошқарув модули -Name[ven]=Phanele ndangula ya phirinthara -Name[vi]=Mô-đun điều khiển TDE -Name[wa]=Module di contrôle TDE -Name[xh]=Ulawulo Lwesicatshulwa we TDE -Name[zh_CN]=TDE 控制模块 -Name[zh_HK]=TDE 控制模組 -Name[zh_TW]=TDE 控制模組 -Name[zu]=Ingxenye ye-TDE Control [PropertyDef::X-TDE-FactoryName] Type=TQString diff --git a/tdeio/tdefile/CMakeLists.txt b/tdeio/tdefile/CMakeLists.txt index 8952005ed..142c06398 100644 --- a/tdeio/tdefile/CMakeLists.txt +++ b/tdeio/tdefile/CMakeLists.txt @@ -47,9 +47,11 @@ install( FILES ##### other data ################################ -install( FILES - kpropsdlgplugin.desktop - DESTINATION ${SERVICETYPES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE kpropsdlgplugin.desktop + DESTINATION ${SERVICETYPES_INSTALL_DIR} + PO_DIR tdeio-desktops +) ##### tdefile ##################################### diff --git a/tdeio/tdefile/NOTES b/tdeio/tdefile/NOTES index c646c13cd..7d7669569 100644 --- a/tdeio/tdefile/NOTES +++ b/tdeio/tdefile/NOTES @@ -26,7 +26,7 @@ for more integration between tdefile and konqueror. 16/08/2000. of the visible icons first" algorithm, currently in KonqIconView. (3) KFileView, the base class for any view, knows about KFileItem, has signals for dropped(), popupMenu(list of actions provided by the view), - has a QWidget * canvas() method, xOffset() and yOffset() + has a TQWidget * canvas() method, xOffset() and yOffset() (4) KFileIconView holds a QPtrDict to look up a QIconViewItem quickly from a given KFileItem. This will help for e.g. deleteItems and refreshItems. (5) KFileListView holds a QPtrDict to find the QListViewItem for a diff --git a/tdeio/tdefile/images.h b/tdeio/tdefile/images.h index f544e2f0a..9d60f02bb 100644 --- a/tdeio/tdefile/images.h +++ b/tdeio/tdefile/images.h @@ -3,7 +3,7 @@ #define _QEMBED_1804289383 #include <tqimage.h> #include <tqdict.h> -static const QRgb group_grey_data[] = { +static const TQRgb group_grey_data[] = { 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x42484848,0xc39b9b9b,0xeab1b1b1,0xce9d9d9d,0x5a4d4d4d,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x563b3b3b,0xfdaeaeae,0xffcfcfcf,0xffcccccc,0xffcecece, 0xffbababa,0x62393939,0x0,0x0,0x0,0x0,0x0,0x0,0x4525252,0x9383838,0x0,0xd0515151,0xff969696,0xff959595, @@ -26,7 +26,7 @@ static const QRgb group_grey_data[] = { }; /* Generated by qembed */ -static const QRgb group_data[] = { +static const TQRgb group_data[] = { 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4223731d,0xc37fbb7c,0xea9bca98,0xce86b982,0x5a316e2c,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x56146610,0xfd8fce8e,0xffbae4bb,0xffb7e2b7,0xffbae3ba, 0xff9ed89d,0x62166112,0x0,0x0,0x0,0x0,0x0,0x0,0x4003ca5,0x9003171,0x0,0xd0198b17,0xff6ac468,0xff6ec665, @@ -48,7 +48,7 @@ static const QRgb group_data[] = { 0x0,0x0,0x0,0x0 }; -static const QRgb mask_data[] = { +static const TQRgb mask_data[] = { 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x11c84a00,0x1000000,0x0,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x68d14e00,0xffda6400,0x72bf4700,0x3000000,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x14d04d00,0xefda6400,0xfffec300,0xf2d86300,0x24742b00, @@ -70,7 +70,7 @@ static const QRgb mask_data[] = { 0x2000000,0x2000000,0x2000000,0x0 }; -static const QRgb others_grey_data[] = { +static const TQRgb others_grey_data[] = { 0x0,0x0,0x0,0xa4c4c4c,0x5d676767,0x777c7c7c,0x3d555555,0x0,0x0,0x0,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x17535353,0xd2afafaf,0xffebebeb,0xffe5e5e5,0xfec2c2c2,0x906d6d6d,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0xa09c9c9c,0xfff1f1f1,0xfff5f5f5,0xffe6e6e6,0xffd4d4d4,0xffbebebe,0x4c424242,0x117b7b7b, @@ -92,7 +92,7 @@ static const QRgb others_grey_data[] = { 0x542e2e2e,0x200f0f0f,0x0,0x0 }; -static const QRgb others_data[] = { +static const TQRgb others_data[] = { 0x0,0x0,0x0,0xa804618,0x5d95643a,0x77a77c52,0x3d855126,0x0,0x0,0x0,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x17964f11,0xd2cfb190,0xfff8efdf,0xffffeccb,0xfeedce98,0x909b703f,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0xa0d29e66,0xfffff7e3,0xfffff8ec,0xffffedce,0xffffe0a9,0xfff5cd88,0x4c6f4316,0x11f72300, @@ -114,7 +114,7 @@ static const QRgb others_data[] = { 0x5403065a,0x2000001e,0x0,0x0 }; -static const QRgb user_green_data[] = { +static const TQRgb user_green_data[] = { 0x0,0x0,0x0,0x0,0x5029,0x6c1c6e21,0xe332aa3b,0xf83ac841,0xf838c83f,0xda369a3b,0x5a145819,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x7e1a6c1e,0xff32da39,0xff3de341,0xff3ee045,0xff3ee042,0xff3de345,0xff27d930,0x68125817, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1f013105,0xf721a328,0xff22de27,0xff23dd27,0xff26dc26,0xff26dc2a,0xff22de27, @@ -136,7 +136,7 @@ static const QRgb user_green_data[] = { 0x1c020604,0x0,0x0,0x0 }; -static const QRgb user_grey_data[] = { +static const TQRgb user_grey_data[] = { 0x0,0x0,0x0,0x0,0x404040,0x6c6e6e6e,0xe3b0b0b0,0xf8cecece,0xf8cccccc,0xdaa6a6a6,0x5a575757,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x7e6b6b6b,0xffd6d6d6,0xffe6e6e6,0xffe4e4e4,0xffe4e4e4,0xffe6e6e6,0xffcccccc,0x68555555, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1f282828,0xf79d9d9d,0xffcccccc,0xffcdcdcd,0xffcecece,0xffcecece,0xffcccccc, @@ -158,7 +158,7 @@ static const QRgb user_grey_data[] = { 0x1c070707,0x0,0x0,0x0 }; -static const QRgb user_data[] = { +static const TQRgb user_data[] = { 0x0,0x0,0x0,0x0,0x7f,0x6c2c68af,0xe384abdb,0xf8b2ccea,0xf8aecae9,0xda7ba3d1,0x5a20508d,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x7e2a66ac,0xffb8d4f3,0xffd2e5f9,0xffd0e3f8,0xffcfe3f8,0xffd3e5f9,0xffa7c9f0,0x681d4e8c, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1f02244d,0xf75c9ade,0xffa6cbf2,0xffa7ccf2,0xffa9cef2,0xffa9cdf2,0xffa6ccf2, @@ -180,7 +180,7 @@ static const QRgb user_data[] = { 0x1c040409,0x0,0x0,0x0 }; -static const QRgb yes_data[] = { +static const TQRgb yes_data[] = { 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x11049c00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, @@ -202,7 +202,7 @@ static const QRgb yes_data[] = { 0x0,0x0,0x0,0x0 }; -static const QRgb yespartial_data[] = { +static const TQRgb yespartial_data[] = { 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,0x114e4e4e,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, @@ -228,20 +228,20 @@ static struct EmbedImage { int width, height, depth; const unsigned char *data; int numColors; - const QRgb *colorTable; + const TQRgb *colorTable; bool alpha; const char *name; } embed_image_vec[] = { - { 16, 16, 32, (const unsigned char*)group_grey_data, 0, 0, TRUE, "group-grey" }, - { 16, 16, 32, (const unsigned char*)group_data, 0, 0, TRUE, "group" }, - { 16, 16, 32, (const unsigned char*)mask_data, 0, 0, TRUE, "mask" }, - { 16, 16, 32, (const unsigned char*)others_grey_data, 0, 0, TRUE, "others-grey" }, - { 16, 16, 32, (const unsigned char*)others_data, 0, 0, TRUE, "others" }, - { 16, 16, 32, (const unsigned char*)user_green_data, 0, 0, TRUE, "user-green" }, - { 16, 16, 32, (const unsigned char*)user_grey_data, 0, 0, TRUE, "user-grey" }, - { 16, 16, 32, (const unsigned char*)user_data, 0, 0, TRUE, "user" }, - { 16, 16, 32, (const unsigned char*)yes_data, 0, 0, TRUE, "yes" }, - { 16, 16, 32, (const unsigned char*)yespartial_data, 0, 0, TRUE, "yespartial" }, + { 16, 16, 32, (const unsigned char*)group_grey_data, 0, 0, true, "group-grey" }, + { 16, 16, 32, (const unsigned char*)group_data, 0, 0, true, "group" }, + { 16, 16, 32, (const unsigned char*)mask_data, 0, 0, true, "mask" }, + { 16, 16, 32, (const unsigned char*)others_grey_data, 0, 0, true, "others-grey" }, + { 16, 16, 32, (const unsigned char*)others_data, 0, 0, true, "others" }, + { 16, 16, 32, (const unsigned char*)user_green_data, 0, 0, true, "user-green" }, + { 16, 16, 32, (const unsigned char*)user_grey_data, 0, 0, true, "user-grey" }, + { 16, 16, 32, (const unsigned char*)user_data, 0, 0, true, "user" }, + { 16, 16, 32, (const unsigned char*)yes_data, 0, 0, true, "yes" }, + { 16, 16, 32, (const unsigned char*)yespartial_data, 0, 0, true, "yespartial" }, { 0, 0, 0, 0, 0, 0, 0, 0 } }; @@ -256,11 +256,11 @@ static const TQImage& qembed_findImage( const TQString& name ) embed_image_vec[i].width, embed_image_vec[i].height, embed_image_vec[i].depth, - (QRgb*)embed_image_vec[i].colorTable, + (TQRgb*)embed_image_vec[i].colorTable, embed_image_vec[i].numColors, TQImage::BigEndian ); if ( embed_image_vec[i].alpha ) - img->setAlphaBuffer( TRUE ); + img->setAlphaBuffer( true ); dict.insert( name, img ); break; } diff --git a/tdeio/tdefile/kacleditwidget.cpp b/tdeio/tdefile/kacleditwidget.cpp index 7e8e3dae2..dec306643 100644 --- a/tdeio/tdefile/kacleditwidget.cpp +++ b/tdeio/tdefile/kacleditwidget.cpp @@ -74,16 +74,16 @@ KACLEditWidget::KACLEditWidget( TQWidget *parent, const char *name ) TQHBox *hbox = new TQHBox( parent ); hbox->setSpacing( KDialog::spacingHint() ); m_listView = new KACLListView( hbox, "acl_listview" ); - connect( m_listView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotUpdateButtons() ) ); + connect( m_listView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotUpdateButtons() ) ); TQVBox *vbox = new TQVBox( hbox ); vbox->setSpacing( KDialog::spacingHint() ); m_AddBtn = new TQPushButton( i18n( "Add Entry..." ), vbox, "add_entry_button" ); - connect( m_AddBtn, TQT_SIGNAL( clicked() ), m_listView, TQT_SLOT( slotAddEntry() ) ); + connect( m_AddBtn, TQ_SIGNAL( clicked() ), m_listView, TQ_SLOT( slotAddEntry() ) ); m_EditBtn = new TQPushButton( i18n( "Edit Entry..." ), vbox, "edit_entry_button" ); - connect( m_EditBtn, TQT_SIGNAL( clicked() ), m_listView, TQT_SLOT( slotEditEntry() ) ); + connect( m_EditBtn, TQ_SIGNAL( clicked() ), m_listView, TQ_SLOT( slotEditEntry() ) ); m_DelBtn = new TQPushButton( i18n( "Delete Entry" ), vbox, "delete_entry_button" ); - connect( m_DelBtn, TQT_SIGNAL( clicked() ), m_listView, TQT_SLOT( slotRemoveEntry() ) ); + connect( m_DelBtn, TQ_SIGNAL( clicked() ), m_listView, TQ_SLOT( slotRemoveEntry() ) ); TQWidget *spacer = new TQWidget( vbox ); spacer->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ); slotUpdateButtons(); @@ -213,7 +213,7 @@ void KACLListViewItem::paintCell( TQPainter* p, const TQColorGroup &cg, const bool lastNonDefault = !isDefault && below && below->isDefault; if ( type == KACLListView::Mask || lastUser || lastNonDefault ) { - p->setPen( TQPen( Qt::gray, 0, TQPen::DotLine ) ); + p->setPen( TQPen( TQt::gray, 0, TQPen::DotLine ) ); if ( type == KACLListView::Mask ) p->drawLine( 0, 0, width - 1, 0 ); p->drawLine( 0, height() - 1, width - 1, height() - 1 ); @@ -409,10 +409,10 @@ EditACLEntryDialog::EditACLEntryDialog( KACLListView *listView, KACLListViewItem if ( allowDefaults ) { m_defaultCB = new TQCheckBox( i18n("Default for new files in this folder"), page, "defaultCB" ); mainLayout->addWidget( m_defaultCB ); - connect( m_defaultCB, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotUpdateAllowedUsersAndGroups() ) ); - connect( m_defaultCB, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotUpdateAllowedTypes() ) ); + connect( m_defaultCB, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotUpdateAllowedUsersAndGroups() ) ); + connect( m_defaultCB, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotUpdateAllowedTypes() ) ); } @@ -431,8 +431,8 @@ EditACLEntryDialog::EditACLEntryDialog( KACLListView *listView, KACLListViewItem TQRadioButton *namedGroupType = new TQRadioButton( i18n("Named Group"), m_buttonGroup, "namedGroupType" ); m_buttonGroup->insert( namedGroupType, KACLListView::NamedGroup ); - connect( m_buttonGroup, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotSelectionChanged( int ) ) ); + connect( m_buttonGroup, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotSelectionChanged( int ) ) ); m_widgetStack = new TQWidgetStack( page ); mainLayout->addWidget( m_widgetStack ); @@ -1051,4 +1051,3 @@ bool KACLListView::defaultMaskCanBeDeleted() const #include "kacleditwidget.moc" #include "kacleditwidget_p.moc" #endif -// vim:set ts=8 sw=4: diff --git a/tdeio/tdefile/kacleditwidget.h b/tdeio/tdefile/kacleditwidget.h index 43f4b2fca..9cbbe1385 100644 --- a/tdeio/tdefile/kacleditwidget.h +++ b/tdeio/tdefile/kacleditwidget.h @@ -24,10 +24,6 @@ #include <config.h> #endif -#ifdef Q_MOC_RUN -#define USE_POSIX_ACL -#endif // Q_MOC_RUN - #ifdef USE_POSIX_ACL #include <tdelistview.h> @@ -40,7 +36,7 @@ class TQPushButton; class KACLEditWidget : TQWidget { - Q_OBJECT + TQ_OBJECT public: KACLEditWidget( TQWidget *parent = 0, const char *name = 0 ); diff --git a/tdeio/tdefile/kacleditwidget_p.h b/tdeio/tdefile/kacleditwidget_p.h index 41e265053..dcbc10de6 100644 --- a/tdeio/tdefile/kacleditwidget_p.h +++ b/tdeio/tdefile/kacleditwidget_p.h @@ -24,10 +24,6 @@ #include <config.h> #endif -#ifdef Q_MOC_RUN -#define USE_POSIX_ACL -#endif // Q_MOC_RUN - #ifdef USE_POSIX_ACL #include <tdelistview.h> #include <sys/acl.h> @@ -49,7 +45,7 @@ class TQCheckBox; */ class KACLListView : public TDEListView { - Q_OBJECT + TQ_OBJECT friend class KACLListViewItem; public: @@ -133,7 +129,7 @@ private: class EditACLEntryDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: EditACLEntryDialog( KACLListView *listView, KACLListViewItem *item, diff --git a/tdeio/tdefile/kcombiview.cpp b/tdeio/tdefile/kcombiview.cpp index 4c4f0cb06..da685daa9 100644 --- a/tdeio/tdefile/kcombiview.cpp +++ b/tdeio/tdefile/kcombiview.cpp @@ -56,8 +56,8 @@ KCombiView::KCombiView( TQWidget *parent, const char *name) left->setAcceptDrops(false); left->installEventFilter( this ); - connect( sig, TQT_SIGNAL( sortingChanged( TQDir::SortSpec ) ), - TQT_SLOT( slotSortingChanged( TQDir::SortSpec ) )); + connect( sig, TQ_SIGNAL( sortingChanged( TQDir::SortSpec ) ), + TQ_SLOT( slotSortingChanged( TQDir::SortSpec ) )); } KCombiView::~KCombiView() @@ -358,9 +358,9 @@ bool KCombiView::eventFilter( TQObject *o, TQEvent *e ) // only the focused view may have a selection if ( type == TQEvent::FocusIn ) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(left) ) + if ( o == left ) right->clearSelection(); - else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(right->widget()) ) + else if ( o == right->widget() ) left->clearSelection(); } diff --git a/tdeio/tdefile/kcombiview.h b/tdeio/tdefile/kcombiview.h index af3680571..cf1736409 100644 --- a/tdeio/tdefile/kcombiview.h +++ b/tdeio/tdefile/kcombiview.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* This file is part of the KDE libraries Copyright (C) 1998 Stephan Kulow <coolo@kde.org> 1998 Daniel Grana <grana@ie.iwi.unibe.ch> @@ -54,7 +54,7 @@ class TQIconViewItem; class TDEIO_EXPORT KCombiView : public TQSplitter, public KFileView { - Q_OBJECT + TQ_OBJECT public: KCombiView( TQWidget *parent, const char *name); diff --git a/tdeio/tdefile/kcustommenueditor.cpp b/tdeio/tdefile/kcustommenueditor.cpp index b59108071..77f3ebef0 100644 --- a/tdeio/tdefile/kcustommenueditor.cpp +++ b/tdeio/tdefile/kcustommenueditor.cpp @@ -29,7 +29,7 @@ #include <kiconloader.h> #include <tdelistview.h> #include <kservice.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfigbase.h> #include <kopenwith.h> @@ -94,13 +94,13 @@ KCustomMenuEditor::KCustomMenuEditor(TQWidget *parent) m_listView->addColumn(i18n("Menu")); m_listView->setFullWidth(true); m_listView->setSorting(-1); - KButtonBox *buttonBox = new KButtonBox(page, Qt::Vertical); - buttonBox->addButton(i18n("New..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewItem())); - d->pbRemove=buttonBox->addButton(i18n("Remove"), TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem())); - d->pbMoveUp=buttonBox->addButton(i18n("Move Up"), TQT_TQOBJECT(this), TQT_SLOT(slotMoveUp())); - d->pbMoveDown=buttonBox->addButton(i18n("Move Down"), TQT_TQOBJECT(this), TQT_SLOT(slotMoveDown())); + KButtonBox *buttonBox = new KButtonBox(page, TQt::Vertical); + buttonBox->addButton(i18n("New..."), this, TQ_SLOT(slotNewItem())); + d->pbRemove=buttonBox->addButton(i18n("Remove"), this, TQ_SLOT(slotRemoveItem())); + d->pbMoveUp=buttonBox->addButton(i18n("Move Up"), this, TQ_SLOT(slotMoveUp())); + d->pbMoveDown=buttonBox->addButton(i18n("Move Down"), this, TQ_SLOT(slotMoveDown())); buttonBox->layout(); - connect( m_listView, TQT_SIGNAL( selectionChanged () ), this, TQT_SLOT( refreshButton() ) ); + connect( m_listView, TQ_SIGNAL( selectionChanged () ), this, TQ_SLOT( refreshButton() ) ); refreshButton(); } diff --git a/tdeio/tdefile/kcustommenueditor.h b/tdeio/tdefile/kcustommenueditor.h index cb43c606f..c0f43343e 100644 --- a/tdeio/tdefile/kcustommenueditor.h +++ b/tdeio/tdefile/kcustommenueditor.h @@ -32,7 +32,7 @@ class TDEConfigBase; */ class TDEIO_EXPORT KCustomMenuEditor : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** * Create a dialog for editing a custom menu diff --git a/tdeio/tdefile/kdirselectdialog.cpp b/tdeio/tdefile/kdirselectdialog.cpp index 8087f206d..11a6f6512 100644 --- a/tdeio/tdefile/kdirselectdialog.cpp +++ b/tdeio/tdefile/kdirselectdialog.cpp @@ -73,10 +73,10 @@ static KURL rootUrl(const KURL &url) KURL root = url; root.setPath( "/" ); - if (!kapp->authorizeURLAction("list", KURL(), root)) + if (!tdeApp->authorizeURLAction("list", KURL(), root)) { root = KURL::fromPathOrURL( TQDir::homeDirPath() ); - if (!kapp->authorizeURLAction("list", KURL(), root)) + if (!tdeApp->authorizeURLAction("list", KURL(), root)) { root = url; } @@ -99,8 +99,8 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly, TQHBoxLayout *hlay = new TQHBoxLayout( page, 0, spacingHint() ); m_mainLayout = new TQVBoxLayout(); d->speedBar = new KFileSpeedBar( page, "speedbar" ); - connect( d->speedBar, TQT_SIGNAL( activated( const KURL& )), - TQT_SLOT( setCurrentURL( const KURL& )) ); + connect( d->speedBar, TQ_SIGNAL( activated( const KURL& )), + TQ_SLOT( setCurrentURL( const KURL& )) ); hlay->addWidget( d->speedBar, 0 ); hlay->addLayout( m_mainLayout, 1 ); @@ -118,15 +118,15 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly, d->urlCombo->setCompletionObject( comp, true ); d->urlCombo->setAutoDeleteCompletionObject( true ); d->urlCombo->setDuplicatesEnabled( false ); - connect( d->urlCombo, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotComboTextChanged( const TQString& ) )); + connect( d->urlCombo, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotComboTextChanged( const TQString& ) )); m_contextMenu = new TQPopupMenu( this ); - TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotMkdir() ), TQT_TQOBJECT(this)); + TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder-new", 0, this, TQ_SLOT( slotMkdir() ), this); newFolder->plug(m_contextMenu); m_contextMenu->insertSeparator(); - m_showHiddenFolders = new TDEToggleAction ( i18n( "Show Hidden Folders" ), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotShowHiddenFoldersToggled() ), TQT_TQOBJECT(this)); + m_showHiddenFolders = new TDEToggleAction ( i18n( "Show Hidden Folders" ), 0, this, + TQ_SLOT( slotShowHiddenFoldersToggled() ), this); m_showHiddenFolders->plug(m_contextMenu); d->startURL = KFileDialog::getStartURL( startDir, d->recentDirClass ); @@ -151,15 +151,15 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly, m_mainLayout->addWidget( m_treeView, 1 ); m_mainLayout->addWidget( d->urlCombo, 0 ); - connect( m_treeView, TQT_SIGNAL( currentChanged( TQListViewItem * )), - TQT_SLOT( slotCurrentChanged() )); - connect( m_treeView, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & )), - TQT_SLOT( slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ))); + connect( m_treeView, TQ_SIGNAL( currentChanged( TQListViewItem * )), + TQ_SLOT( slotCurrentChanged() )); + connect( m_treeView, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & )), + TQ_SLOT( slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ))); - connect( d->urlCombo, TQT_SIGNAL( activated( const TQString& )), - TQT_SLOT( slotURLActivated( const TQString& ))); - connect( d->urlCombo, TQT_SIGNAL( returnPressed( const TQString& )), - TQT_SLOT( slotURLActivated( const TQString& ))); + connect( d->urlCombo, TQ_SIGNAL( activated( const TQString& )), + TQ_SLOT( slotURLActivated( const TQString& ))); + connect( d->urlCombo, TQ_SIGNAL( returnPressed( const TQString& )), + TQ_SLOT( slotURLActivated( const TQString& ))); setCurrentURL( d->startURL ); } @@ -194,10 +194,10 @@ void KDirSelectDialog::setCurrentURL( const KURL& url ) d->branch = createBranch( root ); } - d->branch->disconnect( TQT_SIGNAL( populateFinished( KFileTreeViewItem * )), - this, TQT_SLOT( slotNextDirToList( KFileTreeViewItem *))); - connect( d->branch, TQT_SIGNAL( populateFinished( KFileTreeViewItem * )), - TQT_SLOT( slotNextDirToList( KFileTreeViewItem * ) )); + d->branch->disconnect( TQ_SIGNAL( populateFinished( KFileTreeViewItem * )), + this, TQ_SLOT( slotNextDirToList( KFileTreeViewItem *))); + connect( d->branch, TQ_SIGNAL( populateFinished( KFileTreeViewItem * )), + TQ_SLOT( slotNextDirToList( KFileTreeViewItem * ) )); KURL dirToList = root; d->dirsToList.clear(); @@ -260,8 +260,8 @@ void KDirSelectDialog::slotNextDirToList( KFileTreeViewItem *item ) openNextDir( item ); else { - d->branch->disconnect( TQT_SIGNAL( populateFinished( KFileTreeViewItem * )), - this, TQT_SLOT( slotNextDirToList( KFileTreeViewItem *))); + d->branch->disconnect( TQ_SIGNAL( populateFinished( KFileTreeViewItem * )), + this, TQ_SLOT( slotNextDirToList( KFileTreeViewItem *))); view()->setCurrentItem( item ); item->setSelected( true ); } diff --git a/tdeio/tdefile/kdirselectdialog.h b/tdeio/tdefile/kdirselectdialog.h index 400bd3232..fa71ab35f 100644 --- a/tdeio/tdefile/kdirselectdialog.h +++ b/tdeio/tdefile/kdirselectdialog.h @@ -38,7 +38,7 @@ class TDEToggleAction; */ class TDEIO_EXPORT KDirSelectDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeio/tdefile/kdirsize.cpp b/tdeio/tdefile/kdirsize.cpp index b2d48b4bf..40d0b5d13 100644 --- a/tdeio/tdefile/kdirsize.cpp +++ b/tdeio/tdefile/kdirsize.cpp @@ -35,7 +35,7 @@ KDirSize::KDirSize( const KURL & directory ) KDirSize::KDirSize( const KFileItemList & lstItems ) : TDEIO::Job(false /*No GUI*/), m_bAsync(true), m_totalSize(0L), m_totalFiles(0L), m_totalSubdirs(0L), m_lstItems(lstItems) { - TQTimer::singleShot( 0, this, TQT_SLOT(processList()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(processList()) ); } void KDirSize::processList() @@ -70,9 +70,9 @@ void KDirSize::processList() void KDirSize::startNextJob( const KURL & url ) { TDEIO::ListJob * listJob = TDEIO::listRecursive( url, false /* no GUI */ ); - connect( listJob, TQT_SIGNAL(entries( TDEIO::Job *, + connect( listJob, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList& )), - TQT_SLOT( slotEntries( TDEIO::Job*, + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ))); addSubjob( listJob ); } diff --git a/tdeio/tdefile/kdirsize.h b/tdeio/tdefile/kdirsize.h index 210080950..8526eeff6 100644 --- a/tdeio/tdefile/kdirsize.h +++ b/tdeio/tdefile/kdirsize.h @@ -29,7 +29,7 @@ */ class TDEIO_EXPORT KDirSize : public TDEIO::Job { - Q_OBJECT + TQ_OBJECT protected: KDirSize( const KURL & directory ); KDirSize( const KFileItemList & lstItems ); diff --git a/tdeio/tdefile/kdiskfreesp.cpp b/tdeio/tdefile/kdiskfreesp.cpp index 1552e01d2..487fb51e1 100644 --- a/tdeio/tdefile/kdiskfreesp.cpp +++ b/tdeio/tdefile/kdiskfreesp.cpp @@ -27,7 +27,7 @@ #include <tqtextstream.h> #include <kdebug.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeio/global.h> #include <config-tdefile.h> @@ -48,10 +48,10 @@ KDiskFreeSp::KDiskFreeSp(TQObject *parent, const char *name) { dfProc = new TDEProcess(); TQ_CHECK_PTR(dfProc); dfProc->setEnvironment("LANGUAGE", "C"); - connect( dfProc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int) ), - this, TQT_SLOT (receivedDFStdErrOut(TDEProcess *, char *, int)) ); - connect(dfProc,TQT_SIGNAL(processExited(TDEProcess *) ), - this, TQT_SLOT(dfDone() ) ); + connect( dfProc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int) ), + this, TQ_SLOT (receivedDFStdErrOut(TDEProcess *, char *, int)) ); + connect(dfProc,TQ_SIGNAL(processExited(TDEProcess *) ), + this, TQ_SLOT(dfDone() ) ); readingDFStdErrOut=false; } diff --git a/tdeio/tdefile/kdiskfreesp.h b/tdeio/tdefile/kdiskfreesp.h index 5ffa47d9a..f17a10372 100644 --- a/tdeio/tdefile/kdiskfreesp.h +++ b/tdeio/tdefile/kdiskfreesp.h @@ -38,7 +38,7 @@ class TDEProcess; * information for a given partition (mount point). */ class TDEIO_EXPORT KDiskFreeSp : public TQObject -{ Q_OBJECT +{ TQ_OBJECT public: KDiskFreeSp( TQObject *parent=0, const char *name=0 ); /** diff --git a/tdeio/tdefile/kencodingfiledialog.cpp b/tdeio/tdefile/kencodingfiledialog.cpp index d2d588a4e..971c10378 100644 --- a/tdeio/tdefile/kencodingfiledialog.cpp +++ b/tdeio/tdefile/kencodingfiledialog.cpp @@ -1,4 +1,3 @@ -// -*- c++ -*- /* This file is part of the KDE libraries Copyright (C) 2003 Joseph Wenninger <jowenn@kde.org> 2003 Andras Mantia <amantia@freemail.hu> diff --git a/tdeio/tdefile/kencodingfiledialog.h b/tdeio/tdefile/kencodingfiledialog.h index 8659122fb..607a19493 100644 --- a/tdeio/tdefile/kencodingfiledialog.h +++ b/tdeio/tdefile/kencodingfiledialog.h @@ -1,4 +1,3 @@ -// -*- c++ -*- /* This file is part of the KDE libraries Copyright (C) 2003 Joseph Wenninger <jowenn@kde.org> 2003 Andras Mantia <amantia@freemail.hu> @@ -38,7 +37,7 @@ struct KEncodingFileDialogPrivate; class TDEIO_EXPORT KEncodingFileDialog : public KFileDialog { - Q_OBJECT + TQ_OBJECT public: class Result { diff --git a/tdeio/tdefile/kicondialog.cpp b/tdeio/tdefile/kicondialog.cpp index 154f9e89d..8a5de95ee 100644 --- a/tdeio/tdefile/kicondialog.cpp +++ b/tdeio/tdefile/kicondialog.cpp @@ -1,4 +1,4 @@ -/* vi: ts=8 sts=4 sw=4 +/* * * This file is part of the KDE project, module tdefile. * Copyright (C) 2000 Geert Jansen <jansen@kde.org> @@ -16,13 +16,14 @@ #include <config.h> #include <assert.h> +#include <list> #include <kiconviewsearchline.h> #include <tdeapplication.h> #include <tdelocale.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <kprogress.h> #include <kiconview.h> @@ -32,7 +33,6 @@ #include <tqlayout.h> #include <tqstring.h> #include <tqstringlist.h> -#include <tqsortedlist.h> #include <tqimage.h> #include <tqpixmap.h> #include <tqlabel.h> @@ -93,9 +93,9 @@ TDEIconCanvas::TDEIconCanvas(TQWidget *parent, const char *name) { d = new TDEIconCanvasPrivate; mpTimer = new TQTimer(this); - connect(mpTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotLoadFiles())); - connect(this, TQT_SIGNAL(currentChanged(TQIconViewItem *)), - TQT_SLOT(slotCurrentChanged(TQIconViewItem *))); + connect(mpTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotLoadFiles())); + connect(this, TQ_SIGNAL(currentChanged(TQIconViewItem *)), + TQ_SLOT(slotCurrentChanged(TQIconViewItem *))); setGridX(80); setWordWrapIconText(false); setShowToolTips(true); @@ -119,7 +119,7 @@ void TDEIconCanvas::loadFiles(const TQStringList& files) void TDEIconCanvas::slotLoadFiles() { setResizeMode(Fixed); - TQApplication::setOverrideCursor(tqwaitCursor); + TQApplication::setOverrideCursor(TQt::waitCursor); // disable updates to not trigger paint events when adding child items setUpdatesEnabled( false ); @@ -135,7 +135,7 @@ void TDEIconCanvas::slotLoadFiles() TQStringList::ConstIterator end(mFiles.end()); for (it=mFiles.begin(), i=0; it!=end; ++it, i++) { - // Calling kapp->processEvents() makes the iconview flicker like hell + // Calling tdeApp->processEvents() makes the iconview flicker like hell // (it's being repainted once for every new item), so we don't do this. // Instead, we directly repaint the progress bar without going through // the event-loop. We do that just once for every 10th item so that @@ -146,7 +146,7 @@ void TDEIconCanvas::slotLoadFiles() } emitProgress++; -// kapp->processEvents(); +// tdeApp->processEvents(); if ( !d->m_bLoading ) // user clicked on a button that will load another set of icons break; TQImage img; @@ -180,7 +180,7 @@ void TDEIconCanvas::slotLoadFiles() TQPixmap pm; pm.convertFromImage(img); TQFileInfo fi(*it); - TQIconViewItem *item = new TQIconViewItem(this, fi.baseName(), pm); + TQIconViewItem *item = new TQIconViewItem(this, fi.baseName(true), pm); item->setKey(*it); item->setDragEnabled(false); item->setDropEnabled(false); @@ -267,16 +267,16 @@ void TDEIconDialog::init() TQVBoxLayout *top = new TQVBoxLayout(main); top->setSpacing( spacingHint() ); - TQButtonGroup *bgroup = new TQButtonGroup(0, Qt::Vertical, i18n("Icon Source"), main); + TQButtonGroup *bgroup = new TQButtonGroup(0, TQt::Vertical, i18n("Icon Source"), main); bgroup->layout()->setSpacing(KDialog::spacingHint()); bgroup->layout()->setMargin(KDialog::marginHint()); top->addWidget(bgroup); - connect(bgroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotButtonClicked(int))); + connect(bgroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotButtonClicked(int))); TQGridLayout *grid = new TQGridLayout(bgroup->layout(), 3, 2); mpRb1 = new TQRadioButton(i18n("S&ystem icons:"), bgroup); grid->addWidget(mpRb1, 1, 0); mpCombo = new TQComboBox(bgroup); - connect(mpCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotContext(int))); + connect(mpCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotContext(int))); grid->addWidget(mpCombo, 1, 1); mpRb2 = new TQRadioButton(i18n("O&ther icons:"), bgroup); grid->addWidget(mpRb2, 2, 0); @@ -303,7 +303,7 @@ void TDEIconDialog::init() // signals and slots connections - connect(clearSearch, TQT_SIGNAL(clicked()), d->searchLine, TQT_SLOT(clear())); + connect(clearSearch, TQ_SIGNAL(clicked()), d->searchLine, TQ_SLOT(clear())); TQString wtstr = i18n("Search interactively for icon names (e.g. folder)."); TQWhatsThis::add(searchLabel, wtstr); @@ -311,20 +311,20 @@ void TDEIconDialog::init() mpCanvas = new TDEIconCanvas(main); - connect(mpCanvas, TQT_SIGNAL(executed(TQIconViewItem *)), TQT_SLOT(slotAcceptIcons())); - connect(mpCanvas, TQT_SIGNAL(returnPressed(TQIconViewItem *)), TQT_SLOT(slotAcceptIcons())); + connect(mpCanvas, TQ_SIGNAL(executed(TQIconViewItem *)), TQ_SLOT(slotAcceptIcons())); + connect(mpCanvas, TQ_SIGNAL(returnPressed(TQIconViewItem *)), TQ_SLOT(slotAcceptIcons())); mpCanvas->setMinimumSize(400, 125); top->addWidget(mpCanvas); d->searchLine->setIconView(mpCanvas); mpProgress = new KProgress(main); top->addWidget(mpProgress); - connect(mpCanvas, TQT_SIGNAL(startLoading(int)), TQT_SLOT(slotStartLoading(int))); - connect(mpCanvas, TQT_SIGNAL(progress(int)), TQT_SLOT(slotProgress(int))); - connect(mpCanvas, TQT_SIGNAL(finished()), TQT_SLOT(slotFinished())); + connect(mpCanvas, TQ_SIGNAL(startLoading(int)), TQ_SLOT(slotStartLoading(int))); + connect(mpCanvas, TQ_SIGNAL(progress(int)), TQ_SLOT(slotProgress(int))); + connect(mpCanvas, TQ_SIGNAL(finished()), TQ_SLOT(slotFinished())); // When pressing Ok or Cancel, stop loading icons - connect(this, TQT_SIGNAL(hidden()), mpCanvas, TQT_SLOT(stopLoading())); + connect(this, TQ_SIGNAL(hidden()), mpCanvas, TQ_SLOT(stopLoading())); static const char* const context_text[] = { I18N_NOOP( "Actions" ), @@ -401,17 +401,16 @@ void TDEIconDialog::showIcons() else filelist=mFileList; - TQSortedList <IconPath>iconlist; - iconlist.setAutoDelete(true); + std::list<IconPath> iconlist; TQStringList::Iterator it; for( it = filelist.begin(); it != filelist.end(); ++it ) - iconlist.append(new IconPath(*it)); + iconlist.push_back(IconPath(*it)); iconlist.sort(); filelist.clear(); - for ( IconPath *ip=iconlist.first(); ip != 0; ip=iconlist.next() ) - filelist.append(*ip); + for (const IconPath &ip : iconlist) + filelist.append(ip); d->searchLine->clear(); mpCanvas->loadFiles(filelist); @@ -511,7 +510,7 @@ TQString TDEIconDialog::openDialog() if (name.isEmpty() || (mType == 1)) return name; TQFileInfo fi(name); - return fi.baseName(); + return fi.baseName(true); } return TQString::null; } @@ -536,7 +535,7 @@ void TDEIconDialog::slotOk() if (!name.isEmpty() && (mType != 1)) { TQFileInfo fi(name); - name = fi.baseName(); + name = fi.baseName(true); } } @@ -679,7 +678,7 @@ void TDEIconButton::init( TDEIconLoader *loader ) mpLoader = loader; mpDialog = 0L; - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotChangeIcon())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotChangeIcon())); } TDEIconButton::~TDEIconButton() @@ -723,7 +722,7 @@ void TDEIconButton::setIcon(const TQString& icon) if (!mpDialog) { mpDialog = new TDEIconDialog(mpLoader, this); - connect(mpDialog, TQT_SIGNAL(newIconName(const TQString&)), TQT_SLOT(newIconName(const TQString&))); + connect(mpDialog, TQ_SIGNAL(newIconName(const TQString&)), TQ_SLOT(newIconName(const TQString&))); } if ( mbUser ) @@ -741,7 +740,7 @@ void TDEIconButton::slotChangeIcon() if (!mpDialog) { mpDialog = new TDEIconDialog(mpLoader, this); - connect(mpDialog, TQT_SIGNAL(newIconName(const TQString&)), TQT_SLOT(newIconName(const TQString&))); + connect(mpDialog, TQ_SIGNAL(newIconName(const TQString&)), TQ_SLOT(newIconName(const TQString&))); } mpDialog->setup( mGroup, mContext, d->m_bStrictIconSize, d->iconSize, mbUser ); diff --git a/tdeio/tdefile/kicondialog.h b/tdeio/tdefile/kicondialog.h index 351de929d..1feb75dce 100644 --- a/tdeio/tdefile/kicondialog.h +++ b/tdeio/tdefile/kicondialog.h @@ -1,4 +1,4 @@ -/* vi: ts=8 sts=4 sw=4 +/* * * This file is part of the KDE project, module tdefile. * Copyright (C) 2000 Geert Jansen <jansen@kde.org> @@ -34,7 +34,7 @@ class TDEIconLoader; */ class TDEIO_EXPORT TDEIconCanvas: public TDEIconView { - Q_OBJECT + TQ_OBJECT public: TDEIconCanvas(TQWidget *parent=0L, const char *name=0L); @@ -90,7 +90,7 @@ private: */ class TDEIO_EXPORT TDEIconDialog: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** @@ -256,7 +256,7 @@ private: */ class TDEIO_EXPORT TDEIconButton: public TQPushButton { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString icon READ icon WRITE setIcon RESET resetIcon ) TQ_PROPERTY( int iconSize READ iconSize WRITE setIconSize) TQ_PROPERTY( bool strictIconSize READ strictIconSize WRITE setStrictIconSize ) diff --git a/tdeio/tdefile/kimagefilepreview.cpp b/tdeio/tdefile/kimagefilepreview.cpp index f96be72fc..3b6468016 100644 --- a/tdeio/tdefile/kimagefilepreview.cpp +++ b/tdeio/tdefile/kimagefilepreview.cpp @@ -19,7 +19,7 @@ #include <tdeglobal.h> #include <kiconloader.h> #include <kpushbutton.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tdelocale.h> #include <tdefiledialog.h> @@ -43,7 +43,7 @@ KImageFilePreview::KImageFilePreview( TQWidget *parent ) imageLabel = new TQLabel( this ); imageLabel->setFrameStyle( TQFrame::NoFrame ); - imageLabel->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter ); + imageLabel->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); imageLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding) ); vb->addWidget( imageLabel ); @@ -53,14 +53,14 @@ KImageFilePreview::KImageFilePreview( TQWidget *parent ) autoPreview = new TQCheckBox( i18n("&Automatic preview"), this ); autoPreview->setChecked( autoMode ); hb->addWidget( autoPreview ); - connect( autoPreview, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleAuto(bool)) ); + connect( autoPreview, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggleAuto(bool)) ); previewButton = new KPushButton( SmallIconSet("thumbnail"), i18n("&Preview"), this ); hb->addWidget( previewButton ); - connect( previewButton, TQT_SIGNAL(clicked()), TQT_SLOT(showPreview()) ); + connect( previewButton, TQ_SIGNAL(clicked()), TQ_SLOT(showPreview()) ); timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(showPreview()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(showPreview()) ); setSupportedMimeTypes( TDEIO::PreviewJob::supportedMimeTypes() ); } @@ -109,14 +109,14 @@ void KImageFilePreview::showPreview( const KURL &url, bool force ) if ( force ) // explicitly requested previews shall always be generated! m_job->setIgnoreMaximumSize( true ); - connect( m_job, TQT_SIGNAL( result( TDEIO::Job * )), - this, TQT_SLOT( slotResult( TDEIO::Job * ))); - connect( m_job, TQT_SIGNAL( gotPreview( const KFileItem*, + connect( m_job, TQ_SIGNAL( result( TDEIO::Job * )), + this, TQ_SLOT( slotResult( TDEIO::Job * ))); + connect( m_job, TQ_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )), - TQT_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) )); + TQ_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) )); - connect( m_job, TQT_SIGNAL( failed( const KFileItem* )), - this, TQT_SLOT( slotFailed( const KFileItem* ) )); + connect( m_job, TQ_SIGNAL( failed( const KFileItem* )), + this, TQ_SLOT( slotFailed( const KFileItem* ) )); } } } diff --git a/tdeio/tdefile/kimagefilepreview.h b/tdeio/tdefile/kimagefilepreview.h index 0604e08f0..984c1b476 100644 --- a/tdeio/tdefile/kimagefilepreview.h +++ b/tdeio/tdefile/kimagefilepreview.h @@ -30,7 +30,7 @@ namespace TDEIO { class Job; class PreviewJob; } */ class TDEIO_EXPORT KImageFilePreview : public KPreviewWidgetBase { - Q_OBJECT + TQ_OBJECT public: KImageFilePreview(TQWidget *parent); diff --git a/tdeio/tdefile/kmetaprops.cpp b/tdeio/tdefile/kmetaprops.cpp index 21c75e0ce..88dff7415 100644 --- a/tdeio/tdefile/kmetaprops.cpp +++ b/tdeio/tdefile/kmetaprops.cpp @@ -150,7 +150,7 @@ void KFileMetaPropsPlugin::createLayout() if (itemList.isEmpty()) continue; - TQGroupBox *groupBox = new TQGroupBox(2, Qt::Horizontal, + TQGroupBox *groupBox = new TQGroupBox(2, TQt::Horizontal, TQStyleSheet::escape(mtinfo->groupInfo(*git)->translatedName()), d->m_frame); @@ -184,7 +184,7 @@ void KFileMetaPropsPlugin::createLayout() if (!val) kdDebug(7033) << "didn't get a validator for " << *git << "/" << (*iit).key() << endl; w = new KFileMetaInfoWidget(*iit, val, groupBox); d->m_editWidgets.append( w ); - connect(w, TQT_SIGNAL(valueChanged(const TQVariant&)), this, TQT_SIGNAL(changed())); + connect(w, TQ_SIGNAL(valueChanged(const TQVariant&)), this, TQ_SIGNAL(changed())); } // and then the read only items @@ -203,7 +203,7 @@ void KFileMetaPropsPlugin::createLayout() /* d->m_add = new TQPushButton(i18n("&Add"), topframe); d->m_add->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); - connect(d->m_add, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAdd())); + connect(d->m_add, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAdd())); tmp->addWidget(d->m_add); // if nothing can be added, deactivate it diff --git a/tdeio/tdefile/kmetaprops.h b/tdeio/tdefile/kmetaprops.h index c842499dd..f0b37ecff 100644 --- a/tdeio/tdefile/kmetaprops.h +++ b/tdeio/tdefile/kmetaprops.h @@ -30,7 +30,7 @@ class KFileMetaInfoItem; */ class TDEIO_EXPORT KFileMetaPropsPlugin : public KPropsDlgPlugin { - Q_OBJECT + TQ_OBJECT public: /** * Constructor diff --git a/tdeio/tdefile/knotifydialog.cpp b/tdeio/tdefile/knotifydialog.cpp index 5d1aba62d..37d748f65 100644 --- a/tdeio/tdefile/knotifydialog.cpp +++ b/tdeio/tdefile/knotifydialog.cpp @@ -33,7 +33,7 @@ #include <tdemessagebox.h> #include <knotifyclient.h> #include <knotifydialog.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurlrequester.h> #include <tdeio/netaccess.h> @@ -133,7 +133,7 @@ namespace KNotify TQHeader *header = static_cast<TQHeader*>( parentWidget() ); int section = 0; - if ( header->orientation() == Qt::Horizontal ) + if ( header->orientation() == TQt::Horizontal ) section= header->sectionAt( p.x() ); else section= header->sectionAt( p.y() ); @@ -170,8 +170,8 @@ KNotifyDialog::KNotifyDialog( TQWidget *parent, const char *name, bool modal, if ( aboutData ) addApplicationEvents( aboutData->appName() ); - connect( this, TQT_SIGNAL( okClicked() ), m_notifyWidget, TQT_SLOT( save() )); - connect( this, TQT_SIGNAL( applyClicked() ), m_notifyWidget, TQT_SLOT( save() )); + connect( this, TQ_SIGNAL( okClicked() ), m_notifyWidget, TQ_SLOT( save() )); + connect( this, TQ_SIGNAL( applyClicked() ), m_notifyWidget, TQ_SLOT( save() )); } KNotifyDialog::~KNotifyDialog() @@ -264,47 +264,47 @@ KNotifyWidget::KNotifyWidget( TQWidget *parent, const char *name, d->toolTip = new KNotifyToolTip( header ); m_playButton->setIconSet( SmallIconSet( "media-playback-start" ) ); - connect( m_playButton, TQT_SIGNAL( clicked() ), TQT_SLOT( playSound() )); - - connect( m_listview, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), - TQT_SLOT( slotEventChanged( TQListViewItem * ) )); - connect( m_listview, TQT_SIGNAL(clicked( TQListViewItem *, const TQPoint&, int)), - TQT_SLOT( slotItemClicked( TQListViewItem *, const TQPoint&, int ))); - - connect( m_playSound, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( soundToggled( bool )) ); - connect( m_logToFile, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( loggingToggled( bool )) ); - connect( m_execute, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( executeToggled( bool )) ); - connect( m_messageBox, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( messageBoxChanged() ) ); - connect( m_passivePopup, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( messageBoxChanged() ) ); - connect( m_stderr, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( stderrToggled( bool ) ) ); - connect( m_taskbar, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( taskbarToggled( bool ) ) ); - - connect( m_soundPath, TQT_SIGNAL( textChanged( const TQString& )), - TQT_SLOT( soundFileChanged( const TQString& ))); - connect( m_logfilePath, TQT_SIGNAL( textChanged( const TQString& )), - TQT_SLOT( logfileChanged( const TQString& ) )); - connect( m_executePath, TQT_SIGNAL( textChanged( const TQString& )), - TQT_SLOT( commandlineChanged( const TQString& ) )); - - connect( m_soundPath, TQT_SIGNAL( openFileDialog( KURLRequester * )), - TQT_SLOT( openSoundDialog( KURLRequester * ))); - connect( m_logfilePath, TQT_SIGNAL( openFileDialog( KURLRequester * )), - TQT_SLOT( openLogDialog( KURLRequester * ))); - connect( m_executePath, TQT_SIGNAL( openFileDialog( KURLRequester * )), - TQT_SLOT( openExecDialog( KURLRequester * ))); - - connect( m_extension, TQT_SIGNAL( clicked() ), - TQT_SLOT( toggleAdvanced()) ); - - connect( m_buttonEnable, TQT_SIGNAL( clicked() ), TQT_SLOT( enableAll() )); - connect( m_buttonDisable, TQT_SIGNAL( clicked() ), TQT_SLOT( enableAll() )); + connect( m_playButton, TQ_SIGNAL( clicked() ), TQ_SLOT( playSound() )); + + connect( m_listview, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), + TQ_SLOT( slotEventChanged( TQListViewItem * ) )); + connect( m_listview, TQ_SIGNAL(clicked( TQListViewItem *, const TQPoint&, int)), + TQ_SLOT( slotItemClicked( TQListViewItem *, const TQPoint&, int ))); + + connect( m_playSound, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( soundToggled( bool )) ); + connect( m_logToFile, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( loggingToggled( bool )) ); + connect( m_execute, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( executeToggled( bool )) ); + connect( m_messageBox, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( messageBoxChanged() ) ); + connect( m_passivePopup, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( messageBoxChanged() ) ); + connect( m_stderr, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( stderrToggled( bool ) ) ); + connect( m_taskbar, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( taskbarToggled( bool ) ) ); + + connect( m_soundPath, TQ_SIGNAL( textChanged( const TQString& )), + TQ_SLOT( soundFileChanged( const TQString& ))); + connect( m_logfilePath, TQ_SIGNAL( textChanged( const TQString& )), + TQ_SLOT( logfileChanged( const TQString& ) )); + connect( m_executePath, TQ_SIGNAL( textChanged( const TQString& )), + TQ_SLOT( commandlineChanged( const TQString& ) )); + + connect( m_soundPath, TQ_SIGNAL( openFileDialog( KURLRequester * )), + TQ_SLOT( openSoundDialog( KURLRequester * ))); + connect( m_logfilePath, TQ_SIGNAL( openFileDialog( KURLRequester * )), + TQ_SLOT( openLogDialog( KURLRequester * ))); + connect( m_executePath, TQ_SIGNAL( openFileDialog( KURLRequester * )), + TQ_SLOT( openExecDialog( KURLRequester * ))); + + connect( m_extension, TQ_SIGNAL( clicked() ), + TQ_SLOT( toggleAdvanced()) ); + + connect( m_buttonEnable, TQ_SIGNAL( clicked() ), TQ_SLOT( enableAll() )); + connect( m_buttonDisable, TQ_SIGNAL( clicked() ), TQ_SLOT( enableAll() )); TQString whatsThis = i18n("<qt>You may use the following macros<br>" "in the commandline:<br>" @@ -816,11 +816,11 @@ void KNotifyWidget::save() ++it; } - if ( kapp ) + if ( tdeApp ) { - if ( !kapp->dcopClient()->isAttached() ) - kapp->dcopClient()->attach(); - kapp->dcopClient()->send("knotify", "", "reconfigure()", TQString("")); + if ( !tdeApp->dcopClient()->isAttached() ) + tdeApp->dcopClient()->attach(); + tdeApp->dcopClient()->send("knotify", "", "reconfigure()", TQString("")); } emit changed( false ); @@ -851,8 +851,8 @@ Event * KNotifyWidget::currentEvent() void KNotifyWidget::openSoundDialog( KURLRequester *requester ) { // only need to init this once - requester->disconnect( TQT_SIGNAL( openFileDialog( KURLRequester * )), - this, TQT_SLOT( openSoundDialog( KURLRequester * ))); + requester->disconnect( TQ_SIGNAL( openFileDialog( KURLRequester * )), + this, TQ_SLOT( openSoundDialog( KURLRequester * ))); KFileDialog *fileDialog = requester->fileDialog(); fileDialog->setCaption( i18n("Select Sound File") ); @@ -887,8 +887,8 @@ void KNotifyWidget::openSoundDialog( KURLRequester *requester ) void KNotifyWidget::openLogDialog( KURLRequester *requester ) { // only need to init this once - requester->disconnect( TQT_SIGNAL( openFileDialog( KURLRequester * )), - this, TQT_SLOT( openLogDialog( KURLRequester * ))); + requester->disconnect( TQ_SIGNAL( openFileDialog( KURLRequester * )), + this, TQ_SLOT( openLogDialog( KURLRequester * ))); KFileDialog *fileDialog = requester->fileDialog(); fileDialog->setCaption( i18n("Select Log File") ); @@ -900,8 +900,8 @@ void KNotifyWidget::openLogDialog( KURLRequester *requester ) void KNotifyWidget::openExecDialog( KURLRequester *requester ) { // only need to init this once - requester->disconnect( TQT_SIGNAL( openFileDialog( KURLRequester * )), - this, TQT_SLOT( openExecDialog( KURLRequester * ))); + requester->disconnect( TQ_SIGNAL( openFileDialog( KURLRequester * )), + this, TQ_SLOT( openExecDialog( KURLRequester * ))); KFileDialog *fileDialog = requester->fileDialog(); diff --git a/tdeio/tdefile/knotifydialog.h b/tdeio/tdefile/knotifydialog.h index c8b5b21ac..c9f3fed8d 100644 --- a/tdeio/tdefile/knotifydialog.h +++ b/tdeio/tdefile/knotifydialog.h @@ -21,7 +21,7 @@ #include <tdelistview.h> #include <kdialogbase.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include "knotifywidgetbase.h" @@ -51,7 +51,7 @@ namespace KNotify */ class TDEIO_EXPORT KNotifyDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** @@ -188,7 +188,7 @@ namespace KNotify */ class TDEIO_EXPORT KNotifyWidget : public KNotifyWidgetBase { - Q_OBJECT + TQ_OBJECT public: KNotifyWidget( TQWidget* parent = 0, const char* name = 0, diff --git a/tdeio/tdefile/kopenwith.cpp b/tdeio/tdefile/kopenwith.cpp index 8124db5e5..3e51f0b20 100644 --- a/tdeio/tdefile/kopenwith.cpp +++ b/tdeio/tdefile/kopenwith.cpp @@ -37,7 +37,7 @@ #include <tdeapplication.h> #include <kbuttonbox.h> #include <kcombobox.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kdialog.h> #include <tdeglobal.h> #include <klineedit.h> @@ -45,7 +45,7 @@ #include <kiconloader.h> #include <kmimemagic.h> #include <krun.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstringhandler.h> #include <kuserprofile.h> #include <kurlcompletion.h> @@ -157,10 +157,10 @@ TDEApplicationTree::TDEApplicationTree( TQWidget *parent ) addDesktopGroup( TQString::null ); cleanupTree(); - connect( this, TQT_SIGNAL( currentChanged(TQListViewItem*) ), - TQT_SLOT( slotItemHighlighted(TQListViewItem*) ) ); - connect( this, TQT_SIGNAL( selectionChanged(TQListViewItem*) ), - TQT_SLOT( slotSelectionChanged(TQListViewItem*) ) ); + connect( this, TQ_SIGNAL( currentChanged(TQListViewItem*) ), + TQ_SLOT( slotItemHighlighted(TQListViewItem*) ) ); + connect( this, TQ_SIGNAL( selectionChanged(TQListViewItem*) ), + TQ_SLOT( slotSelectionChanged(TQListViewItem*) ) ); } // ---------------------------------------------------------------------- @@ -388,7 +388,7 @@ void KOpenWithDlg::setServiceType( const KURL::List& _urls ) void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) { d = new KOpenWithDlgPrivate; - bool bReadOnly = kapp && !kapp->authorize("shell_access"); + bool bReadOnly = tdeApp && !tdeApp->authorize("shell_access"); m_terminaldirty = false; m_pTree = 0L; m_pService = 0L; @@ -404,7 +404,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) TQToolButton *clearButton = new TQToolButton( this ); clearButton->setIconSet( BarIcon( "locationbar_erase" ) ); clearButton->setFixedSize( clearButton->sizeHint() ); - connect( clearButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotClear() ) ); + connect( clearButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotClear() ) ); TQToolTip::add( clearButton, i18n( "Clear input field" ) ); hbox->addWidget( clearButton ); @@ -455,23 +455,23 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) edit->comboBox()->setAutoDeleteCompletionObject( true ); } - connect ( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotOK()) ); - connect ( edit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotTextChanged()) ); + connect ( edit, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotOK()) ); + connect ( edit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotTextChanged()) ); m_pTree = new TDEApplicationTree( this ); topLayout->addWidget(m_pTree); - connect( m_pTree, TQT_SIGNAL( selected( const TQString&, const TQString&, const TQString& ) ), - TQT_SLOT( slotSelected( const TQString&, const TQString&, const TQString& ) ) ); - connect( m_pTree, TQT_SIGNAL( highlighted( const TQString&, const TQString&, const TQString& ) ), - TQT_SLOT( slotHighlighted( const TQString&, const TQString&, const TQString& ) ) ); - connect( m_pTree, TQT_SIGNAL( doubleClicked(TQListViewItem*) ), - TQT_SLOT( slotDbClick() ) ); + connect( m_pTree, TQ_SIGNAL( selected( const TQString&, const TQString&, const TQString& ) ), + TQ_SLOT( slotSelected( const TQString&, const TQString&, const TQString& ) ) ); + connect( m_pTree, TQ_SIGNAL( highlighted( const TQString&, const TQString&, const TQString& ) ), + TQ_SLOT( slotHighlighted( const TQString&, const TQString&, const TQString& ) ) ); + connect( m_pTree, TQ_SIGNAL( doubleClicked(TQListViewItem*) ), + TQ_SLOT( slotDbClick() ) ); terminal = new TQCheckBox( i18n("Run in &terminal"), this ); if (bReadOnly) terminal->hide(); - connect(terminal, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTerminalToggled(bool))); + connect(terminal, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotTerminalToggled(bool))); topLayout->addWidget(terminal); @@ -509,10 +509,10 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) d->ok = b->addButton( KStdGuiItem::ok() ); d->ok->setDefault( true ); - connect( d->ok, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOK() ) ); + connect( d->ok, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOK() ) ); TQPushButton* cancel = b->addButton( KStdGuiItem::cancel() ); - connect( cancel, TQT_SIGNAL( clicked() ), TQT_SLOT( reject() ) ); + connect( cancel, TQ_SIGNAL( clicked() ), TQ_SLOT( reject() ) ); b->layout(); topLayout->addWidget( b ); @@ -739,15 +739,15 @@ void KOpenWithDlg::slotOK() maxPreference = offerList.first().preference(); } - KDesktopFile *desktop = 0; + TDEDesktopFile *desktop = 0; if (!oldPath.isEmpty() && (oldPath != newPath)) { - KDesktopFile orig(oldPath, true); + TDEDesktopFile orig(oldPath, true); desktop = orig.copyTo(newPath); } else { - desktop = new KDesktopFile(newPath); + desktop = new TDEDesktopFile(newPath); } desktop->writeEntry("Type", TQString::fromLatin1("Application")); desktop->writeEntry("Name", initialServiceName); @@ -776,7 +776,7 @@ void KOpenWithDlg::slotOK() if ( !qServiceType.isEmpty() ) { // Also make sure the "auto embed" setting for this mimetype is off - KDesktopFile mimeDesktop( locateLocal( "mime", qServiceType + ".desktop" ) ); + TDEDesktopFile mimeDesktop( locateLocal( "mime", qServiceType + ".desktop" ) ); mimeDesktop.writeEntry( "X-TDE-AutoEmbed", false ); mimeDesktop.sync(); } diff --git a/tdeio/tdefile/kopenwith.h b/tdeio/tdefile/kopenwith.h index e0482b87a..99a047082 100644 --- a/tdeio/tdefile/kopenwith.h +++ b/tdeio/tdefile/kopenwith.h @@ -45,7 +45,7 @@ class KOpenWithDlgPrivate; */ class TDEIO_EXPORT KOpenWithDlg : public TQDialog //#TODO: Use KDialogBase for KDE4 { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeio/tdefile/kopenwith_p.h b/tdeio/tdefile/kopenwith_p.h index 4f6d53107..ecdbdd6e6 100644 --- a/tdeio/tdefile/kopenwith_p.h +++ b/tdeio/tdefile/kopenwith_p.h @@ -73,7 +73,7 @@ protected: */ class TDEApplicationTree : public TDEListView { - Q_OBJECT + TQ_OBJECT public: TDEApplicationTree( TQWidget *parent ); diff --git a/tdeio/tdefile/kpreviewprops.cpp b/tdeio/tdefile/kpreviewprops.cpp index c45330893..d5288e822 100644 --- a/tdeio/tdefile/kpreviewprops.cpp +++ b/tdeio/tdefile/kpreviewprops.cpp @@ -54,7 +54,7 @@ void KPreviewPropsPlugin::createLayout() preview = new KFileMetaPreview(topframe); tmp->addWidget(preview) ; - connect( properties, TQT_SIGNAL( aboutToShowPage( TQWidget * ) ), TQT_SLOT( aboutToShowPage( TQWidget* ) ) ); + connect( properties, TQ_SIGNAL( aboutToShowPage( TQWidget * ) ), TQ_SLOT( aboutToShowPage( TQWidget* ) ) ); } KPreviewPropsPlugin::~KPreviewPropsPlugin() @@ -79,10 +79,10 @@ bool KPreviewPropsPlugin::supports( KFileItemList _items ) void KPreviewPropsPlugin::aboutToShowPage( TQWidget* widget ) { - if ( TQT_TQOBJECT(widget) != TQT_TQOBJECT(preview->parent()) ) + if ( widget != preview->parent() ) return; - disconnect( properties, TQT_SIGNAL( aboutToShowPage( TQWidget * ) ), this, TQT_SLOT( aboutToShowPage( TQWidget* ) ) ); + disconnect( properties, TQ_SIGNAL( aboutToShowPage( TQWidget * ) ), this, TQ_SLOT( aboutToShowPage( TQWidget* ) ) ); preview->showPreview(properties->item()->url()); } diff --git a/tdeio/tdefile/kpreviewprops.h b/tdeio/tdefile/kpreviewprops.h index d934af22a..4e7e5fbf3 100644 --- a/tdeio/tdefile/kpreviewprops.h +++ b/tdeio/tdefile/kpreviewprops.h @@ -31,7 +31,7 @@ class KFileMetaPreview; */ class TDEIO_EXPORT KPreviewPropsPlugin : public KPropsDlgPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeio/tdefile/kpreviewwidgetbase.h b/tdeio/tdefile/kpreviewwidgetbase.h index 3597070ee..ba3fed7dd 100644 --- a/tdeio/tdefile/kpreviewwidgetbase.h +++ b/tdeio/tdefile/kpreviewwidgetbase.h @@ -43,7 +43,7 @@ class KURL; */ class TDEIO_EXPORT KPreviewWidgetBase : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp index ae8aae85d..cfd57d7cc 100644 --- a/tdeio/tdefile/kpropertiesdialog.cpp +++ b/tdeio/tdefile/kpropertiesdialog.cpp @@ -92,14 +92,14 @@ extern "C" { #include <kdirnotify_stub.h> #include <kdiskfreesp.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kicondialog.h> #include <kurl.h> #include <kurlrequester.h> #include <tdelocale.h> #include <tdeglobal.h> #include <tdeglobalsettings.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeio/job.h> #include <tdeio/chmodjob.h> #include <tdeio/renamedlg.h> @@ -120,7 +120,7 @@ extern "C" { #include <tdeparts/componentfactory.h> #include <kmetaprops.h> #include <kpreviewprops.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <krun.h> #include <tdelistview.h> #include <kacl.h> @@ -135,7 +135,7 @@ extern "C" { #include "kpropertiesdialog.h" -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN # include <win32_utils.h> #endif @@ -289,7 +289,7 @@ KPropertiesDialog::KPropertiesDialog (const KURL& _tempUrl, const KURL& _current bool KPropertiesDialog::showDialog(KFileItem* item, TQWidget* parent, const char* name, bool modal) { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN TQString localPath = item->localPath(); if (!localPath.isEmpty()) return showWin32FilePropertyDialog(localPath); @@ -301,7 +301,7 @@ bool KPropertiesDialog::showDialog(KFileItem* item, TQWidget* parent, bool KPropertiesDialog::showDialog(const KURL& _url, TQWidget* parent, const char* name, bool modal) { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN if (_url.isLocalFile()) return showWin32FilePropertyDialog( _url.path() ); #endif @@ -372,8 +372,8 @@ KPropertiesDialog::~KPropertiesDialog() void KPropertiesDialog::insertPlugin (KPropsDlgPlugin* plugin) { - connect (plugin, TQT_SIGNAL (changed ()), - plugin, TQT_SLOT (setDirty ())); + connect (plugin, TQ_SIGNAL (changed ()), + plugin, TQ_SLOT (setDirty ())); m_pageList.append (plugin); } @@ -498,7 +498,7 @@ void KPropertiesDialog::insertPages() insertPlugin (p); } - if ( kapp->authorizeTDEAction("sharefile") && + if ( tdeApp->authorizeTDEAction("sharefile") && KFileSharePropsPlugin::supports( m_items ) ) { KPropsDlgPlugin *p = new KFileSharePropsPlugin( this ); @@ -529,7 +529,7 @@ void KPropertiesDialog::insertPages() { KPropsDlgPlugin *plugin = KParts::ComponentFactory ::createInstanceFromLibrary<KPropsDlgPlugin>( (*it)->library().local8Bit().data(), - TQT_TQOBJECT(this), + this, (*it)->name().latin1() ); if ( !plugin ) continue; @@ -754,7 +754,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) grid->setColStretch(1, 0); grid->setColStretch(2, 1); grid->addColSpacing(1, KDialog::spacingHint()); - vbl->addLayout(TQT_TQLAYOUT(grid)); + vbl->addLayout(grid); int curRow = 0; if ( !d->bMultiple ) @@ -800,7 +800,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) filename = nameFromFileName( filename ); if ( d->bKDesktopMode && d->bDesktopFile ) { - KDesktopFile config( url.path(), true /* readonly */ ); + TDEDesktopFile config( url.path(), true /* readonly */ ); if ( config.hasKey( "Name" ) ) { filename = config.readName(); } @@ -875,7 +875,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) // So we have to really open .desktop files TQString iconStr = KMimeType::findByURL( url, mode )->icon( url, isLocal ); if ( bDesktopFile && isLocal ) { - KDesktopFile config( url.path(), true ); + TDEDesktopFile config( url.path(), true ); config.setDesktopGroup(); iconStr = config.readEntry( "Icon" ); if ( config.hasDeviceType() ) { @@ -890,8 +890,8 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) } iconButton->setIcon(iconStr); iconArea = iconButton; - connect( iconButton, TQT_SIGNAL( iconChanged(TQString) ), - this, TQT_SLOT( slotIconChanged() ) ); + connect( iconButton, TQ_SIGNAL( iconChanged(TQString) ), + this, TQ_SLOT( slotIconChanged() ) ); } else { TQLabel *iconLabel = new TQLabel( d->m_frame ); int bsize = 66 + 2 * iconLabel->style().pixelMetric(TQStyle::PM_ButtonMargin); @@ -906,7 +906,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) } iconArea = iconLabel; } - grid->addWidget(iconArea, curRow, 0, Qt::AlignLeft); + grid->addWidget(iconArea, curRow, 0, TQt::AlignLeft); if (d->bMultiple || isTrash || isDevice || isMediaNode || hasRoot) { @@ -935,8 +935,8 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) d->m_lined->setSelection(0, lastDot); } - connect( d->m_lined, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( nameFileChanged(const TQString & ) ) ); + connect( d->m_lined, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( nameFileChanged(const TQString & ) ) ); } grid->addWidget(nameArea, curRow++, 2); @@ -956,7 +956,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) box->setSpacing(20); l = new TQLabel(mimeComment, box ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 //TODO: wrap for win32 or mac? TQPushButton *button = new TQPushButton(box); @@ -969,9 +969,9 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) else TQToolTip::add(button, i18n("Edit file type")); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditFileType() )); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEditFileType() )); - if (!kapp->authorizeTDEAction("editfiletype")) + if (!tdeApp->authorizeTDEAction("editfiletype")) button->hide(); #endif @@ -1024,14 +1024,14 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) // buttons m_sizeDetermineButton = new TQPushButton( i18n("Calculate"), d->m_frame ); m_sizeStopButton = new TQPushButton( i18n("Stop"), d->m_frame ); - connect( m_sizeDetermineButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSizeDetermine() ) ); - connect( m_sizeStopButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSizeStop() ) ); + connect( m_sizeDetermineButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSizeDetermine() ) ); + connect( m_sizeStopButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSizeStop() ) ); sizelay->addWidget(m_sizeDetermineButton, 0); sizelay->addWidget(m_sizeStopButton, 0); sizelay->addStretch(10); // so that the buttons don't grow horizontally - // auto-launch for local dirs only, and not for '/' - if ( isLocal && !hasRoot ) + // auto-launch for local dirs only, but not for '/' or medias + if ( isReallyLocal && !hasRoot ) { m_sizeDetermineButton->setText( i18n("Refresh") ); slotSizeDetermine(); @@ -1110,9 +1110,9 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) grid->addWidget( d->m_freeSpaceLabel, curRow++, 2 ); KDiskFreeSp * job = new KDiskFreeSp; - connect( job, TQT_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&, + connect( job, TQ_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&, const unsigned long&, const TQString& ) ), - this, TQT_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&, + this, TQ_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&, const unsigned long&, const TQString& ) ) ); job->readDF( mountPoint ); } @@ -1142,7 +1142,7 @@ void KFilePropsPlugin::setFileNameReadOnly( bool ro ) void KFilePropsPlugin::slotEditFileType() { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TQString mime; if ( d->mimeType == KMimeType::defaultMimeType() ) { int pos = d->oldFileName.findRev( '.' ); @@ -1274,11 +1274,11 @@ void KFilePropsPlugin::slotSizeDetermine() kdDebug(250) << " URL=" << properties->item()->url().url() << endl; d->dirSizeJob = KDirSize::dirSizeJob( properties->items() ); d->dirSizeUpdateTimer = new TQTimer(this); - connect( d->dirSizeUpdateTimer, TQT_SIGNAL( timeout() ), - TQT_SLOT( slotDirSizeUpdate() ) ); + connect( d->dirSizeUpdateTimer, TQ_SIGNAL( timeout() ), + TQ_SLOT( slotDirSizeUpdate() ) ); d->dirSizeUpdateTimer->start(500); - connect( d->dirSizeJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotDirSizeFinished( TDEIO::Job * ) ) ); + connect( d->dirSizeJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotDirSizeFinished( TDEIO::Job * ) ) ); m_sizeStopButton->setEnabled(true); m_sizeDetermineButton->setEnabled(false); @@ -1291,9 +1291,9 @@ void KFilePropsPlugin::slotSizeDetermine() TQString mountPoint = TDEIO::findPathMountPoint( url.path() ); KDiskFreeSp * job = new KDiskFreeSp; - connect( job, TQT_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&, + connect( job, TQ_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&, const unsigned long&, const TQString& ) ), - this, TQT_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&, + this, TQ_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&, const unsigned long&, const TQString& ) ) ); job->readDF( mountPoint ); } @@ -1336,7 +1336,7 @@ void KFilePropsPlugin::applyChanges() kdDebug(250) << "KFilePropsPlugin::applyChanges" << endl; - if (nameArea->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) + if (nameArea->inherits("TQLineEdit")) { TQString n = ((TQLineEdit *) nameArea)->text(); // Remove trailing spaces (#4345) @@ -1379,10 +1379,10 @@ void KFilePropsPlugin::applyChanges() job = TDEIO::copy( oldurl, properties->kurl() ); } - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotCopyFinished( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( renamed( TDEIO::Job *, const KURL &, const KURL & ) ), - TQT_SLOT( slotFileRenamed( TDEIO::Job *, const KURL &, const KURL & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotCopyFinished( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( renamed( TDEIO::Job *, const KURL &, const KURL & ) ), + TQ_SLOT( slotFileRenamed( TDEIO::Job *, const KURL &, const KURL & ) ) ); // wait for job TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); tqt_enter_modal(&dummy); @@ -1432,7 +1432,7 @@ void KFilePropsPlugin::slotCopyFinished( TDEIO::Job * job ) { kdDebug(250) << "KFilePropsPlugin::slotCopyFinished " << m_sRelativePath << endl; KURL newURL; - newURL.setPath( KDesktopFile::locateLocal(m_sRelativePath) ); + newURL.setPath( TDEDesktopFile::locateLocal(m_sRelativePath) ); kdDebug(250) << "KFilePropsPlugin::slotCopyFinished path=" << newURL.path() << endl; properties->updateUrl( newURL ); } @@ -1440,7 +1440,7 @@ void KFilePropsPlugin::slotCopyFinished( TDEIO::Job * job ) if ( d->bKDesktopMode && d->bDesktopFile ) { // Renamed? Update Name field if ( d->oldFileName != properties->kurl().fileName() || m_bFromTemplate ) { - KDesktopFile config( properties->kurl().path() ); + TDEDesktopFile config( properties->kurl().path() ); TQString nameStr = nameFromFileName(properties->kurl().fileName()); config.writeEntry( "Name", nameStr ); config.writeEntry( "Name", nameStr, true, false, true ); @@ -1450,7 +1450,7 @@ void KFilePropsPlugin::slotCopyFinished( TDEIO::Job * job ) void KFilePropsPlugin::applyIconChanges() { - TDEIconButton *iconButton = ::tqqt_cast<TDEIconButton *>( iconArea ); + TDEIconButton *iconButton = ::tqt_cast<TDEIconButton *>( iconArea ); if ( !iconButton || !d->bIconChanged ) return; // handle icon changes - only local files (or pseudo-local) for now @@ -1492,7 +1492,7 @@ void KFilePropsPlugin::applyIconChanges() } f.close(); - KDesktopFile cfg(path); + TDEDesktopFile cfg(path); kdDebug(250) << "sIcon = " << (sIcon) << endl; kdDebug(250) << "str = " << (str) << endl; cfg.writeEntry( "Icon", sIcon ); @@ -1676,7 +1676,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr TQPushButton* pbAdvancedPerm = 0; /* Group: Access Permissions */ - gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Access Permissions"), d->m_frame ); + gb = new TQGroupBox ( 0, TQt::Vertical, i18n("Access Permissions"), d->m_frame ); gb->layout()->setSpacing(KDialog::spacingHint()); gb->layout()->setMargin(KDialog::marginHint()); box->addWidget (gb); @@ -1698,7 +1698,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr l = d->ownerPermCombo = new TQComboBox(gb); lbl->setBuddy(l); gl->addWidget(l, 1, 1); - connect(l, TQT_SIGNAL( highlighted(int) ), this, TQT_SIGNAL( changed() )); + connect(l, TQ_SIGNAL( highlighted(int) ), this, TQ_SIGNAL( changed() )); TQWhatsThis::add(l, i18n("Specifies the actions that the owner is allowed to do.")); lbl = new TQLabel( i18n("Gro&up:"), gb); @@ -1706,7 +1706,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr l = d->groupPermCombo = new TQComboBox(gb); lbl->setBuddy(l); gl->addWidget(l, 2, 1); - connect(l, TQT_SIGNAL( highlighted(int) ), this, TQT_SIGNAL( changed() )); + connect(l, TQ_SIGNAL( highlighted(int) ), this, TQ_SIGNAL( changed() )); TQWhatsThis::add(l, i18n("Specifies the actions that the members of the group are allowed to do.")); lbl = new TQLabel( i18n("O&thers:"), gb); @@ -1714,7 +1714,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr l = d->othersPermCombo = new TQComboBox(gb); lbl->setBuddy(l); gl->addWidget(l, 3, 1); - connect(l, TQT_SIGNAL( highlighted(int) ), this, TQT_SIGNAL( changed() )); + connect(l, TQ_SIGNAL( highlighted(int) ), this, TQ_SIGNAL( changed() )); TQWhatsThis::add(l, i18n("Specifies the actions that all users, who are neither " "owner nor in the group, are allowed to do.")); @@ -1723,7 +1723,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr i18n("Only own&er can rename and delete folder content") : i18n("Is &executable"), gb ); - connect( d->extraCheckbox, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( changed() ) ); + connect( d->extraCheckbox, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( changed() ) ); gl->addWidget(l, 4, 1); TQWhatsThis::add(l, hasDir ? i18n("Enable this option to allow only the folder's owner to " "delete or rename the contained files and folders. Other " @@ -1733,19 +1733,19 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr "sense for programs and scripts. It is required when you want to " "execute them.")); - TQLayoutItem *spacer = TQT_TQLAYOUTITEM(new TQSpacerItem(0, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); + TQLayoutItem *spacer = new TQSpacerItem(0, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding); gl->addMultiCell(spacer, 5, 5, 0, 1); pbAdvancedPerm = new TQPushButton(i18n("A&dvanced Permissions"), gb); - gl->addMultiCellWidget(pbAdvancedPerm, 6, 6, 0, 1, Qt::AlignRight); - connect(pbAdvancedPerm, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotShowAdvancedPermissions() )); + gl->addMultiCellWidget(pbAdvancedPerm, 6, 6, 0, 1, TQt::AlignRight); + connect(pbAdvancedPerm, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotShowAdvancedPermissions() )); } else d->extraCheckbox = 0; /**** Group: Ownership ****/ - gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Ownership"), d->m_frame ); + gb = new TQGroupBox ( 0, TQt::Vertical, i18n("Ownership"), d->m_frame ); gb->layout()->setSpacing(KDialog::spacingHint()); gb->layout()->setMargin(KDialog::marginHint()); box->addWidget (gb); @@ -1781,8 +1781,8 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr TDEGlobalSettings::CompletionNone); usrEdit->setText(strOwner); gl->addWidget(usrEdit, 1, 1); - connect( usrEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); + connect( usrEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); } else { @@ -1863,8 +1863,8 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr grpEdit->setCompletionMode(TDEGlobalSettings::CompletionAuto); grpEdit->setText(strGroup); gl->addWidget(grpEdit, 2, 1); - connect( grpEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); + connect( grpEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); } else if ((groupList.count() > 1) && isMyFile && isLocal) { @@ -1872,8 +1872,8 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr grpCombo->insertStringList(groupList); grpCombo->setCurrentItem(groupList.findIndex(strGroup)); gl->addWidget(grpCombo, 2, 1); - connect( grpCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SIGNAL( changed() ) ); + connect( grpCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SIGNAL( changed() ) ); } else { @@ -1887,7 +1887,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr if ( hasDir && !isLink && !isTrash ) { d->cbRecursive = new TQCheckBox( i18n("Apply changes to all subfolders and their contents"), d->m_frame ); - connect( d->cbRecursive, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( changed() ) ); + connect( d->cbRecursive, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( changed() ) ); box->addWidget( d->cbRecursive ); } @@ -1941,7 +1941,7 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions() { TQVBox *mainVBox = dlg.makeVBoxMainWidget(); // Group: Access Permissions - gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Access Permissions"), mainVBox ); + gb = new TQGroupBox ( 0, TQt::Vertical, i18n("Access Permissions"), mainVBox ); gb->layout()->setSpacing(KDialog::spacingHint()); gb->layout()->setMargin(KDialog::marginHint()); @@ -2093,16 +2093,19 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions() { if ( col != 3 ) theNotSpecials.append( cb ); cba[row][col] = cb; cb->setChecked(aPermissions & fperm[row][col]); + if ( d->canChangePermissions ) + { + allDisable = false; + } if ( aPartialPermissions & fperm[row][col] ) { cb->setTristate(); - if( d->canChangePermissions ) { - allDisable = false; - } cb->setNoChange(); } else if (d->cbRecursive && d->cbRecursive->isChecked()) - cb->setTristate(); + { + cb->setTristate(); + } cb->setEnabled( d->canChangePermissions ); gl->addWidget (cb, row+2, col+1); @@ -2143,7 +2146,7 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions() { d->fileSystemSupportsACLs = fileSystemSupportsACL( pathCString ); } if ( d->fileSystemSupportsACLs ) { - std::for_each( theNotSpecials.begin(), theNotSpecials.end(), std::mem_fun( &TQWidget::hide ) ); + std::for_each( theNotSpecials.begin(), theNotSpecials.end(), std::mem_fn( &TQWidget::hide ) ); extendedACLs = new KACLEditWidget( mainVBox ); if ( d->extendedACL.isValid() && d->extendedACL.isExtended() ) extendedACLs->setACL( d->extendedACL ); @@ -2550,8 +2553,8 @@ void KFilePermissionsPropsPlugin::applyChanges() if ( defaultACLChange && d->fileSystemSupportsACLs ) job->addMetaData( "DEFAULT_ACL_STRING", d->defaultACL.isValid()?d->defaultACL.asString():"ACL_DELETE" ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotChmodResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotChmodResult( TDEIO::Job * ) ) ); // Wait for job TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); tqt_enter_modal(&dummy); @@ -2566,8 +2569,8 @@ void KFilePermissionsPropsPlugin::applyChanges() if ( defaultACLChange && d->fileSystemSupportsACLs ) job->addMetaData( "DEFAULT_ACL_STRING", d->defaultACL.isValid()?d->defaultACL.asString():"ACL_DELETE" ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotChmodResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotChmodResult( TDEIO::Job * ) ) ); // Wait for job TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); tqt_enter_modal(&dummy); @@ -2624,7 +2627,7 @@ KURLPropsPlugin::KURLPropsPlugin( KPropertiesDialog *_props ) } f.close(); - KSimpleConfig config( path ); + TDESimpleConfig config( path ); config.setDesktopGroup(); URLStr = config.readPathEntry( "URL" ); @@ -2638,8 +2641,8 @@ KURLPropsPlugin::KURLPropsPlugin( KPropertiesDialog *_props ) URLEdit->setURL( URLStr ); } - connect( URLEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); + connect( URLEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); layout->addStretch (1); } @@ -2664,7 +2667,7 @@ bool KURLPropsPlugin::supports( KFileItemList _items ) return false; // open file and check type - KDesktopFile config( item->url().path(), true /* readonly */ ); + TDEDesktopFile config( item->url().path(), true /* readonly */ ); return config.hasLinkType(); } @@ -2685,7 +2688,7 @@ void KURLPropsPlugin::applyChanges() } f.close(); - KSimpleConfig config( path ); + TDESimpleConfig config( path ); config.setDesktopGroup(); config.writeEntry( "Type", TQString::fromLatin1("Link")); config.writePathEntry( "URL", URLEdit->url() ); @@ -2776,7 +2779,7 @@ KBindingPropsPlugin::KBindingPropsPlugin( KPropertiesDialog *_props ) : KPropsDl return; f.close(); - KSimpleConfig config( _props->kurl().path() ); + TDESimpleConfig config( _props->kurl().path() ); config.setDesktopGroup(); TQString patternStr = config.readEntry( "Patterns" ); TQString iconStr = config.readEntry( "Icon" ); @@ -2795,14 +2798,14 @@ KBindingPropsPlugin::KBindingPropsPlugin( KPropertiesDialog *_props ) : KPropsDl else cbAutoEmbed->setNoChange(); - connect( patternEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( commentEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( mimeEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( cbAutoEmbed, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); + connect( patternEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( commentEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( mimeEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( cbAutoEmbed, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); } KBindingPropsPlugin::~KBindingPropsPlugin() @@ -2825,7 +2828,7 @@ bool KBindingPropsPlugin::supports( KFileItemList _items ) return false; // open file and check type - KDesktopFile config( item->url().path(), true /* readonly */ ); + TDEDesktopFile config( item->url().path(), true /* readonly */ ); return config.hasMimeTypeType(); } @@ -2842,7 +2845,7 @@ void KBindingPropsPlugin::applyChanges() } f.close(); - KSimpleConfig config( path ); + TDESimpleConfig config( path ); config.setDesktopGroup(); config.writeEntry( "Type", TQString::fromLatin1("MimeType") ); @@ -2921,8 +2924,8 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP device = new TQComboBox( true, d->m_frame, "ComboBox_device" ); device->insertStringList( devices ); layout->addWidget(device, 0, 1); - connect( device, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotActivated( int ) ) ); + connect( device, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotActivated( int ) ) ); readonly = new TQCheckBox( d->m_frame, "CheckBox_readonly" ); readonly->setText( i18n("Read only") ); @@ -2981,7 +2984,7 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP return; f.close(); - KSimpleConfig config( path ); + TDESimpleConfig config( path ); config.setDesktopGroup(); TQString deviceStr = config.readEntry( "Dev" ); TQString mountPointStr = config.readEntry( "MountPoint" ); @@ -3015,17 +3018,17 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP unmounted->setIcon( unmountedStr ); - connect( device, TQT_SIGNAL( activated( int ) ), - this, TQT_SIGNAL( changed() ) ); - connect( device, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( readonly, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( unmounted, TQT_SIGNAL( iconChanged( TQString ) ), - this, TQT_SIGNAL( changed() ) ); + connect( device, TQ_SIGNAL( activated( int ) ), + this, TQ_SIGNAL( changed() ) ); + connect( device, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( readonly, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( unmounted, TQ_SIGNAL( iconChanged( TQString ) ), + this, TQ_SIGNAL( changed() ) ); - connect( device, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( slotDeviceChanged() ) ); + connect( device, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( slotDeviceChanged() ) ); processLockouts(); } @@ -3062,9 +3065,9 @@ void KDevicePropsPlugin::updateInfo() if ( !mountpoint->text().isEmpty() ) { KDiskFreeSp * job = new KDiskFreeSp; - connect( job, TQT_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&, + connect( job, TQ_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&, const unsigned long&, const TQString& ) ), - this, TQT_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&, + this, TQ_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&, const unsigned long&, const TQString& ) ) ); job->readDF( mountpoint->text() ); @@ -3124,7 +3127,7 @@ bool KDevicePropsPlugin::supports( KFileItemList _items ) if ( !KPropsDlgPlugin::isDesktopFile( item ) ) return false; // open file and check type - KDesktopFile config( item->url().path(), true /* readonly */ ); + TDEDesktopFile config( item->url().path(), true /* readonly */ ); return config.hasDeviceType(); } @@ -3140,7 +3143,7 @@ void KDevicePropsPlugin::applyChanges() } f.close(); - KSimpleConfig config( path ); + TDESimpleConfig config( path ); config.setDesktopGroup(); config.writeEntry( "Type", TQString::fromLatin1("FSDevice") ); @@ -3184,16 +3187,16 @@ KDesktopPropsPlugin::KDesktopPropsPlugin( KPropertiesDialog *_props ) w->pathEdit->setMode(KFile::Directory | KFile::LocalOnly); w->pathEdit->lineEdit()->setAcceptDrops(false); - connect( w->nameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) ); - connect( w->genNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) ); - connect( w->commentEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) ); - connect( w->commandEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) ); - connect( w->pathEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) ); + connect( w->nameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) ); + connect( w->genNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) ); + connect( w->commentEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) ); + connect( w->commandEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) ); + connect( w->pathEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) ); - connect( w->browseButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBrowseExec() ) ); - connect( w->addFiletypeButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddFiletype() ) ); - connect( w->delFiletypeButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDelFiletype() ) ); - connect( w->advancedButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAdvanced() ) ); + connect( w->browseButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotBrowseExec() ) ); + connect( w->addFiletypeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddFiletype() ) ); + connect( w->delFiletypeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDelFiletype() ) ); + connect( w->advancedButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAdvanced() ) ); // now populate the page TQString path = _props->kurl().path(); @@ -3202,7 +3205,7 @@ KDesktopPropsPlugin::KDesktopPropsPlugin( KPropertiesDialog *_props ) return; f.close(); - KDesktopFile config( path ); + TDEDesktopFile config( path ); TQString nameStr = config.readName(); TQString genNameStr = config.readGenericName(); TQString commentStr = config.readComment(); @@ -3310,10 +3313,10 @@ void KDesktopPropsPlugin::slotAddFiletype() mw->listView->setFullWidth(true); mw->listView->setMinimumSize(500,400); - connect(mw->listView, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectMimetype())); - connect(mw->listView, TQT_SIGNAL(doubleClicked( TQListViewItem *, const TQPoint &, int )), - &dlg, TQT_SLOT( slotOk())); + connect(mw->listView, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectMimetype())); + connect(mw->listView, TQ_SIGNAL(doubleClicked( TQListViewItem *, const TQPoint &, int )), + &dlg, TQ_SLOT( slotOk())); TQMap<TQString,TQListViewItem*> majorMap; TQListViewItem *majorGroup; @@ -3428,7 +3431,7 @@ void KDesktopPropsPlugin::applyChanges() // coupled to the command. checkCommandChanged(); - KSimpleConfig config( path ); + TDESimpleConfig config( path ); config.setDesktopGroup(); config.writeEntry( "Type", TQString::fromLatin1("Application")); config.writeEntry( "Comment", w->commentEdit->text() ); @@ -3574,22 +3577,22 @@ void KDesktopPropsPlugin::slotAdvanced() delete kcom; } - connect( w->terminalEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( w->terminalCloseCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( w->terminalCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( w->suidCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( w->suidEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( w->startupInfoCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( w->systrayCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( w->dcopCombo, TQT_SIGNAL( highlighted( int ) ), - this, TQT_SIGNAL( changed() ) ); + connect( w->terminalEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( w->terminalCloseCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( w->terminalCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( w->suidCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( w->suidEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( w->startupInfoCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( w->systrayCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( w->dcopCombo, TQ_SIGNAL( highlighted( int ) ), + this, TQ_SIGNAL( changed() ) ); if ( dlg.exec() == TQDialog::Accepted ) { @@ -3624,8 +3627,8 @@ bool KDesktopPropsPlugin::supports( KFileItemList _items ) if ( !KPropsDlgPlugin::isDesktopFile( item ) ) return false; // open file and check type - KDesktopFile config( item->url().path(), true /* readonly */ ); - return config.hasApplicationType() && kapp->authorize("run_desktop_files") && kapp->authorize("shell_access"); + TDEDesktopFile config( item->url().path(), true /* readonly */ ); + return config.hasApplicationType() && tdeApp->authorize("run_desktop_files") && tdeApp->authorize("shell_access"); } void KPropertiesDialog::virtual_hook( int id, void* data ) @@ -3699,7 +3702,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) // The groupbox about swallowing TQGroupBox* tmpQGroupBox; tmpQGroupBox = new TQGroupBox( i18n("Panel Embedding"), d->m_frame ); - tmpQGroupBox->setColumnLayout( 0, Qt::Horizontal ); + tmpQGroupBox->setColumnLayout( 0, TQt::Horizontal ); mainlayout->addWidget(tmpQGroupBox); @@ -3726,7 +3729,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) // The groupbox about run in terminal tmpQGroupBox = new TQGroupBox( d->m_frame ); - tmpQGroupBox->setColumnLayout( 0, Qt::Horizontal ); + tmpQGroupBox->setColumnLayout( 0, TQt::Horizontal ); mainlayout->addWidget(tmpQGroupBox); @@ -3765,7 +3768,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) // The groupbox about run with substituted uid. tmpQGroupBox = new TQGroupBox( d->m_frame ); - tmpQGroupBox->setColumnLayout( 0, Qt::Horizontal ); + tmpQGroupBox->setColumnLayout( 0, TQt::Horizontal ); mainlayout->addWidget(tmpQGroupBox); @@ -3794,7 +3797,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) return; f.close(); - KSimpleConfig config( path ); + TDESimpleConfig config( path ); config.setDollarExpansion( false ); config.setDesktopGroup(); execStr = config.readPathEntry( "Exec" ); @@ -3848,27 +3851,27 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) delete kcom; } - connect( swallowExecEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( swallowTitleEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( execEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( terminalEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); + connect( swallowExecEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( swallowTitleEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( execEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( terminalEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); if (d->nocloseonexitCheck) - connect( d->nocloseonexitCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( terminalCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( suidCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( suidEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - - connect( execBrowse, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBrowseExec() ) ); - connect( terminalCheck, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableCheckedEdit() ) ); - connect( suidCheck, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableSuidEdit() ) ); + connect( d->nocloseonexitCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( terminalCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( suidCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( suidEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + + connect( execBrowse, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotBrowseExec() ) ); + connect( terminalCheck, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableCheckedEdit() ) ); + connect( suidCheck, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableSuidEdit() ) ); } @@ -3902,8 +3905,8 @@ bool KExecPropsPlugin::supports( KFileItemList _items ) if ( !KPropsDlgPlugin::isDesktopFile( item ) ) return false; // open file and check type - KDesktopFile config( item->url().path(), true /* readonly */ ); - return config.hasApplicationType() && kapp->authorize("run_desktop_files") && kapp->authorize("shell_access"); + TDEDesktopFile config( item->url().path(), true /* readonly */ ); + return config.hasApplicationType() && tdeApp->authorize("run_desktop_files") && tdeApp->authorize("shell_access"); } void KExecPropsPlugin::applyChanges() @@ -3920,7 +3923,7 @@ void KExecPropsPlugin::applyChanges() } f.close(); - KSimpleConfig config( path ); + TDESimpleConfig config( path ); config.setDesktopGroup(); config.writeEntry( "Type", TQString::fromLatin1("Application")); config.writePathEntry( "Exec", execEdit->text() ); @@ -3985,21 +3988,21 @@ TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props addExtensionButton->setIconSet( iconSet ); pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); addExtensionButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); - connect( addExtensionButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotAddExtension() ) ); + connect( addExtensionButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotAddExtension() ) ); delExtensionButton = new TQPushButton( TQString::null, d->m_frame ); iconSet = SmallIconSet( "forward" ); delExtensionButton->setIconSet( iconSet ); delExtensionButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); - connect( delExtensionButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotDelExtension() ) ); + connect( delExtensionButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotDelExtension() ) ); TQLabel *l; TQGridLayout *grid = new TQGridLayout(2, 2); grid->setColStretch(1, 1); - toplayout->addLayout(TQT_TQLAYOUT(grid)); + toplayout->addLayout(grid); if ( d->m_kdesktopMode ) { @@ -4035,7 +4038,7 @@ TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props grid->setColStretch(2, 1); grid->setRowStretch( 0, 1 ); grid->setRowStretch( 3, 1 ); - toplayout->addLayout(TQT_TQLAYOUT(grid), 2); + toplayout->addLayout(grid, 2); extensionsList = new TQListBox( d->m_frame ); extensionsList->setSelectionMode( TQListBox::Extended ); @@ -4054,7 +4057,7 @@ TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props return; f.close(); - KDesktopFile config( path ); + TDEDesktopFile config( path ); TQString commentStr = config.readComment(); TQString genNameStr = config.readGenericName(); @@ -4089,26 +4092,26 @@ TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props updateButton(); - connect( extensionsList, TQT_SIGNAL( highlighted( int ) ), - this, TQT_SLOT( updateButton() ) ); - connect( availableExtensionsList, TQT_SIGNAL( highlighted( int ) ), - this, TQT_SLOT( updateButton() ) ); + connect( extensionsList, TQ_SIGNAL( highlighted( int ) ), + this, TQ_SLOT( updateButton() ) ); + connect( availableExtensionsList, TQ_SIGNAL( highlighted( int ) ), + this, TQ_SLOT( updateButton() ) ); - connect( addExtensionButton, TQT_SIGNAL( clicked() ), - this, TQT_SIGNAL( changed() ) ); - connect( delExtensionButton, TQT_SIGNAL( clicked() ), - this, TQT_SIGNAL( changed() ) ); + connect( addExtensionButton, TQ_SIGNAL( clicked() ), + this, TQ_SIGNAL( changed() ) ); + connect( delExtensionButton, TQ_SIGNAL( clicked() ), + this, TQ_SIGNAL( changed() ) ); if ( nameEdit ) - connect( nameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( commentEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( genNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( availableExtensionsList, TQT_SIGNAL( selected( int ) ), - this, TQT_SIGNAL( changed() ) ); - connect( extensionsList, TQT_SIGNAL( selected( int ) ), - this, TQT_SIGNAL( changed() ) ); + connect( nameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( commentEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( genNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( availableExtensionsList, TQ_SIGNAL( selected( int ) ), + this, TQ_SIGNAL( changed() ) ); + connect( extensionsList, TQ_SIGNAL( selected( int ) ), + this, TQ_SIGNAL( changed() ) ); } TDEApplicationPropsPlugin::~TDEApplicationPropsPlugin() @@ -4163,7 +4166,7 @@ void TDEApplicationPropsPlugin::applyChanges() } f.close(); - KSimpleConfig config( path ); + TDESimpleConfig config( path ); config.setDesktopGroup(); config.writeEntry( "Type", TQString::fromLatin1("Application")); config.writeEntry( "Comment", commentEdit->text() ); diff --git a/tdeio/tdefile/kpropertiesdialog.h b/tdeio/tdefile/kpropertiesdialog.h index 2ff0c576d..8fa1a5880 100644 --- a/tdeio/tdefile/kpropertiesdialog.h +++ b/tdeio/tdefile/kpropertiesdialog.h @@ -31,7 +31,7 @@ #include <tqstring.h> #include <tqptrlist.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <kurl.h> #include <tdefileitem.h> #include <kdialogbase.h> @@ -69,7 +69,7 @@ namespace TDEIO { class Job; } */ class TDEIO_EXPORT KPropertiesDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -129,7 +129,7 @@ public: * @param autoShow tells the dialog whether it should show itself automatically. */ KPropertiesDialog( const KURL& _url, mode_t _mode, TQWidget* parent = 0L, const char* name = 0L, - bool modal = false, bool autoShow = true) KDE_DEPRECATED; + bool modal = false, bool autoShow = true) TDE_DEPRECATED; #endif /** @@ -270,12 +270,12 @@ public: * @return a pointer to the dialog * @deprecated KPropertiesDialog directly inherits from KDialogBase, so use \a this instead */ - KDE_DEPRECATED KDialogBase* dialog() { return this; } + TDE_DEPRECATED KDialogBase* dialog() { return this; } /** * @return a pointer to the dialog * @deprecated KPropertiesDialog directly inherits from KDialogBase, so use \a this instead */ - KDE_DEPRECATED const KDialogBase* dialog() const { return this; } + TDE_DEPRECATED const KDialogBase* dialog() const { return this; } /** * If the dialog is being built from a template, this method @@ -436,7 +436,7 @@ private: */ class TDEIO_EXPORT KPropsDlgPlugin : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * Constructor @@ -494,7 +494,7 @@ private: */ class TDEIO_EXPORT KFilePropsPlugin : public KPropsDlgPlugin { - Q_OBJECT + TQ_OBJECT public: /** * Constructor @@ -570,7 +570,7 @@ private: */ class TDEIO_EXPORT KFilePermissionsPropsPlugin : public KPropsDlgPlugin { - Q_OBJECT + TQ_OBJECT public: enum PermissionsMode { PermissionsOnlyFiles = 0, @@ -656,7 +656,7 @@ private: */ class TDEIO_EXPORT KURLPropsPlugin : public KPropsDlgPlugin { - Q_OBJECT + TQ_OBJECT public: /** * Constructor @@ -691,7 +691,7 @@ private: */ class TDEIO_EXPORT KBindingPropsPlugin : public KPropsDlgPlugin { - Q_OBJECT + TQ_OBJECT public: /** * Constructor @@ -721,7 +721,7 @@ private: */ class TDEIO_EXPORT KDevicePropsPlugin : public KPropsDlgPlugin { - Q_OBJECT + TQ_OBJECT public: KDevicePropsPlugin( KPropertiesDialog *_props ); virtual ~KDevicePropsPlugin(); @@ -774,7 +774,7 @@ class KPropertiesDesktopBase; */ class TDEIO_EXPORT KDesktopPropsPlugin : public KPropsDlgPlugin { - Q_OBJECT + TQ_OBJECT public: /** * Constructor @@ -825,7 +825,7 @@ private: /// Remove in KDE4 class TDEIO_EXPORT_DEPRECATED KExecPropsPlugin : public KPropsDlgPlugin { - Q_OBJECT + TQ_OBJECT public: /** * Constructor @@ -881,7 +881,7 @@ private: /// Remove in KDE4 class TDEIO_EXPORT_DEPRECATED TDEApplicationPropsPlugin : public KPropsDlgPlugin { - Q_OBJECT + TQ_OBJECT public: /** * Constructor diff --git a/tdeio/tdefile/kpropsdlgplugin.desktop b/tdeio/tdefile/kpropsdlgplugin.desktop index f74e3895e..d5598ca4b 100644 --- a/tdeio/tdefile/kpropsdlgplugin.desktop +++ b/tdeio/tdefile/kpropsdlgplugin.desktop @@ -2,86 +2,6 @@ Type=ServiceType X-TDE-ServiceType=KPropsDlg/Plugin Comment=Plugin for the Properties Dialog -Comment[af]=Inprop module vir die Eienskappe Dialoog -Comment[ar]=ملحق لمربع حوار خصائص -Comment[az]=Seçənəklər Rabitə Qutusu Üçün Əlavə -Comment[bg]=Приставка за диалога "Информация" -Comment[bn]=বৈশিষ্ট্যাবলী ডায়ালগ-এর জন্য প্লাগ-ইন -Comment[br]=Adveziant evit kendiviz ar perzhioù -Comment[bs]=Dodatak za Properties dijalog -Comment[ca]=Connector per al diàleg de les propietats -Comment[cs]=Modul pro dialog vlastností -Comment[csb]=Plugins dialogòwégò òkna Swòjiznë -Comment[cy]=Ategyn am yr Ymgom Priodweddau -Comment[da]=Plugin til egenskabsdialog -Comment[de]=Erweiterung für den Eigenschaften-Dialog -Comment[el]=Πρόσθετο για το Διάλογο ιδιοτήτων -Comment[en_GB]=Plugin for the Properties Dialogue -Comment[eo]=Internaĵo por la Eco-dialogo -Comment[es]=Plugin para el diálogo de propiedades -Comment[et]=Omaduste dialoogi plugin -Comment[eu]=Propietateen elkarrizketa-koadroaren plugin-a -Comment[fa]=وصله برای محاورۀ ویژگیها -Comment[fi]=Lisäosa asetusikkunalle -Comment[fr]=Module externe pour la boîte de dialogue des propriétés -Comment[fy]=Plugin foar de 'Eigenskippen'-dialooch -Comment[gl]=Plugin para o Diálogo de Propriedades -Comment[he]=תוסף לדו־שיח המאפיינים -Comment[hi]=विशेषता संवाद के लिए प्लगइन -Comment[hr]=Dodatak dijaloga 'Svojstva' -Comment[hu]=Beépülő modul a tulajdonságok párbeszédablakhoz -Comment[id]=Plugin untuk Dialog Properties -Comment[is]=Íforrit fyrir stillingarforritið -Comment[it]=Plugin per la finestra delle proprietà -Comment[ja]=設定ダイアログプラグイン -Comment[ka]=პარამეტრების გამართვის დიალოგის მოდული -Comment[kk]=Қасиеттер диалогтың модулі -Comment[km]=កម្មវិធីជំនួយខាងក្នុងសម្រាប់ប្រអប់ លក្ខណៈសម្បត្តិ -Comment[ko]=대화창 특성을 위한 플러그인 -Comment[lb]=Plugin fir den Eegeschaften-Dialog -Comment[lt]=Priedas savybių dialogui -Comment[lv]=Īpašību Dialoga Iespraudnis -Comment[mk]=Приклучок за дијалогот за својства -Comment[mn]=Шинж чанарууд диалогийн Plugin -Comment[ms]=Plugmasuk untuk Dialog Ciri-ciri -Comment[mt]=Plugin għad-djalogu tal-propjetajiet -Comment[nb]=Programtillegg for dialogvinduet for egenskaper -Comment[nds]=Plugin för den Egenschappen-Dialoog -Comment[ne]=विशेषता संवादका लागि प्लगइन -Comment[nl]=Plugin voor de 'Eigenschappen'-dialoog -Comment[nn]=Tillegg til eigenskapar-dialogen -Comment[nso]=Tsenyo ya Poledisano ya Dithoto -Comment[oc]=Branquament pel dialeg de propietats -Comment[pa]=ਵਿਸ਼ੇਸਤਾ ਵਾਰਤਾਲਾਪ ਲਈ ਪਲੱਗਿੰਨ -Comment[pl]=Wtyczka do okna dialogowego Właściwości -Comment[pt]='Plugin' para o diálogo de propriedades -Comment[pt_BR]=Plug-in para a janela de Propriedades -Comment[ro]=Modul pentru dialogul de proprietăţi -Comment[ru]=Модуль для диалога настроек -Comment[rw]=Icomeka ry'Ikiganiro cy'Ibiranga -Comment[se]=Lassemoduvla iešvuođahtaláseža várás -Comment[sk]=modul pre ialóg ílastnosti -Comment[sl]=Vstavek za pogovorno okno z lastnostmi -Comment[sq]=Shtojcë për Dialogun e Rekuizitave -Comment[sr]=Прикључак за дијалог са својствима -Comment[sr@Latn]=Priključak za dijalog sa svojstvima -Comment[sv]=Insticksprogram för egenskapsdialogen -Comment[ta]=பண்புகள் உரையாடலுக்கான சொருகுப்பொருள் -Comment[te]=లక్షణాల సంభాషణ కొరకు ప్లగిన్ -Comment[tg]=Штепсели барои Хусусиятҳои Тирезаи Диалогӣ Андохтан -Comment[th]=ปลั๊กอินสำหรับกล่องคุณสมบัติ -Comment[tr]=Özellikler İletişim Kutusu İçin Eklenti -Comment[tt]=Caylaw Dialogı öçen Östämä -Comment[uk]=Втулок для діалогу властивостей -Comment[uz]=Xossalar dialogi uchun plagin -Comment[uz@cyrillic]=Хоссалар диалоги учун плагин -Comment[ven]=U pulaga ha zwishumiswa zwa nyambedzano -Comment[vi]=Bộ cầm phít cho hộp thoại đặc tả. -Comment[xh]=Iplagi yangaphakathi Yezinto zobumnini Zencoko yababini -Comment[zh_CN]=属性对话的插件 -Comment[zh_HK]=屬性對話盒的外掛程式 -Comment[zh_TW]=屬性對話盒的外掛程式 -Comment[zu]=I-plugin Yengxoxo Yezinkomba zobunini [PropertyDef::X-TDE-Protocol] Type=TQString diff --git a/tdeio/tdefile/kurlbar.cpp b/tdeio/tdefile/kurlbar.cpp index 3912aced3..ec8040f51 100644 --- a/tdeio/tdefile/kurlbar.cpp +++ b/tdeio/tdefile/kurlbar.cpp @@ -36,7 +36,7 @@ #include <tdeglobal.h> #include <kicondialog.h> #include <kiconloader.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <klineedit.h> #include <tdelocale.h> #include <kmimetype.h> @@ -377,7 +377,7 @@ KURLBarItem * KURLBar::insertDynamicItem(const KURL& url, const TQString& descri return item; } -void KURLBar::setOrientation( Qt::Orientation orient ) +void KURLBar::setOrientation( TQt::Orientation orient ) { m_listBox->setOrientation( orient ); setSizePolicy( TQSizePolicy( isVertical() ? @@ -388,7 +388,7 @@ void KURLBar::setOrientation( Qt::Orientation orient ) TQSizePolicy::Maximum )); } -Qt::Orientation KURLBar::orientation() const +TQt::Orientation KURLBar::orientation() const { return m_listBox->orientation(); } @@ -399,7 +399,7 @@ void KURLBar::setListBox( KURLBarListBox *view ) if ( !view ) { m_listBox = new KURLBarListBox( this, "urlbar listbox" ); - setOrientation( Qt::Vertical ); + setOrientation( TQt::Vertical ); } else { m_listBox = view; @@ -410,17 +410,17 @@ void KURLBar::setListBox( KURLBarListBox *view ) m_listBox->setSelectionMode( TDEListBox::Single ); paletteChange( palette() ); - m_listBox->setFocusPolicy( TQ_TabFocus ); + m_listBox->setFocusPolicy( TQWidget::TabFocus ); - connect( m_listBox, TQT_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, const TQPoint & ) ), - TQT_SLOT( slotSelected( int, TQListBoxItem * ))); - connect( m_listBox, TQT_SIGNAL( dropped( TQDropEvent * )), - this, TQT_SLOT( slotDropped( TQDropEvent * ))); - connect( m_listBox, TQT_SIGNAL( contextMenuRequested( TQListBoxItem *, + connect( m_listBox, TQ_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, const TQPoint & ) ), + TQ_SLOT( slotSelected( int, TQListBoxItem * ))); + connect( m_listBox, TQ_SIGNAL( dropped( TQDropEvent * )), + this, TQ_SLOT( slotDropped( TQDropEvent * ))); + connect( m_listBox, TQ_SIGNAL( contextMenuRequested( TQListBoxItem *, const TQPoint& )), - TQT_SLOT( slotContextMenuRequested( TQListBoxItem *, const TQPoint& ))); - connect( m_listBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), - TQT_SLOT( slotSelected( TQListBoxItem * ) )); + TQ_SLOT( slotContextMenuRequested( TQListBoxItem *, const TQPoint& ))); + connect( m_listBox, TQ_SIGNAL( returnPressed( TQListBoxItem * ) ), + TQ_SLOT( slotSelected( TQListBoxItem * ) )); } void KURLBar::setIconSize( int size ) @@ -455,12 +455,12 @@ void KURLBar::resizeEvent( TQResizeEvent *e ) void KURLBar::paletteChange( const TQPalette & ) { TQPalette pal = palette(); - TQColor gray = pal.color( TQPalette::Normal, TQColorGroup::Background ); - TQColor selectedTextColor = pal.color( TQPalette::Normal, TQColorGroup::BrightText ); - TQColor foreground = pal.color( TQPalette::Normal, TQColorGroup::Foreground ); - pal.setColor( TQPalette::Normal, TQColorGroup::Base, gray ); - pal.setColor( TQPalette::Normal, TQColorGroup::HighlightedText, selectedTextColor ); - pal.setColor( TQPalette::Normal, TQColorGroup::Text, foreground ); + TQColor gray = pal.color( TQPalette::Active, TQColorGroup::Background ); + TQColor selectedTextColor = pal.color( TQPalette::Active, TQColorGroup::BrightText ); + TQColor foreground = pal.color( TQPalette::Active, TQColorGroup::Foreground ); + pal.setColor( TQPalette::Active, TQColorGroup::Base, gray ); + pal.setColor( TQPalette::Active, TQColorGroup::HighlightedText, selectedTextColor ); + pal.setColor( TQPalette::Active, TQColorGroup::Text, foreground ); pal.setColor( TQPalette::Inactive, TQColorGroup::Base, gray ); pal.setColor( TQPalette::Inactive, TQColorGroup::HighlightedText, selectedTextColor ); pal.setColor( TQPalette::Inactive, TQColorGroup::Text, foreground ); @@ -520,7 +520,7 @@ TQSize KURLBar::minimumSizeHint() const void KURLBar::slotSelected( int button, TQListBoxItem *item ) { - if ( button != Qt::LeftButton ) + if ( button != TQt::LeftButton ) return; slotSelected( item ); @@ -877,9 +877,9 @@ void KURLBarListBox::contextMenuEvent( TQContextMenuEvent *e ) } } -void KURLBarListBox::setOrientation( Qt::Orientation orient ) +void KURLBarListBox::setOrientation( TQt::Orientation orient ) { - if ( orient == Qt::Vertical ) { + if ( orient == TQt::Vertical ) { setColumnMode( 1 ); setRowMode( Variable ); } @@ -985,7 +985,7 @@ KURLBarItemDialog::KURLBarItemDialog( bool allowGlobal, const KURL& url, } else m_appLocal = 0L; - connect(m_urlEdit->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(urlChanged(const TQString & ))); + connect(m_urlEdit->lineEdit(),TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(urlChanged(const TQString & ))); m_edit->setFocus(); setMainWidget( box ); } diff --git a/tdeio/tdefile/kurlbar.h b/tdeio/tdefile/kurlbar.h index 4939fa830..6fec32ee3 100644 --- a/tdeio/tdefile/kurlbar.h +++ b/tdeio/tdefile/kurlbar.h @@ -229,7 +229,7 @@ class KURLBarListBox; */ class TDEIO_EXPORT KURLBar : public TQFrame { - Q_OBJECT + TQ_OBJECT public: /** @@ -277,7 +277,7 @@ public: * horizontally in one row. * @see orientation */ - virtual void setOrientation( Qt::Orientation orient ); + virtual void setOrientation( TQt::Orientation orient ); /** * @returns the current orientation mode. * @see setOrientation @@ -382,7 +382,7 @@ public: /** * @returns true if the bar is in vertical mode. */ - bool isVertical() const { return orientation() == Qt::Vertical; } + bool isVertical() const { return orientation() == TQt::Vertical; } public slots: /** @@ -492,7 +492,7 @@ class KURLBarToolTip; */ class TDEIO_EXPORT KURLBarListBox : public TDEListBox { - Q_OBJECT + TQ_OBJECT public: /** @@ -510,14 +510,14 @@ public: * column. * @see orientation */ - virtual void setOrientation( Qt::Orientation orient ); + virtual void setOrientation( TQt::Orientation orient ); /** * @returns the current orientation. * @see setOrientation */ - Qt::Orientation orientation() const { return m_orientation; } + TQt::Orientation orientation() const { return m_orientation; } - bool isVertical() const { return m_orientation == Qt::Vertical; } + bool isVertical() const { return m_orientation == TQt::Vertical; } signals: /** @@ -537,7 +537,7 @@ protected: virtual void paintEvent( TQPaintEvent* ); private: - Qt::Orientation m_orientation; + TQt::Orientation m_orientation; KURLBarToolTip *m_toolTip; protected: @@ -566,7 +566,7 @@ class KURLRequester; */ class TDEIO_EXPORT KURLBarItemDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeio/tdefile/kurlcombobox.cpp b/tdeio/tdefile/kurlcombobox.cpp index 66fe8efb8..f19dbe961 100644 --- a/tdeio/tdefile/kurlcombobox.cpp +++ b/tdeio/tdefile/kurlcombobox.cpp @@ -74,7 +74,7 @@ void KURLComboBox::init( Mode mode ) opendirPix = SmallIcon(TQString::fromLatin1("folder_open")); - connect( this, TQT_SIGNAL( activated( int )), TQT_SLOT( slotActivated( int ))); + connect( this, TQ_SIGNAL( activated( int )), TQ_SLOT( slotActivated( int ))); } diff --git a/tdeio/tdefile/kurlcombobox.h b/tdeio/tdefile/kurlcombobox.h index a1fd9182d..791d96a8e 100644 --- a/tdeio/tdefile/kurlcombobox.h +++ b/tdeio/tdefile/kurlcombobox.h @@ -40,7 +40,7 @@ */ class TDEIO_EXPORT KURLComboBox : public KComboBox { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQStringList urls READ urls WRITE setURLs DESIGNABLE true) TQ_PROPERTY(int maxItems READ maxItems WRITE setMaxItems DESIGNABLE true) diff --git a/tdeio/tdefile/kurlrequester.cpp b/tdeio/tdefile/kurlrequester.cpp index 64e25b93c..aa88c34b7 100644 --- a/tdeio/tdefile/kurlrequester.cpp +++ b/tdeio/tdefile/kurlrequester.cpp @@ -112,16 +112,16 @@ public: void connectSignals( TQObject *receiver ) { TQObject *sender; if ( combo ) - sender = TQT_TQOBJECT(combo); + sender = combo; else - sender = TQT_TQOBJECT(edit); - - connect( sender, TQT_SIGNAL( textChanged( const TQString& )), - receiver, TQT_SIGNAL( textChanged( const TQString& ))); - connect( sender, TQT_SIGNAL( returnPressed() ), - receiver, TQT_SIGNAL( returnPressed() )); - connect( sender, TQT_SIGNAL( returnPressed( const TQString& ) ), - receiver, TQT_SIGNAL( returnPressed( const TQString& ) )); + sender = edit; + + connect( sender, TQ_SIGNAL( textChanged( const TQString& )), + receiver, TQ_SIGNAL( textChanged( const TQString& ))); + connect( sender, TQ_SIGNAL( returnPressed() ), + receiver, TQ_SIGNAL( returnPressed() )); + connect( sender, TQ_SIGNAL( returnPressed( const TQString& ) ), + receiver, TQ_SIGNAL( returnPressed( const TQString& ) )); } void setCompletionObject( TDECompletion *comp ) { @@ -212,7 +212,7 @@ void KURLRequester::init() myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); TQToolTip::add(myButton, i18n("Open file dialog")); - connect( myButton, TQT_SIGNAL( pressed() ), TQT_SLOT( slotUpdateURL() )); + connect( myButton, TQ_SIGNAL( pressed() ), TQ_SLOT( slotUpdateURL() )); setSpacing( KDialog::spacingHint() ); @@ -220,14 +220,14 @@ void KURLRequester::init() widget->installEventFilter( this ); setFocusProxy( widget ); - d->connectSignals( TQT_TQOBJECT(this) ); - connect( myButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOpenDialog() )); + d->connectSignals( this ); + connect( myButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOpenDialog() )); myCompletion = new KURLCompletion(); d->setCompletionObject( myCompletion ); TDEAccel *accel = new TDEAccel( this ); - accel->insert( TDEStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT( slotOpenDialog() )); + accel->insert( TDEStdAccel::Open, this, TQ_SLOT( slotOpenDialog() )); accel->readSettings(); } @@ -386,7 +386,7 @@ void KURLRequester::slotUpdateURL() bool KURLRequester::eventFilter( TQObject *obj, TQEvent *ev ) { - if ( ( TQT_BASE_OBJECT(d->edit) == TQT_BASE_OBJECT(obj) ) || ( TQT_BASE_OBJECT(d->combo) == TQT_BASE_OBJECT(obj) ) ) + if ( ( d->edit == obj ) || ( d->combo == obj ) ) { if (( ev->type() == TQEvent::FocusIn ) || ( ev->type() == TQEvent::FocusOut )) // Forward focusin/focusout events to the urlrequester; needed by file form element in tdehtml diff --git a/tdeio/tdefile/kurlrequester.h b/tdeio/tdefile/kurlrequester.h index 5655efa5b..6ed9e8d37 100644 --- a/tdeio/tdefile/kurlrequester.h +++ b/tdeio/tdefile/kurlrequester.h @@ -55,7 +55,7 @@ class TQTimer; */ class TDEIO_EXPORT KURLRequester : public TQHBox { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString url READ url WRITE setURL ) TQ_PROPERTY( bool showLocalProtocol READ showLocalProtocol WRITE setShowLocalProtocol ) TQ_PROPERTY( TQString filter READ filter WRITE setFilter ) @@ -289,7 +289,7 @@ private: */ class TDEIO_EXPORT KURLComboRequester : public KURLRequester { - Q_OBJECT + TQ_OBJECT public: /** * Constructs a KURLRequester widget with a combobox. diff --git a/tdeio/tdefile/kurlrequesterdlg.cpp b/tdeio/tdefile/kurlrequesterdlg.cpp index 1a040a656..a5ad1f07d 100644 --- a/tdeio/tdefile/kurlrequesterdlg.cpp +++ b/tdeio/tdefile/kurlrequesterdlg.cpp @@ -70,8 +70,8 @@ void KURLRequesterDlg::initDialog(const TQString &text,const TQString &urlName) urlRequester_->setMinimumWidth( urlRequester_->sizeHint().width() * 3 ); topLayout->addWidget( urlRequester_ ); urlRequester_->setFocus(); - connect( urlRequester_->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotTextChanged(const TQString&)) ); + connect( urlRequester_->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotTextChanged(const TQString&)) ); bool state = !urlName.isEmpty(); enableButtonOK( state ); enableButton( KDialogBase::User1, state ); @@ -80,7 +80,7 @@ void KURLRequesterDlg::initDialog(const TQString &text,const TQString &urlName) KFile::ExistingOnly ); urlRequester_->setMode( mode ); */ - connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotClear() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( slotClear() ) ); } void KURLRequesterDlg::slotTextChanged(const TQString & text) @@ -131,5 +131,3 @@ KURLRequester * KURLRequesterDlg::urlRequester() } #include "kurlrequesterdlg.moc" - -// vim:ts=4:sw=4:tw=78 diff --git a/tdeio/tdefile/kurlrequesterdlg.h b/tdeio/tdefile/kurlrequesterdlg.h index 07b70d745..5fdbe8315 100644 --- a/tdeio/tdefile/kurlrequesterdlg.h +++ b/tdeio/tdefile/kurlrequesterdlg.h @@ -37,7 +37,7 @@ class KFileDialog; */ class TDEIO_EXPORT KURLRequesterDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** @@ -110,5 +110,3 @@ private: }; #endif // KURLREQUESTERDIALOG_H - -// vim:ts=4:sw=4:tw=78 diff --git a/tdeio/tdefile/tdediroperator.cpp b/tdeio/tdefile/tdediroperator.cpp index c7dc845cc..8b133d433 100644 --- a/tdeio/tdefile/tdediroperator.cpp +++ b/tdeio/tdefile/tdediroperator.cpp @@ -124,16 +124,16 @@ KDirOperator::KDirOperator(const KURL& _url, setDirLister( new KDirLister( true ) ); - connect(&myCompletion, TQT_SIGNAL(match(const TQString&)), - TQT_SLOT(slotCompletionMatch(const TQString&))); + connect(&myCompletion, TQ_SIGNAL(match(const TQString&)), + TQ_SLOT(slotCompletionMatch(const TQString&))); progress = new KProgress(this, "progress"); progress->adjustSize(); progress->move(2, height() - progress->height() -2); d->progressDelayTimer = new TQTimer( this, "progress delay timer" ); - connect( d->progressDelayTimer, TQT_SIGNAL( timeout() ), - TQT_SLOT( slotShowProgress() )); + connect( d->progressDelayTimer, TQ_SIGNAL( timeout() ), + TQ_SLOT( slotShowProgress() )); myCompleteListDirty = false; @@ -144,7 +144,9 @@ KDirOperator::KDirOperator(const KURL& _url, setupActions(); setupMenu(); - setFocusPolicy(TQ_WheelFocus); + setFocusPolicy(TQWidget::WheelFocus); + + installEventFilter(this); } KDirOperator::~KDirOperator() @@ -192,10 +194,10 @@ void KDirOperator::insertViewDependentActions() { if (viewActionCollection) { - disconnect( viewActionCollection, TQT_SIGNAL( inserted( TDEAction * )), - this, TQT_SLOT( slotViewActionAdded( TDEAction * ))); - disconnect( viewActionCollection, TQT_SIGNAL( removed( TDEAction * )), - this, TQT_SLOT( slotViewActionRemoved( TDEAction * ))); + disconnect( viewActionCollection, TQ_SIGNAL( inserted( TDEAction * )), + this, TQ_SLOT( slotViewActionAdded( TDEAction * ))); + disconnect( viewActionCollection, TQ_SIGNAL( removed( TDEAction * )), + this, TQ_SLOT( slotViewActionRemoved( TDEAction * ))); } viewActionMenu->popupMenu()->clear(); @@ -237,10 +239,10 @@ void KDirOperator::insertViewDependentActions() } } - connect( viewActionCollection, TQT_SIGNAL( inserted( TDEAction * )), - TQT_SLOT( slotViewActionAdded( TDEAction * ))); - connect( viewActionCollection, TQT_SIGNAL( removed( TDEAction * )), - TQT_SLOT( slotViewActionRemoved( TDEAction * ))); + connect( viewActionCollection, TQ_SIGNAL( inserted( TDEAction * )), + TQ_SLOT( slotViewActionAdded( TDEAction * ))); + connect( viewActionCollection, TQ_SIGNAL( removed( TDEAction * )), + TQ_SLOT( slotViewActionRemoved( TDEAction * ))); } } @@ -719,7 +721,7 @@ void KDirOperator::pathChanged() TQApplication::restoreOverrideCursor(); // when TDEIO::Job emits finished, the slot will restore the cursor - TQApplication::setOverrideCursor( tqwaitCursor ); + TQApplication::setOverrideCursor( TQt::waitCursor ); if ( !isReadable( currUrl )) { KMessageBox::error(viewWidget(), @@ -1046,22 +1048,27 @@ void KDirOperator::connectView(KFileView *view) } m_fileView = view; + m_fileView->widget()->installEventFilter(this); + if (m_fileView->widget()->inherits("TQScrollView")) + { + (static_cast<TQScrollView *>(m_fileView->widget()))->viewport()->installEventFilter(this); + } m_fileView->setDropOptions(d->dropOptions); viewActionCollection = 0L; KFileViewSignaler *sig = view->signaler(); - connect(sig, TQT_SIGNAL( activatedMenu(const KFileItem *, const TQPoint& ) ), - this, TQT_SLOT( activatedMenu(const KFileItem *, const TQPoint& ))); - connect(sig, TQT_SIGNAL( dirActivated(const KFileItem *) ), - this, TQT_SLOT( selectDir(const KFileItem*) ) ); - connect(sig, TQT_SIGNAL( fileSelected(const KFileItem *) ), - this, TQT_SLOT( selectFile(const KFileItem*) ) ); - connect(sig, TQT_SIGNAL( fileHighlighted(const KFileItem *) ), - this, TQT_SLOT( highlightFile(const KFileItem*) )); - connect(sig, TQT_SIGNAL( sortingChanged( TQDir::SortSpec ) ), - this, TQT_SLOT( slotViewSortingChanged( TQDir::SortSpec ))); - connect(sig, TQT_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&) ), - this, TQT_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&)) ); + connect(sig, TQ_SIGNAL( activatedMenu(const KFileItem *, const TQPoint& ) ), + this, TQ_SLOT( activatedMenu(const KFileItem *, const TQPoint& ))); + connect(sig, TQ_SIGNAL( dirActivated(const KFileItem *) ), + this, TQ_SLOT( selectDir(const KFileItem*) ) ); + connect(sig, TQ_SIGNAL( fileSelected(const KFileItem *) ), + this, TQ_SLOT( selectFile(const KFileItem*) ) ); + connect(sig, TQ_SIGNAL( fileHighlighted(const KFileItem *) ), + this, TQ_SLOT( highlightFile(const KFileItem*) )); + connect(sig, TQ_SIGNAL( sortingChanged( TQDir::SortSpec ) ), + this, TQ_SLOT( slotViewSortingChanged( TQDir::SortSpec ))); + connect(sig, TQ_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&) ), + this, TQ_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&)) ); if ( reverseAction->isChecked() != m_fileView->isReversed() ) slotSortReversed(); @@ -1071,7 +1078,7 @@ void KDirOperator::connectView(KFileView *view) m_fileView->widget()->show(); if ( listDir ) { - TQApplication::setOverrideCursor( tqwaitCursor ); + TQApplication::setOverrideCursor( TQt::waitCursor ); openURL( currUrl ); } else @@ -1124,20 +1131,20 @@ void KDirOperator::setDirLister( KDirLister *lister ) dir->setMainWindow (mainWidget); kdDebug (tdefile_area) << "mainWidget=" << mainWidget << endl; - connect( dir, TQT_SIGNAL( percent( int )), - TQT_SLOT( slotProgress( int ) )); - connect( dir, TQT_SIGNAL(started( const KURL& )), TQT_SLOT(slotStarted())); - connect( dir, TQT_SIGNAL(newItems(const KFileItemList &)), - TQT_SLOT(insertNewFiles(const KFileItemList &))); - connect( dir, TQT_SIGNAL(completed()), TQT_SLOT(slotIOFinished())); - connect( dir, TQT_SIGNAL(canceled()), TQT_SLOT(slotCanceled())); - connect( dir, TQT_SIGNAL(deleteItem(KFileItem *)), - TQT_SLOT(itemDeleted(KFileItem *))); - connect( dir, TQT_SIGNAL(redirection( const KURL& )), - TQT_SLOT( slotRedirected( const KURL& ))); - connect( dir, TQT_SIGNAL( clear() ), TQT_SLOT( slotClearView() )); - connect( dir, TQT_SIGNAL( refreshItems( const KFileItemList& ) ), - TQT_SLOT( slotRefreshItems( const KFileItemList& ) ) ); + connect( dir, TQ_SIGNAL( percent( int )), + TQ_SLOT( slotProgress( int ) )); + connect( dir, TQ_SIGNAL(started( const KURL& )), TQ_SLOT(slotStarted())); + connect( dir, TQ_SIGNAL(newItems(const KFileItemList &)), + TQ_SLOT(insertNewFiles(const KFileItemList &))); + connect( dir, TQ_SIGNAL(completed()), TQ_SLOT(slotIOFinished())); + connect( dir, TQ_SIGNAL(canceled()), TQ_SLOT(slotCanceled())); + connect( dir, TQ_SIGNAL(deleteItem(KFileItem *)), + TQ_SLOT(itemDeleted(KFileItem *))); + connect( dir, TQ_SIGNAL(redirection( const KURL& )), + TQ_SLOT( slotRedirected( const KURL& ))); + connect( dir, TQ_SIGNAL( clear() ), TQ_SLOT( slotClearView() )); + connect( dir, TQ_SIGNAL( refreshItems( const KFileItemList& ) ), + TQ_SLOT( slotRefreshItems( const KFileItemList& ) ) ); } void KDirOperator::insertNewFiles(const KFileItemList &newone) @@ -1163,7 +1170,7 @@ void KDirOperator::insertNewFiles(const KFileItemList &newone) ++it; } - TQTimer::singleShot(200, this, TQT_SLOT(resetCursor())); + TQTimer::singleShot(200, this, TQ_SLOT(resetCursor())); } void KDirOperator::selectDir(const KFileItem *item) @@ -1253,26 +1260,26 @@ void KDirOperator::slotCompletionMatch(const TQString& match) void KDirOperator::setupActions() { - myActionCollection = new TDEActionCollection( topLevelWidget(), TQT_TQOBJECT(this), "KDirOperator::myActionCollection" ); + myActionCollection = new TDEActionCollection( topLevelWidget(), this, "KDirOperator::myActionCollection" ); actionMenu = new TDEActionMenu( i18n("Menu"), myActionCollection, "popupMenu" ); - upAction = KStdAction::up( TQT_TQOBJECT(this), TQT_SLOT( cdUp() ), myActionCollection, "up" ); + upAction = KStdAction::up( this, TQ_SLOT( cdUp() ), myActionCollection, "up" ); upAction->setText( i18n("Parent Folder") ); - backAction = KStdAction::back( TQT_TQOBJECT(this), TQT_SLOT( back() ), myActionCollection, "back" ); - forwardAction = KStdAction::forward( TQT_TQOBJECT(this), TQT_SLOT(forward()), myActionCollection, "forward" ); - homeAction = KStdAction::home( TQT_TQOBJECT(this), TQT_SLOT( home() ), myActionCollection, "home" ); + backAction = KStdAction::back( this, TQ_SLOT( back() ), myActionCollection, "back" ); + forwardAction = KStdAction::forward( this, TQ_SLOT(forward()), myActionCollection, "forward" ); + homeAction = KStdAction::home( this, TQ_SLOT( home() ), myActionCollection, "home" ); homeAction->setText(i18n("Home Folder")); - reloadAction = KStdAction::redisplay( TQT_TQOBJECT(this), TQT_SLOT(rereadDir()), myActionCollection, "reload" ); + reloadAction = KStdAction::redisplay( this, TQ_SLOT(rereadDir()), myActionCollection, "reload" ); actionSeparator = new TDEActionSeparator( myActionCollection, "separator" ); d->viewActionSeparator = new TDEActionSeparator( myActionCollection, "viewActionSeparator" ); mkdirAction = new TDEAction( i18n("New Folder..."), 0, - TQT_TQOBJECT(this), TQT_SLOT( mkdir() ), myActionCollection, "mkdir" ); + this, TQ_SLOT( mkdir() ), myActionCollection, "mkdir" ); TDEAction* trash = new TDEAction( i18n( "Move to Trash" ), "edittrash", Key_Delete, myActionCollection, "trash" ); - connect( trash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), - this, TQT_SLOT( trashSelected( TDEAction::ActivationReason, TQt::ButtonState ) ) ); - new TDEAction( i18n( "Delete" ), "edit-delete", SHIFT+Key_Delete, TQT_TQOBJECT(this), - TQT_SLOT( deleteSelected() ), myActionCollection, "delete" ); + connect( trash, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), + this, TQ_SLOT( trashSelected( TDEAction::ActivationReason, TQt::ButtonState ) ) ); + new TDEAction( i18n( "Delete" ), "edit-delete", SHIFT+Key_Delete, this, + TQ_SLOT( deleteSelected() ), myActionCollection, "delete" ); mkdirAction->setIcon( TQString::fromLatin1("folder-new") ); reloadAction->setText( i18n("Reload") ); reloadAction->setShortcut( TDEStdAccel::shortcut( TDEStdAccel::Reload )); @@ -1281,16 +1288,16 @@ void KDirOperator::setupActions() // the sort menu actions sortActionMenu = new TDEActionMenu( i18n("Sorting"), myActionCollection, "sorting menu"); byNameAction = new TDERadioAction( i18n("By Name"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotSortByName() ), + this, TQ_SLOT( slotSortByName() ), myActionCollection, "by name" ); byDateAction = new TDERadioAction( i18n("By Date"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotSortByDate() ), + this, TQ_SLOT( slotSortByDate() ), myActionCollection, "by date" ); bySizeAction = new TDERadioAction( i18n("By Size"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotSortBySize() ), + this, TQ_SLOT( slotSortBySize() ), myActionCollection, "by size" ); reverseAction = new TDEToggleAction( i18n("Reverse"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotSortReversed() ), + this, TQ_SLOT( slotSortReversed() ), myActionCollection, "reversed" ); TQString sortGroup = TQString::fromLatin1("sort"); @@ -1304,17 +1311,17 @@ void KDirOperator::setupActions() caseInsensitiveAction = new TDEToggleAction(i18n("Case Insensitive"), 0, myActionCollection, "case insensitive" ); - connect( dirsFirstAction, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotToggleDirsFirst() )); - connect( caseInsensitiveAction, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotToggleIgnoreCase() )); + connect( dirsFirstAction, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotToggleDirsFirst() )); + connect( caseInsensitiveAction, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotToggleIgnoreCase() )); // the view menu actions viewActionMenu = new TDEActionMenu( i18n("&View"), myActionCollection, "view menu" ); - connect( viewActionMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), - TQT_SLOT( insertViewDependentActions() )); + connect( viewActionMenu->popupMenu(), TQ_SIGNAL( aboutToShow() ), + TQ_SLOT( insertViewDependentActions() )); shortAction = new TDERadioAction( i18n("Short View"), "view_multicolumn", TDEShortcut(), myActionCollection, "short view" ); @@ -1325,31 +1332,31 @@ void KDirOperator::setupActions() myActionCollection, "show hidden" ); // showHiddenAction->setCheckedState( i18n("Hide Hidden Files") ); separateDirsAction = new TDEToggleAction( i18n("Separate Folders"), TDEShortcut(), - TQT_TQOBJECT(this), - TQT_SLOT(slotSeparateDirs()), + this, + TQ_SLOT(slotSeparateDirs()), myActionCollection, "separate dirs" ); TDEToggleAction *previewAction = new TDEToggleAction(i18n("Show Preview"), "thumbnail", TDEShortcut(), myActionCollection, "preview" ); previewAction->setCheckedState(i18n("Hide Preview")); - connect( previewAction, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( togglePreview( bool ))); + connect( previewAction, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( togglePreview( bool ))); TQString viewGroup = TQString::fromLatin1("view"); shortAction->setExclusiveGroup( viewGroup ); detailedAction->setExclusiveGroup( viewGroup ); - connect( shortAction, TQT_SIGNAL( activated() ), - TQT_SLOT( slotSimpleView() )); - connect( detailedAction, TQT_SIGNAL( activated() ), - TQT_SLOT( slotDetailedView() )); - connect( showHiddenAction, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotToggleHidden( bool ) )); + connect( shortAction, TQ_SIGNAL( activated() ), + TQ_SLOT( slotSimpleView() )); + connect( detailedAction, TQ_SIGNAL( activated() ), + TQ_SLOT( slotDetailedView() )); + connect( showHiddenAction, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotToggleHidden( bool ) )); - new TDEAction( i18n("Properties"), TDEShortcut(ALT+Key_Return), TQT_TQOBJECT(this), - TQT_SLOT(slotProperties()), myActionCollection, "properties" ); + new TDEAction( i18n("Properties"), TDEShortcut(ALT+Key_Return), this, + TQ_SLOT(slotProperties()), myActionCollection, "properties" ); } void KDirOperator::setupMenu() @@ -1560,7 +1567,7 @@ void KDirOperator::resizeEvent( TQResizeEvent * ) if (m_fileView) m_fileView->widget()->resize( size() ); - if ( TQT_BASE_OBJECT(progress->parent()) == TQT_BASE_OBJECT(this) ) // might be reparented into a statusbar + if ( progress->parent() == this ) // might be reparented into a statusbar progress->move(2, height() - progress->height() -2); } @@ -1734,6 +1741,24 @@ TQString KDirOperator::viewConfigGroup() const return d->configGroup; } +bool KDirOperator::eventFilter(TQObject *obj, TQEvent *ev) +{ + if (ev->type() == TQEvent::MouseButtonRelease) + { + TQMouseEvent *mouseEv = static_cast<TQMouseEvent *>(ev); + switch (mouseEv->button()) + { + case TQMouseEvent::HistoryBackButton: + back(); + return true; + case TQMouseEvent::HistoryForwardButton: + forward(); + return true; + } + } + return false; +} + void KDirOperator::virtual_hook( int, void* ) { /*BASE::virtual_hook( id, data );*/ } diff --git a/tdeio/tdefile/tdediroperator.h b/tdeio/tdefile/tdediroperator.h index 6ce658e18..50467fc61 100644 --- a/tdeio/tdefile/tdediroperator.h +++ b/tdeio/tdefile/tdediroperator.h @@ -1,4 +1,3 @@ -// -*- c++ -*- /* This file is part of the KDE libraries Copyright (C) 1999 Stephan Kulow <coolo@kde.org> 2000,2001 Carsten Pfeiffer <pfeiffer@kde.org> @@ -73,14 +72,14 @@ namespace TDEIO { * \code * KDirOperator *op = new KDirOperator( KURL( "file:/home/gis" ), this ); * // some signals you might be interested in - * connect(op, TQT_SIGNAL(urlEntered(const KURL&)), - * TQT_SLOT(urlEntered(const KURL&))); - * connect(op, TQT_SIGNAL(fileHighlighted(const KFileItem *)), - * TQT_SLOT(fileHighlighted(const KFileItem *))); - * connect(op, TQT_SIGNAL(fileSelected(const KFileItem *)), - * TQT_SLOT(fileSelected(const KFileItem *))); - * connect(op, TQT_SIGNAL(finishedLoading()), - * TQT_SLOT(slotLoadingFinished())); + * connect(op, TQ_SIGNAL(urlEntered(const KURL&)), + * TQ_SLOT(urlEntered(const KURL&))); + * connect(op, TQ_SIGNAL(fileHighlighted(const KFileItem *)), + * TQ_SLOT(fileHighlighted(const KFileItem *))); + * connect(op, TQ_SIGNAL(fileSelected(const KFileItem *)), + * TQ_SLOT(fileSelected(const KFileItem *))); + * connect(op, TQ_SIGNAL(finishedLoading()), + * TQ_SLOT(slotLoadingFinished())); * * op->readConfig( TDEGlobal::config(), "Your KDiroperator ConfigGroup" ); * op->setView(KFile::Default); @@ -96,7 +95,7 @@ namespace TDEIO { */ class TDEIO_EXPORT KDirOperator : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** @@ -937,6 +936,9 @@ private slots: void insertViewDependentActions(); +public: + bool eventFilter(TQObject *obj, TQEvent *ev); + private: static bool isReadable( const KURL& url ); diff --git a/tdeio/tdefile/tdefilebookmarkhandler.cpp b/tdeio/tdefile/tdefilebookmarkhandler.cpp index 1518b48e5..a2147aa30 100644 --- a/tdeio/tdefile/tdefilebookmarkhandler.cpp +++ b/tdeio/tdefile/tdefilebookmarkhandler.cpp @@ -22,7 +22,7 @@ #include <kbookmarkimporter.h> #include <kbookmarkdombuilder.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "tdefiledialog.h" #include "tdefilebookmarkhandler.h" diff --git a/tdeio/tdefile/tdefilebookmarkhandler.h b/tdeio/tdefile/tdefilebookmarkhandler.h index e13e0673b..092eba9de 100644 --- a/tdeio/tdefile/tdefilebookmarkhandler.h +++ b/tdeio/tdefile/tdefilebookmarkhandler.h @@ -28,7 +28,7 @@ class TDEPopupMenu; class TDEIO_EXPORT KFileBookmarkHandler : public TQObject, public KBookmarkOwner { - Q_OBJECT + TQ_OBJECT public: KFileBookmarkHandler( KFileDialog *dialog ); diff --git a/tdeio/tdefile/tdefiledetailview.cpp b/tdeio/tdefile/tdefiledetailview.cpp index 5e7fe804a..321684ac7 100644 --- a/tdeio/tdefile/tdefiledetailview.cpp +++ b/tdeio/tdefile/tdefiledetailview.cpp @@ -1,4 +1,3 @@ -// -*- c++ -*- /* This file is part of the KDE libraries Copyright (C) 1997 Stephan Kulow <coolo@kde.org> 2000, 2001 Carsten Pfeiffer <pfeiffer@kde.org> @@ -73,21 +72,21 @@ KFileDetailView::KFileDetailView(TQWidget *parent, const char *name) setAllColumnsShowFocus( true ); setDragEnabled(true); - connect( header(), TQT_SIGNAL( clicked(int)), - TQT_SLOT(slotSortingChanged(int) )); + connect( header(), TQ_SIGNAL( clicked(int)), + TQ_SLOT(slotSortingChanged(int) )); - connect( this, TQT_SIGNAL( returnPressed(TQListViewItem *) ), - TQT_SLOT( slotActivate( TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( returnPressed(TQListViewItem *) ), + TQ_SLOT( slotActivate( TQListViewItem *) ) ); - connect( this, TQT_SIGNAL( clicked(TQListViewItem *, const TQPoint&, int)), - TQT_SLOT( selected( TQListViewItem *) ) ); - connect( this, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint&, int)), - TQT_SLOT( slotActivate( TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( clicked(TQListViewItem *, const TQPoint&, int)), + TQ_SLOT( selected( TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint&, int)), + TQ_SLOT( slotActivate( TQListViewItem *) ) ); - connect( this, TQT_SIGNAL(contextMenuRequested( TQListViewItem *, + connect( this, TQ_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint &, int )), - this, TQT_SLOT( slotActivateMenu( TQListViewItem *, const TQPoint& ))); + this, TQ_SLOT( slotActivateMenu( TQListViewItem *, const TQPoint& ))); KFile::SelectionMode sm = KFileView::selectionMode(); switch ( sm ) { @@ -108,15 +107,15 @@ KFileDetailView::KFileDetailView(TQWidget *parent, const char *name) // for highlighting if ( sm == KFile::Multi || sm == KFile::Extended ) - connect( this, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelectionChanged() )); + connect( this, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelectionChanged() )); else - connect( this, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - TQT_SLOT( highlighted( TQListViewItem * ) )); + connect( this, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + TQ_SLOT( highlighted( TQListViewItem * ) )); // DND - connect( &(d->autoOpenTimer), TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoOpen() )); + connect( &(d->autoOpenTimer), TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoOpen() )); setSorting( sorting() ); @@ -254,8 +253,8 @@ void KFileDetailView::highlighted( TQListViewItem *item ) void KFileDetailView::setSelectionMode( KFile::SelectionMode sm ) { - disconnect( this, TQT_SIGNAL( selectionChanged() )); - disconnect( this, TQT_SIGNAL( selectionChanged( TQListViewItem * ) )); + disconnect( this, TQ_SIGNAL( selectionChanged() )); + disconnect( this, TQ_SIGNAL( selectionChanged( TQListViewItem * ) )); KFileView::setSelectionMode( sm ); @@ -276,11 +275,11 @@ void KFileDetailView::setSelectionMode( KFile::SelectionMode sm ) } if ( sm == KFile::Multi || sm == KFile::Extended ) - connect( this, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelectionChanged() )); + connect( this, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelectionChanged() )); else - connect( this, TQT_SIGNAL( selectionChanged( TQListViewItem * )), - TQT_SLOT( highlighted( TQListViewItem * ))); + connect( this, TQ_SIGNAL( selectionChanged( TQListViewItem * )), + TQ_SLOT( highlighted( TQListViewItem * ))); } bool KFileDetailView::isSelected( const KFileItem *i ) const diff --git a/tdeio/tdefile/tdefiledetailview.h b/tdeio/tdefile/tdefiledetailview.h index 2def9bf27..f40b5b374 100644 --- a/tdeio/tdefile/tdefiledetailview.h +++ b/tdeio/tdefile/tdefiledetailview.h @@ -1,4 +1,3 @@ -// -*- c++ -*- /* This file is part of the KDE libraries Copyright (C) 1997 Stephan Kulow <coolo@kde.org> @@ -108,7 +107,7 @@ private: */ class TDEIO_EXPORT KFileDetailView : public TDEListView, public KFileView { - Q_OBJECT + TQ_OBJECT public: KFileDetailView(TQWidget *parent, const char *name); diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp index 0f3f69943..60c017459 100644 --- a/tdeio/tdefile/tdefiledialog.cpp +++ b/tdeio/tdefile/tdefiledialog.cpp @@ -1,4 +1,3 @@ -// -*- c++ -*- /* This file is part of the KDE libraries Copyright (C) 1997, 1998 Richard Moore <rich@kde.org> 1998 Stephan Kulow <coolo@kde.org> @@ -66,7 +65,7 @@ #include <kpushbutton.h> #include <tderecentdirs.h> #include <kshell.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstdguiitem.h> #include <kstaticdeleter.h> #include <tdetoolbar.h> @@ -89,7 +88,7 @@ #include <tdefilespeedbar.h> #include <tdefilebookmarkhandler.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/Xlib.h> #include <fixx11h.h> #endif @@ -530,7 +529,7 @@ void KFileDialog::slotOk() return; } - if (!kapp->authorizeURLAction("open", KURL(), d->url)) + if (!tdeApp->authorizeURLAction("open", KURL(), d->url)) { TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, d->url.prettyURL()); KMessageBox::error( d->mainWidget, msg); @@ -548,7 +547,7 @@ void KFileDialog::slotOk() for ( KURL::List::ConstIterator it = list.begin(); it != list.end(); ++it ) { - if (!kapp->authorizeURLAction("open", KURL(), *it)) + if (!tdeApp->authorizeURLAction("open", KURL(), *it)) { TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, (*it).prettyURL()); KMessageBox::error( d->mainWidget, msg); @@ -562,8 +561,8 @@ void KFileDialog::slotOk() job->setWindow (topLevelWidget()); TDEIO::Scheduler::scheduleJob( job ); d->statJobs.append( job ); - connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), - TQT_SLOT( slotStatResult( TDEIO::Job *) )); + connect( job, TQ_SIGNAL( result(TDEIO::Job *) ), + TQ_SLOT( slotStatResult( TDEIO::Job *) )); } return; } @@ -571,7 +570,7 @@ void KFileDialog::slotOk() job = TDEIO::stat(d->url,!d->url.isLocalFile()); job->setWindow (topLevelWidget()); d->statJobs.append( job ); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotStatResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotStatResult(TDEIO::Job*))); } @@ -771,11 +770,11 @@ void KFileDialog::setLocationText( const TQString& text ) // setCurrentItem() will cause textChanged() being emitted, // so slotLocationChanged() will be called. Make sure we don't clear // the KDirOperator's view-selection in there - disconnect( locationEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotLocationChanged( const TQString& ) ) ); + disconnect( locationEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotLocationChanged( const TQString& ) ) ); locationEdit->setCurrentItem( 0 ); - connect( locationEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotLocationChanged( const TQString& )) ); + connect( locationEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotLocationChanged( const TQString& )) ); locationEdit->setEditText( text ); // don't change selection when user has clicked on an item @@ -828,17 +827,17 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge d->okButton = new KPushButton( KStdGuiItem::ok(), d->mainWidget ); d->okButton->setDefault( true ); d->cancelButton = new KPushButton(KStdGuiItem::cancel(), d->mainWidget); - connect( d->okButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOk() )); - connect( d->cancelButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotCancel() )); + connect( d->okButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOk() )); + connect( d->cancelButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotCancel() )); d->customWidget = widget; d->autoSelectExtCheckBox = 0; // delayed loading d->autoSelectExtChecked = false; d->urlBar = 0; // delayed loading - TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceQToolBar ); + TQtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar ); toolbar = new TDEToolBar( d->mainWidget, "KFileDialog::toolbar", true); toolbar->setFlat(true); - tqInstallMsgHandler( oldHandler ); + qInstallMsgHandler( oldHandler ); d->pathCombo = new KURLComboBox( KURLComboBox::Directories, true, toolbar, "path combo" ); @@ -897,14 +896,14 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge ops = new KDirOperator(d->url, d->mainWidget, "KFileDialog::ops"); ops->setOnlyDoubleClickSelectsFiles( true ); - connect(ops, TQT_SIGNAL(urlEntered(const KURL&)), - TQT_SLOT(urlEntered(const KURL&))); - connect(ops, TQT_SIGNAL(fileHighlighted(const KFileItem *)), - TQT_SLOT(fileHighlighted(const KFileItem *))); - connect(ops, TQT_SIGNAL(fileSelected(const KFileItem *)), - TQT_SLOT(fileSelected(const KFileItem *))); - connect(ops, TQT_SIGNAL(finishedLoading()), - TQT_SLOT(slotLoadingFinished())); + connect(ops, TQ_SIGNAL(urlEntered(const KURL&)), + TQ_SLOT(urlEntered(const KURL&))); + connect(ops, TQ_SIGNAL(fileHighlighted(const KFileItem *)), + TQ_SLOT(fileHighlighted(const KFileItem *))); + connect(ops, TQ_SIGNAL(fileSelected(const KFileItem *)), + TQ_SLOT(fileSelected(const KFileItem *))); + connect(ops, TQ_SIGNAL(finishedLoading()), + TQ_SLOT(slotLoadingFinished())); ops->setupMenu(KDirOperator::SortActions | KDirOperator::FileActions | @@ -929,16 +928,16 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge TDEToggleAction *showSidebarAction = new TDEToggleAction(i18n("Show Quick Access Navigation Panel"), Key_F9, coll,"toggleSpeedbar"); showSidebarAction->setCheckedState(i18n("Hide Quick Access Navigation Panel")); - connect( showSidebarAction, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( toggleSpeedbar( bool )) ); + connect( showSidebarAction, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( toggleSpeedbar( bool )) ); TDEToggleAction *showBookmarksAction = new TDEToggleAction(i18n("Show Bookmarks"), 0, coll, "toggleBookmarks"); showBookmarksAction->setCheckedState(i18n("Hide Bookmarks")); - connect( showBookmarksAction, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( toggleBookmarks( bool )) ); + connect( showBookmarksAction, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( toggleBookmarks( bool )) ); - TDEActionMenu *menu = new TDEActionMenu( i18n("Configure"), "configure", TQT_TQOBJECT(this), "extra menu" ); + TDEActionMenu *menu = new TDEActionMenu( i18n("Configure"), "configure", this, "extra menu" ); menu->setWhatsThis(i18n("<qt>This is the configuration menu for the file dialog. " "Various options can be accessed from this menu including: <ul>" "<li>how files are sorted in the list</li>" @@ -964,12 +963,12 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge menu->insert( coll->action( "separate dirs" )); menu->setDelayed( false ); - connect( menu->popupMenu(), TQT_SIGNAL( aboutToShow() ), - ops, TQT_SLOT( updateSelectionDependentActions() )); + connect( menu->popupMenu(), TQ_SIGNAL( aboutToShow() ), + ops, TQ_SLOT( updateSelectionDependentActions() )); menu->plug( toolbar ); //Insert a separator. - TDEToolBarSeparator* spacerWidget = new TDEToolBarSeparator(Qt::Horizontal, false /*no line*/, + TDEToolBarSeparator* spacerWidget = new TDEToolBarSeparator(TQt::Horizontal, false /*no line*/, toolbar); d->m_pathComboIndex = toolbar->insertWidget(-1, -1, spacerWidget); toolbar->insertWidget(PATH_COMBO, 0, d->pathCombo); @@ -985,12 +984,12 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge d->pathCombo->setCompletionObject( pathCompletionObj ); d->pathCombo->setAutoDeleteCompletionObject( true ); - connect( d->pathCombo, TQT_SIGNAL( urlActivated( const KURL& )), - this, TQT_SLOT( enterURL( const KURL& ) )); - connect( d->pathCombo, TQT_SIGNAL( returnPressed( const TQString& )), - this, TQT_SLOT( enterURL( const TQString& ) )); - connect( d->pathCombo, TQT_SIGNAL( activated( const TQString& )), - this, TQT_SLOT( enterURL( const TQString& ) )); + connect( d->pathCombo, TQ_SIGNAL( urlActivated( const KURL& )), + this, TQ_SLOT( enterURL( const KURL& ) )); + connect( d->pathCombo, TQ_SIGNAL( returnPressed( const TQString& )), + this, TQ_SLOT( enterURL( const TQString& ) )); + connect( d->pathCombo, TQ_SIGNAL( activated( const TQString& )), + this, TQ_SLOT( enterURL( const TQString& ) )); TQString whatsThisText; @@ -999,8 +998,8 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge locationEdit = new KURLComboBox(KURLComboBox::Files, true, d->mainWidget, "LocationEdit"); locationEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); - connect( locationEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotLocationChanged( const TQString& )) ); + connect( locationEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotLocationChanged( const TQString& )) ); updateLocationWhatsThis (); d->locationLabel->setBuddy(locationEdit); @@ -1012,13 +1011,13 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge fileCompletionObj->setDir( dir ); locationEdit->setCompletionObject( fileCompletionObj ); locationEdit->setAutoDeleteCompletionObject( true ); - connect( fileCompletionObj, TQT_SIGNAL( match( const TQString& ) ), - TQT_SLOT( fileCompletion( const TQString& )) ); + connect( fileCompletionObj, TQ_SIGNAL( match( const TQString& ) ), + TQ_SLOT( fileCompletion( const TQString& )) ); - connect( locationEdit, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( slotOk())); - connect(locationEdit, TQT_SIGNAL( activated( const TQString& )), - this, TQT_SLOT( locationActivated( const TQString& ) )); + connect( locationEdit, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( slotOk())); + connect(locationEdit, TQ_SIGNAL( activated( const TQString& )), + this, TQ_SLOT( locationActivated( const TQString& ) )); // the Filter label/edit whatsThisText = i18n("<qt>This is the filter to apply to the file list. " @@ -1035,12 +1034,12 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge TQWhatsThis::add(filterWidget, whatsThisText); setFilter(filter); d->filterLabel->setBuddy(filterWidget); - connect(filterWidget, TQT_SIGNAL(filterChanged()), TQT_SLOT(slotFilterChanged())); + connect(filterWidget, TQ_SIGNAL(filterChanged()), TQ_SLOT(slotFilterChanged())); // the Automatically Select Extension checkbox // (the text, visibility etc. is set in updateAutoSelectExtension(), which is called by readConfig()) d->autoSelectExtCheckBox = new TQCheckBox (d->mainWidget); - connect(d->autoSelectExtCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotAutoSelectExtClicked())); + connect(d->autoSelectExtCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotAutoSelectExtClicked())); initGUI(); // activate GM @@ -1057,8 +1056,8 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge void KFileDialog::initSpeedbar() { d->urlBar = new KFileSpeedBar( d->mainWidget, "url bar" ); - connect( d->urlBar, TQT_SIGNAL( activated( const KURL& )), - TQT_SLOT( enterURL( const KURL& )) ); + connect( d->urlBar, TQ_SIGNAL( activated( const KURL& )), + TQ_SLOT( enterURL( const KURL& )) ); // need to set the current url of the urlbar manually (not via urlEntered() // here, because the initial url of KDirOperator might be the same as the @@ -1084,17 +1083,17 @@ void KFileDialog::initGUI() TQGridLayout* lafBox= new TQGridLayout(2, 3, KDialog::spacingHint()); - lafBox->addWidget(d->locationLabel, 0, 0, Qt::AlignVCenter); - lafBox->addWidget(locationEdit, 0, 1, Qt::AlignVCenter); - lafBox->addWidget(d->okButton, 0, 2, Qt::AlignVCenter); + lafBox->addWidget(d->locationLabel, 0, 0, TQt::AlignVCenter); + lafBox->addWidget(locationEdit, 0, 1, TQt::AlignVCenter); + lafBox->addWidget(d->okButton, 0, 2, TQt::AlignVCenter); - lafBox->addWidget(d->filterLabel, 1, 0, Qt::AlignVCenter); - lafBox->addWidget(filterWidget, 1, 1, Qt::AlignVCenter); - lafBox->addWidget(d->cancelButton, 1, 2, Qt::AlignVCenter); + lafBox->addWidget(d->filterLabel, 1, 0, TQt::AlignVCenter); + lafBox->addWidget(filterWidget, 1, 1, TQt::AlignVCenter); + lafBox->addWidget(d->cancelButton, 1, 2, TQt::AlignVCenter); lafBox->setColStretch(1, 4); - vbox->addLayout(TQT_TQLAYOUT(lafBox), 0); + vbox->addLayout(lafBox, 0); vbox->addSpacing(3); // add the Automatically Select Extension checkbox @@ -1337,9 +1336,9 @@ TQString KFileDialog::getOpenFileNameWId(const TQString& startDir, const TQString& filter, WId parent_id, const TQString& caption) { - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KFileDialog dlg(startDir, filter, parent, "filedialog", true); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( parent == NULL && parent_id != 0 ) XSetTransientForHint( tqt_xdisplay(), dlg.winId(), parent_id ); #else @@ -1414,7 +1413,7 @@ TQString KFileDialog::getExistingDirectory(const TQString& startDir, TQWidget *parent, const TQString& caption) { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN return TQFileDialog::getExistingDirectory(startDir, parent, "getExistingDirectory", caption, true, true); #else @@ -1619,9 +1618,9 @@ TQString KFileDialog::getSaveFileNameWId(const TQString& dir, const TQString& fi const TQString& caption) { bool specialDir = dir.at(0) == ':'; - TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); + TQWidget* parent = TQWidget::find( parent_id ); KFileDialog dlg( specialDir ? dir : TQString::null, filter, parent, "filedialog", true); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( parent == NULL && parent_id != 0 ) XSetTransientForHint(tqt_xdisplay(), dlg.winId(), parent_id); #else @@ -2264,8 +2263,8 @@ void KFileDialog::toggleBookmarks(bool show) } d->bookmarkHandler = new KFileBookmarkHandler( this ); - connect( d->bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )), - TQT_SLOT( enterURL( const TQString& ))); + connect( d->bookmarkHandler, TQ_SIGNAL( openURL( const TQString& )), + TQ_SLOT( enterURL( const TQString& ))); toolbar->insertButton(TQString::fromLatin1("bookmark"), (int)HOTLIST_BUTTON, true, diff --git a/tdeio/tdefile/tdefiledialog.h b/tdeio/tdefile/tdefiledialog.h index b7310b599..3782e455f 100644 --- a/tdeio/tdefile/tdefiledialog.h +++ b/tdeio/tdefile/tdefiledialog.h @@ -1,4 +1,3 @@ -// -*- c++ -*- /* This file is part of the KDE libraries Copyright (C) 1997, 1998 Richard Moore <rich@kde.org> 1998 Stephan Kulow <coolo@kde.org> @@ -76,7 +75,7 @@ struct KFileDialogPrivate; */ class TDEIO_EXPORT KFileDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -269,7 +268,7 @@ public: * tdefile->setFilter("*.cpp"); * tdefile->setFilter("*.cpp|Sources (*.cpp)"); * tdefile->setFilter("*.cpp|" + i18n("Sources (*.cpp)")); - * tdefile->setFilter("*.cpp *.cc *.C|C++ Source Files\n*.h *.H|Header files"); + * tdefile->setFilter("*.cpp|C++ Source Files\n*.h|Header files"); * \endcode * * Note: The text to display is not parsed in any way. So, if you @@ -310,7 +309,7 @@ public: * Do not use in conjunction with setFilter() * @deprecated */ - void setFilterMimeType(const TQString &label, const KMimeType::List &types, const KMimeType::Ptr &defaultType) KDE_DEPRECATED; + void setFilterMimeType(const TQString &label, const KMimeType::List &types, const KMimeType::Ptr &defaultType) TDE_DEPRECATED; /** * Returns the mimetype for the desired output format. @@ -360,12 +359,12 @@ public: * This widget has to inherit TQWidget and it has to implement * a slot showPreview(const KURL &); which is called * every time the file changes. You may want to look at - * koffice/lib/kofficecore/koFilterManager.cc for some hints :) + * koffice/lib/kofficecore/koFilterManager.cpp for some hints :) * * Ownership is transferred to KFileDialog. You need to create the * preview-widget with "new", i.e. on the heap. */ - void setPreviewWidget(const TQWidget *w) KDE_DEPRECATED; + void setPreviewWidget(const TQWidget *w) TDE_DEPRECATED; /** * Adds a preview widget and enters the preview mode. @@ -714,7 +713,7 @@ public: * items into it, e.g.: * \code * yourAction = new TDEAction( i18n("Your Action"), 0, - * this, TQT_SLOT( yourSlot() ), + * this, TQ_SLOT( yourSlot() ), * this, "action name" ); * yourAction->plug( tdefileDialog->toolBar() ); * \endcode @@ -812,7 +811,7 @@ signals: * or chose one of the predefined set via setFilter(). * * @param filter contains the new filter (only the extension part, - * not the explanation), i.e. "*.cpp" or "*.cpp *.cc". + * not the explanation), i.e. "*.cpp". * * @see setFilter() * @see currentFilter() diff --git a/tdeio/tdefile/tdefilefiltercombo.cpp b/tdeio/tdefile/tdefilefiltercombo.cpp index ed41f8f82..de4d45518 100644 --- a/tdeio/tdefile/tdefilefiltercombo.cpp +++ b/tdeio/tdefile/tdefilefiltercombo.cpp @@ -49,9 +49,9 @@ KFileFilterCombo::KFileFilterCombo( TQWidget *parent, const char *name) { setTrapReturnKey( true ); setInsertionPolicy(NoInsertion); - connect( this, TQT_SIGNAL( activated( int )), this, TQT_SIGNAL( filterChanged() )); - connect( this, TQT_SIGNAL( returnPressed() ), this, TQT_SIGNAL( filterChanged() )); - connect( this, TQT_SIGNAL( filterChanged() ), TQT_SLOT( slotFilterChanged() )); + connect( this, TQ_SIGNAL( activated( int )), this, TQ_SIGNAL( filterChanged() )); + connect( this, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( filterChanged() )); + connect( this, TQ_SIGNAL( filterChanged() ), TQ_SLOT( slotFilterChanged() )); m_allTypes = false; } @@ -179,7 +179,7 @@ void KFileFilterCombo::slotFilterChanged() bool KFileFilterCombo::eventFilter( TQObject *o, TQEvent *e ) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lineEdit()) && e->type() == TQEvent::FocusOut ) { + if ( o == lineEdit() && e->type() == TQEvent::FocusOut ) { if ( currentText() != d->lastFilter ) emit filterChanged(); } diff --git a/tdeio/tdefile/tdefilefiltercombo.h b/tdeio/tdefile/tdefilefiltercombo.h index f448003bb..1f1f40db9 100644 --- a/tdeio/tdefile/tdefilefiltercombo.h +++ b/tdeio/tdefile/tdefilefiltercombo.h @@ -30,7 +30,7 @@ class KFileFilterComboPrivate; class TDEIO_EXPORT KFileFilterCombo : public KComboBox { - Q_OBJECT + TQ_OBJECT public: KFileFilterCombo(TQWidget *parent= 0, const char *name= 0); diff --git a/tdeio/tdefile/tdefileiconview.cpp b/tdeio/tdefile/tdefileiconview.cpp index 90d2b2a10..f8deeaf73 100644 --- a/tdeio/tdefile/tdefileiconview.cpp +++ b/tdeio/tdefile/tdefileiconview.cpp @@ -1,4 +1,3 @@ -// -*- c++ -*- /* This file is part of the KDE libraries Copyright (C) 1997 Stephan Kulow <coolo@kde.org> 2000,2001,2002 Carsten Pfeiffer <pfeiffer@kde.org> @@ -18,7 +17,7 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <tqt.h> +#include <tqglobal.h> #include <tqfontmetrics.h> #include <tqkeycode.h> @@ -60,13 +59,13 @@ public: noArrangement = false; ignoreMaximumSize = false; - smallColumns = new TDERadioAction( i18n("Small Icons"), 0, TQT_TQOBJECT(parent), - TQT_SLOT( slotSmallColumns() ), + smallColumns = new TDERadioAction( i18n("Small Icons"), 0, parent, + TQ_SLOT( slotSmallColumns() ), parent->actionCollection(), "small columns" ); - largeRows = new TDERadioAction( i18n("Large Icons"), 0, TQT_TQOBJECT(parent), - TQT_SLOT( slotLargeRows() ), + largeRows = new TDERadioAction( i18n("Large Icons"), 0, parent, + TQ_SLOT( slotLargeRows() ), parent->actionCollection(), "large rows" ); @@ -76,22 +75,22 @@ public: previews = new TDEToggleAction( i18n("Thumbnail Previews"), 0, parent->actionCollection(), "show previews" ); - zoomIn = KStdAction::zoomIn( TQT_TQOBJECT(parent), TQT_SLOT( zoomIn() ), + zoomIn = KStdAction::zoomIn( parent, TQ_SLOT( zoomIn() ), parent->actionCollection(), "zoomIn" ); - zoomOut = KStdAction::zoomOut( TQT_TQOBJECT(parent), TQT_SLOT( zoomOut() ), + zoomOut = KStdAction::zoomOut( parent, TQ_SLOT( zoomOut() ), parent->actionCollection(), "zoomOut" ); previews->setGroup("previews"); zoomIn->setGroup("previews"); zoomOut->setGroup("previews"); - connect( previews, TQT_SIGNAL( toggled( bool )), - parent, TQT_SLOT( slotPreviewsToggled( bool ))); + connect( previews, TQ_SIGNAL( toggled( bool )), + parent, TQ_SLOT( slotPreviewsToggled( bool ))); - connect( &previewTimer, TQT_SIGNAL( timeout() ), - parent, TQT_SLOT( showPreviews() )); - connect( &autoOpenTimer, TQT_SIGNAL( timeout() ), - parent, TQT_SLOT( slotAutoOpen() )); + connect( &previewTimer, TQ_SIGNAL( timeout() ), + parent, TQ_SLOT( showPreviews() )); + connect( &autoOpenTimer, TQ_SIGNAL( timeout() ), + parent, TQ_SLOT( slotAutoOpen() )); } ~KFileIconViewPrivate() { @@ -134,21 +133,21 @@ KFileIconView::KFileIconView(TQWidget *parent, const char *name) slotSmallColumns(); d->smallColumns->setChecked( true ); - connect( this, TQT_SIGNAL( returnPressed(TQIconViewItem *) ), - TQT_SLOT( slotActivate( TQIconViewItem *) ) ); + connect( this, TQ_SIGNAL( returnPressed(TQIconViewItem *) ), + TQ_SLOT( slotActivate( TQIconViewItem *) ) ); // we want single click _and_ double click (as convenience) - connect( this, TQT_SIGNAL( clicked(TQIconViewItem *, const TQPoint&) ), - TQT_SLOT( selected( TQIconViewItem *) ) ); - connect( this, TQT_SIGNAL( doubleClicked(TQIconViewItem *, const TQPoint&) ), - TQT_SLOT( slotActivate( TQIconViewItem *) ) ); - - connect( this, TQT_SIGNAL( onItem( TQIconViewItem * ) ), - TQT_SLOT( showToolTip( TQIconViewItem * ) ) ); - connect( this, TQT_SIGNAL( onViewport() ), - TQT_SLOT( removeToolTip() ) ); - connect( this, TQT_SIGNAL( contextMenuRequested(TQIconViewItem*,const TQPoint&)), - TQT_SLOT( slotActivateMenu( TQIconViewItem*, const TQPoint& ) ) ); + connect( this, TQ_SIGNAL( clicked(TQIconViewItem *, const TQPoint&) ), + TQ_SLOT( selected( TQIconViewItem *) ) ); + connect( this, TQ_SIGNAL( doubleClicked(TQIconViewItem *, const TQPoint&) ), + TQ_SLOT( slotActivate( TQIconViewItem *) ) ); + + connect( this, TQ_SIGNAL( onItem( TQIconViewItem * ) ), + TQ_SLOT( showToolTip( TQIconViewItem * ) ) ); + connect( this, TQ_SIGNAL( onViewport() ), + TQ_SLOT( removeToolTip() ) ); + connect( this, TQ_SIGNAL( contextMenuRequested(TQIconViewItem*,const TQPoint&)), + TQ_SLOT( slotActivateMenu( TQIconViewItem*, const TQPoint& ) ) ); KFile::SelectionMode sm = KFileView::selectionMode(); switch ( sm ) { @@ -168,11 +167,11 @@ KFileIconView::KFileIconView(TQWidget *parent, const char *name) } if ( sm == KFile::Multi || sm == KFile::Extended ) - connect( this, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelectionChanged() )); + connect( this, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelectionChanged() )); else - connect( this, TQT_SIGNAL( selectionChanged( TQIconViewItem * )), - TQT_SLOT( highlighted( TQIconViewItem * ))); + connect( this, TQ_SIGNAL( selectionChanged( TQIconViewItem * )), + TQ_SLOT( highlighted( TQIconViewItem * ))); viewport()->installEventFilter( this ); @@ -399,8 +398,8 @@ void KFileIconView::highlighted( TQIconViewItem *item ) void KFileIconView::setSelectionMode( KFile::SelectionMode sm ) { - disconnect( TQT_SIGNAL( selectionChanged() ), this ); - disconnect( TQT_SIGNAL( selectionChanged( TQIconViewItem * )), this ); + disconnect( TQ_SIGNAL( selectionChanged() ), this ); + disconnect( TQ_SIGNAL( selectionChanged( TQIconViewItem * )), this ); KFileView::setSelectionMode( sm ); switch ( KFileView::selectionMode() ) { @@ -420,11 +419,11 @@ void KFileIconView::setSelectionMode( KFile::SelectionMode sm ) } if ( sm == KFile::Multi || sm == KFile::Extended ) - connect( this, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelectionChanged() )); + connect( this, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelectionChanged() )); else - connect( this, TQT_SIGNAL( selectionChanged( TQIconViewItem * )), - TQT_SLOT( highlighted( TQIconViewItem * ))); + connect( this, TQ_SIGNAL( selectionChanged( TQIconViewItem * )), + TQ_SLOT( highlighted( TQIconViewItem * ))); } bool KFileIconView::isSelected( const KFileItem *i ) const @@ -594,12 +593,12 @@ void KFileIconView::showPreviews() d->job = TDEIO::filePreview(*items(), d->previewIconSize,d->previewIconSize); d->job->setIgnoreMaximumSize(d->ignoreMaximumSize); - connect( d->job, TQT_SIGNAL( result( TDEIO::Job * )), - this, TQT_SLOT( slotPreviewResult( TDEIO::Job * ))); - connect( d->job, TQT_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )), - TQT_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) )); -// connect( d->job, TQT_SIGNAL( failed( const KFileItem* )), -// this, TQT_SLOT( slotFailed( const KFileItem* ) )); + connect( d->job, TQ_SIGNAL( result( TDEIO::Job * )), + this, TQ_SLOT( slotPreviewResult( TDEIO::Job * ))); + connect( d->job, TQ_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )), + TQ_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) )); +// connect( d->job, TQ_SIGNAL( failed( const KFileItem* )), +// this, TQ_SLOT( slotFailed( const KFileItem* ) )); } void KFileIconView::slotPreviewResult( TDEIO::Job *job ) @@ -738,7 +737,7 @@ void KFileIconView::listingCompleted() // need to remove our tooltip, eventually bool KFileIconView::eventFilter( TQObject *o, TQEvent *e ) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) { + if ( o == viewport() || o == this ) { int type = e->type(); if ( type == TQEvent::Leave || type == TQEvent::FocusOut ) diff --git a/tdeio/tdefile/tdefileiconview.h b/tdeio/tdefile/tdefileiconview.h index 0c46e4ffd..65ff54fed 100644 --- a/tdeio/tdefile/tdefileiconview.h +++ b/tdeio/tdefile/tdefileiconview.h @@ -1,4 +1,3 @@ -// -*- c++ -*- /* This file is part of the KDE libraries Copyright (C) 1997 Stephan Kulow <coolo@kde.org> @@ -21,7 +20,7 @@ #ifndef TDEFILEICONVIEW_H #define TDEFILEICONVIEW_H -#include <tqt.h> +#include <tqglobal.h> #include <kiconview.h> #include <kiconloader.h> @@ -82,7 +81,7 @@ namespace TDEIO { */ class TDEIO_EXPORT KFileIconView : public TDEIconView, public KFileView { - Q_OBJECT + TQ_OBJECT public: KFileIconView(TQWidget *parent, const char *name); diff --git a/tdeio/tdefile/tdefilemetainfowidget.cpp b/tdeio/tdefile/tdefilemetainfowidget.cpp index 4590ee381..f271b4541 100644 --- a/tdeio/tdefile/tdefilemetainfowidget.cpp +++ b/tdeio/tdefile/tdefilemetainfowidget.cpp @@ -139,7 +139,7 @@ TQWidget* KFileMetaInfoWidget::makeWidget() #if 0 case TQVariant::Size: // a QSize - case TQVariant::String: // a QString + case TQVariant::String: // a TQString case TQVariant::List: // a QValueList case TQVariant::Map: // a QMap case TQVariant::StringList: // a QStringList @@ -147,12 +147,12 @@ TQWidget* KFileMetaInfoWidget::makeWidget() case TQVariant::Pixmap: // a QPixmap case TQVariant::Brush: // a QBrush case TQVariant::Rect: // a QRect - case TQVariant::Color: // a QColor + case TQVariant::Color: // a TQColor case TQVariant::Palette: // a QPalette case TQVariant::ColorGroup: // a QColorGroup case TQVariant::IconSet: // a QIconSet case TQVariant::Point: // a QPoint - case TQVariant::Image: // a QImage + case TQVariant::Image: // a TQImage case TQVariant::CString: // a QCString case TQVariant::PointArray: // a QPointArray case TQVariant::Region: // a QRegion @@ -185,7 +185,7 @@ TQWidget* KFileMetaInfoWidget::makeBoolWidget() { TQCheckBox* cb = new TQCheckBox(this, "metainfo bool widget"); cb->setChecked(m_item.value().toBool()); - connect(cb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged(bool))); + connect(cb, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged(bool))); return cb; } @@ -196,7 +196,7 @@ TQWidget* KFileMetaInfoWidget::makeIntWidget() if (m_validator) { - if (m_validator->inherits(TQINTVALIDATOR_OBJECT_NAME_STRING)) + if (m_validator->inherits("TQIntValidator")) { sb->setMinValue(static_cast<TQIntValidator*>(m_validator)->bottom()); sb->setMaxValue(static_cast<TQIntValidator*>(m_validator)->top()); @@ -209,7 +209,7 @@ TQWidget* KFileMetaInfoWidget::makeIntWidget() if (m_item.type() == TQVariant::UInt) sb->setMinValue(TQMAX(sb->minValue(), 0)); - connect(sb, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged(int))); + connect(sb, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged(int))); return sb; } @@ -229,7 +229,7 @@ TQWidget* KFileMetaInfoWidget::makeDoubleWidget() reparentValidator(dni, m_validator); } - connect(dni, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotChanged(double))); + connect(dni, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(slotChanged(double))); return dni; } @@ -242,7 +242,7 @@ TQWidget* KFileMetaInfoWidget::makeStringWidget() (m_validator); b->insertStringList(val->stringList()); b->setCurrentText(m_item.value().toString()); - connect(b, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotComboChanged(const TQString &))); + connect(b, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(slotComboChanged(const TQString &))); b->setValidator(val); reparentValidator(b, val); return b; @@ -251,8 +251,8 @@ TQWidget* KFileMetaInfoWidget::makeStringWidget() if ( m_item.attributes() & KFileMimeTypeInfo::MultiLine ) { KEdit *edit = new KEdit( this ); edit->setText( m_item.value().toString() ); - connect( edit, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( slotMultiLineEditChanged() )); + connect( edit, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( slotMultiLineEditChanged() )); // can't use a validator with a TQTextEdit, but we may need to delete it if ( m_validator ) reparentValidator( edit, m_validator ); @@ -265,16 +265,16 @@ TQWidget* KFileMetaInfoWidget::makeStringWidget() e->setValidator(m_validator); reparentValidator(e, m_validator); } - connect(e, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotLineEditChanged(const TQString&))); + connect(e, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotLineEditChanged(const TQString&))); return e; } TQWidget* KFileMetaInfoWidget::makeDateWidget() { TQWidget *e = new TQDateEdit(m_item.value().toDate(), this); - connect(e, TQT_SIGNAL(valueChanged(const TQDate&)), - this, TQT_SLOT(slotDateChanged(const TQDate&))); + connect(e, TQ_SIGNAL(valueChanged(const TQDate&)), + this, TQ_SLOT(slotDateChanged(const TQDate&))); return e; } @@ -301,7 +301,7 @@ void KFileMetaInfoWidget::reparentValidator( TQWidget *widget, void KFileMetaInfoWidget::slotChanged(bool value) { - Q_ASSERT(m_widget->inherits(TQCOMBOBOX_OBJECT_NAME_STRING)); + Q_ASSERT(m_widget->inherits("TQComboBox")); m_value = TQVariant(value); emit valueChanged(m_value); m_dirty = true; @@ -309,7 +309,7 @@ void KFileMetaInfoWidget::slotChanged(bool value) void KFileMetaInfoWidget::slotChanged(int value) { - Q_ASSERT(m_widget->inherits(TQSPINBOX_OBJECT_NAME_STRING)); + Q_ASSERT(m_widget->inherits("TQSpinBox")); m_value = TQVariant(value); emit valueChanged(m_value); m_dirty = true; @@ -342,7 +342,7 @@ void KFileMetaInfoWidget::slotLineEditChanged(const TQString& value) // that may be a little expensive for long texts, but what can we do? void KFileMetaInfoWidget::slotMultiLineEditChanged() { - Q_ASSERT(m_widget->inherits(TQTEXTEDIT_OBJECT_NAME_STRING)); + Q_ASSERT(m_widget->inherits("TQTextEdit")); m_value = TQVariant( static_cast<const TQTextEdit*>( sender() )->text() ); emit valueChanged(m_value); m_dirty = true; @@ -350,7 +350,7 @@ void KFileMetaInfoWidget::slotMultiLineEditChanged() void KFileMetaInfoWidget::slotDateChanged(const TQDate& value) { - Q_ASSERT(m_widget->inherits(TQDATEEDIT_OBJECT_NAME_STRING)); + Q_ASSERT(m_widget->inherits("TQDateEdit")); m_value = TQVariant(value); emit valueChanged(m_value); m_dirty = true; @@ -358,7 +358,7 @@ void KFileMetaInfoWidget::slotDateChanged(const TQDate& value) void KFileMetaInfoWidget::slotTimeChanged(const TQTime& value) { - Q_ASSERT(m_widget->inherits(TQTIMEEDIT_OBJECT_NAME_STRING)); + Q_ASSERT(m_widget->inherits("TQTimeEdit")); m_value = TQVariant(value); emit valueChanged(m_value); m_dirty = true; @@ -366,7 +366,7 @@ void KFileMetaInfoWidget::slotTimeChanged(const TQTime& value) void KFileMetaInfoWidget::slotDateTimeChanged(const TQDateTime& value) { - Q_ASSERT(m_widget->inherits(TQDATETIMEEDIT_OBJECT_NAME_STRING)); + Q_ASSERT(m_widget->inherits("TQDateTimeEdit")); m_value = TQVariant(value); emit valueChanged(m_value); m_dirty = true; diff --git a/tdeio/tdefile/tdefilemetainfowidget.h b/tdeio/tdefile/tdefilemetainfowidget.h index 5ba4d6eef..57ef4ce64 100644 --- a/tdeio/tdefile/tdefilemetainfowidget.h +++ b/tdeio/tdefile/tdefilemetainfowidget.h @@ -29,7 +29,7 @@ */ class TDEIO_EXPORT KFileMetaInfoWidget: public TQWidget { - Q_OBJECT + TQ_OBJECT public: enum Mode { diff --git a/tdeio/tdefile/tdefilemetapreview.cpp b/tdeio/tdefile/tdefilemetapreview.cpp index d587511e4..42f40ef9b 100644 --- a/tdeio/tdefile/tdefilemetapreview.cpp +++ b/tdeio/tdefile/tdefilemetapreview.cpp @@ -188,7 +188,7 @@ KPreviewWidgetBase * KFileMetaPreview::createAudioPreview( TQWidget *parent ) return 0L; } - return dynamic_cast<KPreviewWidgetBase*>( factory->create( TQT_TQOBJECT(parent), "tdefileaudiopreview" )); + return dynamic_cast<KPreviewWidgetBase*>( factory->create( parent, "tdefileaudiopreview" )); } void KFileMetaPreview::virtual_hook( int, void* ) {} diff --git a/tdeio/tdefile/tdefilemetapreview.h b/tdeio/tdefile/tdefilemetapreview.h index 443324da3..24fe415a2 100644 --- a/tdeio/tdefile/tdefilemetapreview.h +++ b/tdeio/tdefile/tdefilemetapreview.h @@ -17,7 +17,7 @@ class TDEIO_EXPORT KFileMetaPreview : public KPreviewWidgetBase { - Q_OBJECT + TQ_OBJECT public: KFileMetaPreview(TQWidget *parent, const char *name = 0); diff --git a/tdeio/tdefile/tdefilepreview.cpp b/tdeio/tdefile/tdefilepreview.cpp index acec61475..36fc81eb5 100644 --- a/tdeio/tdefile/tdefilepreview.cpp +++ b/tdeio/tdefile/tdefilepreview.cpp @@ -95,8 +95,8 @@ void KFilePreview::setFileView( KFileView *view ) view->setSorting( sorting() ); left = view; - connect( left->signaler(), TQT_SIGNAL( fileHighlighted(const KFileItem*) ), - TQT_SLOT( slotHighlighted( const KFileItem * ))); + connect( left->signaler(), TQ_SIGNAL( fileHighlighted(const KFileItem*) ), + TQ_SLOT( slotHighlighted( const KFileItem * ))); // Why copy the actions? --ellis, 13 Jan 02. //for ( uint i = 0; i < view->actionCollection()->count(); i++ ) @@ -110,10 +110,10 @@ void KFilePreview::setPreviewWidget(const TQWidget *w, const KURL &) left->setOnlyDoubleClickSelectsFiles( onlyDoubleClickSelectsFiles() ); if (w) { - connect(this, TQT_SIGNAL( showPreview(const KURL &) ), - w, TQT_SLOT( showPreview(const KURL &) )); - connect( this, TQT_SIGNAL( clearPreview() ), - w, TQT_SLOT( clearPreview() )); + connect(this, TQ_SIGNAL( showPreview(const KURL &) ), + w, TQ_SLOT( showPreview(const KURL &) )); + connect( this, TQ_SIGNAL( clearPreview() ), + w, TQ_SLOT( clearPreview() )); } else { preview->hide(); diff --git a/tdeio/tdefile/tdefilepreview.h b/tdeio/tdefile/tdefilepreview.h index 16cfa281b..8ca2c6937 100644 --- a/tdeio/tdefile/tdefilepreview.h +++ b/tdeio/tdefile/tdefilepreview.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* This file is part of the KDE libraries Copyright (C) 1998 Stephan Kulow <coolo@kde.org> 1998 Daniel Grana <grana@ie.iwi.unibe.ch> @@ -38,7 +38,7 @@ */ class TDEIO_EXPORT KFilePreview : public TQSplitter, public KFileView { - Q_OBJECT + TQ_OBJECT public: KFilePreview(TQWidget *parent, const char *name); diff --git a/tdeio/tdefile/tdefilesharedlg.cpp b/tdeio/tdefile/tdefilesharedlg.cpp index a2fb01c2c..1a7268ea6 100644 --- a/tdeio/tdefile/tdefilesharedlg.cpp +++ b/tdeio/tdefile/tdefilesharedlg.cpp @@ -25,11 +25,11 @@ #include <tqbuttongroup.h> #include <tqlayout.h> #include <tqlineedit.h> -#include <kprocess.h> -#include <kprocio.h> +#include <tdeprocess.h> +#include <tdeprocio.h> #include <tdelocale.h> #include <tdeglobalsettings.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <stdio.h> #include <stdlib.h> @@ -38,7 +38,7 @@ #include <kseparator.h> #include <tqpushbutton.h> #include <tdeapplication.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdemessagebox.h> class KFileSharePropsPlugin::Private @@ -152,17 +152,17 @@ void KFileSharePropsPlugin::init() TQButtonGroup *rbGroup = new TQButtonGroup( m_widget ); rbGroup->hide(); m_rbUnShare = new TQRadioButton( i18n("Not shared"), m_widget ); - connect( m_rbUnShare, TQT_SIGNAL( toggled(bool) ), TQT_SIGNAL( changed() ) ); + connect( m_rbUnShare, TQ_SIGNAL( toggled(bool) ), TQ_SIGNAL( changed() ) ); vbox->addWidget( m_rbUnShare, 0 ); rbGroup->insert( m_rbUnShare ); m_rbShare = new TQRadioButton( i18n("Shared - read only for others"), m_widget ); - connect( m_rbShare, TQT_SIGNAL( toggled(bool) ), TQT_SIGNAL( changed() ) ); + connect( m_rbShare, TQ_SIGNAL( toggled(bool) ), TQ_SIGNAL( changed() ) ); vbox->addWidget( m_rbShare, 0 ); rbGroup->insert( m_rbShare ); m_rbSharerw = new TQRadioButton( i18n("Shared - writeable for others"), m_widget ); - connect( m_rbSharerw, TQT_SIGNAL( toggled(bool) ), TQT_SIGNAL( changed() ) ); + connect( m_rbSharerw, TQ_SIGNAL( toggled(bool) ), TQ_SIGNAL( changed() ) ); vbox->addWidget( m_rbSharerw, 0 ); rbGroup->insert( m_rbSharerw ); @@ -193,8 +193,8 @@ void KFileSharePropsPlugin::init() label->setAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::WordBreak ); vbox->addWidget( label, 0 ); m_pbConfig = new TQPushButton( i18n("Configure File Sharing..."), m_widget ); - connect( m_pbConfig, TQT_SIGNAL( clicked() ), TQT_SLOT( slotConfigureFileSharing() ) ); - vbox->addWidget( m_pbConfig, 0, Qt::AlignHCenter ); + connect( m_pbConfig, TQ_SIGNAL( clicked() ), TQ_SLOT( slotConfigureFileSharing() ) ); + vbox->addWidget( m_pbConfig, 0, TQt::AlignHCenter ); vbox->addStretch( 10 ); @@ -220,8 +220,8 @@ void KFileSharePropsPlugin::init() TQHBoxLayout* hBox = new TQHBoxLayout( (TQWidget *)0L ); vbox->addLayout( hBox, 0 ); m_pbConfig = new TQPushButton( i18n("Configure File Sharing..."), m_widget ); - connect( m_pbConfig, TQT_SIGNAL( clicked() ), TQT_SLOT( slotConfigureFileSharing() ) ); - hBox->addWidget( m_pbConfig, 0, Qt::AlignHCenter ); + connect( m_pbConfig, TQ_SIGNAL( clicked() ), TQ_SLOT( slotConfigureFileSharing() ) ); + hBox->addWidget( m_pbConfig, 0, TQt::AlignHCenter ); vbox->addStretch( 10 ); // align items on top break; } @@ -244,8 +244,8 @@ void KFileSharePropsPlugin::slotConfigureFileSharing() d->m_configProc = 0; return; } - connect(d->m_configProc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotConfigureFileSharingDone())); + connect(d->m_configProc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotConfigureFileSharingDone())); m_pbConfig->setEnabled(false); } diff --git a/tdeio/tdefile/tdefilesharedlg.h b/tdeio/tdefile/tdefilesharedlg.h index 4b817f714..e2ed6b194 100644 --- a/tdeio/tdefile/tdefilesharedlg.h +++ b/tdeio/tdefile/tdefilesharedlg.h @@ -32,7 +32,7 @@ class TQPushButton; */ class TDEIO_EXPORT KFileSharePropsPlugin : public KPropsDlgPlugin { - Q_OBJECT + TQ_OBJECT public: KFileSharePropsPlugin( KPropertiesDialog *_props ); virtual ~KFileSharePropsPlugin(); diff --git a/tdeio/tdefile/tdefilespeedbar.cpp b/tdeio/tdefile/tdefilespeedbar.cpp index 066953f3a..dfd09ee53 100644 --- a/tdeio/tdefile/tdefilespeedbar.cpp +++ b/tdeio/tdefile/tdefilespeedbar.cpp @@ -29,7 +29,7 @@ #include <tdeglobalsettings.h> #include <tdelocale.h> #include <kprotocolinfo.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurl.h> KFileSpeedBar::KFileSpeedBar( TQWidget *parent, const char *name ) diff --git a/tdeio/tdefile/tdefilespeedbar.h b/tdeio/tdefile/tdefilespeedbar.h index 62415dadc..33c12c530 100644 --- a/tdeio/tdefile/tdefilespeedbar.h +++ b/tdeio/tdefile/tdefilespeedbar.h @@ -25,7 +25,7 @@ class TDEConfig; class TDEIO_EXPORT KFileSpeedBar : public KURLBar { - Q_OBJECT + TQ_OBJECT public: KFileSpeedBar( TQWidget *parent = 0, const char *name = 0 ); ~KFileSpeedBar(); diff --git a/tdeio/tdefile/tdefiletreebranch.cpp b/tdeio/tdefile/tdefiletreebranch.cpp index b55c3ffb2..70e7d7c40 100644 --- a/tdeio/tdefile/tdefiletreebranch.cpp +++ b/tdeio/tdefile/tdefiletreebranch.cpp @@ -64,32 +64,32 @@ KFileTreeBranch::KFileTreeBranch( KFileTreeView *parent, const KURL& url, setShowingDotFiles( showHidden ); - connect( this, TQT_SIGNAL( refreshItems(const KFileItemList&)), - this, TQT_SLOT ( slotRefreshItems( const KFileItemList& ))); + connect( this, TQ_SIGNAL( refreshItems(const KFileItemList&)), + this, TQ_SLOT ( slotRefreshItems( const KFileItemList& ))); - connect( this, TQT_SIGNAL( newItems(const KFileItemList&)), - this, TQT_SLOT ( addItems( const KFileItemList& ))); + connect( this, TQ_SIGNAL( newItems(const KFileItemList&)), + this, TQ_SLOT ( addItems( const KFileItemList& ))); - connect( this, TQT_SIGNAL( completed(const KURL& )), - this, TQT_SLOT(slCompleted(const KURL&))); + connect( this, TQ_SIGNAL( completed(const KURL& )), + this, TQ_SLOT(slCompleted(const KURL&))); - connect( this, TQT_SIGNAL( started( const KURL& )), - this, TQT_SLOT( slotListerStarted( const KURL& ))); + connect( this, TQ_SIGNAL( started( const KURL& )), + this, TQ_SLOT( slotListerStarted( const KURL& ))); - connect( this, TQT_SIGNAL( deleteItem( KFileItem* )), - this, TQT_SLOT( slotDeleteItem( KFileItem* ))); + connect( this, TQ_SIGNAL( deleteItem( KFileItem* )), + this, TQ_SLOT( slotDeleteItem( KFileItem* ))); - connect( this, TQT_SIGNAL( canceled(const KURL&) ), - this, TQT_SLOT( slotCanceled(const KURL&) )); + connect( this, TQ_SIGNAL( canceled(const KURL&) ), + this, TQ_SLOT( slotCanceled(const KURL&) )); - connect( this, TQT_SIGNAL( clear()), - this, TQT_SLOT( slotDirlisterClear())); + connect( this, TQ_SIGNAL( clear()), + this, TQ_SLOT( slotDirlisterClear())); - connect( this, TQT_SIGNAL( clear(const KURL&)), - this, TQT_SLOT( slotDirlisterClearURL(const KURL&))); + connect( this, TQ_SIGNAL( clear(const KURL&)), + this, TQ_SLOT( slotDirlisterClearURL(const KURL&))); - connect( this, TQT_SIGNAL( redirection( const KURL& , const KURL& ) ), - this, TQT_SLOT( slotRedirect( const KURL&, const KURL& ))); + connect( this, TQ_SIGNAL( redirection( const KURL& , const KURL& ) ), + this, TQ_SLOT( slotRedirect( const KURL&, const KURL& ))); m_openChildrenURLs.append( url ); } diff --git a/tdeio/tdefile/tdefiletreebranch.h b/tdeio/tdefile/tdefiletreebranch.h index 8c9428de3..af5b323de 100644 --- a/tdeio/tdefile/tdefiletreebranch.h +++ b/tdeio/tdefile/tdefiletreebranch.h @@ -47,7 +47,7 @@ class KFileTreeView; class TDEIO_EXPORT KFileTreeBranch : public KDirLister { - Q_OBJECT + TQ_OBJECT public: /** * constructs a branch for KFileTreeView. Does not yet start to list it. diff --git a/tdeio/tdefile/tdefiletreeview.cpp b/tdeio/tdefile/tdefiletreeview.cpp index 2710d4c08..928f4a070 100644 --- a/tdeio/tdefile/tdefiletreeview.cpp +++ b/tdeio/tdefile/tdefiletreeview.cpp @@ -26,7 +26,7 @@ #include <tdefileitem.h> #include <tdefileview.h> #include <kmimetype.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <stdlib.h> #include <assert.h> #include <tdeio/job.h> @@ -48,32 +48,32 @@ KFileTreeView::KFileTreeView( TQWidget *parent, const char *name ) setSelectionModeExt( TDEListView::Single ); m_animationTimer = new TQTimer( this ); - connect( m_animationTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAnimation() ) ); + connect( m_animationTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAnimation() ) ); m_currentBeforeDropItem = 0; m_dropItem = 0; m_autoOpenTimer = new TQTimer( this ); - connect( m_autoOpenTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoOpenFolder() ) ); + connect( m_autoOpenTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoOpenFolder() ) ); /* The executed-Slot only opens a path, while the expanded-Slot populates it */ - connect( this, TQT_SIGNAL( executed( TQListViewItem * ) ), - this, TQT_SLOT( slotExecuted( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( expanded ( TQListViewItem *) ), - this, TQT_SLOT( slotExpanded( TQListViewItem *) )); - connect( this, TQT_SIGNAL( collapsed( TQListViewItem *) ), - this, TQT_SLOT( slotCollapsed( TQListViewItem* ))); + connect( this, TQ_SIGNAL( executed( TQListViewItem * ) ), + this, TQ_SLOT( slotExecuted( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( expanded ( TQListViewItem *) ), + this, TQ_SLOT( slotExpanded( TQListViewItem *) )); + connect( this, TQ_SIGNAL( collapsed( TQListViewItem *) ), + this, TQ_SLOT( slotCollapsed( TQListViewItem* ))); /* connections from the konqtree widget */ - connect( this, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); - connect( this, TQT_SIGNAL( onItem( TQListViewItem * )), - this, TQT_SLOT( slotOnItem( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)), - this, TQT_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int))); + connect( this, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); + connect( this, TQ_SIGNAL( onItem( TQListViewItem * )), + this, TQ_SLOT( slotOnItem( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)), + this, TQ_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int))); m_bDrag = false; @@ -375,12 +375,12 @@ KFileTreeBranch* KFileTreeView::addBranch( const KURL &path, const TQString& nam KFileTreeBranch *KFileTreeView::addBranch(KFileTreeBranch *newBranch) { - connect( newBranch, TQT_SIGNAL(populateFinished( KFileTreeViewItem* )), - this, TQT_SLOT( slotPopulateFinished( KFileTreeViewItem* ))); + connect( newBranch, TQ_SIGNAL(populateFinished( KFileTreeViewItem* )), + this, TQ_SLOT( slotPopulateFinished( KFileTreeViewItem* ))); - connect( newBranch, TQT_SIGNAL( newTreeViewItems( KFileTreeBranch*, + connect( newBranch, TQ_SIGNAL( newTreeViewItems( KFileTreeBranch*, const KFileTreeViewItemList& )), - this, TQT_SLOT( slotNewTreeViewItems( KFileTreeBranch*, + this, TQ_SLOT( slotNewTreeViewItems( KFileTreeBranch*, const KFileTreeViewItemList& ))); m_branches.append( newBranch ); diff --git a/tdeio/tdefile/tdefiletreeview.h b/tdeio/tdefile/tdefiletreeview.h index 60f756dc2..b0dd9af36 100644 --- a/tdeio/tdefile/tdefiletreeview.h +++ b/tdeio/tdefile/tdefiletreeview.h @@ -65,7 +65,7 @@ private: */ class TDEIO_EXPORT KFileTreeView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: KFileTreeView( TQWidget *parent, const char *name = 0 ); virtual ~KFileTreeView(); diff --git a/tdeio/tdefile/tdefileview.cpp b/tdeio/tdefile/tdefileview.cpp index f171975d8..66111595b 100644 --- a/tdeio/tdefile/tdefileview.cpp +++ b/tdeio/tdefile/tdefileview.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> #include <tdeglobal.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "config-tdefile.h" #include "tdefileview.h" @@ -90,20 +90,20 @@ KFileView::~KFileView() void KFileView::setParentView(KFileView *parent) { if ( parent ) { // pass all signals right to our parent - TQObject::connect(sig, TQT_SIGNAL( activatedMenu(const KFileItem *, + TQObject::connect(sig, TQ_SIGNAL( activatedMenu(const KFileItem *, const TQPoint& ) ), - parent->sig, TQT_SIGNAL( activatedMenu(const KFileItem *, + parent->sig, TQ_SIGNAL( activatedMenu(const KFileItem *, const TQPoint& ))); - TQObject::connect(sig, TQT_SIGNAL( dirActivated(const KFileItem *)), - parent->sig, TQT_SIGNAL( dirActivated(const KFileItem*))); - TQObject::connect(sig, TQT_SIGNAL( fileSelected(const KFileItem *)), - parent->sig, TQT_SIGNAL( fileSelected(const KFileItem*))); - TQObject::connect(sig, TQT_SIGNAL( fileHighlighted(const KFileItem *) ), - parent->sig,TQT_SIGNAL(fileHighlighted(const KFileItem*))); - TQObject::connect(sig, TQT_SIGNAL( sortingChanged( TQDir::SortSpec ) ), - parent->sig, TQT_SIGNAL(sortingChanged( TQDir::SortSpec))); - TQObject::connect(sig, TQT_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&) ), - parent->sig, TQT_SIGNAL(dropped(const KFileItem *, TQDropEvent*, const KURL::List&))); + TQObject::connect(sig, TQ_SIGNAL( dirActivated(const KFileItem *)), + parent->sig, TQ_SIGNAL( dirActivated(const KFileItem*))); + TQObject::connect(sig, TQ_SIGNAL( fileSelected(const KFileItem *)), + parent->sig, TQ_SIGNAL( fileSelected(const KFileItem*))); + TQObject::connect(sig, TQ_SIGNAL( fileHighlighted(const KFileItem *) ), + parent->sig,TQ_SIGNAL(fileHighlighted(const KFileItem*))); + TQObject::connect(sig, TQ_SIGNAL( sortingChanged( TQDir::SortSpec ) ), + parent->sig, TQ_SIGNAL(sortingChanged( TQDir::SortSpec))); + TQObject::connect(sig, TQ_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&) ), + parent->sig, TQ_SIGNAL(dropped(const KFileItem *, TQDropEvent*, const KURL::List&))); } } diff --git a/tdeio/tdefile/tdefileview.h b/tdeio/tdefile/tdefileview.h index b80c16f0f..6703b8c82 100644 --- a/tdeio/tdefile/tdefileview.h +++ b/tdeio/tdefile/tdefileview.h @@ -1,4 +1,3 @@ -// -*- c++ -*- /* This file is part of the KDE libraries Copyright (C) 1997 Stephan Kulow <coolo@kde.org> Copyright (C) 2001 Carsten Pfeiffer <pfeiffer@kde.org> @@ -36,7 +35,7 @@ class TDEActionCollection; **/ class TDEIO_EXPORT KFileViewSignaler : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeio/tdefile/tderecentdirs.cpp b/tdeio/tdefile/tderecentdirs.cpp index 0548261dd..11b390433 100644 --- a/tdeio/tdefile/tderecentdirs.cpp +++ b/tdeio/tdefile/tderecentdirs.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* * Copyright (C)2000 Waldo Bastian <bastian@kde.org> * * All rights reserved. @@ -26,8 +26,8 @@ * */ #include <tderecentdirs.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <tdeglobalsettings.h> #define MAX_DIR_HISTORY 3 @@ -52,7 +52,7 @@ static TDEConfig *recentdirs_readList(TQString &key, TQStringList &result, bool if (key[1] == ':') { key = key.mid(2); - config = new KSimpleConfig(TQString::fromLatin1("tderecentdirsrc"), readOnly); + config = new TDESimpleConfig(TQString::fromLatin1("tderecentdirsrc"), readOnly); } else { diff --git a/tdeio/tdefile/tderecentdirs.h b/tdeio/tdefile/tderecentdirs.h index ca1a5bbe2..df9cb855f 100644 --- a/tdeio/tdefile/tderecentdirs.h +++ b/tdeio/tdefile/tderecentdirs.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* * Copyright (C)2000 Waldo Bastian <bastian@kde.org> * * All rights reserved. diff --git a/tdeio/tdefile/tderecentdocument.cpp b/tdeio/tdefile/tderecentdocument.cpp index 968db93a4..2b8a96102 100644 --- a/tdeio/tdefile/tderecentdocument.cpp +++ b/tdeio/tdefile/tderecentdocument.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* * Copyright (C)2000 Daniel M. Duley <mosfet@kde.org> * * All rights reserved. @@ -26,13 +26,13 @@ * */ #include <tderecentdocument.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <kurl.h> #include <kdebug.h> #include <kmimetype.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tqdir.h> #include <tqfileinfo.h> #include <tqtextstream.h> @@ -61,7 +61,7 @@ TQStringList TDERecentDocument::recentDocuments() for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) { TQString pathDesktop = d.absFilePath( *it ); - KDesktopFile tmpDesktopFile( pathDesktop, false); + TDEDesktopFile tmpDesktopFile( pathDesktop, false); KURL urlDesktopFile(tmpDesktopFile.readURL()); if( urlDesktopFile.isLocalFile() && !TQFile(urlDesktopFile.path()).exists()) d.remove(pathDesktop); @@ -106,7 +106,7 @@ void TDERecentDocument::add(const KURL& url, const TQString& desktopEntryName) // check for duplicates while(TQFile::exists(ddesktop)){ // see if it points to the same file and application - KSimpleConfig tmp(ddesktop); + TDESimpleConfig tmp(ddesktop); tmp.setDesktopGroup(); if(tmp.readEntry(TQString::fromLatin1("X-TDE-LastOpenedWith")) == desktopEntryName) @@ -135,7 +135,7 @@ void TDERecentDocument::add(const KURL& url, const TQString& desktopEntryName) } // create the applnk - KSimpleConfig conf(ddesktop); + TDESimpleConfig conf(ddesktop); conf.setDesktopGroup(); conf.writeEntry( TQString::fromLatin1("Type"), TQString::fromLatin1("Link") ); conf.writePathEntry( TQString::fromLatin1("URL"), openStr ); diff --git a/tdeio/tdefile/tderecentdocument.h b/tdeio/tdefile/tderecentdocument.h index a3ee1b6b7..ec481afaa 100644 --- a/tdeio/tdefile/tderecentdocument.h +++ b/tdeio/tdefile/tderecentdocument.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* * Copyright (C)2000 Daniel M. Duley <mosfet@kde.org> * * All rights reserved. diff --git a/tdeio/tdefile/tests/kfdtest.cpp b/tdeio/tdefile/tests/kfdtest.cpp index ce7127d9e..9239d5f4d 100644 --- a/tdeio/tdefile/tests/kfdtest.cpp +++ b/tdeio/tdefile/tests/kfdtest.cpp @@ -10,7 +10,7 @@ KFDTest::KFDTest( const TQString& startDir, TQObject *parent, const char *name ) : TQObject( parent, name ), m_startDir( startDir ) { - TQTimer::singleShot( 1000, this, TQT_SLOT( doit() )); + TQTimer::singleShot( 1000, this, TQ_SLOT( doit() )); } void KFDTest::doit() diff --git a/tdeio/tdefile/tests/kfdtest.h b/tdeio/tdefile/tests/kfdtest.h index 6c59550b8..5a076460e 100644 --- a/tdeio/tdefile/tests/kfdtest.h +++ b/tdeio/tdefile/tests/kfdtest.h @@ -12,7 +12,7 @@ class KFDTest : public TQObject { - Q_OBJECT + TQ_OBJECT public: KFDTest( const TQString& startDir, TQObject *parent = 0, const char *name = 0); diff --git a/tdeio/tdefile/tests/kicondialogtest.cpp b/tdeio/tdefile/tests/kicondialogtest.cpp index b516ee07d..c0a86bda1 100644 --- a/tdeio/tdefile/tests/kicondialogtest.cpp +++ b/tdeio/tdefile/tests/kicondialogtest.cpp @@ -14,6 +14,3 @@ int main( int argc, char **argv ) return app.exec(); } - -/* vim: et sw=4 - */ diff --git a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp index da031eac2..1f3f2e67d 100644 --- a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp +++ b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp @@ -45,14 +45,14 @@ testFrame::testFrame():TDEMainWindow(0,"Test FileTreeView"), /* Connect to see the status bar */ KStatusBar* sta = statusBar(); - connect( treeView, TQT_SIGNAL( onItem( const TQString& )), - sta, TQT_SLOT( message( const TQString& ))); + connect( treeView, TQ_SIGNAL( onItem( const TQString& )), + sta, TQ_SLOT( message( const TQString& ))); - connect( treeView, TQT_SIGNAL( dropped( TQWidget*, TQDropEvent*, KURL::List& )), - this, TQT_SLOT( urlsDropped( TQWidget*, TQDropEvent*, KURL::List& ))); + connect( treeView, TQ_SIGNAL( dropped( TQWidget*, TQDropEvent*, KURL::List& )), + this, TQ_SLOT( urlsDropped( TQWidget*, TQDropEvent*, KURL::List& ))); - connect( treeView, TQT_SIGNAL( dropped( KURL::List&, KURL& )), this, - TQT_SLOT( copyURLs( KURL::List&, KURL& ))); + connect( treeView, TQ_SIGNAL( dropped( KURL::List&, KURL& )), this, + TQ_SLOT( copyURLs( KURL::List&, KURL& ))); treeView->addColumn( "File" ); treeView->addColumn( "ChildCount" ); @@ -77,10 +77,10 @@ void testFrame::showPath( const KURL &url ) if( dirOnlyMode ) treeView->setDirOnlyMode( nb, true ); nb->setOpenPixmap( pixOpen ); - connect( nb, TQT_SIGNAL(populateFinished(KFileTreeViewItem*)), - this, TQT_SLOT(slotPopulateFinished(KFileTreeViewItem*))); - connect( nb, TQT_SIGNAL( directoryChildCount( KFileTreeViewItem *, int )), - this, TQT_SLOT( slotSetChildCount( KFileTreeViewItem*, int ))); + connect( nb, TQ_SIGNAL(populateFinished(KFileTreeViewItem*)), + this, TQ_SLOT(slotPopulateFinished(KFileTreeViewItem*))); + connect( nb, TQ_SIGNAL( directoryChildCount( KFileTreeViewItem *, int )), + this, TQ_SLOT( slotSetChildCount( KFileTreeViewItem*, int ))); // nb->setChildRecurse(false ); nb->setOpen(true); diff --git a/tdeio/tdefile/tests/tdefiletreeviewtest.h b/tdeio/tdefile/tests/tdefiletreeviewtest.h index 0375f8d11..246d769ef 100644 --- a/tdeio/tdefile/tests/tdefiletreeviewtest.h +++ b/tdeio/tdefile/tests/tdefiletreeviewtest.h @@ -22,7 +22,7 @@ class testFrame: public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: testFrame(); void showPath( const KURL & ); diff --git a/tdeio/tdefileplugin.desktop b/tdeio/tdefileplugin.desktop index 6609551a6..a26280bee 100644 --- a/tdeio/tdefileplugin.desktop +++ b/tdeio/tdefileplugin.desktop @@ -2,81 +2,6 @@ Type=ServiceType X-TDE-ServiceType=KFilePlugin Name=KFile Meta Data Plugin -Name[af]=Klêer Meta Data Inprop module -Name[ar]=ملحق KFile Meta Data -Name[az]=KFile Meta Data Əlavəsi -Name[bg]=Приставка за мета данни -Name[bn]=কে-ফাইল মেটা-ডেটা প্লাগ-ইন -Name[bs]=KFile Meta Data dodatak -Name[ca]=Connector de meta dades KFile -Name[cs]=Modul KFile pro metadata -Name[csb]=Plugins do sprôwianiô pòdôwkama nieznónegò fòrmatu -Name[cy]=Ategyn Meta-ddata KFfeil -Name[da]=KFile Metadata-plugin -Name[de]=KFile: Metadaten-Modul -Name[el]=Πρόσθετο μετα-δεδομένων του KFile -Name[eo]=Dosierinterdatuma kromaĵo -Name[es]=Plugin de meta datos KFile -Name[et]=KFile'i metaandmete plugin -Name[eu]=KFile metadatuen plugin-a -Name[fa]=وصلۀ فرادادۀ KFile -Name[fi]=KFile-metatietolisäosa -Name[fr]=Module externe de métadonnées KFile -Name[ga]=Breiseán meiteashonraí do KFile -Name[gl]=Plugin para Meta Dados de KFile -Name[he]=תוסף מטא־נתונים עבור KFile -Name[hi]=KFile मेटा ङाटा प्लगइन -Name[hr]=KFile dodatak za meta-podatke -Name[hu]=KFile metaadat-modul -Name[id]=Plugin Meta Data KBerkas -Name[is]=KFile lýsiskráar-íforrit -Name[it]=Plugin informazioni aggiuntive per KFile -Name[ja]=KFile メタデータプラグイン -Name[ka]=KFile-ს მეტამონაცემთა მოდული -Name[kk]=KFile метадеректер модулі -Name[km]=កម្មវិធីជំនួយខាងក្នុងនៃទិន្នន័យមេតា KFile -Name[ko]=K파일 메타 자료 플러그인 -Name[lb]=KFile-Metadonnéeë-Plugin -Name[lt]=KFile Meta duomenų priedas -Name[lv]=KFailu Meta Datu Iespraudnis -Name[mk]=KFile приклучок за мета податоци -Name[mn]=KFile: Мита өгөгдлийн -Plugin -Name[ms]=Plug masuk Data Meta KFile -Name[mt]=Plagin metadata ta' KFile -Name[nb]=KFile programtillegg for metadata -Name[nds]=KFile, Metadaten-Plugin -Name[ne]=K फाइल मेटाडेटा प्लगइन -Name[nn]=KFile-programtillegg for metadata -Name[nso]=Tsenyo ya Data ya Meta wa KFaele -Name[pa]=KFile ਮੈਟਾ ਡਾਟਾ ਪਲੱਗਿੰਨ -Name[pl]=Wtyczka do obsługi danych nieznanego formatu -Name[pt]='Plugin' de Meta-Dados do KFile -Name[pt_BR]=Plug-in KFile de Meta Dados -Name[ro]=Modul metadate KFile -Name[ru]=Модуль метаданных KFile -Name[rw]=Icyomeka ry'Ibyatanzwe Bidasanzwe bya KIdosiye -Name[se]=KFile lassemoduvla metadieđuid várás -Name[sk]=Modul KFile pre meta dáta -Name[sl]=Vstavek za meta podatke pri KFile -Name[sq]=Shtojca KFile Meta Data -Name[sr]=KFile прикључак за мета податке -Name[sr@Latn]=KFile priključak za meta podatke -Name[sv]=Kfil-metadatainsticksprogram -Name[ta]=கேகோப்பு மெட்டா தகவல் சொருகுப்பொருள் -Name[te]=కెదస్త్రం మెటా దత్తాంసం ప్లగిన్ -Name[tg]=KФайли Модули Meta Сана -Name[th]=ปลั๊กอินข้อมูลเมตาของ KFile -Name[tr]=KFile Meta Veri Eklentisi -Name[tt]=KFile Meta-Bireme öçen Östämä -Name[uk]=Втулок метаданих KFile -Name[uz]=KFile meta maʼlumot uchun plagin -Name[uz@cyrillic]=KFile мета маълумот учун плагин -Name[ven]=Meta data pulagini ya faela ya K -Name[vi]=Bộ cầm phít siêu dữ liệu KFile -Name[xh]=Iplagi yangaphakathi ye KFile Meta Data -Name[zh_CN]=KFile 元数据插件 -Name[zh_HK]=KFile 元資料外掛程式 -Name[zh_TW]=KFile 資料定義外掛程式 [PropertyDef::PreferredItems] Type=TQStringList diff --git a/tdeio/tdeio/CMakeLists.txt b/tdeio/tdeio/CMakeLists.txt index fb56d2783..91828320a 100644 --- a/tdeio/tdeio/CMakeLists.txt +++ b/tdeio/tdeio/CMakeLists.txt @@ -82,7 +82,6 @@ set( ${target}_SRCS tde_add_library( ${target} STATIC_PIC AUTOMOC SOURCES ${${target}_SRCS} - DEPENDENCIES dcopidl ) diff --git a/tdeio/tdeio/authinfo.cpp b/tdeio/tdeio/authinfo.cpp index b95a40585..e8c89e5ff 100644 --- a/tdeio/tdeio/authinfo.cpp +++ b/tdeio/tdeio/authinfo.cpp @@ -30,7 +30,7 @@ #include <tqfile.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ksavefile.h> #include <kstaticdeleter.h> #include <kde_file.h> diff --git a/tdeio/tdeio/chmodjob.cpp b/tdeio/tdeio/chmodjob.cpp index 24a5c247d..54d4aeab1 100644 --- a/tdeio/tdeio/chmodjob.cpp +++ b/tdeio/tdeio/chmodjob.cpp @@ -48,7 +48,7 @@ ChmodJob::ChmodJob( const KFileItemList& lstItems, int permissions, int mask, m_newOwner( newOwner ), m_newGroup( newGroup ), m_recursive( recursive ), m_lstItems( lstItems ) { - TQTimer::singleShot( 0, this, TQT_SLOT(processList()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(processList()) ); } void ChmodJob::processList() @@ -77,9 +77,9 @@ void ChmodJob::processList() { //kdDebug(7007) << "ChmodJob::processList dir -> listing" << endl; TDEIO::ListJob * listJob = TDEIO::listRecursive( item->url(), false /* no GUI */ ); - connect( listJob, TQT_SIGNAL(entries( TDEIO::Job *, + connect( listJob, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList& )), - TQT_SLOT( slotEntries( TDEIO::Job*, + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ))); addSubjob( listJob ); return; // we'll come back later, when this one's finished diff --git a/tdeio/tdeio/chmodjob.h b/tdeio/tdeio/chmodjob.h index 59fb253bc..fec1fe18b 100644 --- a/tdeio/tdeio/chmodjob.h +++ b/tdeio/tdeio/chmodjob.h @@ -1,4 +1,3 @@ -// -*- c++ -*- /* This file is part of the KDE libraries Copyright (C) 2000 David Faure <faure@kde.org> @@ -37,7 +36,7 @@ namespace TDEIO { */ class TDEIO_EXPORT ChmodJob : public TDEIO::Job { - Q_OBJECT + TQ_OBJECT public: /** * Create new ChmodJobs using the TDEIO::chmod() function. diff --git a/tdeio/tdeio/configure.in.in b/tdeio/tdeio/configure.in.in index f45411458..cf9911512 100644 --- a/tdeio/tdeio/configure.in.in +++ b/tdeio/tdeio/configure.in.in @@ -32,20 +32,6 @@ AC_FIND_ZLIB AC_CHECK_HEADERS(sys/mnttab.h sys/mntent.h mntent.h fstab.h sys/ucred.h sys/mount.h) AC_CHECK_FUNCS(setmntent getmntinfo) -AH_VERBATIM(_GETMNTINFO, [ -#ifdef __osf__ -#ifdef __cplusplus -extern "C" { -#endif -#include <sys/mount.h> -int getmntinfo(struct statfs **mntbufp, int flags); -#include <sys/fs_types.h> /* for mnt_names[] */ -#ifdef __cplusplus -} -#endif -#endif -]) - dnl ------------------------------------------------------------------------ dnl Try to find if libvolmgt is installed (Solaris) dnl ------------------------------------------------------------------------ diff --git a/tdeio/tdeio/connection.cpp b/tdeio/tdeio/connection.cpp index 9577ad534..8b21e3a0c 100644 --- a/tdeio/tdeio/connection.cpp +++ b/tdeio/tdeio/connection.cpp @@ -42,8 +42,10 @@ #include <kdebug.h> #include <tqsocketnotifier.h> -#if defined(__OpenBSD__) || defined(__FreeBSD__) +#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) #define __progname getprogname() +#elif defined(_GNU_SOURCE) && defined(__GLIBC__) +#define __progname program_invocation_short_name #else extern char *__progname; #endif @@ -141,7 +143,7 @@ void Connection::init(TDESocket *sock) if ( m_suspended ) { suspend(); } - TQObject::connect(notifier, TQT_SIGNAL(activated(int)), receiver, member); + TQObject::connect(notifier, TQ_SIGNAL(activated(int)), receiver, member); } dequeue(); } @@ -157,7 +159,7 @@ void Connection::init(int _fd_in, int fd_out) if ( m_suspended ) { suspend(); } - TQObject::connect(notifier, TQT_SIGNAL(activated(int)), receiver, member); + TQObject::connect(notifier, TQ_SIGNAL(activated(int)), receiver, member); } dequeue(); } @@ -173,7 +175,7 @@ void Connection::connect(TQObject *_receiver, const char *_member) notifier = new TQSocketNotifier(fd_in, TQSocketNotifier::Read); if ( m_suspended ) suspend(); - TQObject::connect(notifier, TQT_SIGNAL(activated(int)), receiver, member); + TQObject::connect(notifier, TQ_SIGNAL(activated(int)), receiver, member); } } diff --git a/tdeio/tdeio/connection.h b/tdeio/tdeio/connection.h index fb0b50e15..011928899 100644 --- a/tdeio/tdeio/connection.h +++ b/tdeio/tdeio/connection.h @@ -1,4 +1,3 @@ -// -*- c++ -*- /* This file is part of the KDE libraries Copyright (C) 2000 Stephan Kulow <coolo@kde.org> David Faure <faure@kde.org> @@ -48,7 +47,7 @@ namespace TDEIO { */ class TDEIO_EXPORT Connection : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * Creates a new connection. diff --git a/tdeio/tdeio/dataprotocol.cpp b/tdeio/tdeio/dataprotocol.cpp index efbf549ad..3bfd3ed1c 100644 --- a/tdeio/tdeio/dataprotocol.cpp +++ b/tdeio/tdeio/dataprotocol.cpp @@ -29,7 +29,7 @@ #include <tqtextcodec.h> #ifdef DATAKIOSLAVE -# include <kinstance.h> +# include <tdeinstance.h> # include <stdlib.h> #endif #ifdef TESTKIO diff --git a/tdeio/tdeio/dataslave.cpp b/tdeio/tdeio/dataslave.cpp index 41a76efd1..46c230f06 100644 --- a/tdeio/tdeio/dataslave.cpp +++ b/tdeio/tdeio/dataslave.cpp @@ -62,7 +62,7 @@ DataSlave::DataSlave() : //kdDebug() << this << k_funcinfo << endl; _suspended = false; timer = new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), TQT_SLOT(dispatchNext())); + connect(timer, TQ_SIGNAL(timeout()), TQ_SLOT(dispatchNext())); } DataSlave::~DataSlave() { diff --git a/tdeio/tdeio/dataslave.h b/tdeio/tdeio/dataslave.h index 0c78a308c..9bd5bfc4f 100644 --- a/tdeio/tdeio/dataslave.h +++ b/tdeio/tdeio/dataslave.h @@ -1,4 +1,3 @@ -// -*- c++ -*- /* * This file is part of the KDE libraries * Copyright (c) 2003 Leo Savernik <l.savernik@aon.at> @@ -47,7 +46,7 @@ namespace TDEIO { * @author Leo Savernik */ class DataSlave : public TDEIO::Slave { - Q_OBJECT + TQ_OBJECT public: DataSlave(); diff --git a/tdeio/tdeio/davjob.cpp b/tdeio/tdeio/davjob.cpp index 8106c77ba..8395587fa 100644 --- a/tdeio/tdeio/davjob.cpp +++ b/tdeio/tdeio/davjob.cpp @@ -1,4 +1,3 @@ -// -*- c++ -*- /* This file is part of the KDE libraries Copyright (C) 2002 Jan-Pascal van Best <janpascal@vanbest.org> diff --git a/tdeio/tdeio/davjob.h b/tdeio/tdeio/davjob.h index 83e3bb3d8..a6a2f77bb 100644 --- a/tdeio/tdeio/davjob.h +++ b/tdeio/tdeio/davjob.h @@ -1,4 +1,3 @@ -// -*- c++ -*- /* This file is part of the KDE libraries Copyright (C) 2002 Jan-Pascal van Best <janpascal@vanbest.org> @@ -55,7 +54,7 @@ namespace TDEIO { * @since 3.1 */ class TDEIO_EXPORT DavJob : public TransferJob { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeio/tdeio/defaultprogress.cpp b/tdeio/tdeio/defaultprogress.cpp index 7198a3fd5..653c5a144 100644 --- a/tdeio/tdeio/defaultprogress.cpp +++ b/tdeio/tdeio/defaultprogress.cpp @@ -29,13 +29,13 @@ #include <tdeglobal.h> #include <tdelocale.h> #include <kiconloader.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kpushbutton.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstdguiitem.h> #include <klineedit.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <twin.h> #endif @@ -86,7 +86,7 @@ void DefaultProgress::init() { d = new DefaultProgressPrivate; -#ifdef Q_WS_X11 //FIXME(E): Remove once all the KWin::foo calls have been ported to QWS +#ifdef TQ_WS_X11 //FIXME(E): Remove once all the KWin::foo calls have been ported to QWS // Set a useful icon for this window! KWin::setIcons( winId(), TDEGlobal::iconLoader()->loadIcon( "document-save", TDEIcon::NoGroup, 32 ), @@ -98,7 +98,7 @@ void DefaultProgress::init() topLayout->addStrut( 360 ); // makes dlg at least that wide TQGridLayout *grid = new TQGridLayout( 2, 3 ); - topLayout->addLayout(TQT_TQLAYOUT(grid)); + topLayout->addLayout(grid); grid->addColSpacing(1, KDialog::spacingHint()); // filenames or action name grid->addWidget(new TQLabel(i18n("Source:"), this), 0, 0); @@ -147,7 +147,7 @@ void DefaultProgress::init() topLayout->addWidget( line ); d->keepOpen = new TQCheckBox( i18n("&Keep this window open after transfer is complete"), this); - connect( d->keepOpen, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotKeepOpenToggled(bool) ) ); + connect( d->keepOpen, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotKeepOpenToggled(bool) ) ); topLayout->addWidget(d->keepOpen); d->keepOpen->hide(); @@ -155,20 +155,20 @@ void DefaultProgress::init() topLayout->addLayout(hBox); d->openFile = new KPushButton( i18n("Open &File"), this ); - connect( d->openFile, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOpenFile() ) ); + connect( d->openFile, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOpenFile() ) ); hBox->addWidget( d->openFile ); d->openFile->setEnabled(false); d->openFile->hide(); d->openLocation = new KPushButton( i18n("Open &Destination"), this ); - connect( d->openLocation, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOpenLocation() ) ); + connect( d->openLocation, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOpenLocation() ) ); hBox->addWidget( d->openLocation ); d->openLocation->hide(); hBox->addStretch(1); d->cancelClose = new KPushButton( KStdGuiItem::cancel(), this ); - connect( d->cancelClose, TQT_SIGNAL( clicked() ), TQT_SLOT( slotStop() ) ); + connect( d->cancelClose, TQ_SIGNAL( clicked() ), TQ_SLOT( slotStop() ) ); hBox->addWidget( d->cancelClose ); resize( sizeHint() ); diff --git a/tdeio/tdeio/defaultprogress.h b/tdeio/tdeio/defaultprogress.h index de0dfd093..d3fdf785e 100644 --- a/tdeio/tdeio/defaultprogress.h +++ b/tdeio/tdeio/defaultprogress.h @@ -36,7 +36,7 @@ namespace TDEIO { */ class TDEIO_EXPORT DefaultProgress : public ProgressBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeio/tdeio/forwardingslavebase.cpp b/tdeio/tdeio/forwardingslavebase.cpp index c4e4daa0c..66ab1202d 100644 --- a/tdeio/tdeio/forwardingslavebase.cpp +++ b/tdeio/tdeio/forwardingslavebase.cpp @@ -318,52 +318,52 @@ void ForwardingSlaveBase::connectJob(TDEIO::Job *job) kdDebug() << it.key() << " = " << it.data() << endl; #endif - connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), - this, TQT_SLOT( slotResult(TDEIO::Job *) ) ); - connect( job, TQT_SIGNAL( warning(TDEIO::Job *, const TQString &) ), - this, TQT_SLOT( slotWarning(TDEIO::Job *, const TQString &) ) ); - connect( job, TQT_SIGNAL( infoMessage(TDEIO::Job *, const TQString &) ), - this, TQT_SLOT( slotInfoMessage(TDEIO::Job *, const TQString &) ) ); - connect( job, TQT_SIGNAL( totalSize(TDEIO::Job *, TDEIO::filesize_t) ), - this, TQT_SLOT( slotTotalSize(TDEIO::Job *, TDEIO::filesize_t) ) ); - connect( job, TQT_SIGNAL( processedSize(TDEIO::Job *, TDEIO::filesize_t) ), - this, TQT_SLOT( slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t) ) ); - connect( job, TQT_SIGNAL( speed(TDEIO::Job *, unsigned long) ), - this, TQT_SLOT( slotSpeed(TDEIO::Job *, unsigned long) ) ); + connect( job, TQ_SIGNAL( result(TDEIO::Job *) ), + this, TQ_SLOT( slotResult(TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( warning(TDEIO::Job *, const TQString &) ), + this, TQ_SLOT( slotWarning(TDEIO::Job *, const TQString &) ) ); + connect( job, TQ_SIGNAL( infoMessage(TDEIO::Job *, const TQString &) ), + this, TQ_SLOT( slotInfoMessage(TDEIO::Job *, const TQString &) ) ); + connect( job, TQ_SIGNAL( totalSize(TDEIO::Job *, TDEIO::filesize_t) ), + this, TQ_SLOT( slotTotalSize(TDEIO::Job *, TDEIO::filesize_t) ) ); + connect( job, TQ_SIGNAL( processedSize(TDEIO::Job *, TDEIO::filesize_t) ), + this, TQ_SLOT( slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t) ) ); + connect( job, TQ_SIGNAL( speed(TDEIO::Job *, unsigned long) ), + this, TQ_SLOT( slotSpeed(TDEIO::Job *, unsigned long) ) ); } void ForwardingSlaveBase::connectSimpleJob(TDEIO::SimpleJob *job) { connectJob(job); - connect( job, TQT_SIGNAL( redirection(TDEIO::Job *, const KURL &) ), - this, TQT_SLOT( slotRedirection(TDEIO::Job *, const KURL &) ) ); + connect( job, TQ_SIGNAL( redirection(TDEIO::Job *, const KURL &) ), + this, TQ_SLOT( slotRedirection(TDEIO::Job *, const KURL &) ) ); } void ForwardingSlaveBase::connectListJob(TDEIO::ListJob *job) { connectSimpleJob(job); - connect( job, TQT_SIGNAL( entries(TDEIO::Job *, const TDEIO::UDSEntryList &) ), - this, TQT_SLOT( slotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &) ) ); + connect( job, TQ_SIGNAL( entries(TDEIO::Job *, const TDEIO::UDSEntryList &) ), + this, TQ_SLOT( slotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &) ) ); } void ForwardingSlaveBase::connectTransferJob(TDEIO::TransferJob *job) { connectSimpleJob(job); - connect( job, TQT_SIGNAL( data(TDEIO::Job *, const TQByteArray &) ), - this, TQT_SLOT( slotData(TDEIO::Job *, const TQByteArray &) ) ); - connect( job, TQT_SIGNAL( dataReq(TDEIO::Job *, TQByteArray &) ), - this, TQT_SLOT( slotDataReq(TDEIO::Job *, TQByteArray &) ) ); - connect( job, TQT_SIGNAL( mimetype(TDEIO::Job *, const TQString &) ), - this, TQT_SLOT( slotMimetype(TDEIO::Job *, const TQString &) ) ); - connect( job, TQT_SIGNAL( canResume(TDEIO::Job *, TDEIO::filesize_t) ), - this, TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t) ) ); + connect( job, TQ_SIGNAL( data(TDEIO::Job *, const TQByteArray &) ), + this, TQ_SLOT( slotData(TDEIO::Job *, const TQByteArray &) ) ); + connect( job, TQ_SIGNAL( dataReq(TDEIO::Job *, TQByteArray &) ), + this, TQ_SLOT( slotDataReq(TDEIO::Job *, TQByteArray &) ) ); + connect( job, TQ_SIGNAL( mimetype(TDEIO::Job *, const TQString &) ), + this, TQ_SLOT( slotMimetype(TDEIO::Job *, const TQString &) ) ); + connect( job, TQ_SIGNAL( canResume(TDEIO::Job *, TDEIO::filesize_t) ), + this, TQ_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t) ) ); } void ForwardingSlaveBase::connectLocalURLJob(TDEIO::LocalURLJob *job) { connectJob(job); - connect( job, TQT_SIGNAL( localURL(TDEIO::LocalURLJob *, const KURL&, bool) ), - this, TQT_SLOT( slotLocalURL(TDEIO::LocalURLJob *, const KURL&, bool) ) ); + connect( job, TQ_SIGNAL( localURL(TDEIO::LocalURLJob *, const KURL&, bool) ), + this, TQ_SLOT( slotLocalURL(TDEIO::LocalURLJob *, const KURL&, bool) ) ); } ////////////////////////////////////////////////////////////////////////////// diff --git a/tdeio/tdeio/forwardingslavebase.h b/tdeio/tdeio/forwardingslavebase.h index 5905fcf5e..00d38cdba 100644 --- a/tdeio/tdeio/forwardingslavebase.h +++ b/tdeio/tdeio/forwardingslavebase.h @@ -87,7 +87,7 @@ class ForwardingSlaveBasePrivate; */ class TDEIO_EXPORT ForwardingSlaveBase : public TQObject, public SlaveBase { -Q_OBJECT +TQ_OBJECT public: ForwardingSlaveBase(const TQCString &protocol, const TQCString &poolSocket, diff --git a/tdeio/tdeio/global.cpp b/tdeio/tdeio/global.cpp index ff51ac19c..f026b3044 100644 --- a/tdeio/tdeio/global.cpp +++ b/tdeio/tdeio/global.cpp @@ -1144,22 +1144,34 @@ TDEIO_EXPORT TQByteArray TDEIO::rawErrorDetail(int errorCode, const TQString &er break; case TDEIO::ERR_SERVER_TIMEOUT: + { + int connTimeout = KProtocolManager::connectTimeout(); + int respTimeout = KProtocolManager::responseTimeout(); + int prConnTimeout = KProtocolManager::proxyConnectTimeout(); errorName = i18n( "Timeout Error" ); - description = i18n( "Although contact was made with the server, a " - "response was not received within the amount of time allocated for " - "the request as follows:<ul>" - "<li>Timeout for establishing a connection: %1 seconds</li>" - "<li>Timeout for receiving a response: %2 seconds</li>" - "<li>Timeout for accessing proxy servers: %3 seconds</li></ul>" - "Please note that you can alter these timeout settings in the TDE " - "Control Center, by selecting Network -> Preferences." ) - .arg( KProtocolManager::connectTimeout() ) - .arg( KProtocolManager::responseTimeout() ) - .arg( KProtocolManager::proxyConnectTimeout() ); + description = i18n("Although contact was made with the server, a " + "response was not received within the amount of time allocated for " + "the request as follows:") + .append(TQString::fromLatin1("<ul><li>")) + .append(i18n("Timeout for establishing a connection: %n second", + "Timeout for establishing a connection: %n seconds", + connTimeout)) + .append(TQString::fromLatin1("</li><li>")) + .append(i18n("Timeout for receiving a response: %n second", + "Timeout for receiving a response: %n seconds", + respTimeout)) + .append(TQString::fromLatin1("</li><li>")) + .append(i18n("Timeout for accessing proxy servers: %n second", + "Timeout for accessing proxy servers: %n seconds", + prConnTimeout)) + .append(TQString::fromLatin1("</li></ul>")) + .append(i18n("Please note that you can alter these timeout settings in the TDE " + "Control Center, by selecting Network -> Preferences." )); causes << cNetpath << i18n( "The server was too busy responding to other " "requests to respond." ); solutions << sTryagain << sServeradmin; break; + } case TDEIO::ERR_UNKNOWN: errorName = i18n( "Unknown Error" ); @@ -1295,6 +1307,8 @@ TDEIO_EXPORT TQByteArray TDEIO::rawErrorDetail(int errorCode, const TQString &er #endif #ifdef HAVE_SYS_UCRED_H #include <sys/ucred.h> +#elif defined(HAVE_UCRED_H) +#include <ucred.h> #endif #ifdef HAVE_SYS_MOUNT_H #include <sys/mount.h> @@ -1746,11 +1760,7 @@ static TQString get_mount_info(const TQString& filename, if (realpath(device_name, realpath_buffer) != 0) // succes, use result from realpath device_name = realpath_buffer; -#ifdef __osf__ - char * mounttype = mnt_names[mounted[i].f_type]; -#else char * mounttype = mounted[i].f_fstypename; -#endif if ( is_my_mountpoint( mounted[i].f_mntonname, realname, max ) ) { mountPoint = TQFile::decodeName(mounted[i].f_mntonname); diff --git a/tdeio/tdeio/global.h b/tdeio/tdeio/global.h index c4ba34f95..77e2da77b 100644 --- a/tdeio/tdeio/global.h +++ b/tdeio/tdeio/global.h @@ -103,7 +103,7 @@ namespace TDEIO * @param speed speed in bytes per second * @return calculated remaining time */ - TDEIO_EXPORT TQTime calculateRemaining( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed ) KDE_DEPRECATED; + TDEIO_EXPORT TQTime calculateRemaining( TDEIO::filesize_t totalSize, TDEIO::filesize_t processedSize, TDEIO::filesize_t speed ) TDE_DEPRECATED; /** * Helper for showing information about a set of files and directories diff --git a/tdeio/tdeio/job.cpp b/tdeio/tdeio/job.cpp index f6156a966..d7ac59697 100644 --- a/tdeio/tdeio/job.cpp +++ b/tdeio/tdeio/job.cpp @@ -44,7 +44,7 @@ extern "C" { #include <tdeapplication.h> #include <tdeglobal.h> #include <tdelocale.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kdebug.h> #include <kdialog.h> #include <tdemessagebox.h> @@ -73,7 +73,7 @@ extern "C" { #ifdef Q_OS_UNIX #include <utime.h> #endif -#if defined Q_WS_X11 +#if defined TQ_WS_X11 #include <netwm.h> #include <fixx11h.h> #endif @@ -89,15 +89,23 @@ template class TQPtrList<TDEIO::Job>; class Job::JobPrivate { public: - JobPrivate() : m_autoErrorHandling( false ), m_autoWarningHandling( true ), - m_interactive( true ), m_parentJob( 0L ), m_extraFlags(0), - m_processedSize(0), m_userTimestamp(0) + JobPrivate() : m_autoErrorHandling(false), m_autoWarningHandling(true), + m_interactive(true), m_errorParentWidgetGP(0), m_parentJob(0L), + m_extraFlags(0), m_processedSize(0), m_userTimestamp(0) {} + ~JobPrivate() + { + if (m_errorParentWidgetGP) + { + delete m_errorParentWidgetGP; + } + } + bool m_autoErrorHandling; bool m_autoWarningHandling; bool m_interactive; - TQGuardedPtr<TQWidget> m_errorParentWidget; + TQGuardedPtr<TQWidget> *m_errorParentWidgetGP; // Maybe we could use the TQObject parent/child mechanism instead // (requires a new ctor, and moving the ctor code to some init()). Job* m_parentJob; @@ -106,7 +114,18 @@ public: unsigned long m_userTimestamp; }; -Job::Job(bool showProgressInfo) : TQObject(0, "job"), m_error(0), m_percent(0) +static TQObject *__job_root_obj = nullptr; + +static TQObject* __getJobRoot() +{ + if (!__job_root_obj) + { + __job_root_obj = new TQObject(0, "jobroot"); + } + return __job_root_obj; +} + +Job::Job(bool showProgressInfo) : TQObject(__getJobRoot(), "job"), m_error(0), m_percent(0) , m_progressId(0), m_speedTimer(0), d( new JobPrivate ) { // All jobs delete themselves after emiting 'result'. @@ -118,30 +137,32 @@ Job::Job(bool showProgressInfo) : TQObject(0, "job"), m_error(0), m_percent(0) addMetaData("progress-id", TQString::number(m_progressId)); //kdDebug(7007) << "Created job " << this << " with progress info -- m_progressId=" << m_progressId << endl; // Connect global progress info signals - connect( this, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); - connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString & ) ), - Observer::self(), TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString & ) ) ); - connect( this, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), - Observer::self(), TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( this, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), - Observer::self(), TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( this, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQ_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQ_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString & ) ), + Observer::self(), TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString & ) ) ); + connect( this, TQ_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), + Observer::self(), TQ_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( this, TQ_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), + Observer::self(), TQ_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( this, TQ_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQ_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) ); } // Don't exit while this job is running - if (kapp) - kapp->ref(); - if (kapp) - updateUserTimestamp( kapp->userTimestamp()); + if (tdeApp) + tdeApp->ref(); + if (tdeApp) + updateUserTimestamp( tdeApp->userTimestamp()); } Job::~Job() { delete m_speedTimer; delete d; - if (kapp) - kapp->deref(); + if (tdeApp) + { + tdeApp->deref(); + } } int& Job::extraFlags() @@ -164,15 +185,15 @@ void Job::addSubjob(Job *job, bool inheritMetaData) //kdDebug(7007) << "addSubjob(" << job << ") this = " << this << endl; subjobs.append(job); - connect( job, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotResult(TDEIO::Job*)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotResult(TDEIO::Job*)) ); // Forward information from that subjob. - connect( job, TQT_SIGNAL(speed( TDEIO::Job*, unsigned long )), - TQT_SLOT(slotSpeed(TDEIO::Job*, unsigned long)) ); + connect( job, TQ_SIGNAL(speed( TDEIO::Job*, unsigned long )), + TQ_SLOT(slotSpeed(TDEIO::Job*, unsigned long)) ); - connect( job, TQT_SIGNAL(infoMessage( TDEIO::Job*, const TQString & )), - TQT_SLOT(slotInfoMessage(TDEIO::Job*, const TQString &)) ); + connect( job, TQ_SIGNAL(infoMessage( TDEIO::Job*, const TQString & )), + TQ_SLOT(slotInfoMessage(TDEIO::Job*, const TQString &)) ); if (inheritMetaData) job->mergeMetaData(m_outgoingMetaData); @@ -219,7 +240,7 @@ void Job::emitSpeed( unsigned long bytes_per_second ) if ( !m_speedTimer ) { m_speedTimer = new TQTimer(); - connect( m_speedTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotSpeedTimeout() ) ); + connect( m_speedTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotSpeedTimeout() ) ); } emit speed( this, bytes_per_second ); m_speedTimer->start( 5000 ); // 5 seconds interval should be enough @@ -231,7 +252,7 @@ void Job::emitResult() if ( m_progressId ) // Did we get an ID from the observer ? Observer::self()->jobFinished( m_progressId ); if ( m_error && d->m_interactive && d->m_autoErrorHandling ) - showErrorDialog( d->m_errorParentWidget ); + showErrorDialog( d->m_errorParentWidgetGP ? *d->m_errorParentWidgetGP : nullptr); emit result(this); deleteLater(); } @@ -294,7 +315,7 @@ void Job::slotSpeedTimeout() void Job::showErrorDialog( TQWidget * parent ) { //kdDebug(7007) << "Job::showErrorDialog parent=" << parent << endl; - kapp->enableStyles(); + tdeApp->enableStyles(); // Show a message box, except for "user canceled" or "no content" if ( (m_error != ERR_USER_CANCELED) && (m_error != ERR_NO_CONTENT) ) { //old plain error message @@ -320,8 +341,16 @@ void Job::showErrorDialog( TQWidget * parent ) void Job::setAutoErrorHandlingEnabled( bool enable, TQWidget *parentWidget ) { + if (d->m_errorParentWidgetGP && (TQWidget*)(*d->m_errorParentWidgetGP) != parentWidget) + { + delete d->m_errorParentWidgetGP; + d->m_errorParentWidgetGP = nullptr; + } d->m_autoErrorHandling = enable; - d->m_errorParentWidget = parentWidget; + if (enable && parentWidget && !d->m_errorParentWidgetGP) + { + d->m_errorParentWidgetGP = new TQGuardedPtr<TQWidget>(parentWidget); + } } bool Job::isAutoErrorHandlingEnabled() const @@ -362,7 +391,7 @@ TQWidget *Job::window() const void Job::updateUserTimestamp( unsigned long time ) { -#if defined Q_WS_X11 +#if defined TQ_WS_X11 if( d->m_userTimestamp == 0 || NET::timestampCompare( time, d->m_userTimestamp ) > 0 ) d->m_userTimestamp = time; #endif @@ -449,7 +478,7 @@ SimpleJob::SimpleJob(const KURL& url, int command, const TQByteArray &packedArgs kdDebug() << "ERR_MALFORMED_URL" << endl; m_error = ERR_MALFORMED_URL; m_errorText = m_url.url(); - TQTimer::singleShot(0, this, TQT_SLOT(slotFinished()) ); + TQTimer::singleShot(0, this, TQ_SLOT(slotFinished()) ); return; } } @@ -495,38 +524,38 @@ void SimpleJob::start(Slave *slave) { m_slave = slave; - connect( m_slave, TQT_SIGNAL( error( int , const TQString & ) ), - TQT_SLOT( slotError( int , const TQString & ) ) ); + connect( m_slave, TQ_SIGNAL( error( int , const TQString & ) ), + TQ_SLOT( slotError( int , const TQString & ) ) ); - connect( m_slave, TQT_SIGNAL( warning( const TQString & ) ), - TQT_SLOT( slotWarning( const TQString & ) ) ); + connect( m_slave, TQ_SIGNAL( warning( const TQString & ) ), + TQ_SLOT( slotWarning( const TQString & ) ) ); - connect( m_slave, TQT_SIGNAL( infoMessage( const TQString & ) ), - TQT_SLOT( slotInfoMessage( const TQString & ) ) ); + connect( m_slave, TQ_SIGNAL( infoMessage( const TQString & ) ), + TQ_SLOT( slotInfoMessage( const TQString & ) ) ); - connect( m_slave, TQT_SIGNAL( connected() ), - TQT_SLOT( slotConnected() ) ); + connect( m_slave, TQ_SIGNAL( connected() ), + TQ_SLOT( slotConnected() ) ); - connect( m_slave, TQT_SIGNAL( finished() ), - TQT_SLOT( slotFinished() ) ); + connect( m_slave, TQ_SIGNAL( finished() ), + TQ_SLOT( slotFinished() ) ); if ((extraFlags() & EF_TransferJobDataSent) == 0) { - connect( m_slave, TQT_SIGNAL( totalSize( TDEIO::filesize_t ) ), - TQT_SLOT( slotTotalSize( TDEIO::filesize_t ) ) ); + connect( m_slave, TQ_SIGNAL( totalSize( TDEIO::filesize_t ) ), + TQ_SLOT( slotTotalSize( TDEIO::filesize_t ) ) ); - connect( m_slave, TQT_SIGNAL( processedSize( TDEIO::filesize_t ) ), - TQT_SLOT( slotProcessedSize( TDEIO::filesize_t ) ) ); + connect( m_slave, TQ_SIGNAL( processedSize( TDEIO::filesize_t ) ), + TQ_SLOT( slotProcessedSize( TDEIO::filesize_t ) ) ); - connect( m_slave, TQT_SIGNAL( speed( unsigned long ) ), - TQT_SLOT( slotSpeed( unsigned long ) ) ); + connect( m_slave, TQ_SIGNAL( speed( unsigned long ) ), + TQ_SLOT( slotSpeed( unsigned long ) ) ); } - connect( slave, TQT_SIGNAL( needProgressId() ), - TQT_SLOT( slotNeedProgressId() ) ); + connect( slave, TQ_SIGNAL( needProgressId() ), + TQ_SLOT( slotNeedProgressId() ) ); - connect( slave, TQT_SIGNAL(metaData( const TDEIO::MetaData& ) ), - TQT_SLOT( slotMetaData( const TDEIO::MetaData& ) ) ); + connect( slave, TQ_SIGNAL(metaData( const TDEIO::MetaData& ) ), + TQ_SLOT( slotMetaData( const TDEIO::MetaData& ) ) ); if (m_window) { @@ -697,8 +726,8 @@ MkdirJob::MkdirJob( const KURL& url, int command, void MkdirJob::start(Slave *slave) { - connect( slave, TQT_SIGNAL( redirection(const KURL &) ), - TQT_SLOT( slotRedirection(const KURL &) ) ); + connect( slave, TQ_SIGNAL( redirection(const KURL &) ), + TQ_SLOT( slotRedirection(const KURL &) ) ); SimpleJob::start(slave); } @@ -707,7 +736,7 @@ void MkdirJob::start(Slave *slave) void MkdirJob::slotRedirection( const KURL &url) { kdDebug(7007) << "MkdirJob::slotRedirection(" << url << ")" << endl; - if (!kapp->authorizeURLAction("redirect", m_url, url)) + if (!tdeApp->authorizeURLAction("redirect", m_url, url)) { kdWarning(7007) << "MkdirJob: Redirection from " << m_url << " to " << url << " REJECTED!" << endl; m_error = ERR_ACCESS_DENIED; @@ -818,8 +847,8 @@ LocalURLJob::LocalURLJob( const KURL& url, int command, void LocalURLJob::start(Slave *slave) { - connect( slave, TQT_SIGNAL( localURL(const KURL &, bool) ), - TQT_SLOT( slotLocalURL(const KURL &, bool) ) ); + connect( slave, TQ_SIGNAL( localURL(const KURL &, bool) ), + TQ_SLOT( slotLocalURL(const KURL &, bool) ) ); SimpleJob::start(slave); } @@ -859,10 +888,10 @@ void StatJob::start(Slave *slave) m_outgoingMetaData.replace( "statSide", m_bSource ? "source" : "dest" ); m_outgoingMetaData.replace( "details", TQString::number(m_details) ); - connect( slave, TQT_SIGNAL( statEntry( const TDEIO::UDSEntry& ) ), - TQT_SLOT( slotStatEntry( const TDEIO::UDSEntry & ) ) ); - connect( slave, TQT_SIGNAL( redirection(const KURL &) ), - TQT_SLOT( slotRedirection(const KURL &) ) ); + connect( slave, TQ_SIGNAL( statEntry( const TDEIO::UDSEntry& ) ), + TQ_SLOT( slotStatEntry( const TDEIO::UDSEntry & ) ) ); + connect( slave, TQ_SIGNAL( redirection(const KURL &) ), + TQ_SLOT( slotRedirection(const KURL &) ) ); SimpleJob::start(slave); } @@ -877,7 +906,7 @@ void StatJob::slotStatEntry( const TDEIO::UDSEntry & entry ) void StatJob::slotRedirection( const KURL &url) { kdDebug(7007) << "StatJob::slotRedirection(" << url << ")" << endl; - if (!kapp->authorizeURLAction("redirect", m_url, url)) + if (!tdeApp->authorizeURLAction("redirect", m_url, url)) { kdWarning(7007) << "StatJob: Redirection from " << m_url << " to " << url << " REJECTED!" << endl; m_error = ERR_ACCESS_DENIED; @@ -972,7 +1001,7 @@ void TransferJob::slotData( const TQByteArray &_data) void TransferJob::slotRedirection( const KURL &url) { kdDebug(7007) << "TransferJob::slotRedirection(" << url << ")" << endl; - if (!kapp->authorizeURLAction("redirect", m_url, url)) + if (!tdeApp->authorizeURLAction("redirect", m_url, url)) { kdWarning(7007) << "TransferJob: Redirection from " << m_url << " to " << url << " REJECTED!" << endl; return; @@ -1164,26 +1193,26 @@ void TransferJob::resume() void TransferJob::start(Slave *slave) { assert(slave); - connect( slave, TQT_SIGNAL( data( const TQByteArray & ) ), - TQT_SLOT( slotData( const TQByteArray & ) ) ); + connect( slave, TQ_SIGNAL( data( const TQByteArray & ) ), + TQ_SLOT( slotData( const TQByteArray & ) ) ); - connect( slave, TQT_SIGNAL( dataReq() ), - TQT_SLOT( slotDataReq() ) ); + connect( slave, TQ_SIGNAL( dataReq() ), + TQ_SLOT( slotDataReq() ) ); - connect( slave, TQT_SIGNAL( redirection(const KURL &) ), - TQT_SLOT( slotRedirection(const KURL &) ) ); + connect( slave, TQ_SIGNAL( redirection(const KURL &) ), + TQ_SLOT( slotRedirection(const KURL &) ) ); - connect( slave, TQT_SIGNAL(mimeType( const TQString& ) ), - TQT_SLOT( slotMimetype( const TQString& ) ) ); + connect( slave, TQ_SIGNAL(mimeType( const TQString& ) ), + TQ_SLOT( slotMimetype( const TQString& ) ) ); - connect( slave, TQT_SIGNAL(errorPage() ), - TQT_SLOT( slotErrorPage() ) ); + connect( slave, TQ_SIGNAL(errorPage() ), + TQ_SLOT( slotErrorPage() ) ); - connect( slave, TQT_SIGNAL( needSubURLData() ), - TQT_SLOT( slotNeedSubURLData() ) ); + connect( slave, TQ_SIGNAL( needSubURLData() ), + TQ_SLOT( slotNeedSubURLData() ) ); - connect( slave, TQT_SIGNAL(canResume( TDEIO::filesize_t ) ), - TQT_SLOT( slotCanResume( TDEIO::filesize_t ) ) ); + connect( slave, TQ_SIGNAL(canResume( TDEIO::filesize_t ) ), + TQ_SLOT( slotCanResume( TDEIO::filesize_t ) ) ); if (slave->suspended()) { @@ -1202,8 +1231,8 @@ void TransferJob::slotNeedSubURLData() // Job needs data from subURL. m_subJob = TDEIO::get( m_subUrl, false, false); suspend(); // Put job on hold until we have some data. - connect(m_subJob, TQT_SIGNAL( data(TDEIO::Job*,const TQByteArray &)), - TQT_SLOT( slotSubURLData(TDEIO::Job*,const TQByteArray &))); + connect(m_subJob, TQ_SIGNAL( data(TDEIO::Job*,const TQByteArray &)), + TQ_SLOT( slotSubURLData(TDEIO::Job*,const TQByteArray &))); addSubjob(m_subJob); } @@ -1379,7 +1408,7 @@ TransferJob *TDEIO::http_post( const KURL& url, const TQByteArray &postData, boo _url.setPath("/"); } - if (!_error && !kapp->authorizeURLAction("open", KURL(), _url)) + if (!_error && !tdeApp->authorizeURLAction("open", KURL(), _url)) _error = TDEIO::ERR_ACCESS_DENIED; // if request is not valid, return an invalid transfer job @@ -1396,7 +1425,7 @@ TransferJob *TDEIO::http_post( const KURL& url, const TQByteArray &postData, boo packedArgs, postData, showProgressInfo ); if (redirection) - TQTimer::singleShot(0, job, TQT_SLOT(slotPostRedirection()) ); + TQTimer::singleShot(0, job, TQ_SLOT(slotPostRedirection()) ); return job; } @@ -1429,10 +1458,10 @@ StoredTransferJob::StoredTransferJob(const KURL& url, int command, : TransferJob( url, command, packedArgs, _staticData, showProgressInfo ), m_uploadOffset( 0 ) { - connect( this, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotStoredData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( this, TQT_SIGNAL( dataReq( TDEIO::Job *, TQByteArray & ) ), - TQT_SLOT( slotStoredDataReq( TDEIO::Job *, TQByteArray & ) ) ); + connect( this, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotStoredData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( this, TQ_SIGNAL( dataReq( TDEIO::Job *, TQByteArray & ) ), + TQ_SLOT( slotStoredDataReq( TDEIO::Job *, TQByteArray & ) ) ); } void StoredTransferJob::setData( const TQByteArray& arr ) @@ -1560,8 +1589,8 @@ DirectCopyJob::DirectCopyJob( const KURL& url, int command, void DirectCopyJob::start( Slave* slave ) { - connect( slave, TQT_SIGNAL(canResume( TDEIO::filesize_t ) ), - TQT_SLOT( slotCanResume( TDEIO::filesize_t ) ) ); + connect( slave, TQ_SIGNAL(canResume( TDEIO::filesize_t ) ), + TQ_SLOT( slotCanResume( TDEIO::filesize_t ) ) ); SimpleJob::start(slave); } @@ -1608,7 +1637,7 @@ FileCopyJob::FileCopyJob( const KURL& src, const KURL& dest, int permissions, d->m_delJob = 0; d->m_sourceSize = (TDEIO::filesize_t) -1; d->m_modificationTime = static_cast<time_t>( -1 ); - TQTimer::singleShot(0, this, TQT_SLOT(slotStart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotStart())); } void FileCopyJob::slotStart() @@ -1702,8 +1731,8 @@ void FileCopyJob::startCopyJob(const KURL &slave_url) m_copyJob = new DirectCopyJob(slave_url, CMD_COPY, packedArgs, false); addSubjob( m_copyJob ); connectSubjob( m_copyJob ); - connect( m_copyJob, TQT_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)), - TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t))); + connect( m_copyJob, TQ_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)), + TQ_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t))); } void FileCopyJob::startRenameJob(const KURL &slave_url) @@ -1716,14 +1745,14 @@ void FileCopyJob::startRenameJob(const KURL &slave_url) void FileCopyJob::connectSubjob( SimpleJob * job ) { - connect( job, TQT_SIGNAL(totalSize( TDEIO::Job*, TDEIO::filesize_t )), - this, TQT_SLOT( slotTotalSize(TDEIO::Job*, TDEIO::filesize_t)) ); + connect( job, TQ_SIGNAL(totalSize( TDEIO::Job*, TDEIO::filesize_t )), + this, TQ_SLOT( slotTotalSize(TDEIO::Job*, TDEIO::filesize_t)) ); - connect( job, TQT_SIGNAL(processedSize( TDEIO::Job*, TDEIO::filesize_t )), - this, TQT_SLOT( slotProcessedSize(TDEIO::Job*, TDEIO::filesize_t)) ); + connect( job, TQ_SIGNAL(processedSize( TDEIO::Job*, TDEIO::filesize_t )), + this, TQ_SLOT( slotProcessedSize(TDEIO::Job*, TDEIO::filesize_t)) ); - connect( job, TQT_SIGNAL(percent( TDEIO::Job*, unsigned long )), - this, TQT_SLOT( slotPercent(TDEIO::Job*, unsigned long)) ); + connect( job, TQ_SIGNAL(percent( TDEIO::Job*, unsigned long )), + this, TQ_SLOT( slotPercent(TDEIO::Job*, unsigned long)) ); } @@ -1765,16 +1794,16 @@ void FileCopyJob::startDataPump() m_putJob = put( m_dest, m_permissions, m_overwrite, m_resume, false /* no GUI */); if ( d->m_modificationTime != static_cast<time_t>( -1 ) ) { TQDateTime dt; dt.setTime_t( d->m_modificationTime ); - m_putJob->addMetaData( "modified", dt.toString( Qt::ISODate ) ); + m_putJob->addMetaData( "modified", dt.toString( TQt::ISODate ) ); } //kdDebug(7007) << "FileCopyJob: m_putJob = " << m_putJob << " m_dest=" << m_dest << endl; // The first thing the put job will tell us is whether we can // resume or not (this is always emitted) - connect( m_putJob, TQT_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)), - TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t))); - connect( m_putJob, TQT_SIGNAL(dataReq(TDEIO::Job *, TQByteArray&)), - TQT_SLOT( slotDataReq(TDEIO::Job *, TQByteArray&))); + connect( m_putJob, TQ_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)), + TQ_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t))); + connect( m_putJob, TQ_SIGNAL(dataReq(TDEIO::Job *, TQByteArray&)), + TQ_SLOT( slotDataReq(TDEIO::Job *, TQByteArray&))); addSubjob( m_putJob ); } @@ -1833,8 +1862,8 @@ void FileCopyJob::slotCanResume( TDEIO::Job* job, TDEIO::filesize_t offset ) m_getJob->addMetaData( "resume", TDEIO::number(offset) ); // Might or might not get emitted - connect( m_getJob, TQT_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)), - TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t))); + connect( m_getJob, TQ_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)), + TQ_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t))); } m_putJob->slave()->setOffset( offset ); @@ -1843,10 +1872,10 @@ void FileCopyJob::slotCanResume( TDEIO::Job* job, TDEIO::filesize_t offset ) connectSubjob( m_getJob ); // Progress info depends on get m_getJob->resume(); // Order a beer - connect( m_getJob, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&)), - TQT_SLOT( slotData(TDEIO::Job*,const TQByteArray&)) ); - connect( m_getJob, TQT_SIGNAL(mimetype(TDEIO::Job*,const TQString&) ), - TQT_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) ); + connect( m_getJob, TQ_SIGNAL(data(TDEIO::Job*,const TQByteArray&)), + TQ_SLOT( slotData(TDEIO::Job*,const TQByteArray&)) ); + connect( m_getJob, TQ_SIGNAL(mimetype(TDEIO::Job*,const TQString&) ), + TQ_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) ); } else // copyjob { @@ -2075,9 +2104,9 @@ void ListJob::slotListEntries( const TDEIO::UDSEntryList& list ) prefix + filename + "/", includeHidden); Scheduler::scheduleJob(job); - connect(job, TQT_SIGNAL(entries( TDEIO::Job *, + connect(job, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList& )), - TQT_SLOT( gotEntries( TDEIO::Job*, + TQ_SLOT( gotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ))); addSubjob(job); } @@ -2133,7 +2162,7 @@ void ListJob::slotResult( TDEIO::Job * job ) void ListJob::slotRedirection( const KURL & url ) { - if (!kapp->authorizeURLAction("redirect", m_url, url)) + if (!tdeApp->authorizeURLAction("redirect", m_url, url)) { kdWarning(7007) << "ListJob: Redirection from " << m_url << " to " << url << " REJECTED!" << endl; return; @@ -2206,19 +2235,19 @@ void ListJob::setUnrestricted(bool unrestricted) void ListJob::start(Slave *slave) { - if (kapp && !kapp->authorizeURLAction("list", m_url, m_url) && !(extraFlags() & EF_ListJobUnrestricted)) + if (tdeApp && !tdeApp->authorizeURLAction("list", m_url, m_url) && !(extraFlags() & EF_ListJobUnrestricted)) { m_error = ERR_ACCESS_DENIED; m_errorText = m_url.url(); - TQTimer::singleShot(0, this, TQT_SLOT(slotFinished()) ); + TQTimer::singleShot(0, this, TQ_SLOT(slotFinished()) ); return; } - connect( slave, TQT_SIGNAL( listEntries( const TDEIO::UDSEntryList& )), - TQT_SLOT( slotListEntries( const TDEIO::UDSEntryList& ))); - connect( slave, TQT_SIGNAL( totalSize( TDEIO::filesize_t ) ), - TQT_SLOT( slotTotalSize( TDEIO::filesize_t ) ) ); - connect( slave, TQT_SIGNAL( redirection(const KURL &) ), - TQT_SLOT( slotRedirection(const KURL &) ) ); + connect( slave, TQ_SIGNAL( listEntries( const TDEIO::UDSEntryList& )), + TQ_SLOT( slotListEntries( const TDEIO::UDSEntryList& ))); + connect( slave, TQ_SIGNAL( totalSize( TDEIO::filesize_t ) ), + TQ_SLOT( slotTotalSize( TDEIO::filesize_t ) ) ); + connect( slave, TQ_SIGNAL( redirection(const KURL &) ), + TQ_SLOT( slotRedirection(const KURL &) ) ); SimpleJob::start(slave); } @@ -2261,13 +2290,13 @@ CopyJob::CopyJob( const KURL::List& src, const KURL& dest, CopyMode mode, bool a d->m_globalDestinationState = destinationState; if ( showProgressInfo ) { - connect( this, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQ_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQ_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); - connect( this, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQ_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQ_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); } - TQTimer::singleShot(0, this, TQT_SLOT(slotStart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotStart())); /** States: STATE_STATING for the dest @@ -2298,7 +2327,7 @@ void CopyJob::slotStart() */ m_reportTimer = new TQTimer(this); - connect(m_reportTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotReport())); + connect(m_reportTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(slotReport())); m_reportTimer->start(REPORT_TIMEOUT,false); // Stat the dest @@ -2812,9 +2841,9 @@ void CopyJob::startListing( const KURL & src ) d->m_bURLDirty = true; ListJob * newjob = listRecursive( src, false ); newjob->setUnrestricted(true); - connect(newjob, TQT_SIGNAL(entries( TDEIO::Job *, + connect(newjob, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList& )), - TQT_SLOT( slotEntries( TDEIO::Job*, + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ))); addSubjob( newjob ); } @@ -3142,7 +3171,7 @@ void CopyJob::slotResultCopyingFiles( Job * job ) } else { - if ( m_bCurrentOperationIsLink && ::tqqt_cast<TDEIO::DeleteJob*>( job ) ) + if ( m_bCurrentOperationIsLink && ::tqt_cast<TDEIO::DeleteJob*>( job ) ) { // Very special case, see a few lines below // We are deleting the source of a symlink we successfully moved... ignore error @@ -3159,7 +3188,7 @@ void CopyJob::slotResultCopyingFiles( Job * job ) { // Special case for moving links. That operation needs two jobs, unlike others. if ( m_bCurrentOperationIsLink && m_mode == Move - && !::tqqt_cast<TDEIO::DeleteJob *>( job ) // Deleting source not already done + && !::tqt_cast<TDEIO::DeleteJob *>( job ) // Deleting source not already done ) { subjobs.remove( job ); @@ -3402,7 +3431,7 @@ void CopyJob::copyNextFile() TQDataStream streamout(param,IO_WriteOnly); streamout<<(*it).uSource; streamout<<(*it).uDest; - if ( kapp && kapp->dcopClient()->call( "kded", + if ( tdeApp && tdeApp->dcopClient()->call( "kded", "mountwatcher", "createLink(KURL, KURL)", param,retType,data,false ) ) { TQDataStream streamin(data,IO_ReadOnly); @@ -3426,7 +3455,7 @@ void CopyJob::copyNextFile() if ( f.open( IO_ReadWrite ) ) { f.close(); - KSimpleConfig config( path ); + TDESimpleConfig config( path ); config.setDesktopGroup(); KURL url = (*it).uSource; url.setPass( "" ); @@ -3519,10 +3548,10 @@ void CopyJob::copyNextFile() d->m_bURLDirty = true; } addSubjob(newjob); - connect( newjob, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), - this, TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( newjob, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), - this, TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( newjob, TQ_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), + this, TQ_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( newjob, TQ_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), + this, TQ_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); } else { @@ -4002,29 +4031,29 @@ DeleteJob::DeleteJob( const KURL::List& src, bool /*shred*/, bool showProgressIn { if ( showProgressInfo ) { - connect( this, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQ_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQ_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); - connect( this, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQ_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQ_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); // See slotReport - /*connect( this, TQT_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ), - m_observer, TQT_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) ); + /*connect( this, TQ_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ), + m_observer, TQ_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) ); - connect( this, TQT_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ), - m_observer, TQT_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQ_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ), + m_observer, TQ_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) ); - connect( this, TQT_SIGNAL( deleting( TDEIO::Job*, const KURL& ) ), - m_observer, TQT_SLOT( slotDeleting( TDEIO::Job*, const KURL& ) ) );*/ + connect( this, TQ_SIGNAL( deleting( TDEIO::Job*, const KURL& ) ), + m_observer, TQ_SLOT( slotDeleting( TDEIO::Job*, const KURL& ) ) );*/ m_reportTimer=new TQTimer(this); - connect(m_reportTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotReport())); + connect(m_reportTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(slotReport())); //this will update the report dialog with 5 Hz, I think this is fast enough, aleXXX m_reportTimer->start(REPORT_TIMEOUT,false); } - TQTimer::singleShot(0, this, TQT_SLOT(slotStart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotStart())); } void DeleteJob::slotStart() @@ -4350,9 +4379,9 @@ void DeleteJob::slotResult( Job *job ) ListJob *newjob = listRecursive( url, false ); newjob->setUnrestricted(true); // No KIOSK restrictions Scheduler::scheduleJob(newjob); - connect(newjob, TQT_SIGNAL(entries( TDEIO::Job *, + connect(newjob, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList& )), - TQT_SLOT( slotEntries( TDEIO::Job*, + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ))); addSubjob(newjob); } else { @@ -4532,7 +4561,7 @@ bool MultiGetJob::findCurrentEntry() void MultiGetJob::slotRedirection( const KURL &url) { if (!findCurrentEntry()) return; // Error - if (kapp && !kapp->authorizeURLAction("redirect", m_url, url)) + if (tdeApp && !tdeApp->authorizeURLAction("redirect", m_url, url)) { kdWarning(7007) << "MultiGetJob: Redirection from " << m_currentEntry->url << " to " << url << " REJECTED!" << endl; return; @@ -4666,7 +4695,7 @@ TQString CacheInfo::cachedFileName() TQFile *CacheInfo::cachedFile() { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN const char *mode = (readWrite ? "rb+" : "rb"); #else const char *mode = (readWrite ? "r+" : "r"); diff --git a/tdeio/tdeio/job.h b/tdeio/tdeio/job.h index 79a21aeec..5484712bb 100644 --- a/tdeio/tdeio/job.h +++ b/tdeio/tdeio/job.h @@ -1,4 +1,3 @@ -// -*- c++ -*- /* This file is part of the KDE libraries Copyright (C) 2000 Stephan Kulow <coolo@kde.org> David Faure <faure@kde.org> diff --git a/tdeio/tdeio/jobclasses.h b/tdeio/tdeio/jobclasses.h index 34efee582..5d04b7f5d 100644 --- a/tdeio/tdeio/jobclasses.h +++ b/tdeio/tdeio/jobclasses.h @@ -1,4 +1,3 @@ -// -*- c++ -*- /* This file is part of the KDE libraries Copyright (C) 2000 Stephan Kulow <coolo@kde.org> David Faure <faure@kde.org> @@ -51,8 +50,8 @@ namespace TDEIO { * * \code * TDEIO::Job * job = TDEIO::someoperation( some parameters ); - * connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - * this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + * connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + * this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); * \endcode * (other connects, specific to the job) * @@ -66,7 +65,7 @@ namespace TDEIO { * @see TDEIO::Slave */ class TDEIO_EXPORT Job : public TQObject { - Q_OBJECT + TQ_OBJECT protected: Job( bool showProgressInfo ); @@ -526,7 +525,7 @@ namespace TDEIO { * that manage subjobs but aren't scheduled directly. */ class TDEIO_EXPORT SimpleJob : public TDEIO::Job { - Q_OBJECT + TQ_OBJECT public: /** @@ -687,7 +686,7 @@ namespace TDEIO { */ class TDEIO_EXPORT StatJob : public SimpleJob { - Q_OBJECT + TQ_OBJECT public: /** @@ -779,7 +778,7 @@ namespace TDEIO { */ class TDEIO_EXPORT MkdirJob : public SimpleJob { - Q_OBJECT + TQ_OBJECT public: /** @@ -837,7 +836,7 @@ namespace TDEIO { * Used for direct copy from or to the local filesystem (i.e. SlaveBase::copy()) */ class TDEIO_EXPORT DirectCopyJob : public SimpleJob { - Q_OBJECT + TQ_OBJECT public: /** @@ -873,7 +872,7 @@ namespace TDEIO { * reading of data from the slave should be suspended. */ class TDEIO_EXPORT TransferJob : public SimpleJob { - Q_OBJECT + TQ_OBJECT public: /** @@ -1073,7 +1072,7 @@ namespace TDEIO { * @since 3.3 */ class TDEIO_EXPORT StoredTransferJob : public TDEIO::TransferJob { - Q_OBJECT + TQ_OBJECT public: /** @@ -1118,7 +1117,7 @@ namespace TDEIO { * @see TDEIO::multi_get() */ class TDEIO_EXPORT MultiGetJob : public TransferJob { - Q_OBJECT + TQ_OBJECT public: /** @@ -1206,7 +1205,7 @@ namespace TDEIO { * @see TDEIO::mimetype() */ class TDEIO_EXPORT MimetypeJob : public TransferJob { - Q_OBJECT + TQ_OBJECT public: /** @@ -1248,7 +1247,7 @@ namespace TDEIO { * @see TDEIO::file_move() */ class TDEIO_EXPORT FileCopyJob : public Job { - Q_OBJECT + TQ_OBJECT public: /** @@ -1286,7 +1285,7 @@ namespace TDEIO { /** * @deprecated */ - void setSourceSize( off_t size ) KDE_DEPRECATED; + void setSourceSize( off_t size ) TDE_DEPRECATED; /** * Returns the source URL. @@ -1390,7 +1389,7 @@ namespace TDEIO { * @see TDEIO::listDir() */ class TDEIO_EXPORT ListJob : public SimpleJob { - Q_OBJECT + TQ_OBJECT public: /** @@ -1506,7 +1505,7 @@ namespace TDEIO { * @see TDEIO::linkAs() */ class TDEIO_EXPORT CopyJob : public Job { - Q_OBJECT + TQ_OBJECT public: /** @@ -1761,7 +1760,7 @@ namespace TDEIO { * @see TDEIO::del() */ class TDEIO_EXPORT DeleteJob : public Job { - Q_OBJECT + TQ_OBJECT public: /** @@ -1865,7 +1864,7 @@ namespace TDEIO { */ class TDEIO_EXPORT LocalURLJob : public SimpleJob { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeio/tdeio/kacl.cpp b/tdeio/tdeio/kacl.cpp index 432a50d31..b62ac5438 100644 --- a/tdeio/tdeio/kacl.cpp +++ b/tdeio/tdeio/kacl.cpp @@ -62,7 +62,7 @@ public: bool setMaskPermissions( unsigned short v ); TQString getUserName( uid_t uid ) const; TQString getGroupName( gid_t gid ) const; - bool setAllUsersOrGroups( const TQValueList< QPair<TQString, unsigned short> > &list, acl_tag_t type ); + bool setAllUsersOrGroups( const TQValueList< TQPair<TQString, unsigned short> > &list, acl_tag_t type ); bool setNamedUserOrGroupPermissions( const TQString& name, unsigned short permissions, acl_tag_t type ); acl_t m_acl; @@ -429,7 +429,7 @@ ACLUserPermissionsList KACL::allUserPermissions() const } #ifdef USE_POSIX_ACL -bool KACL::KACLPrivate::setAllUsersOrGroups( const TQValueList< QPair<TQString, unsigned short> > &list, acl_tag_t type ) +bool KACL::KACLPrivate::setAllUsersOrGroups( const TQValueList< TQPair<TQString, unsigned short> > &list, acl_tag_t type ) { bool allIsWell = true; bool atLeastOneUserOrGroup = false; @@ -456,7 +456,7 @@ bool KACL::KACLPrivate::setAllUsersOrGroups( const TQValueList< QPair<TQString, //printACL( newACL, "After cleaning out entries: " ); // now add the entries from the list - TQValueList< QPair<TQString, unsigned short> >::const_iterator it = list.constBegin(); + TQValueList< TQPair<TQString, unsigned short> >::const_iterator it = list.constBegin(); while ( it != list.constEnd() ) { acl_create_entry( &newACL, &entry ); acl_set_tag_type( entry, type ); @@ -678,5 +678,3 @@ TQDataStream & operator>> ( TQDataStream & s, KACL & a ) a.setACL( str ); return s; } - -// vim:set ts=8 sw=4: diff --git a/tdeio/tdeio/kacl.h b/tdeio/tdeio/kacl.h index f581f7a8e..3b96f8dfb 100644 --- a/tdeio/tdeio/kacl.h +++ b/tdeio/tdeio/kacl.h @@ -23,12 +23,12 @@ #include <sys/types.h> #include <tdeio/global.h> -typedef QPair<TQString, unsigned short> ACLUserPermissions; +typedef TQPair<TQString, unsigned short> ACLUserPermissions; typedef TQValueList<ACLUserPermissions> ACLUserPermissionsList; typedef TQValueListIterator<ACLUserPermissions> ACLUserPermissionsIterator; typedef TQValueListConstIterator<ACLUserPermissions> ACLUserPermissionsConstIterator; -typedef QPair<TQString, unsigned short> ACLGroupPermissions; +typedef TQPair<TQString, unsigned short> ACLGroupPermissions; typedef TQValueList<ACLGroupPermissions> ACLGroupPermissionsList; typedef TQValueListIterator<ACLGroupPermissions> ACLGroupPermissionsIterator; typedef TQValueListConstIterator<ACLGroupPermissions> ACLGroupPermissionsConstIterator; @@ -146,7 +146,7 @@ public: bool setNamedUserPermissions( const TQString& name, unsigned short ); /** Returns the list of all group permission entries. Each entry consists - * of a name/permissions pair. This is a QPair, therefore access is provided + * of a name/permissions pair. This is a TQPair, therefore access is provided * via the .first and .next members. * @return the list of all group permission entries. */ ACLUserPermissionsList allUserPermissions() const; @@ -170,7 +170,7 @@ public: bool setNamedGroupPermissions( const TQString& name, unsigned short ); /** Returns the list of all group permission entries. Each entry consists - * of a name/permissions pair. This is a QPair, therefor access is provided + * of a name/permissions pair. This is a TQPair, therefor access is provided * via the .first and .next members. * @return the list of all group permission entries. */ diff --git a/tdeio/tdeio/kar.cpp b/tdeio/tdeio/kar.cpp index 07072d0c6..dd8716c5b 100644 --- a/tdeio/tdeio/kar.cpp +++ b/tdeio/tdeio/kar.cpp @@ -45,7 +45,7 @@ KAr::KAr( const TQString& filename ) //kdDebug(7042) << "KAr(filename) reached." << endl; m_filename = filename; d = new KArPrivate; - setDevice( TQT_TQIODEVICE(new TQFile( filename )) ); + setDevice( new TQFile( filename ) ); } KAr::KAr( TQIODevice * dev ) diff --git a/tdeio/tdeio/kautomount.cpp b/tdeio/tdeio/kautomount.cpp index c6fa72371..313c8e47b 100644 --- a/tdeio/tdeio/kautomount.cpp +++ b/tdeio/tdeio/kautomount.cpp @@ -39,7 +39,7 @@ KAutoMount::KAutoMount( bool _readonly, const TQString& _format, const TQString& m_bShowFilemanagerWindow = _show_filemanager_window; TDEIO::Job* job = TDEIO::mount( _readonly, _format.ascii(), _device, _mountpoint ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void KAutoMount::slotResult( TDEIO::Job * job ) @@ -81,7 +81,7 @@ KAutoUnmount::KAutoUnmount( const TQString & _mountpoint, const TQString & _desk : m_desktopFile( _desktopFile ), m_mountpoint( _mountpoint ) { TDEIO::Job * job = TDEIO::unmount( m_mountpoint ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void KAutoUnmount::slotResult( TDEIO::Job * job ) diff --git a/tdeio/tdeio/kautomount.h b/tdeio/tdeio/kautomount.h index 203c037d9..9c56c56ec 100644 --- a/tdeio/tdeio/kautomount.h +++ b/tdeio/tdeio/kautomount.h @@ -24,10 +24,6 @@ #include <tdelibs_export.h> -#ifdef Q_MOC_RUN -#define Q_OS_UNIX -#endif // Q_MOC_RUN - #ifdef Q_OS_UNIX namespace TDEIO { @@ -44,7 +40,7 @@ class Job; */ class TDEIO_EXPORT KAutoMount : public TQObject { - Q_OBJECT + TQ_OBJECT friend class gcc_gives_a_warning_without_this; public: /** @@ -89,7 +85,7 @@ private: */ class TDEIO_EXPORT KAutoUnmount : public TQObject { - Q_OBJECT + TQ_OBJECT friend class gcc_gives_a_warning_without_this; public: /** diff --git a/tdeio/tdeio/kdatatool.cpp b/tdeio/tdeio/kdatatool.cpp index 5ec790aa7..c916abf0f 100644 --- a/tdeio/tdeio/kdatatool.cpp +++ b/tdeio/tdeio/kdatatool.cpp @@ -20,10 +20,10 @@ #include "kdatatool.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <klibloader.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <ktrader.h> #include <tdeparts/componentfactory.h> @@ -251,7 +251,7 @@ TQPtrList<TDEAction> KDataToolAction::dataToolActionList( const TQValueList<KDat { //kdDebug() << "creating action " << *uit << " " << *cit << endl; KDataToolAction * action = new KDataToolAction( *uit, *entry, *cit ); - connect( action, TQT_SIGNAL( toolActivated( const KDataToolInfo &, const TQString & ) ), + connect( action, TQ_SIGNAL( toolActivated( const KDataToolInfo &, const TQString & ) ), receiver, slot ); actionList.append( action ); } diff --git a/tdeio/tdeio/kdatatool.h b/tdeio/tdeio/kdatatool.h index a77f8a9ea..ab5a2ee4b 100644 --- a/tdeio/tdeio/kdatatool.h +++ b/tdeio/tdeio/kdatatool.h @@ -97,13 +97,13 @@ public: * @return a large pixmap for the DataTool. * @deprecated, use iconName() */ - TQPixmap icon() const KDE_DEPRECATED; + TQPixmap icon() const TDE_DEPRECATED; /** * Returns the mini icon of this data tool. * @return a mini pixmap for the DataTool. * @deprecated, use iconName() */ - TQPixmap miniIcon() const KDE_DEPRECATED; + TQPixmap miniIcon() const TDE_DEPRECATED; /** * Returns the icon name for this DataTool. * @return the name of the icon for the DataTool @@ -193,7 +193,7 @@ private: */ class TDEIO_EXPORT KDataToolAction : public TDEAction { - Q_OBJECT + TQ_OBJECT public: /** @@ -253,7 +253,7 @@ private: */ class TDEIO_EXPORT KDataTool : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeio/tdeio/kdcopservicestarter.cpp b/tdeio/tdeio/kdcopservicestarter.cpp index 8a7a67632..28edba63b 100644 --- a/tdeio/tdeio/kdcopservicestarter.cpp +++ b/tdeio/tdeio/kdcopservicestarter.cpp @@ -68,7 +68,7 @@ int KDCOPServiceStarter::findServiceFor( const TQString& serviceType, KService::Ptr ptr = offers.first(); TQCString dcopService = ptr->property("X-DCOP-ServiceName").toString().latin1(); - if ( !kapp->dcopClient()->isApplicationRegistered( dcopService ) ) + if ( !tdeApp->dcopClient()->isApplicationRegistered( dcopService ) ) { TQString error; if ( startServiceFor( serviceType, constraint, preferences, &error, &dcopService, flags ) != 0 ) @@ -93,5 +93,5 @@ int KDCOPServiceStarter::startServiceFor( const TQString& serviceType, return -1; KService::Ptr ptr = offers.first(); kdDebug() << "KDCOPServiceStarter: starting " << ptr->desktopEntryPath() << endl; - return kapp->startServiceByDesktopPath( ptr->desktopEntryPath(), TQStringList(), error, dcopService ); + return tdeApp->startServiceByDesktopPath( ptr->desktopEntryPath(), TQStringList(), error, dcopService ); } diff --git a/tdeio/tdeio/kdcopservicestarter.h b/tdeio/tdeio/kdcopservicestarter.h index 04f8d7ee2..21699dc9a 100644 --- a/tdeio/tdeio/kdcopservicestarter.h +++ b/tdeio/tdeio/kdcopservicestarter.h @@ -68,7 +68,7 @@ public: * Find an implementation of the given @p serviceType, * and start it, to use its DCOP interface. * The default implementation uses TDETrader to find the preferred Application, - * and then starts it using kapp->startService... + * and then starts it using tdeApp->startService... * * However applications (like kontact) can reimplement this method, to provide * an in-process way of loading the implementation for this service type. diff --git a/tdeio/tdeio/kdirlister.cpp b/tdeio/tdeio/kdirlister.cpp index 1f3a03d1d..e5045db5b 100644 --- a/tdeio/tdeio/kdirlister.cpp +++ b/tdeio/tdeio/kdirlister.cpp @@ -63,12 +63,12 @@ KDirListerCache::KDirListerCache( int maxCount ) urlsCurrentlyHeld.setAutoDelete( true ); pendingUpdates.setAutoDelete( true ); - connect( kdirwatch, TQT_SIGNAL( dirty( const KURL& ) ), - this, TQT_SLOT( slotFileDirty( const KURL& ) ) ); - connect( kdirwatch, TQT_SIGNAL( created( const TQString& ) ), - this, TQT_SLOT( slotFileCreated( const TQString& ) ) ); - connect( kdirwatch, TQT_SIGNAL( deleted( const TQString& ) ), - this, TQT_SLOT( slotFileDeleted( const TQString& ) ) ); + connect( kdirwatch, TQ_SIGNAL( dirty( const KURL& ) ), + this, TQ_SLOT( slotFileDirty( const KURL& ) ) ); + connect( kdirwatch, TQ_SIGNAL( created( const TQString& ) ), + this, TQ_SLOT( slotFileCreated( const TQString& ) ) ); + connect( kdirwatch, TQ_SIGNAL( deleted( const TQString& ) ), + this, TQ_SLOT( slotFileDeleted( const TQString& ) ) ); } KDirListerCache::~KDirListerCache() @@ -243,12 +243,12 @@ bool KDirListerCache::listDir( KDirLister *lister, const KURL& _u, job->setWindow( lister->d->window ); } - connect( job, TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ), - this, TQT_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( redirection( TDEIO::Job *, const KURL & ) ), - this, TQT_SLOT( slotRedirection( TDEIO::Job *, const KURL & ) ) ); + connect( job, TQ_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ), + this, TQ_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( redirection( TDEIO::Job *, const KURL & ) ), + this, TQ_SLOT( slotRedirection( TDEIO::Job *, const KURL & ) ) ); emit lister->started( _url ); @@ -608,10 +608,10 @@ void KDirListerCache::updateDirectory( const KURL& _dir ) job = TDEIO::listDir( _dir, false /* no default GUI */ ); jobs.insert( job, TQValueList<TDEIO::UDSEntry>() ); - connect( job, TQT_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList & )), - this, TQT_SLOT(slotUpdateEntries( TDEIO::Job *, const TDEIO::UDSEntryList & )) ); - connect( job, TQT_SIGNAL(result( TDEIO::Job * )), - this, TQT_SLOT(slotUpdateResult( TDEIO::Job * )) ); + connect( job, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList & )), + this, TQ_SLOT(slotUpdateEntries( TDEIO::Job *, const TDEIO::UDSEntryList & )) ); + connect( job, TQ_SIGNAL(result( TDEIO::Job * )), + this, TQ_SLOT(slotUpdateResult( TDEIO::Job * )) ); kdDebug(7004) << k_funcinfo << "update started in " << _dir << endl; @@ -925,7 +925,7 @@ void KDirListerCache::slotFileDirty( const KURL& _url ) { // Nice hack to save memory: use the qt object name to store the filename TQTimer *timer = new TQTimer( this, _url.path().utf8() ); - connect( timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotFileDirtyDelayed()) ); + connect( timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotFileDirtyDelayed()) ); pendingUpdates.insert( _url.path(), timer ); timer->start( 500, true ); } @@ -935,7 +935,7 @@ void KDirListerCache::slotFileDirty( const KURL& _url ) // delayed updating of files, FAM is flooding us with events void KDirListerCache::slotFileDirtyDelayed() { - TQString file = TQString::fromUtf8( TQT_TQOBJECT_CONST(sender())->name() ); + TQString file = TQString::fromUtf8( sender()->name() ); kdDebug(7004) << k_funcinfo << file << endl; @@ -1357,10 +1357,10 @@ void KDirListerCache::slotRedirection( TDEIO::Job *j, const KURL& url ) // make the job an update job job->disconnect( this ); - connect( job, TQT_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList & )), - this, TQT_SLOT(slotUpdateEntries( TDEIO::Job *, const TDEIO::UDSEntryList & )) ); - connect( job, TQT_SIGNAL(result( TDEIO::Job * )), - this, TQT_SLOT(slotUpdateResult( TDEIO::Job * )) ); + connect( job, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList & )), + this, TQ_SLOT(slotUpdateEntries( TDEIO::Job *, const TDEIO::UDSEntryList & )) ); + connect( job, TQ_SIGNAL(result( TDEIO::Job * )), + this, TQ_SLOT(slotUpdateResult( TDEIO::Job * )) ); // FIXME: autoUpdate-Counts!! @@ -1946,44 +1946,53 @@ bool KDirLister::openURL( const KURL& _url, bool _keep, bool _reload ) d->changes = NONE; + if ( !validURL( _url ) ) { + return false; + } + + // Some ioslaves like media:/ or home:/ can provide a local url istead of a remote one // If a local path is available, monitor that instead of the given remote URL... if (!_url.isLocalFile()) { - TDEIO::LocalURLJob* localURLJob = TDEIO::localURL(_url); - if (localURLJob) { - d->openURL_url[localURLJob] = _url; - d->openURL_keep[localURLJob] = _keep; - d->openURL_reload[localURLJob] = _reload; - connect(localURLJob, TQT_SIGNAL(localURL(TDEIO::LocalURLJob*, const KURL&, bool)), this, TQT_SLOT(slotOpenURLGotLocalURL(TDEIO::LocalURLJob*, const KURL&, bool))); - connect(localURLJob, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotLocalURLKIODestroyed())); - } + TDEIO::LocalURLJob* localURLJob = TDEIO::localURL(_url); + if (localURLJob) { + d->openURLContext[localURLJob] = KDirListerPrivate::OpenURLContext{_url, _keep, _reload}; + connect(localURLJob, TQ_SIGNAL(localURL(TDEIO::LocalURLJob*, const KURL&, bool)), + this, TQ_SLOT(slotOpenURLGotLocalURL(TDEIO::LocalURLJob*, const KURL&, bool))); + connect(localURLJob, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotLocalURLKIODestroyed())); + d->complete = false; return true; + } } - else { - return s_pCache->listDir( this, _url, _keep, _reload ); - } + + return s_pCache->listDir( this, _url, _keep, _reload ); } void KDirLister::slotOpenURLGotLocalURL(TDEIO::LocalURLJob *job, const KURL& url, bool isLocal) { - KURL realURL = d->openURL_url[job]; + auto jobIt = d->openURLContext.find(job); + + Q_ASSERT( jobIt != d->openURLContext.end() ); + + auto ctx = jobIt.data(); + KURL realURL = ctx.url; if (isLocal) { - realURL = url; - realURL.setInternalReferenceURL(d->openURL_url[job].url()); - d->m_referenceURLMap[d->openURL_url[job].url()] = url.path(); + realURL = url; + realURL.setInternalReferenceURL(ctx.url.url()); + d->m_referenceURLMap[ctx.url.url()] = url.path(); } - s_pCache->listDir( this, realURL, d->openURL_keep[job], d->openURL_reload[job] ); - d->openURL_url.remove(job); - d->openURL_keep.remove(job); - d->openURL_reload.remove(job); + d->openURLContext.remove(jobIt); + d->complete = d->jobData.isEmpty() && d->openURLContext.isEmpty(); + s_pCache->listDir( this, realURL, ctx.keep, ctx.reload ); } void KDirLister::slotLocalURLKIODestroyed() { - TDEIO::LocalURLJob* terminatedJob = const_cast<TDEIO::LocalURLJob*>(static_cast<const TDEIO::LocalURLJob*>(sender())); + TDEIO::Job* terminatedJob = const_cast<TDEIO::Job*>(static_cast<const TDEIO::Job*>(sender())); + auto jobIt = d->openURLContext.find(terminatedJob); - if (d->openURL_url.contains(terminatedJob)) { - s_pCache->listDir( this, d->openURL_url[terminatedJob], d->openURL_keep[terminatedJob], d->openURL_reload[terminatedJob] ); - d->openURL_url.remove(terminatedJob); - d->openURL_keep.remove(terminatedJob); - d->openURL_reload.remove(terminatedJob); + if (jobIt != d->openURLContext.end()) { + auto ctx = jobIt.data(); + d->openURLContext.remove(jobIt); + d->complete = d->jobData.isEmpty() && d->openURLContext.isEmpty(); + s_pCache->listDir( this, ctx.url, ctx.keep, ctx.reload ); } } @@ -1991,6 +2000,11 @@ void KDirLister::stop() { kdDebug(7003) << k_funcinfo << endl; s_pCache->stop( this ); + for( auto it = d->openURLContext.begin(); it != d->openURLContext.end(); ++it ) { + it.key()->disconnect( this ); + it.key()->kill(); + } + d->openURLContext.clear(); d->m_referenceURLMap.clear(); } @@ -1998,6 +2012,17 @@ void KDirLister::stop( const KURL& _url ) { kdDebug(7003) << k_funcinfo << _url.prettyURL() << endl; s_pCache->stop( this, _url ); + TQPtrList<TDEIO::Job> toRemove; + for( auto it = d->openURLContext.begin(); it != d->openURLContext.end(); ++it ) { + if( it.data().url ==_url ) { + it.key()->disconnect( this ); + it.key()->kill(); + toRemove.append(it.key()); + } + } + for(const auto &job: toRemove) { + d->openURLContext.remove(job); + } d->m_referenceURLMap.remove(_url.url()); } @@ -2355,25 +2380,24 @@ void KDirLister::handleError( TDEIO::Job *job ) void KDirLister::addNewItem( const KFileItem *item ) { - if ( ( d->dirOnlyMode && !item->isDir() ) || !matchesFilter( item ) ) { - return; // No reason to continue... bailing out here prevents a mimetype scan. - } - - if ((item->url().internalReferenceURL() != "") - && (d->m_referenceURLMap.contains(item->url().internalReferenceURL()))) { + TQString refURL = item->url().internalReferenceURL(); + if (!refURL.isEmpty() && d->m_referenceURLMap.contains(refURL) && + item->url().path().startsWith(d->m_referenceURLMap[refURL])) + { // Likely a media:/ tdeioslave URL or similar // Rewrite the URL to ensure that the user remains within the media:/ tree! - TQString itemPath = item->url().path(); - if (itemPath.startsWith(d->m_referenceURLMap[item->url().internalReferenceURL()])) { - itemPath = itemPath.remove(0, d->m_referenceURLMap[item->url().internalReferenceURL()].length()); - TQString newPath = item->url().internalReferenceURL(); - if (!newPath.endsWith("/")) newPath = newPath + "/"; - while (itemPath.startsWith("/")) itemPath = itemPath.remove(0,1); - while (itemPath.endsWith("/")) itemPath.truncate(itemPath.length()-1); - newPath = newPath + itemPath; - const_cast<KFileItem*>(item)->setListerURL(item->url()); - const_cast<KFileItem*>(item)->setURL(newPath); + if (!refURL.endsWith("/")) + { + refURL.append("/"); } + KURL newItemURL(refURL); + newItemURL.addPath(item->url().fileName()); + const_cast<KFileItem*>(item)->setListerURL(newItemURL); + const_cast<KFileItem*>(item)->setURL(newItemURL); + } + + if ( ( d->dirOnlyMode && !item->isDir() ) || !matchesFilter( item ) ) { + return; // No reason to continue... bailing out here prevents a mimetype scan. } if ( matchesMimeFilter( item ) ) @@ -2399,7 +2423,6 @@ void KDirLister::addNewItems( const KFileItemList& items ) // TODO: make this faster - test if we have a filter at all first // DF: was this profiled? The matchesFoo() functions should be fast, w/o filters... // Of course if there is no filter and we can do a range-insertion instead of a loop, that might be good. - // But that's for Qt4, not possible with TQPtrList. for ( KFileItemListIterator kit( items ); kit.current(); ++kit ) { addNewItem( *kit ); } @@ -2420,21 +2443,20 @@ void KDirLister::addRefreshItem( const KFileItem *item ) { bool isExcluded = (d->dirOnlyMode && !item->isDir()) || !matchesFilter( item ); - if ((item->url().internalReferenceURL() != "") - && (d->m_referenceURLMap.contains(item->url().internalReferenceURL()))) { + TQString refURL = item->url().internalReferenceURL(); + if (!refURL.isEmpty() && d->m_referenceURLMap.contains(refURL) && + item->url().path().startsWith(d->m_referenceURLMap[refURL])) + { // Likely a media:/ tdeioslave URL or similar // Rewrite the URL to ensure that the user remains within the media:/ tree! - TQString itemPath = item->url().path(); - if (itemPath.startsWith(d->m_referenceURLMap[item->url().internalReferenceURL()])) { - itemPath = itemPath.remove(0, d->m_referenceURLMap[item->url().internalReferenceURL()].length()); - TQString newPath = item->url().internalReferenceURL(); - if (!newPath.endsWith("/")) newPath = newPath + "/"; - while (itemPath.startsWith("/")) itemPath = itemPath.remove(0,1); - while (itemPath.endsWith("/")) itemPath.truncate(itemPath.length()-1); - newPath = newPath + itemPath; - const_cast<KFileItem*>(item)->setListerURL(item->url()); - const_cast<KFileItem*>(item)->setURL(newPath); + if (!refURL.endsWith("/")) + { + refURL.append("/"); } + KURL newItemURL(refURL); + newItemURL.addPath(item->url().fileName()); + const_cast<KFileItem*>(item)->setListerURL(newItemURL); + const_cast<KFileItem*>(item)->setURL(newItemURL); } if ( !isExcluded && matchesMimeFilter( item ) ) @@ -2644,39 +2666,38 @@ void KDirLister::jobStarted( TDEIO::ListJob *job ) void KDirLister::connectJob( TDEIO::ListJob *job ) { - connect( job, TQT_SIGNAL(infoMessage( TDEIO::Job *, const TQString& )), - this, TQT_SLOT(slotInfoMessage( TDEIO::Job *, const TQString& )) ); - connect( job, TQT_SIGNAL(percent( TDEIO::Job *, unsigned long )), - this, TQT_SLOT(slotPercent( TDEIO::Job *, unsigned long )) ); - connect( job, TQT_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t )), - this, TQT_SLOT(slotTotalSize( TDEIO::Job *, TDEIO::filesize_t )) ); - connect( job, TQT_SIGNAL(processedSize( TDEIO::Job *, TDEIO::filesize_t )), - this, TQT_SLOT(slotProcessedSize( TDEIO::Job *, TDEIO::filesize_t )) ); - connect( job, TQT_SIGNAL(speed( TDEIO::Job *, unsigned long )), - this, TQT_SLOT(slotSpeed( TDEIO::Job *, unsigned long )) ); + connect( job, TQ_SIGNAL(infoMessage( TDEIO::Job *, const TQString& )), + this, TQ_SLOT(slotInfoMessage( TDEIO::Job *, const TQString& )) ); + connect( job, TQ_SIGNAL(percent( TDEIO::Job *, unsigned long )), + this, TQ_SLOT(slotPercent( TDEIO::Job *, unsigned long )) ); + connect( job, TQ_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t )), + this, TQ_SLOT(slotTotalSize( TDEIO::Job *, TDEIO::filesize_t )) ); + connect( job, TQ_SIGNAL(processedSize( TDEIO::Job *, TDEIO::filesize_t )), + this, TQ_SLOT(slotProcessedSize( TDEIO::Job *, TDEIO::filesize_t )) ); + connect( job, TQ_SIGNAL(speed( TDEIO::Job *, unsigned long )), + this, TQ_SLOT(slotSpeed( TDEIO::Job *, unsigned long )) ); } void KDirLister::emitCompleted( const KURL& _url ) { - KURL emitURL = _url; - - if ((_url.internalReferenceURL() != "") - && (d->m_referenceURLMap.contains(_url.internalReferenceURL()))) { + TQString refURL = _url.internalReferenceURL(); + if (!refURL.isEmpty() && d->m_referenceURLMap.contains(refURL) && + _url.path().startsWith(d->m_referenceURLMap[refURL])) + { // Likely a media:/ tdeioslave URL or similar // Rewrite the URL to ensure that the user remains within the media:/ tree! - TQString itemPath = _url.path(); - if (itemPath.startsWith(d->m_referenceURLMap[_url.internalReferenceURL()])) { - itemPath = itemPath.remove(0, d->m_referenceURLMap[_url.internalReferenceURL()].length()); - TQString newPath = _url.internalReferenceURL(); - if (!newPath.endsWith("/")) newPath = newPath + "/"; - while (itemPath.startsWith("/")) itemPath = itemPath.remove(0,1); - while (itemPath.endsWith("/")) itemPath.truncate(itemPath.length()-1); - newPath = newPath + itemPath; - emitURL = newPath; + if (!refURL.endsWith("/")) + { + refURL.append("/"); } + KURL newItemURL(refURL); + newItemURL.addPath(_url.fileName()); + emit completed(newItemURL); + } + else + { + emit completed(_url); } - - emit completed( emitURL ); } void KDirLister::setMainWindow( TQWidget *window ) diff --git a/tdeio/tdeio/kdirlister.h b/tdeio/tdeio/kdirlister.h index a48709b19..b69a51841 100644 --- a/tdeio/tdeio/kdirlister.h +++ b/tdeio/tdeio/kdirlister.h @@ -58,7 +58,7 @@ class TDEIO_EXPORT KDirLister : public TQObject friend class KDirListerPrivate; friend class KDirListerCache; - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( bool autoUpdate READ autoUpdate WRITE setAutoUpdate ) TQ_PROPERTY( bool showingDotFiles READ showingDotFiles WRITE setShowingDotFiles ) TQ_PROPERTY( bool dirOnlyMode READ dirOnlyMode WRITE setDirOnlyMode ) diff --git a/tdeio/tdeio/kdirlister_p.h b/tdeio/tdeio/kdirlister_p.h index 0e1bfa259..7c3461c4b 100644 --- a/tdeio/tdeio/kdirlister_p.h +++ b/tdeio/tdeio/kdirlister_p.h @@ -111,9 +111,13 @@ public: TQStringList mimeFilter, oldMimeFilter; TQStringList mimeExcludeFilter, oldMimeExcludeFilter; - TQMap<TDEIO::Job*, KURL> openURL_url; - TQMap<TDEIO::Job*, bool> openURL_keep; - TQMap<TDEIO::Job*, bool> openURL_reload; + struct OpenURLContext { + KURL url; + bool keep; + bool reload; + }; + + TQMap<TDEIO::Job*, OpenURLContext> openURLContext; TQMap<TQString,TQString> m_referenceURLMap; }; @@ -133,7 +137,7 @@ public: */ class KDirListerCache : public TQObject, KDirNotify { - Q_OBJECT + TQ_OBJECT public: KDirListerCache( int maxCount = 10 ); ~KDirListerCache(); diff --git a/tdeio/tdeio/kdirwatch.cpp b/tdeio/tdeio/kdirwatch.cpp index 9849ff644..857e50703 100644 --- a/tdeio/tdeio/kdirwatch.cpp +++ b/tdeio/tdeio/kdirwatch.cpp @@ -1,4 +1,3 @@ -// -*- c-basic-offset: 2 -*- /* This file is part of the KDE libraries Copyright (C) 1998 Sven Radej <sven@lisa.exp.univie.ac.at> @@ -65,11 +64,17 @@ // debug #include <sys/ioctl.h> +#ifdef Q_OS_SOLARIS +#include <sys/filio.h> /* FIONREAD */ +#endif /* solaris */ + #ifdef HAVE_INOTIFY #include <unistd.h> #include <fcntl.h> #include <sys/syscall.h> +#ifdef Q_OS_LINUX #include <linux/types.h> +#endif /* Linux */ // Linux kernel headers are documented to not compile #define _S390_BITOPS_H #include <sys/inotify.h> @@ -221,7 +226,7 @@ KDirWatchPrivate::KDirWatchPrivate() : rescan_timer(0, "KDirWatchPrivate::rescan_timer") { timer = new TQTimer(this, "KDirWatchPrivate::timer"); - connect (timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotRescan())); + connect (timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotRescan())); freq = 3600000; // 1 hour as upper bound statEntries = 0; delayRemove = false; @@ -235,7 +240,7 @@ KDirWatchPrivate::KDirWatchPrivate() // used for FAM and DNOTIFY rescan_all = false; - connect(&rescan_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotRescan())); + connect(&rescan_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotRescan())); #ifdef HAVE_FAM // It's possible that FAM server can't be started @@ -244,8 +249,8 @@ KDirWatchPrivate::KDirWatchPrivate() use_fam=true; sn = new TQSocketNotifier( FAMCONNECTION_GETFD(&fc), TQSocketNotifier::Read, this); - connect( sn, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(famEventReceived()) ); + connect( sn, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(famEventReceived()) ); } else { kdDebug(7001) << "Can't use FAM (fam daemon not running?)" << endl; @@ -281,7 +286,7 @@ KDirWatchPrivate::KDirWatchPrivate() fcntl(m_inotify_fd, F_SETFD, FD_CLOEXEC); mSn = new TQSocketNotifier( m_inotify_fd, TQSocketNotifier::Read, this ); - connect( mSn, TQT_SIGNAL(activated( int )), this, TQT_SLOT( slotActivated() ) ); + connect( mSn, TQ_SIGNAL(activated( int )), this, TQ_SLOT( slotActivated() ) ); } #endif @@ -315,7 +320,7 @@ KDirWatchPrivate::KDirWatchPrivate() fcntl(mPipe[0], F_SETFL, O_NONBLOCK | fcntl(mPipe[0], F_GETFL)); fcntl(mPipe[1], F_SETFL, O_NONBLOCK | fcntl(mPipe[1], F_GETFL)); mSn = new TQSocketNotifier( mPipe[0], TQSocketNotifier::Read, this); - connect(mSn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated())); + connect(mSn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated())); // Install the signal handler only once if ( dnotify_signal == 0 ) { @@ -1244,7 +1249,7 @@ void KDirWatchPrivate::emitEvent(Entry* e, int event, const KURL &fileName) else #ifdef Q_OS_UNIX path += "/" + fileName.path(); -#elif defined(Q_WS_WIN) +#elif defined(TQ_WS_WIN) //current drive is passed instead of / path += TQDir::currentDirPath().left(2) + "/" + fileName.path(); #endif @@ -1415,7 +1420,7 @@ void KDirWatchPrivate::slotRescan() timer->start(freq); } - TQTimer::singleShot(0, this, TQT_SLOT(slotRemoveDelayed())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRemoveDelayed())); } bool KDirWatchPrivate::isNoisyFile( const char * filename ) @@ -1464,7 +1469,7 @@ void KDirWatchPrivate::famEventReceived() checkFAMEvent(&fe); } - TQTimer::singleShot(0, this, TQT_SLOT(slotRemoveDelayed())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRemoveDelayed())); } void KDirWatchPrivate::checkFAMEvent(FAMEvent* fe) @@ -1550,10 +1555,14 @@ void KDirWatchPrivate::checkFAMEvent(FAMEvent* fe) removeEntry(0,e->path,sub_entry); // <e> can be invalid here!! sub_entry->m_status = Normal; if (!useFAM(sub_entry)) + { #ifdef HAVE_INOTIFY if (!useINotify(sub_entry )) #endif + { useStat(sub_entry); + } + } } break; } @@ -1816,7 +1825,3 @@ KDirWatch::Method KDirWatch::internalMethod() #include "kdirwatch.moc" #include "kdirwatch_p.moc" - -//sven - -// vim: sw=2 ts=8 et diff --git a/tdeio/tdeio/kdirwatch.h b/tdeio/tdeio/kdirwatch.h index 67d762938..ce7dae5cc 100644 --- a/tdeio/tdeio/kdirwatch.h +++ b/tdeio/tdeio/kdirwatch.h @@ -64,7 +64,7 @@ class KDirWatchPrivate; */ class TDEIO_EXPORT KDirWatch : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** @@ -295,5 +295,3 @@ class TDEIO_EXPORT KDirWatch : public TQObject }; #endif - -// vim: sw=3 et diff --git a/tdeio/tdeio/kdirwatch_p.h b/tdeio/tdeio/kdirwatch_p.h index a0d87fee3..46c83cf72 100644 --- a/tdeio/tdeio/kdirwatch_p.h +++ b/tdeio/tdeio/kdirwatch_p.h @@ -21,7 +21,7 @@ */ class KDirWatchPrivate : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum entryStatus { Normal = 0, NonExistent }; diff --git a/tdeio/tdeio/kfilterbase.h b/tdeio/tdeio/kfilterbase.h index 25613c101..f2c4f1225 100644 --- a/tdeio/tdeio/kfilterbase.h +++ b/tdeio/tdeio/kfilterbase.h @@ -24,7 +24,7 @@ #include <tdelibs_export.h> -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #undef ERROR //avoid conflicts #endif @@ -37,7 +37,7 @@ class TQIODevice; */ class TDEIO_EXPORT KFilterBase : public TQObject // needs to inherit TQObject for KLibFactory::create { - Q_OBJECT + TQ_OBJECT public: KFilterBase(); virtual ~KFilterBase(); diff --git a/tdeio/tdeio/kfilterdev.cpp b/tdeio/tdeio/kfilterdev.cpp index b4e024031..4df335090 100644 --- a/tdeio/tdeio/kfilterdev.cpp +++ b/tdeio/tdeio/kfilterdev.cpp @@ -70,9 +70,9 @@ TQIODevice* KFilterDev::createFilterDevice(KFilterBase* base, TQFile* file) //we don't need a filter if (base==0) - return TQT_TQIODEVICE(new TQFile(file->name())); // A bit strange IMHO. We ask for a TQFile but we create another one !?! (DF) + return new TQFile(file->name()); // A bit strange IMHO. We ask for a TQFile but we create another one !?! (DF) - base->setDevice(TQT_TQIODEVICE(file)); + base->setDevice(file); return new KFilterDev(base); } #endif @@ -86,11 +86,11 @@ TQIODevice * KFilterDev::deviceForFile( const TQString & fileName, const TQStrin : KFilterBase::findFilterByMimeType( mimetype ); if ( base ) { - base->setDevice(TQT_TQIODEVICE(f), true); + base->setDevice(f, true); return new KFilterDev(base, true); } if(!forceFilter) - return TQT_TQIODEVICE(f); + return f; else { delete f; @@ -116,7 +116,7 @@ TQIODevice * KFilterDev::device( TQIODevice* inDevice, const TQString & mimetype return 0; } -bool KFilterDev::open( TQ_OpenMode mode ) +bool KFilterDev::open( int mode ) { //kdDebug(7005) << "KFilterDev::open " << mode << endl; if ( mode == IO_ReadOnly ) @@ -132,7 +132,7 @@ bool KFilterDev::open( TQ_OpenMode mode ) d->bNeedHeader = !d->bSkipHeaders; filter->init( mode ); d->bOpenedUnderlyingDevice = !filter->device()->isOpen(); - bool ret = d->bOpenedUnderlyingDevice ? filter->device()->open( (TQ_OpenMode)mode ) : true; + bool ret = d->bOpenedUnderlyingDevice ? filter->device()->open( (int)mode ) : true; d->result = KFilterBase::OK; if ( !ret ) @@ -169,11 +169,7 @@ void KFilterDev::flush() // Hmm, might not be enough... } -#ifdef USE_QT4 -qint64 KFilterDev::size() const -#else // USE_QT4 TQIODevice::Offset KFilterDev::size() const -#endif // USE_QT4 { // Well, hmm, Houston, we have a problem. // We can't know the size of the uncompressed data @@ -236,7 +232,7 @@ bool KFilterDev::atEnd() const && d->ungetchBuffer.isEmpty(); } -TQT_TQIO_LONG KFilterDev::tqreadBlock( char *data, TQT_TQIO_ULONG maxlen ) +TQ_LONG KFilterDev::readBlock( char *data, TQ_ULONG maxlen ) { Q_ASSERT ( filter->mode() == IO_ReadOnly ); //kdDebug(7005) << "KFilterDev::readBlock maxlen=" << maxlen << endl; @@ -355,7 +351,7 @@ TQT_TQIO_LONG KFilterDev::tqreadBlock( char *data, TQT_TQIO_ULONG maxlen ) return dataReceived; } -TQT_TQIO_LONG KFilterDev::tqwriteBlock( const char *data /*0 to finish*/, TQT_TQIO_ULONG len ) +TQ_LONG KFilterDev::writeBlock( const char *data /*0 to finish*/, TQ_ULONG len ) { Q_ASSERT ( filter->mode() == IO_WriteOnly ); // If we had an error, return 0. diff --git a/tdeio/tdeio/kfilterdev.h b/tdeio/tdeio/kfilterdev.h index 8dd0999a9..c692e3a0b 100644 --- a/tdeio/tdeio/kfilterdev.h +++ b/tdeio/tdeio/kfilterdev.h @@ -55,7 +55,7 @@ public: */ #ifdef qdoc #else - virtual bool open( TQ_OpenMode mode ); + virtual bool open( int mode ); #endif /** * Close after reading or writing. @@ -82,11 +82,7 @@ public: // Not implemented #ifdef qdoc #else -#ifdef USE_QT4 - virtual qint64 size() const; -#else // USE_QT4 virtual TQIODevice::Offset size() const; -#endif // USE_QT4 #endif virtual TQIODevice::Offset at() const; @@ -99,8 +95,8 @@ public: #ifdef qdoc #else - virtual TQT_TQIO_LONG tqreadBlock( char *data, TQT_TQIO_ULONG maxlen ); - virtual TQT_TQIO_LONG tqwriteBlock( const char *data, TQT_TQIO_ULONG len ); + virtual TQ_LONG readBlock( char *data, TQ_ULONG maxlen ); + virtual TQ_LONG writeBlock( const char *data, TQ_ULONG len ); #endif //int readLine( char *data, uint maxlen ); @@ -118,7 +114,7 @@ private: * @deprecated. Use deviceForFile instead. * To be removed in KDE 3.0 */ - static TQIODevice* createFilterDevice(KFilterBase* base, TQFile* file) KDE_DEPRECATED; + static TQIODevice* createFilterDevice(KFilterBase* base, TQFile* file) TDE_DEPRECATED; public: /** diff --git a/tdeio/tdeio/kimageio.cpp b/tdeio/tdeio/kimageio.cpp index d3768d297..c5835e251 100644 --- a/tdeio/tdeio/kimageio.cpp +++ b/tdeio/tdeio/kimageio.cpp @@ -12,7 +12,7 @@ #include <tqdir.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqstring.h> #include <tqregexp.h> #include <tqvaluelist.h> diff --git a/tdeio/tdeio/klimitediodevice.h b/tdeio/tdeio/klimitediodevice.h index 3dc6c80f3..4337215ff 100644 --- a/tdeio/tdeio/klimitediodevice.h +++ b/tdeio/tdeio/klimitediodevice.h @@ -47,7 +47,7 @@ public: } virtual ~KLimitedIODevice() {} - virtual bool open( TQ_OpenMode m ) { + virtual bool open( int m ) { //kdDebug(7005) << "KLimitedIODevice::open m=" << m << endl; if ( m & IO_ReadOnly ) { /*bool ok = false; @@ -67,23 +67,19 @@ public: virtual void close() {} virtual void flush() {} -#ifdef USE_QT4 - virtual qint64 size() const { return m_length; } -#else // USE_QT4 virtual Offset size() const { return m_length; } -#endif // USE_QT4 - virtual TQT_TQIO_LONG tqreadBlock ( char * data, TQT_TQIO_ULONG maxlen ) + virtual TQ_LONG readBlock ( char * data, TQ_ULONG maxlen ) { maxlen = TQMIN( maxlen, m_length - at() ); // Apply upper limit return m_dev->readBlock( data, maxlen ); } - virtual TQT_TQIO_LONG tqwriteBlock ( const char *, TQT_TQIO_ULONG ) { return -1; } // unsupported + virtual TQ_LONG writeBlock ( const char *, TQ_ULONG ) { return -1; } // unsupported virtual int putch( int ) { return -1; } // unsupported virtual int getch() { char c[2]; - if ( tqreadBlock(c, 1) == -1) + if ( readBlock(c, 1) == -1) return -1; else return c[0]; diff --git a/tdeio/tdeio/kmessageboxwrapper.h b/tdeio/tdeio/kmessageboxwrapper.h index 50bbc6678..5e9296752 100644 --- a/tdeio/tdeio/kmessageboxwrapper.h +++ b/tdeio/tdeio/kmessageboxwrapper.h @@ -35,7 +35,7 @@ public: const TQString &caption = TQString::null) { if (TDEApplication::guiEnabled()) { - kapp->enableStyles(); + tdeApp->enableStyles(); KMessageBox::error( parent, text, caption ); } else kdWarning() << text << endl; @@ -46,7 +46,7 @@ public: const TQString &caption = TQString::null) { if (TDEApplication::guiEnabled()) { - kapp->enableStyles(); + tdeApp->enableStyles(); KMessageBox::sorry( parent, text, caption ); } else kdWarning() << text << endl; diff --git a/tdeio/tdeio/kmimemagic.cpp b/tdeio/tdeio/kmimemagic.cpp index 42f4d676c..b97a0f82b 100644 --- a/tdeio/tdeio/kmimemagic.cpp +++ b/tdeio/tdeio/kmimemagic.cpp @@ -25,8 +25,8 @@ #include <kdebug.h> #include <tdeapplication.h> #include <tqfile.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <kstaticdeleter.h> #include <klargefile.h> #include <assert.h> @@ -103,14 +103,14 @@ class KMimeMagicUtimeConf { if ( !confDirs.isEmpty() ) { TQString globalConf = confDirs.last() + "kmimemagicrc"; if ( TQFile::exists( globalConf ) ) { - KSimpleConfig cfg( globalConf ); + TDESimpleConfig cfg( globalConf ); cfg.setGroup( "Settings" ); tmpDirs = cfg.readListEntry( "atimeDirs" ); } if ( confDirs.count() > 1 ) { TQString localConf = confDirs.first() + "kmimemagicrc"; if ( TQFile::exists( localConf ) ) { - KSimpleConfig cfg( localConf ); + TDESimpleConfig cfg( localConf ); cfg.setGroup( "Settings" ); tmpDirs += cfg.readListEntry( "atimeDirs" ); } diff --git a/tdeio/tdeio/kmimetype.cpp b/tdeio/tdeio/kmimetype.cpp index 0dd96cb6d..d0014d99c 100644 --- a/tdeio/tdeio/kmimetype.cpp +++ b/tdeio/tdeio/kmimetype.cpp @@ -47,14 +47,14 @@ #include <dcopclient.h> #include <dcopref.h> #include <tdeapplication.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kdirwatch.h> #include <kiconloader.h> #include <tdelocale.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <kurl.h> #include <tdesycoca.h> #include <kde_file.h> @@ -365,14 +365,14 @@ KMimeType::KMimeType( const TQString & _fullpath, const TQString& _type, const T KMimeType::KMimeType( const TQString & _fullpath ) : KServiceType( _fullpath ) { - KDesktopFile _cfg( _fullpath, true ); + TDEDesktopFile _cfg( _fullpath, true ); init ( &_cfg ); if ( !isValid() ) kdWarning(7009) << "mimetype not valid '" << m_strName << "' (missing entry in the file ?)" << endl; } -KMimeType::KMimeType( KDesktopFile *config ) : KServiceType( config ) +KMimeType::KMimeType( TDEDesktopFile *config ) : KServiceType( config ) { init( config ); @@ -380,7 +380,7 @@ KMimeType::KMimeType( KDesktopFile *config ) : KServiceType( config ) kdWarning(7009) << "mimetype not valid '" << m_strName << "' (missing entry in the file ?)" << endl; } -void KMimeType::init( KDesktopFile * config ) +void KMimeType::init( TDEDesktopFile * config ) { config->setDesktopGroup(); m_lstPatterns = config->readListEntry( "Patterns", ';' ); @@ -525,6 +525,10 @@ TQString KMimeType::iconForURL( const KURL & _url, mode_t _mode ) // root of protocol: if we found nothing, revert to mimeTypeIcon (which is usually "folder") if ( _url.path().length() <= 1 && ( i == unknown || i.isEmpty() ) ) i = mimeTypeIcon; + + // special case: root directory (/) -- Gitea issue #128 + if ( _url == KURL("file:///") ) + i = "folder_red"; } return i; } @@ -613,7 +617,7 @@ TQString KFolderType::icon( const KURL& _url, bool _is_local ) const // a file instead of a directory if ( TDEStandardDirs::exists( u.path() ) ) { - KSimpleConfig cfg( u.path(), true ); + TDESimpleConfig cfg( u.path(), true ); cfg.setDesktopGroup(); icon = cfg.readEntry( "Icon" ); TQString empty_icon = cfg.readEntry( "EmptyIcon" ); @@ -681,7 +685,7 @@ TQString KFolderType::comment( const KURL& _url, bool _is_local ) const KURL u( _url ); u.addPath( ".directory" ); - KDesktopFile cfg( u.path(), true ); + TDEDesktopFile cfg( u.path(), true ); TQString comment = cfg.readComment(); if ( comment.isEmpty() ) return KMimeType::comment( _url, _is_local ); @@ -709,7 +713,7 @@ TQString KDEDesktopMimeType::icon( const KURL& _url, bool _is_local ) const if ( !_is_local ) return KMimeType::icon( _url, _is_local ); - KSimpleConfig cfg( _url.path(), true ); + TDESimpleConfig cfg( _url.path(), true ); cfg.setDesktopGroup(); TQString icon = cfg.readEntry( "Icon" ); TQString type = cfg.readEntry( "Type" ); @@ -734,7 +738,7 @@ TQString KDEDesktopMimeType::icon( const KURL& _url, bool _is_local ) const if ( url.protocol() == "trash" ) { // We need to find if the trash is empty, preferrably without using a TDEIO job. // So instead tdeio_trash leaves an entry in its config file for us. - KSimpleConfig trashConfig( "trashrc", true ); + TDESimpleConfig trashConfig( "trashrc", true ); trashConfig.setGroup( "Status" ); if ( trashConfig.readBoolEntry( "Empty", true ) ) { return emptyIcon; @@ -775,7 +779,7 @@ TQString KDEDesktopMimeType::comment( const KURL& _url, bool _is_local ) const if ( !_is_local ) return KMimeType::comment( _url, _is_local ); - KDesktopFile cfg( _url.path(), true ); + TDEDesktopFile cfg( _url.path(), true ); TQString comment = cfg.readComment(); if ( comment.isEmpty() ) return KMimeType::comment( _url, _is_local ); @@ -790,7 +794,7 @@ pid_t KDEDesktopMimeType::run( const KURL& u, bool _is_local ) if ( !_is_local ) return 0; - KSimpleConfig cfg( u.path(), true ); + TDESimpleConfig cfg( u.path(), true ); cfg.setDesktopGroup(); TQString type = cfg.readEntry( "Type" ); if ( type.isEmpty() ) @@ -822,7 +826,7 @@ pid_t KDEDesktopMimeType::run( const KURL& u, bool _is_local ) return 0; } -pid_t KDEDesktopMimeType::runFSDevice( const KURL& _url, const KSimpleConfig &cfg ) +pid_t KDEDesktopMimeType::runFSDevice( const KURL& _url, const TDESimpleConfig &cfg ) { pid_t retval = 0; @@ -851,7 +855,7 @@ pid_t KDEDesktopMimeType::runFSDevice( const KURL& _url, const KSimpleConfig &cf if ( fstype == "Default" ) // KDE-1 thing fstype = TQString::null; TQString point = cfg.readEntry( "MountPoint" ); -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN (void) new KAutoMount( ro, fstype, dev, point, _url.path() ); #endif retval = -1; // we don't want to return 0, but we don't want to return a pid @@ -871,7 +875,7 @@ pid_t KDEDesktopMimeType::runApplication( const KURL& , const TQString & _servic return KRun::run( s, lst ); } -pid_t KDEDesktopMimeType::runLink( const KURL& _url, const KSimpleConfig &cfg ) +pid_t KDEDesktopMimeType::runLink( const KURL& _url, const TDESimpleConfig &cfg ) { TQString u = cfg.readPathEntry( "URL" ); if ( u.isEmpty() ) @@ -894,7 +898,7 @@ pid_t KDEDesktopMimeType::runLink( const KURL& _url, const KSimpleConfig &cfg ) return -1; // we don't want to return 0, but we don't want to return a pid } -pid_t KDEDesktopMimeType::runMimeType( const KURL& url , const KSimpleConfig & ) +pid_t KDEDesktopMimeType::runMimeType( const KURL& url , const TDESimpleConfig & ) { // Hmm, can't really use keditfiletype since we might be looking // at the global file, or at a file not in share/mimelnk... @@ -920,7 +924,7 @@ TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::builtinServices( co if ( !_url.isLocalFile() ) return result; - KSimpleConfig cfg( _url.path(), true ); + TDESimpleConfig cfg( _url.path(), true ); cfg.setDesktopGroup(); TQString type = cfg.readEntry( "Type" ); @@ -968,7 +972,7 @@ TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::builtinServices( co TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::userDefinedServices( const TQString& path, bool bLocalFiles ) { - KSimpleConfig cfg( path, true ); + TDESimpleConfig cfg( path, true ); return userDefinedServices( path, cfg, bLocalFiles ); } @@ -1011,7 +1015,7 @@ TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::userDefinedServices if(!function.endsWith("(KURL::List)")) { kdWarning() << "Desktop file " << path << " contains an invalid X-TDE-ShowIfDcopCall - the function must take the exact parameter (KURL::List) and must be specified." << endl; } else { - if(kapp->dcopClient()->call( app, object, + if(tdeApp->dcopClient()->call( app, object, function.utf8(), dataToSend, replyType, replyData, true, -1) && replyType == "TQStringList" ) { @@ -1109,7 +1113,7 @@ void KDEDesktopMimeType::executeService( const KURL::List& urls, KDEDesktopMimeT TQString path = urls.first().path(); //kdDebug(7009) << "MOUNT&UNMOUNT" << endl; - KSimpleConfig cfg( path, true ); + TDESimpleConfig cfg( path, true ); cfg.setDesktopGroup(); TQString dev = cfg.readEntry( "Dev" ); if ( dev.isEmpty() ) @@ -1134,7 +1138,7 @@ void KDEDesktopMimeType::executeService( const KURL::List& urls, KDEDesktopMimeT if ( fstype == "Default" ) // KDE-1 thing fstype = TQString::null; TQString point = cfg.readEntry( "MountPoint" ); -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN (void)new KAutoMount( ro, fstype, dev, point, path, false ); #endif } @@ -1144,7 +1148,7 @@ void KDEDesktopMimeType::executeService( const KURL::List& urls, KDEDesktopMimeT if ( mp.isEmpty() ) return; -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN (void)new KAutoUnmount( mp, path ); #endif } diff --git a/tdeio/tdeio/kmimetype.h b/tdeio/tdeio/kmimetype.h index b6ec9267e..ed1931361 100644 --- a/tdeio/tdeio/kmimetype.h +++ b/tdeio/tdeio/kmimetype.h @@ -32,7 +32,7 @@ #include <tdesycocatype.h> #include <kservicetype.h> -class KSimpleConfig; +class TDESimpleConfig; /** * Represent a mime type, like "text/plain", and the data that is associated * with it. @@ -78,7 +78,7 @@ public: * Construct a mimetype and take all information from a desktop file. * @param config the desktop configuration file that describes the mime type */ - KMimeType( KDesktopFile *config ); + KMimeType( TDEDesktopFile *config ); /** * @internal Construct a service from a stream. @@ -436,7 +436,7 @@ public: protected: void loadInternal( TQDataStream& ); - void init( KDesktopFile * ); + void init( TDEDesktopFile * ); /** * Signal a missing mime type. @@ -486,7 +486,7 @@ public: * Construct a folder mimetype and take all information from a desktop file. * @param config the desktop configuration file that describes the mime type */ - KFolderType( KDesktopFile *config) : KMimeType( config ) { } + KFolderType( TDEDesktopFile *config) : KMimeType( config ) { } /** \internal */ KFolderType( TQDataStream& _str, int offset ) : KMimeType( _str, offset ) { } @@ -531,7 +531,7 @@ public: * Construct a desktop mimetype and take all information from a desktop file. * @param config the desktop configuration file that describes the mime type */ - KDEDesktopMimeType( KDesktopFile *config) : KMimeType( config ) { } + KDEDesktopMimeType( TDEDesktopFile *config) : KMimeType( config ) { } /** \internal */ KDEDesktopMimeType( TQDataStream& _str, int offset ) : KMimeType( _str, offset ) { } @@ -580,7 +580,7 @@ public: * @param service the service to execute * @deprecated, see the other executeService */ - static void executeService( const TQString& path, KDEDesktopMimeType::Service& service ) KDE_DEPRECATED; + static void executeService( const TQString& path, KDEDesktopMimeType::Service& service ) TDE_DEPRECATED; /** * Execute @p service on the list of @p urls. @@ -607,10 +607,10 @@ protected: TQString * path = 0L ) const { return KMimeType::pixmap( group, force_size, state, path ); } - static pid_t runFSDevice( const KURL& _url, const KSimpleConfig &cfg ); + static pid_t runFSDevice( const KURL& _url, const TDESimpleConfig &cfg ); static pid_t runApplication( const KURL& _url, const TQString & _serviceFile ); - static pid_t runLink( const KURL& _url, const KSimpleConfig &cfg ); - static pid_t runMimeType( const KURL& _url, const KSimpleConfig &cfg ); + static pid_t runLink( const KURL& _url, const TDESimpleConfig &cfg ); + static pid_t runMimeType( const KURL& _url, const TDESimpleConfig &cfg ); protected: virtual void virtual_hook( int id, void* data ); }; @@ -631,7 +631,7 @@ public: * Construct a executable mimetype and take all information from a desktop file. * @param config the desktop configuration file that describes the mime type */ - KExecMimeType( KDesktopFile *config) : KMimeType( config ) { } + KExecMimeType( TDEDesktopFile *config) : KMimeType( config ) { } /** \internal */ KExecMimeType( TQDataStream& _str, int offset ) : KMimeType( _str, offset ) { } protected: diff --git a/tdeio/tdeio/kmimetypechooser.cpp b/tdeio/tdeio/kmimetypechooser.cpp index ffc9a4c78..267e91d30 100644 --- a/tdeio/tdeio/kmimetypechooser.cpp +++ b/tdeio/tdeio/kmimetypechooser.cpp @@ -23,7 +23,7 @@ #include <tdelistview.h> #include <tdelocale.h> #include <kmimetype.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <krun.h> #include <tdesycoca.h> @@ -93,12 +93,12 @@ KMimeTypeChooser::KMimeTypeChooser( const TQString &text, ((TQBoxLayout*)btns->layout())->addStretch(1); d->btnEditMimeType = new TQPushButton( i18n("&Edit..."), btns ); - connect( d->btnEditMimeType, TQT_SIGNAL(clicked()), this, TQT_SLOT(editMimeType()) ); + connect( d->btnEditMimeType, TQ_SIGNAL(clicked()), this, TQ_SLOT(editMimeType()) ); d->btnEditMimeType->setEnabled( false ); - connect( d->lvMimeTypes, TQT_SIGNAL( doubleClicked ( TQListViewItem * )), - this, TQT_SLOT( editMimeType())); - connect( d->lvMimeTypes, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(slotCurrentChanged(TQListViewItem*)) ); + connect( d->lvMimeTypes, TQ_SIGNAL( doubleClicked ( TQListViewItem * )), + this, TQ_SLOT( editMimeType())); + connect( d->lvMimeTypes, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(slotCurrentChanged(TQListViewItem*)) ); TQWhatsThis::add( d->btnEditMimeType, i18n( "Click this button to display the familiar TDE mime type editor.") ); @@ -192,9 +192,9 @@ void KMimeTypeChooser::editMimeType() if ( !(d->lvMimeTypes->currentItem() && (d->lvMimeTypes->currentItem())->parent()) ) return; TQString mt = (d->lvMimeTypes->currentItem()->parent())->text( 0 ) + "/" + (d->lvMimeTypes->currentItem())->text( 0 ); - // thanks to libkonq/konq_operations.cc - connect( KSycoca::self(), TQT_SIGNAL(databaseChanged()), - this, TQT_SLOT(slotSycocaDatabaseChanged()) ); + // thanks to libkonq/konq_operations.cpp + connect( KSycoca::self(), TQ_SIGNAL(databaseChanged()), + this, TQ_SLOT(slotSycocaDatabaseChanged()) ); TQString keditfiletype = TQString::fromLatin1("keditfiletype"); KRun::runCommand( keditfiletype + " --parent " + TQString::number( (ulong)topLevelWidget()->winId()) @@ -293,6 +293,4 @@ KMimeTypeChooserDialog::~KMimeTypeChooserDialog() } //END KMimeTypeChooserDialog - -// kate: space-indent on; indent-width 2; replace-tabs on; #include "kmimetypechooser.moc" diff --git a/tdeio/tdeio/kmimetypechooser.h b/tdeio/tdeio/kmimetypechooser.h index 16ec052f5..db3aa0c81 100644 --- a/tdeio/tdeio/kmimetypechooser.h +++ b/tdeio/tdeio/kmimetypechooser.h @@ -33,7 +33,7 @@ */ class TDEIO_EXPORT KMimeTypeChooser : public TQVBox { - Q_OBJECT + TQ_OBJECT public: /** @@ -177,4 +177,3 @@ class TDEIO_EXPORT KMimeTypeChooserDialog : public KDialogBase KMimeTypeChooser *m_chooser; }; #endif // _KMIMETYPE_CHOOSER_H_ -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/tdeio/tdeio/kmimetyperesolver.h b/tdeio/tdeio/kmimetyperesolver.h index c8828a0da..b0a6d7f9e 100644 --- a/tdeio/tdeio/kmimetyperesolver.h +++ b/tdeio/tdeio/kmimetyperesolver.h @@ -42,13 +42,13 @@ protected: /** * @internal - * This class is used by KMimeTypeResolver, because it can't be a QObject + * This class is used by KMimeTypeResolver, because it can't be a TQObject * itself. So an object of this class is used to handle signals, slots etc. * and forwards them to the KMimeTypeResolver instance. */ class TDEIO_EXPORT KMimeTypeResolverHelper : public TQObject { - Q_OBJECT + TQ_OBJECT public: KMimeTypeResolverHelper( KMimeTypeResolverBase *resolver, @@ -56,12 +56,12 @@ public: : m_resolver( resolver ), m_timer( new TQTimer( this ) ) { - connect( m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotProcessMimeIcons() )); + connect( m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotProcessMimeIcons() )); - connect( view->horizontalScrollBar(), TQT_SIGNAL( sliderMoved(int) ), - TQT_SLOT( slotAdjust() ) ); - connect( view->verticalScrollBar(), TQT_SIGNAL( sliderMoved(int) ), - TQT_SLOT( slotAdjust() ) ); + connect( view->horizontalScrollBar(), TQ_SIGNAL( sliderMoved(int) ), + TQ_SLOT( slotAdjust() ) ); + connect( view->verticalScrollBar(), TQ_SIGNAL( sliderMoved(int) ), + TQ_SLOT( slotAdjust() ) ); view->viewport()->installEventFilter( this ); } diff --git a/tdeio/tdeio/knfsshare.cpp b/tdeio/tdeio/knfsshare.cpp index b4a3d903a..b72a94318 100644 --- a/tdeio/tdeio/knfsshare.cpp +++ b/tdeio/tdeio/knfsshare.cpp @@ -162,8 +162,8 @@ KNFSShare::KNFSShare() { d = new KNFSSharePrivate(); if (TQFile::exists(d->exportsFile)) { KDirWatch::self()->addFile(d->exportsFile); - connect(KDirWatch::self(), TQT_SIGNAL(dirty (const TQString&)),this, - TQT_SLOT(slotFileChange(const TQString&))); + connect(KDirWatch::self(), TQ_SIGNAL(dirty (const TQString&)),this, + TQ_SLOT(slotFileChange(const TQString&))); } } diff --git a/tdeio/tdeio/knfsshare.h b/tdeio/tdeio/knfsshare.h index 64cd28dcf..1d2c306c7 100644 --- a/tdeio/tdeio/knfsshare.h +++ b/tdeio/tdeio/knfsshare.h @@ -34,7 +34,7 @@ class KNFSSharePrivate; */ class TDEIO_EXPORT KNFSShare : public TQObject { -Q_OBJECT +TQ_OBJECT public: /** * Returns the one and only instance of KNFSShare diff --git a/tdeio/tdeio/kprotocolinfo.cpp b/tdeio/tdeio/kprotocolinfo.cpp index bf11060e4..4332fc23b 100644 --- a/tdeio/tdeio/kprotocolinfo.cpp +++ b/tdeio/tdeio/kprotocolinfo.cpp @@ -19,7 +19,7 @@ #ifdef MAKE_TDECORE_LIB //needed for proper linkage (win32) #undef TDEIO_EXPORT -#define TDEIO_EXPORT KDE_EXPORT +#define TDEIO_EXPORT TDE_EXPORT #endif #include "kprotocolinfo.h" diff --git a/tdeio/tdeio/kprotocolinfo.h b/tdeio/tdeio/kprotocolinfo.h index 3cf142b69..000a88323 100644 --- a/tdeio/tdeio/kprotocolinfo.h +++ b/tdeio/tdeio/kprotocolinfo.h @@ -98,7 +98,7 @@ public: */ static bool isKnownProtocol( const TQString& protocol ) #ifdef KPROTOCOLINFO_TDECORE - KDE_WEAK_SYMBOL + TDE_WEAK_SYMBOL #endif ; @@ -227,7 +227,7 @@ public: */ static bool isHelperProtocol( const TQString& protocol ) #ifdef KPROTOCOLINFO_TDECORE - KDE_WEAK_SYMBOL + TDE_WEAK_SYMBOL #endif ; @@ -255,7 +255,7 @@ public: */ static bool isFilterProtocol( const TQString& protocol ) #ifdef KPROTOCOLINFO_TDECORE - KDE_WEAK_SYMBOL + TDE_WEAK_SYMBOL #endif ; @@ -612,38 +612,38 @@ public: // The following methods are deprecated: /// @deprecated - static Type inputType( const TQString& protocol ) KDE_DEPRECATED; + static Type inputType( const TQString& protocol ) TDE_DEPRECATED; /// @deprecated - static Type outputType( const TQString& protocol ) KDE_DEPRECATED; + static Type outputType( const TQString& protocol ) TDE_DEPRECATED; /** * @deprecated * Returns the list of fields this protocol returns when listing * The current possibilities are * Name, Type, Size, Date, AccessDate, Access, Owner, Group, Link, URL, MimeType */ - static TQStringList listing( const TQString& protocol ) KDE_DEPRECATED; + static TQStringList listing( const TQString& protocol ) TDE_DEPRECATED; /// @deprecated - static bool isSourceProtocol( const TQString& protocol ) KDE_DEPRECATED; + static bool isSourceProtocol( const TQString& protocol ) TDE_DEPRECATED; /// @deprecated - static bool supportsListing( const TQString& protocol ) KDE_DEPRECATED; + static bool supportsListing( const TQString& protocol ) TDE_DEPRECATED; /// @deprecated - static bool supportsReading( const TQString& protocol ) KDE_DEPRECATED; + static bool supportsReading( const TQString& protocol ) TDE_DEPRECATED; /// @deprecated - static bool supportsWriting( const TQString& protocol ) KDE_DEPRECATED; + static bool supportsWriting( const TQString& protocol ) TDE_DEPRECATED; /// @deprecated - static bool supportsMakeDir( const TQString& protocol ) KDE_DEPRECATED; + static bool supportsMakeDir( const TQString& protocol ) TDE_DEPRECATED; /// @deprecated - static bool supportsDeleting( const TQString& protocol ) KDE_DEPRECATED; + static bool supportsDeleting( const TQString& protocol ) TDE_DEPRECATED; /// @deprecated - static bool supportsLinking( const TQString& protocol ) KDE_DEPRECATED; + static bool supportsLinking( const TQString& protocol ) TDE_DEPRECATED; /// @deprecated - static bool supportsMoving( const TQString& protocol ) KDE_DEPRECATED; + static bool supportsMoving( const TQString& protocol ) TDE_DEPRECATED; /// @deprecated - static bool canCopyFromFile( const TQString& protocol ) KDE_DEPRECATED; + static bool canCopyFromFile( const TQString& protocol ) TDE_DEPRECATED; /// @deprecated - static bool canCopyToFile( const TQString& protocol ) KDE_DEPRECATED; + static bool canCopyToFile( const TQString& protocol ) TDE_DEPRECATED; /// @deprecated - static TQString defaultMimetype( const TQString& protocol) KDE_DEPRECATED; + static TQString defaultMimetype( const TQString& protocol) TDE_DEPRECATED; //////////////////////// END DEPRECATED /////////////////////// protected: diff --git a/tdeio/tdeio/krun.cpp b/tdeio/tdeio/krun.cpp index 89c84952f..d6fd8a80e 100644 --- a/tdeio/tdeio/krun.cpp +++ b/tdeio/tdeio/krun.cpp @@ -46,22 +46,22 @@ #include <kdebug.h> #include <tdelocale.h> #include <kprotocolinfo.h> -#include <kstandarddirs.h> -#include <kprocess.h> +#include <tdestandarddirs.h> +#include <tdeprocess.h> #include <dcopclient.h> #include <tqfile.h> #include <tqfileinfo.h> #include <tqtextstream.h> #include <tqdatetime.h> #include <tqregexp.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdestartupinfo.h> #include <kmacroexpander.h> #include <kshell.h> #include <kde_file.h> #include <kstringhandler.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <twin.h> #endif @@ -143,7 +143,7 @@ pid_t KRun::runURL( const KURL& u, const TQString& _mimetype, TQWidget* window, { if ( u.isLocalFile() && runExecutables) { - if (kapp->authorize("shell_access")) + if (tdeApp->authorize("shell_access")) { TQString path = u.path(); shellQuote( path ); @@ -155,15 +155,17 @@ pid_t KRun::runURL( const KURL& u, const TQString& _mimetype, TQWidget* window, noAuth = true; } } - else if (_mimetype == "application/x-executable") + else if (_mimetype == "application/x-executable" || _mimetype == "application/x-pie-executable") + { noRun = true; + } } else if ( isExecutable(_mimetype) ) { if (!runExecutables) noRun = true; - if (!kapp->authorize("shell_access")) + if (!tdeApp->authorize("shell_access")) noAuth = true; } @@ -211,7 +213,7 @@ bool KRun::displayOpenWithDialog( const KURL::List& lst, bool tempFiles ) bool KRun::displayOpenWithDialog( const KURL::List& lst, bool tempFiles, const TQString& suggestedFileName ) { - if (kapp && !kapp->authorizeTDEAction("openwith")) + if (tdeApp && !tdeApp->authorizeTDEAction("openwith")) { // TODO: Better message, i18n freeze :-( KMessageBox::sorry(0L, i18n("You are not authorized to open this file.")); @@ -323,7 +325,7 @@ KRunMX2::subst( int option, const KURL &url, TQStringList &ret ) break; case 'v': if (url.isLocalFile() && TQFile::exists( url.path() ) ) - ret << KDesktopFile( url.path(), true ).readEntry( "Dev" ); + ret << TDEDesktopFile( url.path(), true ).readEntry( "Dev" ); break; } return; @@ -553,14 +555,14 @@ static pid_t runCommandInternal( TDEProcess* proc, const KService* service, cons const TQString &execName, const TQString & iconName, TQWidget* window, TQCString asn ) { if (service && !service->desktopEntryPath().isEmpty() - && !KDesktopFile::isAuthorizedDesktopFile( service->desktopEntryPath() )) + && !TDEDesktopFile::isAuthorizedDesktopFile( service->desktopEntryPath() )) { kdWarning() << "No authorization to execute " << service->desktopEntryPath() << endl; KMessageBox::sorry(window, i18n("You are not authorized to execute this file.")); return 0; } TQString bin = KRun::binaryName( binName, true ); -#ifdef Q_WS_X11 // Startup notification doesn't work with QT/E, service isn't needed without Startup notification +#ifdef TQ_WS_X11 // Startup notification doesn't work with QT/E, service isn't needed without Startup notification bool silent; TQCString wmclass; TDEStartupInfoId id; @@ -697,8 +699,12 @@ static pid_t runTempService( const KService& _service, const KURL::List& _urls, static KURL::List resolveURLs( const KURL::List& _urls, const KService& _service ) { // Check which protocols the application supports. - // This can be a list of actual protocol names, or just TDEIO for KDE apps. + // This can be a list of actual protocol names, or just TDEIO for TDE apps, or KIO for KDE apps. TQStringList supportedProtocols = _service.property("X-TDE-Protocols").toStringList(); + if (supportedProtocols.isEmpty()) + { + supportedProtocols = _service.property("X-KDE-Protocols").toStringList(); + } KRunMX1 mx1( _service ); TQString exec = _service.exec(); if ( mx1.expandMacrosShellQuote( exec ) && !mx1.hasUrls ) { @@ -706,9 +712,9 @@ static KURL::List resolveURLs( const KURL::List& _urls, const KService& _service } else { if ( supportedProtocols.isEmpty() ) { - // compat mode: assume TDEIO if not set and it's a KDE app + // compat mode: assume TDEIO if not set and it's a TDE or KDE app TQStringList categories = _service.property("Categories").toStringList(); - if (( categories.find("TDE") != categories.end() ) && ( categories.find("KDE") != categories.end() )) + if ((categories.find("TDE") != categories.end()) || (categories.find("KDE") != categories.end())) supportedProtocols.append( "TDEIO" ); else { // if no KDE app, be a bit over-generic supportedProtocols.append( "http"); @@ -719,12 +725,13 @@ static KURL::List resolveURLs( const KURL::List& _urls, const KService& _service kdDebug(7010) << "supportedProtocols:" << supportedProtocols << endl; KURL::List urls( _urls ); - if ( supportedProtocols.find( "TDEIO" ) == supportedProtocols.end() ) { + if ((supportedProtocols.find("TDEIO") == supportedProtocols.end()) && + (supportedProtocols.find("KIO") == supportedProtocols.end())) { for( KURL::List::Iterator it = urls.begin(); it != urls.end(); ++it ) { const KURL url = *it; bool supported = url.isLocalFile() || supportedProtocols.find( url.protocol().lower() ) != supportedProtocols.end(); kdDebug(7010) << "Looking at url=" << url << " supported=" << supported << endl; - if ( !supported && KProtocolInfo::protocolClass(url.protocol()) == ":local" ) + if ((!supported) && (KProtocolInfo::protocolClass(url.protocol()) == ":local")) { // Maybe we can resolve to a local URL? KURL localURL = TDEIO::NetAccess::mostLocalURL( url, 0 ); @@ -768,7 +775,7 @@ pid_t KRun::run( const KService& _service, const KURL::List& _urls, TQWidget* wi bool tempFiles, const TQString& suggestedFileName ) { if (!_service.desktopEntryPath().isEmpty() && - !KDesktopFile::isAuthorizedDesktopFile( _service.desktopEntryPath())) + !TDEDesktopFile::isAuthorizedDesktopFile( _service.desktopEntryPath())) { kdWarning() << "No authorization to execute " << _service.desktopEntryPath() << endl; KMessageBox::sorry(window, i18n("You are not authorized to execute this service.")); @@ -911,11 +918,11 @@ void KRun::init ( const KURL& url, TQWidget* window, const TQCString& asn, mode_ // loop and do initialization afterwards. // Reason: We must complete the constructor before we do anything else. m_bInit = true; - connect( &m_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimeout() ) ); + connect( &m_timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTimeout() ) ); m_timer.start( 0, true ); kdDebug(7010) << " new KRun " << this << " " << url.prettyURL() << " timer=" << &m_timer << endl; - kapp->ref(); + tdeApp->ref(); } void KRun::init() @@ -982,7 +989,7 @@ void KRun::init() m_timer.start( 0, true ); return; } - if ( !kapp->authorizeURLAction( "open", KURL(), m_strURL)) + if ( !tdeApp->authorizeURLAction( "open", KURL(), m_strURL)) { TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, m_strURL.prettyURL()); d->m_showingError = true; @@ -1102,8 +1109,8 @@ void KRun::init() // It may be a directory or a file, let's stat TDEIO::StatJob *job = TDEIO::stat( m_strURL, true, 0 /* no details */, m_bProgressInfo ); job->setWindow (d->m_window); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotStatResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotStatResult( TDEIO::Job * ) ) ); m_job = job; kdDebug(7010) << " Job " << job << " is about stating " << m_strURL.url() << endl; } @@ -1113,7 +1120,7 @@ KRun::~KRun() kdDebug(7010) << "KRun::~KRun() " << this << endl; m_timer.stop(); killJob(); - kapp->deref(); + tdeApp->deref(); kdDebug(7010) << "KRun::~KRun() done " << this << endl; delete d; } @@ -1151,10 +1158,10 @@ void KRun::scanFile() TDEIO::TransferJob *job = TDEIO::get( m_strURL, false /*reload*/, m_bProgressInfo ); job->setWindow (d->m_window); - connect(job, TQT_SIGNAL( result(TDEIO::Job *)), - this, TQT_SLOT( slotScanFinished(TDEIO::Job *))); - connect(job, TQT_SIGNAL( mimetype(TDEIO::Job *, const TQString &)), - this, TQT_SLOT( slotScanMimeType(TDEIO::Job *, const TQString &))); + connect(job, TQ_SIGNAL( result(TDEIO::Job *)), + this, TQ_SLOT( slotScanFinished(TDEIO::Job *))); + connect(job, TQ_SIGNAL( mimetype(TDEIO::Job *, const TQString &)), + this, TQ_SLOT( slotScanMimeType(TDEIO::Job *, const TQString &))); m_job = job; kdDebug(7010) << " Job " << job << " is about getting from " << m_strURL.url() << endl; } @@ -1334,14 +1341,14 @@ void KRun::foundMimeType( const TQString& type ) // (For instance a tar.gz is a directory contained inside a file) // It may be a directory or a file, let's stat TDEIO::StatJob *job = TDEIO::stat( m_strURL, m_bProgressInfo ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotStatResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotStatResult( TDEIO::Job * ) ) ); m_job = job; return; } */ - TDEIO::TransferJob *job = ::tqqt_cast<TDEIO::TransferJob *>( m_job ); + TDEIO::TransferJob *job = ::tqt_cast<TDEIO::TransferJob *>( m_job ); if ( job ) { job->putOnHold(); @@ -1451,6 +1458,7 @@ bool KRun::isExecutable( const TQString& serviceType ) serviceType == "media/builtin-trash" || serviceType == "media/builtin-webbrowser" || serviceType == "application/x-executable" || + serviceType == "application/x-pie-executable" || serviceType == "application/x-msdos-program" || serviceType == "application/x-shellscript" ); } @@ -1463,7 +1471,7 @@ TDEProcessRunner::run(TDEProcess * p, const TQString & binName) return (new TDEProcessRunner(p, binName))->pid(); } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 pid_t TDEProcessRunner::run(TDEProcess * p, const TQString & binName, const TDEStartupInfoId& id ) { @@ -1477,15 +1485,15 @@ TDEProcessRunner::TDEProcessRunner(TDEProcess * p, const TQString & _binName ) binName( _binName ) { TQObject::connect( - process_, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotProcessExited(TDEProcess *))); + process_, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotProcessExited(TDEProcess *))); process_->start(); if ( !process_->pid() ) slotProcessExited( process_ ); } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TDEProcessRunner::TDEProcessRunner(TDEProcess * p, const TQString & _binName, const TDEStartupInfoId& id ) : TQObject(), process_(p), @@ -1493,8 +1501,8 @@ TDEProcessRunner::TDEProcessRunner(TDEProcess * p, const TQString & _binName, co id_( id ) { TQObject::connect( - process_, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotProcessExited(TDEProcess *))); + process_, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotProcessExited(TDEProcess *))); process_->start(); if ( !process_->pid() ) @@ -1532,12 +1540,12 @@ TDEProcessRunner::slotProcessExited(TDEProcess * p) // relatively to current directory, and then in the PATH. if ( !TQFile( binName ).exists() && TDEStandardDirs::findExe( binName ).isEmpty() ) { - kapp->ref(); + tdeApp->ref(); KMessageBox::sorry( 0L, i18n("Could not find the program '%1'").arg( binName ) ); - kapp->deref(); + tdeApp->deref(); } } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 if( !id_.none()) { TDEStartupInfoData data; diff --git a/tdeio/tdeio/krun.h b/tdeio/tdeio/krun.h index 6e5604f7a..62a1a5d91 100644 --- a/tdeio/tdeio/krun.h +++ b/tdeio/tdeio/krun.h @@ -57,7 +57,7 @@ namespace TDEIO { */ class TDEIO_EXPORT KRun : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * Create a KRun object to run the preferred application for a file/URL. @@ -477,12 +477,12 @@ public: */ class TDEIO_EXPORT TDEProcessRunner : public TQObject { - Q_OBJECT + TQ_OBJECT public: static pid_t run(TDEProcess *, const TQString & binName); -#ifdef Q_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded +#ifdef TQ_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded static pid_t run(TDEProcess *, const TQString & binName, const TDEStartupInfoId& id ); #endif @@ -497,14 +497,14 @@ class TDEIO_EXPORT TDEProcessRunner : public TQObject private: TDEProcessRunner(TDEProcess *, const TQString & binName); -#ifdef Q_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded +#ifdef TQ_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded TDEProcessRunner(TDEProcess *, const TQString & binName, const TDEStartupInfoId& id ); #endif TDEProcessRunner(); TDEProcess * process_; TQString binName; -#ifdef Q_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded +#ifdef TQ_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded TDEStartupInfoId id_; #endif }; diff --git a/tdeio/tdeio/ksambashare.cpp b/tdeio/tdeio/ksambashare.cpp index 608594ee5..fbc3c2e6e 100644 --- a/tdeio/tdeio/ksambashare.cpp +++ b/tdeio/tdeio/ksambashare.cpp @@ -23,7 +23,7 @@ #include <kdirwatch.h> #include <kstaticdeleter.h> #include <kdebug.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include "ksambashare.h" @@ -62,7 +62,7 @@ bool KSambaSharePrivate::load() { * @return wether a smb.conf was found. **/ bool KSambaSharePrivate::findSmbConf() { - KSimpleConfig config(TQString::fromLatin1(FILESHARECONF),true); + TDESimpleConfig config(TQString::fromLatin1(FILESHARECONF),true); smbConf = config.readEntry("SMBCONF"); if ( TQFile::exists(smbConf) ) @@ -181,8 +181,8 @@ KSambaShare::KSambaShare() { if (TQFile::exists(d->smbConf)) { KDirWatch::self()->addFile(d->smbConf); KDirWatch::self()->addFile(FILESHARECONF); - connect(KDirWatch::self(), TQT_SIGNAL(dirty (const TQString&)),this, - TQT_SLOT(slotFileChange(const TQString&))); + connect(KDirWatch::self(), TQ_SIGNAL(dirty (const TQString&)),this, + TQ_SLOT(slotFileChange(const TQString&))); } } diff --git a/tdeio/tdeio/ksambashare.h b/tdeio/tdeio/ksambashare.h index ffd298588..d97a4a645 100644 --- a/tdeio/tdeio/ksambashare.h +++ b/tdeio/tdeio/ksambashare.h @@ -33,7 +33,7 @@ class KSambaSharePrivate; */ class TDEIO_EXPORT KSambaShare : public TQObject { -Q_OBJECT +TQ_OBJECT public: /** * Returns the one and only instance of KSambaShare diff --git a/tdeio/tdeio/kscan.cpp b/tdeio/tdeio/kscan.cpp index b49459771..3ca269da9 100644 --- a/tdeio/tdeio/kscan.cpp +++ b/tdeio/tdeio/kscan.cpp @@ -41,7 +41,7 @@ KScanDialog * KScanDialog::getScanDialog( TQWidget *parent, const char *name, TQStringList args; args << TQString::number( (int)modal ); - TQObject *res = factory->create( TQT_TQOBJECT(parent), name, "KScanDialog", args ); + TQObject *res = factory->create( parent, name, "KScanDialog", args ); return dynamic_cast<KScanDialog *>( res ); } @@ -84,7 +84,7 @@ KOCRDialog * KOCRDialog::getOCRDialog( TQWidget *parent, const char *name, TQStringList args; args << TQString::number( (int)modal ); - TQObject *res = factory->create( TQT_TQOBJECT(parent), name, "KOCRDialog", args ); + TQObject *res = factory->create( parent, name, "KOCRDialog", args ); return dynamic_cast<KOCRDialog *>( res ); } @@ -133,7 +133,7 @@ TQObject *KScanDialogFactory::createObject( TQObject *parent, const char *name, if ( args.count() == 1 ) modal = (bool)args[ 0 ].toInt(); - return TQT_TQOBJECT(createDialog( TQT_TQWIDGET( parent ), name, modal )); + return createDialog( static_cast<TQWidget*>( parent ), name, modal ); } @@ -166,7 +166,7 @@ TQObject *KOCRDialogFactory::createObject( TQObject *parent, const char *name, if ( args.count() == 1 ) modal = (bool)args[ 0 ].toInt(); - return TQT_TQOBJECT(createDialog( TQT_TQWIDGET( parent ), name, modal )); + return createDialog( static_cast<TQWidget*>( parent ), name, modal ); } void KScanDialog::virtual_hook( int id, void* data ) diff --git a/tdeio/tdeio/kscan.h b/tdeio/tdeio/kscan.h index 940b8ceaa..d7d8ffe0b 100644 --- a/tdeio/tdeio/kscan.h +++ b/tdeio/tdeio/kscan.h @@ -21,7 +21,7 @@ #define KSCAN_H #include <kdialogbase.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <klibloader.h> class TQImage; @@ -43,8 +43,8 @@ class TQImage; * if ( !m_scanDialog ) // no scanning support installed? * return; * - * connect( m_scanDialog, TQT_SIGNAL( finalImage( const TQImage&, int )), - * TQT_SLOT( slotScanned( const TQImage&, int ) )); + * connect( m_scanDialog, TQ_SIGNAL( finalImage( const TQImage&, int )), + * TQ_SLOT( slotScanned( const TQImage&, int ) )); * } * * if ( m_scanDialog->setup() ) // only if scanner configured/available @@ -62,7 +62,7 @@ class TQImage; */ class TDEIO_EXPORT KScanDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** @@ -70,7 +70,7 @@ public: * or 0L if no scan-support * is available. Pass a suitable @p parent widget, if you like. If you * don't you have to 'delete' the returned pointer yourself. - * @param parent the QWidget's parent, or 0 + * @param parent the TQWidget's parent, or 0 * @param name the name of the TQObject, can be 0 * @param modal if true the dialog is model * @return the KScanDialog, or 0 if the function failed @@ -100,7 +100,7 @@ protected: * @param dialogFace the KDialogBase::DialogType * @param buttonMask a ORed mask of all buttons (see * KDialogBase::ButtonCode) - * @param parent the QWidget's parent, or 0 + * @param parent the TQWidget's parent, or 0 * @param name the name of the TQObject, can be 0 * @param modal if true the dialog is model * @see KDialogBase @@ -187,7 +187,7 @@ public: /** * Your library should reimplement this method to return your KScanDialog * derived dialog. - * @param parent the QWidget's parent, or 0 + * @param parent the TQWidget's parent, or 0 * @param name the name of the TQObject, can be 0 * @param modal if true the dialog is model */ @@ -197,13 +197,13 @@ public: protected: /** * Creates a new KScanDialogFactory. - * @param parent the QWidget's parent, or 0 + * @param parent the TQWidget's parent, or 0 * @param name the name of the TQObject, can be 0 */ KScanDialogFactory( TQObject *parent=0, const char *name=0 ); virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, - const char* classname = TQOBJECT_OBJECT_NAME_STRING, + const char* classname = "TQObject", const TQStringList &args = TQStringList() ); @@ -235,7 +235,7 @@ private: */ class TDEIO_EXPORT KOCRDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** @@ -243,7 +243,7 @@ public: * or 0L if no OCR-support * is available. Pass a suitable @p parent widget, if you like. If you * don't you have to 'delete' the returned pointer yourself. - * @param parent the QWidget's parent, or 0 + * @param parent the TQWidget's parent, or 0 * @param name the name of the TQObject, can be 0 * @param modal if true the dialog is model * @return the KOCRDialog, or 0 if the function failed @@ -260,7 +260,7 @@ protected: * @param dialogFace the KDialogBase::DialogType * @param buttonMask a ORed mask of all buttons (see * KDialogBase::ButtonCode) - * @param parent the QWidget's parent, or 0 + * @param parent the TQWidget's parent, or 0 * @param name the name of the TQObject, can be 0 * @param modal if true the dialog is model */ @@ -323,7 +323,7 @@ public: /** * Your library should reimplement this method to return your KOCRDialog * derived dialog. - * @param parent the QWidget's parent, or 0 + * @param parent the TQWidget's parent, or 0 * @param name the name of the TQObject, can be 0 * @param modal if true the dialog is model */ @@ -333,13 +333,13 @@ public: protected: /** * Creates a new KScanDialogFactory. - * @param parent the QWidget's parent, or 0 + * @param parent the TQWidget's parent, or 0 * @param name the name of the TQObject, can be 0 */ KOCRDialogFactory( TQObject *parent=0, const char *name=0 ); virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, - const char* className = TQOBJECT_OBJECT_NAME_STRING, + const char* className = "TQObject", const TQStringList &args = TQStringList() ); diff --git a/tdeio/tdeio/kservice.cpp b/tdeio/tdeio/kservice.cpp index 05cf554c0..17545d8e6 100644 --- a/tdeio/tdeio/kservice.cpp +++ b/tdeio/tdeio/kservice.cpp @@ -37,15 +37,15 @@ #include <tqdir.h> #include <tqtl.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <tdeglobal.h> #include <kiconloader.h> #include <tdelocale.h> #include <tdeconfigbase.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <dcopclient.h> #include "kservicefactory.h" @@ -80,19 +80,19 @@ KService::KService( const TQString & _name, const TQString &_exec, const TQStrin KService::KService( const TQString & _fullpath ) : KSycocaEntry( _fullpath) { - KDesktopFile config( _fullpath ); + TDEDesktopFile config( _fullpath ); init(&config); } -KService::KService( KDesktopFile *config ) +KService::KService( TDEDesktopFile *config ) : KSycocaEntry( config->fileName()) { init(config); } void -KService::init( KDesktopFile *config ) +KService::init( TDEDesktopFile *config ) { d = new KServicePrivate; m_bValid = true; @@ -738,7 +738,7 @@ bool KService::substituteUid() const { } TQString KService::username() const { - // See also KDesktopFile::tryExec() + // See also TDEDesktopFile::tryExec() TQString user; TQVariant v = property("X-TDE-Username", TQVariant::String); user = v.isValid() ? v.toString() : TQString::null; @@ -786,7 +786,7 @@ bool KService::noDisplay() const { #endif } - if (!kapp->authorizeControlModule(d->menuId)) + if (!tdeApp->authorizeControlModule(d->menuId)) return true; return false; @@ -856,7 +856,7 @@ TQString KService::locateLocal() { if (d->menuId.isEmpty() || desktopEntryPath().startsWith(".hidden") || (TQDir::isRelativePath(desktopEntryPath()) && d->categories.isEmpty())) - return KDesktopFile::locateLocal(desktopEntryPath()); + return TDEDesktopFile::locateLocal(desktopEntryPath()); return ::locateLocal("xdgdata-apps", d->menuId); } @@ -924,10 +924,10 @@ void KService::rebuildKSycoca(TQWidget *parent) i18n("Updating system configuration.")); TQByteArray data; - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); int result = client->callAsync("kded", "tdebuildsycoca", "recreate()", - data, TQT_TQOBJECT(&dlg), TQT_SLOT(slotFinished())); + data, &dlg, TQ_SLOT(slotFinished())); if (result) { @@ -939,7 +939,7 @@ KServiceProgressDialog::KServiceProgressDialog(TQWidget *parent, const char *nam const TQString &caption, const TQString &text) : KProgressDialog(parent, name, caption, text, true) { - connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotProgress())); + connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotProgress())); progressBar()->setTotalSteps(20); m_timeStep = 700; m_timer.start(m_timeStep); @@ -968,7 +968,7 @@ KServiceProgressDialog::slotFinished() { progressBar()->setProgress(20); m_timer.stop(); - TQTimer::singleShot(1000, this, TQT_SLOT(close())); + TQTimer::singleShot(1000, this, TQ_SLOT(close())); } #include "kservice_p.moc" diff --git a/tdeio/tdeio/kservice.h b/tdeio/tdeio/kservice.h index bd42f9b0d..09218ac9d 100644 --- a/tdeio/tdeio/kservice.h +++ b/tdeio/tdeio/kservice.h @@ -28,7 +28,7 @@ #include "tdesycocaentry.h" class TQDataStream; -class KDesktopFile; +class TDEDesktopFile; class KService; class KBuildSycoca; class TQWidget; @@ -74,7 +74,7 @@ public: * Construct a service and take all information from a desktop file. * @param config the desktop file to read */ - KService( KDesktopFile *config ); // KDE-4.0: make explicit + KService( TDEDesktopFile *config ); // KDE-4.0: make explicit /** * @internal @@ -521,7 +521,7 @@ public: protected: - void init(KDesktopFile *config); + void init(TDEDesktopFile *config); TQStringList &accessServiceTypes() { return m_lstServiceTypes; } diff --git a/tdeio/tdeio/kservice_p.h b/tdeio/tdeio/kservice_p.h index 180ab8fc3..b0f0269ce 100644 --- a/tdeio/tdeio/kservice_p.h +++ b/tdeio/tdeio/kservice_p.h @@ -25,7 +25,7 @@ class KServiceProgressDialog : public KProgressDialog { - Q_OBJECT + TQ_OBJECT public: KServiceProgressDialog(TQWidget *parent, const char *name, const TQString &caption, const TQString &text); diff --git a/tdeio/tdeio/kservicefactory.cpp b/tdeio/tdeio/kservicefactory.cpp index abd6ec61e..346088bbb 100644 --- a/tdeio/tdeio/kservicefactory.cpp +++ b/tdeio/tdeio/kservicefactory.cpp @@ -27,7 +27,7 @@ #include <tdelocale.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstaticdeleter.h> KServiceFactory::KServiceFactory() diff --git a/tdeio/tdeio/kservicegroup.cpp b/tdeio/tdeio/kservicegroup.cpp index e0ec1321e..e612705e5 100644 --- a/tdeio/tdeio/kservicegroup.cpp +++ b/tdeio/tdeio/kservicegroup.cpp @@ -20,7 +20,7 @@ #include <kiconloader.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kdebug.h> #include <ksortablevaluelist.h> @@ -69,7 +69,7 @@ KServiceGroup::KServiceGroup( const TQString &configFile, const TQString & _relp d->directoryEntryPath = cfg; - KDesktopFile config( cfg, true, "apps" ); + TDEDesktopFile config( cfg, true, "apps" ); m_strCaption = config.readName(); m_strIcon = config.readIcon(); diff --git a/tdeio/tdeio/kservicegroup.h b/tdeio/tdeio/kservicegroup.h index ac4646599..6cb910f18 100644 --- a/tdeio/tdeio/kservicegroup.h +++ b/tdeio/tdeio/kservicegroup.h @@ -25,7 +25,7 @@ #include <tqdatastream.h> #include <tqvariant.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <ksortablevaluelist.h> #include "tdesycocaentry.h" diff --git a/tdeio/tdeio/kservicegroupfactory.cpp b/tdeio/tdeio/kservicegroupfactory.cpp index 3caf9c027..077ed800b 100644 --- a/tdeio/tdeio/kservicegroupfactory.cpp +++ b/tdeio/tdeio/kservicegroupfactory.cpp @@ -27,7 +27,7 @@ #include <tdelocale.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> KServiceGroupFactory::KServiceGroupFactory() : KSycocaFactory( KST_KServiceGroupFactory ) diff --git a/tdeio/tdeio/kservicetype.cpp b/tdeio/tdeio/kservicetype.cpp index 66d12698b..f94d7cc77 100644 --- a/tdeio/tdeio/kservicetype.cpp +++ b/tdeio/tdeio/kservicetype.cpp @@ -25,7 +25,7 @@ #include "kuserprofile.h" #include <assert.h> #include <kdebug.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> class KServiceType::KServiceTypePrivate { @@ -40,19 +40,19 @@ public: KServiceType::KServiceType( const TQString & _fullpath) : KSycocaEntry(_fullpath), d(0) { - KDesktopFile config( _fullpath ); + TDEDesktopFile config( _fullpath ); init(&config); } -KServiceType::KServiceType( KDesktopFile *config ) +KServiceType::KServiceType( TDEDesktopFile *config ) : KSycocaEntry(config->fileName()), d(0) { init(config); } void -KServiceType::init( KDesktopFile *config) +KServiceType::init( TDEDesktopFile *config) { // Is it a mimetype ? m_strName = config->readEntry( "MimeType" ); diff --git a/tdeio/tdeio/kservicetype.h b/tdeio/tdeio/kservicetype.h index d333188c1..8b40b7695 100644 --- a/tdeio/tdeio/kservicetype.h +++ b/tdeio/tdeio/kservicetype.h @@ -32,7 +32,7 @@ #include <tqdatastream.h> #include <tqvariant.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> /** * A service type is the generic notion for a mimetype, a type of service @@ -73,7 +73,7 @@ public: * Construct a service type and take all informations from a deskop file. * @param config the configuration file */ - KServiceType( KDesktopFile *config); + KServiceType( TDEDesktopFile *config); /** * @internal construct a service from a stream. @@ -227,7 +227,7 @@ public: static List allServiceTypes(); protected: - void init( KDesktopFile *config ); + void init( TDEDesktopFile *config ); protected: TQString m_strName; diff --git a/tdeio/tdeio/kservicetypefactory.cpp b/tdeio/tdeio/kservicetypefactory.cpp index e198f1333..77cda4059 100644 --- a/tdeio/tdeio/kservicetypefactory.cpp +++ b/tdeio/tdeio/kservicetypefactory.cpp @@ -234,7 +234,7 @@ KServiceType::List KServiceTypeFactory::allServiceTypes() it != list.end(); ++it) { -#ifndef Q_WS_QWS +#ifndef TQ_WS_QWS KServiceType *newServiceType = dynamic_cast<KServiceType *>((*it).data()); #else //FIXME KServiceType *newServiceType = (KServiceType*)(*it).data(); @@ -296,5 +296,3 @@ KServiceTypeFactory *KServiceTypeFactory::_self = 0; void KServiceTypeFactory::virtual_hook( int id, void* data ) { KSycocaFactory::virtual_hook( id, data ); } - -// vim: ts=3 sw=3 et diff --git a/tdeio/tdeio/kshellcompletion.h b/tdeio/tdeio/kshellcompletion.h index a23fbe78e..632aef7a6 100644 --- a/tdeio/tdeio/kshellcompletion.h +++ b/tdeio/tdeio/kshellcompletion.h @@ -39,7 +39,7 @@ class KShellCompletionPrivate; */ class TDEIO_EXPORT KShellCompletion : public KURLCompletion { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeio/tdeio/kshred.cpp b/tdeio/tdeio/kshred.cpp index b013e2059..f5c44c702 100644 --- a/tdeio/tdeio/kshred.cpp +++ b/tdeio/tdeio/kshred.cpp @@ -133,7 +133,7 @@ KShred::fillrandom() // assumes that 4096 is a multipe of sizeof(long int) int limit = (n + sizeof(long int) - 1) / sizeof(long int); for (int i = 0; i < limit; i++) - buff[i] = kapp->random(); + buff[i] = tdeApp->random(); if (!writeData((unsigned char *) buff, n)) return false; diff --git a/tdeio/tdeio/kshred.h b/tdeio/tdeio/kshred.h index 5fabcaa5b..dae5cc3df 100644 --- a/tdeio/tdeio/kshred.h +++ b/tdeio/tdeio/kshred.h @@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ class TDEIO_EXPORT_DEPRECATED KShred : public TQObject { // KDE4: remove - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeio/tdeio/ktar.cpp b/tdeio/tdeio/ktar.cpp index 058d328b7..6d90954b4 100644 --- a/tdeio/tdeio/ktar.cpp +++ b/tdeio/tdeio/ktar.cpp @@ -36,7 +36,7 @@ #include <kfilterbase.h> #include "ktar.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> //////////////////////////////////////////////////////////////////////// /////////////////////////// KTar /////////////////////////////////// @@ -129,7 +129,7 @@ void KTar::prepareDevice( const TQString & filename, const TQString & mimetype, bool /*forced*/ ) { if( "application/x-tar" == mimetype ) - setDevice( TQT_TQIODEVICE(new TQFile( filename )) ); + setDevice( new TQFile( filename ) ); else { // The compression filters are very slow with random access. @@ -149,7 +149,7 @@ void KTar::prepareDevice( const TQString & filename, // the device must be closed, however, for KArchive.setDevice() TQFile* file = d->tmpFile->file(); file->close(); - setDevice(TQT_TQIODEVICE(file)); + setDevice(file); } } diff --git a/tdeio/tdeio/ktrader.cpp b/tdeio/tdeio/ktrader.cpp index 7ef39638e..6e01d2bcf 100644 --- a/tdeio/tdeio/ktrader.cpp +++ b/tdeio/tdeio/ktrader.cpp @@ -23,7 +23,7 @@ #include <tqbuffer.h> #include <kuserprofile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstaticdeleter.h> #include <kdebug.h> diff --git a/tdeio/tdeio/ktrader.h b/tdeio/tdeio/ktrader.h index 3703f5e60..8b42a55e8 100644 --- a/tdeio/tdeio/ktrader.h +++ b/tdeio/tdeio/ktrader.h @@ -84,7 +84,7 @@ */ class TDEIO_EXPORT TDETrader : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * A list of services. @@ -187,7 +187,7 @@ protected: * * As elementary atoms of the constraint language, TDETrader supports * booleans, integers, floats and strings. Boolean literals are - * @a TRUE and @a FALSE . Integers can be positive or negative, + * @a true and @a false . Integers can be positive or negative, * i.e. @a 42 and @a -10 are legal values. Floating point * numbers are @a 3.141592535 or @a -999.999 . Scientific notation * like @a 1.5e-2 is not supported. Character literals are delimited @@ -254,7 +254,7 @@ protected: * - <tt>()</tt> * * The tilde operator stands for a substring match. For example, - * <tt>KParts ~ 'KParts/ReadOnlyPart'</tt> is TRUE. The membership + * <tt>KParts ~ 'KParts/ReadOnlyPart'</tt> is true. The membership * operator <tt>in</tt> tests whether a value is in a list. A list is a * string with semi-colon- or comma-separated entries, depending on the * type. An example for the membership operator is diff --git a/tdeio/tdeio/kurifilter.h b/tdeio/tdeio/kurifilter.h index cbd74d4e8..9118f7f89 100644 --- a/tdeio/tdeio/kurifilter.h +++ b/tdeio/tdeio/kurifilter.h @@ -142,7 +142,7 @@ public: * * @deprecated */ - KDE_DEPRECATED bool hasBeenFiltered() const { return true; } + TDE_DEPRECATED bool hasBeenFiltered() const { return true; } /** * Returns the filtered or the original URL. @@ -306,7 +306,7 @@ public: /** * Overloaded assigenment operator. * - * This function allows you to easily assign a QString + * This function allows you to easily assign a TQString * to a KURIFilterData object. * * @return an instance of a KURIFilterData object. @@ -362,7 +362,7 @@ private: */ class TDEIO_EXPORT KURIFilterPlugin : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeio/tdeio/kurlcompletion.cpp b/tdeio/tdeio/kurlcompletion.cpp index 890f9f28c..2ea5d03fc 100644 --- a/tdeio/tdeio/kurlcompletion.cpp +++ b/tdeio/tdeio/kurlcompletion.cpp @@ -1,5 +1,4 @@ -/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset:4 -*- - +/* This file is part of the KDE libraries Copyright (C) 2000 David Smith <dsmith@algonet.se> Copyright (C) 2004 Scott Wheeler <wheeler@kde.org> @@ -114,7 +113,7 @@ protected: void done() { if ( !m_terminationRequested ) - kapp->postEvent( m_receiver, new CompletionMatchEvent( this ) ); + tdeApp->postEvent( m_receiver, new CompletionMatchEvent( this ) ); else delete this; } @@ -224,8 +223,7 @@ void DirectoryListThread::run() // Loop through all directory entries // Solaris and IRIX dirent structures do not allocate space for d_name. On - // systems that do (HP-UX, Linux, Tru64 UNIX), we overallocate space but - // that's ok. + // systems that do (HP-UX, Linux), we overallocate space but that's ok. #ifndef HAVE_READDIR_R struct dirent *dirEntry = 0; while ( !terminationRequested() && @@ -1164,7 +1162,7 @@ TQString KURLCompletion::listDirectories( { KURL url; url.setPath(*it); - if ( kapp->authorizeURLAction( "list", KURL(), url ) ) + if ( tdeApp->authorizeURLAction( "list", KURL(), url ) ) dirs.append( *it ); } @@ -1334,12 +1332,12 @@ void KURLCompletion::slotIOFinished( TDEIO::Job * job ) assert( d->list_job ); connect( d->list_job, - TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotIOFinished(TDEIO::Job*)) ); + TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotIOFinished(TDEIO::Job*)) ); connect( d->list_job, - TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), - TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&)) ); + TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&)) ); delete kurl; } diff --git a/tdeio/tdeio/kurlcompletion.h b/tdeio/tdeio/kurlcompletion.h index a6b68b1b4..6c0bada4f 100644 --- a/tdeio/tdeio/kurlcompletion.h +++ b/tdeio/tdeio/kurlcompletion.h @@ -40,7 +40,7 @@ class KURLCompletionPrivate; */ class TDEIO_EXPORT KURLCompletion : public TDECompletion { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeio/tdeio/kzip.cpp b/tdeio/tdeio/kzip.cpp index 91f36a085..159d5c20a 100644 --- a/tdeio/tdeio/kzip.cpp +++ b/tdeio/tdeio/kzip.cpp @@ -385,7 +385,7 @@ bool KZip::openArchive( int mode ) return false; } Q_ASSERT( d->m_saveFile->file() ); - setDevice( TQT_TQIODEVICE(d->m_saveFile->file()) ); + setDevice( d->m_saveFile->file() ); } return true; case IO_ReadOnly: @@ -393,7 +393,7 @@ bool KZip::openArchive( int mode ) { // ReadWrite mode still uses TQFile for now; we'd need to copy to the tempfile, in fact. if ( !m_filename.isEmpty() ) { - setDevice( TQT_TQIODEVICE(new TQFile( m_filename )) ); + setDevice( new TQFile( m_filename ) ); if ( !device()->open( mode ) ) return false; } diff --git a/tdeio/tdeio/lex.c b/tdeio/tdeio/lex.c index f8d8c2bfc..6596a8082 100644 --- a/tdeio/tdeio/lex.c +++ b/tdeio/tdeio/lex.c @@ -59,15 +59,6 @@ #endif /* __STDC__ */ #endif /* ! __cplusplus */ -#ifdef __TURBOC__ - #pragma warn -rch - #pragma warn -use -#include <io.h> -#include <stdlib.h> -#define YY_USE_CONST -#define YY_USE_PROTOS -#endif - #ifdef YY_USE_CONST #define yyconst const #else diff --git a/tdeio/tdeio/metainfojob.cpp b/tdeio/tdeio/metainfojob.cpp index 002c76b2a..e00c262c8 100644 --- a/tdeio/tdeio/metainfojob.cpp +++ b/tdeio/tdeio/metainfojob.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- -// vim: ts=4 sw=4 et /* This file is part of the KDE libraries Copyright (C) 2002 Rolf Magnus <ramagnus@kde.org> @@ -63,7 +61,7 @@ MetaInfoJob::MetaInfoJob(const KFileItemList &items, bool deleteItems) // Return to event loop first, determineNextFile() might delete this; // (no idea what that means, it comes from previewjob) - TQTimer::singleShot(0, this, TQT_SLOT(start())); + TQTimer::singleShot(0, this, TQ_SLOT(start())); } MetaInfoJob::~MetaInfoJob() @@ -132,8 +130,8 @@ void MetaInfoJob::getMetaInfo() TDEIO::TransferJob* job = TDEIO::get(URL, false, false); addSubjob(job); - connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotMetaInfo(TDEIO::Job *, const TQByteArray &))); + connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotMetaInfo(TDEIO::Job *, const TQByteArray &))); job->addMetaData("mimeType", d->currentItem->current()->mimetype()); } diff --git a/tdeio/tdeio/metainfojob.h b/tdeio/tdeio/metainfojob.h index 27aa4e839..61f944260 100644 --- a/tdeio/tdeio/metainfojob.h +++ b/tdeio/tdeio/metainfojob.h @@ -1,5 +1,3 @@ -// -*- c++ -*- -// vim: ts=4 sw=4 et /* This file is part of the KDE libraries Copyright (C) 2001 Rolf Magnus <ramagnus@kde.org> parts of this taken from previewjob.h @@ -34,7 +32,7 @@ namespace TDEIO { */ class TDEIO_EXPORT MetaInfoJob : public TDEIO::Job { - Q_OBJECT + TQ_OBJECT public: /** * Creates a new MetaInfoJob. diff --git a/tdeio/tdeio/netaccess.cpp b/tdeio/tdeio/netaccess.cpp index 132c87a50..da141e3ae 100644 --- a/tdeio/tdeio/netaccess.cpp +++ b/tdeio/tdeio/netaccess.cpp @@ -316,8 +316,8 @@ bool NetAccess::filecopyInternal(const KURL& src, const KURL& target, int permis ? TDEIO::file_move( src, target, permissions, overwrite, resume ) : TDEIO::file_copy( src, target, permissions, overwrite, resume ); job->setWindow (window); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); return bJobOK; @@ -332,8 +332,8 @@ bool NetAccess::dircopyInternal(const KURL::List& src, const KURL& target, ? TDEIO::move( src, target ) : TDEIO::copy( src, target ); job->setWindow (window); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); return bJobOK; @@ -347,8 +347,8 @@ bool NetAccess::statInternal( const KURL & url, int details, bool source, job->setWindow (window); job->setDetails( details ); job->setSide( source ); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); return bJobOK; } @@ -358,8 +358,8 @@ KURL NetAccess::localURLInternal( const KURL & url, TQWidget* window ) m_localURL = url; TDEIO::LocalURLJob* job = TDEIO::localURL(url); job->setWindow (window); - connect(job, TQT_SIGNAL( localURL(TDEIO::Job*, const KURL&, bool) ), - this, TQT_SLOT( slotLocalURL(TDEIO::Job*, const KURL&, bool) )); + connect(job, TQ_SIGNAL( localURL(TDEIO::Job*, const KURL&, bool) ), + this, TQ_SLOT( slotLocalURL(TDEIO::Job*, const KURL&, bool) )); enter_loop(); return m_localURL; } @@ -369,8 +369,8 @@ bool NetAccess::delInternal( const KURL & url, TQWidget* window ) bJobOK = true; // success unless further error occurs TDEIO::Job * job = TDEIO::del( url ); job->setWindow (window); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); return bJobOK; } @@ -381,8 +381,8 @@ bool NetAccess::mkdirInternal( const KURL & url, int permissions, bJobOK = true; // success unless further error occurs TDEIO::Job * job = TDEIO::mkdir( url, permissions ); job->setWindow (window); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); return bJobOK; } @@ -393,10 +393,10 @@ TQString NetAccess::mimetypeInternal( const KURL & url, TQWidget* window ) m_mimetype = TQString::fromLatin1("unknown"); TDEIO::Job * job = TDEIO::mimetype( url ); job->setWindow (window); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); - connect( job, TQT_SIGNAL( mimetype (TDEIO::Job *, const TQString &) ), - this, TQT_SLOT( slotMimetype (TDEIO::Job *, const TQString &) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( mimetype (TDEIO::Job *, const TQString &) ), + this, TQ_SLOT( slotMimetype (TDEIO::Job *, const TQString &) ) ); enter_loop(); return m_mimetype; } @@ -437,8 +437,8 @@ TQString NetAccess::fish_executeInternal(const KURL & url, const TQString comman TDEIO::Job * job = TDEIO::special( tempPathUrl, packedArgs, true ); job->setWindow( window ); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); // since the TDEIO::special does not provide feedback we need to download the result @@ -482,21 +482,21 @@ bool NetAccess::synchronousRunInternal( Job* job, TQWidget* window, TQByteArray* } } - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); TQMetaObject *meta = job->metaObject(); - static const char dataSignal[] = "data(TDEIO::Job*,const " TQBYTEARRAY_OBJECT_NAME_STRING "&)"; + static const char dataSignal[] = "data(TDEIO::Job*,const " "TQByteArray" "&)"; if ( meta->findSignal( dataSignal ) != -1 ) { - connect( job, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&)), - this, TQT_SLOT(slotData(TDEIO::Job*,const TQByteArray&)) ); + connect( job, TQ_SIGNAL(data(TDEIO::Job*,const TQByteArray&)), + this, TQ_SLOT(slotData(TDEIO::Job*,const TQByteArray&)) ); } static const char redirSignal[] = "redirection(TDEIO::Job*,const KURL&)"; if ( meta->findSignal( redirSignal ) != -1 ) { - connect( job, TQT_SIGNAL(redirection(TDEIO::Job*,const KURL&)), - this, TQT_SLOT(slotRedirection(TDEIO::Job*, const KURL&)) ); + connect( job, TQ_SIGNAL(redirection(TDEIO::Job*,const KURL&)), + this, TQ_SLOT(slotRedirection(TDEIO::Job*, const KURL&)) ); } enter_loop(); @@ -516,7 +516,7 @@ void tqt_leave_modal( TQWidget *widget ); void NetAccess::enter_loop() { TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal)); - dummy.setFocusPolicy( TQ_NoFocus ); + dummy.setFocusPolicy( TQWidget::NoFocus ); tqt_enter_modal(&dummy); tqApp->enter_loop(); tqt_leave_modal(&dummy); diff --git a/tdeio/tdeio/netaccess.h b/tdeio/tdeio/netaccess.h index 7dde61385..5a9767515 100644 --- a/tdeio/tdeio/netaccess.h +++ b/tdeio/tdeio/netaccess.h @@ -58,7 +58,7 @@ namespace TDEIO { */ class TDEIO_EXPORT NetAccess : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** @@ -119,7 +119,7 @@ public: /** * @deprecated. Use the function above instead. */ - static bool download(const KURL& src, TQString & target) KDE_DEPRECATED; + static bool download(const KURL& src, TQString & target) TDE_DEPRECATED; /** * Removes the specified file if and only if it was created @@ -158,7 +158,7 @@ public: /** * @deprecated. Use the function above instead. */ - static bool upload(const TQString& src, const KURL& target) KDE_DEPRECATED; + static bool upload(const TQString& src, const KURL& target) TDE_DEPRECATED; /** * Alternative to upload for copying over the network. @@ -184,7 +184,7 @@ public: /** * @deprecated. Use the function above instead. */ - static bool copy( const KURL& src, const KURL& target ) KDE_DEPRECATED; + static bool copy( const KURL& src, const KURL& target ) TDE_DEPRECATED; // KDE4: merge with above /** @@ -226,7 +226,7 @@ public: /** * @deprecated. Use the function above instead. */ - static bool dircopy( const KURL& src, const KURL& target ) KDE_DEPRECATED; // KDE4: merge + static bool dircopy( const KURL& src, const KURL& target ) TDE_DEPRECATED; // KDE4: merge /** * Overloaded method, which takes a list of source URLs @@ -283,17 +283,17 @@ public: * @deprecated. Use the function above instead. * @since 3.2 */ - static bool exists(const KURL& url, TQWidget* window) KDE_DEPRECATED; + static bool exists(const KURL& url, TQWidget* window) TDE_DEPRECATED; /** * @deprecated. Use the function above instead. */ - static bool exists(const KURL& url) KDE_DEPRECATED; + static bool exists(const KURL& url) TDE_DEPRECATED; /** * @deprecated. Use the function above instead. */ - static bool exists(const KURL& url, bool source) KDE_DEPRECATED; // KDE4: merge + static bool exists(const KURL& url, bool source) TDE_DEPRECATED; // KDE4: merge /** * Tests whether a URL exists and return information on it. @@ -316,7 +316,7 @@ public: /** * @deprecated. Use the function above instead. */ - static bool stat(const KURL& url, TDEIO::UDSEntry & entry) KDE_DEPRECATED; + static bool stat(const KURL& url, TDEIO::UDSEntry & entry) TDE_DEPRECATED; /** * Tries to map a local URL for the given URL. @@ -358,7 +358,7 @@ public: * you should try to identify a suitable parent widget * if at all possible. */ - static bool del( const KURL & url ) KDE_DEPRECATED; + static bool del( const KURL & url ) TDE_DEPRECATED; /** * Creates a directory in a synchronous way. @@ -383,7 +383,7 @@ public: * you should try to identify a suitable parent widget * if at all possible. */ - static bool mkdir( const KURL & url, int permissions = -1 ) KDE_DEPRECATED; + static bool mkdir( const KURL & url, int permissions = -1 ) TDE_DEPRECATED; /** * Executes a remote process via the fish ioslave in a synchronous way. @@ -472,7 +472,7 @@ public: * you should try to identify a suitable parent widget * if at all possible. */ - static TQString mimetype( const KURL & url ) KDE_DEPRECATED; + static TQString mimetype( const KURL & url ) TDE_DEPRECATED; /** * Returns the error string for the last job, in case it failed. diff --git a/tdeio/tdeio/observer.cpp b/tdeio/tdeio/observer.cpp index 2309c2142..41bd7dbc6 100644 --- a/tdeio/tdeio/observer.cpp +++ b/tdeio/tdeio/observer.cpp @@ -52,12 +52,12 @@ const int KDEBUG_OBSERVER = 7007; // Should be 7028 Observer::Observer() : DCOPObject("TDEIO::Observer") { // Register app as able to receive DCOP messages - if (kapp && !kapp->dcopClient()->isAttached()) + if (tdeApp && !tdeApp->dcopClient()->isAttached()) { - kapp->dcopClient()->attach(); + tdeApp->dcopClient()->attach(); } - if ( !kapp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) ) + if ( !tdeApp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) ) { kdDebug(KDEBUG_OBSERVER) << "Starting tdeio_uiserver" << endl; TQString error; @@ -70,7 +70,7 @@ Observer::Observer() : DCOPObject("TDEIO::Observer") kdDebug(KDEBUG_OBSERVER) << "startServiceByDesktopPath returned " << ret << endl; } - if ( !kapp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) ) + if ( !tdeApp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) ) kdDebug(KDEBUG_OBSERVER) << "The application tdeio_uiserver is STILL NOT REGISTERED" << endl; else kdDebug(KDEBUG_OBSERVER) << "tdeio_uiserver registered" << endl; @@ -82,7 +82,7 @@ int Observer::newJob( TDEIO::Job * job, bool showProgress ) { // Tell the UI Server about this new job, and give it the application id // at the same time - int progressId = m_uiserver->newJob( kapp->dcopClient()->appId(), showProgress ); + int progressId = m_uiserver->newJob( tdeApp->dcopClient()->appId(), showProgress ); // Keep the result in a dict m_dctJobs.insert( progressId, job ); @@ -353,7 +353,7 @@ int Observer::messageBox( int progressId, int type, const TQString &text, arg << caption; arg << buttonYes; arg << buttonNo; - if ( kapp->dcopClient()->call( "tdeio_uiserver", "UIServer", "messageBox(int,int,TQString,TQString,TQString,TQString)", data, replyType, replyData, true ) + if ( tdeApp->dcopClient()->call( "tdeio_uiserver", "UIServer", "messageBox(int,int,TQString,TQString,TQString,TQString)", data, replyType, replyData, true ) && replyType == "int" ) { int result; diff --git a/tdeio/tdeio/observer.h b/tdeio/tdeio/observer.h index fd3cb6310..31e0feda0 100644 --- a/tdeio/tdeio/observer.h +++ b/tdeio/tdeio/observer.h @@ -55,7 +55,7 @@ namespace TDEIO { class TDEIO_EXPORT Observer : public TQObject, public DCOPObject { K_DCOP - Q_OBJECT + TQ_OBJECT public: @@ -208,6 +208,4 @@ protected: private: class ObserverPrivate* d; }; - -// -*- mode: c++; c-basic-offset: 2 -*- #endif diff --git a/tdeio/tdeio/passdlg.cpp b/tdeio/tdeio/passdlg.cpp index 91fba050d..112244d80 100644 --- a/tdeio/tdeio/passdlg.cpp +++ b/tdeio/tdeio/passdlg.cpp @@ -31,7 +31,7 @@ #include <kiconloader.h> #include <klineedit.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> using namespace TDEIO; @@ -87,13 +87,13 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, { lbl = new TQLabel( main ); lbl->setPixmap( pix ); - lbl->setAlignment( Qt::AlignLeft|Qt::AlignVCenter ); + lbl->setAlignment( TQt::AlignLeft|TQt::AlignVCenter ); lbl->setFixedSize( lbl->sizeHint() ); - d->layout->addWidget( lbl, 0, 0, Qt::AlignLeft ); + d->layout->addWidget( lbl, 0, 0, TQt::AlignLeft ); } d->prompt = new TQLabel( main ); - d->prompt->setAlignment( Qt::AlignLeft|Qt::AlignVCenter|TQt::WordBreak ); - d->layout->addWidget( d->prompt, 0, 2, Qt::AlignLeft ); + d->prompt->setAlignment( TQt::AlignLeft|TQt::AlignVCenter|TQt::WordBreak ); + d->layout->addWidget( d->prompt, 0, 2, TQt::AlignLeft ); if ( prompt.isEmpty() ) setPrompt( i18n( "You need to supply a username and a password" ) ); else @@ -106,7 +106,7 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, // Row 4: Username field d->userNameLabel = new TQLabel( i18n("&Username:"), main ); - d->userNameLabel->setAlignment( Qt::AlignVCenter | Qt::AlignLeft ); + d->userNameLabel->setAlignment( TQt::AlignVCenter | TQt::AlignLeft ); d->userNameLabel->setFixedSize( d->userNameLabel->sizeHint() ); d->userNameHBox = new TQHBox( main ); @@ -123,7 +123,7 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, // Row 6: Password field lbl = new TQLabel( i18n("&Password:"), main ); - lbl->setAlignment( Qt::AlignVCenter | Qt::AlignLeft ); + lbl->setAlignment( TQt::AlignVCenter | TQt::AlignLeft ); lbl->setFixedSize( lbl->sizeHint() ); TQHBox* hbox = new TQHBox( main ); d->passEdit = new KLineEdit( hbox ); @@ -148,13 +148,13 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, d->keepCheckBox->setFixedSize( d->keepCheckBox->sizeHint() ); d->keep = cfg->readBoolEntry("Keep", false ); d->keepCheckBox->setChecked( d->keep ); - connect(d->keepCheckBox, TQT_SIGNAL(toggled( bool )), TQT_SLOT(slotKeep( bool ))); + connect(d->keepCheckBox, TQ_SIGNAL(toggled( bool )), TQ_SLOT(slotKeep( bool ))); d->layout->addWidget( hbox, 8, 2 ); } // Configure necessary key-bindings and connect necessar slots and signals - connect( d->userEdit, TQT_SIGNAL(returnPressed()), d->passEdit, TQT_SLOT(setFocus()) ); - connect( d->passEdit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotOk()) ); + connect( d->userEdit, TQ_SIGNAL(returnPressed()), d->passEdit, TQ_SLOT(setFocus()) ); + connect( d->passEdit, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotOk()) ); if ( !user.isEmpty() ) { @@ -239,13 +239,13 @@ void PasswordDialog::addCommentLine( const TQString& label, TQWidget *main = mainWidget(); TQLabel* lbl = new TQLabel( label, main); - lbl->setAlignment( Qt::AlignVCenter|Qt::AlignRight ); + lbl->setAlignment( TQt::AlignVCenter|TQt::AlignRight ); lbl->setFixedSize( lbl->sizeHint() ); - d->layout->addWidget( lbl, d->nRow+2, 0, Qt::AlignLeft ); + d->layout->addWidget( lbl, d->nRow+2, 0, TQt::AlignLeft ); lbl = new TQLabel( comment, main); - lbl->setAlignment( Qt::AlignVCenter|Qt::AlignLeft|TQt::WordBreak ); + lbl->setAlignment( TQt::AlignVCenter|TQt::AlignLeft|TQt::WordBreak ); calculateLabelSize(lbl); - d->layout->addWidget( lbl, d->nRow+2, 2, Qt::AlignLeft ); + d->layout->addWidget( lbl, d->nRow+2, 2, TQt::AlignLeft ); d->layout->addRowSpacing( 3, 10 ); // Add a spacer d->nRow++; } @@ -315,8 +315,8 @@ void PasswordDialog::setKnownLogins( const TQMap<TQString, TQString>& knownLogin d->userEditCombo->insertStringList( knownLogins.keys() ); d->userEditCombo->setFocus(); - connect( d->userEditCombo, TQT_SIGNAL( activated( const TQString& ) ), - this, TQT_SLOT( slotActivated( const TQString& ) ) ); + connect( d->userEditCombo, TQ_SIGNAL( activated( const TQString& ) ), + this, TQ_SLOT( slotActivated( const TQString& ) ) ); } void PasswordDialog::slotActivated( const TQString& userName ) diff --git a/tdeio/tdeio/passdlg.h b/tdeio/tdeio/passdlg.h index 929fa1014..b5c56ffba 100644 --- a/tdeio/tdeio/passdlg.h +++ b/tdeio/tdeio/passdlg.h @@ -35,7 +35,7 @@ namespace TDEIO { */ class TDEIO_EXPORT PasswordDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** @@ -113,7 +113,7 @@ public: /** * @deprecated. Use setUserReadOnly(bool). */ - KDE_DEPRECATED void setEnableUserField( bool enable, bool=false ) { + TDE_DEPRECATED void setEnableUserField( bool enable, bool=false ) { setUserReadOnly( !enable ); }; diff --git a/tdeio/tdeio/pastedialog.cpp b/tdeio/tdeio/pastedialog.cpp index d95cc7e88..61fb12c48 100644 --- a/tdeio/tdeio/pastedialog.cpp +++ b/tdeio/tdeio/pastedialog.cpp @@ -53,17 +53,17 @@ TDEIO::PasteDialog::PasteDialog( const TQString &caption, const TQString &label, layout->addStretch(); - //connect( m_lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - // TQT_SLOT( slotEditTextChanged( const TQString & ) ) ); - //connect( this, TQT_SIGNAL( user1Clicked() ), m_lineEdit, TQT_SLOT( clear() ) ); + //connect( m_lineEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + // TQ_SLOT( slotEditTextChanged( const TQString & ) ) ); + //connect( this, TQ_SIGNAL( user1Clicked() ), m_lineEdit, TQ_SLOT( clear() ) ); //slotEditTextChanged( value ); setMinimumWidth( 350 ); m_clipboardChanged = false; if ( clipboard ) - connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), - this, TQT_SLOT( slotClipboardDataChanged() ) ); + connect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ), + this, TQ_SLOT( slotClipboardDataChanged() ) ); } void TDEIO::PasteDialog::slotClipboardDataChanged() diff --git a/tdeio/tdeio/pastedialog.h b/tdeio/tdeio/pastedialog.h index 2e7bdfda1..07b4dfce5 100644 --- a/tdeio/tdeio/pastedialog.h +++ b/tdeio/tdeio/pastedialog.h @@ -34,7 +34,7 @@ namespace TDEIO { */ class PasteDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: PasteDialog( const TQString &caption, const TQString &label, const TQString &value, const TQStringList& items, diff --git a/tdeio/tdeio/posixacladdons.cpp b/tdeio/tdeio/posixacladdons.cpp index 873f1a81e..c4d4ca555 100644 --- a/tdeio/tdeio/posixacladdons.cpp +++ b/tdeio/tdeio/posixacladdons.cpp @@ -21,7 +21,7 @@ #if defined(USE_POSIX_ACL) && !defined(HAVE_NON_POSIX_ACL_EXTENSIONS) -#include <kdemacros.h> +#include <tdemacros.h> #include <errno.h> #include <sys/stat.h> @@ -63,7 +63,7 @@ protected: } }; -KDE_EXPORT int acl_cmp(acl_t acl1, acl_t acl2) +TDE_EXPORT int acl_cmp(acl_t acl1, acl_t acl2) { if ( !acl1 || !acl2 ) return -1; @@ -129,7 +129,7 @@ KDE_EXPORT int acl_cmp(acl_t acl1, acl_t acl2) return 0; } -KDE_EXPORT acl_t acl_from_mode(mode_t mode) +TDE_EXPORT acl_t acl_from_mode(mode_t mode) { acl_t newACL = acl_init( 3 ); acl_entry_t entry; @@ -180,7 +180,7 @@ KDE_EXPORT acl_t acl_from_mode(mode_t mode) return newACL; } -KDE_EXPORT int acl_equiv_mode(acl_t acl, mode_t *mode_p) +TDE_EXPORT int acl_equiv_mode(acl_t acl, mode_t *mode_p) { acl_entry_t entry; acl_tag_t tag; diff --git a/tdeio/tdeio/posixacladdons.h b/tdeio/tdeio/posixacladdons.h index 45c4af245..720ae0f5d 100644 --- a/tdeio/tdeio/posixacladdons.h +++ b/tdeio/tdeio/posixacladdons.h @@ -28,13 +28,13 @@ #if defined(USE_POSIX_ACL) && !defined(HAVE_NON_POSIX_ACL_EXTENSIIONS) -#ifdef Q_OS_FREEBSD +#if defined Q_OS_FREEBSD || defined Q_OS_NETBSD #include <sys/types.h> #endif #include <sys/acl.h> -#ifdef Q_OS_FREEBSD +#if defined Q_OS_FREEBSD || defined Q_OS_NETBSD #define acl_get_perm acl_get_perm_np #endif diff --git a/tdeio/tdeio/previewjob.cpp b/tdeio/tdeio/previewjob.cpp index 5e3148619..b4e9396ef 100644 --- a/tdeio/tdeio/previewjob.cpp +++ b/tdeio/tdeio/previewjob.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- -// vim: ts=4 sw=4 et /* This file is part of the KDE libraries Copyright (C) 2000 David Faure <faure@kde.org> 2000 Carsten Pfeiffer <pfeiffer@kde.org> @@ -47,7 +45,7 @@ #include <ktrader.h> #include <kmdcodec.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeio/kservice.h> @@ -141,7 +139,7 @@ PreviewJob::PreviewJob( const KFileItemList &items, int width, int height, d->ignoreMaximumSize = false; // Return to event loop first, determineNextFile() might delete this; - connect(&d->startPreviewTimer, TQT_SIGNAL(timeout()), TQT_SLOT(startPreview()) ); + connect(&d->startPreviewTimer, TQ_SIGNAL(timeout()), TQ_SLOT(startPreview()) ); d->startPreviewTimer.start(0, true); } @@ -452,7 +450,7 @@ void PreviewJob::createThumbnail( TQString pixPath ) thumbURL.setPath(pixPath); TDEIO::TransferJob *job = TDEIO::get(thumbURL, false, false); addSubjob(job); - connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQT_SLOT(slotThumbData(TDEIO::Job *, const TQByteArray &))); + connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQ_SLOT(slotThumbData(TDEIO::Job *, const TQByteArray &))); bool save = d->bSave && d->currentItem.plugin->property("CacheThumbnail").toBool(); job->addMetaData("mimeType", d->currentItem.item->mimetype()); job->addMetaData("width", TQString().setNum(save ? d->cacheWidth : d->width)); diff --git a/tdeio/tdeio/previewjob.h b/tdeio/tdeio/previewjob.h index e203b807e..b4cecf412 100644 --- a/tdeio/tdeio/previewjob.h +++ b/tdeio/tdeio/previewjob.h @@ -1,5 +1,3 @@ -// -*- c++ -*- -// vim: ts=4 sw=4 et /* This file is part of the KDE libraries Copyright (C) 2000 David Faure <faure@kde.org> 2000 Carsten Pfeiffer <pfeiffer@kde.org> @@ -36,7 +34,7 @@ namespace TDEIO { */ class TDEIO_EXPORT PreviewJob : public TDEIO::Job { - Q_OBJECT + TQ_OBJECT public: /** * Creates a new PreviewJob. diff --git a/tdeio/tdeio/progressbase.cpp b/tdeio/tdeio/progressbase.cpp index 146f4182e..608213c6a 100644 --- a/tdeio/tdeio/progressbase.cpp +++ b/tdeio/tdeio/progressbase.cpp @@ -37,14 +37,14 @@ ProgressBase::ProgressBase( TQWidget *parent ) void ProgressBase::setJob( TDEIO::Job *job ) { // first connect all slots - connect( job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQ_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); - connect( job, TQT_SIGNAL( canceled( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( canceled( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); // then assign job m_pJob = job; @@ -54,37 +54,37 @@ void ProgressBase::setJob( TDEIO::Job *job ) void ProgressBase::setJob( TDEIO::CopyJob *job ) { // first connect all slots - connect( job, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), - TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( job, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), - TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( job, TQT_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( copying( TDEIO::Job*, const KURL& , const KURL& ) ), - TQT_SLOT( slotCopying( TDEIO::Job*, const KURL&, const KURL& ) ) ); - connect( job, TQT_SIGNAL( moving( TDEIO::Job*, const KURL& , const KURL& ) ), - TQT_SLOT( slotMoving( TDEIO::Job*, const KURL&, const KURL& ) ) ); - connect( job, TQT_SIGNAL( creatingDir( TDEIO::Job*, const KURL& ) ), - TQT_SLOT( slotCreatingDir( TDEIO::Job*, const KURL& ) ) ); - - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); - - connect( job, TQT_SIGNAL( canceled( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), + TQ_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( job, TQ_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQ_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQ_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), + TQ_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( job, TQ_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQ_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQ_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQ_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQ_SIGNAL( copying( TDEIO::Job*, const KURL& , const KURL& ) ), + TQ_SLOT( slotCopying( TDEIO::Job*, const KURL&, const KURL& ) ) ); + connect( job, TQ_SIGNAL( moving( TDEIO::Job*, const KURL& , const KURL& ) ), + TQ_SLOT( slotMoving( TDEIO::Job*, const KURL&, const KURL& ) ) ); + connect( job, TQ_SIGNAL( creatingDir( TDEIO::Job*, const KURL& ) ), + TQ_SLOT( slotCreatingDir( TDEIO::Job*, const KURL& ) ) ); + + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); + + connect( job, TQ_SIGNAL( canceled( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); // then assign job m_pJob = job; @@ -94,33 +94,33 @@ void ProgressBase::setJob( TDEIO::CopyJob *job ) void ProgressBase::setJob( TDEIO::DeleteJob *job ) { // first connect all slots - connect( job, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), - TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( job, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), - TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( job, TQT_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( deleting( TDEIO::Job*, const KURL& ) ), - TQT_SLOT( slotDeleting( TDEIO::Job*, const KURL& ) ) ); - - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); - - connect( job, TQT_SIGNAL( canceled( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), + TQ_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( job, TQ_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQ_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQ_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), + TQ_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( job, TQ_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQ_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQ_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQ_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQ_SIGNAL( deleting( TDEIO::Job*, const KURL& ) ), + TQ_SLOT( slotDeleting( TDEIO::Job*, const KURL& ) ) ); + + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); + + connect( job, TQ_SIGNAL( canceled( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); // then assign job m_pJob = job; diff --git a/tdeio/tdeio/progressbase.h b/tdeio/tdeio/progressbase.h index 655edeee5..9dcad7c13 100644 --- a/tdeio/tdeio/progressbase.h +++ b/tdeio/tdeio/progressbase.h @@ -69,7 +69,7 @@ namespace TDEIO */ class TDEIO_EXPORT ProgressBase : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeio/tdeio/renamedlg.cpp b/tdeio/tdeio/renamedlg.cpp index 41d8851d9..4b5aee5ab 100644 --- a/tdeio/tdeio/renamedlg.cpp +++ b/tdeio/tdeio/renamedlg.cpp @@ -48,7 +48,7 @@ #include <kguiitem.h> #include <ksqueezedtextlabel.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <twin.h> #endif @@ -99,7 +99,7 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, // Set "StaysOnTop", because this dialog is typically used in tdeio_uiserver, // i.e. in a separate process. // ####### This isn't the case anymore - remove? -#if !defined(Q_WS_QWS) && !defined(Q_WS_WIN) //FIXME(E): Implement for QT Embedded & win32 +#if !defined(TQ_WS_QWS) && !defined(TQ_WS_WIN) //FIXME(E): Implement for QT Embedded & win32 if (d->modal) KWin::setState( winId(), NET::StaysOnTop ); #endif @@ -113,42 +113,42 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, setCaption( _caption ); d->bCancel = new KPushButton( KStdGuiItem::cancel(), this ); - connect(d->bCancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(b0Pressed())); + connect(d->bCancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(b0Pressed())); if ( ! (_mode & M_NORENAME ) ) { d->bRename = new TQPushButton( i18n( "&Rename" ), this ); d->bRename->setEnabled(false); d->bSuggestNewName = new TQPushButton( i18n( "Suggest New &Name" ), this ); - connect(d->bSuggestNewName, TQT_SIGNAL(clicked()), this, TQT_SLOT(b8Pressed())); - connect(d->bRename, TQT_SIGNAL(clicked()), this, TQT_SLOT(b1Pressed())); + connect(d->bSuggestNewName, TQ_SIGNAL(clicked()), this, TQ_SLOT(b8Pressed())); + connect(d->bRename, TQ_SIGNAL(clicked()), this, TQ_SLOT(b1Pressed())); } if ( ( _mode & M_MULTI ) && ( _mode & M_SKIP ) ) { d->bSkip = new TQPushButton( i18n( "&Skip" ), this ); - connect(d->bSkip, TQT_SIGNAL(clicked()), this, TQT_SLOT(b2Pressed())); + connect(d->bSkip, TQ_SIGNAL(clicked()), this, TQ_SLOT(b2Pressed())); d->bAutoSkip = new TQPushButton( i18n( "&Auto Skip" ), this ); - connect(d->bAutoSkip, TQT_SIGNAL(clicked()), this, TQT_SLOT(b3Pressed())); + connect(d->bAutoSkip, TQ_SIGNAL(clicked()), this, TQ_SLOT(b3Pressed())); } if ( _mode & M_OVERWRITE ) { d->bOverwrite = new TQPushButton( i18n( "&Overwrite" ), this ); - connect(d->bOverwrite, TQT_SIGNAL(clicked()), this, TQT_SLOT(b4Pressed())); + connect(d->bOverwrite, TQ_SIGNAL(clicked()), this, TQ_SLOT(b4Pressed())); if ( _mode & M_MULTI ) { d->bOverwriteAll = new TQPushButton( i18n( "O&verwrite All" ), this ); - connect(d->bOverwriteAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(b5Pressed())); + connect(d->bOverwriteAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(b5Pressed())); } } if ( _mode & M_RESUME ) { d->bResume = new TQPushButton( i18n( "&Resume" ), this ); - connect(d->bResume, TQT_SIGNAL(clicked()), this, TQT_SLOT(b6Pressed())); + connect(d->bResume, TQ_SIGNAL(clicked()), this, TQ_SLOT(b6Pressed())); if ( _mode & M_MULTI ) { d->bResumeAll = new TQPushButton( i18n( "R&esume All" ), this ); - connect(d->bResumeAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(b7Pressed())); + connect(d->bResumeAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(b7Pressed())); } } @@ -194,12 +194,12 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, lib->unload(); continue; } - TQObject *obj = factory->create( TQT_TQOBJECT(this), (*it)->name().latin1() ); + TQObject *obj = factory->create( this, (*it)->name().latin1() ); if(!obj) { lib->unload(); continue; } - RenameDlgPlugin *plugin = static_cast<RenameDlgPlugin *>(TQT_TQWIDGET(obj)); + RenameDlgPlugin *plugin = static_cast<RenameDlgPlugin *>(static_cast<TQWidget*>(obj)); if(!plugin ){ delete obj; continue; @@ -223,7 +223,7 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, // No plugin found, build default dialog TQGridLayout * gridLayout = new TQGridLayout( 0L, 9, 2, KDialog::marginHint(), KDialog::spacingHint() ); - pLayout->addLayout(TQT_TQLAYOUT(gridLayout)); + pLayout->addLayout(gridLayout); gridLayout->setColStretch(0,0); gridLayout->setColStretch(1,10); @@ -325,8 +325,8 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, TQString fileName = d->dest.fileName(); d->m_pLineEdit->setText( TDEIO::decodeFileName( fileName ) ); if ( d->bRename || d->bOverwrite ) - connect(d->m_pLineEdit, TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(enableRenameButton(const TQString &))); + connect(d->m_pLineEdit, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(enableRenameButton(const TQString &))); if ( d->bSuggestNewName ) { layout2->addWidget( d->bSuggestNewName ); @@ -557,7 +557,7 @@ RenameDlg_Result TDEIO::open_RenameDlg( const TQString & _caption, time_t mtimeSrc, time_t mtimeDest) { - Q_ASSERT(kapp); + Q_ASSERT(tdeApp); RenameDlg dlg( 0L, _caption, _src, _dest, _mode, sizeSrc, sizeDest, ctimeSrc, ctimeDest, mtimeSrc, mtimeDest, diff --git a/tdeio/tdeio/renamedlg.h b/tdeio/tdeio/renamedlg.h index 2183d05b6..2550f63f6 100644 --- a/tdeio/tdeio/renamedlg.h +++ b/tdeio/tdeio/renamedlg.h @@ -47,7 +47,7 @@ enum RenameDlg_Result { R_RESUME = 6, R_RESUME_ALL = 7, R_OVERWRITE = 4, R_OVERW */ class TDEIO_EXPORT RenameDlg : public TQDialog { - Q_OBJECT + TQ_OBJECT public: /** * Construct a "rename" dialog. diff --git a/tdeio/tdeio/scheduler.cpp b/tdeio/tdeio/scheduler.cpp index 3935a91cf..95b5a778c 100644 --- a/tdeio/tdeio/scheduler.cpp +++ b/tdeio/tdeio/scheduler.cpp @@ -125,7 +125,7 @@ TDEIO::Scheduler::ProtocolInfoDict::get(const TQString &protocol) Scheduler::Scheduler() : DCOPObject( "TDEIO::Scheduler" ), - TQObject(kapp, "scheduler"), + TQObject(tdeApp, "scheduler"), slaveTimer(0, "Scheduler::slaveTimer"), coSlaveTimer(0, "Scheduler::coSlaveTimer"), cleanupTimer(0, "Scheduler::cleanupTimer") @@ -139,9 +139,9 @@ Scheduler::Scheduler() extraJobData = new ExtraJobData; sessionData = new SessionData; slaveConfig = SlaveConfig::self(); - connect(&slaveTimer, TQT_SIGNAL(timeout()), TQT_SLOT(startStep())); - connect(&coSlaveTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotScheduleCoSlave())); - connect(&cleanupTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotCleanIdleSlaves())); + connect(&slaveTimer, TQ_SIGNAL(timeout()), TQ_SLOT(startStep())); + connect(&coSlaveTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotScheduleCoSlave())); + connect(&cleanupTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotCleanIdleSlaves())); busy = false; } @@ -541,15 +541,15 @@ Slave *Scheduler::createSlave(ProtocolInfo *protInfo, SimpleJob *job, const KURL { slaveList->append(slave); idleSlaves->append(slave); - connect(slave, TQT_SIGNAL(slaveDied(TDEIO::Slave *)), - TQT_SLOT(slotSlaveDied(TDEIO::Slave *))); - connect(slave, TQT_SIGNAL(slaveStatus(pid_t,const TQCString &,const TQString &, bool)), - TQT_SLOT(slotSlaveStatus(pid_t,const TQCString &, const TQString &, bool))); - - connect(slave,TQT_SIGNAL(authorizationKey(const TQCString&, const TQCString&, bool)), - sessionData,TQT_SLOT(slotAuthData(const TQCString&, const TQCString&, bool))); - connect(slave,TQT_SIGNAL(delAuthorization(const TQCString&)), sessionData, - TQT_SLOT(slotDelAuthData(const TQCString&))); + connect(slave, TQ_SIGNAL(slaveDied(TDEIO::Slave *)), + TQ_SLOT(slotSlaveDied(TDEIO::Slave *))); + connect(slave, TQ_SIGNAL(slaveStatus(pid_t,const TQCString &,const TQString &, bool)), + TQ_SLOT(slotSlaveStatus(pid_t,const TQCString &, const TQString &, bool))); + + connect(slave,TQ_SIGNAL(authorizationKey(const TQCString&, const TQCString&, bool)), + sessionData,TQ_SLOT(slotAuthData(const TQCString&, const TQCString&, bool))); + connect(slave,TQ_SIGNAL(delAuthorization(const TQCString&)), sessionData, + TQ_SLOT(slotDelAuthData(const TQCString&))); } else { @@ -713,10 +713,10 @@ Scheduler::_getConnectedSlave(const KURL &url, const TDEIO::MetaData &config ) setupSlave(slave, url, protocol, proxy, true, &config); slave->send( CMD_CONNECT ); - connect(slave, TQT_SIGNAL(connected()), - TQT_SLOT(slotSlaveConnected())); - connect(slave, TQT_SIGNAL(error(int, const TQString &)), - TQT_SLOT(slotSlaveError(int, const TQString &))); + connect(slave, TQ_SIGNAL(connected()), + TQ_SLOT(slotSlaveConnected())); + connect(slave, TQ_SIGNAL(error(int, const TQString &)), + TQ_SLOT(slotSlaveError(int, const TQString &))); coSlaves.insert(slave, new TQPtrList<SimpleJob>()); // kdDebug(7006) << "_getConnectedSlave( " << slave << ")" << endl; @@ -772,8 +772,8 @@ Scheduler::slotSlaveConnected() Slave *slave = (Slave *)sender(); // kdDebug(7006) << "slotSlaveConnected( " << slave << ")" << endl; slave->setConnected(true); - disconnect(slave, TQT_SIGNAL(connected()), - this, TQT_SLOT(slotSlaveConnected())); + disconnect(slave, TQ_SIGNAL(connected()), + this, TQ_SLOT(slotSlaveConnected())); emit slaveConnected(slave); assert(!coIdleSlaves->contains(slave)); coIdleSlaves->append(slave); @@ -796,6 +796,18 @@ Scheduler::_assignJobToSlave(TDEIO::Slave *slave, SimpleJob *job) { // kdDebug(7006) << "_assignJobToSlave( " << job << ", " << slave << ")" << endl; TQString dummy; + if (!job) + { + kdDebug(7006) << "_assignJobToSlave(): ERROR, non-existing job." << endl; + return false; + } + if (!slave) + { + kdDebug(7006) << "_assignJobToSlave(): ERROR, non-existing slave." << endl; + job->kill(); + return false; + } + if ((slave->slaveProtocol() != KProtocolManager::slaveProtocol( job->url(), dummy )) || (!newJobs.removeRef(job))) @@ -838,10 +850,10 @@ Scheduler::_disconnectSlave(TDEIO::Slave *slave) delete list; coIdleSlaves->removeRef(slave); assert(!coIdleSlaves->contains(slave)); - disconnect(slave, TQT_SIGNAL(connected()), - this, TQT_SLOT(slotSlaveConnected())); - disconnect(slave, TQT_SIGNAL(error(int, const TQString &)), - this, TQT_SLOT(slotSlaveError(int, const TQString &))); + disconnect(slave, TQ_SIGNAL(connected()), + this, TQ_SLOT(slotSlaveConnected())); + disconnect(slave, TQ_SIGNAL(error(int, const TQString &)), + this, TQ_SLOT(slotSlaveError(int, const TQString &))); if (slave->isAlive()) { idleSlaves->append(slave); @@ -865,7 +877,7 @@ Scheduler::_registerWindow(TQWidget *wid) if (!wid) return; - TQObject *obj = TQT_TQOBJECT(wid); + TQObject *obj = wid; if (!m_windowList.contains(obj)) { // We must store the window Id because by the time @@ -873,12 +885,12 @@ Scheduler::_registerWindow(TQWidget *wid) // access TQWidget::winId() (already destructed) WId windowId = wid->winId(); m_windowList.insert(obj, windowId); - connect(TQT_TQOBJECT(wid), TQT_SIGNAL(destroyed(TQObject *)), - this, TQT_SLOT(slotUnregisterWindow(TQObject*))); + connect(wid, TQ_SIGNAL(destroyed(TQObject *)), + this, TQ_SLOT(slotUnregisterWindow(TQObject*))); TQByteArray params; TQDataStream stream(params, IO_WriteOnly); stream << windowId; - if( !kapp->dcopClient()->send( "kded", "kded", + if( !tdeApp->dcopClient()->send( "kded", "kded", "registerWindowId(long int)", params ) ) kdDebug(7006) << "Could not register window with kded!" << endl; } @@ -894,15 +906,15 @@ Scheduler::slotUnregisterWindow(TQObject *obj) if (it == m_windowList.end()) return; WId windowId = it.data(); - disconnect( it.key(), TQT_SIGNAL(destroyed(TQObject *)), - this, TQT_SLOT(slotUnregisterWindow(TQObject*))); + disconnect( it.key(), TQ_SIGNAL(destroyed(TQObject *)), + this, TQ_SLOT(slotUnregisterWindow(TQObject*))); m_windowList.remove( it ); - if (kapp) + if (tdeApp) { TQByteArray params; TQDataStream stream(params, IO_WriteOnly); stream << windowId; - kapp->dcopClient()->send( "kded", "kded", + tdeApp->dcopClient()->send( "kded", "kded", "unregisterWindowId(long int)", params ); } } diff --git a/tdeio/tdeio/scheduler.h b/tdeio/tdeio/scheduler.h index 28c030a25..f7f7bb1a7 100644 --- a/tdeio/tdeio/scheduler.h +++ b/tdeio/tdeio/scheduler.h @@ -1,4 +1,3 @@ -// -*- c++ -*- /* This file is part of the KDE libraries Copyright (C) 2000 Stephan Kulow <coolo@kde.org> Waldo Bastian <bastian@kde.org> @@ -109,7 +108,7 @@ namespace TDEIO { **/ class TDEIO_EXPORT Scheduler : public TQObject, virtual public DCOPObject { - Q_OBJECT + TQ_OBJECT public: typedef TQPtrList<SimpleJob> JobList; diff --git a/tdeio/tdeio/sessiondata.cpp b/tdeio/tdeio/sessiondata.cpp index 9c6b33b0a..d16137cad 100644 --- a/tdeio/tdeio/sessiondata.cpp +++ b/tdeio/tdeio/sessiondata.cpp @@ -28,7 +28,7 @@ #include <kcharsets.h> #include <dcopclient.h> #include <tdeprotocolmanager.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdesu/client.h> #include <tdeio/slaveconfig.h> diff --git a/tdeio/tdeio/sessiondata.h b/tdeio/tdeio/sessiondata.h index 4aee40497..48595c68e 100644 --- a/tdeio/tdeio/sessiondata.h +++ b/tdeio/tdeio/sessiondata.h @@ -34,7 +34,7 @@ class SlaveConfig; */ class TDEIO_EXPORT SessionData : public TQObject { - Q_OBJECT + TQ_OBJECT public: SessionData(); diff --git a/tdeio/tdeio/skipdlg.cpp b/tdeio/tdeio/skipdlg.cpp index 5871bbd09..f28e3b2c2 100644 --- a/tdeio/tdeio/skipdlg.cpp +++ b/tdeio/tdeio/skipdlg.cpp @@ -32,7 +32,7 @@ #include <kpushbutton.h> #include <kstdguiitem.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <twin.h> #endif @@ -46,7 +46,7 @@ SkipDlg::SkipDlg(TQWidget *parent, bool _multi, const TQString& _error_text, boo // Set "StaysOnTop", because this dialog is typically used in tdeio_uiserver, // i.e. in a separate process. -#ifdef Q_WS_X11 //FIXME(E): Implement for QT Embedded, mac & win32 +#ifdef TQ_WS_X11 //FIXME(E): Implement for QT Embedded, mac & win32 if (modal) KWin::setState( winId(), NET::StaysOnTop ); #endif @@ -56,15 +56,15 @@ SkipDlg::SkipDlg(TQWidget *parent, bool _multi, const TQString& _error_text, boo setCaption( i18n( "Information" ) ); b0 = new KPushButton( KStdGuiItem::cancel(), this ); - connect(b0, TQT_SIGNAL(clicked()), this, TQT_SLOT(b0Pressed())); + connect(b0, TQ_SIGNAL(clicked()), this, TQ_SLOT(b0Pressed())); if ( _multi ) { b1 = new TQPushButton( i18n( "Skip" ), this ); - connect(b1, TQT_SIGNAL(clicked()), this, TQT_SLOT(b1Pressed())); + connect(b1, TQ_SIGNAL(clicked()), this, TQ_SLOT(b1Pressed())); b2 = new TQPushButton( i18n( "Auto Skip" ), this ); - connect(b2, TQT_SIGNAL(clicked()), this, TQT_SLOT(b2Pressed())); + connect(b2, TQ_SIGNAL(clicked()), this, TQ_SLOT(b2Pressed())); } TQVBoxLayout *vlayout = new TQVBoxLayout( this, 10, 0 ); @@ -134,7 +134,7 @@ void SkipDlg::b2Pressed() SkipDlg_Result TDEIO::open_SkipDlg( bool _multi, const TQString& _error_text ) { - Q_ASSERT(kapp); + Q_ASSERT(tdeApp); SkipDlg dlg( 0L, _multi, _error_text, true ); return (SkipDlg_Result) dlg.exec(); diff --git a/tdeio/tdeio/skipdlg.h b/tdeio/tdeio/skipdlg.h index c07086463..a63eb062b 100644 --- a/tdeio/tdeio/skipdlg.h +++ b/tdeio/tdeio/skipdlg.h @@ -36,7 +36,7 @@ namespace TDEIO { */ class TDEIO_EXPORT SkipDlg : public KDialog { - Q_OBJECT + TQ_OBJECT public: SkipDlg( TQWidget *parent, bool _multi, const TQString& _error_text, bool _modal = false ); ~SkipDlg(); diff --git a/tdeio/tdeio/slave.cpp b/tdeio/tdeio/slave.cpp index b4a7c8f2a..0954d3932 100644 --- a/tdeio/tdeio/slave.cpp +++ b/tdeio/tdeio/slave.cpp @@ -37,11 +37,11 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tdetempfile.h> #include <ksock.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <klibloader.h> #include "tdeio/dataprotocol.h" @@ -89,12 +89,12 @@ namespace TDEIO { void Slave::accept(TDESocket *socket) { -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN slaveconn.init(socket); #endif delete serv; serv = 0; - slaveconn.connect(this, TQT_SLOT(gotInput())); + slaveconn.connect(this, TQ_SLOT(gotInput())); unlinkSocket(); } @@ -116,7 +116,7 @@ void Slave::timeout() kdDebug(7002) << "slave is slow... pid=" << m_pid << " t=" << delta_t << endl; if (delta_t < SLAVE_CONNECTION_TIMEOUT_MAX) { - TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, this, TQT_SLOT(timeout())); + TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, this, TQ_SLOT(timeout())); return; } } @@ -151,9 +151,9 @@ Slave::Slave(TDEServerSocket *socket, const TQString &protocol, const TQString & idle_since = contact_started; m_pid = 0; m_port = 0; -#ifndef Q_WS_WIN - connect(serv, TQT_SIGNAL(accepted( TDESocket* )), - TQT_SLOT(accept(TDESocket*) ) ); +#ifndef TQ_WS_WIN + connect(serv, TQ_SIGNAL(accepted( TDESocket* )), + TQ_SLOT(accept(TDESocket*) ) ); #endif } @@ -173,9 +173,9 @@ Slave::Slave(bool /*derived*/, TDEServerSocket *socket, const TQString &protocol m_pid = 0; m_port = 0; if (serv != 0) { -#ifndef Q_WS_WIN - connect(serv, TQT_SIGNAL(accepted( TDESocket* )), - TQT_SLOT(accept(TDESocket*) ) ); +#ifndef TQ_WS_WIN + connect(serv, TQ_SIGNAL(accepted( TDESocket* )), + TQ_SLOT(accept(TDESocket*) ) ); #endif } } @@ -235,7 +235,7 @@ void Slave::hold(const KURL &url) deref(); // Call TDELauncher::waitForSlave(pid); { - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); if (!client->isAttached()) client->attach(); @@ -359,7 +359,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error if (protocol == "data") return new DataProtocol(); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); if (!client->isAttached()) client->attach(); @@ -376,7 +376,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error socketfile.close(); #endif -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN TDEServerSocket *kss = new TDEServerSocket(TQFile::encodeName(socketfile.name()).data()); Slave *slave = new Slave(kss, protocol, socketfile.name()); @@ -418,9 +418,9 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error proc.start(TDEProcess::DontCare); -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN slave->setPID(proc.pid()); - TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQT_SLOT(timeout())); + TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQ_SLOT(timeout())); #endif return slave; } @@ -450,9 +450,9 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error delete slave; return 0; } -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN slave->setPID(pid); - TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQT_SLOT(timeout())); + TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQ_SLOT(timeout())); #endif return slave; } @@ -464,7 +464,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url ) if (protocol == "data") return 0; - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); if (!client->isAttached()) client->attach(); @@ -478,7 +478,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url ) socketfile.unlink(); #endif -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN TDEServerSocket *kss = new TDEServerSocket(TQFile::encodeName(socketfile.name()).data()); Slave *slave = new Slave(kss, protocol, socketfile.name()); @@ -505,9 +505,9 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url ) delete slave; return 0; } -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN slave->setPID(pid); - TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQT_SLOT(timeout())); + TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQ_SLOT(timeout())); #endif return slave; } diff --git a/tdeio/tdeio/slave.h b/tdeio/tdeio/slave.h index 96e018e85..dafde7842 100644 --- a/tdeio/tdeio/slave.h +++ b/tdeio/tdeio/slave.h @@ -1,4 +1,3 @@ -// -*- c++ -*- /* * This file is part of the KDE libraries * Copyright (c) 2000 Waldo Bastian <bastian@kde.org> @@ -43,7 +42,7 @@ namespace TDEIO { */ class TDEIO_EXPORT Slave : public TDEIO::SlaveInterface { - Q_OBJECT + TQ_OBJECT protected: @@ -205,7 +204,7 @@ namespace TDEIO { * within TDEIO::Slave instead. Old code directly accessing connection() * will not be able to access special protocols. */ - KDE_DEPRECATED Connection *connection() { return &slaveconn; } // TODO(BIC): remove before KDE 4 + TDE_DEPRECATED Connection *connection() { return &slaveconn; } // TODO(BIC): remove before KDE 4 void ref() { m_refCount++; } void deref() { m_refCount--; if (!m_refCount) delete this; } diff --git a/tdeio/tdeio/slavebase.cpp b/tdeio/tdeio/slavebase.cpp index aa98c41d3..b9e9a04a6 100644 --- a/tdeio/tdeio/slavebase.cpp +++ b/tdeio/tdeio/slavebase.cpp @@ -46,7 +46,7 @@ #include <tdeapplication.h> #include <ksock.h> -#include <kcrash.h> +#include <tdecrash.h> #include <tdesu/client.h> #include <tdelocale.h> #include <ksocks.h> diff --git a/tdeio/tdeio/slaveconfig.cpp b/tdeio/tdeio/slaveconfig.cpp index af1b7b793..4aaacbe79 100644 --- a/tdeio/tdeio/slaveconfig.cpp +++ b/tdeio/tdeio/slaveconfig.cpp @@ -1,4 +1,3 @@ -// -*- c++ -*- /* * This file is part of the KDE libraries * Copyright (c) 2001 Waldo Bastian <bastian@kde.org> diff --git a/tdeio/tdeio/slaveconfig.h b/tdeio/tdeio/slaveconfig.h index fd6fa1e1e..9f8562649 100644 --- a/tdeio/tdeio/slaveconfig.h +++ b/tdeio/tdeio/slaveconfig.h @@ -1,4 +1,3 @@ -// -*- c++ -*- /* * This file is part of the KDE libraries * Copyright (c) 2001 Waldo Bastian <bastian@kde.org> @@ -46,7 +45,7 @@ namespace TDEIO { */ class TDEIO_EXPORT SlaveConfig : public TQObject { - Q_OBJECT + TQ_OBJECT public: static SlaveConfig *self(); ~SlaveConfig(); diff --git a/tdeio/tdeio/slaveinterface.cpp b/tdeio/tdeio/slaveinterface.cpp index 47f935cda..e2a681581 100644 --- a/tdeio/tdeio/slaveinterface.cpp +++ b/tdeio/tdeio/slaveinterface.cpp @@ -135,7 +135,7 @@ SlaveInterface::SlaveInterface( Connection * connection ) m_progressId = 0; d = new SlaveInterfacePrivate; - connect(&d->speed_timer, TQT_SIGNAL(timeout()), TQT_SLOT(calcSpeed())); + connect(&d->speed_timer, TQ_SIGNAL(timeout()), TQ_SLOT(calcSpeed())); } SlaveInterface::~SlaveInterface() @@ -511,7 +511,7 @@ void SlaveInterface::messageBox( int type, const TQString &text, const TQString TQString caption( _caption ); if ( type == TDEIO::SlaveBase::SSLMessageBox ) - caption = TQString::fromUtf8(kapp->dcopClient()->appId()); // hack, see observer.cpp + caption = TQString::fromUtf8(tdeApp->dcopClient()->appId()); // hack, see observer.cpp emit needProgressId(); kdDebug(7007) << "SlaveInterface::messageBox m_progressId=" << m_progressId << endl; diff --git a/tdeio/tdeio/slaveinterface.h b/tdeio/tdeio/slaveinterface.h index 584a4f606..aca56f09b 100644 --- a/tdeio/tdeio/slaveinterface.h +++ b/tdeio/tdeio/slaveinterface.h @@ -92,7 +92,7 @@ class SlaveInterfacePrivate; */ class TDEIO_EXPORT SlaveInterface : public TQObject { - Q_OBJECT + TQ_OBJECT public: SlaveInterface( Connection *connection ); @@ -210,12 +210,12 @@ protected: */ void openPassDlg( const TQString& prompt, const TQString& user, const TQString& caption, const TQString& comment, - const TQString& label, bool readOnly ) KDE_DEPRECATED; + const TQString& label, bool readOnly ) TDE_DEPRECATED; /** * @deprecated. Use openPassDlg( AuthInfo& ) instead. */ - void openPassDlg( const TQString& prompt, const TQString& user, bool readOnly ) KDE_DEPRECATED; + void openPassDlg( const TQString& prompt, const TQString& user, bool readOnly ) TDE_DEPRECATED; void messageBox( int type, const TQString &text, const TQString &caption, const TQString &buttonYes, const TQString &buttonNo ); diff --git a/tdeio/tdeio/statusbarprogress.cpp b/tdeio/tdeio/statusbarprogress.cpp index d7ef698c4..270c997d3 100644 --- a/tdeio/tdeio/statusbarprogress.cpp +++ b/tdeio/tdeio/statusbarprogress.cpp @@ -49,7 +49,7 @@ StatusbarProgress::StatusbarProgress( TQWidget* parent, bool button ) box->addWidget( m_pButton ); stack = new TQWidgetStack( this ); box->addWidget( stack ); - connect( m_pButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotStop() ) ); + connect( m_pButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotStop() ) ); m_pProgressBar = new KProgress( this ); m_pProgressBar->setFrameStyle( TQFrame::Box | TQFrame::Raised ); @@ -144,7 +144,7 @@ bool StatusbarProgress::eventFilter( TQObject *, TQEvent *ev ) { if ( ev->type() == TQEvent::MouseButtonPress ) { TQMouseEvent *e = (TQMouseEvent*)ev; - if ( e->button() == Qt::LeftButton ) { // toggle view on left mouse button + if ( e->button() == TQt::LeftButton ) { // toggle view on left mouse button if ( mode == Label ) { mode = Progress; } else if ( mode == Progress ) { diff --git a/tdeio/tdeio/statusbarprogress.h b/tdeio/tdeio/statusbarprogress.h index d1d591fbe..ff235e9ab 100644 --- a/tdeio/tdeio/statusbarprogress.h +++ b/tdeio/tdeio/statusbarprogress.h @@ -59,7 +59,7 @@ class Job; */ class TDEIO_EXPORT StatusbarProgress : public ProgressBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeio/tdeio/tcpslavebase.cpp b/tdeio/tdeio/tcpslavebase.cpp index 0237c9fd5..d75e8804f 100644 --- a/tdeio/tdeio/tcpslavebase.cpp +++ b/tdeio/tdeio/tcpslavebase.cpp @@ -44,7 +44,7 @@ #include <ksslall.h> #include <ksslcertdlg.h> #include <tdemessagebox.h> -#ifndef Q_WS_WIN //temporary +#ifndef TQ_WS_WIN //temporary #include <kresolver.h> #endif @@ -762,7 +762,7 @@ int TCPSlaveBase::verifyCertificate() _IPmatchesCN = d->kssl->peerInfo().certMatchesAddress(); if (!_IPmatchesCN) { -#ifndef Q_WS_WIN //temporary +#ifndef TQ_WS_WIN //temporary KNetwork::KResolverResults res = KNetwork::KResolver::resolve(d->kssl->peerInfo().peerHost(), "80", KNetwork::KResolver::CanonName); if (!res.isEmpty()) { TQString old = d->kssl->peerInfo().peerHost(); diff --git a/tdeio/tdeio/tcpslavebase.h b/tdeio/tdeio/tcpslavebase.h index 4903dd7ac..a0a8620fc 100644 --- a/tdeio/tdeio/tcpslavebase.h +++ b/tdeio/tdeio/tcpslavebase.h @@ -60,48 +60,48 @@ protected: /** * @deprecated Due to inconsistency with KDE naming convention. */ - KDE_DEPRECATED ssize_t Write(const void *data, ssize_t len) { return write( data, len ); } + TDE_DEPRECATED ssize_t Write(const void *data, ssize_t len) { return write( data, len ); } /** * @deprecated Due to inconsistency with KDE naming convention. */ - KDE_DEPRECATED ssize_t Read(void *data, ssize_t len) { return read( data, len ); } + TDE_DEPRECATED ssize_t Read(void *data, ssize_t len) { return read( data, len ); } /** * @deprecated Due to inconsistency with KDE naming convention. */ - KDE_DEPRECATED ssize_t ReadLine(char *data, ssize_t len) { return readLine( data, len ); } + TDE_DEPRECATED ssize_t ReadLine(char *data, ssize_t len) { return readLine( data, len ); } /** * @deprecated Due to inconsistency with KDE naming convention. */ - KDE_DEPRECATED unsigned short int GetPort(unsigned short int p) { return port(p); } + TDE_DEPRECATED unsigned short int GetPort(unsigned short int p) { return port(p); } /** * @deprecated Due to inconsistency with KDE naming convention. */ - KDE_DEPRECATED bool ConnectToHost( const TQString &host, unsigned int port, + TDE_DEPRECATED bool ConnectToHost( const TQString &host, unsigned int port, bool sendError ) { return connectToHost( host, port, sendError ); } /** * @deprecated Due to inconsistency with KDE naming convention. */ - KDE_DEPRECATED void CloseDescriptor() { closeDescriptor(); } + TDE_DEPRECATED void CloseDescriptor() { closeDescriptor(); } /** * @deprecated Due to inconsistency with KDE naming convention. */ - KDE_DEPRECATED bool AtEOF() { return atEnd(); } + TDE_DEPRECATED bool AtEOF() { return atEnd(); } /** * @deprecated Due to inconsistency with KDE naming convention. */ - KDE_DEPRECATED bool InitializeSSL() { return initializeSSL(); } + TDE_DEPRECATED bool InitializeSSL() { return initializeSSL(); } /** * @deprecated Due to inconsistency with KDE naming convention. */ - KDE_DEPRECATED void CleanSSL() { cleanSSL(); } + TDE_DEPRECATED void CleanSSL() { cleanSSL(); } #endif /** diff --git a/tdeio/tdeio/tdefileitem.cpp b/tdeio/tdeio/tdefileitem.cpp index 7b4c7ccd3..aa4d1f873 100644 --- a/tdeio/tdeio/tdefileitem.cpp +++ b/tdeio/tdeio/tdefileitem.cpp @@ -172,7 +172,7 @@ void KFileItem::init( bool _determineMimeTypeOnDemand ) if ( KDE_stat( path.data(), &buf ) == 0 ) { mode = buf.st_mode; } - else { // link pointing to nowhere (see tdeio/file/file.cc) + else { // link pointing to nowhere (see tdeio/file/file.cpp) mode = (S_IFMT-1) | S_IRWXU | S_IRWXG | S_IRWXO; } } @@ -700,7 +700,7 @@ TQPixmap KFileItem::pixmap( int _size, int _state ) const if (p.isNull()) kdWarning() << "Pixmap not found for mimetype " << m_pMimeType->name() << endl; - if ( mime->name() == "application/x-executable" ) { + if ( mime->name() == "application/x-executable" || mime->name() == "application/x-pie-executable" ) { // At first glance it might seem to be a good idea to // look for .desktop files for this executable before resorting to the embedded icon // in the same fashion as the minicli, but on close examination this is NOT A GOOD IDEA. @@ -965,7 +965,7 @@ TQString KFileItem::getToolTipText(int maxcount) if(!timeStr.isEmpty()) tip += start + i18n("Modified:") + mid + timeStr + end; -#ifndef Q_WS_WIN //TODO: show win32-specific permissions +#ifndef TQ_WS_WIN //TODO: show win32-specific permissions TQString userStr = user(); TQString groupStr = group(); if(!userStr.isEmpty() || !groupStr.isEmpty()) diff --git a/tdeio/tdeio/tdefileitem.h b/tdeio/tdeio/tdefileitem.h index b0dd9b4b8..171b611e3 100644 --- a/tdeio/tdeio/tdefileitem.h +++ b/tdeio/tdeio/tdefileitem.h @@ -30,7 +30,7 @@ #include <kmimetype.h> #include <tdefilemetainfo.h> -#define TDEFILEITEM_HAS_ISWRITABLE // only used in libkonq/konq_iconviewwidget.cc, will be removed for 3.4 +#define TDEFILEITEM_HAS_ISWRITABLE // only used in libkonq/konq_iconviewwidget.cpp, will be removed for 3.4 /** * A KFileItem is a generic class to handle a file, local or remote. diff --git a/tdeio/tdeio/tdefilemetainfo.cpp b/tdeio/tdeio/tdefilemetainfo.cpp index c1389695d..d6be6e17c 100644 --- a/tdeio/tdeio/tdefilemetainfo.cpp +++ b/tdeio/tdeio/tdefilemetainfo.cpp @@ -951,7 +951,7 @@ KFilePlugin* KFileMetaInfoProvider::loadPlugin( const TQString& mimeType, const return 0; KFilePlugin* plugin = KParts::ComponentFactory::createInstanceFromService<KFilePlugin> - ( service, TQT_TQOBJECT(this), mimeType.local8Bit() ); + ( service, this, mimeType.local8Bit() ); if (!plugin) kdWarning(7033) << "error loading the plugin from " << service->desktopEntryPath() << endl; diff --git a/tdeio/tdeio/tdefilemetainfo.h b/tdeio/tdeio/tdefilemetainfo.h index 2266690e8..e0371c7dd 100644 --- a/tdeio/tdeio/tdefilemetainfo.h +++ b/tdeio/tdeio/tdefilemetainfo.h @@ -1393,7 +1393,7 @@ private: **/ class TDEIO_EXPORT KFilePlugin : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** @@ -1643,11 +1643,11 @@ private: * supported and which groups and items are provided for it, you can ask * the KFileMetainfoProvider for it. **/ -class TDEIO_EXPORT KFileMetaInfoProvider: private QObject +class TDEIO_EXPORT KFileMetaInfoProvider: private TQObject { friend class KFilePlugin; - Q_OBJECT + TQ_OBJECT public: virtual ~KFileMetaInfoProvider(); diff --git a/tdeio/tdeio/tdefileshare.cpp b/tdeio/tdeio/tdefileshare.cpp index dc3f8c05a..31533e6c7 100644 --- a/tdeio/tdeio/tdefileshare.cpp +++ b/tdeio/tdeio/tdefileshare.cpp @@ -21,18 +21,18 @@ #include <tqdir.h> #include <tqfile.h> #include <tqregexp.h> -#include <kprocess.h> -#include <kprocio.h> +#include <tdeprocess.h> +#include <tdeprocio.h> #include <tdelocale.h> #include <kstaticdeleter.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <kdirwatch.h> #include <stdio.h> #include <stdlib.h> #include <errno.h> #include <kdirnotify_stub.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kuser.h> KFileShare::Authorization KFileShare::s_authorization = NotInitialized; @@ -54,12 +54,12 @@ bool KFileShare::s_sharingEnabled; KFileSharePrivate::KFileSharePrivate() { KDirWatch::self()->addFile(FILESHARECONF); - connect(KDirWatch::self(), TQT_SIGNAL(dirty (const TQString&)),this, - TQT_SLOT(slotFileChange(const TQString &))); - connect(KDirWatch::self(), TQT_SIGNAL(created(const TQString&)),this, - TQT_SLOT(slotFileChange(const TQString &))); - connect(KDirWatch::self(), TQT_SIGNAL(deleted(const TQString&)),this, - TQT_SLOT(slotFileChange(const TQString &))); + connect(KDirWatch::self(), TQ_SIGNAL(dirty (const TQString&)),this, + TQ_SLOT(slotFileChange(const TQString &))); + connect(KDirWatch::self(), TQ_SIGNAL(created(const TQString&)),this, + TQ_SLOT(slotFileChange(const TQString &))); + connect(KDirWatch::self(), TQ_SIGNAL(deleted(const TQString&)),this, + TQ_SLOT(slotFileChange(const TQString &))); } KFileSharePrivate::~KFileSharePrivate() @@ -90,7 +90,7 @@ void KFileShare::readConfig() // static { // Create KFileSharePrivate instance KFileSharePrivate::self(); - KSimpleConfig config(TQString::fromLatin1(FILESHARECONF),true); + TDESimpleConfig config(TQString::fromLatin1(FILESHARECONF),true); s_sharingEnabled = config.readEntry("FILESHARING", "yes") == "yes"; s_restricted = config.readEntry("RESTRICT", "yes") == "yes"; @@ -179,7 +179,7 @@ void KFileShare::readShareList() s_authorization = ErrorNotFound; return; } - KProcIO proc; + TDEProcIO proc; proc << exe; if ( !proc.start( TDEProcess::Block ) ) { kdError() << "Can't run " << exe << endl; diff --git a/tdeio/tdeio/tdefileshare.h b/tdeio/tdeio/tdefileshare.h index b909a8e2f..7ef2b67a9 100644 --- a/tdeio/tdeio/tdefileshare.h +++ b/tdeio/tdeio/tdefileshare.h @@ -31,7 +31,7 @@ class KDirWatch; */ class KFileSharePrivate : public TQObject { - Q_OBJECT + TQ_OBJECT public: KFileSharePrivate(); diff --git a/tdeio/tdeio/tdeprotocolmanager.cpp b/tdeio/tdeio/tdeprotocolmanager.cpp index 6f64fe922..492b83401 100644 --- a/tdeio/tdeio/tdeprotocolmanager.cpp +++ b/tdeio/tdeio/tdeprotocolmanager.cpp @@ -26,7 +26,7 @@ #include <tdeglobal.h> #include <tdelocale.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <klibloader.h> #include <kstringhandler.h> #include <kstaticdeleter.h> diff --git a/tdeio/tdeio/yacc.c b/tdeio/tdeio/yacc.c index a4f618769..b845d5cb8 100644 --- a/tdeio/tdeio/yacc.c +++ b/tdeio/tdeio/yacc.c @@ -579,7 +579,9 @@ while (0) # define YYDPRINTF(Args) \ do { \ if (yydebug) \ + { \ YYFPRINTF Args; \ + } \ } while (0) # define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ diff --git a/tdeio/tdeioexec/README b/tdeio/tdeioexec/README index daaa38bdb..165db1f33 100644 --- a/tdeio/tdeioexec/README +++ b/tdeio/tdeioexec/README @@ -9,12 +9,12 @@ For this it does the following: (because the file was modified) then it offers re-uploading the modified version. This is how you offer network transparency to apps that don't have it. -BUT: with KUniqueApplication, this breaks, because the app returns at once, +BUT: with TDEUniqueApplication, this breaks, because the app returns at once, so we have no way to know when the user finished editing the file... Conclusion: if the application has network transparency built-in, it should put "%u" in its desktop file - and kfmexec isn't used -. If it doesn't, either -it's a TDEApplication and kfmexec does its job, or it's a KUniqueApplication +it's a TDEApplication and kfmexec does its job, or it's a TDEUniqueApplication and... kfmexec can't see modifications to the file. Be warned. From Waldo: "The program doesn't return _at once_. It returns diff --git a/tdeio/tdeioexec/main.cpp b/tdeio/tdeioexec/main.cpp index 54987e43c..d3515b9bc 100644 --- a/tdeio/tdeioexec/main.cpp +++ b/tdeio/tdeioexec/main.cpp @@ -27,13 +27,13 @@ #include <tqfile.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tdemessagebox.h> #include <tdeio/job.h> #include <krun.h> #include <tdeio/netaccess.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kservice.h> #include <tdelocale.h> #include <tdecmdlineargs.h> @@ -125,7 +125,7 @@ KIOExec::KIOExec() TDEIO::Job *job = TDEIO::file_copy( url, dest ); jobList->append( job ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } } } @@ -133,7 +133,7 @@ KIOExec::KIOExec() if ( tempfiles ) { // #113991 - TQTimer::singleShot( 0, this, TQT_SLOT( slotRunApp() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotRunApp() ) ); //slotRunApp(); // does not return return; } @@ -174,7 +174,7 @@ void KIOExec::slotResult( TDEIO::Job * job ) kdDebug() << "All files downloaded, will call slotRunApp shortly" << endl; // We know we can run the app now - but let's finish the job properly first. - TQTimer::singleShot( 0, this, TQT_SLOT( slotRunApp() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotRunApp() ) ); jobList->clear(); } @@ -204,10 +204,10 @@ void KIOExec::slotRunApp() kdDebug() << "EXEC " << KShell::joinArgs( params ) << endl; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 // propagate the startup indentification to the started process TDEStartupInfoId id; - id.initId( kapp->startupId()); + id.initId( tdeApp->startupId()); id.setupStartupEnv(); #endif @@ -215,7 +215,7 @@ void KIOExec::slotRunApp() proc << params; proc.start( TDEProcess::Block ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TDEStartupInfo::resetStartupEnv(); #endif @@ -265,7 +265,7 @@ void KIOExec::slotRunApp() } } - //kapp->quit(); not efficient enough + //tdeApp->quit(); not efficient enough exit(0); } diff --git a/tdeio/tdeioexec/main.h b/tdeio/tdeioexec/main.h index beb6a2297..863da887a 100644 --- a/tdeio/tdeioexec/main.h +++ b/tdeio/tdeioexec/main.h @@ -10,7 +10,7 @@ namespace TDEIO { class Job; } class KIOExec : public TQObject { - Q_OBJECT + TQ_OBJECT public: KIOExec(); diff --git a/tdeio/tests/CMakeLists.txt b/tdeio/tests/CMakeLists.txt index 323a7d86e..e9f5ea5ff 100644 --- a/tdeio/tests/CMakeLists.txt +++ b/tdeio/tests/CMakeLists.txt @@ -80,6 +80,7 @@ configure_file( kmimetypetest.sh.cmake kmimetypetest.sh @ONLY ) add_test( NAME "tdeio/kmimetypetest" COMMAND sh -x "${CMAKE_CURRENT_BINARY_DIR}/kmimetypetest.sh" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" ) +set_tests_properties( "tdeio/kmimetypetest" PROPERTIES TIMEOUT 30) # TODO add kdirwatchunittest diff --git a/tdeio/tests/dataprotocoltest.cpp b/tdeio/tests/dataprotocoltest.cpp index ed0a63ed9..45e4d1dda 100644 --- a/tdeio/tests/dataprotocoltest.cpp +++ b/tdeio/tests/dataprotocoltest.cpp @@ -247,7 +247,7 @@ const char * const url; #if 0 // == charset tests // -------------------- string -const QChar +const TQChar const TQChar * const charset_urls[] = { #endif diff --git a/tdeio/tests/dummymeta.h b/tdeio/tests/dummymeta.h index 4cefcc01d..20c9fec54 100644 --- a/tdeio/tests/dummymeta.h +++ b/tdeio/tests/dummymeta.h @@ -7,7 +7,7 @@ class KFileMetaInfo; class DummyMeta : public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: DummyMeta( TQObject *parent, const char *name, const TQStringList &args ); diff --git a/tdeio/tests/getalltest.cpp b/tdeio/tests/getalltest.cpp index 96d39c3c2..40a0ec934 100644 --- a/tdeio/tests/getalltest.cpp +++ b/tdeio/tests/getalltest.cpp @@ -7,7 +7,7 @@ int main(int argc, char *argv[]) { - TDEApplication k(argc,argv,"getalltest",false/*nostyle*/,false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption + TDEApplication k(argc,argv,"getalltest",false/*nostyle*/,false/*noGUI*/); // KMessageBox needs TDEApp for makeStdCaption //for (int i = 0 ; i < 2 ; ++i ) { // test twice to see if they got deleted kdDebug() << "All services" << endl; diff --git a/tdeio/tests/jobtest.cpp b/tdeio/tests/jobtest.cpp index 7df3ff3f0..8a17b2aec 100644 --- a/tdeio/tests/jobtest.cpp +++ b/tdeio/tests/jobtest.cpp @@ -160,7 +160,7 @@ static void createTestFile( const TQString& path ) TQFile f( path ); if ( !f.open( IO_WriteOnly ) ) kdFatal() << "Can't create " << path << endl; - f.tqwriteBlock( "Hello world", 11 ); + f.writeBlock( "Hello world", 11 ); f.close(); setTimeStamp( path ); } @@ -195,9 +195,9 @@ void JobTest::get() KURL u; u.setPath( filePath ); m_result = -1; TDEIO::StoredTransferJob* job = TDEIO::storedGet( u ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotGetResult( TDEIO::Job* ) ) ); - kapp->eventLoop()->enterLoop(); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotGetResult( TDEIO::Job* ) ) ); + tdeApp->eventLoop()->enterLoop(); assert( m_result == 0 ); // no error assert( m_data.size() == 11 ); assert( memcmp (m_data, "Hello world", m_data.size()) == 0 ); // m_data is not null-terminated @@ -207,7 +207,7 @@ void JobTest::slotGetResult( TDEIO::Job* job ) { m_result = job->error(); m_data = static_cast<TDEIO::StoredTransferJob *>(job)->data(); - kapp->eventLoop()->exitLoop(); + tdeApp->eventLoop()->exitLoop(); } //// @@ -498,8 +498,8 @@ void JobTest::listRecursive() KURL u; u.setPath( src ); TDEIO::ListJob* job = TDEIO::listRecursive( u ); - connect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), - TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + connect( job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); bool ok = TDEIO::NetAccess::synchronousRun( job, 0 ); assert( ok ); m_names.sort(); @@ -565,8 +565,8 @@ void JobTest::copyFileToSystem( bool resolve_local_urls ) // copy the file with file_copy TDEIO::FileCopyJob* job = TDEIO::file_copy( u, d ); - connect( job, TQT_SIGNAL(mimetype(TDEIO::Job*,const TQString&)), - this, TQT_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) ); + connect( job, TQ_SIGNAL(mimetype(TDEIO::Job*,const TQString&)), + this, TQ_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) ); bool ok = TDEIO::NetAccess::synchronousRun( job, 0 ); assert( ok ); diff --git a/tdeio/tests/jobtest.h b/tdeio/tests/jobtest.h index 5bff6d0e3..bcf1af5ac 100644 --- a/tdeio/tests/jobtest.h +++ b/tdeio/tests/jobtest.h @@ -26,7 +26,7 @@ class JobTest : public TQObject { - Q_OBJECT + TQ_OBJECT public: JobTest() {} diff --git a/tdeio/tests/kdcopcheck.cpp b/tdeio/tests/kdcopcheck.cpp index e99de7e79..0b5692f59 100644 --- a/tdeio/tests/kdcopcheck.cpp +++ b/tdeio/tests/kdcopcheck.cpp @@ -3,11 +3,11 @@ #include <kservice.h> #include <kmimetype.h> #include <assert.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kservicegroup.h> #include <kimageio.h> #include <kprotocolinfo.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqtimer.h> #include "kdcopcheck.h" @@ -40,14 +40,14 @@ TestService::TestService(const TQString &exec) proc.start(); - connect(kapp->dcopClient(), TQT_SIGNAL( applicationRegistered(const TQCString&)), - this, TQT_SLOT(newApp(const TQCString&))); - connect(kapp->dcopClient(), TQT_SIGNAL( applicationRemoved(const TQCString&)), - this, TQT_SLOT(endApp(const TQCString&))); - connect(&proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(appExit())); + connect(tdeApp->dcopClient(), TQ_SIGNAL( applicationRegistered(const TQCString&)), + this, TQ_SLOT(newApp(const TQCString&))); + connect(tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved(const TQCString&)), + this, TQ_SLOT(endApp(const TQCString&))); + connect(&proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(appExit())); - TQTimer::singleShot(20*1000, this, TQT_SLOT(stop())); + TQTimer::singleShot(20*1000, this, TQ_SLOT(stop())); result = KService::DCOP_None; } @@ -79,19 +79,19 @@ void TestService::appExit() void TestService::stop() { - kapp->exit_loop(); + tdeApp->exit_loop(); } int TestService::exec() { - kapp->enter_loop(); + tdeApp->enter_loop(); return result; } int main(int argc, char *argv[]) { setenv("IGNORE_SYCOCA_VERSION", "true", true); - TDEApplication k(argc,argv,"whatever",false/*nostyle*/,false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption + TDEApplication k(argc,argv,"whatever",false/*nostyle*/,false/*noGUI*/); // KMessageBox needs TDEApp for makeStdCaption k.dcopClient()->setNotifications(true); diff --git a/tdeio/tests/kdcopcheck.h b/tdeio/tests/kdcopcheck.h index 593dbba1e..a5ea1d979 100644 --- a/tdeio/tests/kdcopcheck.h +++ b/tdeio/tests/kdcopcheck.h @@ -1,13 +1,13 @@ #ifndef _BLA_H_ #define _BLA_H_ -#include <kprocess.h> +#include <tdeprocess.h> #include <tqstring.h> #include <tqobject.h> class TestService : public TQObject { - Q_OBJECT + TQ_OBJECT public: TestService(const TQString &exec); diff --git a/tdeio/tests/kdefaultprogresstest.cpp b/tdeio/tests/kdefaultprogresstest.cpp index b3f778772..fb4bc2bd3 100644 --- a/tdeio/tests/kdefaultprogresstest.cpp +++ b/tdeio/tests/kdefaultprogresstest.cpp @@ -29,7 +29,7 @@ int main(int argc, char **argv) { dlg->slotProcessedFiles( 0L, ++files ); } - kapp->processEvents(); + tdeApp->processEvents(); } dlg->slotInfoMessage( 0L, TQString::fromLatin1( "Done." ) ); diff --git a/tdeio/tests/kdirlistertest.cpp b/tdeio/tests/kdirlistertest.cpp index b1208f41d..54cefac87 100644 --- a/tdeio/tests/kdirlistertest.cpp +++ b/tdeio/tests/kdirlistertest.cpp @@ -49,48 +49,48 @@ KDirListerTest::KDirListerTest( TQWidget *parent, const char *name ) layout->addWidget( test ); resize( layout->sizeHint() ); - connect( startR, TQT_SIGNAL( clicked() ), TQT_SLOT( startRoot() ) ); - connect( startH, TQT_SIGNAL( clicked() ), TQT_SLOT( startHome() ) ); - connect( startT, TQT_SIGNAL( clicked() ), TQT_SLOT( startTar() ) ); - connect( test, TQT_SIGNAL( clicked() ), TQT_SLOT( test() ) ); - - connect( lister, TQT_SIGNAL( started( const KURL & ) ), - debug, TQT_SLOT( started( const KURL & ) ) ); - connect( lister, TQT_SIGNAL( completed() ), - debug, TQT_SLOT( completed() ) ); - connect( lister, TQT_SIGNAL( completed( const KURL & ) ), - debug, TQT_SLOT( completed( const KURL & ) ) ); - connect( lister, TQT_SIGNAL( canceled() ), - debug, TQT_SLOT( canceled() ) ); - connect( lister, TQT_SIGNAL( canceled( const KURL & ) ), - debug, TQT_SLOT( canceled( const KURL & ) ) ); - connect( lister, TQT_SIGNAL( redirection( const KURL & ) ), - debug, TQT_SLOT( redirection( const KURL & ) ) ); - connect( lister, TQT_SIGNAL( redirection( const KURL &, const KURL & ) ), - debug, TQT_SLOT( redirection( const KURL &, const KURL & ) ) ); - connect( lister, TQT_SIGNAL( clear() ), - debug, TQT_SLOT( clear() ) ); - connect( lister, TQT_SIGNAL( newItems( const KFileItemList & ) ), - debug, TQT_SLOT( newItems( const KFileItemList & ) ) ); - connect( lister, TQT_SIGNAL( itemsFilteredByMime( const KFileItemList & ) ), - debug, TQT_SLOT( itemsFilteredByMime( const KFileItemList & ) ) ); - connect( lister, TQT_SIGNAL( deleteItem( KFileItem * ) ), - debug, TQT_SLOT( deleteItem( KFileItem * ) ) ); - connect( lister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ), - debug, TQT_SLOT( refreshItems( const KFileItemList & ) ) ); - connect( lister, TQT_SIGNAL( infoMessage( const TQString& ) ), - debug, TQT_SLOT( infoMessage( const TQString& ) ) ); - connect( lister, TQT_SIGNAL( percent( int ) ), - debug, TQT_SLOT( percent( int ) ) ); - connect( lister, TQT_SIGNAL( totalSize( TDEIO::filesize_t ) ), - debug, TQT_SLOT( totalSize( TDEIO::filesize_t ) ) ); - connect( lister, TQT_SIGNAL( processedSize( TDEIO::filesize_t ) ), - debug, TQT_SLOT( processedSize( TDEIO::filesize_t ) ) ); - connect( lister, TQT_SIGNAL( speed( int ) ), - debug, TQT_SLOT( speed( int ) ) ); - - connect( lister, TQT_SIGNAL( completed() ), - this, TQT_SLOT( completed() ) ); + connect( startR, TQ_SIGNAL( clicked() ), TQ_SLOT( startRoot() ) ); + connect( startH, TQ_SIGNAL( clicked() ), TQ_SLOT( startHome() ) ); + connect( startT, TQ_SIGNAL( clicked() ), TQ_SLOT( startTar() ) ); + connect( test, TQ_SIGNAL( clicked() ), TQ_SLOT( test() ) ); + + connect( lister, TQ_SIGNAL( started( const KURL & ) ), + debug, TQ_SLOT( started( const KURL & ) ) ); + connect( lister, TQ_SIGNAL( completed() ), + debug, TQ_SLOT( completed() ) ); + connect( lister, TQ_SIGNAL( completed( const KURL & ) ), + debug, TQ_SLOT( completed( const KURL & ) ) ); + connect( lister, TQ_SIGNAL( canceled() ), + debug, TQ_SLOT( canceled() ) ); + connect( lister, TQ_SIGNAL( canceled( const KURL & ) ), + debug, TQ_SLOT( canceled( const KURL & ) ) ); + connect( lister, TQ_SIGNAL( redirection( const KURL & ) ), + debug, TQ_SLOT( redirection( const KURL & ) ) ); + connect( lister, TQ_SIGNAL( redirection( const KURL &, const KURL & ) ), + debug, TQ_SLOT( redirection( const KURL &, const KURL & ) ) ); + connect( lister, TQ_SIGNAL( clear() ), + debug, TQ_SLOT( clear() ) ); + connect( lister, TQ_SIGNAL( newItems( const KFileItemList & ) ), + debug, TQ_SLOT( newItems( const KFileItemList & ) ) ); + connect( lister, TQ_SIGNAL( itemsFilteredByMime( const KFileItemList & ) ), + debug, TQ_SLOT( itemsFilteredByMime( const KFileItemList & ) ) ); + connect( lister, TQ_SIGNAL( deleteItem( KFileItem * ) ), + debug, TQ_SLOT( deleteItem( KFileItem * ) ) ); + connect( lister, TQ_SIGNAL( refreshItems( const KFileItemList & ) ), + debug, TQ_SLOT( refreshItems( const KFileItemList & ) ) ); + connect( lister, TQ_SIGNAL( infoMessage( const TQString& ) ), + debug, TQ_SLOT( infoMessage( const TQString& ) ) ); + connect( lister, TQ_SIGNAL( percent( int ) ), + debug, TQ_SLOT( percent( int ) ) ); + connect( lister, TQ_SIGNAL( totalSize( TDEIO::filesize_t ) ), + debug, TQ_SLOT( totalSize( TDEIO::filesize_t ) ) ); + connect( lister, TQ_SIGNAL( processedSize( TDEIO::filesize_t ) ), + debug, TQ_SLOT( processedSize( TDEIO::filesize_t ) ) ); + connect( lister, TQ_SIGNAL( speed( int ) ), + debug, TQ_SLOT( speed( int ) ) ); + + connect( lister, TQ_SIGNAL( completed() ), + this, TQ_SLOT( completed() ) ); } KDirListerTest::~KDirListerTest() diff --git a/tdeio/tests/kdirlistertest.h b/tdeio/tests/kdirlistertest.h index 484121eef..550b5c1ce 100644 --- a/tdeio/tests/kdirlistertest.h +++ b/tdeio/tests/kdirlistertest.h @@ -33,7 +33,7 @@ using namespace std; class PrintSignals : public TQObject { - Q_OBJECT + TQ_OBJECT public: PrintSignals() : TQObject() { } @@ -100,7 +100,7 @@ public slots: class KDirListerTest : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KDirListerTest( TQWidget *parent=0, const char *name=0 ); ~KDirListerTest(); diff --git a/tdeio/tests/kdirwatchtest.cpp b/tdeio/tests/kdirwatchtest.cpp index 9f50c2170..eed240f2d 100644 --- a/tdeio/tests/kdirwatchtest.cpp +++ b/tdeio/tests/kdirwatchtest.cpp @@ -38,9 +38,9 @@ int main (int argc, char **argv) KDirWatch *dirwatch1 = KDirWatch::self(); KDirWatch *dirwatch2 = new KDirWatch; - testObject.connect(dirwatch1, TQT_SIGNAL( dirty( const TQString &)), TQT_SLOT( dirty( const TQString &)) ); - testObject.connect(dirwatch1, TQT_SIGNAL( created( const TQString &)), TQT_SLOT( created( const TQString &)) ); - testObject.connect(dirwatch1, TQT_SIGNAL( deleted( const TQString &)), TQT_SLOT( deleted( const TQString &)) ); + testObject.connect(dirwatch1, TQ_SIGNAL( dirty( const TQString &)), TQ_SLOT( dirty( const TQString &)) ); + testObject.connect(dirwatch1, TQ_SIGNAL( created( const TQString &)), TQ_SLOT( created( const TQString &)) ); + testObject.connect(dirwatch1, TQ_SIGNAL( deleted( const TQString &)), TQ_SLOT( deleted( const TQString &)) ); if (args->count() >0) { for(int i = 0; i < args->count(); i++) { diff --git a/tdeio/tests/kdirwatchtest.h b/tdeio/tests/kdirwatchtest.h index 493043c01..ee7974f6f 100644 --- a/tdeio/tests/kdirwatchtest.h +++ b/tdeio/tests/kdirwatchtest.h @@ -21,7 +21,7 @@ class myTest : public TQObject { - Q_OBJECT + TQ_OBJECT public: myTest() { }; public slots: diff --git a/tdeio/tests/kdirwatchunittest.cpp b/tdeio/tests/kdirwatchunittest.cpp index ed59f3c19..773ce476b 100644 --- a/tdeio/tests/kdirwatchunittest.cpp +++ b/tdeio/tests/kdirwatchunittest.cpp @@ -120,9 +120,9 @@ void KDirWatchTest::allTests() TQDir* dir = new TQDir(m_workingDir); VERIFY (dir != 0); - connect(d, TQT_SIGNAL (dirty( const TQString &)), TQT_SLOT( slotDirty( const TQString &)) ); - connect(d, TQT_SIGNAL (created( const TQString &)), TQT_SLOT( slotCreated( const TQString &)) ); - connect(d, TQT_SIGNAL (deleted( const TQString &)), TQT_SLOT( slotDeleted( const TQString &)) ); + connect(d, TQ_SIGNAL (dirty( const TQString &)), TQ_SLOT( slotDirty( const TQString &)) ); + connect(d, TQ_SIGNAL (created( const TQString &)), TQ_SLOT( slotCreated( const TQString &)) ); + connect(d, TQ_SIGNAL (deleted( const TQString &)), TQ_SLOT( slotDeleted( const TQString &)) ); VERIFY (dir->mkdir (m_workingDir)); diff --git a/tdeio/tests/kdirwatchunittest.h b/tdeio/tests/kdirwatchunittest.h index 416aeecfe..99c7f73c3 100644 --- a/tdeio/tests/kdirwatchunittest.h +++ b/tdeio/tests/kdirwatchunittest.h @@ -24,7 +24,7 @@ class KDirWatchTest : public KUnitTest::Tester { - Q_OBJECT + TQ_OBJECT public: enum { sigDirty, sigCreated, sigDeleted }; diff --git a/tdeio/tests/kfiltertest.cpp b/tdeio/tests/kfiltertest.cpp index f16b957ab..5e0fdfba4 100644 --- a/tdeio/tests/kfiltertest.cpp +++ b/tdeio/tests/kfiltertest.cpp @@ -23,7 +23,7 @@ #include <tqfile.h> #include <tqtextstream.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> void test_block( const TQString & fileName ) { @@ -35,7 +35,7 @@ void test_block( const TQString & fileName ) TQByteArray array(1024); int n; - while ( ( n = dev->tqreadBlock( array.data(), array.size() ) ) ) + while ( ( n = dev->readBlock( array.data(), array.size() ) ) ) { kdDebug() << "readBlock returned " << n << endl << endl; // TQCString s(array,n+1); // Terminate with 0 before printing @@ -55,9 +55,9 @@ void test_block_write( const TQString & fileName ) if ( !dev->open( IO_WriteOnly ) ) { kdWarning() << "open failed " << endl; return; } TQCString s("hello\n"); - int ret = dev->tqwriteBlock( s, s.size()-1 ); + int ret = dev->writeBlock( s, s.size()-1 ); kdDebug() << "writeBlock ret=" << ret << endl; - //ret = dev->tqwriteBlock( s, s.size()-1 ); + //ret = dev->writeBlock( s, s.size()-1 ); //kdDebug() << "writeBlock ret=" << ret << endl; dev->close(); delete dev; diff --git a/tdeio/tests/kmfitest.cpp b/tdeio/tests/kmfitest.cpp index a2ec91717..aadde7652 100644 --- a/tdeio/tests/kmfitest.cpp +++ b/tdeio/tests/kmfitest.cpp @@ -1,7 +1,7 @@ #include <stdio.h> #include <tqdir.h> #include <tqfile.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kurl.h> #include <tdefilemetainfo.h> #include <kmimetype.h> diff --git a/tdeio/tests/kmimemagictest.cpp b/tdeio/tests/kmimemagictest.cpp index 00c545c3c..47583ea21 100644 --- a/tdeio/tests/kmimemagictest.cpp +++ b/tdeio/tests/kmimemagictest.cpp @@ -19,7 +19,7 @@ #include <kmimetype.h> #include <kmimemagic.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <stdio.h> int main( int argc, char** argv ) diff --git a/tdeio/tests/kmimetypetest.cpp b/tdeio/tests/kmimetypetest.cpp index 631521c8a..bf41d8c40 100644 --- a/tdeio/tests/kmimetypetest.cpp +++ b/tdeio/tests/kmimetypetest.cpp @@ -17,7 +17,7 @@ */ #include <kmimetype.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <ktempdir.h> #include <kprotocolinfo.h> #include <tqdir.h> diff --git a/tdeio/tests/kmimetypetest.sh.cmake b/tdeio/tests/kmimetypetest.sh.cmake index 3bcd98669..55a0ffbc6 100644 --- a/tdeio/tests/kmimetypetest.sh.cmake +++ b/tdeio/tests/kmimetypetest.sh.cmake @@ -5,11 +5,16 @@ HOME=@CMAKE_CURRENT_BINARY_DIR@/test-home mkdir $HOME $HOME/.trinity $HOME/.trinity/share ln -s @CMAKE_SOURCE_DIR@/mimetypes $HOME/.trinity/share/mimelnk export HOME +export ICEAUTHORITY=$HOME/.ICEauthority # run dcop server ../../dcop/dcopserver --nofork & DCOP_SERVER_PID=$! +while ! ../../dcop/dcopserver --serverid 2>/dev/null; do + sleep 2 +done + # update tdesycoca using mime types from source ../../kded/tdebuildsycoca --noincremental --nosignal diff --git a/tdeio/tests/kruntest.cpp b/tdeio/tests/kruntest.cpp index 7562b488a..8f4b6d075 100644 --- a/tdeio/tests/kruntest.cpp +++ b/tdeio/tests/kruntest.cpp @@ -56,9 +56,9 @@ Receiver::Receiver() start = new TQPushButton( "Launch KRuns", this ); stop = new TQPushButton( "Stop those KRuns", this ); stop->setEnabled(false); - TQObject::connect( h, TQT_SIGNAL(clicked()), kapp, TQT_SLOT(quit()) ); - TQObject::connect( start, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStart()) ); - TQObject::connect( stop, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStop()) ); + TQObject::connect( h, TQ_SIGNAL(clicked()), tdeApp, TQ_SLOT(quit()) ); + TQObject::connect( start, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStart()) ); + TQObject::connect( stop, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStop()) ); adjustSize(); show(); diff --git a/tdeio/tests/kruntest.h b/tdeio/tests/kruntest.h index 68e7a7280..b8870816c 100644 --- a/tdeio/tests/kruntest.h +++ b/tdeio/tests/kruntest.h @@ -25,7 +25,7 @@ class testKRun : public KRun { - Q_OBJECT + TQ_OBJECT public: testKRun( const KURL& _url, mode_t _mode = 0, @@ -42,7 +42,7 @@ public: class TQPushButton; class Receiver : public TQWidget { - Q_OBJECT + TQ_OBJECT public: Receiver(); ~Receiver() {} diff --git a/tdeio/tests/ktartest.cpp b/tdeio/tests/ktartest.cpp index 2c470f6e4..84ada6c06 100644 --- a/tdeio/tests/ktartest.cpp +++ b/tdeio/tests/ktartest.cpp @@ -18,7 +18,7 @@ #include "ktar.h" #include <stdio.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tqfile.h> #include <assert.h> diff --git a/tdeio/tests/kurifiltertest.cpp b/tdeio/tests/kurifiltertest.cpp index dec955156..708b3b840 100644 --- a/tdeio/tests/kurifiltertest.cpp +++ b/tdeio/tests/kurifiltertest.cpp @@ -26,8 +26,8 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdecmdlineargs.h> -#include <kstandarddirs.h> -#include <ksimpleconfig.h> +#include <tdestandarddirs.h> +#include <tdesimpleconfig.h> #include <tqdir.h> #include <tqregexp.h> @@ -172,7 +172,7 @@ int main(int argc, char **argv) // There is no default search engine by default (since it was annoying when making typos), // so the user has to set it up, which we do here. { - KSimpleConfig cfg( "kuriikwsfilterrc" ); + TDESimpleConfig cfg( "kuriikwsfilterrc" ); cfg.setGroup( "General" ); cfg.writeEntry( "DefaultSearchEngine", "google" ); cfg.writeEntry( "Verbose", true ); @@ -182,7 +182,7 @@ int main(int argc, char **argv) // Enable verbosity for debugging { - KSimpleConfig cfg( "tdeshorturifilterrc" ); + TDESimpleConfig cfg( "tdeshorturifilterrc" ); cfg.writeEntry( "Verbose", true ); cfg.sync(); } @@ -270,7 +270,7 @@ int main(int argc, char **argv) // a search using the default search engine // 'ls' is a bit of a special case though, due to the toplevel domain called 'ls' filter( "cp", "http://www.google.com/search?q=cp&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL, - TQStringList(), 0, false /* don't check for executables, see konq_misc.cc */ ); + TQStringList(), 0, false /* don't check for executables, see konq_misc.cpp */ ); // Executable tests - No IKWS in minicli filter( "cp", "cp", KURIFilterData::EXECUTABLE, minicliFilters ); diff --git a/tdeio/tests/kziptest.cpp b/tdeio/tests/kziptest.cpp index 84d38d134..1e34c98b8 100644 --- a/tdeio/tests/kziptest.cpp +++ b/tdeio/tests/kziptest.cpp @@ -18,7 +18,7 @@ #include "kzip.h" #include <stdio.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kdebug.h> #include <tqfile.h> diff --git a/tdeio/tests/previewtest.cpp b/tdeio/tests/previewtest.cpp index 3237f0180..f30e7ad10 100644 --- a/tdeio/tests/previewtest.cpp +++ b/tdeio/tests/previewtest.cpp @@ -19,7 +19,7 @@ PreviewTest::PreviewTest() m_url->setText("/home/malte/gore_bush.jpg"); layout->addWidget(m_url, 0, 0); TQPushButton *btn = new TQPushButton("Generate", this); - connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotGenerate())); + connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotGenerate())); layout->addWidget(btn, 0, 1); m_preview = new TQLabel(this); m_preview->setMinimumSize(400, 300); @@ -31,9 +31,9 @@ void PreviewTest::slotGenerate() KURL::List urls; urls.append(m_url->text()); TDEIO::PreviewJob *job = TDEIO::filePreview(urls, m_preview->width(), m_preview->height(), true, 48); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*))); - connect(job, TQT_SIGNAL(gotPreview(const KFileItem *, const TQPixmap &)), TQT_SLOT(slotPreview(const KFileItem *, const TQPixmap &))); - connect(job, TQT_SIGNAL(failed(const KFileItem *)), TQT_SLOT(slotFailed())); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(gotPreview(const KFileItem *, const TQPixmap &)), TQ_SLOT(slotPreview(const KFileItem *, const TQPixmap &))); + connect(job, TQ_SIGNAL(failed(const KFileItem *)), TQ_SLOT(slotFailed())); } void PreviewTest::slotResult(TDEIO::Job*) diff --git a/tdeio/tests/previewtest.h b/tdeio/tests/previewtest.h index 5ef82916d..2a3f5e5d1 100644 --- a/tdeio/tests/previewtest.h +++ b/tdeio/tests/previewtest.h @@ -8,7 +8,7 @@ class KFileItem; class PreviewTest : public TQWidget { - Q_OBJECT + TQ_OBJECT public: PreviewTest(); diff --git a/tdeio/tests/speed.cpp b/tdeio/tests/speed.cpp index 4b14a6bb6..1f2740527 100644 --- a/tdeio/tests/speed.cpp +++ b/tdeio/tests/speed.cpp @@ -32,10 +32,10 @@ SpeedTest::SpeedTest( const KURL & url ) { Job *job = listRecursive( url ); //Job *job = del( KURL("file:" + TQDir::currentDirPath()) ); DANGEROUS ! - connect(job, TQT_SIGNAL( result( TDEIO::Job*)), - TQT_SLOT( finished( TDEIO::Job* ) )); - /*connect(job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), - TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList&))); + connect(job, TQ_SIGNAL( result( TDEIO::Job*)), + TQ_SLOT( finished( TDEIO::Job* ) )); + /*connect(job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQ_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList&))); */ } @@ -54,7 +54,7 @@ void SpeedTest::entries(TDEIO::Job*, const UDSEntryList& list) { void SpeedTest::finished(Job*) { kdDebug() << "job finished" << endl; - kapp->quit(); + tdeApp->quit(); } static TDECmdLineOptions options[] = diff --git a/tdeio/tests/speed.h b/tdeio/tests/speed.h index d7801ae47..1e9dab6a1 100644 --- a/tdeio/tests/speed.h +++ b/tdeio/tests/speed.h @@ -1,4 +1,3 @@ -// -*- c++ -*- #ifndef _SPEED_H #define _SPEED_H @@ -10,7 +9,7 @@ namespace TDEIO { } class SpeedTest : public TQObject { - Q_OBJECT + TQ_OBJECT public: SpeedTest(const KURL & url); diff --git a/tdeio/tests/tdeioslavetest.cpp b/tdeio/tests/tdeioslavetest.cpp index 4d52eab2e..7a44f5313 100644 --- a/tdeio/tests/tdeioslavetest.cpp +++ b/tdeio/tests/tdeioslavetest.cpp @@ -63,7 +63,7 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr ) // Operation groupbox & buttons opButtons = new TQButtonGroup( "Operation", main_widget ); topLayout->addWidget( opButtons, 10 ); - connect( opButtons, TQT_SIGNAL(clicked(int)), TQT_SLOT(changeOperation(int)) ); + connect( opButtons, TQ_SIGNAL(clicked(int)), TQ_SLOT(changeOperation(int)) ); TQBoxLayout *hbLayout = new TQHBoxLayout( opButtons, 15 ); @@ -117,7 +117,7 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr ) // Progress groupbox & buttons progressButtons = new TQButtonGroup( "Progress dialog mode", main_widget ); topLayout->addWidget( progressButtons, 10 ); - connect( progressButtons, TQT_SIGNAL(clicked(int)), TQT_SLOT(changeProgressMode(int)) ); + connect( progressButtons, TQ_SIGNAL(clicked(int)), TQ_SLOT(changeProgressMode(int)) ); hbLayout = new TQHBoxLayout( progressButtons, 15 ); @@ -145,19 +145,19 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr ) pbStart = new TQPushButton( "&Start", main_widget ); pbStart->setFixedSize( pbStart->sizeHint() ); - connect( pbStart, TQT_SIGNAL(clicked()), TQT_SLOT(startJob()) ); + connect( pbStart, TQ_SIGNAL(clicked()), TQ_SLOT(startJob()) ); hbLayout->addWidget( pbStart, 5 ); pbStop = new TQPushButton( "Sto&p", main_widget ); pbStop->setFixedSize( pbStop->sizeHint() ); pbStop->setEnabled( false ); - connect( pbStop, TQT_SIGNAL(clicked()), TQT_SLOT(stopJob()) ); + connect( pbStop, TQ_SIGNAL(clicked()), TQ_SLOT(stopJob()) ); hbLayout->addWidget( pbStop, 5 ); // close button close = new TQPushButton( "&Close", main_widget ); close->setFixedSize( close->sizeHint() ); - connect(close, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotQuit())); + connect(close, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotQuit())); topLayout->addWidget( close, 5 ); @@ -166,10 +166,10 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr ) slave = 0; // slave = TDEIO::Scheduler::getConnectedSlave(KURL("ftp://ftp.kde.org")); - TDEIO::Scheduler::connect(TQT_SIGNAL(slaveConnected(TDEIO::Slave*)), - this, TQT_SLOT(slotSlaveConnected())); - TDEIO::Scheduler::connect(TQT_SIGNAL(slaveError(TDEIO::Slave*,int,const TQString&)), - this, TQT_SLOT(slotSlaveError())); + TDEIO::Scheduler::connect(TQ_SIGNAL(slaveConnected(TDEIO::Slave*)), + this, TQ_SLOT(slotSlaveConnected())); + TDEIO::Scheduler::connect(TQ_SIGNAL(slaveError(TDEIO::Slave*,int,const TQString&)), + this, TQ_SLOT(slotSlaveError())); } @@ -184,7 +184,7 @@ void KioslaveTest::slotQuit(){ } if (slave) TDEIO::Scheduler::disconnectSlave(slave); - kapp->quit(); + tdeApp->quit(); } @@ -242,14 +242,14 @@ void KioslaveTest::startJob() { switch ( selectedOperation ) { case List: myJob = TDEIO::listDir( src ); - connect(myJob, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), - TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&))); + connect(myJob, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&))); break; case ListRecursive: myJob = TDEIO::listRecursive( src ); - connect(myJob, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), - TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&))); + connect(myJob, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&))); break; case Stat: @@ -258,15 +258,15 @@ void KioslaveTest::startJob() { case Get: myJob = TDEIO::get( src, true ); - connect(myJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray &)), - TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray &))); + connect(myJob, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray &)), + TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray &))); break; case Put: putBuffer = 0; myJob = TDEIO::put( src, -1, true, false); - connect(myJob, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray &)), - TQT_SLOT( slotDataReq( TDEIO::Job*, TQByteArray &))); + connect(myJob, TQ_SIGNAL( dataReq( TDEIO::Job*, TQByteArray &)), + TQ_SLOT( slotDataReq( TDEIO::Job*, TQByteArray &))); break; case Copy: @@ -300,11 +300,11 @@ void KioslaveTest::startJob() { job = myJob; } - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( canceled( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( canceled( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); if (progressMode == ProgressStatus) { statusProgress->setJob( job ); diff --git a/tdeio/tests/tdeioslavetest.h b/tdeio/tests/tdeioslavetest.h index 7f11bd4e3..efe089fd9 100644 --- a/tdeio/tests/tdeioslavetest.h +++ b/tdeio/tests/tdeioslavetest.h @@ -27,7 +27,7 @@ #include "tdeio/slave.h" class KioslaveTest : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: KioslaveTest( TQString src, TQString dest, uint op, uint pr ); diff --git a/tdeio/tests/tdesycocatest.cpp b/tdeio/tests/tdesycocatest.cpp index f21402405..035c4593f 100644 --- a/tdeio/tests/tdesycocatest.cpp +++ b/tdeio/tests/tdesycocatest.cpp @@ -22,7 +22,7 @@ #include <kservice.h> #include <kmimetype.h> #include <assert.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kservicegroup.h> #include <kimageio.h> #include <kprotocolinfo.h> @@ -67,7 +67,7 @@ void debug(const char *format, const char *txt) int main(int argc, char *argv[]) { - TDEApplication k(argc,argv,"whatever",true); // KMessageBox needs KApp for makeStdCaption + TDEApplication k(argc,argv,"whatever",true); // KMessageBox needs TDEApp for makeStdCaption TQCString instname = "kword"; TQString desktopPath = TQString::fromLatin1( "Office/%1.desktop" ).arg( instname ); diff --git a/tdeio/tests/tdesycocaupdatetest.cpp b/tdeio/tests/tdesycocaupdatetest.cpp index 5b390efa6..9b0f686b5 100644 --- a/tdeio/tests/tdesycocaupdatetest.cpp +++ b/tdeio/tests/tdesycocaupdatetest.cpp @@ -4,7 +4,7 @@ int main(int argc, char *argv[]) { - TDEApplication k(argc,argv,"whatever",true,true); // KMessageBox needs KApp for makeStdCaption + TDEApplication k(argc,argv,"whatever",true,true); // KMessageBox needs TDEApp for makeStdCaption KService::rebuildKSycoca(0); return 0; |