Rename a number of libraries and executables to avoid conflicts with KDE4

pull/2/head
Timothy Pearson 12 years ago
parent 5e4f00a991
commit 45e371f7ff

@ -608,7 +608,7 @@ TODO: only re-write a local database if it is changed.
2004-04-10 Reinhold Kainhofer 2004-04-10 Reinhold Kainhofer
* Split kpilot's configuration into several files, one for each conduit. * Split kpilot's configuration into several files, one for each conduit.
Also wrote a kconf_update script so the old settings are preserved. Also wrote a tdeconf_update script so the old settings are preserved.
We still need to sort out the remaining settings written to kpilotrc. We still need to sort out the remaining settings written to kpilotrc.
* Corrected all path variables in the .kcfg files from type String to Path * Corrected all path variables in the .kcfg files from type String to Path
* The configuration wizard now also sets the conduits' settings to sensitive * The configuration wizard now also sets the conduits' settings to sensitive
@ -805,7 +805,7 @@ TODO: only re-write a local database if it is changed.
* New DCOP functions in the daemon to query its state and settings * New DCOP functions in the daemon to query its state and settings
* the kontact plugin also detects if the daemon is quit * the kontact plugin also detects if the daemon is quit
* Use a QSplitter in the config dialog instead of the QHBox layout * Use a QSplitter in the config dialog instead of the QHBox layout
* implemented the kconf_update scripts to move groupless entries to the * implemented the tdeconf_update scripts to move groupless entries to the
[General] group [General] group
* Still missing: * Still missing:
o) TDEConfig sync between the three processes working on the o) TDEConfig sync between the three processes working on the

@ -40,7 +40,7 @@
#include <kabc/stdaddressbook.h> #include <kabc/stdaddressbook.h>
#include <kabc/resourcefile.h> #include <kabc/resourcefile.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <ksavefile.h> #include <ksavefile.h>
#include <pilotSerialDatabase.h> #include <pilotSerialDatabase.h>

