diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:21 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:21 -0600 |
commit | dfe289850f068f19ba4a83ab4e7e22a7e09c13c9 (patch) | |
tree | c297348a55df66c571de4525646e0b9762427353 /kio/misc | |
parent | b7658a0d5eca24a9d37c6e04f88298ef02389db0 (diff) | |
download | tdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.tar.gz tdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kio/misc')
-rw-r--r-- | kio/misc/CMakeLists.txt | 4 | ||||
-rw-r--r-- | kio/misc/Makefile.am | 6 | ||||
-rw-r--r-- | kio/misc/kfile/Makefile.am | 2 | ||||
-rw-r--r-- | kio/misc/kntlm/Makefile.am | 12 | ||||
-rw-r--r-- | kio/misc/ksendbugmail/Makefile.am | 2 | ||||
-rw-r--r-- | kio/misc/tdentlm/CMakeLists.txt (renamed from kio/misc/kntlm/CMakeLists.txt) | 8 | ||||
-rw-r--r-- | kio/misc/tdentlm/Makefile.am | 12 | ||||
-rw-r--r-- | kio/misc/tdentlm/des.cpp (renamed from kio/misc/kntlm/des.cpp) | 0 | ||||
-rw-r--r-- | kio/misc/tdentlm/des.h (renamed from kio/misc/kntlm/des.h) | 0 | ||||
-rw-r--r-- | kio/misc/tdentlm/kswap.h (renamed from kio/misc/kntlm/kswap.h) | 0 | ||||
-rw-r--r-- | kio/misc/tdentlm/tdentlm.cpp (renamed from kio/misc/kntlm/kntlm.cpp) | 2 | ||||
-rw-r--r-- | kio/misc/tdentlm/tdentlm.h (renamed from kio/misc/kntlm/kntlm.h) | 0 | ||||
-rw-r--r-- | kio/misc/tdewalletd/CMakeLists.txt (renamed from kio/misc/kwalletd/CMakeLists.txt) | 14 | ||||
-rw-r--r-- | kio/misc/tdewalletd/Makefile.am (renamed from kio/misc/kwalletd/Makefile.am) | 16 | ||||
-rw-r--r-- | kio/misc/tdewalletd/kbetterthankdialogbase.ui (renamed from kio/misc/kwalletd/kbetterthankdialogbase.ui) | 0 | ||||
-rw-r--r-- | kio/misc/tdewalletd/kbetterthankdialogbase.ui.h (renamed from kio/misc/kwalletd/kbetterthankdialogbase.ui.h) | 0 | ||||
-rw-r--r-- | kio/misc/tdewalletd/ktimeout.cpp (renamed from kio/misc/kwalletd/ktimeout.cpp) | 0 | ||||
-rw-r--r-- | kio/misc/tdewalletd/ktimeout.h (renamed from kio/misc/kwalletd/ktimeout.h) | 0 | ||||
-rw-r--r-- | kio/misc/tdewalletd/tdewalletd.cpp (renamed from kio/misc/kwalletd/kwalletd.cpp) | 36 | ||||
-rw-r--r-- | kio/misc/tdewalletd/tdewalletd.desktop (renamed from kio/misc/kwalletd/kwalletd.desktop) | 4 | ||||
-rw-r--r-- | kio/misc/tdewalletd/tdewalletd.h (renamed from kio/misc/kwalletd/kwalletd.h) | 2 | ||||
-rw-r--r-- | kio/misc/tdewalletd/tdewalletwizard.ui (renamed from kio/misc/kwalletd/kwalletwizard.ui) | 2 | ||||
-rw-r--r-- | kio/misc/tdewalletd/tdewalletwizard.ui.h (renamed from kio/misc/kwalletd/kwalletwizard.ui.h) | 0 |
23 files changed, 61 insertions, 61 deletions
diff --git a/kio/misc/CMakeLists.txt b/kio/misc/CMakeLists.txt index 52aa2207a..5212444a2 100644 --- a/kio/misc/CMakeLists.txt +++ b/kio/misc/CMakeLists.txt @@ -14,8 +14,8 @@ add_subdirectory( kpac ) add_subdirectory( tdesasl ) add_subdirectory( kssld ) add_subdirectory( kfile ) -add_subdirectory( kwalletd ) -add_subdirectory( kntlm ) +add_subdirectory( tdewalletd ) +add_subdirectory( tdentlm ) add_definitions( -D_LARGEFILE64_SOURCE diff --git a/kio/misc/Makefile.am b/kio/misc/Makefile.am index cfa5a4c3e..0bafce0f5 100644 --- a/kio/misc/Makefile.am +++ b/kio/misc/Makefile.am @@ -20,7 +20,7 @@ AM_CPPFLAGS = -D_LARGEFILE64_SOURCE INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) -I$(srcdir)/../kssl -I../kssl $(all_includes) $(SSL_INCLUDES) -SUBDIRS = . ksendbugmail kpac tdesasl kssld kfile kwalletd kntlm +SUBDIRS = . ksendbugmail kpac tdesasl kssld kfile tdewalletd tdentlm lib_LTLIBRARIES = tdeinit_LTLIBRARIES = kio_uiserver.la @@ -38,11 +38,11 @@ kde_services_DATA = kio_uiserver.desktop kmailservice_SOURCES = kmailservice.cpp kmailservice_LDADD = $(LIB_TDECORE) -kmailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kmailservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor ktelnetservice_SOURCES = ktelnetservice.cpp ktelnetservice_LDADD = $(LIB_TDEUI) -ktelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ktelnetservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor protocol_DATA = kmailservice.protocol telnet.protocol rlogin.protocol rtsp.protocol ssh.protocol \ mms.protocol mmst.protocol mmsu.protocol pnm.protocol rtspt.protocol rtspu.protocol diff --git a/kio/misc/kfile/Makefile.am b/kio/misc/kfile/Makefile.am index ad5a377a2..605fef7d3 100644 --- a/kio/misc/kfile/Makefile.am +++ b/kio/misc/kfile/Makefile.am @@ -5,6 +5,6 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio/kio $(all_includes) bin_PROGRAMS = kfile kfile_SOURCES = fileprops.cpp -kfile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kfile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kfile_LDADD = $(LIB_KIO) diff --git a/kio/misc/kntlm/Makefile.am b/kio/misc/kntlm/Makefile.am deleted file mode 100644 index 91efaf40f..000000000 --- a/kio/misc/kntlm/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -INCLUDES=$(all_includes) - -lib_LTLIBRARIES = libkntlm.la -METASOURCES = AUTO - -kntlmincludedir = $(includedir)/kio -kntlminclude_HEADERS = kntlm.h - -libkntlm_la_SOURCES = kntlm.cpp des.cpp -libkntlm_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined -libkntlm_la_LIBADD = $(LIB_TDECORE) $(LIB_QT) - diff --git a/kio/misc/ksendbugmail/Makefile.am b/kio/misc/ksendbugmail/Makefile.am index f3efb2b2c..b24e36a26 100644 --- a/kio/misc/ksendbugmail/Makefile.am +++ b/kio/misc/ksendbugmail/Makefile.am @@ -20,7 +20,7 @@ bin_PROGRAMS = ksendbugmail INCLUDES= -I$(srcdir)/.. $(all_includes) ksendbugmail_SOURCES = main.cpp smtp.cpp -ksendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ksendbugmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor ksendbugmail_LDADD = ../../libkio.la METASOURCES = AUTO diff --git a/kio/misc/kntlm/CMakeLists.txt b/kio/misc/tdentlm/CMakeLists.txt index 0952f4535..a846d1dcc 100644 --- a/kio/misc/kntlm/CMakeLists.txt +++ b/kio/misc/tdentlm/CMakeLists.txt @@ -24,15 +24,15 @@ link_directories( ##### headers ################################### -install(FILES kntlm.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio ) +install(FILES tdentlm.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio ) -##### kntlm ################################### +##### tdentlm ################################### -set( target kntlm ) +set( target tdentlm ) set( ${target}_SRCS - kntlm.cpp des.cpp + tdentlm.cpp des.cpp ) tde_add_library( ${target} SHARED diff --git a/kio/misc/tdentlm/Makefile.am b/kio/misc/tdentlm/Makefile.am new file mode 100644 index 000000000..689d0921d --- /dev/null +++ b/kio/misc/tdentlm/Makefile.am @@ -0,0 +1,12 @@ +INCLUDES=$(all_includes) + +lib_LTLIBRARIES = libtdentlm.la +METASOURCES = AUTO + +tdentlmincludedir = $(includedir)/kio +tdentlminclude_HEADERS = tdentlm.h + +libtdentlm_la_SOURCES = tdentlm.cpp des.cpp +libtdentlm_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined +libtdentlm_la_LIBADD = $(LIB_TDECORE) $(LIB_QT) + diff --git a/kio/misc/kntlm/des.cpp b/kio/misc/tdentlm/des.cpp index bb4fab88b..bb4fab88b 100644 --- a/kio/misc/kntlm/des.cpp +++ b/kio/misc/tdentlm/des.cpp diff --git a/kio/misc/kntlm/des.h b/kio/misc/tdentlm/des.h index 0f6f59dc9..0f6f59dc9 100644 --- a/kio/misc/kntlm/des.h +++ b/kio/misc/tdentlm/des.h diff --git a/kio/misc/kntlm/kswap.h b/kio/misc/tdentlm/kswap.h index 9eca243de..9eca243de 100644 --- a/kio/misc/kntlm/kswap.h +++ b/kio/misc/tdentlm/kswap.h diff --git a/kio/misc/kntlm/kntlm.cpp b/kio/misc/tdentlm/tdentlm.cpp index dd9cd33ec..2ef5d1cb6 100644 --- a/kio/misc/kntlm/kntlm.cpp +++ b/kio/misc/tdentlm/tdentlm.cpp @@ -30,7 +30,7 @@ #include <kdebug.h> #include "des.h" -#include "kntlm.h" +#include "tdentlm.h" TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool unicode ) { diff --git a/kio/misc/kntlm/kntlm.h b/kio/misc/tdentlm/tdentlm.h index 06b8febab..06b8febab 100644 --- a/kio/misc/kntlm/kntlm.h +++ b/kio/misc/tdentlm/tdentlm.h diff --git a/kio/misc/kwalletd/CMakeLists.txt b/kio/misc/tdewalletd/CMakeLists.txt index db4f56cb1..4aaa332aa 100644 --- a/kio/misc/kwalletd/CMakeLists.txt +++ b/kio/misc/tdewalletd/CMakeLists.txt @@ -17,8 +17,8 @@ include_directories( ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kwallet/client - ${CMAKE_SOURCE_DIR}/kwallet/backend + ${CMAKE_SOURCE_DIR}/tdewallet/client + ${CMAKE_SOURCE_DIR}/tdewallet/backend ${CMAKE_SOURCE_DIR}/kio/kio ) @@ -29,21 +29,21 @@ link_directories( ##### other data ################################ -install(FILES kwalletd.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) +install(FILES tdewalletd.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) -#### kded_kwalletd ############################## +#### kded_tdewalletd ############################## -set( target kded_kwalletd ) +set( target kded_tdewalletd ) set( ${target}_SRCS - kwalletd.cpp kwalletd.skel ktimeout.cpp kwalletwizard.ui + tdewalletd.cpp tdewalletd.skel ktimeout.cpp tdewalletwizard.ui kbetterthankdialogbase.ui ) tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK tdeinit_kded-shared kwalletbackend-shared + LINK tdeinit_kded-shared tdewalletbackend-shared DEPENDENCIES dcopidl DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kio/misc/kwalletd/Makefile.am b/kio/misc/tdewalletd/Makefile.am index 1d5b1313c..5d52fa810 100644 --- a/kio/misc/kwalletd/Makefile.am +++ b/kio/misc/tdewalletd/Makefile.am @@ -16,20 +16,20 @@ # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) -I$(top_srcdir)/kwallet/backend -I$(top_builddir)/kwallet/backend -I$(top_srcdir)/kwallet/client -I$(top_builddir)/kwallet/client $(all_includes) +INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) -I$(top_srcdir)/tdewallet/backend -I$(top_builddir)/tdewallet/backend -I$(top_srcdir)/tdewallet/client -I$(top_builddir)/tdewallet/client $(all_includes) -kde_module_LTLIBRARIES = kded_kwalletd.la +kde_module_LTLIBRARIES = kded_tdewalletd.la -kded_kwalletd_la_LDFLAGS = $(all_libraries) -module -avoid-version -kded_kwalletd_la_LIBADD = $(LIB_KIO) ../../../kwallet/backend/libkwalletbackend.la ../../../kwallet/client/libkwalletclient.la $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_TDEUI) -kded_kwalletd_la_SOURCES = kwalletd.cpp kwalletd.skel ktimeout.cpp kwalletwizard.ui kbetterthankdialogbase.ui +kded_tdewalletd_la_LDFLAGS = $(all_libraries) -module -avoid-version +kded_tdewalletd_la_LIBADD = $(LIB_KIO) ../../../tdewallet/backend/libtdewalletbackend.la ../../../tdewallet/client/libtdewalletclient.la $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) $(LIB_TDEUI) +kded_tdewalletd_la_SOURCES = tdewalletd.cpp tdewalletd.skel ktimeout.cpp tdewalletwizard.ui kbetterthankdialogbase.ui METASOURCES = AUTO -noinst_HEADERS = kwalletd.h ktimeout.h kwalletwizard.ui.h +noinst_HEADERS = tdewalletd.h ktimeout.h tdewalletwizard.ui.h -services_DATA = kwalletd.desktop +services_DATA = tdewalletd.desktop servicesdir = $(kde_servicesdir)/kded -kwalletwizard.lo: kwalletwizard.ui kwalletwizard.ui.h +tdewalletwizard.lo: tdewalletwizard.ui tdewalletwizard.ui.h kbetterthankdialogbase.lo: kbetterthankdialogbase.ui kbetterthankdialogbase.ui.h diff --git a/kio/misc/kwalletd/kbetterthankdialogbase.ui b/kio/misc/tdewalletd/kbetterthankdialogbase.ui index a02d5def7..a02d5def7 100644 --- a/kio/misc/kwalletd/kbetterthankdialogbase.ui +++ b/kio/misc/tdewalletd/kbetterthankdialogbase.ui diff --git a/kio/misc/kwalletd/kbetterthankdialogbase.ui.h b/kio/misc/tdewalletd/kbetterthankdialogbase.ui.h index 2b3e16b0d..2b3e16b0d 100644 --- a/kio/misc/kwalletd/kbetterthankdialogbase.ui.h +++ b/kio/misc/tdewalletd/kbetterthankdialogbase.ui.h diff --git a/kio/misc/kwalletd/ktimeout.cpp b/kio/misc/tdewalletd/ktimeout.cpp index c431ecf69..c431ecf69 100644 --- a/kio/misc/kwalletd/ktimeout.cpp +++ b/kio/misc/tdewalletd/ktimeout.cpp diff --git a/kio/misc/kwalletd/ktimeout.h b/kio/misc/tdewalletd/ktimeout.h index 441e4ed77..441e4ed77 100644 --- a/kio/misc/kwalletd/ktimeout.h +++ b/kio/misc/tdewalletd/ktimeout.h diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/tdewalletd/tdewalletd.cpp index afa634c64..3f59f4e91 100644 --- a/kio/misc/kwalletd/kwalletd.cpp +++ b/kio/misc/tdewalletd/tdewalletd.cpp @@ -21,8 +21,8 @@ */ #include "kbetterthankdialogbase.h" -#include "kwalletwizard.h" -#include "kwalletd.h" +#include "tdewalletwizard.h" +#include "tdewalletd.h" #include "ktimeout.h" #include <dcopclient.h> @@ -37,7 +37,7 @@ #include <kmessagebox.h> #include <kpassdlg.h> #include <kstandarddirs.h> -#include <kwalletentry.h> +#include <tdewalletentry.h> #include <twin.h> #include <tqdir.h> @@ -51,7 +51,7 @@ #include <assert.h> extern "C" { - KDE_EXPORT KDEDModule *create_kwalletd(const TQCString &name) { + KDE_EXPORT KDEDModule *create_tdewalletd(const TQCString &name) { return new KWalletD(name); } } @@ -94,13 +94,13 @@ KWalletD::KWalletD(const TQCString &name) _idleTime = 0; connect(_timeouts, TQT_SIGNAL(timedOut(int)), this, TQT_SLOT(timedOut(int))); reconfigure(); - TDEGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet"); + TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet"); connect(TDEApplication::dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)), this, TQT_SLOT(slotAppUnregistered(const TQCString&))); _dw = new KDirWatch(this, "KWallet Directory Watcher"); - _dw->addDir(TDEGlobal::dirs()->saveLocation("kwallet")); + _dw->addDir(TDEGlobal::dirs()->saveLocation("tdewallet")); _dw->startScan(true); connect(_dw, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(emitWalletListDirty())); } @@ -272,15 +272,15 @@ int KWalletD::open(const TQString& wallet, uint wId) { } -// Sets up a dialog that will be shown by kwallet. +// Sets up a dialog that will be shown by tdewallet. void KWalletD::setupDialog( TQWidget* dialog, WId wId, const TQCString& appid, bool modal ) { if( wId != 0 ) KWin::setMainWindow( dialog, wId ); // correct, set dialog parent else { if( appid.isEmpty()) - kdWarning() << "Using kwallet without parent window!" << endl; + kdWarning() << "Using tdewallet without parent window!" << endl; else - kdWarning() << "Application '" << appid << "' using kwallet without parent window!" << endl; + 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(); @@ -314,7 +314,7 @@ int KWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet, setupDialog( wiz, wId, appid, modal ); int rc = wiz->exec(); if (rc == TQDialog::Accepted) { - TDEConfig cfg("kwalletrc"); + TDEConfig cfg("tdewalletrc"); cfg.setGroup("Wallet"); cfg.writeEntry("First Use", false); cfg.writeEntry("Enabled", wiz->_useWallet->isChecked()); @@ -344,7 +344,7 @@ int KWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet, return -1; } } else if (_firstUse) { - TDEConfig cfg("kwalletrc"); + TDEConfig cfg("tdewalletrc"); _firstUse = false; cfg.setGroup("Wallet"); cfg.writeEntry("First Use", false); @@ -526,7 +526,7 @@ int KWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool } emitDCOPSignal("walletOpened(TQString)", data); if (_wallets.count() == 1 && _launchManager) { - TDEApplication::startServiceByDesktopName("kwalletmanager-kwalletd"); + TDEApplication::startServiceByDesktopName("tdewalletmanager-tdewalletd"); } } else { if (!_handles[appid].contains(rc) && _openPrompt && !isAuthorizedApp(appid, wallet, w)) { @@ -564,7 +564,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W if (response == 0 || response == 1) { if (response == 1) { - TDEConfig cfg("kwalletrc"); + TDEConfig cfg("tdewalletrc"); cfg.setGroup("Auto Allow"); TQStringList apps = cfg.readListEntry(wallet); if (!apps.contains(thisApp)) { @@ -575,7 +575,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W } } } else if (response == 3) { - TDEConfig cfg("kwalletrc"); + TDEConfig cfg("tdewalletrc"); cfg.setGroup("Auto Deny"); TQStringList apps = cfg.readListEntry(wallet); if (!apps.contains(thisApp)) { @@ -593,7 +593,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W int KWalletD::deleteWallet(const TQString& wallet) { - TQString path = TDEGlobal::dirs()->saveLocation("kwallet") + TQDir::separator() + wallet + ".kwl"; + TQString path = TDEGlobal::dirs()->saveLocation("tdewallet") + TQDir::separator() + wallet + ".kwl"; if (TQFile::exists(path)) { close(wallet, true); @@ -806,7 +806,7 @@ bool KWalletD::isOpen(int handle) { TQStringList KWalletD::wallets() const { - TQString path = TDEGlobal::dirs()->saveLocation("kwallet"); + TQString path = TDEGlobal::dirs()->saveLocation("tdewallet"); TQDir dir(path, "*.kwl"); TQStringList rc; @@ -1343,7 +1343,7 @@ void KWalletD::emitWalletListDirty() { void KWalletD::reconfigure() { - TDEConfig cfg("kwalletrc"); + TDEConfig cfg("tdewalletrc"); cfg.setGroup("Wallet"); _firstUse = cfg.readBoolEntry("First Use", true); _enabled = cfg.readBoolEntry("Enabled", true); @@ -1511,4 +1511,4 @@ TQString KWalletD::localWallet() { } -#include "kwalletd.moc" +#include "tdewalletd.moc" diff --git a/kio/misc/kwalletd/kwalletd.desktop b/kio/misc/tdewalletd/tdewalletd.desktop index 7f07fd079..1e65fe0df 100644 --- a/kio/misc/kwalletd/kwalletd.desktop +++ b/kio/misc/tdewalletd/tdewalletd.desktop @@ -2,8 +2,8 @@ Type=Service ServiceTypes=KDEDModule X-TDE-ModuleType=Library -X-TDE-Library=kwalletd -X-TDE-FactoryName=kwalletd +X-TDE-Library=tdewalletd +X-TDE-FactoryName=tdewalletd X-TDE-Kded-autoload=false X-TDE-Kded-load-on-demand=true Name=KWallet Daemon Module diff --git a/kio/misc/kwalletd/kwalletd.h b/kio/misc/tdewalletd/tdewalletd.h index 2aea371ba..b3a315413 100644 --- a/kio/misc/kwalletd/kwalletd.h +++ b/kio/misc/tdewalletd/tdewalletd.h @@ -28,7 +28,7 @@ #include <tqwidget.h> #include <tqtimer.h> #include <tqguardedptr.h> -#include "kwalletbackend.h" +#include "tdewalletbackend.h" #include <time.h> #include <stdlib.h> diff --git a/kio/misc/kwalletd/kwalletwizard.ui b/kio/misc/tdewalletd/tdewalletwizard.ui index b79853549..aa3a1c09d 100644 --- a/kio/misc/kwalletd/kwalletwizard.ui +++ b/kio/misc/tdewalletd/tdewalletwizard.ui @@ -532,7 +532,7 @@ <includes> <include location="global" impldecl="in declaration">tqcheckbox.h</include> <include location="global" impldecl="in implementation">klocale.h</include> - <include location="local" impldecl="in implementation">kwalletwizard.ui.h</include> + <include location="local" impldecl="in implementation">tdewalletwizard.ui.h</include> </includes> <Q_SLOTS> <slot access="private">passwordPageUpdate()</slot> diff --git a/kio/misc/kwalletd/kwalletwizard.ui.h b/kio/misc/tdewalletd/tdewalletwizard.ui.h index a42635e9b..a42635e9b 100644 --- a/kio/misc/kwalletd/kwalletwizard.ui.h +++ b/kio/misc/tdewalletd/tdewalletwizard.ui.h |