TDE
/
kpilot
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kpilot
0
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source
pull/2/head
Timothy Pearson 12 years ago
parent 5e4f00a991
commit 45e371f7ff
45 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File

4
ChangeLog
Unescape View File

@ -608,7 +608,7 @@ TODO: only re-write a local database if it is changed.
2004-04-10 Reinhold Kainhofer
* 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.
* Corrected all path variables in the .kcfg files from type String to Path
* 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
* the kontact plugin also detects if the daemon is quit
* 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
* Still missing:
o) TDEConfig sync between the three processes working on the

2
conduits/abbrowserconduit/abbrowser-conduit.cc
Unescape View File

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

2
conduits/docconduit/CMakeLists.txt
Unescape View File

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

2
conduits/docconduit/Makefile.am
Unescape View File

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

2
conduits/docconduit/doc-conduit.cc
Unescape View File

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

2
conduits/docconduit/doc-setup.cc
Unescape View File

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

2
conduits/docconduit/kpalmdoc_dlg.cc
Unescape View File

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

2
conduits/knotes/knotes-action.cc
Unescape View File

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

2
conduits/knotes/knotes-setup.cc
Unescape View File

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

2
conduits/malconduit/mal-conduit.cc
Unescape View File

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

2
conduits/malconduit/mal-setup.cc
Unescape View File

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

2
conduits/memofileconduit/memofile-conduit.cc
Unescape View File

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

2
conduits/memofileconduit/memofile-factory.cc
Unescape View File

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

2
conduits/notepadconduit/notepad-factory.cc
Unescape View File

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

2
conduits/null/null-conduit.cc
Unescape View File

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

2
conduits/null/null-factory.cc
Unescape View File

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

2
conduits/popmail/popmail-conduit.cc
Unescape View File

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

4
conduits/popmail/setupDialog.cc
Unescape View File

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

2
conduits/recordconduit/factory.cc
Unescape View File

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

2
conduits/sysinfoconduit/sysinfo-conduit.cc
Unescape View File

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

2
conduits/timeconduit/time-conduit.cc
Unescape View File

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

2
conduits/vcalconduit/cleanupstate.cc
Unescape View File

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

2
conduits/vcalconduit/vcal-conduitbase.cc
Unescape View File

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

2
kpilot/CMakeLists.txt
Unescape View File

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

8
kpilot/Makefile-standalone
Unescape View File

@ -27,7 +27,7 @@ CONFIG_MOCS=kpilotConfigDialog_base.moc kpilotConfigDialog.moc \
conduitConfigDialog.moc conduitConfigDialog_base.moc
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_OBJS=kpilotConfig.o \
@ -36,7 +36,7 @@ TEST_OBJS=kpilotConfig.o \
TEST_MOCS= pilotComponent.moc logWidget.moc \
interactiveSync.moc hotSync.moc
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_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 \
pilotDaemonDCOP.h kpilotDCOP.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_OBJS= pilotDaemonDCOP_skel.o kpilotDCOP_stub.o \
@ -67,7 +67,7 @@ DAEMON_MOCS=pilotDaemon.moc \
fileInstaller.moc
DAEMON_EXTRA=pilotDaemonDCOP.h kpilotDCOP.h pilotUser.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

2
kpilot/Makefile.am
Unescape View File

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

2
kpilot/addressWidget.cc
Unescape View File

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

2
kpilot/conduitConfigDialog.cc
Unescape View File

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

2
kpilot/fileInstallWidget.cc
Unescape View File

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

2
kpilot/fileInstaller.cc
Unescape View File

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

2
kpilot/kpilot.cc
Unescape View File

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

4
kpilot/kpilotConfig.cc
Unescape View File

@ -36,7 +36,7 @@
#include <tqcheckbox.h>
#include <kstandarddirs.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <ksimpleconfig.h>
#include <kcmdlineargs.h>
#include <kmessagebox.h>
@ -296,7 +296,7 @@ static void update443()
int res = 0;
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.
if (fileVersion >= KPilotConfig::ConfigurationVersion)

2
kpilot/kpilotConfigDialog.cc
Unescape View File

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

2
kpilot/kpilotConfigWizard.cc
Unescape View File

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

2
kpilot/kpilotProbeDialog.cc
Unescape View File

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

2
kpilot/logWidget.cc
Unescape View File

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

12
kpilot/memoWidget.cc
Unescape View File

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

2
lib/idmapper.h
Unescape View File

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

4
lib/kpilotdevicelink.cc
Unescape View File

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

4
lib/kpilotlink.cc
Unescape View File

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

4
lib/kpilotlocallink.cc
Unescape View File

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

2
lib/options.cc
Unescape View File

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

2
lib/syncAction.cc
Unescape View File

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

2
tests/exportdatebook.cc
Unescape View File

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

2
tests/mergecalendars.cc
Unescape View File

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

Write Preview
Loading…
Cancel
Save