@ -81,7 +81,7 @@ install(
install( install(
FILES kpalmdoc.upd FILES kpalmdoc.upd
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/kconf_update DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/tdeconf_update
) )
add_subdirectory(Icons) add_subdirectory(Icons)

@ -36,5 +36,5 @@ servicetypedir = $(kde_servicetypesdir)
kde_kcfg_DATA = docconduit.kcfg kpalmdoc.kcfg kde_kcfg_DATA = docconduit.kcfg kpalmdoc.kcfg
update_DATA = kpalmdoc.upd update_DATA = kpalmdoc.upd
updatedir = $(kde_datadir)/kconf_update updatedir = $(kde_datadir)/tdeconf_update

@ -39,7 +39,7 @@
#include <tqtimer.h> #include <tqtimer.h>
#include <tqdir.h> #include <tqdir.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kmdcodec.h> #include <kmdcodec.h>
#include <pilotLocalDatabase.h> #include <pilotLocalDatabase.h>

@ -33,7 +33,7 @@
#include <tqbuttongroup.h> #include <tqbuttongroup.h>
#include <tqcombobox.h> #include <tqcombobox.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kurlrequester.h> #include <kurlrequester.h>
#include <kcharsets.h> #include <kcharsets.h>

@ -39,7 +39,7 @@
#include <tqcombobox.h> #include <tqcombobox.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kaboutapplication.h> #include <kaboutapplication.h>
#include <kapplication.h> #include <kapplication.h>
#include <kurlrequester.h> #include <kurlrequester.h>

@ -39,7 +39,7 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kconfig.h> #include <tdeconfig.h>
//#include <dcopclient.h> //#include <dcopclient.h>
#include <time.h> // required by pilot-link includes #include <time.h> // required by pilot-link includes

@ -34,7 +34,7 @@
#include <tqtimer.h> #include <tqtimer.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "setup_base.h" #include "setup_base.h"

@ -35,7 +35,7 @@
#include "options.h" #include "options.h"
#include <tqregexp.h> #include <tqregexp.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include "mal-factory.h" #include "mal-factory.h"

@ -43,7 +43,7 @@
#include <kpassdlg.h> #include <kpassdlg.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "mal-setup_dialog.h" #include "mal-setup_dialog.h"

@ -45,7 +45,7 @@
#include <tqdir.h> #include <tqdir.h>
#include <tqtextcodec.h> #include <tqtextcodec.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include "pilotRecord.h" #include "pilotRecord.h"

@ -32,7 +32,7 @@
#include <tqlineedit.h> #include <tqlineedit.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kinstance.h> #include <kinstance.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kurlrequester.h> #include <kurlrequester.h>

@ -28,7 +28,7 @@
#include "options.h" #include "options.h"
#include <kconfig.h> #include <tdeconfig.h>
#include <kinstance.h> #include <kinstance.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kurlrequester.h> #include <kurlrequester.h>

@ -40,7 +40,7 @@
// //
#include <time.h> #include <time.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include "pilotSerialDatabase.h" #include "pilotSerialDatabase.h"

@ -32,7 +32,7 @@
#include <tqlineedit.h> #include <tqlineedit.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kinstance.h> #include <kinstance.h>
#include <kaboutdata.h> #include <kaboutdata.h>

@ -67,7 +67,7 @@ unsigned long version_conduit_popmail = Pilot::PLUGIN_API;
#include <kapplication.h> #include <kapplication.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <ksock.h> #include <ksock.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <ksimpleconfig.h> #include <ksimpleconfig.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <ktempfile.h> #include <ktempfile.h>

@ -37,7 +37,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <stdlib.h> #include <stdlib.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <klineedit.h> #include <klineedit.h>
#include <kaboutdata.h> #include <kaboutdata.h>
@ -46,7 +46,7 @@
#include <tqdir.h> #include <tqdir.h>
#include <tqcombobox.h> #include <tqcombobox.h>
#include "kfiledialog.h" #include "tdefiledialog.h"
#include <kurlrequester.h> #include <kurlrequester.h>

@ -32,7 +32,7 @@
#include <tqlineedit.h> #include <tqlineedit.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kinstance.h> #include <kinstance.h>
#include <kaboutdata.h> #include <kaboutdata.h>

@ -33,7 +33,7 @@
#include <tqdir.h> #include <tqdir.h>
#include <tqfileinfo.h> #include <tqfileinfo.h>
#include <tqregexp.h> #include <tqregexp.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <pilotSysInfo.h> #include <pilotSysInfo.h>

@ -31,7 +31,7 @@
#include <pilotSysInfo.h> #include <pilotSysInfo.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include "time-factory.h" #include "time-factory.h"

@ -28,7 +28,7 @@
#include <options.h> #include <options.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <tqfile.h> #include <tqfile.h>
#include "pilotDatabase.h" #include "pilotDatabase.h"

@ -37,7 +37,7 @@
#include <tqfile.h> #include <tqfile.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include "libkcal/calendar.h" #include "libkcal/calendar.h"
#include "libkcal/calendarlocal.h" #include "libkcal/calendarlocal.h"

@ -170,7 +170,7 @@ install(
install ( install (
FILES kpilot.upd FILES kpilot.upd
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/kconf_update DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/tdeconf_update
) )
install( install(

@ -27,7 +27,7 @@ CONFIG_MOCS=kpilotConfigDialog_base.moc kpilotConfigDialog.moc \
conduitConfigDialog.moc conduitConfigDialog_base.moc conduitConfigDialog.moc conduitConfigDialog_base.moc
CONFIG_EXTRA=kpilotConfigDialog_base.ui conduitConfigDialog_base.ui CONFIG_EXTRA=kpilotConfigDialog_base.ui conduitConfigDialog_base.ui
CONFIG_LIBS=-ltdeui -lkfile -ltdecore -lqt -lkpilot CONFIG_LIBS=-ltdeui -ltdefile -ltdecore -lqt -lkpilot
TEST_DISTDIR=kpilotTest-0.2 TEST_DISTDIR=kpilotTest-0.2
TEST_OBJS=kpilotConfig.o \ TEST_OBJS=kpilotConfig.o \
@ -36,7 +36,7 @@ TEST_OBJS=kpilotConfig.o \
TEST_MOCS= pilotComponent.moc logWidget.moc \ TEST_MOCS= pilotComponent.moc logWidget.moc \
interactiveSync.moc hotSync.moc interactiveSync.moc hotSync.moc
TEST_EXTRA=pilotUser.h TEST_EXTRA=pilotUser.h
TEST_LIBS=-lkpilot -lkfile -ltdeui -lqt -lpisock TEST_LIBS=-lkpilot -ltdefile -ltdeui -lqt -lpisock
KPILOT_DISTDIR=kpilot-4.2.9 KPILOT_DISTDIR=kpilot-4.2.9
KPILOT_OBJS= pilotDaemonDCOP_stub.o \ KPILOT_OBJS= pilotDaemonDCOP_stub.o \
@ -56,7 +56,7 @@ KPILOT_MOCS=pilotComponent.moc logWidget.moc memoWidget.moc addressWidget.moc \
KPILOT_EXTRA=kpilotConfigDialog_base.ui conduitConfigDialog_base.ui \ KPILOT_EXTRA=kpilotConfigDialog_base.ui conduitConfigDialog_base.ui \
pilotDaemonDCOP.h kpilotDCOP.h \ pilotDaemonDCOP.h kpilotDCOP.h \
pilotAppCategory.h pilotDatabase.h kpilot_on_pp.h pilotAppCategory.h pilotDatabase.h kpilot_on_pp.h
KPILOT_LIBS=-lkfile -ltdeui -lqt -lkpilot -lpisock KPILOT_LIBS=-ltdefile -ltdeui -lqt -lkpilot -lpisock
DAEMON_DISTDIR=kpilotDaemon-4.2.9 DAEMON_DISTDIR=kpilotDaemon-4.2.9
DAEMON_OBJS= pilotDaemonDCOP_skel.o kpilotDCOP_stub.o \ DAEMON_OBJS= pilotDaemonDCOP_skel.o kpilotDCOP_stub.o \
@ -67,7 +67,7 @@ DAEMON_MOCS=pilotDaemon.moc \
fileInstaller.moc fileInstaller.moc
DAEMON_EXTRA=pilotDaemonDCOP.h kpilotDCOP.h pilotUser.h \ DAEMON_EXTRA=pilotDaemonDCOP.h kpilotDCOP.h pilotUser.h \
hotsync.h busysync.h hotsync.h busysync.h
DAEMON_LIBS=-lkfile -ltdeui -lqt -lkpilot -lpisock DAEMON_LIBS=-ltdefile -ltdeui -lqt -lkpilot -lpisock
DISTFILES=kpilotConfig.tar.gz kpilotTest.tar.gz kpilot.tar.gz kpilotDaemon.tar.gz DISTFILES=kpilotConfig.tar.gz kpilotTest.tar.gz kpilot.tar.gz kpilotDaemon.tar.gz

@ -93,7 +93,7 @@ rcdir = $(kde_datadir)/kpilot
rc_DATA = kpilotui.rc rc_DATA = kpilotui.rc
update_DATA = kpilot.upd update_DATA = kpilot.upd
updatedir = $(kde_datadir)/kconf_update updatedir = $(kde_datadir)/tdeconf_update
DOXYGEN_REFERENCES = tdeui kpilot/lib DOXYGEN_REFERENCES = tdeui kpilot/lib
include $(top_srcdir)/admin/Doxyfile.am include $(top_srcdir)/admin/Doxyfile.am

@ -55,7 +55,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kdebug.h> #include <kdebug.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include "kpilotConfig.h" #include "kpilotConfig.h"
#include "listItems.h" #include "listItems.h"

@ -52,7 +52,7 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <klibloader.h> #include <klibloader.h>
#include <kseparator.h> #include <kseparator.h>
#include <kconfigskeleton.h> #include <tdeconfigskeleton.h>
#include <kdialogbase.h> #include <kdialogbase.h>
#include "plugin.h" #include "plugin.h"

@ -45,7 +45,7 @@
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqpopupmenu.h> #include <tqpopupmenu.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kurldrag.h> #include <kurldrag.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kiconview.h> #include <kiconview.h>

@ -41,7 +41,7 @@
#include <kglobal.h> #include <kglobal.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kurl.h> #include <kurl.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include "fileInstaller.moc" #include "fileInstaller.moc"

@ -41,7 +41,7 @@
#include <kurl.h> #include <kurl.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kstatusbar.h> #include <kstatusbar.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <twin.h> #include <twin.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kmenubar.h> #include <kmenubar.h>

@ -36,7 +36,7 @@
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <ksimpleconfig.h> #include <ksimpleconfig.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kmessagebox.h> #include <kmessagebox.h>
@ -296,7 +296,7 @@ static void update443()
int res = 0; int res = 0;
unsigned int fileVersion = KPilotSettings::configVersion(); unsigned int fileVersion = KPilotSettings::configVersion();
// FIXME better config handling -> Move the config entries using kconf_update // FIXME better config handling -> Move the config entries using tdeconf_update
// It's OK if we're already at the required level. // It's OK if we're already at the required level.
if (fileVersion >= KPilotConfig::ConfigurationVersion) if (fileVersion >= KPilotConfig::ConfigurationVersion)

@ -49,7 +49,7 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kglobal.h> #include <kglobal.h>
#include <kurl.h> #include <kurl.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include "kpilotConfig.h" #include "kpilotConfig.h"
#include "kpilotSettings.h" #include "kpilotSettings.h"

@ -36,7 +36,7 @@
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>
#include <kconfigskeleton.h> #include <tdeconfigskeleton.h>
#include "kpilotConfig.h" #include "kpilotConfig.h"
#include "options.h" #include "options.h"

@ -40,7 +40,7 @@
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>
#include <kconfigskeleton.h> #include <tdeconfigskeleton.h>
#include <kapplication.h> #include <kapplication.h>
#include <kprogress.h> #include <kprogress.h>

@ -45,7 +45,7 @@
#include <kglobal.h> #include <kglobal.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kprogress.h> #include <kprogress.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <pi-version.h> #include <pi-version.h>

@ -50,7 +50,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <tdeversion.h> #include <tdeversion.h>
#include <ktextedit.h> #include <ktextedit.h>
@ -640,11 +640,11 @@ void MemoWidget::slotExportMemo()
const TQString filter = CSL1("*|Plain text output\n*.xml|XML output"); const TQString filter = CSL1("*|Plain text output\n*.xml|XML output");
TQString fileName; TQString fileName;
KFileDialog kfile( TQString() , filter, fExportButton , "memoSave" , true ); KFileDialog tdefile( TQString() , filter, fExportButton , "memoSave" , true );
kfile.setOperationMode( KFileDialog::Saving ); tdefile.setOperationMode( KFileDialog::Saving );
if ( kfile.exec() == TQDialog::Accepted ) { if ( tdefile.exec() == TQDialog::Accepted ) {
fileName = kfile.selectedFile(); fileName = tdefile.selectedFile();
} }
if (fileName.isEmpty()) if (fileName.isEmpty())
@ -658,7 +658,7 @@ void MemoWidget::slotExportMemo()
} }
} }
if (kfile.currentFilter() == CSL1("*.xml") ) if (tdefile.currentFilter() == CSL1("*.xml") )
{ {
MemoWidget::saveAsXML( fileName , menu_items ); MemoWidget::saveAsXML( fileName , menu_items );
} }

