summaryrefslogtreecommitdiffstats
path: root/tdersync
diff options
context:
space:
mode:
Diffstat (limited to 'tdersync')
-rw-r--r--tdersync/rsyncconfigdialog.cpp24
-rw-r--r--tdersync/rsyncconfigdialog.h4
-rw-r--r--tdersync/tdersync.cpp62
-rw-r--r--tdersync/tdersync.h8
4 files changed, 50 insertions, 48 deletions
diff --git a/tdersync/rsyncconfigdialog.cpp b/tdersync/rsyncconfigdialog.cpp
index 675044140..a6a0fe5f6 100644
--- a/tdersync/rsyncconfigdialog.cpp
+++ b/tdersync/rsyncconfigdialog.cpp
@@ -72,7 +72,7 @@
#include <kdebug.h>
#include <tdelocale.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <twin.h>
#include <tdeaction.h>
@@ -86,7 +86,7 @@
#include <tdeconfigdialog.h>
#include <kdirlister.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelistviewsearchline.h>
#include <kiconviewsearchline.h>
#include <kstaticdeleter.h>
@@ -113,7 +113,7 @@ RsyncConfigDialog::RsyncConfigDialog(TQWidget* parent, const char* name,
mSyncAutoLogout(false)
{
#ifdef TQ_WS_X11
- KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
+ KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon());
#endif
mShowTimer = new TQTimer(this);
@@ -126,9 +126,9 @@ RsyncConfigDialog::RsyncConfigDialog(TQWidget* parent, const char* name,
layout->addWidget(mLabel);
// Create an exclusive button group
- TQButtonGroup *layoutg = new TQButtonGroup( 1, Qt::Horizontal, i18n("Synchronization Method")+TQString(":"), mainWidget);
+ TQButtonGroup *layoutg = new TQButtonGroup( 1, TQt::Horizontal, i18n("Synchronization Method")+TQString(":"), mainWidget);
layout->addWidget( layoutg );
- layoutg->setExclusive( TRUE );
+ layoutg->setExclusive( true );
// Insert radiobuttons
rsync_rb1 = new TQRadioButton(i18n("&Utilize rsync + ssh for upload to remote server\nExample: servername:/path/to/remote/folder"), layoutg);
@@ -136,19 +136,19 @@ RsyncConfigDialog::RsyncConfigDialog(TQWidget* parent, const char* name,
rsync_rb3 = new TQRadioButton(i18n("&Utilize unison + ssh for bidirectional synchronization with remote server\nExample: ssh://servername//path/to/remote/folder"), layoutg);
if (syncmode == 1)
- rsync_rb1->setChecked( TRUE );
+ rsync_rb1->setChecked( true );
else if (syncmode == 2)
- rsync_rb2->setChecked( TRUE );
+ rsync_rb2->setChecked( true );
else if (syncmode == 3)
- rsync_rb3->setChecked( TRUE );
+ rsync_rb3->setChecked( true );
//(void)new TQRadioButton( "R&adiobutton 2", layoutg );
//(void)new TQRadioButton( "Ra&diobutton 3", layoutg );
// Create an exclusive button group
- TQButtonGroup *layoutm = new TQButtonGroup( 1, Qt::Horizontal, i18n("Remote Folder")+TQString(":"), mainWidget);
+ TQButtonGroup *layoutm = new TQButtonGroup( 1, TQt::Horizontal, i18n("Remote Folder")+TQString(":"), mainWidget);
layout->addWidget( layoutm );
- layoutg->setExclusive( TRUE );
+ layoutg->setExclusive( true );
m_rsync_txt = new TQLineEdit(layoutm);
if (remotefolder.isEmpty() == false) {
@@ -156,9 +156,9 @@ RsyncConfigDialog::RsyncConfigDialog(TQWidget* parent, const char* name,
}
// Create an exclusive button group
- TQButtonGroup *layouta = new TQButtonGroup( 1, Qt::Horizontal, i18n("Automatic Synchronization")+TQString(":"), mainWidget);
+ TQButtonGroup *layouta = new TQButtonGroup( 1, TQt::Horizontal, i18n("Automatic Synchronization")+TQString(":"), mainWidget);
layout->addWidget( layouta );
- layouta->setExclusive( FALSE );
+ layouta->setExclusive( false );
m_sync_auto_logout_cb = new TQCheckBox(layouta);
m_sync_auto_logout_cb->setText(i18n("Synchronize on logout"));
diff --git a/tdersync/rsyncconfigdialog.h b/tdersync/rsyncconfigdialog.h
index 2ce05b8db..e61d1e1ce 100644
--- a/tdersync/rsyncconfigdialog.h
+++ b/tdersync/rsyncconfigdialog.h
@@ -26,7 +26,7 @@
#include <tqradiobutton.h>
#include <kurl.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tdefileitem.h>
#include <klibloader.h>
#include <kdialogbase.h>
@@ -37,7 +37,7 @@
class RsyncConfigDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdersync/tdersync.cpp b/tdersync/tdersync.cpp
index 464b3923b..e83f22088 100644
--- a/tdersync/tdersync.cpp
+++ b/tdersync/tdersync.cpp
@@ -60,7 +60,7 @@
#define CONFIGURATION_FILE_SEPARATOR ';'
-KDE_EXPORT KRsync::KRsync (TQObject* parent, const char* name)
+TDE_EXPORT KRsync::KRsync (TQObject* parent, const char* name)
: TQObject (parent, name), m_progressDialog(0), m_progressDialogExists(false), m_bSettingsLoaded(false), m_bInSpecialSync(false)
{
loadSettings();
@@ -77,7 +77,7 @@ KDE_EXPORT KRsync::KRsync (TQObject* parent, const char* name)
redirectPass = ""; // FIXME: just a workaround for konq deficiencies
}
-KDE_EXPORT KRsync::~KRsync()
+TDE_EXPORT KRsync::~KRsync()
{
}
@@ -97,6 +97,8 @@ Reference Manual for Version 2.2.x of the GNU C Library */
#ifdef HAVE_GETPT
master = getpt();
+#elif defined(HAVE_POSIX_OPENTPT)
+ master = posix_openpt(O_RDWR);
#else
master = open("/dev/ptmx", O_RDWR);
#endif
@@ -150,7 +152,7 @@ close_master:
/**
creates the unidirectional sync subprocess
*/
-KDE_EXPORT bool KRsync::syncUnidirectional(TQString synccommand, TQString syncflags, int parameter_order, TQString localfolder, TQString remotepath) {
+TDE_EXPORT bool KRsync::syncUnidirectional(TQString synccommand, TQString syncflags, int parameter_order, TQString localfolder, TQString remotepath) {
int fd[2];
int rc, flags;
thisFn = TQString();
@@ -289,7 +291,7 @@ KDE_EXPORT bool KRsync::syncUnidirectional(TQString synccommand, TQString syncfl
/**
creates the bidirectional sync subprocess
*/
-KDE_EXPORT bool KRsync::syncBidirectional(TQString synccommand, TQString syncflags, int parameter_order, TQString localfolder, TQString remotepath) {
+TDE_EXPORT bool KRsync::syncBidirectional(TQString synccommand, TQString syncflags, int parameter_order, TQString localfolder, TQString remotepath) {
int fd[2];
int rc, flags;
thisFn = TQString();
@@ -428,7 +430,7 @@ KDE_EXPORT bool KRsync::syncBidirectional(TQString synccommand, TQString syncfla
/**
writes one chunk of data to stdin of child process
*/
-KDE_EXPORT void KRsync::writeChild(const char *buf, TDEIO::fileoffset_t len) {
+TDE_EXPORT void KRsync::writeChild(const char *buf, TDEIO::fileoffset_t len) {
if (outBufPos >= 0 && outBuf) {
#if 0
TQString debug;
@@ -445,7 +447,7 @@ KDE_EXPORT void KRsync::writeChild(const char *buf, TDEIO::fileoffset_t len) {
/**
manages initial communication setup including password queries
*/
-KDE_EXPORT int KRsync::establishConnectionRsync(char *buffer, TDEIO::fileoffset_t len) {
+TDE_EXPORT int KRsync::establishConnectionRsync(char *buffer, TDEIO::fileoffset_t len) {
TQString buf;
buf.setLatin1(buffer,len);
int pos;
@@ -477,7 +479,7 @@ KDE_EXPORT int KRsync::establishConnectionRsync(char *buffer, TDEIO::fileoffset_
m_progressDialog->setAutoClose(true);
m_progressDialog->progressBar()->setTotalSteps(2);
m_progressDialog->progressBar()->setValue(1);
- connect (m_progressDialog, TQT_SIGNAL(cancelClicked()), TQT_SLOT(slotRsyncCancelled()));
+ connect (m_progressDialog, TQ_SIGNAL(cancelClicked()), TQ_SLOT(slotRsyncCancelled()));
if (m_bInSpecialSync) m_progressDialog->move(0,0);
m_progressDialog->show();
m_progressDialogExists = true;
@@ -560,7 +562,7 @@ KDE_EXPORT int KRsync::establishConnectionRsync(char *buffer, TDEIO::fileoffset_
/**
manages initial communication setup including password queries
*/
-KDE_EXPORT int KRsync::establishConnectionUnison(char *buffer, TDEIO::fileoffset_t len, TQString localfolder, TQString remotepath) {
+TDE_EXPORT int KRsync::establishConnectionUnison(char *buffer, TDEIO::fileoffset_t len, TQString localfolder, TQString remotepath) {
TQString buf;
buf.setLatin1(buffer,len);
int pos;
@@ -600,7 +602,7 @@ KDE_EXPORT int KRsync::establishConnectionUnison(char *buffer, TDEIO::fileoffset
m_progressDialog->progressBar()->setFormat("%v / %m");
m_progressDialog->progressBar()->setTotalSteps(0);
m_progressDialog->setAutoClose(true);
- connect (m_progressDialog, TQT_SIGNAL(cancelClicked()), TQT_SLOT(slotUnisonCancelled()));
+ connect (m_progressDialog, TQ_SIGNAL(cancelClicked()), TQ_SLOT(slotUnisonCancelled()));
if (m_bInSpecialSync) m_progressDialog->move(0,0);
m_progressDialog->show();
m_progressDialogExists = true;
@@ -744,7 +746,7 @@ Forced close of the connection
This function gets called from the application side of the universe,
it shouldn't send any response.
*/
-KDE_EXPORT void KRsync::closeConnection(){
+TDE_EXPORT void KRsync::closeConnection(){
myDebug( << "closeConnection()" << endl);
shutdownConnection(true, false);
}
@@ -752,7 +754,7 @@ KDE_EXPORT void KRsync::closeConnection(){
/**
Closes the connection
*/
-KDE_EXPORT void KRsync::shutdownConnection(bool forced, bool wait){
+TDE_EXPORT void KRsync::shutdownConnection(bool forced, bool wait){
if (childPid) {
kill(childPid,SIGTERM); // We may not have permission...
childPid = 0;
@@ -773,7 +775,7 @@ KDE_EXPORT void KRsync::shutdownConnection(bool forced, bool wait){
//
// --------------------------------------------------------------------------------------------
-KDE_EXPORT void KRsync::saveSettings()
+TDE_EXPORT void KRsync::saveSettings()
{
TDEConfig cfg ("rsyncrc", false, false);
cfg.setGroup ("General");
@@ -782,7 +784,7 @@ KDE_EXPORT void KRsync::saveSettings()
cfg.sync();
}
-KDE_EXPORT void KRsync::loadSettings()
+TDE_EXPORT void KRsync::loadSettings()
{
if (m_bSettingsLoaded)
return;
@@ -796,7 +798,7 @@ KDE_EXPORT void KRsync::loadSettings()
m_bSettingsLoaded = true;
}
-KDE_EXPORT void KRsync::executeLogoutAutoSync()
+TDE_EXPORT void KRsync::executeLogoutAutoSync()
{
for (TQStringList::Iterator i(cfgautosync_onlogout_list.begin()); i != cfgautosync_onlogout_list.end(); ++i) {
setCurrentDirectoryURL(*i);
@@ -806,7 +808,7 @@ KDE_EXPORT void KRsync::executeLogoutAutoSync()
}
}
-KDE_EXPORT TQString KRsync::findLocalFolderByName(TQString folderurl)
+TDE_EXPORT TQString KRsync::findLocalFolderByName(TQString folderurl)
{
TQString folderurl_stripped;
folderurl_stripped = folderurl;
@@ -825,7 +827,7 @@ KDE_EXPORT TQString KRsync::findLocalFolderByName(TQString folderurl)
return NULL;
}
-KDE_EXPORT TQString KRsync::findSyncMethodByName(TQString folderurl)
+TDE_EXPORT TQString KRsync::findSyncMethodByName(TQString folderurl)
{
TQString folderurl_stripped;
folderurl_stripped = folderurl;
@@ -844,7 +846,7 @@ KDE_EXPORT TQString KRsync::findSyncMethodByName(TQString folderurl)
return NULL;
}
-KDE_EXPORT TQString KRsync::findLoginSyncEnabledByName(TQString folderurl)
+TDE_EXPORT TQString KRsync::findLoginSyncEnabledByName(TQString folderurl)
{
TQString folderurl_stripped;
folderurl_stripped = folderurl;
@@ -863,7 +865,7 @@ KDE_EXPORT TQString KRsync::findLoginSyncEnabledByName(TQString folderurl)
return NULL;
}
-KDE_EXPORT TQString KRsync::findLogoutSyncEnabledByName(TQString folderurl)
+TDE_EXPORT TQString KRsync::findLogoutSyncEnabledByName(TQString folderurl)
{
TQString folderurl_stripped;
folderurl_stripped = folderurl;
@@ -882,7 +884,7 @@ KDE_EXPORT TQString KRsync::findLogoutSyncEnabledByName(TQString folderurl)
return NULL;
}
-KDE_EXPORT TQString KRsync::findTimedSyncEnabledByName(TQString folderurl)
+TDE_EXPORT TQString KRsync::findTimedSyncEnabledByName(TQString folderurl)
{
TQString folderurl_stripped;
folderurl_stripped = folderurl;
@@ -901,7 +903,7 @@ KDE_EXPORT TQString KRsync::findTimedSyncEnabledByName(TQString folderurl)
return NULL;
}
-KDE_EXPORT int KRsync::deleteLocalFolderByName(TQString folderurl)
+TDE_EXPORT int KRsync::deleteLocalFolderByName(TQString folderurl)
{
TQString folderurl_stripped;
folderurl_stripped = folderurl;
@@ -921,7 +923,7 @@ KDE_EXPORT int KRsync::deleteLocalFolderByName(TQString folderurl)
return 1;
}
-KDE_EXPORT int KRsync::addLocalFolderByName(TQString folderurl, TQString remoteurl, TQString syncmethod, TQString excludelist, TQString sync_on_login, TQString sync_on_logout, TQString sync_timed_interval)
+TDE_EXPORT int KRsync::addLocalFolderByName(TQString folderurl, TQString remoteurl, TQString syncmethod, TQString excludelist, TQString sync_on_login, TQString sync_on_logout, TQString sync_timed_interval)
{
TQString folderurl_stripped;
folderurl_stripped = folderurl;
@@ -936,12 +938,12 @@ KDE_EXPORT int KRsync::addLocalFolderByName(TQString folderurl, TQString remoteu
return 1;
}
-KDE_EXPORT void KRsync::setCurrentDirectoryURL (KURL url)
+TDE_EXPORT void KRsync::setCurrentDirectoryURL (KURL url)
{
m_pURL = url;
}
-KDE_EXPORT void KRsync::slotSetup()
+TDE_EXPORT void KRsync::slotSetup()
{
KURL url = m_pURL;
@@ -975,11 +977,11 @@ KDE_EXPORT void KRsync::slotSetup()
m_configDialog->show();
- connect (m_configDialog, TQT_SIGNAL(okClicked()), TQT_SLOT(slotSetupOK()));
- connect (m_configDialog, TQT_SIGNAL(cancelClicked()), TQT_SLOT(slotSetupCancelled()));
+ connect (m_configDialog, TQ_SIGNAL(okClicked()), TQ_SLOT(slotSetupOK()));
+ connect (m_configDialog, TQ_SIGNAL(cancelClicked()), TQ_SLOT(slotSetupCancelled()));
}
-KDE_EXPORT void KRsync::slotSetupOK()
+TDE_EXPORT void KRsync::slotSetupOK()
{
KURL url = m_pURL;
@@ -1017,12 +1019,12 @@ KDE_EXPORT void KRsync::slotSetupOK()
emit setupDone();
}
-KDE_EXPORT void KRsync::slotSetupCancelled()
+TDE_EXPORT void KRsync::slotSetupCancelled()
{
emit setupDone();
}
-KDE_EXPORT void KRsync::slotRsyncCancelled()
+TDE_EXPORT void KRsync::slotRsyncCancelled()
{
shutdownConnection(true, true);
if (m_progressDialogExists == true) {
@@ -1032,7 +1034,7 @@ KDE_EXPORT void KRsync::slotRsyncCancelled()
emit transferDone();
}
-KDE_EXPORT void KRsync::slotUnisonCancelled()
+TDE_EXPORT void KRsync::slotUnisonCancelled()
{
shutdownConnection(true, true);
if (m_progressDialogExists == true) {
@@ -1044,7 +1046,7 @@ KDE_EXPORT void KRsync::slotUnisonCancelled()
emit transferDone();
}
-KDE_EXPORT void KRsync::slotSync()
+TDE_EXPORT void KRsync::slotSync()
{
KURL url = m_pURL;
diff --git a/tdersync/tdersync.h b/tdersync/tdersync.h
index 54d3090ed..0d642fcde 100644
--- a/tdersync/tdersync.h
+++ b/tdersync/tdersync.h
@@ -23,7 +23,7 @@
#include <tqstringlist.h>
#include <kurl.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tdefileitem.h>
#include <klibloader.h>
#include <tdeparts/plugin.h>
@@ -50,7 +50,7 @@
#include <kdebug.h>
#include <tdelocale.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include <twin.h>
#include <kurl.h>
@@ -65,7 +65,7 @@
#include <tdeconfigdialog.h>
#include <kdirlister.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelistviewsearchline.h>
#include <kiconviewsearchline.h>
#include <kstaticdeleter.h>
@@ -84,7 +84,7 @@ namespace KParts
class KRsync : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-26 11:13:32 +0000