@ -31,7 +31,7 @@
#include "pi-macros.h" #include "pi-macros.h"
#include <kconfig.h> #include <tdeconfig.h>
class IDMapperPrivate; class IDMapperPrivate;

@ -51,11 +51,11 @@
#include <tqthread.h> #include <tqthread.h>
#include <tqsocketnotifier.h> #include <tqsocketnotifier.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kurl.h> #include <kurl.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include "pilotUser.h" #include "pilotUser.h"
#include "pilotSysInfo.h" #include "pilotSysInfo.h"

@ -52,11 +52,11 @@
#include <tqdatetime.h> #include <tqdatetime.h>
#include <tqthread.h> #include <tqthread.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kurl.h> #include <kurl.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include "pilotUser.h" #include "pilotUser.h"
#include "pilotSysInfo.h" #include "pilotSysInfo.h"

@ -52,11 +52,11 @@
#include <tqdatetime.h> #include <tqdatetime.h>
#include <tqthread.h> #include <tqthread.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kurl.h> #include <kurl.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include "pilotSerialDatabase.h" #include "pilotSerialDatabase.h"
#include "pilotLocalDatabase.h" #include "pilotLocalDatabase.h"

@ -35,7 +35,7 @@
#include <tqsize.h> #include <tqsize.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>

@ -49,7 +49,7 @@
#include <kdialogbase.h> #include <kdialogbase.h>
#include <kglobal.h> #include <kglobal.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include "syncAction.moc" #include "syncAction.moc"

@ -33,7 +33,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kconfigskeleton.h> #include <tdeconfigskeleton.h>
#include <libkcal/calendar.h> #include <libkcal/calendar.h>
#include <libkcal/calendarlocal.h> #include <libkcal/calendarlocal.h>

@ -30,7 +30,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kconfigskeleton.h> #include <tdeconfigskeleton.h>
#include <libkcal/calendar.h> #include <libkcal/calendar.h>
#include <libkcal/calendarlocal.h> #include <libkcal/calendarlocal.h>

Loading…
Cancel
Save