summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeL10n.txt10
-rw-r--r--src/CMakeLists.txt6
-rw-r--r--src/commandline_part.h2
-rw-r--r--src/helpers/sshagent.cpp20
-rw-r--r--src/helpers/sshagent.h2
-rw-r--r--src/helpers/sub2qt.cpp2
-rw-r--r--src/helpers/sub2qt.h2
-rw-r--r--src/ksvnwidgets/authdialogimpl.h2
-rw-r--r--src/ksvnwidgets/authdlg.ui13
-rw-r--r--src/ksvnwidgets/depthselector.cpp2
-rw-r--r--src/ksvnwidgets/depthselector.h4
-rw-r--r--src/ksvnwidgets/diffbrowser.cpp6
-rw-r--r--src/ksvnwidgets/diffbrowser.h2
-rw-r--r--src/ksvnwidgets/encodingselector.ui4
-rw-r--r--src/ksvnwidgets/encodingselector_impl.h2
-rw-r--r--src/ksvnwidgets/logmessage.ui4
-rw-r--r--src/ksvnwidgets/logmsg_impl.cpp4
-rw-r--r--src/ksvnwidgets/logmsg_impl.h4
-rw-r--r--src/ksvnwidgets/pwstorage.h2
-rw-r--r--src/ksvnwidgets/revertform.ui6
-rw-r--r--src/ksvnwidgets/revertform_impl.h4
-rw-r--r--src/ksvnwidgets/ssltrustprompt_impl.h2
-rw-r--r--src/settings/cmdexecsettings.ui4
-rw-r--r--src/settings/cmdexecsettings_impl.h2
-rw-r--r--src/settings/diffmergesettings.ui4
-rw-r--r--src/settings/diffmergesettings_impl.h2
-rw-r--r--src/settings/dispcolor_settings.ui10
-rw-r--r--src/settings/dispcolorsettings_impl.h2
-rw-r--r--src/settings/display_settings.ui7
-rw-r--r--src/settings/displaysettings_impl.h2
-rw-r--r--src/settings/revisiontreesettingsdlg_impl.h2
-rw-r--r--src/settings/subversion_settings.ui30
-rw-r--r--src/settings/subversionsettings_impl.h2
-rw-r--r--src/settings/tdesvn_part.kcfg2
-rw-r--r--src/svnfrontend/blamedisplay.ui4
-rw-r--r--src/svnfrontend/blamedisplay_impl.cpp18
-rw-r--r--src/svnfrontend/blamedisplay_impl.h4
-rw-r--r--src/svnfrontend/cacheentry.h6
-rw-r--r--src/svnfrontend/ccontextlistener.h6
-rw-r--r--src/svnfrontend/commandexec.cpp66
-rw-r--r--src/svnfrontend/commandexec.h2
-rw-r--r--src/svnfrontend/copymoveview.ui3
-rw-r--r--src/svnfrontend/copymoveview_impl.h2
-rw-r--r--src/svnfrontend/createrepo_dlg.ui13
-rw-r--r--src/svnfrontend/createrepo_impl.h2
-rw-r--r--src/svnfrontend/dumprepo_dlg.ui13
-rw-r--r--src/svnfrontend/dumprepo_impl.h2
-rw-r--r--src/svnfrontend/editproperty_impl.cpp2
-rw-r--r--src/svnfrontend/editproperty_impl.h2
-rw-r--r--src/svnfrontend/editpropsdlg.ui13
-rw-r--r--src/svnfrontend/filelistviewitem.cpp8
-rw-r--r--src/svnfrontend/filelistviewitem.h2
-rw-r--r--src/svnfrontend/fillcachethread.cpp8
-rw-r--r--src/svnfrontend/fillcachethread.h6
-rw-r--r--src/svnfrontend/frontendtypes.h2
-rw-r--r--src/svnfrontend/fronthelpers/checkoutinfo.ui7
-rw-r--r--src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp2
-rw-r--r--src/svnfrontend/fronthelpers/checkoutinfo_impl.h6
-rw-r--r--src/svnfrontend/fronthelpers/propertylist.cpp10
-rw-r--r--src/svnfrontend/fronthelpers/propertylist.h4
-rw-r--r--src/svnfrontend/fronthelpers/rangeinput.ui10
-rw-r--r--src/svnfrontend/fronthelpers/rangeinput_impl.h4
-rw-r--r--src/svnfrontend/fronthelpers/revisionbutton.ui4
-rw-r--r--src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp2
-rw-r--r--src/svnfrontend/fronthelpers/revisionbuttonimpl.h4
-rw-r--r--src/svnfrontend/graphtree/elogentry.h2
-rw-r--r--src/svnfrontend/graphtree/pannerview.h2
-rw-r--r--src/svnfrontend/graphtree/revgraphview.cpp30
-rw-r--r--src/svnfrontend/graphtree/revgraphview.h4
-rw-r--r--src/svnfrontend/graphtree/revisiontree.cpp8
-rw-r--r--src/svnfrontend/graphtree/revisiontree.h6
-rw-r--r--src/svnfrontend/graphtree/revtreewidget.cpp16
-rw-r--r--src/svnfrontend/graphtree/revtreewidget.h4
-rw-r--r--src/svnfrontend/hotcopydlg.ui3
-rw-r--r--src/svnfrontend/hotcopydlg_impl.h2
-rw-r--r--src/svnfrontend/importdir_logmsg.cpp2
-rw-r--r--src/svnfrontend/importdir_logmsg.h2
-rw-r--r--src/svnfrontend/itemdisplay.cpp2
-rw-r--r--src/svnfrontend/itemdisplay.h2
-rw-r--r--src/svnfrontend/loaddmpdlg.ui15
-rw-r--r--src/svnfrontend/loaddmpdlg_impl.h2
-rw-r--r--src/svnfrontend/merge_dlg.ui13
-rw-r--r--src/svnfrontend/mergedlg_impl.cpp2
-rw-r--r--src/svnfrontend/mergedlg_impl.h2
-rw-r--r--src/svnfrontend/modifiedthread.cpp4
-rw-r--r--src/svnfrontend/modifiedthread.h6
-rw-r--r--src/svnfrontend/opencontextmenu.cpp6
-rw-r--r--src/svnfrontend/opencontextmenu.h2
-rw-r--r--src/svnfrontend/propertiesdlg.cpp14
-rw-r--r--src/svnfrontend/propertiesdlg.h6
-rw-r--r--src/svnfrontend/stopdlg.cpp16
-rw-r--r--src/svnfrontend/stopdlg.h4
-rw-r--r--src/svnfrontend/svnactions.cpp130
-rw-r--r--src/svnfrontend/svnactions.h12
-rw-r--r--src/svnfrontend/svnfiletip.cpp14
-rw-r--r--src/svnfrontend/svnfiletip.h2
-rw-r--r--src/svnfrontend/svnitem.cpp6
-rw-r--r--src/svnfrontend/svnitem.h4
-rw-r--r--src/svnfrontend/svnlogdlg.ui19
-rw-r--r--src/svnfrontend/svnlogdlgimp.cpp10
-rw-r--r--src/svnfrontend/svnlogdlgimp.h8
-rw-r--r--src/svnfrontend/tcontextlistener.h2
-rw-r--r--src/svnfrontend/tdesvnfilelist.cpp190
-rw-r--r--src/svnfrontend/tdesvnfilelist.h6
-rw-r--r--src/svnfrontend/threadcontextlistenerdata.h2
-rw-r--r--src/svnqt/CMakeLists.txt180
-rw-r--r--src/svnqt/LICENSE_SVN2
-rw-r--r--src/svnqt/annotate_line.h (renamed from src/svnqt/annotate_line.hpp)15
-rw-r--r--src/svnqt/apr.cpp4
-rw-r--r--src/svnqt/apr.h (renamed from src/svnqt/apr.hpp)7
-rw-r--r--src/svnqt/cache/DatabaseException.cpp2
-rw-r--r--src/svnqt/cache/DatabaseException.h (renamed from src/svnqt/cache/DatabaseException.hpp)2
-rw-r--r--src/svnqt/cache/LogCache.cpp6
-rw-r--r--src/svnqt/cache/LogCache.h (renamed from src/svnqt/cache/LogCache.hpp)4
-rw-r--r--src/svnqt/cache/ReposLog.cpp16
-rw-r--r--src/svnqt/cache/ReposLog.h (renamed from src/svnqt/cache/ReposLog.hpp)6
-rw-r--r--src/svnqt/cache/sqlite3/README11
-rw-r--r--src/svnqt/cache/test/CMakeLists.txt28
-rw-r--r--src/svnqt/cache/test/sqlite.cpp12
-rw-r--r--src/svnqt/check.h (renamed from src/svnqt/check.hpp)7
-rw-r--r--src/svnqt/client.cpp14
-rw-r--r--src/svnqt/client.h (renamed from src/svnqt/client.hpp)113
-rw-r--r--src/svnqt/client_annotate.cpp8
-rw-r--r--src/svnqt/client_cat.cpp28
-rw-r--r--src/svnqt/client_diff.cpp30
-rw-r--r--src/svnqt/client_impl.cpp12
-rw-r--r--src/svnqt/client_impl.h (renamed from src/svnqt/client_impl.hpp)91
-rw-r--r--src/svnqt/client_lock.cpp14
-rw-r--r--src/svnqt/client_ls.cpp24
-rw-r--r--src/svnqt/client_merge.cpp20
-rw-r--r--src/svnqt/client_modify.cpp60
-rw-r--r--src/svnqt/client_property.cpp22
-rw-r--r--src/svnqt/client_status.cpp40
-rw-r--r--src/svnqt/cmakemodules/FindSqlite.cmake4
-rw-r--r--src/svnqt/cmakemodules/FindSubversion.cmake96
-rw-r--r--src/svnqt/commititem.cpp2
-rw-r--r--src/svnqt/commititem.h (renamed from src/svnqt/commititem.hpp)2
-rw-r--r--src/svnqt/conflictdescription.cpp4
-rw-r--r--src/svnqt/conflictdescription.h (renamed from src/svnqt/conflictdescription.hpp)4
-rw-r--r--src/svnqt/conflictresult.cpp4
-rw-r--r--src/svnqt/conflictresult.h (renamed from src/svnqt/conflictresult.hpp)4
-rw-r--r--src/svnqt/context.cpp16
-rw-r--r--src/svnqt/context.h (renamed from src/svnqt/context.hpp)15
-rw-r--r--src/svnqt/context_listener.h (renamed from src/svnqt/context_listener.hpp)15
-rw-r--r--src/svnqt/contextdata.cpp8
-rw-r--r--src/svnqt/contextdata.h (renamed from src/svnqt/contextdata.hpp)8
-rw-r--r--src/svnqt/datetime.cpp8
-rw-r--r--src/svnqt/datetime.h (renamed from src/svnqt/datetime.hpp)9
-rw-r--r--src/svnqt/diff_data.cpp6
-rw-r--r--src/svnqt/diff_data.h (renamed from src/svnqt/diff_data.hpp)8
-rw-r--r--src/svnqt/diffoptions.cpp6
-rw-r--r--src/svnqt/diffoptions.h (renamed from src/svnqt/diffoptions.hpp)2
-rw-r--r--src/svnqt/dirent.cpp14
-rw-r--r--src/svnqt/dirent.h (renamed from src/svnqt/dirent.hpp)13
-rw-r--r--src/svnqt/entry.cpp4
-rw-r--r--src/svnqt/entry.h (renamed from src/svnqt/entry.hpp)19
-rw-r--r--src/svnqt/exception.cpp11
-rw-r--r--src/svnqt/exception.h (renamed from src/svnqt/exception.hpp)9
-rw-r--r--src/svnqt/helper.h (renamed from src/svnqt/helper.hpp)4
-rw-r--r--src/svnqt/info_entry.cpp6
-rw-r--r--src/svnqt/info_entry.h (renamed from src/svnqt/info_entry.hpp)8
-rw-r--r--src/svnqt/lock_entry.cpp12
-rw-r--r--src/svnqt/lock_entry.h (renamed from src/svnqt/lock_entry.hpp)12
-rw-r--r--src/svnqt/log_entry.cpp6
-rw-r--r--src/svnqt/log_entry.h (renamed from src/svnqt/log_entry.hpp)11
-rw-r--r--src/svnqt/path.cpp20
-rw-r--r--src/svnqt/path.h (renamed from src/svnqt/path.hpp)11
-rw-r--r--src/svnqt/pool.cpp10
-rw-r--r--src/svnqt/pool.h (renamed from src/svnqt/pool.hpp)8
-rw-r--r--src/svnqt/repository.cpp16
-rw-r--r--src/svnqt/repository.h (renamed from src/svnqt/repository.hpp)16
-rw-r--r--src/svnqt/repositorydata.cpp10
-rw-r--r--src/svnqt/repositorydata.h (renamed from src/svnqt/repositorydata.hpp)8
-rw-r--r--src/svnqt/repositorylistener.cpp2
-rw-r--r--src/svnqt/repositorylistener.h (renamed from src/svnqt/repositorylistener.hpp)2
-rw-r--r--src/svnqt/revision.cpp14
-rw-r--r--src/svnqt/revision.h (renamed from src/svnqt/revision.hpp)13
-rw-r--r--src/svnqt/shared_pointer.h (renamed from src/svnqt/shared_pointer.hpp)6
-rw-r--r--src/svnqt/smart_pointer.h (renamed from src/svnqt/smart_pointer.hpp)2
-rw-r--r--src/svnqt/status.cpp10
-rw-r--r--src/svnqt/status.h (renamed from src/svnqt/status.hpp)23
-rw-r--r--src/svnqt/stringarray.cpp4
-rw-r--r--src/svnqt/stringarray.h (renamed from src/svnqt/stringarray.hpp)4
-rw-r--r--src/svnqt/svnfilestream.cpp2
-rw-r--r--src/svnqt/svnfilestream.h (renamed from src/svnqt/svnfilestream.hpp)2
-rw-r--r--src/svnqt/svnqt_defines.h.in (renamed from src/svnqt/svnqt_defines.hpp.in)0
-rw-r--r--src/svnqt/svnqttypes.h (renamed from src/svnqt/svnqttypes.hpp)6
-rw-r--r--src/svnqt/svnstream.cpp10
-rw-r--r--src/svnqt/svnstream.h (renamed from src/svnqt/svnstream.hpp)2
-rw-r--r--src/svnqt/targets.cpp16
-rw-r--r--src/svnqt/targets.h (renamed from src/svnqt/targets.hpp)11
-rw-r--r--src/svnqt/testmain.cpp8
-rw-r--r--src/svnqt/tests/CMakeLists.txt36
-rw-r--r--src/svnqt/tests/ckpath.cpp2
-rw-r--r--src/svnqt/tests/crepo.cpp8
-rw-r--r--src/svnqt/tests/lsdir.cpp6
-rw-r--r--src/svnqt/tests/testlistener.h2
-rw-r--r--src/svnqt/url.cpp12
-rw-r--r--src/svnqt/url.h (renamed from src/svnqt/url.hpp)12
-rw-r--r--src/svnqt/version_check.cpp2
-rw-r--r--src/svnqt/version_check.h (renamed from src/svnqt/version_check.hpp)2
-rw-r--r--src/svnqt/wc.cpp24
-rw-r--r--src/svnqt/wc.h (renamed from src/svnqt/wc.hpp)21
-rw-r--r--src/tdeiosvn/CMakeLists.txt5
-rw-r--r--src/tdeiosvn/ksvn+file.protocol34
-rw-r--r--src/tdeiosvn/ksvn+http.protocol34
-rw-r--r--src/tdeiosvn/ksvn+https.protocol34
-rw-r--r--src/tdeiosvn/ksvn+ssh.protocol34
-rw-r--r--src/tdeiosvn/ksvn.protocol34
-rw-r--r--src/tdeiosvn/svn+file.protocol34
-rw-r--r--src/tdeiosvn/svn+http.protocol34
-rw-r--r--src/tdeiosvn/svn+https.protocol34
-rw-r--r--src/tdeiosvn/svn+ssh.protocol34
-rw-r--r--src/tdeiosvn/svn.protocol34
-rw-r--r--src/tdeiosvn/tdeiobytestream.h2
-rw-r--r--src/tdeiosvn/tdeiolistener.cpp6
-rw-r--r--src/tdeiosvn/tdeiolistener.h2
-rw-r--r--src/tdeiosvn/tdeiosvn.cpp14
-rw-r--r--src/tdesvn.cpp44
-rw-r--r--src/tdesvn.desktop19
-rw-r--r--src/tdesvn.h2
-rw-r--r--src/tdesvn_events.h2
-rw-r--r--src/tdesvn_part.cpp39
-rw-r--r--src/tdesvn_part.h7
-rw-r--r--src/tdesvnd/CMakeLists.txt12
-rw-r--r--src/tdesvnd/tdesvn_subversion.desktop.cmake130
-rw-r--r--src/tdesvnd/tdesvn_subversion.desktop.in368
-rw-r--r--src/tdesvnd/tdesvnd.desktop7
-rw-r--r--src/tdesvnd/tdesvnd_dcop.cpp10
-rw-r--r--src/tdesvnd/tdesvnd_dcop.h2
-rw-r--r--src/tdesvnview.cpp46
-rw-r--r--src/tdesvnview.h4
-rw-r--r--src/urldlg.cpp4
-rw-r--r--src/urldlg.h2
234 files changed, 1389 insertions, 2162 deletions
diff --git a/src/CMakeL10n.txt b/src/CMakeL10n.txt
index 0a39ac0..8cc80c0 100644
--- a/src/CMakeL10n.txt
+++ b/src/CMakeL10n.txt
@@ -12,10 +12,18 @@ file( WRITE "${CMAKE_CURRENT_SOURCE_DIR}/svnfrontend/svnactions.cpp.tde_l10n" "$
##### create translation templates ##############
tde_l10n_create_template(
- CATALOG "tdesvn"
+ CATALOG "messages/tdesvn"
SOURCES
"."
"svnfrontend/svnactions.cpp.tde_l10n"
EXCLUDES
"^svnfrontend/svnactions\\\\.cpp\$"
)
+
+tde_l10n_create_template(
+ CATALOG "desktop_files/tdesvn-desktops"
+ SOURCES
+ *.desktop
+ *.desktop.cmake
+ *.protocol
+)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 91ac206..d9d1f0e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -36,9 +36,9 @@ link_directories(
##### other data ################################
-INSTALL(FILES tdesvnui.rc DESTINATION ${DATA_INSTALL_DIR}/tdesvn)
-INSTALL(FILES tdesvn_part.rc DESTINATION ${DATA_INSTALL_DIR}/tdesvnpart)
-INSTALL(FILES tdesvn.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+install(FILES tdesvnui.rc DESTINATION ${DATA_INSTALL_DIR}/tdesvn)
+install(FILES tdesvn_part.rc DESTINATION ${DATA_INSTALL_DIR}/tdesvnpart)
+tde_create_translated_desktop( tdesvn.desktop )
##### tdesvnaskpass #############################
diff --git a/src/commandline_part.h b/src/commandline_part.h
index 00b7139..6b022c2 100644
--- a/src/commandline_part.h
+++ b/src/commandline_part.h
@@ -30,7 +30,7 @@ class TDECmdLineArgs;
*/
class commandline_part : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
commandline_part(TQObject *parent, const char *name, TDECmdLineArgs *args);
diff --git a/src/helpers/sshagent.cpp b/src/helpers/sshagent.cpp
index 04271c3..e42b071 100644
--- a/src/helpers/sshagent.cpp
+++ b/src/helpers/sshagent.cpp
@@ -134,10 +134,10 @@ bool SshAgent::addSshIdentities(bool force)
proc << "ssh-add";
- connect(&proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
- TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
- connect(&proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
- TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)));
+ connect(&proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+ TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
+ connect(&proc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+ TQ_SLOT(slotReceivedStderr(TDEProcess*, char*, int)));
proc.start(TDEProcess::DontCare, TDEProcess::AllOutput);
@@ -238,12 +238,12 @@ bool SshAgent::startSshAgent()
proc << "ssh-agent";
- connect(&proc, TQT_SIGNAL(processExited(TDEProcess*)),
- TQT_SLOT(slotProcessExited(TDEProcess*)));
- connect(&proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
- TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
- connect(&proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
- TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)) );
+ connect(&proc, TQ_SIGNAL(processExited(TDEProcess*)),
+ TQ_SLOT(slotProcessExited(TDEProcess*)));
+ connect(&proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+ TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
+ connect(&proc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+ TQ_SLOT(slotReceivedStderr(TDEProcess*, char*, int)) );
proc.start(TDEProcess::NotifyOnExit, TDEProcess::All);
diff --git a/src/helpers/sshagent.h b/src/helpers/sshagent.h
index cc78cae..1aab1dd 100644
--- a/src/helpers/sshagent.h
+++ b/src/helpers/sshagent.h
@@ -30,7 +30,7 @@ class TDEProcess;
class SshAgent : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/src/helpers/sub2qt.cpp b/src/helpers/sub2qt.cpp
index 35cf248..d14e64c 100644
--- a/src/helpers/sub2qt.cpp
+++ b/src/helpers/sub2qt.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include "sub2qt.h"
-#include "datetime.hpp"
+#include "datetime.h"
#include "tdeglobal.h"
#include "tdelocale.h"
#include <tqmap.h>
diff --git a/src/helpers/sub2qt.h b/src/helpers/sub2qt.h
index bc158df..6b1520f 100644
--- a/src/helpers/sub2qt.h
+++ b/src/helpers/sub2qt.h
@@ -20,7 +20,7 @@
#ifndef HELPERSSUB2TQT_H
#define HELPERSSUB2TQT_H
-#include "datetime.hpp"
+#include "datetime.h"
#include <tqdatetime.h>
#include <tqstring.h>
#include <svn_time.h>
diff --git a/src/ksvnwidgets/authdialogimpl.h b/src/ksvnwidgets/authdialogimpl.h
index 3a32475..0d8b18f 100644
--- a/src/ksvnwidgets/authdialogimpl.h
+++ b/src/ksvnwidgets/authdialogimpl.h
@@ -24,7 +24,7 @@
#include <tqstring.h>
class AuthDialogImpl: public AuthDialogData {
-Q_OBJECT
+TQ_OBJECT
public:
AuthDialogImpl(const TQString & realm = "",const TQString&user="", TQWidget *parent = 0, const char *name = 0);
diff --git a/src/ksvnwidgets/authdlg.ui b/src/ksvnwidgets/authdlg.ui
index ce24474..fd8b89e 100644
--- a/src/ksvnwidgets/authdlg.ui
+++ b/src/ksvnwidgets/authdlg.ui
@@ -95,9 +95,6 @@
<property name="text">
<string>OK</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
@@ -112,9 +109,6 @@
<property name="text">
<string>Cancel</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
@@ -143,9 +137,6 @@
<property name="text">
<string>Help</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
@@ -184,9 +175,9 @@
<tabstop>buttonCancel</tabstop>
<tabstop>buttonHelp</tabstop>
</tabstops>
-<Q_SLOTS>
+<slots>
<slot access="protected">slotHelp()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">klineedit.h</include>
diff --git a/src/ksvnwidgets/depthselector.cpp b/src/ksvnwidgets/depthselector.cpp
index 6840ec9..78c1a7d 100644
--- a/src/ksvnwidgets/depthselector.cpp
+++ b/src/ksvnwidgets/depthselector.cpp
@@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include "depthselector.h"
-#include "version_check.hpp"
+#include "version_check.h"
#include <tdelocale.h>
diff --git a/src/ksvnwidgets/depthselector.h b/src/ksvnwidgets/depthselector.h
index ce44d29..ea76862 100644
--- a/src/ksvnwidgets/depthselector.h
+++ b/src/ksvnwidgets/depthselector.h
@@ -22,12 +22,12 @@
#include "depthform.h"
-#include "svnqttypes.hpp"
+#include "svnqttypes.h"
class TQCheckBox;
class DepthSelector: public DepthSettings {
- Q_OBJECT
+ TQ_OBJECT
public:
DepthSelector(TQWidget *parent = 0, const char *name = 0);
diff --git a/src/ksvnwidgets/diffbrowser.cpp b/src/ksvnwidgets/diffbrowser.cpp
index a77e77f..19b2c71 100644
--- a/src/ksvnwidgets/diffbrowser.cpp
+++ b/src/ksvnwidgets/diffbrowser.cpp
@@ -95,7 +95,7 @@ void DiffBrowser::saveDiff()
}
TQFile tfile(saveTo);
if (tfile.exists()) {
- if (KMessageBox::warningYesNo(TQT_TQWIDGET(TDEApplication::activeModalWidget()),
+ if (KMessageBox::warningYesNo(TDEApplication::activeModalWidget(),
i18n("File %1 exists - overwrite?").arg(saveTo))
!=KMessageBox::Yes) {
return;
@@ -131,8 +131,8 @@ void DiffBrowser::startSearch()
{
if( !m_Data->srchdialog ) {
m_Data->srchdialog = new KEdFind( this, "searchdialog", false);
- connect(m_Data->srchdialog,TQT_SIGNAL(search()),this,TQT_SLOT(search_slot()));
- connect(m_Data->srchdialog,TQT_SIGNAL(done()),this,TQT_SLOT(searchdone_slot()));
+ connect(m_Data->srchdialog,TQ_SIGNAL(search()),this,TQ_SLOT(search_slot()));
+ connect(m_Data->srchdialog,TQ_SIGNAL(done()),this,TQ_SLOT(searchdone_slot()));
}
TQString _st = m_Data->srchdialog->getText();
m_Data->srchdialog->setText(_st.isEmpty() ? m_Data->pattern : _st);
diff --git a/src/ksvnwidgets/diffbrowser.h b/src/ksvnwidgets/diffbrowser.h
index 5fa2dae..896eab0 100644
--- a/src/ksvnwidgets/diffbrowser.h
+++ b/src/ksvnwidgets/diffbrowser.h
@@ -29,7 +29,7 @@ class DiffBrowserData;
class DiffBrowser : public KTextBrowser
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/src/ksvnwidgets/encodingselector.ui b/src/ksvnwidgets/encodingselector.ui
index e1ce254..ea3b33c 100644
--- a/src/ksvnwidgets/encodingselector.ui
+++ b/src/ksvnwidgets/encodingselector.ui
@@ -84,8 +84,8 @@
<slot>itemActivated(int)</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot access="protected">itemActivated(int)</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/src/ksvnwidgets/encodingselector_impl.h b/src/ksvnwidgets/encodingselector_impl.h
index 20cbe27..48b0573 100644
--- a/src/ksvnwidgets/encodingselector_impl.h
+++ b/src/ksvnwidgets/encodingselector_impl.h
@@ -25,7 +25,7 @@
class TQTextCodec;
class EncodingSelector_impl: public EncodingSelector {
-Q_OBJECT
+TQ_OBJECT
public:
EncodingSelector_impl(const TQString&cur, TQWidget *parent = 0, const char *name = 0);
diff --git a/src/ksvnwidgets/logmessage.ui b/src/ksvnwidgets/logmessage.ui
index 6be884e..9d935c5 100644
--- a/src/ksvnwidgets/logmessage.ui
+++ b/src/ksvnwidgets/logmessage.ui
@@ -326,7 +326,7 @@
<slot>insertFile()</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot access="protected">slotHistoryActivated(const TQString&amp;)</slot>
<slot access="protected">slotHistoryActivated(int)</slot>
<slot access="protected">slotMarkUnversioned()</slot>
@@ -334,7 +334,7 @@
<slot access="protected">slotUnmarkUnversioned()</slot>
<slot access="protected">hideNewItems(bool)</slot>
<slot access="protected">insertFile()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="2" margin="2"/>
<includes>
<include location="global" impldecl="in implementation">kcombobox.h</include>
diff --git a/src/ksvnwidgets/logmsg_impl.cpp b/src/ksvnwidgets/logmsg_impl.cpp
index aae4d0f..c93adb9 100644
--- a/src/ksvnwidgets/logmsg_impl.cpp
+++ b/src/ksvnwidgets/logmsg_impl.cpp
@@ -422,8 +422,8 @@ TQString Logmsg_impl::getLogmessage(const logActionEntries&_on,
ptr->initHistory();
if (callback)
{
- connect(ptr,TQT_SIGNAL(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)),
- callback,TQT_SLOT(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)));
+ connect(ptr,TQ_SIGNAL(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)),
+ callback,TQ_SLOT(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)));
}
dlg.resize(dlg.configDialogSize(*(Kdesvnsettings::self()->config()),groupName));
if (dlg.exec()!=TQDialog::Accepted) {
diff --git a/src/ksvnwidgets/logmsg_impl.h b/src/ksvnwidgets/logmsg_impl.h
index 233c651..60698f5 100644
--- a/src/ksvnwidgets/logmsg_impl.h
+++ b/src/ksvnwidgets/logmsg_impl.h
@@ -21,12 +21,12 @@
#define LOGMSG_IMPL_H
#include "logmessage.h"
-#include "commititem.hpp"
+#include "commititem.h"
#include <tqvaluelist.h>
#include <tqpair.h>
class Logmsg_impl: public LogmessageData {
-Q_OBJECT
+TQ_OBJECT
public:
struct logActionEntry {
diff --git a/src/ksvnwidgets/pwstorage.h b/src/ksvnwidgets/pwstorage.h
index 42dc394..3a544a8 100644
--- a/src/ksvnwidgets/pwstorage.h
+++ b/src/ksvnwidgets/pwstorage.h
@@ -31,7 +31,7 @@ class PwStorageData;
*/
class PwStorage:public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
protected:
PwStorageData* mData;
diff --git a/src/ksvnwidgets/revertform.ui b/src/ksvnwidgets/revertform.ui
index dacca01..eb74427 100644
--- a/src/ksvnwidgets/revertform.ui
+++ b/src/ksvnwidgets/revertform.ui
@@ -83,7 +83,7 @@
</image>
</images>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>depthselector.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">depthselector.h</include>
+</includes>
</UI>
diff --git a/src/ksvnwidgets/revertform_impl.h b/src/ksvnwidgets/revertform_impl.h
index 7c40faf..9e82024 100644
--- a/src/ksvnwidgets/revertform_impl.h
+++ b/src/ksvnwidgets/revertform_impl.h
@@ -21,13 +21,13 @@
#define _REVERT_FORM_IMPL_H
#include "revertform.h"
-#include "svnqttypes.hpp"
+#include "svnqttypes.h"
class TQStringList;
class RevertFormImpl:public RevertForm
{
- Q_OBJECT
+ TQ_OBJECT
public:
RevertFormImpl(TQWidget*parent=0,const char*name=0);
diff --git a/src/ksvnwidgets/ssltrustprompt_impl.h b/src/ksvnwidgets/ssltrustprompt_impl.h
index 46e6384..8414a26 100644
--- a/src/ksvnwidgets/ssltrustprompt_impl.h
+++ b/src/ksvnwidgets/ssltrustprompt_impl.h
@@ -23,7 +23,7 @@
#include "ssltrustprompt.h"
class SslTrustPrompt_impl: public SslTrustPrompt {
-Q_OBJECT
+TQ_OBJECT
public:
SslTrustPrompt_impl(const TQString&,TQWidget *parent = 0, const char *name = 0);
diff --git a/src/settings/cmdexecsettings.ui b/src/settings/cmdexecsettings.ui
index ca9a885..2aa7e48 100644
--- a/src/settings/cmdexecsettings.ui
+++ b/src/settings/cmdexecsettings.ui
@@ -143,9 +143,9 @@
<slot>setEnabled(bool)</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot access="protected">showLogToggled(bool)</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">klineedit.h</include>
diff --git a/src/settings/cmdexecsettings_impl.h b/src/settings/cmdexecsettings_impl.h
index 7f90e7a..021c8f8 100644
--- a/src/settings/cmdexecsettings_impl.h
+++ b/src/settings/cmdexecsettings_impl.h
@@ -25,7 +25,7 @@
class CmdExecSettings_impl : public CmdExecSettings
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/src/settings/diffmergesettings.ui b/src/settings/diffmergesettings.ui
index 4b2b5dd..d917618 100644
--- a/src/settings/diffmergesettings.ui
+++ b/src/settings/diffmergesettings.ui
@@ -239,9 +239,9 @@ When %1 and %2 is given, tdesvn let this display make the diff. For that it it m
<slot>diffDispChanged(bool)</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot access="protected">diffDispChanged(bool)</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">klineedit.h</include>
diff --git a/src/settings/diffmergesettings_impl.h b/src/settings/diffmergesettings_impl.h
index 1d872d4..6c5bd11 100644
--- a/src/settings/diffmergesettings_impl.h
+++ b/src/settings/diffmergesettings_impl.h
@@ -23,7 +23,7 @@
#include "diffmergesettings.h"
class DiffMergeSettings_impl: public DiffMergeSettings {
-Q_OBJECT
+TQ_OBJECT
public:
DiffMergeSettings_impl(TQWidget *parent = 0, const char *name = 0);
diff --git a/src/settings/dispcolor_settings.ui b/src/settings/dispcolor_settings.ui
index bc0a5f6..a4a0fc0 100644
--- a/src/settings/dispcolor_settings.ui
+++ b/src/settings/dispcolor_settings.ui
@@ -26,9 +26,6 @@
<property name="text">
<string>Mark changed and locked items colored</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
@@ -61,9 +58,6 @@
<property name="text">
<string></string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<widget class="TQLabel" row="4" column="0">
<property name="name">
@@ -241,9 +235,9 @@
<slot>coloredStateToggled(bool)</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot access="protected">coloredStateToggled(bool)</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">kcolorbutton.h</include>
diff --git a/src/settings/dispcolorsettings_impl.h b/src/settings/dispcolorsettings_impl.h
index a57e0ed..d53673c 100644
--- a/src/settings/dispcolorsettings_impl.h
+++ b/src/settings/dispcolorsettings_impl.h
@@ -23,7 +23,7 @@
#include "dispcolor_settings.h"
class DispColorSettings_impl: public DispColorSettings {
-Q_OBJECT
+TQ_OBJECT
public:
DispColorSettings_impl(TQWidget *parent = 0, const char *name = 0);
diff --git a/src/settings/display_settings.ui b/src/settings/display_settings.ui
index 323538f..4dc517b 100644
--- a/src/settings/display_settings.ui
+++ b/src/settings/display_settings.ui
@@ -105,9 +105,6 @@ see which items has newer items in repository you may have to set "Check for upd
<property name="text">
<string>Display ignored files</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<widget class="TQCheckBox">
<property name="name">
@@ -230,10 +227,10 @@ When TDE-default is wanted for opening on double click, enter &amp;quot;default&
<slot>diffDispChanged()</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot access="protected">diffDispChanged()</slot>
<slot access="protected">dispFileInfotoggled(bool)</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">klineedit.h</include>
diff --git a/src/settings/displaysettings_impl.h b/src/settings/displaysettings_impl.h
index e3e919c..0c5124f 100644
--- a/src/settings/displaysettings_impl.h
+++ b/src/settings/displaysettings_impl.h
@@ -23,7 +23,7 @@
#include "display_settings.h"
class DisplaySettings_impl: public DisplaySettings {
-Q_OBJECT
+TQ_OBJECT
public:
DisplaySettings_impl(TQWidget *parent = 0, const char *name = 0);
diff --git a/src/settings/revisiontreesettingsdlg_impl.h b/src/settings/revisiontreesettingsdlg_impl.h
index e2b8db5..18ac7aa 100644
--- a/src/settings/revisiontreesettingsdlg_impl.h
+++ b/src/settings/revisiontreesettingsdlg_impl.h
@@ -24,7 +24,7 @@
class RevisiontreeSettingsDlg_impl: public RevisiontreeSettingsDlg
{
- Q_OBJECT
+ TQ_OBJECT
public:
RevisiontreeSettingsDlg_impl(TQWidget *parent = 0, const char *name = 0);
diff --git a/src/settings/subversion_settings.ui b/src/settings/subversion_settings.ui
index 7157584..bf1b64f 100644
--- a/src/settings/subversion_settings.ui
+++ b/src/settings/subversion_settings.ui
@@ -26,9 +26,6 @@
<property name="text">
<string>Start check for updates when open a working copy</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="toolTip" stdset="0">
<string>Select if tdesvn should check for updates when open a working copy</string>
</property>
@@ -65,9 +62,6 @@
<property name="text">
<string>Get file details while remote listing</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="toolTip" stdset="0">
<string>Whether getting details about items when making listing on repositories or not</string>
</property>
@@ -84,9 +78,6 @@
<property name="text">
<string>Gain item info recursive</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<widget class="TQCheckBox">
<property name="name">
@@ -95,9 +86,6 @@
<property name="text">
<string>Always get properties on networked repositories</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="toolTip" stdset="0">
<string>Should tdesvn retrieves properties on selected item in repositories</string>
</property>
@@ -113,9 +101,6 @@ On networked repositories (eg., not opened via file:// protocol) this may get re
<property name="text">
<string>Store passwords for remote connections</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="toolTip" stdset="0">
<string>Should subversion store passwords in default</string>
</property>
@@ -130,9 +115,6 @@ On networked repositories (eg., not opened via file:// protocol) this may get re
<property name="text">
<string>Store passwords into TDE Wallet</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="toolTip" stdset="0">
<string>When saving passwords, do it into TDE wallet instead of subversions storage?</string>
</property>
@@ -160,9 +142,6 @@ On networked repositories (eg., not opened via file:// protocol) this may get re
<property name="text">
<string>Log follows node changes</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<widget class="TQCheckBox">
<property name="name">
@@ -171,9 +150,6 @@ On networked repositories (eg., not opened via file:// protocol) this may get re
<property name="text">
<string>Logs always reads list of changed files</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="toolTip" stdset="0">
<string>Read detailed change lists</string>
</property>
@@ -188,9 +164,6 @@ On networked repositories (eg., not opened via file:// protocol) this may get re
<property name="text">
<string>Review items before commit</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="toolTip" stdset="0">
<string>List items next commit will send or not</string>
</property>
@@ -202,9 +175,6 @@ On networked repositories (eg., not opened via file:// protocol) this may get re
<property name="text">
<string>Hide new items in commit box</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="toolTip" stdset="0">
<string>Should unversioned items displayed in commit dialog or not.</string>
</property>
diff --git a/src/settings/subversionsettings_impl.h b/src/settings/subversionsettings_impl.h
index 3e5f78a..226c7d5 100644
--- a/src/settings/subversionsettings_impl.h
+++ b/src/settings/subversionsettings_impl.h
@@ -25,7 +25,7 @@
class SubversionSettings_impl : public SubversionSettings
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/src/settings/tdesvn_part.kcfg b/src/settings/tdesvn_part.kcfg
index 4c8aa67..bf405b5 100644
--- a/src/settings/tdesvn_part.kcfg
+++ b/src/settings/tdesvn_part.kcfg
@@ -254,7 +254,7 @@
<entry key="locale_is_casesensitive" type="Bool" >
<whatsthis>This value computes how casesensitive string ordering will made.
Never overwrite the default computed value unless you know what you're doing.</whatsthis>
- <default code="true" >QString(&quot;a&quot;).localeAwareCompare(&quot;B&quot;)>0</default>
+ <default code="true" >TQString(&quot;a&quot;).localeAwareCompare(&quot;B&quot;)>0</default>
<label>Check if current locale is case sensitive or not</label>
</entry>
</group>
diff --git a/src/svnfrontend/blamedisplay.ui b/src/svnfrontend/blamedisplay.ui
index f4ec033..303e713 100644
--- a/src/svnfrontend/blamedisplay.ui
+++ b/src/svnfrontend/blamedisplay.ui
@@ -100,10 +100,10 @@
<forwards>
<forward>class TQListViewItem;</forward>
</forwards>
-<Q_SLOTS>
+<slots>
<slot access="protected">slotContextMenuRequested(TDEListView*,TQListViewItem*, const TQPoint&amp;)</slot>
<slot access="protected">slotItemDoubleClicked(TQListViewItem*)</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">tdelistview.h</include>
diff --git a/src/svnfrontend/blamedisplay_impl.cpp b/src/svnfrontend/blamedisplay_impl.cpp
index 0acc9bc..9d48155 100644
--- a/src/svnfrontend/blamedisplay_impl.cpp
+++ b/src/svnfrontend/blamedisplay_impl.cpp
@@ -20,7 +20,7 @@
#include "blamedisplay_impl.h"
#include "simple_logcb.h"
#include "tdesvnsettings.h"
-#include "log_entry.hpp"
+#include "log_entry.h"
#include "cursorstack.h"
#include "widgetblockstack.h"
#include "encodingselector_impl.h"
@@ -247,14 +247,14 @@ BlameDisplay_impl::BlameDisplay_impl(TQWidget*parent,const char*name)
: BlameDisplay(parent,name)
{
m_Data = new BlameDisplayData();
- connect(m_BlameList,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotSelectionChanged()));
+ connect(m_BlameList,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(slotSelectionChanged()));
}
BlameDisplay_impl::BlameDisplay_impl(const TQString&what,const svn::AnnotatedFile&blame,TQWidget*parent,const char*name)
: BlameDisplay(parent,name)
{
m_Data = new BlameDisplayData();
- connect(m_BlameList,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotSelectionChanged()));
+ connect(m_BlameList,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(slotSelectionChanged()));
setContent(what,blame);
}
@@ -268,8 +268,8 @@ void BlameDisplay_impl::setContent(const TQString&what,const svn::AnnotatedFile&
m_Data->m_File = what;
m_SearchWidget = new TDEListViewSearchLineWidget(m_BlameList,this);
EncodingSelector_impl*m_Ls = new EncodingSelector_impl(Kdesvnsettings::locale_for_blame(),this);
- connect(m_Ls,TQT_SIGNAL(TextCodecChanged(const TQString&)),
- this,TQT_SLOT(slotTextCodecChanged(const TQString&)));
+ connect(m_Ls,TQ_SIGNAL(TextCodecChanged(const TQString&)),
+ this,TQ_SLOT(slotTextCodecChanged(const TQString&)));
BlameDisplayLayout->remove(m_BlameList);
BlameDisplayLayout->addWidget(m_Ls);
@@ -410,7 +410,7 @@ void BlameDisplay_impl::showCommit(BlameDisplayItem*bit)
}
}
KDialogBase* dlg = new KDialogBase(
- TQT_TQWIDGET(TDEApplication::activeModalWidget()),
+ TDEApplication::activeModalWidget(),
"simplelog",true,TQString(i18n("Logmessage for revision %1").arg(bit->rev())),
KDialogBase::Close);
TQWidget* Dialog1Layout = dlg->makeVBoxMainWidget();
@@ -446,7 +446,7 @@ void BlameDisplay_impl::displayBlame(SimpleLogCb*_cb,const TQString&item,const s
{
int buttons = KDialogBase::Close|KDialogBase::User1|KDialogBase::User2;
KDialogBase * dlg = new KDialogBase(
- TQT_TQWIDGET(TDEApplication::activeModalWidget()),
+ TDEApplication::activeModalWidget(),
name,true,TQString(i18n("Blame %1")).arg(item),buttons,KDialogBase::Close,false,
KGuiItem(i18n("Goto line")),KGuiItem(i18n("Log message for revision"),"tdesvnlog"));
@@ -457,8 +457,8 @@ void BlameDisplay_impl::displayBlame(SimpleLogCb*_cb,const TQString&item,const s
ptr->setCb(_cb);
ptr->m_Data->m_dlg = dlg;
dlg->enableButton(KDialogBase::User2,false);
- connect(dlg,TQT_SIGNAL(user1Clicked()),ptr,TQT_SLOT(slotGoLine()));
- connect(dlg,TQT_SIGNAL(user2Clicked()),ptr,TQT_SLOT(slotShowCurrentCommit()));
+ connect(dlg,TQ_SIGNAL(user1Clicked()),ptr,TQ_SLOT(slotGoLine()));
+ connect(dlg,TQ_SIGNAL(user2Clicked()),ptr,TQ_SLOT(slotShowCurrentCommit()));
Dialog1Layout->adjustSize();
dlg->exec();
diff --git a/src/svnfrontend/blamedisplay_impl.h b/src/svnfrontend/blamedisplay_impl.h
index e248b35..43b6708 100644
--- a/src/svnfrontend/blamedisplay_impl.h
+++ b/src/svnfrontend/blamedisplay_impl.h
@@ -21,7 +21,7 @@
#define BLAMEDISPLAY_IMPL_H
#include "blamedisplay.h"
-#include "client.hpp"
+#include "client.h"
class BlameDisplayData;
class SimpleLogCb;
@@ -30,7 +30,7 @@ class TDEListViewSearchLineWidget;
class BlameDisplay_impl:public BlameDisplay
{
- Q_OBJECT
+ TQ_OBJECT
public:
BlameDisplay_impl(const TQString&,const svn::AnnotatedFile&,TQWidget*parent=0,const char*name=0);
diff --git a/src/svnfrontend/cacheentry.h b/src/svnfrontend/cacheentry.h
index fd9ae64..d2a7787 100644
--- a/src/svnfrontend/cacheentry.h
+++ b/src/svnfrontend/cacheentry.h
@@ -20,9 +20,9 @@
#ifndef HELPERSCACHEENTRY_H
#define HELPERSCACHEENTRY_H
-#include "svnqttypes.hpp"
-#include "shared_pointer.hpp"
-#include "status.hpp"
+#include "svnqttypes.h"
+#include "shared_pointer.h"
+#include "status.h"
// std::map 'cause TQMap isn't usable
#include <map>
diff --git a/src/svnfrontend/ccontextlistener.h b/src/svnfrontend/ccontextlistener.h
index a280782..b5f0966 100644
--- a/src/svnfrontend/ccontextlistener.h
+++ b/src/svnfrontend/ccontextlistener.h
@@ -20,8 +20,8 @@
#ifndef CCONTEXTLISTENER_H
#define CCONTEXTLISTENER_H
-#include "context_listener.hpp"
-#include "smart_pointer.hpp"
+#include "context_listener.h"
+#include "smart_pointer.h"
#include <tqobject.h>
#include <tqstring.h>
@@ -33,7 +33,7 @@ class CContextListenerData;
*/
class CContextListener : public TQObject, public svn::ContextListener,public svn::ref_count
{
- Q_OBJECT
+ TQ_OBJECT
public:
CContextListener(TQObject *parent = 0, const char *name = 0);
diff --git a/src/svnfrontend/commandexec.cpp b/src/svnfrontend/commandexec.cpp
index 953f33a..822f3e3 100644
--- a/src/svnfrontend/commandexec.cpp
+++ b/src/svnfrontend/commandexec.cpp
@@ -21,9 +21,9 @@
#include "tdesvnsettings.h"
#include "svnactions.h"
#include "dummydisplay.h"
-#include "targets.hpp"
-#include "url.hpp"
-#include "dirent.hpp"
+#include "targets.h"
+#include "url.h"
+#include "dirent.h"
#include "sub2qt.h"
#include "ktranslateurl.h"
#include "sshagent.h"
@@ -79,8 +79,8 @@ pCPart::pCPart()
end = svn::Revision::UNDEFINED;
toStdout.open(IO_WriteOnly, stdout);
toStderr.open(IO_WriteOnly, stderr);
- Stdout.setDevice(TQT_TQIODEVICE(&toStdout));
- Stderr.setDevice(TQT_TQIODEVICE(&toStderr));
+ Stdout.setDevice(&toStdout);
+ Stderr.setDevice(&toStderr);
disp = new DummyDisplay();
m_SvnWrapper = new SvnActions(disp,0,true);
}
@@ -99,8 +99,8 @@ CommandExec::CommandExec(TQObject*parent, const char *name,TDECmdLineArgs *args)
SshAgent ag;
ag.querySshAgent();
- connect(m_pCPart->m_SvnWrapper,TQT_SIGNAL(clientException(const TQString&)),this,TQT_SLOT(clientException(const TQString&)));
- connect(m_pCPart->m_SvnWrapper,TQT_SIGNAL(sendNotify(const TQString&)),this,TQT_SLOT(slotNotifyMessage(const TQString&)));
+ connect(m_pCPart->m_SvnWrapper,TQ_SIGNAL(clientException(const TQString&)),this,TQ_SLOT(clientException(const TQString&)));
+ connect(m_pCPart->m_SvnWrapper,TQ_SIGNAL(sendNotify(const TQString&)),this,TQ_SLOT(slotNotifyMessage(const TQString&)));
m_pCPart->m_SvnWrapper->reInitClient();
}
@@ -130,86 +130,86 @@ int CommandExec::exec()
}
TQString slotCmd;
if (!TQString::compare(m_pCPart->cmd,"log")) {
- slotCmd=TQT_SLOT(slotCmd_log());
+ slotCmd=TQ_SLOT(slotCmd_log());
} else if (!TQString::compare(m_pCPart->cmd,"cat")) {
- slotCmd=TQT_SLOT(slotCmd_cat());
+ slotCmd=TQ_SLOT(slotCmd_cat());
m_pCPart->single_revision=true;
} else if (!TQString::compare(m_pCPart->cmd,"get")) {
- slotCmd=TQT_SLOT(slotCmd_get());
+ slotCmd=TQ_SLOT(slotCmd_get());
m_pCPart->single_revision=true;
} else if (!TQString::compare(m_pCPart->cmd,"help")) {
- slotCmd=TQT_SLOT(slotCmd_help());
+ slotCmd=TQ_SLOT(slotCmd_help());
} else if (!TQString::compare(m_pCPart->cmd,"blame")||
!TQString::compare(m_pCPart->cmd,"annotate")) {
- slotCmd=TQT_SLOT(slotCmd_blame());
+ slotCmd=TQ_SLOT(slotCmd_blame());
} else if (!TQString::compare(m_pCPart->cmd,"update")) {
- slotCmd=TQT_SLOT(slotCmd_update());
+ slotCmd=TQ_SLOT(slotCmd_update());
m_pCPart->single_revision=true;
} else if (!TQString::compare(m_pCPart->cmd,"diff")) {
m_pCPart->start = svn::Revision::WORKING;
- slotCmd=TQT_SLOT(slotCmd_diff());
+ slotCmd=TQ_SLOT(slotCmd_diff());
} else if (!TQString::compare(m_pCPart->cmd,"info")) {
- slotCmd=TQT_SLOT(slotCmd_info());
+ slotCmd=TQ_SLOT(slotCmd_info());
m_pCPart->single_revision=true;
} else if (!TQString::compare(m_pCPart->cmd,"commit")||
!TQString::compare(m_pCPart->cmd,"ci")) {
- slotCmd=TQT_SLOT(slotCmd_commit());
+ slotCmd=TQ_SLOT(slotCmd_commit());
} else if (!TQString::compare(m_pCPart->cmd,"list")||
!TQString::compare(m_pCPart->cmd,"ls")) {
- slotCmd=TQT_SLOT(slotCmd_list());
+ slotCmd=TQ_SLOT(slotCmd_list());
} else if (!TQString::compare(m_pCPart->cmd,"copy")||
!TQString::compare(m_pCPart->cmd,"cp")) {
- slotCmd=TQT_SLOT(slotCmd_copy());
+ slotCmd=TQ_SLOT(slotCmd_copy());
dont_check_second = true;
} else if (!TQString::compare(m_pCPart->cmd,"move")||
!TQString::compare(m_pCPart->cmd,"rename")||
!TQString::compare(m_pCPart->cmd,"mv")) {
- slotCmd=TQT_SLOT(slotCmd_move());
+ slotCmd=TQ_SLOT(slotCmd_move());
dont_check_second = true;
} else if (!TQString::compare(m_pCPart->cmd,"checkout")||
!TQString::compare(m_pCPart->cmd,"co")) {
- slotCmd=TQT_SLOT(slotCmd_checkout());
+ slotCmd=TQ_SLOT(slotCmd_checkout());
dont_check_second = true;
} else if (!TQString::compare(m_pCPart->cmd,"checkoutto")||
!TQString::compare(m_pCPart->cmd,"coto")) {
- slotCmd=TQT_SLOT(slotCmd_checkoutto());
+ slotCmd=TQ_SLOT(slotCmd_checkoutto());
dont_check_second = true;
} else if (!TQString::compare(m_pCPart->cmd,"export")) {
- slotCmd=TQT_SLOT(slotCmd_export());
+ slotCmd=TQ_SLOT(slotCmd_export());
dont_check_second = true;
} else if (!TQString::compare(m_pCPart->cmd,"exportto")) {
- slotCmd=TQT_SLOT(slotCmd_exportto());
+ slotCmd=TQ_SLOT(slotCmd_exportto());
dont_check_second = true;
} else if (!TQString::compare(m_pCPart->cmd,"delete")||
!TQString::compare(m_pCPart->cmd,"del")||
!TQString::compare(m_pCPart->cmd,"rm")||
!TQString::compare(m_pCPart->cmd,"remove")) {
- slotCmd=TQT_SLOT(slotCmd_delete());
+ slotCmd=TQ_SLOT(slotCmd_delete());
} else if (!TQString::compare(m_pCPart->cmd,"add")) {
- slotCmd=TQT_SLOT(slotCmd_add());
+ slotCmd=TQ_SLOT(slotCmd_add());
dont_check_all = true;
path_only=true;
} else if (!TQString::compare(m_pCPart->cmd,"undo")||
!TQString::compare(m_pCPart->cmd,"revert")) {
- slotCmd=TQT_SLOT(slotCmd_revert());
+ slotCmd=TQ_SLOT(slotCmd_revert());
} else if (!TQString::compare(m_pCPart->cmd,"checknew")||
!TQString::compare(m_pCPart->cmd,"addnew")) {
- slotCmd=TQT_SLOT(slotCmd_addnew());
+ slotCmd=TQ_SLOT(slotCmd_addnew());
} else if (!TQString::compare(m_pCPart->cmd,"switch")) {
- slotCmd=TQT_SLOT(slotCmd_switch());
+ slotCmd=TQ_SLOT(slotCmd_switch());
} else if (!TQString::compare(m_pCPart->cmd,"tree")) {
- slotCmd=TQT_SLOT(slotCmd_tree());
+ slotCmd=TQ_SLOT(slotCmd_tree());
} else if (!TQString::compare(m_pCPart->cmd,"lock")) {
- slotCmd=TQT_SLOT(slotCmd_lock());
+ slotCmd=TQ_SLOT(slotCmd_lock());
no_revision = true;
check_force=true;
} else if (!TQString::compare(m_pCPart->cmd,"unlock")) {
- slotCmd=TQT_SLOT(slotCmd_unlock());
+ slotCmd=TQ_SLOT(slotCmd_unlock());
no_revision=true;
check_force=true;
}
- bool found = connect(this,TQT_SIGNAL(executeMe()),this,slotCmd.ascii());
+ bool found = connect(this,TQ_SIGNAL(executeMe()),this,slotCmd.ascii());
if (!found) {
slotCmd=i18n("Command \"%1\" not implemented or known").arg(m_pCPart->cmd);
KMessageBox::sorry(0,slotCmd,i18n("SVN Error"));
@@ -314,7 +314,7 @@ int CommandExec::exec()
if (Kdesvnsettings::self()->cmdline_show_logwindow() &&
m_lastMessagesLines >= Kdesvnsettings::self()->cmdline_log_minline()) {
KDialogBase dlg (
- TQT_TQWIDGET(TDEApplication::activeModalWidget()),
+ TDEApplication::activeModalWidget(),
"execution_log",
true,
i18n("Execution log"),
diff --git a/src/svnfrontend/commandexec.h b/src/svnfrontend/commandexec.h
index 7455ea7..e827728 100644
--- a/src/svnfrontend/commandexec.h
+++ b/src/svnfrontend/commandexec.h
@@ -36,7 +36,7 @@ namespace svn {
*/
class CommandExec : public TQObject
{
-Q_OBJECT
+TQ_OBJECT
public:
CommandExec(TQObject*parent,const char *name,TDECmdLineArgs *args);
diff --git a/src/svnfrontend/copymoveview.ui b/src/svnfrontend/copymoveview.ui
index c1af479..8976349 100644
--- a/src/svnfrontend/copymoveview.ui
+++ b/src/svnfrontend/copymoveview.ui
@@ -85,9 +85,6 @@
<property name="text">
<string>Force operation</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
</vbox>
</widget>
diff --git a/src/svnfrontend/copymoveview_impl.h b/src/svnfrontend/copymoveview_impl.h
index 5b4b22d..c4f8376 100644
--- a/src/svnfrontend/copymoveview_impl.h
+++ b/src/svnfrontend/copymoveview_impl.h
@@ -25,7 +25,7 @@
class CopyMoveView_impl : public CopyMoveView
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/src/svnfrontend/createrepo_dlg.ui b/src/svnfrontend/createrepo_dlg.ui
index 64d73e4..ca09e14 100644
--- a/src/svnfrontend/createrepo_dlg.ui
+++ b/src/svnfrontend/createrepo_dlg.ui
@@ -87,9 +87,6 @@
<property name="text">
<string>Disable fsync at commit (BDB only)</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<widget class="TQCheckBox">
<property name="name">
@@ -98,9 +95,6 @@
<property name="text">
<string>Disable automatic log file removal (BDB only)</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<widget class="TQCheckBox">
<property name="name">
@@ -109,9 +103,6 @@
<property name="text">
<string>Create main folders</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="checked">
<bool>true</bool>
</property>
@@ -192,11 +183,11 @@
<tabstop>m_svn13compat</tabstop>
<tabstop>m_svn14compat</tabstop>
</tabstops>
-<Q_SLOTS>
+<slots>
<slot access="protected">fsTypeChanged(int)</slot>
<slot access="protected">compatChanged13(bool)</slot>
<slot access="protected">compatChanged14(bool)</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">kcombobox.h</include>
diff --git a/src/svnfrontend/createrepo_impl.h b/src/svnfrontend/createrepo_impl.h
index 54756b2..547d18b 100644
--- a/src/svnfrontend/createrepo_impl.h
+++ b/src/svnfrontend/createrepo_impl.h
@@ -23,7 +23,7 @@
#include "createrepo_dlg.h"
class Createrepo_impl: public CreateRepo_Dlg {
- Q_OBJECT
+ TQ_OBJECT
public:
Createrepo_impl(bool enable_compat13,bool enable_compat14, TQWidget *parent = 0, const char *name = 0);
diff --git a/src/svnfrontend/dumprepo_dlg.ui b/src/svnfrontend/dumprepo_dlg.ui
index 0d15e28..84844f4 100644
--- a/src/svnfrontend/dumprepo_dlg.ui
+++ b/src/svnfrontend/dumprepo_dlg.ui
@@ -71,9 +71,6 @@
<property name="text">
<string>incremental Dump</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="checked">
<bool>true</bool>
</property>
@@ -85,9 +82,6 @@
<property name="text">
<string>Use deltas</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="checked">
<bool>true</bool>
</property>
@@ -99,9 +93,6 @@
<property name="text">
<string>Dump revision range</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
@@ -181,9 +172,9 @@
<slot>slotDumpRange(bool)</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot access="protected">slotDumpRange(bool)</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">knuminput.h</include>
diff --git a/src/svnfrontend/dumprepo_impl.h b/src/svnfrontend/dumprepo_impl.h
index 3f17f3e..0ba89a1 100644
--- a/src/svnfrontend/dumprepo_impl.h
+++ b/src/svnfrontend/dumprepo_impl.h
@@ -23,7 +23,7 @@
#include "dumprepo_dlg.h"
class DumpRepo_impl: public DumpRepoDlg {
-Q_OBJECT
+TQ_OBJECT
public:
DumpRepo_impl(TQWidget *parent = 0, const char *name = 0);
diff --git a/src/svnfrontend/editproperty_impl.cpp b/src/svnfrontend/editproperty_impl.cpp
index c87ff8b..b1bcca2 100644
--- a/src/svnfrontend/editproperty_impl.cpp
+++ b/src/svnfrontend/editproperty_impl.cpp
@@ -123,7 +123,7 @@ EditProperty_impl::EditProperty_impl(TQWidget *parent, const char *name)
isDir = false;
TQToolTip::add(m_NameEdit, "Select or enter new property");
- connect(m_NameEdit, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(updateToolTip(const TQString &)));
+ connect(m_NameEdit, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(updateToolTip(const TQString &)));
}
diff --git a/src/svnfrontend/editproperty_impl.h b/src/svnfrontend/editproperty_impl.h
index 6008971..ca1bbce 100644
--- a/src/svnfrontend/editproperty_impl.h
+++ b/src/svnfrontend/editproperty_impl.h
@@ -26,7 +26,7 @@ class TQStringList;
class TQString;
class EditProperty_impl: public EditPropsDlgData {
-Q_OBJECT
+TQ_OBJECT
public:
EditProperty_impl(TQWidget *parent = 0, const char *name = 0);
diff --git a/src/svnfrontend/editpropsdlg.ui b/src/svnfrontend/editpropsdlg.ui
index 5e06fd9..e9ef89f 100644
--- a/src/svnfrontend/editpropsdlg.ui
+++ b/src/svnfrontend/editpropsdlg.ui
@@ -51,9 +51,6 @@
<property name="text">
<string>OK</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
@@ -68,9 +65,6 @@
<property name="text">
<string>Cancel</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="autoDefault">
<bool>true</bool>
</property>
@@ -166,9 +160,6 @@
<property name="pixmap">
<pixmap>image0</pixmap>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="toolTip" stdset="0">
<string>Click for short info about pre-defined property name</string>
</property>
@@ -230,11 +221,11 @@
<tabstop>buttonOk</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops>
-<Q_SLOTS>
+<slots>
<slot access="protected">nameChanged(const TQString&amp;)</slot>
<slot access="protected">valueChanged()</slot>
<slot access="protected">showHelp()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">kcombobox.h</include>
diff --git a/src/svnfrontend/filelistviewitem.cpp b/src/svnfrontend/filelistviewitem.cpp
index 615ea4c..0eee5bc 100644
--- a/src/svnfrontend/filelistviewitem.cpp
+++ b/src/svnfrontend/filelistviewitem.cpp
@@ -21,10 +21,10 @@
#include "tdesvnfilelist.h"
#include "tdesvnsettings.h"
#include "helpers/sub2qt.h"
-#include "status.hpp"
-#include "revision.hpp"
-#include "exception.hpp"
-#include "url.hpp"
+#include "status.h"
+#include "revision.h"
+#include "exception.h"
+#include "url.h"
#include "widgetblockstack.h"
#include <tdelocale.h>
diff --git a/src/svnfrontend/filelistviewitem.h b/src/svnfrontend/filelistviewitem.h
index 6886511..4f130c9 100644
--- a/src/svnfrontend/filelistviewitem.h
+++ b/src/svnfrontend/filelistviewitem.h
@@ -24,7 +24,7 @@
#include <tdelistview.h>
#include <tqdatetime.h>
#include <tqptrlist.h>
-#include "svnqttypes.hpp"
+#include "svnqttypes.h"
class TQPainter;
class KFileItem;
diff --git a/src/svnfrontend/fillcachethread.cpp b/src/svnfrontend/fillcachethread.cpp
index f7619fe..5958928 100644
--- a/src/svnfrontend/fillcachethread.cpp
+++ b/src/svnfrontend/fillcachethread.cpp
@@ -20,9 +20,9 @@
#include "fillcachethread.h"
#include "tcontextlistener.h"
-#include "LogCache.hpp"
-#include "ReposLog.hpp"
-#include "DatabaseException.hpp"
+#include "LogCache.h"
+#include "ReposLog.h"
+#include "DatabaseException.h"
#include "tdesvn_events.h"
#include <tqobject.h>
@@ -37,7 +37,7 @@ FillCacheThread::FillCacheThread(TQObject*_parent,const TQString&reposRoot)
m_CurrentContext = new svn::Context();
m_SvnContextListener = new ThreadContextListener(m_Parent);
- TQObject::connect(m_SvnContextListener,TQT_SIGNAL(sendNotify(const TQString&)),m_Parent,TQT_SLOT(slotNotifyMessage(const TQString&)));
+ TQObject::connect(m_SvnContextListener,TQ_SIGNAL(sendNotify(const TQString&)),m_Parent,TQ_SLOT(slotNotifyMessage(const TQString&)));
m_CurrentContext->setListener(m_SvnContextListener);
m_what = reposRoot;
diff --git a/src/svnfrontend/fillcachethread.h b/src/svnfrontend/fillcachethread.h
index 1b20e73..735726e 100644
--- a/src/svnfrontend/fillcachethread.h
+++ b/src/svnfrontend/fillcachethread.h
@@ -20,9 +20,9 @@
#ifndef _FILLCACHE_THREAD_H
#define _FILLCACHE_THREAD_H
-#include "client.hpp"
-#include "revision.hpp"
-#include "status.hpp"
+#include "client.h"
+#include "revision.h"
+#include "status.h"
#include "ccontextlistener.h"
#include "eventnumbers.h"
#include "frontendtypes.h"
diff --git a/src/svnfrontend/frontendtypes.h b/src/svnfrontend/frontendtypes.h
index 0f45ecf..a34f460 100644
--- a/src/svnfrontend/frontendtypes.h
+++ b/src/svnfrontend/frontendtypes.h
@@ -1,7 +1,7 @@
#ifndef _FRONTEND_TYPES_H
#define _FRONTEND_TYPES_H
-#include "svnqt/shared_pointer.hpp"
+#include "svnqt/shared_pointer.h"
class ThreadContextListener;
diff --git a/src/svnfrontend/fronthelpers/checkoutinfo.ui b/src/svnfrontend/fronthelpers/checkoutinfo.ui
index 8f3ed80..eaa5708 100644
--- a/src/svnfrontend/fronthelpers/checkoutinfo.ui
+++ b/src/svnfrontend/fronthelpers/checkoutinfo.ui
@@ -109,9 +109,6 @@
<property name="text">
<string>Overwrite existing</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="checked">
<bool>false</bool>
</property>
@@ -206,9 +203,9 @@
<data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data>
</image>
</images>
-<Q_SLOTS>
+<slots>
<slot access="protected">urlChanged(const TQString&amp;)</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="2" margin="2"/>
<includes>
<include location="global" impldecl="in implementation">kurlrequester.h</include>
diff --git a/src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp b/src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp
index 3dad68d..9a06738 100644
--- a/src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp
+++ b/src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp
@@ -20,7 +20,7 @@
#include "checkoutinfo_impl.h"
#include "rangeinput_impl.h"
#include "depthselector.h"
-#include "url.hpp"
+#include "url.h"
#include "ktranslateurl.h"
#include <kurlrequester.h>
#include <tqlabel.h>
diff --git a/src/svnfrontend/fronthelpers/checkoutinfo_impl.h b/src/svnfrontend/fronthelpers/checkoutinfo_impl.h
index eb567f4..8836ba0 100644
--- a/src/svnfrontend/fronthelpers/checkoutinfo_impl.h
+++ b/src/svnfrontend/fronthelpers/checkoutinfo_impl.h
@@ -21,12 +21,12 @@
#define CHECKOUTINFO_IMPL_H
#include "checkoutinfo.h"
-#include "revision.hpp"
-#include "svnqttypes.hpp"
+#include "revision.h"
+#include "svnqttypes.h"
#include "kurl.h"
class CheckoutInfo_impl: public CheckoutInfo {
-Q_OBJECT
+TQ_OBJECT
public:
CheckoutInfo_impl(TQWidget *parent = 0, const char *name = 0);
diff --git a/src/svnfrontend/fronthelpers/propertylist.cpp b/src/svnfrontend/fronthelpers/propertylist.cpp
index 1f46571..7503b08 100644
--- a/src/svnfrontend/fronthelpers/propertylist.cpp
+++ b/src/svnfrontend/fronthelpers/propertylist.cpp
@@ -35,10 +35,10 @@ Propertylist::Propertylist(TQWidget *parent, const char *name)
setRootIsDecorated(false);
setSortColumn(0);
setAcceptDrops(false);
- connect(this,TQT_SIGNAL(itemRenamed(TQListViewItem*,const TQString&,int)),this,TQT_SLOT(slotItemRenamed(TQListViewItem*,const TQString&,int)));
+ connect(this,TQ_SIGNAL(itemRenamed(TQListViewItem*,const TQString&,int)),this,TQ_SLOT(slotItemRenamed(TQListViewItem*,const TQString&,int)));
- connect(this,TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),this,
- TQT_SLOT(slotContextMenuRequested(TQListViewItem *, const TQPoint &, int)));
+ connect(this,TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),this,
+ TQ_SLOT(slotContextMenuRequested(TQListViewItem *, const TQPoint &, int)));
//setFullWidth( TRUE );
}
@@ -150,8 +150,8 @@ bool Propertylist::checkExisting(const TQString&aName,TQListViewItem*it)
void Propertylist::addCallback(TQObject*ob)
{
if (ob) {
- connect(this,TQT_SIGNAL(sigSetProperty(const svn::PropertiesMap&,const TQValueList<TQString>&,const TQString&)),
- ob,TQT_SLOT(slotChangeProperties(const svn::PropertiesMap&,const TQValueList<TQString>&,const TQString&)));
+ connect(this,TQ_SIGNAL(sigSetProperty(const svn::PropertiesMap&,const TQValueList<TQString>&,const TQString&)),
+ ob,TQ_SLOT(slotChangeProperties(const svn::PropertiesMap&,const TQValueList<TQString>&,const TQString&)));
}
}
diff --git a/src/svnfrontend/fronthelpers/propertylist.h b/src/svnfrontend/fronthelpers/propertylist.h
index 71c72e0..a777db0 100644
--- a/src/svnfrontend/fronthelpers/propertylist.h
+++ b/src/svnfrontend/fronthelpers/propertylist.h
@@ -21,14 +21,14 @@
#define PROPERTYLIST_H
#include <tdelistview.h>
-#include "svnqttypes.hpp"
+#include "svnqttypes.h"
/**
@author
*/
class Propertylist : public TDEListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
Propertylist(TQWidget *parent = 0, const char *name = 0);
diff --git a/src/svnfrontend/fronthelpers/rangeinput.ui b/src/svnfrontend/fronthelpers/rangeinput.ui
index 16e806f..03c6a50 100644
--- a/src/svnfrontend/fronthelpers/rangeinput.ui
+++ b/src/svnfrontend/fronthelpers/rangeinput.ui
@@ -69,9 +69,6 @@
<property name="text">
<string>Date</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<widget class="TQRadioButton" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
@@ -162,9 +159,6 @@
<property name="text">
<string>Date</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<widget class="TQRadioButton" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
@@ -259,7 +253,7 @@
<tabstop>m_stopStartButton</tabstop>
<tabstop>m_stopHeadButton</tabstop>
</tabstops>
-<Q_SLOTS>
+<slots>
<slot access="protected">stopHeadToggled(bool)</slot>
<slot access="protected">stopBaseToggled(bool)</slot>
<slot access="protected">stopNumberToggled(bool)</slot>
@@ -268,7 +262,7 @@
<slot access="protected">startNumberToggled(bool)</slot>
<slot access="protected">startDateToggled(bool)</slot>
<slot access="protected">stopDateToggled(bool)</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="2" margin="2"/>
<includes>
<include location="global" impldecl="in implementation">kdatetimewidget.h</include>
diff --git a/src/svnfrontend/fronthelpers/rangeinput_impl.h b/src/svnfrontend/fronthelpers/rangeinput_impl.h
index aaa27a4..eab11e3 100644
--- a/src/svnfrontend/fronthelpers/rangeinput_impl.h
+++ b/src/svnfrontend/fronthelpers/rangeinput_impl.h
@@ -21,11 +21,11 @@
#define RANGEINPUT_IMPL_H
#include "rangeinput.h"
-#include "revision.hpp"
+#include "revision.h"
#include <tqpair.h>
class Rangeinput_impl: public RangeInputDlg {
-Q_OBJECT
+TQ_OBJECT
public:
Rangeinput_impl(TQWidget *parent = 0, const char *name = 0);
diff --git a/src/svnfrontend/fronthelpers/revisionbutton.ui b/src/svnfrontend/fronthelpers/revisionbutton.ui
index b517e7e..989f327 100644
--- a/src/svnfrontend/fronthelpers/revisionbutton.ui
+++ b/src/svnfrontend/fronthelpers/revisionbutton.ui
@@ -45,9 +45,9 @@
<slot>askRevision()</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot>askRevision()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">kpushbutton.h</include>
diff --git a/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp b/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp
index 66e299a..c64cbd6 100644
--- a/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp
+++ b/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp
@@ -50,7 +50,7 @@ void RevisionButtonImpl::askRevision()
Rangeinput_impl*rdlg;
int buttons = KDialogBase::Ok|KDialogBase::Cancel;
- KDialogBase * dlg = new KDialogBase(TQT_TQWIDGET(TDEApplication::activeModalWidget()),"Revinput",true,i18n("Select revision"),buttons);
+ KDialogBase * dlg = new KDialogBase(TDEApplication::activeModalWidget(),"Revinput",true,i18n("Select revision"),buttons);
if (!dlg) {
return;
diff --git a/src/svnfrontend/fronthelpers/revisionbuttonimpl.h b/src/svnfrontend/fronthelpers/revisionbuttonimpl.h
index bec5124..04a04a0 100644
--- a/src/svnfrontend/fronthelpers/revisionbuttonimpl.h
+++ b/src/svnfrontend/fronthelpers/revisionbuttonimpl.h
@@ -21,10 +21,10 @@
#define REVISIONBUTTONIMPL_H
#include "revisionbutton.h"
-#include "svnqt/revision.hpp"
+#include "svnqt/revision.h"
class RevisionButtonImpl: public RevisionButton {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/src/svnfrontend/graphtree/elogentry.h b/src/svnfrontend/graphtree/elogentry.h
index 3bcbabc..d9490b6 100644
--- a/src/svnfrontend/graphtree/elogentry.h
+++ b/src/svnfrontend/graphtree/elogentry.h
@@ -20,7 +20,7 @@
#ifndef ELOGENTRY_H
#define ELOGENTRY_H
-#include <svnqt/log_entry.hpp>
+#include <svnqt/log_entry.h>
/**
@author Rajko Albrecht <ral@alwins-world.de>
diff --git a/src/svnfrontend/graphtree/pannerview.h b/src/svnfrontend/graphtree/pannerview.h
index 5f67dc3..77fc724 100644
--- a/src/svnfrontend/graphtree/pannerview.h
+++ b/src/svnfrontend/graphtree/pannerview.h
@@ -27,7 +27,7 @@
*/
class PannerView : public TQCanvasView
{
-Q_OBJECT
+TQ_OBJECT
public:
PannerView(TQWidget* parent=0, const char* name=0);
diff --git a/src/svnfrontend/graphtree/revgraphview.cpp b/src/svnfrontend/graphtree/revgraphview.cpp
index 416b6e9..db95554 100644
--- a/src/svnfrontend/graphtree/revgraphview.cpp
+++ b/src/svnfrontend/graphtree/revgraphview.cpp
@@ -23,7 +23,7 @@
#include "graphtree_defines.h"
#include "tdesvnsettings.h"
#include "stopdlg.h"
-#include "client.hpp"
+#include "client.h"
#include <kapp.h>
#include <kdebug.h>
@@ -92,12 +92,12 @@ RevGraphView::RevGraphView(TQObject*aListener,svn::Client*_client,TQWidget * par
m_CompleteView->setHScrollBarMode(TQScrollView::AlwaysOff);
m_CompleteView->raise();
m_CompleteView->hide();
- connect(this, TQT_SIGNAL(contentsMoving(int,int)),
- this, TQT_SLOT(contentsMovingSlot(int,int)));
- connect(m_CompleteView, TQT_SIGNAL(zoomRectMoved(int,int)),
- this, TQT_SLOT(zoomRectMoved(int,int)));
- connect(m_CompleteView, TQT_SIGNAL(zoomRectMoveFinished()),
- this, TQT_SLOT(zoomRectMoveFinished()));
+ connect(this, TQ_SIGNAL(contentsMoving(int,int)),
+ this, TQ_SLOT(contentsMovingSlot(int,int)));
+ connect(m_CompleteView, TQ_SIGNAL(zoomRectMoved(int,int)),
+ this, TQ_SLOT(zoomRectMoved(int,int)));
+ connect(m_CompleteView, TQ_SIGNAL(zoomRectMoveFinished()),
+ this, TQ_SLOT(zoomRectMoveFinished()));
m_LastAutoPosition = TopLeft;
_isMoving = false;
_noUpdateZoomerPos = false;
@@ -495,9 +495,9 @@ void RevGraphView::dumpRevtree()
renderProcess->setEnvironment("LANG","C");
*renderProcess << "dot";
*renderProcess << dotTmpFile->name() << "-Tplain";
- connect(renderProcess,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(dotExit(TDEProcess*)));
- connect(renderProcess,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
- this,TQT_SLOT(readDotOutput(TDEProcess*,char*,int)) );
+ connect(renderProcess,TQ_SIGNAL(processExited(TDEProcess*)),this,TQ_SLOT(dotExit(TDEProcess*)));
+ connect(renderProcess,TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+ this,TQ_SLOT(readDotOutput(TDEProcess*,char*,int)) );
if (!renderProcess->start(TDEProcess::NotifyOnExit,TDEProcess::Stdout)) {
TQString arguments;
for (unsigned c=0;c<renderProcess->args().count();++c) {
@@ -735,7 +735,7 @@ void RevGraphView::makeSelected(GraphTreeLabel*gtl)
void RevGraphView::contentsMouseDoubleClickEvent ( TQMouseEvent * e )
{
setFocus();
- if (e->button() == Qt::LeftButton) {
+ if (e->button() == TQt::LeftButton) {
TQCanvasItemList l = canvas()->collisions(e->pos());
if (l.count()>0) {
TQCanvasItem* i = l.first();
@@ -901,7 +901,7 @@ void RevGraphView::makeCat(GraphTreeLabel*_l)
}
svn::Revision tr(it.data().rev);
TQString tp = _basePath+it.data().name;
- emit makeCat(tr,tp,it.data().name,tr,TQT_TQWIDGET(kapp->activeModalWidget()));
+ emit makeCat(tr,tp,it.data().name,tr,kapp->activeModalWidget());
}
void RevGraphView::makeDiffPrev(GraphTreeLabel*_l)
@@ -931,9 +931,9 @@ void RevGraphView::makeDiff(const TQString&n1,const TQString&n2)
svn::Revision tr(it.data().rev);
TQString tp = _basePath+it.data().name;
if (Kdesvnsettings::tree_diff_rec()) {
- emit makeRecDiff(sp,sr,tp,tr,TQT_TQWIDGET(kapp->activeModalWidget()));
+ emit makeRecDiff(sp,sr,tp,tr,kapp->activeModalWidget());
} else {
- emit makeNorecDiff(sp,sr,tp,tr,TQT_TQWIDGET(kapp->activeModalWidget()));
+ emit makeNorecDiff(sp,sr,tp,tr,kapp->activeModalWidget());
}
}
@@ -944,7 +944,7 @@ void RevGraphView::setBasePath(const TQString&_path)
void RevGraphView::slotClientException(const TQString&what)
{
- KMessageBox::sorry(TQT_TQWIDGET(TDEApplication::activeModalWidget()),what,i18n("SVN Error"));
+ KMessageBox::sorry(TDEApplication::activeModalWidget(),what,i18n("SVN Error"));
}
#include "revgraphview.moc"
diff --git a/src/svnfrontend/graphtree/revgraphview.h b/src/svnfrontend/graphtree/revgraphview.h
index d8d1972..9e9b577 100644
--- a/src/svnfrontend/graphtree/revgraphview.h
+++ b/src/svnfrontend/graphtree/revgraphview.h
@@ -20,7 +20,7 @@
#ifndef REVGRAPHVIEW_H
#define REVGRAPHVIEW_H
-#include <svnqt/revision.hpp>
+#include <svnqt/revision.h>
#include <tqcanvas.h>
@@ -43,7 +43,7 @@ class CContextListener;
*/
class RevGraphView : public TQCanvasView
{
- Q_OBJECT
+ TQ_OBJECT
public:
enum ZoomPosition { TopLeft, TopRight, BottomLeft, BottomRight, Auto };
diff --git a/src/svnfrontend/graphtree/revisiontree.cpp b/src/svnfrontend/graphtree/revisiontree.cpp
index be11aa2..c37818f 100644
--- a/src/svnfrontend/graphtree/revisiontree.cpp
+++ b/src/svnfrontend/graphtree/revisiontree.cpp
@@ -19,10 +19,10 @@
***************************************************************************/
#include "revisiontree.h"
#include "stopdlg.h"
-#include "log_entry.hpp"
-#include "LogCache.hpp"
-#include "ReposLog.hpp"
-#include "url.hpp"
+#include "log_entry.h"
+#include "LogCache.h"
+#include "ReposLog.h"
+#include "url.h"
#include "sub2qt.h"
#include "revtreewidget.h"
#include "revgraphview.h"
diff --git a/src/svnfrontend/graphtree/revisiontree.h b/src/svnfrontend/graphtree/revisiontree.h
index 199929d..211e3d4 100644
--- a/src/svnfrontend/graphtree/revisiontree.h
+++ b/src/svnfrontend/graphtree/revisiontree.h
@@ -20,9 +20,9 @@
#ifndef REVISIONTREE_H
#define REVISIONTREE_H
-#include "log_entry.hpp"
-#include "revision.hpp"
-#include "client.hpp"
+#include "log_entry.h"
+#include "revision.h"
+#include "client.h"
#include <tqstring.h>
#include <tqmap.h>
diff --git a/src/svnfrontend/graphtree/revtreewidget.cpp b/src/svnfrontend/graphtree/revtreewidget.cpp
index 46ae7fa..ff1fb5a 100644
--- a/src/svnfrontend/graphtree/revtreewidget.cpp
+++ b/src/svnfrontend/graphtree/revtreewidget.cpp
@@ -41,25 +41,25 @@ RevTreeWidget::RevTreeWidget(TQObject*lt,svn::Client*cl, TQWidget* parent, const
RevTreeWidgetLayout = new TQVBoxLayout( this, 11, 6, "RevTreeWidgetLayout");
m_Splitter = new TQSplitter( this, "m_Splitter" );
- m_Splitter->setOrientation( Qt::Vertical );
+ m_Splitter->setOrientation( TQt::Vertical );
m_RevGraphView = new RevGraphView(lt,cl, m_Splitter, "m_RevGraphView" );
m_RevGraphView->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 2, m_RevGraphView->sizePolicy().hasHeightForWidth() ) );
- connect(m_RevGraphView,TQT_SIGNAL(dispDetails(const TQString&)),this,TQT_SLOT(setDetailText(const TQString&)));
+ connect(m_RevGraphView,TQ_SIGNAL(dispDetails(const TQString&)),this,TQ_SLOT(setDetailText(const TQString&)));
connect(m_RevGraphView,
- TQT_SIGNAL(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)),
+ TQ_SIGNAL(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)),
this,
- TQT_SIGNAL(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*))
+ TQ_SIGNAL(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*))
);
connect(m_RevGraphView,
- TQT_SIGNAL(makeRecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)),
+ TQ_SIGNAL(makeRecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)),
this,
- TQT_SIGNAL(makeRecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*))
+ TQ_SIGNAL(makeRecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*))
);
connect(m_RevGraphView,
- TQT_SIGNAL(makeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*)),
+ TQ_SIGNAL(makeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*)),
this,
- TQT_SIGNAL(makeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*))
+ TQ_SIGNAL(makeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*))
);
m_Detailstext = new KTextBrowser( m_Splitter, "m_Detailstext" );
diff --git a/src/svnfrontend/graphtree/revtreewidget.h b/src/svnfrontend/graphtree/revtreewidget.h
index 40a1b10..cecda25 100644
--- a/src/svnfrontend/graphtree/revtreewidget.h
+++ b/src/svnfrontend/graphtree/revtreewidget.h
@@ -20,7 +20,7 @@
#ifndef REVTREEWIDGET_H
#define REVTREEWIDGET_H
-#include <svnqt/revision.hpp>
+#include <svnqt/revision.h>
#include <tqvariant.h>
#include <tqpixmap.h>
@@ -42,7 +42,7 @@ namespace svn {
class RevTreeWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/src/svnfrontend/hotcopydlg.ui b/src/svnfrontend/hotcopydlg.ui
index 47c7052..c144100 100644
--- a/src/svnfrontend/hotcopydlg.ui
+++ b/src/svnfrontend/hotcopydlg.ui
@@ -71,9 +71,6 @@
<property name="text">
<string>Clean logs</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="checked">
<bool>true</bool>
</property>
diff --git a/src/svnfrontend/hotcopydlg_impl.h b/src/svnfrontend/hotcopydlg_impl.h
index 5e216c5..7d2857f 100644
--- a/src/svnfrontend/hotcopydlg_impl.h
+++ b/src/svnfrontend/hotcopydlg_impl.h
@@ -23,7 +23,7 @@
#include "hotcopydlg.h"
class HotcopyDlg_impl: public HotcopyDlg {
-Q_OBJECT
+TQ_OBJECT
public:
HotcopyDlg_impl(TQWidget *parent = 0, const char *name = 0);
diff --git a/src/svnfrontend/importdir_logmsg.cpp b/src/svnfrontend/importdir_logmsg.cpp
index 8dfd03e..ecf8e47 100644
--- a/src/svnfrontend/importdir_logmsg.cpp
+++ b/src/svnfrontend/importdir_logmsg.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include "importdir_logmsg.h"
-#include "version_check.hpp"
+#include "version_check.h"
#include <tdelocale.h>
diff --git a/src/svnfrontend/importdir_logmsg.h b/src/svnfrontend/importdir_logmsg.h
index c6b2b18..e07f4ae 100644
--- a/src/svnfrontend/importdir_logmsg.h
+++ b/src/svnfrontend/importdir_logmsg.h
@@ -28,7 +28,7 @@ class TQCheckBox;
*/
class Importdir_logmsg : public Logmsg_impl
{
-Q_OBJECT
+TQ_OBJECT
public:
Importdir_logmsg(TQWidget *parent = 0, const char *name = 0);
diff --git a/src/svnfrontend/itemdisplay.cpp b/src/svnfrontend/itemdisplay.cpp
index 1d60730..0e47316 100644
--- a/src/svnfrontend/itemdisplay.cpp
+++ b/src/svnfrontend/itemdisplay.cpp
@@ -21,7 +21,7 @@
#include "itemdisplay.h"
#include "svnitem.h"
#include "tdesvnsettings.h"
-#include "status.hpp"
+#include "status.h"
ItemDisplay::ItemDisplay()
diff --git a/src/svnfrontend/itemdisplay.h b/src/svnfrontend/itemdisplay.h
index 2c3ffbc..7bb2fa0 100644
--- a/src/svnfrontend/itemdisplay.h
+++ b/src/svnfrontend/itemdisplay.h
@@ -21,7 +21,7 @@
#ifndef __ITEMDISPLAY_H
#define __ITEMDISPLAY_H
-#include "svnqttypes.hpp"
+#include "svnqttypes.h"
#include <tqptrlist.h>
#include <tqstring.h>
#include <kurl.h>
diff --git a/src/svnfrontend/loaddmpdlg.ui b/src/svnfrontend/loaddmpdlg.ui
index 70a947b..2f140b5 100644
--- a/src/svnfrontend/loaddmpdlg.ui
+++ b/src/svnfrontend/loaddmpdlg.ui
@@ -113,9 +113,6 @@
<property name="text">
<string>Default</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="checked">
<bool>true</bool>
</property>
@@ -127,9 +124,6 @@
<property name="text">
<string>Ignore</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<widget class="TQRadioButton">
<property name="name">
@@ -138,9 +132,6 @@
<property name="text">
<string>Force</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
</vbox>
</widget>
@@ -151,9 +142,6 @@
<property name="text">
<string>Use pre-commit hook</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<widget class="TQCheckBox">
<property name="name">
@@ -162,9 +150,6 @@
<property name="text">
<string>Use post-commit hook</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
</vbox>
</widget>
diff --git a/src/svnfrontend/loaddmpdlg_impl.h b/src/svnfrontend/loaddmpdlg_impl.h
index 8a31eb5..f20f373 100644
--- a/src/svnfrontend/loaddmpdlg_impl.h
+++ b/src/svnfrontend/loaddmpdlg_impl.h
@@ -23,7 +23,7 @@
#include "loaddmpdlg.h"
class LoadDmpDlg_impl: public LoadDmpDlg {
-Q_OBJECT
+TQ_OBJECT
public:
LoadDmpDlg_impl(TQWidget *parent = 0, const char *name = 0);
diff --git a/src/svnfrontend/merge_dlg.ui b/src/svnfrontend/merge_dlg.ui
index 621ecd0..94c0fcf 100644
--- a/src/svnfrontend/merge_dlg.ui
+++ b/src/svnfrontend/merge_dlg.ui
@@ -100,9 +100,6 @@
<property name="text">
<string>Force delete on modified/unversioned</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<widget class="TQCheckBox" row="1" column="0">
<property name="name">
@@ -119,9 +116,6 @@
<property name="text">
<string>Just dry run without modifications</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<widget class="TQCheckBox" row="0" column="0">
<property name="name">
@@ -130,9 +124,6 @@
<property name="text">
<string>Recursive</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="checked">
<bool>true</bool>
</property>
@@ -194,9 +185,9 @@
<slot>externDisplayToggled(bool)</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot access="protected">externDisplayToggled(bool)</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="2" margin="2"/>
<includes>
<include location="global" impldecl="in implementation">kurlrequester.h</include>
diff --git a/src/svnfrontend/mergedlg_impl.cpp b/src/svnfrontend/mergedlg_impl.cpp
index c8efc54..b046043 100644
--- a/src/svnfrontend/mergedlg_impl.cpp
+++ b/src/svnfrontend/mergedlg_impl.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include "mergedlg_impl.h"
#include "rangeinput_impl.h"
-#include "svnqt/url.hpp"
+#include "svnqt/url.h"
#include "ktranslateurl.h"
#include "tdesvnsettings.h"
diff --git a/src/svnfrontend/mergedlg_impl.h b/src/svnfrontend/mergedlg_impl.h
index e6e702d..d070fc9 100644
--- a/src/svnfrontend/mergedlg_impl.h
+++ b/src/svnfrontend/mergedlg_impl.h
@@ -24,7 +24,7 @@
#include "rangeinput_impl.h"
class MergeDlg_impl: public MergeDlg {
-Q_OBJECT
+TQ_OBJECT
public:
MergeDlg_impl(TQWidget *parent = 0, const char *name = 0,bool src1=true,bool src2=true,bool out=true);
diff --git a/src/svnfrontend/modifiedthread.cpp b/src/svnfrontend/modifiedthread.cpp
index 8cef421..ca185b5 100644
--- a/src/svnfrontend/modifiedthread.cpp
+++ b/src/svnfrontend/modifiedthread.cpp
@@ -21,7 +21,7 @@
#include "modifiedthread.h"
#include "tcontextlistener.h"
-#include "svnqttypes.hpp"
+#include "svnqttypes.h"
#include <tqobject.h>
#include <kdebug.h>
@@ -33,7 +33,7 @@ CheckModifiedThread::CheckModifiedThread(TQObject*_parent,const TQString&what,bo
m_Parent = _parent;
m_CurrentContext = new svn::Context();
m_ContextListener = new ThreadContextListener(m_Parent);
- TQObject::connect(m_ContextListener,TQT_SIGNAL(sendNotify(const TQString&)),m_Parent,TQT_SLOT(slotNotifyMessage(const TQString&)));
+ TQObject::connect(m_ContextListener,TQ_SIGNAL(sendNotify(const TQString&)),m_Parent,TQ_SLOT(slotNotifyMessage(const TQString&)));
m_CurrentContext->setListener(m_ContextListener);
m_what = what;
diff --git a/src/svnfrontend/modifiedthread.h b/src/svnfrontend/modifiedthread.h
index 93beb33..af6d7dd 100644
--- a/src/svnfrontend/modifiedthread.h
+++ b/src/svnfrontend/modifiedthread.h
@@ -20,9 +20,9 @@
#ifndef _MODIFIED_THREAD_H
#define _MODIFIED_THREAD_H
-#include "client.hpp"
-#include "revision.hpp"
-#include "status.hpp"
+#include "client.h"
+#include "revision.h"
+#include "status.h"
#include "ccontextlistener.h"
#include "eventnumbers.h"
#include "frontendtypes.h"
diff --git a/src/svnfrontend/opencontextmenu.cpp b/src/svnfrontend/opencontextmenu.cpp
index aa9d090..b30956e 100644
--- a/src/svnfrontend/opencontextmenu.cpp
+++ b/src/svnfrontend/opencontextmenu.cpp
@@ -47,7 +47,7 @@ void OpenContextmenu::setup()
TQString actionName( (*it)->name().replace("&", "&&") );
act = new TDEAction( actionName, (*it)->pixmap( TDEIcon::Small ), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotRunService() ), TQT_TQOBJECT(this), nam.prepend( "appservice_" ) );
+ this, TQ_SLOT( slotRunService() ), this, nam.prepend( "appservice_" ) );
act->plug(this);
m_mapPopup[ id++ ] = *it;
}
@@ -55,13 +55,13 @@ void OpenContextmenu::setup()
insertSeparator( );
}
act = new TDEAction(i18n("Other..."),0, 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotOpenWith() ),TQT_TQOBJECT(this),"openwith");
+ this, TQ_SLOT( slotOpenWith() ),this,"openwith");
act->plug(this);
}
void OpenContextmenu::slotRunService()
{
- TQCString senderName = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name();
+ TQCString senderName = sender()->name();
int id = senderName.mid( senderName.find( '_' ) + 1 ).toInt();
TQMap<int,KService::Ptr>::Iterator it = m_mapPopup.find( id );
diff --git a/src/svnfrontend/opencontextmenu.h b/src/svnfrontend/opencontextmenu.h
index d0b32af..b48a7a8 100644
--- a/src/svnfrontend/opencontextmenu.h
+++ b/src/svnfrontend/opencontextmenu.h
@@ -31,7 +31,7 @@
*/
class OpenContextmenu : public TQPopupMenu
{
-Q_OBJECT
+TQ_OBJECT
public:
OpenContextmenu(const KURL&,const TDETrader::OfferList&,TQWidget* parent, const char* name);
diff --git a/src/svnfrontend/propertiesdlg.cpp b/src/svnfrontend/propertiesdlg.cpp
index b4f8b7e..45b74b3 100644
--- a/src/svnfrontend/propertiesdlg.cpp
+++ b/src/svnfrontend/propertiesdlg.cpp
@@ -23,7 +23,7 @@
#include "propertiesdlg.h"
#include "editproperty_impl.h"
#include "svnitem.h"
-#include "client.hpp"
+#include "client.h"
#include <tqvariant.h>
#include <tqlabel.h>
@@ -85,12 +85,12 @@ PropertiesDlg::PropertiesDlg(SvnItem*which, svn::Client*aClient, const svn::Revi
clearWState( WState_Polished );
// signals and slots connections
- connect( m_AddButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAdd()));
- connect( m_ModifyButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotModify()));
- connect( m_DeleteButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelete()));
- connect(this,TQT_SIGNAL(helpClicked()),TQT_SLOT(slotHelp()));
- connect(m_PropertiesListview,TQT_SIGNAL(selectionChanged(TQListViewItem*)),this,TQT_SLOT(slotSelectionChanged(TQListViewItem*)));
-// connect(m_PropertiesListview,TQT_SIGNAL(executed(TQListViewItem*)),this,TQT_SLOT(slotSelectionExecuted(TQListViewItem*)));
+ connect( m_AddButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAdd()));
+ connect( m_ModifyButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotModify()));
+ connect( m_DeleteButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDelete()));
+ connect(this,TQ_SIGNAL(helpClicked()),TQ_SLOT(slotHelp()));
+ connect(m_PropertiesListview,TQ_SIGNAL(selectionChanged(TQListViewItem*)),this,TQ_SLOT(slotSelectionChanged(TQListViewItem*)));
+// connect(m_PropertiesListview,TQ_SIGNAL(executed(TQListViewItem*)),this,TQ_SLOT(slotSelectionExecuted(TQListViewItem*)));
if (!m_Client) {
m_PropertiesListview->setEnabled(false);
diff --git a/src/svnfrontend/propertiesdlg.h b/src/svnfrontend/propertiesdlg.h
index b67288d..fc0d289 100644
--- a/src/svnfrontend/propertiesdlg.h
+++ b/src/svnfrontend/propertiesdlg.h
@@ -26,8 +26,8 @@
#include <tqmap.h>
#include <tqstring.h>
-#include "svnqttypes.hpp"
-#include "revision.hpp"
+#include "svnqttypes.h"
+#include "revision.h"
class TQVBoxLayout;
class TQHBoxLayout;
@@ -46,7 +46,7 @@ namespace svn {
class PropertiesDlg : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/src/svnfrontend/stopdlg.cpp b/src/svnfrontend/stopdlg.cpp
index 8c6077d..bae5967 100644
--- a/src/svnfrontend/stopdlg.cpp
+++ b/src/svnfrontend/stopdlg.cpp
@@ -62,13 +62,13 @@ StopDlg::StopDlg(TQObject*listener,TQWidget *parent, const char *name,const TQSt
mWait = false;
m_LogWindow = 0;
- connect(mShowTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoShow()));
+ connect(mShowTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoShow()));
if (m_Context) {
- connect(m_Context,TQT_SIGNAL(tickProgress()),this,TQT_SLOT(slotTick()));
- connect(m_Context,TQT_SIGNAL(waitShow(bool)),this,TQT_SLOT(slotWait(bool)));
- connect(m_Context,TQT_SIGNAL(netProgress(long long int, long long int)),
- this,TQT_SLOT(slotNetProgres(long long int, long long int)));
- connect(this,TQT_SIGNAL(sigCancel(bool)),m_Context,TQT_SLOT(setCanceled(bool)));
+ connect(m_Context,TQ_SIGNAL(tickProgress()),this,TQ_SLOT(slotTick()));
+ connect(m_Context,TQ_SIGNAL(waitShow(bool)),this,TQ_SLOT(slotWait(bool)));
+ connect(m_Context,TQ_SIGNAL(netProgress(long long int, long long int)),
+ this,TQ_SLOT(slotNetProgres(long long int, long long int)));
+ connect(this,TQ_SIGNAL(sigCancel(bool)),m_Context,TQ_SLOT(setCanceled(bool)));
}
mShowTimer->start(m_MinDuration, true);
setMinimumSize(280,160);
@@ -102,7 +102,7 @@ StopDlg::~StopDlg()
void StopDlg::slotAutoShow()
{
bool hasDialogs = false;
- TQWidget * w = TQT_TQWIDGET(kapp->activeModalWidget());
+ TQWidget * w = kapp->activeModalWidget();
if (w && w!=this && w!=parentWidget() ) {
hasDialogs = true;
}
@@ -200,7 +200,7 @@ void StopDlg::slotNetProgres(long long int current, long long int max)
StopSimpleDlg::StopSimpleDlg(TQWidget *parent, const char *name,const TQString&caption,const TQString&text)
: StopDlg(0,parent,name,caption,text),cancelld(false)
{
- connect(this,TQT_SIGNAL(sigCancel(bool)),this,TQT_SLOT(slotSimpleCancel(bool)));
+ connect(this,TQ_SIGNAL(sigCancel(bool)),this,TQ_SLOT(slotSimpleCancel(bool)));
}
void StopSimpleDlg::slotSimpleCancel(bool how)
diff --git a/src/svnfrontend/stopdlg.h b/src/svnfrontend/stopdlg.h
index 0aaa948..fbddd8e 100644
--- a/src/svnfrontend/stopdlg.h
+++ b/src/svnfrontend/stopdlg.h
@@ -40,7 +40,7 @@ class TQVBoxLayout;
*/
class StopDlg : public KDialogBase
{
-Q_OBJECT
+TQ_OBJECT
public:
StopDlg(TQObject*,TQWidget *parent = 0, const char *name = 0,const TQString&caption=TQString(),const TQString&text=TQString());
@@ -86,7 +86,7 @@ signals:
class StopSimpleDlg:public StopDlg
{
- Q_OBJECT
+ TQ_OBJECT
public:
StopSimpleDlg(TQWidget *parent = 0, const char *name = 0,const TQString&caption=TQString(),const TQString&text=TQString());
diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp
index 9171a00..037c212 100644
--- a/src/svnfrontend/svnactions.cpp
+++ b/src/svnfrontend/svnactions.cpp
@@ -37,17 +37,17 @@
#include "revisiontree.h"
#include "tdesvnsettings.h"
#include "tdesvn_events.h"
-#include "client.hpp"
-#include "annotate_line.hpp"
-#include "context_listener.hpp"
-#include "dirent.hpp"
-#include "targets.hpp"
-#include "url.hpp"
-#include "wc.hpp"
-#include "svnqt_defines.hpp"
-#include "LogCache.hpp"
-#include "ReposLog.hpp"
-#include "url.hpp"
+#include "client.h"
+#include "annotate_line.h"
+#include "context_listener.h"
+#include "dirent.h"
+#include "targets.h"
+#include "url.h"
+#include "wc.h"
+#include "svnqt_defines.h"
+#include "LogCache.h"
+#include "ReposLog.h"
+#include "url.h"
#include "helpers/sub2qt.h"
#include "fronthelpers/cursorstack.h"
@@ -209,9 +209,9 @@ SvnActions::SvnActions(ItemDisplay *parent, const char *name,bool processes_bloc
m_Data->m_ParentList = parent;
m_Data->m_SvnContextListener = new CContextListener(this);
m_Data->runblocked = processes_blocked;
- connect(m_Data->m_SvnContextListener,TQT_SIGNAL(sendNotify(const TQString&)),this,TQT_SLOT(slotNotifyMessage(const TQString&)));
- connect(&(m_Data->m_ThreadCheckTimer),TQT_SIGNAL(timeout()),this,TQT_SLOT(checkModthread()));
- connect(&(m_Data->m_UpdateCheckTimer),TQT_SIGNAL(timeout()),this,TQT_SLOT(checkUpdateThread()));
+ connect(m_Data->m_SvnContextListener,TQ_SIGNAL(sendNotify(const TQString&)),this,TQ_SLOT(slotNotifyMessage(const TQString&)));
+ connect(&(m_Data->m_ThreadCheckTimer),TQ_SIGNAL(timeout()),this,TQ_SLOT(checkModthread()));
+ connect(&(m_Data->m_UpdateCheckTimer),TQ_SIGNAL(timeout()),this,TQ_SLOT(checkUpdateThread()));
}
svn::Client* SvnActions::svnclient()
@@ -252,7 +252,7 @@ template<class T> KDialogBase* SvnActions::createDialog(T**ptr,const TQString&_h
buttons = buttons|KDialogBase::User1;
}
KDialogBase * dlg = new KDialogBase(
- modal?TQT_TQWIDGET(TQT_TQWIDGET(TDEApplication::activeModalWidget())):0, // parent
+ modal?TDEApplication::activeModalWidget():0, // parent
name, // name
modal, // modal
_head, // caption
@@ -291,7 +291,7 @@ svn::SharedPointer<svn::LogEntriesMap> SvnActions::getLog(const svn::Revision&st
try {
StopDlg sdlg(m_Data->m_SvnContextListener,(parent?parent:m_Data->m_ParentList->realWidget()),0,"Logs",
i18n("Getting logs - hit cancel for abort"));
- connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&)));
+ connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
if (doNetworking()) {
m_Data->m_Svnclient->log(which,start,end,*logs,peg,list_files,!follow,limit);
} else {
@@ -454,15 +454,15 @@ void SvnActions::makeTree(const TQString&what,const svn::Revision&_rev,const svn
disp = rt.getView();
if (disp) {
connect(
- disp,TQT_SIGNAL(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)),
- this,TQT_SLOT(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*))
+ disp,TQ_SIGNAL(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)),
+ this,TQ_SLOT(makeNorecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*))
);
connect(
- disp,TQT_SIGNAL(makeRecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)),
- this,TQT_SLOT(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*))
+ disp,TQ_SIGNAL(makeRecDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)),
+ this,TQ_SLOT(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*))
);
- connect(disp,TQT_SIGNAL(makeCat(const svn::Revision&, const TQString&,const TQString&,const svn::Revision&,TQWidget*)),
- this,TQT_SLOT(slotMakeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*)));
+ connect(disp,TQ_SIGNAL(makeCat(const svn::Revision&, const TQString&,const TQString&,const svn::Revision&,TQWidget*)),
+ this,TQ_SLOT(slotMakeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*)));
dlg.resize(dlg.configDialogSize(*(Kdesvnsettings::self()->config()),"revisiontree_dlg"));
dlg.exec();
dlg.saveDialogSize(*(Kdesvnsettings::self()->config()),"revisiontree_dlg",false);
@@ -483,13 +483,13 @@ void SvnActions::makeLog(const svn::Revision&start,const svn::Revision&end,const
kdDebug()<<"getting logs..."<<endl;
svn::SharedPointer<svn::LogEntriesMap> logs = getLog(start,end,peg,which,list_files,limit);
if (!logs) return;
- bool need_modal = m_Data->runblocked||TQT_TQWIDGET(TDEApplication::activeModalWidget())!=0;
+ bool need_modal = m_Data->runblocked||TDEApplication::activeModalWidget()!=0;
if (need_modal||!m_Data->m_LogDialog) {
m_Data->m_LogDialog=new SvnLogDlgImp(this,0,"logdialog",need_modal);
- connect(m_Data->m_LogDialog,TQT_SIGNAL(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)),
- this,TQT_SLOT(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)));
- connect(m_Data->m_LogDialog,TQT_SIGNAL(makeCat(const svn::Revision&, const TQString&,const TQString&,const svn::Revision&,TQWidget*)),
- this,TQT_SLOT(slotMakeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*)));
+ connect(m_Data->m_LogDialog,TQ_SIGNAL(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)),
+ this,TQ_SLOT(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)));
+ connect(m_Data->m_LogDialog,TQ_SIGNAL(makeCat(const svn::Revision&, const TQString&,const TQString&,const svn::Revision&,TQWidget*)),
+ this,TQ_SLOT(slotMakeCat(const svn::Revision&,const TQString&,const TQString&,const svn::Revision&,TQWidget*)));
}
if (m_Data->m_LogDialog) {
@@ -528,7 +528,7 @@ void SvnActions::makeBlame(const svn::Revision&start, const svn::Revision&end,co
try {
CursorStack a(TQt::BusyCursor);
StopDlg sdlg(m_Data->m_SvnContextListener,_parent,0,"Annotate",i18n("Annotate lines - hit cancel for abort"));
- connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&)));
+ connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
m_Data->m_Svnclient->annotate(blame,p,start,end,peg);
} catch (const svn::Exception&e) {
emit clientException(e.msg());
@@ -554,7 +554,7 @@ bool SvnActions::makeGet(const svn::Revision&start, const TQString&what, const T
try {
StopDlg sdlg(m_Data->m_SvnContextListener,dlgp,
0,"Content get",i18n("Getting content - hit cancel for abort"));
- connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&)));
+ connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
m_Data->m_Svnclient->get(p,target,start,peg);
} catch (const svn::Exception&e) {
emit clientException(e.msg());
@@ -673,7 +673,7 @@ TQString SvnActions::getInfo(const TQString& _what,const svn::Revision&rev,const
try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,"Details",
i18n("Retrieving infos - hit cancel for abort"));
- connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&)));
+ connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
svn::InfoEntries e;
entries = (m_Data->m_Svnclient->info(_what+
(_what.find("@")>-1&&!svn::Url::isValid(_what)?"@BASE":""),recursive?svn::DepthInfinity:svn::DepthEmpty,rev,peg));
@@ -865,7 +865,7 @@ void SvnActions::slotProperties()
if (!k) return;
PropertiesDlg dlg(k,svnclient(),
m_Data->m_ParentList->isWorkingCopy()?svn::Revision::WORKING:svn::Revision::HEAD);
- connect(&dlg,TQT_SIGNAL(clientException(const TQString&)),m_Data->m_ParentList->realWidget(),TQT_SLOT(slotClientException(const TQString&)));
+ connect(&dlg,TQ_SIGNAL(clientException(const TQString&)),m_Data->m_ParentList->realWidget(),TQ_SLOT(slotClientException(const TQString&)));
dlg.resize(dlg.configDialogSize(*(Kdesvnsettings::self()->config()), "properties_dlg"));
if (dlg.exec()!=TQDialog::Accepted) {
return;
@@ -884,7 +884,7 @@ bool SvnActions::changeProperties(const svn::PropertiesMap&setList,const TQValue
{
try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,"Applying properties","<center>Applying<br>hit cancel for abort</center>");
- connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&)));
+ connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
unsigned int pos;
for (pos = 0; pos<delList.size();++pos) {
m_Data->m_Svnclient->propdel(delList[pos],svn::Path(path));
@@ -1024,7 +1024,7 @@ bool SvnActions::makeCommit(const svn::Targets&targets)
try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Commiting"),
i18n("Commiting - hit cancel for abort"));
- connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&)));
+ connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
nnum = m_Data->m_Svnclient->commit(_targets,msg,depth,keeplocks);
} catch (const svn::Exception&e) {
emit clientException(e.msg());
@@ -1085,7 +1085,7 @@ bool SvnActions::get(const TQString&what,const TQString& to,const svn::Revision&
try {
StopDlg sdlg(m_Data->m_SvnContextListener,p?p:m_Data->m_ParentList->realWidget(),0,"Downloading",
i18n("Download - hit cancel for abort"));
- connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&)));
+ connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
m_Data->m_Svnclient->get(svn::Path(what),
to,rev,_peg);
} catch (const svn::Exception&e) {
@@ -1193,9 +1193,9 @@ void SvnActions::makeDiffExternal(const TQString&p1,const svn::Revision&start,co
*proc << *it;
}
}
- connect(proc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(procClosed(TDEProcess*)));
- connect(proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int)));
- connect(proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int)));
+ connect(proc,TQ_SIGNAL(processExited(TDEProcess*)),this,TQ_SLOT(procClosed(TDEProcess*)));
+ connect(proc,TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQ_SLOT(receivedStderr(TDEProcess*,char*,int)));
+ connect(proc,TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),this,TQ_SLOT(receivedStderr(TDEProcess*,char*,int)));
if (proc->start(m_Data->runblocked?TDEProcess::Block:TDEProcess::NotifyOnExit,TDEProcess::All)) {
if (!m_Data->runblocked) {
if (!isDir) {
@@ -1249,7 +1249,7 @@ void SvnActions::makeDiffinternal(const TQString&p1,const svn::Revision&r1,const
try {
StopDlg sdlg(m_Data->m_SvnContextListener,parent,0,"Diffing",
i18n("Diffing - hit cancel for abort"));
- connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&)));
+ connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
if (p1==p2 && (r1.isRemote()||r2.isRemote())) {
kdDebug()<<"Pegged diff"<<endl;
ex = m_Data->m_Svnclient->diff_peg(svn::Path(tn),
@@ -1300,7 +1300,7 @@ void SvnActions::makeNorecDiff(const TQString&p1,const svn::Revision&r1,const TQ
bool ignore_content = Kdesvnsettings::diff_ignore_content();
try {
StopDlg sdlg(m_Data->m_SvnContextListener,_p?_p:m_Data->m_ParentList->realWidget(),0,"Diffing","Diffing - hit cancel for abort");
- connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&)));
+ connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
ex = m_Data->m_Svnclient->diff(svn::Path(tn),
svn::Path(p1),svn::Path(p2),svn::Path(),
r1, r2,
@@ -1342,10 +1342,10 @@ void SvnActions::dispDiff(const TQByteArray&ex)
}
}
- connect(proc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(procClosed(TDEProcess*)));
- connect(proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int)));
+ connect(proc,TQ_SIGNAL(processExited(TDEProcess*)),this,TQ_SLOT(procClosed(TDEProcess*)));
+ connect(proc,TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQ_SLOT(receivedStderr(TDEProcess*,char*,int)));
if (!fname_used) {
- connect(proc,TQT_SIGNAL(wroteStdin(TDEProcess*)),this,TQT_SLOT(wroteStdin(TDEProcess*)));
+ connect(proc,TQ_SIGNAL(wroteStdin(TDEProcess*)),this,TQ_SLOT(wroteStdin(TDEProcess*)));
}
if (proc->start(TDEProcess::NotifyOnExit,fname_used?TDEProcess::Stderr:(TDEProcess::Communication)r)) {
if (!fname_used) proc->writeStdin(ex,ex.size());
@@ -1356,7 +1356,7 @@ void SvnActions::dispDiff(const TQByteArray&ex)
}
delete proc;
}
- bool need_modal = m_Data->runblocked||TQT_TQWIDGET(TDEApplication::activeModalWidget())!=0;
+ bool need_modal = m_Data->runblocked||TDEApplication::activeModalWidget()!=0;
if (need_modal||!m_Data->m_DiffBrowserPtr||!m_Data->m_DiffDialog) {
DiffBrowser*ptr;
@@ -1370,10 +1370,10 @@ void SvnActions::dispDiff(const TQByteArray&ex)
TQWidget*wd = dlg->mainWidget();
if (wd) {
EncodingSelector_impl * ls = new EncodingSelector_impl("",wd);
- TQObject::connect(ls,TQT_SIGNAL(TextCodecChanged(const TQString&)),
- ptr,TQT_SLOT(slotTextCodecChanged(const TQString&)));
+ TQObject::connect(ls,TQ_SIGNAL(TextCodecChanged(const TQString&)),
+ ptr,TQ_SLOT(slotTextCodecChanged(const TQString&)));
}
- TQObject::connect(dlg,TQT_SIGNAL(user1Clicked()),ptr,TQT_SLOT(saveDiff()));
+ TQObject::connect(dlg,TQ_SIGNAL(user1Clicked()),ptr,TQ_SLOT(saveDiff()));
ptr->setText(ex);
if (need_modal) {
ptr->setFocus();
@@ -1409,7 +1409,7 @@ void SvnActions::makeUpdate(const TQStringList&what,const svn::Revision&rev,bool
try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,"Making update",
i18n("Making update - hit cancel for abort"));
- connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&)));
+ connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
svn::Targets pathes(what);
ret = m_Data->m_Svnclient->update(pathes,rev, recurse?svn::DepthInfinity:svn::DepthFiles,false,false,true);
} catch (const svn::Exception&e) {
@@ -1689,7 +1689,7 @@ bool SvnActions::makeCheckout(const TQString&rUrl,const TQString&tPath,const svn
if (!_exp||!m_Data->m_CurrentContext) reInitClient();
try {
StopDlg sdlg(m_Data->m_SvnContextListener,_p?_p:m_Data->m_ParentList->realWidget(),0,_exp?i18n("Export"):i18n("Checkout"),_exp?i18n("Exporting"):i18n("Checking out"));
- connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&)));
+ connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
if (_exp) {
/// @todo setup parameter for export operation
m_Data->m_Svnclient->doExport(svn::Path(fUrl),p,r,peg,overwrite,TQString(),ignoreExternal,depth);
@@ -1762,7 +1762,7 @@ void SvnActions::slotRevertItems(const TQStringList&displist)
try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Revert"),i18n("Reverting items"));
- connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&)));
+ connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
svn::Targets target(items);
m_Data->m_Svnclient->revert(target,depth);
} catch (const svn::Exception&e) {
@@ -1788,7 +1788,7 @@ bool SvnActions::makeSwitch(const TQString&rUrl,const TQString&tPath,const svn::
svn::Path p(tPath);
try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Switch url"),i18n("Switching url"));
- connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&)));
+ connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
m_Data->m_Svnclient->doSwitch(p,fUrl,r,depth,peg,stickydepth,ignore_externals,allow_unversioned);
} catch (const svn::Exception&e) {
emit clientException(e.msg());
@@ -1813,7 +1813,7 @@ bool SvnActions::makeRelocate(const TQString&fUrl,const TQString&tUrl,const TQSt
svn::Path p(path);
try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Relocate url"),i18n("Relocate repository to new URL"));
- connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&)));
+ connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
m_Data->m_Svnclient->relocate(p,_f,_t,rec);
} catch (const svn::Exception&e) {
emit clientException(e.msg());
@@ -1875,7 +1875,7 @@ bool SvnActions::makeCleanup(const TQString&path)
if (!m_Data->m_CurrentContext) return false;
try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Cleanup"),i18n("Cleaning up folder"));
- connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&)));
+ connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
m_Data->m_Svnclient->cleanup(svn::Path(path));
} catch (const svn::Exception&e) {
emit clientException(e.msg());
@@ -1889,7 +1889,7 @@ void SvnActions::slotResolved(const TQString&path)
if (!m_Data->m_CurrentContext) return;
try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Resolve"),i18n("Marking resolved"));
- connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&)));
+ connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
m_Data->m_Svnclient->resolve(svn::Path(path),svn::DepthEmpty);
} catch (const svn::Exception&e) {
emit clientException(e.msg());
@@ -1938,9 +1938,9 @@ void SvnActions::slotResolve(const TQString&p)
*proc << *it;
}
}
- connect(proc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(procClosed(TDEProcess*)));
- connect(proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int)));
- connect(proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int)));
+ connect(proc,TQ_SIGNAL(processExited(TDEProcess*)),this,TQ_SLOT(procClosed(TDEProcess*)));
+ connect(proc,TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQ_SLOT(receivedStderr(TDEProcess*,char*,int)));
+ connect(proc,TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),this,TQ_SLOT(receivedStderr(TDEProcess*,char*,int)));
if (proc->start(m_Data->runblocked?TDEProcess::Block:TDEProcess::NotifyOnExit,TDEProcess::All)) {
return;
} else {
@@ -1956,7 +1956,7 @@ void SvnActions::slotImport(const TQString&path,const TQString&target,const TQSt
if (!m_Data->m_CurrentContext) return;
try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Import"),i18n("Importing items"));
- connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&)));
+ connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
m_Data->m_Svnclient->import(svn::Path(path),target,message,depth,noIgnore,noUnknown);
} catch (const svn::Exception&e) {
emit clientException(e.msg());
@@ -2088,8 +2088,8 @@ void SvnActions::slotMergeExternal(const TQString&_src1,const TQString&_src2, co
*proc << *it;
}
}
- connect(proc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(procClosed(TDEProcess*)));
- connect(proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int)));
+ connect(proc,TQ_SIGNAL(processExited(TDEProcess*)),this,TQ_SLOT(procClosed(TDEProcess*)));
+ connect(proc,TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQ_SLOT(receivedStderr(TDEProcess*,char*,int)));
if (proc->start(m_Data->runblocked?TDEProcess::Block:TDEProcess::NotifyOnExit,TDEProcess::Stderr)) {
if (!m_Data->runblocked) {
tdir1.setAutoDelete(false);
@@ -2147,7 +2147,7 @@ void SvnActions::slotMerge(const TQString&src1,const TQString&src2, const TQStri
}
try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Merge"),i18n("Merging items"));
- connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&)));
+ connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
if (pegged_merge) {
m_Data->m_Svnclient->merge_peg(p1,ranges,svn::Revision::HEAD,svn::Path(target),rec?svn::DepthUnknown:svn::DepthFiles,
ancestry,dry,forceIt,false);
@@ -2171,7 +2171,7 @@ bool SvnActions::makeMove(const TQString&Old,const TQString&New,bool force)
svn::Revision nnum;
try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Move"),i18n("Moving/Rename item "));
- connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&)));
+ connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
nnum = m_Data->m_Svnclient->move(svn::Path(Old),svn::Path(New),force);
} catch (const svn::Exception&e) {
emit clientException(e.msg());
@@ -2189,7 +2189,7 @@ bool SvnActions::makeMove(const KURL::List&Old,const TQString&New,bool force)
svn::Revision nnum;
try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Move"),i18n("Moving entries"));
- connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&)));
+ connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
KURL::List::ConstIterator it = Old.begin();
bool local = false;
@@ -2216,7 +2216,7 @@ bool SvnActions::makeCopy(const TQString&Old,const TQString&New,const svn::Revis
if (!m_Data->m_CurrentContext) return false;
try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Copy / Move"),i18n("Copy or Moving entries"));
- connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&)));
+ connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
m_Data->m_Svnclient->copy(svn::Path(Old),rev,svn::Path(New));
} catch (const svn::Exception&e) {
emit clientException(e.msg());
@@ -2241,7 +2241,7 @@ bool SvnActions::makeCopy(const KURL::List&Old,const TQString&New,const svn::Rev
try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Copy / Move"),i18n("Copy or Moving entries"));
- connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&)));
+ connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
KURL::List::ConstIterator it = Old.begin();
m_Data->m_Svnclient->copy(t,rev,rev,svn::Path(New),true);
} catch (const svn::Exception&e) {
@@ -2310,7 +2310,7 @@ bool SvnActions::makeStatus(const TQString&what, svn::StatusEntries&dlist, svn::
svn::Depth _d=rec?svn::DepthInfinity:svn::DepthImmediates;
try {
StopDlg sdlg(m_Data->m_SvnContextListener,m_Data->m_ParentList->realWidget(),0,i18n("Status / List"),i18n("Creating list / check status"));
- connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&)));
+ connect(this,TQ_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQ_SLOT(slotExtraMessage(const TQString&)));
// rec all up noign
dlist = m_Data->m_Svnclient->status(what,_d,all,updates,display_ignores,where,disp_remote_details,false);
} catch (const svn::Exception&e) {
diff --git a/src/svnfrontend/svnactions.h b/src/svnfrontend/svnactions.h
index 4342ea5..f5a79e0 100644
--- a/src/svnfrontend/svnactions.h
+++ b/src/svnfrontend/svnactions.h
@@ -20,11 +20,11 @@
#ifndef SVNACTIONS_H
#define SVNACTIONS_H
-#include "client.hpp"
-#include "revision.hpp"
-#include "smart_pointer.hpp"
-#include "shared_pointer.hpp"
-#include "svnqttypes.hpp"
+#include "client.h"
+#include "revision.h"
+#include "smart_pointer.h"
+#include "shared_pointer.h"
+#include "svnqttypes.h"
#include "simple_logcb.h"
@@ -62,7 +62,7 @@ namespace TDEIO {
*/
class SvnActions : public TQObject,public SimpleLogCb
{
- Q_OBJECT
+ TQ_OBJECT
public:
enum ThreadType {
diff --git a/src/svnfrontend/svnfiletip.cpp b/src/svnfrontend/svnfiletip.cpp
index 462a32e..f9e66b5 100644
--- a/src/svnfrontend/svnfiletip.cpp
+++ b/src/svnfrontend/svnfiletip.cpp
@@ -113,7 +113,7 @@ void SvnFileTip::setItem(SvnItem*item, const TQRect &rect, const TQPixmap *pixma
// Don't start immediately, because the user could move the mouse over another item
// This avoids a quick sequence of started preview-jobs
m_timer->disconnect( this );
- connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(startDelayed()));
+ connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(startDelayed()));
m_timer->start( 300, true );
} else {
m_timer->stop();
@@ -239,7 +239,7 @@ void SvnFileTip::showTip()
if ( text.isEmpty() ) return;
m_timer->disconnect( this );
- connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(hideTip()));
+ connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(hideTip()));
m_timer->start( 15000, true );
m_textLabel->setText( text );
@@ -269,14 +269,14 @@ void SvnFileTip::startDelayed()
oneItem.append( m_svnitem->fileItem() );
m_previewJob = TDEIO::filePreview( oneItem, 256, 256, 64, 70, true, true, 0);
- connect( m_previewJob, TQT_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ),
- this, TQT_SLOT( gotPreview( const KFileItem *, const TQPixmap & ) ) );
- connect( m_previewJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- this, TQT_SLOT( gotPreviewResult() ) );
+ connect( m_previewJob, TQ_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ),
+ this, TQ_SLOT( gotPreview( const KFileItem *, const TQPixmap & ) ) );
+ connect( m_previewJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ this, TQ_SLOT( gotPreviewResult() ) );
}
m_timer->disconnect( this );
- connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(showTip()));
+ connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(showTip()));
m_timer->start( 400, true );
}
diff --git a/src/svnfrontend/svnfiletip.h b/src/svnfrontend/svnfiletip.h
index 2b71b2d..65486cc 100644
--- a/src/svnfrontend/svnfiletip.h
+++ b/src/svnfrontend/svnfiletip.h
@@ -39,7 +39,7 @@ class SvnItem;
*/
class SvnFileTip : public TQFrame
{
-Q_OBJECT
+TQ_OBJECT
public:
SvnFileTip(TQScrollView*parent);
diff --git a/src/svnfrontend/svnitem.cpp b/src/svnfrontend/svnitem.cpp
index 0e70cbf..bfe5b8b 100644
--- a/src/svnfrontend/svnitem.cpp
+++ b/src/svnfrontend/svnitem.cpp
@@ -22,9 +22,9 @@
#include "svnactions.h"
#include "tdesvn_part.h"
#include "tdesvnsettings.h"
-#include "status.hpp"
-#include "smart_pointer.hpp"
-#include "url.hpp"
+#include "status.h"
+#include "smart_pointer.h"
+#include "url.h"
#include "sub2qt.h"
#include "ktranslateurl.h"
diff --git a/src/svnfrontend/svnitem.h b/src/svnfrontend/svnitem.h
index 76c2533..73b7c9a 100644
--- a/src/svnfrontend/svnitem.h
+++ b/src/svnfrontend/svnitem.h
@@ -21,8 +21,8 @@
#ifndef __SVN_ITEM_H
#define __SVN_ITEM_H
-#include "smart_pointer.hpp"
-#include "svnqttypes.hpp"
+#include "smart_pointer.h"
+#include "svnqttypes.h"
#include <kmimetype.h>
#include <tqstring.h>
#include <tqdatetime.h>
diff --git a/src/svnfrontend/svnlogdlg.ui b/src/svnfrontend/svnlogdlg.ui
index b55f2ec..d893f0b 100644
--- a/src/svnfrontend/svnlogdlg.ui
+++ b/src/svnfrontend/svnlogdlg.ui
@@ -262,9 +262,6 @@
<property name="text">
<string>Diff previous</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<widget class="KPushButton">
<property name="name">
@@ -276,9 +273,6 @@
<property name="text">
<string>Diff revisions</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="toolTip" stdset="0">
<string>Select second revision with right mouse button</string>
</property>
@@ -293,9 +287,6 @@
<property name="text">
<string>List entries</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<widget class="KPushButton">
<property name="name">
@@ -307,9 +298,6 @@
<property name="text">
<string>Annotate</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<spacer>
<property name="name">
@@ -335,9 +323,6 @@
<property name="text">
<string>Close</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
</hbox>
</widget>
@@ -448,7 +433,7 @@
<slot>slotGetLogs()</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot access="protected">slotSelectionChanged(TQListViewItem*)</slot>
<slot access="protected">slotItemChanged(TQListViewItem*)</slot>
<slot access="protected">slotDispPrevious()</slot>
@@ -461,7 +446,7 @@
<slot access="protected">slotSingleDoubleClicked(TQListViewItem*)</slot>
<slot access="protected">slotRevisionSelected()</slot>
<slot access="protected">slotGetLogs()</slot>
-</Q_SLOTS>
+</slots>
<forwards>
<forward>class TQListViewItem;</forward>
</forwards>
diff --git a/src/svnfrontend/svnlogdlgimp.cpp b/src/svnfrontend/svnlogdlgimp.cpp
index 5f8b69a..00f5959 100644
--- a/src/svnfrontend/svnlogdlgimp.cpp
+++ b/src/svnfrontend/svnlogdlgimp.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include "svnlogdlgimp.h"
#include "tdesvnsettings.h"
-#include "log_entry.hpp"
+#include "log_entry.h"
#include "sub2qt.h"
#include "svnactions.h"
#include "revisionbuttonimpl.h"
@@ -580,7 +580,7 @@ void SvnLogDlgImp::slotBlameItem()
return;
}
svn::Revision start(svn::Revision::START);
- m_Actions->makeBlame(start,k->rev(),_base+k->realName(),TQT_TQWIDGET(kapp->activeModalWidget()),k->rev(),this);
+ m_Actions->makeBlame(start,k->rev(),_base+k->realName(),kapp->activeModalWidget(),k->rev(),this);
}
void SvnLogDlgImp::slotEntriesSelectionChanged()
@@ -618,7 +618,7 @@ void SvnLogDlgImp::slotSingleContext(TQListViewItem*_item, const TQPoint & e, in
{
case 101:
{
- m_Actions->makeBlame(start,k->rev(),_base+name,TQT_TQWIDGET(kapp->activeModalWidget()),k->rev(),this);
+ m_Actions->makeBlame(start,k->rev(),_base+name,kapp->activeModalWidget(),k->rev(),this);
break;
}
case 102:
@@ -628,7 +628,7 @@ void SvnLogDlgImp::slotSingleContext(TQListViewItem*_item, const TQPoint & e, in
}
case 103:
{
- emit makeCat(k->rev(),_base+source,source,k->rev(),TQT_TQWIDGET(kapp->activeModalWidget()));
+ emit makeCat(k->rev(),_base+source,source,k->rev(),kapp->activeModalWidget());
}
default:
break;
@@ -654,7 +654,7 @@ void SvnLogDlgImp::slotSingleDoubleClicked(TQListViewItem*_item)
//svn_revnum_t prev = item->revision()>0?item->revision():k->rev()-1;
svn::Revision start(svn::Revision::START);
if (action != "D") {
- m_Actions->makeBlame(start,k->rev(),_base+name,TQT_TQWIDGET(kapp->activeModalWidget()),k->rev(),this);
+ m_Actions->makeBlame(start,k->rev(),_base+name,kapp->activeModalWidget(),k->rev(),this);
}
}
diff --git a/src/svnfrontend/svnlogdlgimp.h b/src/svnfrontend/svnlogdlgimp.h
index 64b57c9..dbbffb3 100644
--- a/src/svnfrontend/svnlogdlgimp.h
+++ b/src/svnfrontend/svnlogdlgimp.h
@@ -22,9 +22,9 @@
#include "svnlogdlg.h"
#include "simple_logcb.h"
-#include "log_entry.hpp"
-#include "client.hpp"
-#include "shared_pointer.hpp"
+#include "log_entry.h"
+#include "client.h"
+#include "shared_pointer.h"
#include <tqsize.h>
#include <tqregexp.h>
@@ -34,7 +34,7 @@ class SvnActions;
class SvnLogDlgImp: public SvnLogDialogData,public SimpleLogCb
{
-Q_OBJECT
+TQ_OBJECT
public:
SvnLogDlgImp(SvnActions*,TQWidget *parent = 0, const char *name = 0,bool modal=true);
diff --git a/src/svnfrontend/tcontextlistener.h b/src/svnfrontend/tcontextlistener.h
index 9f0b258..097ce57 100644
--- a/src/svnfrontend/tcontextlistener.h
+++ b/src/svnfrontend/tcontextlistener.h
@@ -35,7 +35,7 @@ class ThreadContextListenerData;
*/
class ThreadContextListener : public CContextListener
{
- Q_OBJECT
+ TQ_OBJECT
public:
ThreadContextListener(TQObject* parent, const char* name=0);
diff --git a/src/svnfrontend/tdesvnfilelist.cpp b/src/svnfrontend/tdesvnfilelist.cpp
index 21e23dc..d297e7d 100644
--- a/src/svnfrontend/tdesvnfilelist.cpp
+++ b/src/svnfrontend/tdesvnfilelist.cpp
@@ -31,11 +31,11 @@
#include "checkoutinfo_impl.h"
#include "stopdlg.h"
#include "tdesvnsettings.h"
-#include "revision.hpp"
-#include "dirent.hpp"
-#include "client.hpp"
-#include "status.hpp"
-#include "url.hpp"
+#include "revision.h"
+#include "dirent.h"
+#include "client.h"
+#include "status.h"
+#include "url.h"
#include "sshagent.h"
#include "sub2qt.h"
#include "cursorstack.h"
@@ -127,7 +127,7 @@ public:
void connectDirTimer(TQObject*ob)
{
- TQObject::connect(&dirwatch_timer,TQT_SIGNAL(timeout()),ob,TQT_SLOT(_dirwatchTimeout()));
+ TQObject::connect(&dirwatch_timer,TQ_SIGNAL(timeout()),ob,TQ_SLOT(_dirwatchTimeout()));
}
void stopScan()
{
@@ -151,7 +151,7 @@ public:
}
void connectPropTimer(TQObject*ob)
{
- TQObject::connect(&propTimer,TQT_SIGNAL(timeout()),ob,TQT_SLOT(_propListTimeout()));
+ TQObject::connect(&propTimer,TQ_SIGNAL(timeout()),ob,TQ_SLOT(_propListTimeout()));
}
private:
@@ -216,30 +216,30 @@ tdesvnfilelist::tdesvnfilelist(TDEActionCollection*aCollect,TQWidget *parent, co
setSortColumn(FileListViewItem::COL_NAME);
setupActions();
- connect(this,TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),this,
- TQT_SLOT(slotContextMenuRequested(TQListViewItem *, const TQPoint &, int)));
+ connect(this,TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),this,
+ TQ_SLOT(slotContextMenuRequested(TQListViewItem *, const TQPoint &, int)));
/* not via executed 'cause click may used for selection - single click execution
just confuses in an application */
- connect(this,TQT_SIGNAL(doubleClicked(TQListViewItem*)),this,TQT_SLOT(slotItemDoubleClicked(TQListViewItem*)));
- connect(this,TQT_SIGNAL(returnPressed(TQListViewItem*)),this,TQT_SLOT(slotItemDoubleClicked(TQListViewItem*)));
-
- connect(this,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotSelectionChanged()));
- connect(m_SvnWrapper,TQT_SIGNAL(clientException(const TQString&)),this,TQT_SLOT(slotClientException(const TQString&)));
- connect(m_SvnWrapper,TQT_SIGNAL(sendNotify(const TQString&)),this,TQT_SLOT(slotNotifyMessage(const TQString&)));
- connect(m_SvnWrapper,TQT_SIGNAL(reinitItem(SvnItem*)),this,TQT_SLOT(slotReinitItem(SvnItem*)));
- connect(m_SvnWrapper,TQT_SIGNAL(sigRefreshAll()),this,TQT_SLOT(refreshCurrentTree()));
- connect(m_SvnWrapper,TQT_SIGNAL(sigRefreshCurrent(SvnItem*)),this,TQT_SLOT(refreshCurrent(SvnItem*)));
- connect(m_SvnWrapper,TQT_SIGNAL(sigRefreshIcons(bool)),this,TQT_SLOT(slotRescanIcons(bool)));
- connect(this,TQT_SIGNAL(dropped (TQDropEvent*,TQListViewItem*)),
- this,TQT_SLOT(slotDropped(TQDropEvent*,TQListViewItem*)));
- connect(m_SvnWrapper,TQT_SIGNAL(sigGotourl(const TQString&)),this,TQT_SLOT(_openURL(const TQString&)));
-
- connect(m_SvnWrapper,TQT_SIGNAL(sigCacheStatus(TQ_LONG,TQ_LONG)),this,TQT_SIGNAL(sigCacheStatus(TQ_LONG,TQ_LONG)));
- connect(m_SvnWrapper,TQT_SIGNAL(sigThreadsChanged()),this,TQT_SLOT(enableActions()));
-
- m_pList->connectDirTimer(TQT_TQOBJECT(this));
- m_pList->connectPropTimer(TQT_TQOBJECT(this));
+ connect(this,TQ_SIGNAL(doubleClicked(TQListViewItem*)),this,TQ_SLOT(slotItemDoubleClicked(TQListViewItem*)));
+ connect(this,TQ_SIGNAL(returnPressed(TQListViewItem*)),this,TQ_SLOT(slotItemDoubleClicked(TQListViewItem*)));
+
+ connect(this,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(slotSelectionChanged()));
+ connect(m_SvnWrapper,TQ_SIGNAL(clientException(const TQString&)),this,TQ_SLOT(slotClientException(const TQString&)));
+ connect(m_SvnWrapper,TQ_SIGNAL(sendNotify(const TQString&)),this,TQ_SLOT(slotNotifyMessage(const TQString&)));
+ connect(m_SvnWrapper,TQ_SIGNAL(reinitItem(SvnItem*)),this,TQ_SLOT(slotReinitItem(SvnItem*)));
+ connect(m_SvnWrapper,TQ_SIGNAL(sigRefreshAll()),this,TQ_SLOT(refreshCurrentTree()));
+ connect(m_SvnWrapper,TQ_SIGNAL(sigRefreshCurrent(SvnItem*)),this,TQ_SLOT(refreshCurrent(SvnItem*)));
+ connect(m_SvnWrapper,TQ_SIGNAL(sigRefreshIcons(bool)),this,TQ_SLOT(slotRescanIcons(bool)));
+ connect(this,TQ_SIGNAL(dropped (TQDropEvent*,TQListViewItem*)),
+ this,TQ_SLOT(slotDropped(TQDropEvent*,TQListViewItem*)));
+ connect(m_SvnWrapper,TQ_SIGNAL(sigGotourl(const TQString&)),this,TQ_SLOT(_openURL(const TQString&)));
+
+ connect(m_SvnWrapper,TQ_SIGNAL(sigCacheStatus(TQ_LONG,TQ_LONG)),this,TQ_SIGNAL(sigCacheStatus(TQ_LONG,TQ_LONG)));
+ connect(m_SvnWrapper,TQ_SIGNAL(sigThreadsChanged()),this,TQ_SLOT(enableActions()));
+
+ m_pList->connectDirTimer(this);
+ m_pList->connectPropTimer(this);
setDropHighlighter(true);
setDragEnabled(true);
@@ -259,152 +259,152 @@ void tdesvnfilelist::setupActions()
TDEAction*tmp_action;
/* local and remote actions */
/* 1. actions on dirs AND files */
- //new TDEAction(i18n("Log..."),"tdesvnlog",TDEShortcut(SHIFT+CTRL+Key_L),this,TQT_SLOT(slotMakeRangeLog()),m_filesAction,"make_svn_log");
- new TDEAction(i18n("Full Log"),"tdesvnlog",TDEShortcut(CTRL+Key_L),TQT_TQOBJECT(this),TQT_SLOT(slotMakeLog()),m_filesAction,"make_svn_log_full");
- new TDEAction(i18n("Full revision tree"),"tdesvnlog",TDEShortcut(CTRL+Key_T),TQT_TQOBJECT(this),TQT_SLOT(slotMakeTree()),m_filesAction,"make_svn_tree");
+ //new TDEAction(i18n("Log..."),"tdesvnlog",TDEShortcut(SHIFT+CTRL+Key_L),this,TQ_SLOT(slotMakeRangeLog()),m_filesAction,"make_svn_log");
+ new TDEAction(i18n("Full Log"),"tdesvnlog",TDEShortcut(CTRL+Key_L),this,TQ_SLOT(slotMakeLog()),m_filesAction,"make_svn_log_full");
+ new TDEAction(i18n("Full revision tree"),"tdesvnlog",TDEShortcut(CTRL+Key_T),this,TQ_SLOT(slotMakeTree()),m_filesAction,"make_svn_tree");
new TDEAction(i18n("Partial revision tree"),"tdesvnlog",TDEShortcut(SHIFT+CTRL+Key_T),
- TQT_TQOBJECT(this),TQT_SLOT(slotMakePartTree()),m_filesAction,"make_svn_partialtree");
+ this,TQ_SLOT(slotMakePartTree()),m_filesAction,"make_svn_partialtree");
new TDEAction(i18n("Properties"),"edit",
- TDEShortcut(CTRL+Key_P),m_SvnWrapper,TQT_SLOT(slotProperties()),m_filesAction,"make_svn_property");
+ TDEShortcut(CTRL+Key_P),m_SvnWrapper,TQ_SLOT(slotProperties()),m_filesAction,"make_svn_property");
new TDEAction(i18n("Display Properties"),"edit",
- TDEShortcut(SHIFT+CTRL+Key_P),TQT_TQOBJECT(this),TQT_SLOT(slotDisplayProperties()),m_filesAction,"get_svn_property");
+ TDEShortcut(SHIFT+CTRL+Key_P),this,TQ_SLOT(slotDisplayProperties()),m_filesAction,"get_svn_property");
tmp_action = new TDEAction(i18n("Display last changes"),"tdesvndiff",
- TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotDisplayLastDiff()),m_filesAction,"make_last_change");
+ TDEShortcut(),this,TQ_SLOT(slotDisplayLastDiff()),m_filesAction,"make_last_change");
tmp_action->setToolTip(i18n("Display last changes as difference to previous commit."));
m_InfoAction = new TDEAction(i18n("Details"),"tdesvninfo",
- TDEShortcut(CTRL+Key_I),TQT_TQOBJECT(this),TQT_SLOT(slotInfo()),m_filesAction,"make_svn_info");
+ TDEShortcut(CTRL+Key_I),this,TQ_SLOT(slotInfo()),m_filesAction,"make_svn_info");
m_RenameAction = new TDEAction(i18n("Move"),"move",
- TDEShortcut(Key_F2),TQT_TQOBJECT(this),TQT_SLOT(slotRename()),m_filesAction,"make_svn_rename");
+ TDEShortcut(Key_F2),this,TQ_SLOT(slotRename()),m_filesAction,"make_svn_rename");
m_CopyAction = new TDEAction(i18n("Copy"),"tdesvncopy",
- TDEShortcut(CTRL+Key_C),TQT_TQOBJECT(this),TQT_SLOT(slotCopy()),m_filesAction,"make_svn_copy");
- tmp_action = new TDEAction(i18n("Check for updates"),"tdesvncheckupdates",TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotCheckUpdates()),m_filesAction,"make_check_updates");
+ TDEShortcut(CTRL+Key_C),this,TQ_SLOT(slotCopy()),m_filesAction,"make_svn_copy");
+ tmp_action = new TDEAction(i18n("Check for updates"),"tdesvncheckupdates",TDEShortcut(),this,TQ_SLOT(slotCheckUpdates()),m_filesAction,"make_check_updates");
tmp_action->setToolTip(i18n("Check if current working copy has items with newer version in repository"));
/* 2. actions only on files */
m_BlameAction = new TDEAction(i18n("Blame"),"tdesvnblame",
- TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotBlame()),m_filesAction,"make_svn_blame");
+ TDEShortcut(),this,TQ_SLOT(slotBlame()),m_filesAction,"make_svn_blame");
m_BlameAction->setToolTip(i18n("Output the content of specified files or URLs with revision and author information in-line."));
m_BlameRangeAction = new TDEAction(i18n("Blame range"),"tdesvnblame",
- TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotRangeBlame()),m_filesAction,"make_svn_range_blame");
+ TDEShortcut(),this,TQ_SLOT(slotRangeBlame()),m_filesAction,"make_svn_range_blame");
m_BlameRangeAction->setToolTip(i18n("Output the content of specified files or URLs with revision and author information in-line."));
m_CatAction = new TDEAction(i18n("Cat head"), "tdesvncat",
- TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotCat()),m_filesAction,"make_svn_cat");
+ TDEShortcut(),this,TQ_SLOT(slotCat()),m_filesAction,"make_svn_cat");
m_CatAction->setToolTip(i18n("Output the content of specified files or URLs."));
tmp_action = new TDEAction(i18n("Cat revision..."),"tdesvncat",
- TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotRevisionCat()),m_filesAction,"make_revisions_cat");
+ TDEShortcut(),this,TQ_SLOT(slotRevisionCat()),m_filesAction,"make_revisions_cat");
tmp_action->setToolTip(i18n("Output the content of specified files or URLs at specific revision."));
m_LockAction = new TDEAction(i18n("Lock current items"),"tdesvnlock",
- TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotLock()),m_filesAction,"make_svn_lock");
+ TDEShortcut(),this,TQ_SLOT(slotLock()),m_filesAction,"make_svn_lock");
m_UnlockAction = new TDEAction(i18n("Unlock current items"),"tdesvnunlock",
- TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotUnlock()),m_filesAction,"make_svn_unlock");
+ TDEShortcut(),this,TQ_SLOT(slotUnlock()),m_filesAction,"make_svn_unlock");
/* 3. actions only on dirs */
m_MkdirAction = new TDEAction(i18n("New folder"),"folder-new",
- TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotMkdir()),m_filesAction,"make_svn_mkdir");
+ TDEShortcut(),this,TQ_SLOT(slotMkdir()),m_filesAction,"make_svn_mkdir");
m_switchRepository = new TDEAction(i18n("Switch repository"),"tdesvnswitch",
- TDEShortcut(), m_SvnWrapper,TQT_SLOT(slotSwitch()),m_filesAction,"make_svn_switch");
+ TDEShortcut(), m_SvnWrapper,TQ_SLOT(slotSwitch()),m_filesAction,"make_svn_switch");
m_switchRepository->setToolTip(i18n("Switch repository path of current working copy path (\"svn switch\")"));
tmp_action = new TDEAction(i18n("Relocate current working copy url"),"tdesvnrelocate",TDEShortcut(),
- TQT_TQOBJECT(this),TQT_SLOT(slotRelocate()),m_filesAction,"make_svn_relocate");
+ this,TQ_SLOT(slotRelocate()),m_filesAction,"make_svn_relocate");
tmp_action->setToolTip(i18n("Relocate url of current working copy path to other url"));
tmp_action = new TDEAction(i18n("Check for unversioned items"),"tdesvnaddrecursive",TDEShortcut(),
- TQT_TQOBJECT(this),TQT_SLOT(slotCheckNewItems()),m_filesAction,"make_check_unversioned");
+ this,TQ_SLOT(slotCheckNewItems()),m_filesAction,"make_check_unversioned");
tmp_action->setToolTip(i18n("Browse folder for unversioned items and add them if wanted."));
m_changeToRepository = new TDEAction(i18n("Open repository of working copy"),"go-home",TDEShortcut(),
- TQT_TQOBJECT(this),TQT_SLOT(slotChangeToRepository()),m_filesAction,"make_switch_to_repo");
+ this,TQ_SLOT(slotChangeToRepository()),m_filesAction,"make_switch_to_repo");
m_changeToRepository->setToolTip(i18n("Opens the repository the current working copy was checked out from"));
m_CleanupAction = new TDEAction(i18n("Cleanup"),"tdesvncleanup",
- TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotCleanupAction()),m_filesAction,"make_cleanup");
+ TDEShortcut(),this,TQ_SLOT(slotCleanupAction()),m_filesAction,"make_cleanup");
m_CleanupAction->setToolTip(i18n("Recursively clean up the working copy, removing locks, resuming unfinished operations, etc."));
m_ImportDirsIntoCurrent = new TDEAction(i18n("Import folders into current"),"fileimport",TDEShortcut(),
- TQT_TQOBJECT(this),TQT_SLOT(slotImportDirsIntoCurrent()),m_filesAction,"make_import_dirs_into_current");
+ this,TQ_SLOT(slotImportDirsIntoCurrent()),m_filesAction,"make_import_dirs_into_current");
m_ImportDirsIntoCurrent->setToolTip(i18n("Import folder content into current url"));
/* local only actions */
/* 1. actions on files AND dirs*/
m_AddCurrent = new TDEAction(i18n("Add selected files/dirs"),
- "tdesvnadd",TDEShortcut(Key_Insert),m_SvnWrapper,TQT_SLOT(slotAdd()),m_filesAction,"make_svn_add");
+ "tdesvnadd",TDEShortcut(Key_Insert),m_SvnWrapper,TQ_SLOT(slotAdd()),m_filesAction,"make_svn_add");
m_AddCurrent->setToolTip(i18n("Adding selected files and/or directories to repository"));
tmp_action = new TDEAction("Add selected files/dirs recursive",
- "tdesvnaddrecursive",TDEShortcut(CTRL+Key_Insert),m_SvnWrapper,TQT_SLOT(slotAddRec()),m_filesAction,"make_svn_addrec");
+ "tdesvnaddrecursive",TDEShortcut(CTRL+Key_Insert),m_SvnWrapper,TQ_SLOT(slotAddRec()),m_filesAction,"make_svn_addrec");
tmp_action->setToolTip(i18n("Adding selected files and/or directories to repository and all subitems of folders"));
m_DelCurrent = new TDEAction(i18n("Delete selected files/dirs"),"tdesvndelete",
- TDEShortcut(Key_Delete),TQT_TQOBJECT(this),TQT_SLOT(slotDelete()),m_filesAction,"make_svn_remove");
+ TDEShortcut(Key_Delete),this,TQ_SLOT(slotDelete()),m_filesAction,"make_svn_remove");
m_DelCurrent->setToolTip(i18n("Deleting selected files and/or directories from repository"));
m_RevertAction = new TDEAction(i18n("Revert current changes"),"document-revert",
- TDEShortcut(),m_SvnWrapper,TQT_SLOT(slotRevert()),m_filesAction,"make_svn_revert");
+ TDEShortcut(),m_SvnWrapper,TQ_SLOT(slotRevert()),m_filesAction,"make_svn_revert");
m_ResolvedAction = new TDEAction(i18n("Mark resolved"),TDEShortcut(),
- TQT_TQOBJECT(this),TQT_SLOT(slotResolved()),m_filesAction,"make_resolved");
+ this,TQ_SLOT(slotResolved()),m_filesAction,"make_resolved");
m_ResolvedAction->setToolTip(i18n("Marking files or dirs resolved"));
tmp_action = new TDEAction(i18n("Resolve conflicts"),TDEShortcut(),
- TQT_TQOBJECT(this),TQT_SLOT(slotTryResolve()),m_filesAction,"make_try_resolve");
+ this,TQ_SLOT(slotTryResolve()),m_filesAction,"make_try_resolve");
- m_IgnoreAction = new TDEAction(i18n("Ignore/Unignore current item"),TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotIgnore()),m_filesAction,"make_svn_ignore");
+ m_IgnoreAction = new TDEAction(i18n("Ignore/Unignore current item"),TDEShortcut(),this,TQ_SLOT(slotIgnore()),m_filesAction,"make_svn_ignore");
m_UpdateHead = new TDEAction(i18n("Update to head"),"tdesvnupdate",
- TDEShortcut(),m_SvnWrapper,TQT_SLOT(slotUpdateHeadRec()),m_filesAction,"make_svn_headupdate");
+ TDEShortcut(),m_SvnWrapper,TQ_SLOT(slotUpdateHeadRec()),m_filesAction,"make_svn_headupdate");
m_UpdateRev = new TDEAction(i18n("Update to revision..."),"tdesvnupdate",
- TDEShortcut(),m_SvnWrapper,TQT_SLOT(slotUpdateTo()),m_filesAction,"make_svn_revupdate");
+ TDEShortcut(),m_SvnWrapper,TQ_SLOT(slotUpdateTo()),m_filesAction,"make_svn_revupdate");
m_commitAction = new TDEAction(i18n("Commit"),"tdesvncommit",
- TDEShortcut("CTRL+#"),m_SvnWrapper,TQT_SLOT(slotCommit()),m_filesAction,"make_svn_commit");
+ TDEShortcut("CTRL+#"),m_SvnWrapper,TQ_SLOT(slotCommit()),m_filesAction,"make_svn_commit");
tmp_action = new TDEAction(i18n("Diff local changes"),"tdesvndiff",
- TDEShortcut(CTRL+Key_D),TQT_TQOBJECT(this),TQT_SLOT(slotSimpleBaseDiff()),m_filesAction,"make_svn_basediff");
+ TDEShortcut(CTRL+Key_D),this,TQ_SLOT(slotSimpleBaseDiff()),m_filesAction,"make_svn_basediff");
tmp_action->setToolTip(i18n("Diff working copy against BASE (last checked out version) - doesn't require access to repository"));
tmp_action = new TDEAction(i18n("Diff against HEAD"),"tdesvndiff",
- TDEShortcut(CTRL+Key_H),TQT_TQOBJECT(this),TQT_SLOT(slotSimpleHeadDiff()),m_filesAction,"make_svn_headdiff");
+ TDEShortcut(CTRL+Key_H),this,TQ_SLOT(slotSimpleHeadDiff()),m_filesAction,"make_svn_headdiff");
tmp_action->setToolTip(i18n("Diff working copy against HEAD (last checked in version)- requires access to repository"));
tmp_action = new TDEAction(i18n("Diff items"),"tdesvndiff",
- TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotDiffPathes()),m_filesAction,"make_svn_itemsdiff");
+ TDEShortcut(),this,TQ_SLOT(slotDiffPathes()),m_filesAction,"make_svn_itemsdiff");
tmp_action->setToolTip(i18n("Diff two items"));
m_MergeRevisionAction = new TDEAction(i18n("Merge two revisions"),"tdesvnmerge",
- TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotMergeRevisions()),m_filesAction,"make_svn_merge_revisions");
+ TDEShortcut(),this,TQ_SLOT(slotMergeRevisions()),m_filesAction,"make_svn_merge_revisions");
m_MergeRevisionAction->setToolTip(i18n("Merge two revisions of this entry into itself"));
tmp_action=new TDEAction(i18n("Merge..."),"tdesvnmerge",
- TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotMerge()),m_filesAction,"make_svn_merge");
+ TDEShortcut(),this,TQ_SLOT(slotMerge()),m_filesAction,"make_svn_merge");
tmp_action->setToolTip("Merge repository path into current worky copy path or current repository path into a target");
- tmp_action=new TDEAction( i18n( "Open With..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenWith() ), m_filesAction, "openwith" );
+ tmp_action=new TDEAction( i18n( "Open With..." ), 0, this, TQ_SLOT( slotOpenWith() ), m_filesAction, "openwith" );
/* remote actions only */
m_CheckoutCurrentAction = new TDEAction(i18n("Checkout current repository path"),"tdesvncheckout",TDEShortcut(),
- m_SvnWrapper,TQT_SLOT(slotCheckoutCurrent()),m_filesAction,"make_svn_checkout_current");
+ m_SvnWrapper,TQ_SLOT(slotCheckoutCurrent()),m_filesAction,"make_svn_checkout_current");
m_ExportCurrentAction = new TDEAction(i18n("Export current repository path"),"tdesvnexport",TDEShortcut(),
- m_SvnWrapper,TQT_SLOT(slotExportCurrent()),m_filesAction,"make_svn_export_current");
- new TDEAction(i18n("Select browse revision"),TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotSelectBrowsingRevision()),m_filesAction,"switch_browse_revision");
+ m_SvnWrapper,TQ_SLOT(slotExportCurrent()),m_filesAction,"make_svn_export_current");
+ new TDEAction(i18n("Select browse revision"),TDEShortcut(),this,TQ_SLOT(slotSelectBrowsingRevision()),m_filesAction,"switch_browse_revision");
/* independe actions */
m_CheckoutAction = new TDEAction(i18n("Checkout a repository"),"tdesvncheckout",
- TDEShortcut(),m_SvnWrapper,TQT_SLOT(slotCheckout()),m_filesAction,"make_svn_checkout");
+ TDEShortcut(),m_SvnWrapper,TQ_SLOT(slotCheckout()),m_filesAction,"make_svn_checkout");
m_ExportAction = new TDEAction(i18n("Export a repository"),"tdesvnexport",
- TDEShortcut(),m_SvnWrapper,TQT_SLOT(slotExport()),m_filesAction,"make_svn_export");
- m_RefreshViewAction = new TDEAction(i18n("Refresh view"),"reload",TDEShortcut(Key_F5),TQT_TQOBJECT(this),TQT_SLOT(refreshCurrentTree()),m_filesAction,"make_view_refresh");
+ TDEShortcut(),m_SvnWrapper,TQ_SLOT(slotExport()),m_filesAction,"make_svn_export");
+ m_RefreshViewAction = new TDEAction(i18n("Refresh view"),"reload",TDEShortcut(Key_F5),this,TQ_SLOT(refreshCurrentTree()),m_filesAction,"make_view_refresh");
- new TDEAction(i18n("Diff revisions"),"tdesvndiff",TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotDiffRevisions()),m_filesAction,"make_revisions_diff");
+ new TDEAction(i18n("Diff revisions"),"tdesvndiff",TDEShortcut(),this,TQ_SLOT(slotDiffRevisions()),m_filesAction,"make_revisions_diff");
/* folding options */
- tmp_action = new TDEAction( i18n("Unfold File Tree"), 0, TQT_TQOBJECT(this) , TQT_SLOT(slotUnfoldTree()), m_filesAction, "view_unfold_tree" );
+ tmp_action = new TDEAction( i18n("Unfold File Tree"), 0, this , TQ_SLOT(slotUnfoldTree()), m_filesAction, "view_unfold_tree" );
tmp_action->setToolTip(i18n("Opens all branches of the file tree"));
- tmp_action = new TDEAction( i18n("Fold File Tree"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFoldTree()), m_filesAction, "view_fold_tree" );
+ tmp_action = new TDEAction( i18n("Fold File Tree"), 0, this, TQ_SLOT(slotFoldTree()), m_filesAction, "view_fold_tree" );
tmp_action->setToolTip(i18n("Closes all branches of the file tree"));
/* caching */
- tmp_action = new TDEAction( i18n("Update log cache"),0,TQT_TQOBJECT(this),TQT_SLOT(slotUpdateLogCache()),m_filesAction,"update_log_cache" );
+ tmp_action = new TDEAction( i18n("Update log cache"),0,this,TQ_SLOT(slotUpdateLogCache()),m_filesAction,"update_log_cache" );
tmp_action->setToolTip(i18n("Update the log cache for current repository"));
- /* tmp_action = new TDEAction( i18n("Stop update log cache"),0,this,TQT_SLOT(slotUpdateLogCache()),m_filesAction,"stop_update_log_cache" );
+ /* tmp_action = new TDEAction( i18n("Stop update log cache"),0,this,TQ_SLOT(slotUpdateLogCache()),m_filesAction,"stop_update_log_cache" );
tmp_action->setToolTip(i18n("Stop the update of the log cache"));
*/
@@ -585,10 +585,10 @@ bool tdesvnfilelist::openURL( const KURL &url,bool noReinit )
}
m_SvnWrapper->clearUpdateCache();
if (isWorkingCopy()) {
- m_pList->m_DirWatch=new KDirWatch(TQT_TQOBJECT(this));
- connect(m_pList->m_DirWatch,TQT_SIGNAL(dirty(const TQString&)),this,TQT_SLOT(slotDirItemDirty(const TQString&)));
- connect(m_pList->m_DirWatch,TQT_SIGNAL(created(const TQString&)),this,TQT_SLOT(slotDirItemCreated(const TQString&)));
- connect(m_pList->m_DirWatch,TQT_SIGNAL(deleted(const TQString&)),this,TQT_SLOT(slotDirItemDeleted(const TQString&)));
+ m_pList->m_DirWatch=new KDirWatch(this);
+ connect(m_pList->m_DirWatch,TQ_SIGNAL(dirty(const TQString&)),this,TQ_SLOT(slotDirItemDirty(const TQString&)));
+ connect(m_pList->m_DirWatch,TQ_SIGNAL(created(const TQString&)),this,TQ_SLOT(slotDirItemCreated(const TQString&)));
+ connect(m_pList->m_DirWatch,TQ_SIGNAL(deleted(const TQString&)),this,TQ_SLOT(slotDirItemDeleted(const TQString&)));
/* seems that recursive does not work */
if (m_pList->m_DirWatch) {
m_pList->m_DirWatch->addDir(baseUri()+"/",false,false);
@@ -620,7 +620,7 @@ bool tdesvnfilelist::openURL( const KURL &url,bool noReinit )
}
emit changeCaption(baseUri());
emit sigUrlOpend(result);
- TQTimer::singleShot(1,this,TQT_SLOT(readSupportData()));
+ TQTimer::singleShot(1,this,TQ_SLOT(readSupportData()));
enableActions();
return result;
}
@@ -1041,7 +1041,7 @@ void tdesvnfilelist::slotSelectionChanged()
void tdesvnfilelist::slotClientException(const TQString&what)
{
emit sigLogMessage(what);
- KMessageBox::sorry(TQT_TQWIDGET(TDEApplication::activeModalWidget()),what,i18n("SVN Error"));
+ KMessageBox::sorry(TDEApplication::activeModalWidget(),what,i18n("SVN Error"));
}
@@ -1067,7 +1067,7 @@ void tdesvnfilelist::slotChangeToRepository()
return;
}
if (i.reposRoot().isEmpty()) {
- KMessageBox::sorry(TQT_TQWIDGET(TDEApplication::activeModalWidget()),i18n("Could not retrieve repository of working copy."),i18n("SVN Error"));
+ KMessageBox::sorry(TDEApplication::activeModalWidget(),i18n("Could not retrieve repository of working copy."),i18n("SVN Error"));
} else {
sigSwitchUrl(i.reposRoot());
}
@@ -1150,7 +1150,7 @@ template<class T> KDialogBase* tdesvnfilelist::createDialog(T**ptr,const TQStrin
buttons = buttons|KDialogBase::Help;
}
KDialogBase * dlg = new KDialogBase(
- TQT_TQWIDGET(TQT_TQWIDGET(TDEApplication::activeModalWidget())),
+ TDEApplication::activeModalWidget(),
name,
true,
_head,
@@ -1287,7 +1287,7 @@ void tdesvnfilelist::refreshCurrentTree()
kdDebug()<<"Refresh time: "<<t.elapsed()<<" ms"<<endl;
setUpdatesEnabled(true);
viewport()->repaint();
- TQTimer::singleShot(1,this,TQT_SLOT(readSupportData()));
+ TQTimer::singleShot(1,this,TQ_SLOT(readSupportData()));
//m_pList->startScan();
}
@@ -1673,7 +1673,7 @@ void tdesvnfilelist::viewportPaintEvent(TQPaintEvent *ev)
TDEListView::viewportPaintEvent(ev);
if (m_pList->mOldDropHighlighter.isValid() && ev->rect().intersects(m_pList->mOldDropHighlighter)) {
TQPainter painter(viewport());
- style().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, m_pList->mOldDropHighlighter, colorGroup(),
+ style().drawPrimitive(TQStyle::PE_FocusRect, &painter, m_pList->mOldDropHighlighter, colorGroup(),
TQStyle::Style_FocusAtBorder);
}
}
@@ -1815,7 +1815,7 @@ void tdesvnfilelist::slotDropped(TQDropEvent* event,TQListViewItem*item)
//m_pList->stopScan();
TDEIO::Job * job = 0L;
job = TDEIO::copy(urlList,tdir);
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),TQT_SLOT( slotCopyFinished( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),TQ_SLOT( slotCopyFinished( TDEIO::Job * ) ) );
dispDummy();
event->acceptAction();
return;
@@ -1860,7 +1860,7 @@ void tdesvnfilelist::slotDropped(TQDropEvent* event,TQListViewItem*item)
m_pList->intern_drop_target=tdir;
m_pList->intern_drop_action=action;
m_pList->intern_drop_pos=TQCursor::pos();
- TQTimer::singleShot(0,this,TQT_SLOT(slotInternalDrop()));
+ TQTimer::singleShot(0,this,TQ_SLOT(slotInternalDrop()));
// internalDrop(action,urlList,tdir);
}
@@ -2005,7 +2005,7 @@ void tdesvnfilelist::slotDelete()
}
if (tdeioList.count()>0) {
TDEIO::Job*aJob = TDEIO::del(tdeioList);
- connect(aJob,TQT_SIGNAL(result (TDEIO::Job *)),this,TQT_SLOT(slotDeleteFinished(TDEIO::Job*)));
+ connect(aJob,TQ_SIGNAL(result (TDEIO::Job *)),this,TQ_SLOT(slotDeleteFinished(TDEIO::Job*)));
dispDummy();
}
if (m_deletePerfect && items.size()>0) {
@@ -2716,7 +2716,7 @@ void tdesvnfilelist::contentsMousePressEvent(TQMouseEvent*e)
m_pList->m_fileTip->setItem(0);
TQPoint p(contentsToViewport( e->pos()));
TQListViewItem *i = itemAt( p );
- // this is from qt the example - hopefully I got my problems with drag&drop fixed.
+ // this is from tqt the example - hopefully I got my problems with drag&drop fixed.
if ( i ) {
// if the user clicked into the root decoration of the item, don't try to start a drag!
if ( p.x() > header()->cellPos( header()->mapToActual( 0 ) ) +
@@ -3059,8 +3059,8 @@ void tdesvnfilelist::slotUnfoldTree()
{
StopSimpleDlg sdlg(0,0,i18n("Unfold tree"),i18n("Unfold all folder"));
- connect(this,TQT_SIGNAL(sigListError()),
- &sdlg,TQT_SLOT(makeCancel()));
+ connect(this,TQ_SIGNAL(sigListError()),
+ &sdlg,TQ_SLOT(makeCancel()));
TQListViewItemIterator it(this);
TQTime t;t.start();
diff --git a/src/svnfrontend/tdesvnfilelist.h b/src/svnfrontend/tdesvnfilelist.h
index 2337b20..f41c1cc 100644
--- a/src/svnfrontend/tdesvnfilelist.h
+++ b/src/svnfrontend/tdesvnfilelist.h
@@ -22,8 +22,8 @@
#include "itemdisplay.h"
#include "filelistviewitem.h"
-#include "status.hpp"
-#include "client.hpp"
+#include "status.h"
+#include "client.h"
#include <tdelistview.h>
#include <kurl.h>
@@ -52,7 +52,7 @@ namespace svn {
*/
class tdesvnfilelist : public TDEListView,public ItemDisplay
{
- Q_OBJECT
+ TQ_OBJECT
friend class FileListViewItem;
public:
diff --git a/src/svnfrontend/threadcontextlistenerdata.h b/src/svnfrontend/threadcontextlistenerdata.h
index 285817c..e8d50f6 100644
--- a/src/svnfrontend/threadcontextlistenerdata.h
+++ b/src/svnfrontend/threadcontextlistenerdata.h
@@ -20,7 +20,7 @@
#ifndef THREADCONTEXTLISTENERDATA_H
#define THREADCONTEXTLISTENERDATA_H
-#include "context_listener.hpp"
+#include "context_listener.h"
#include <tqthread.h>
#include <tqstring.h>
diff --git a/src/svnqt/CMakeLists.txt b/src/svnqt/CMakeLists.txt
index 73d61cf..904c2b7 100644
--- a/src/svnqt/CMakeLists.txt
+++ b/src/svnqt/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(SOURCES
+set(SOURCES
apr.cpp
client_annotate.cpp
client_cat.cpp
@@ -41,118 +41,118 @@ SET(SOURCES
client_merge.cpp
cache/LogCache.cpp
cache/ReposLog.cpp
- cache/DatabaseException.hpp
+ cache/DatabaseException.h
cache/DatabaseException.cpp
)
-SET(CACHEINST_HEADERS
- cache/LogCache.hpp
- cache/ReposLog.hpp
- cache/DatabaseException.hpp
+set(CACHEINST_HEADERS
+ cache/LogCache.h
+ cache/ReposLog.h
+ cache/DatabaseException.h
)
-SET(INST_HEADERS
- annotate_line.hpp
- apr.hpp
- check.hpp
- client.hpp
- commititem.hpp
- context.hpp
- context_listener.hpp
- datetime.hpp
- dirent.hpp
- entry.hpp
- exception.hpp
- info_entry.hpp
- lock_entry.hpp
- log_entry.hpp
- path.hpp
- pool.hpp
- repository.hpp
- repositorylistener.hpp
- revision.hpp
- smart_pointer.hpp
- shared_pointer.hpp
- status.hpp
- svnfilestream.hpp
- svnstream.hpp
- svnqttypes.hpp
- targets.hpp
- url.hpp
- version_check.hpp
- wc.hpp
- stringarray.hpp
- diffoptions.hpp
- conflictdescription.hpp
- conflictresult.hpp
+set(INST_HEADERS
+ annotate_line.h
+ apr.h
+ check.h
+ client.h
+ commititem.h
+ context.h
+ context_listener.h
+ datetime.h
+ dirent.h
+ entry.h
+ exception.h
+ info_entry.h
+ lock_entry.h
+ log_entry.h
+ path.h
+ pool.h
+ repository.h
+ repositorylistener.h
+ revision.h
+ smart_pointer.h
+ shared_pointer.h
+ status.h
+ svnfilestream.h
+ svnstream.h
+ svnqttypes.h
+ targets.h
+ url.h
+ version_check.h
+ wc.h
+ stringarray.h
+ diffoptions.h
+ conflictdescription.h
+ conflictresult.h
)
-FILE(GLOB svnhdr RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.hpp")
-SET(svnhdr ${svnhdr} ${CACHE_INST_HEADERS})
+file(GLOB svnhdr RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.h")
+set(svnhdr ${svnhdr} ${CACHE_INST_HEADERS})
- SET(TOUTF8 "utf8")
- SET(FROMUTF8 "fromUtf8")
- SET(QLIST "TQValueList")
- SET(TOASCII "latin1")
- SET(HOMEDIR "homeDirPath")
- SET(QDATABASE "TQSqlDatabase*")
- SET(QLONG "TQ_LLONG")
- SET(svnqt-name svnqt)
+ set(TOUTF8 "utf8")
+ set(FROMUTF8 "fromUtf8")
+ set(QLIST "TQValueList")
+ set(TOASCII "latin1")
+ set(HOMEDIR "homeDirPath")
+ set(QDATABASE "TQSqlDatabase*")
+ set(QLONG "TQ_LLONG")
+ set(svnqt-name svnqt)
-IF (HAVE_GCC_VISIBILITY)
- SET(_SVNQT_EXPORT "__attribute__ ((visibility(\"default\")))")
- SET(_SVNQT_NOEXPORT "__attribute__ ((visibility(\"hidden\")))")
-ENDIF (HAVE_GCC_VISIBILITY)
+if (HAVE_GCC_VISIBILITY)
+ set(_SVNQT_EXPORT "__attribute__ ((visibility(\"default\")))")
+ set(_SVNQT_NOEXPORT "__attribute__ ((visibility(\"hidden\")))")
+endif (HAVE_GCC_VISIBILITY)
-CONFIGURE_FILE(
- "${CMAKE_CURRENT_SOURCE_DIR}/svnqt_defines.hpp.in"
- "${CMAKE_CURRENT_BINARY_DIR}/svnqt_defines.hpp"
+configure_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/svnqt_defines.h.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/svnqt_defines.h"
IMMEDIATE
@ONLY)
-SET(INST_HEADERS ${INST_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/svnqt_defines.hpp)
-INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
+set(INST_HEADERS ${INST_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/svnqt_defines.h)
+include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
-ADD_LIBRARY(${svnqt-name} SHARED ${SOURCES} ${svnhdr})
- SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib${LIB_SUFFIX})
- SET_TARGET_PROPERTIES(${svnqt-name}
+add_library(${svnqt-name} SHARED ${SOURCES} ${svnhdr})
+ set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib${LIB_SUFFIX})
+ set_target_properties(${svnqt-name}
PROPERTIES
COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})
-SET(LIB_MAJOR 4)
-SET(LIB_MINOR 2)
-SET(LIB_RELEASE 2)
+set(LIB_MAJOR 4)
+set(LIB_MINOR 2)
+set(LIB_RELEASE 2)
-SET(_soversion ${LIB_MAJOR}.${LIB_MINOR}.${LIB_RELEASE})
+set(_soversion ${LIB_MAJOR}.${LIB_MINOR}.${LIB_RELEASE})
-SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES
+set_target_properties(${svnqt-name} PROPERTIES
SOVERSION ${LIB_MAJOR}
VERSION ${_soversion})
-SET(ALL_LINKFLAGS ${APR_EXTRA_LIBFLAGS})
-SET(ALL_LINKFLAGS "${ALL_LINKFLAGS} ${APU_EXTRA_LIBFLAGS}")
-SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES LINK_FLAGS "${ALL_LINKFLAGS} ${LINK_NO_UNDEFINED}")
-TARGET_LINK_LIBRARIES(${svnqt-name} ${TQT_LIBRARIES} ${SUBVERSION_ALL_LIBS} ${ALL_LINKFLAGS})
+set(ALL_LINKFLAGS ${APR_EXTRA_LIBFLAGS})
+set(ALL_LINKFLAGS "${ALL_LINKFLAGS} ${APU_EXTRA_LIBFLAGS}")
+set_target_properties(${svnqt-name} PROPERTIES LINK_FLAGS "${ALL_LINKFLAGS} ${LINK_NO_UNDEFINED}")
+target_link_libraries(${svnqt-name} ${TQT_LIBRARIES} ${SUBVERSION_ALL_LIBS} ${ALL_LINKFLAGS})
-# IF (SQLITE_FOUND)
- TARGET_LINK_LIBRARIES(${svnqt-name} ${SQLITE_LIBRARIES})
- INCLUDE_DIRECTORIES(${SQLITE_INCLUDE_DIR})
-# ELSE (SQLITE_FOUND)
-# TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_QTSQL_LIBRARY})
-# ENDIF (SQLITE_FOUND)
+# if (SQLITE_FOUND)
+ target_link_libraries(${svnqt-name} ${SQLITE_LIBRARIES})
+ include_directories(${SQLITE_INCLUDE_DIR})
+# else (SQLITE_FOUND)
+# target_link_libraries(${svnqt-name} ${QT_QTSQL_LIBRARY})
+# endif (SQLITE_FOUND)
# Just a small linking test
-IF (BUILD_TESTS)
- ADD_EXECUTABLE(testlink testmain.cpp)
- TARGET_LINK_LIBRARIES(testlink ${svnqt-name})
-ENDIF (BUILD_TESTS)
-
- INSTALL(TARGETS ${svnqt-name} DESTINATION ${LIB_INSTALL_DIR})
- INSTALL(FILES ${INST_HEADERS} DESTINATION include/${svnqt-name})
- INSTALL(FILES ${CACHEINST_HEADERS} DESTINATION include/${svnqt-name}/cache)
-
-IF (BUILD_TESTS)
- ADD_SUBDIRECTORY(tests)
- ADD_SUBDIRECTORY(cache/test)
-ENDIF (BUILD_TESTS)
+if (BUILD_TESTS)
+ add_executable(testlink testmain.cpp)
+ target_link_libraries(testlink ${svnqt-name})
+endif (BUILD_TESTS)
+
+ install(TARGETS ${svnqt-name} DESTINATION ${LIB_INSTALL_DIR})
+ install(FILES ${INST_HEADERS} DESTINATION include/${svnqt-name})
+ install(FILES ${CACHEINST_HEADERS} DESTINATION include/${svnqt-name}/cache)
+
+if (BUILD_TESTS)
+ add_subdirectory(tests)
+ add_subdirectory(cache/test)
+endif (BUILD_TESTS)
diff --git a/src/svnqt/LICENSE_SVN b/src/svnqt/LICENSE_SVN
index 61d889a..687c45d 100644
--- a/src/svnqt/LICENSE_SVN
+++ b/src/svnqt/LICENSE_SVN
@@ -1,4 +1,4 @@
-A small section of code in client_impl.hpp and client_impl.cpp was taken and modified
+A small section of code in client_impl.h and client_impl.cpp was taken and modified
from the source code of subversion 1.8.10, which is released under the following license.
---------------------------------------------------------------------------------
diff --git a/src/svnqt/annotate_line.hpp b/src/svnqt/annotate_line.h
index c08b273..94dedbf 100644
--- a/src/svnqt/annotate_line.hpp
+++ b/src/svnqt/annotate_line.h
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -30,7 +30,7 @@
#ifndef _SVNCPP_ANNOTATE_LINE_HPP_
#define _SVNCPP_ANNOTATE_LINE_HPP_
-#include "svnqt/svnqt_defines.hpp"
+#include "svnqt/svnqt_defines.h"
#include <tqstring.h>
#include <tqdatetime.h>
@@ -49,7 +49,7 @@ namespace svn
const char *date,
const char *line)
: m_line_no (line_no), m_revision (revision),
- m_date( (date&&strlen(date))?TQDateTime::fromString(TQString::FROMUTF8(date),Qt::ISODate):TQDateTime()),
+ m_date( (date&&strlen(date))?TQDateTime::fromString(TQString::FROMUTF8(date),TQt::ISODate):TQDateTime()),
m_line(line?line:""),m_author(author?author:""),
m_merge_revision(-1),
m_merge_date(TQDateTime()),
@@ -69,10 +69,10 @@ namespace svn
const char *merge_path
)
: m_line_no (line_no), m_revision (revision),
- m_date( (date&&strlen(date))?TQDateTime::fromString(TQString::FROMUTF8(date),Qt::ISODate):TQDateTime()),
+ m_date( (date&&strlen(date))?TQDateTime::fromString(TQString::FROMUTF8(date),TQt::ISODate):TQDateTime()),
m_line(line?line:""),m_author(author?author:""),
m_merge_revision(merge_revision),
- m_merge_date( (merge_date&&strlen(merge_date))?TQDateTime::fromString(TQString::FROMUTF8(merge_date),Qt::ISODate):TQDateTime()),
+ m_merge_date( (merge_date&&strlen(merge_date))?TQDateTime::fromString(TQString::FROMUTF8(merge_date),TQt::ISODate):TQDateTime()),
m_merge_author(merge_author?merge_author:""),m_merge_path(merge_path?merge_path:"")
{
}
@@ -142,8 +142,3 @@ namespace svn
}
#endif
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/apr.cpp b/src/svnqt/apr.cpp
index 97bb3b8..2eb7ddf 100644
--- a/src/svnqt/apr.cpp
+++ b/src/svnqt/apr.cpp
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -32,7 +32,7 @@
#include "apr_general.h"
// svncpp
-#include "apr.hpp"
+#include "apr.h"
/**
diff --git a/src/svnqt/apr.hpp b/src/svnqt/apr.h
index ddefebd..bdfd8f3 100644
--- a/src/svnqt/apr.hpp
+++ b/src/svnqt/apr.h
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -62,8 +62,3 @@ namespace svn
}
#endif
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/cache/DatabaseException.cpp b/src/svnqt/cache/DatabaseException.cpp
index 199a5f9..7ca796a 100644
--- a/src/svnqt/cache/DatabaseException.cpp
+++ b/src/svnqt/cache/DatabaseException.cpp
@@ -1,4 +1,4 @@
-#include "DatabaseException.hpp"
+#include "DatabaseException.h"
/*!
\fn svn::cache::DatabaseException::DatabaseException(const TQString&msg,int aNumber)throw()
diff --git a/src/svnqt/cache/DatabaseException.hpp b/src/svnqt/cache/DatabaseException.h
index 9e67cb9..c089beb 100644
--- a/src/svnqt/cache/DatabaseException.hpp
+++ b/src/svnqt/cache/DatabaseException.h
@@ -1,7 +1,7 @@
#ifndef _DATABASE_EXCEPTION_HPP
#define _DATABASE_EXCEPTION_HPP
-#include "svnqt/exception.hpp"
+#include "svnqt/exception.h"
namespace svn
{
diff --git a/src/svnqt/cache/LogCache.cpp b/src/svnqt/cache/LogCache.cpp
index a3cb590..f6b7b3b 100644
--- a/src/svnqt/cache/LogCache.cpp
+++ b/src/svnqt/cache/LogCache.cpp
@@ -1,4 +1,4 @@
-#include "LogCache.hpp"
+#include "LogCache.h"
#include <tqdir.h>
#include <tqsql.h>
@@ -6,8 +6,8 @@
#include <tqthreadstorage.h>
#include <tqmap.h>
-#include "svnqt/path.hpp"
-#include "svnqt/cache/DatabaseException.hpp"
+#include "svnqt/path.h"
+#include "svnqt/cache/DatabaseException.h"
#ifndef NO_SQLITE3
#define SQLTYPE "TQSQLITE3"
diff --git a/src/svnqt/cache/LogCache.hpp b/src/svnqt/cache/LogCache.h
index eaaf37a..5e43b40 100644
--- a/src/svnqt/cache/LogCache.hpp
+++ b/src/svnqt/cache/LogCache.h
@@ -5,8 +5,8 @@
#include <tqdir.h>
#include <tqmutex.h>
-#include "svnqt/svnqt_defines.hpp"
-#include "svnqt/shared_pointer.hpp"
+#include "svnqt/svnqt_defines.h"
+#include "svnqt/shared_pointer.h"
namespace svn {
namespace cache {
diff --git a/src/svnqt/cache/ReposLog.cpp b/src/svnqt/cache/ReposLog.cpp
index d8cd609..81b022b 100644
--- a/src/svnqt/cache/ReposLog.cpp
+++ b/src/svnqt/cache/ReposLog.cpp
@@ -1,11 +1,11 @@
-#include "ReposLog.hpp"
-
-#include "LogCache.hpp"
-#include "svnqt/info_entry.hpp"
-#include "svnqt/svnqttypes.hpp"
-#include "svnqt/client.hpp"
-#include "svnqt/context_listener.hpp"
-#include "svnqt/cache/DatabaseException.hpp"
+#include "ReposLog.h"
+
+#include "LogCache.h"
+#include "svnqt/info_entry.h"
+#include "svnqt/svnqttypes.h"
+#include "svnqt/client.h"
+#include "svnqt/context_listener.h"
+#include "svnqt/cache/DatabaseException.h"
#include <tqsqldatabase.h>
diff --git a/src/svnqt/cache/ReposLog.hpp b/src/svnqt/cache/ReposLog.h
index 1d28037..4d01fae 100644
--- a/src/svnqt/cache/ReposLog.hpp
+++ b/src/svnqt/cache/ReposLog.h
@@ -1,9 +1,9 @@
#ifndef _REPOS_LOG_HPP
#define _REPOS_LOG_HPP
-#include "svnqt/svnqt_defines.hpp"
-#include "svnqt/svnqttypes.hpp"
-#include "svnqt/revision.hpp"
+#include "svnqt/svnqt_defines.h"
+#include "svnqt/svnqttypes.h"
+#include "svnqt/revision.h"
#include <tqsqldatabase.h>
#include <tqstring.h>
diff --git a/src/svnqt/cache/sqlite3/README b/src/svnqt/cache/sqlite3/README
index 854be9e..3ea0855 100644
--- a/src/svnqt/cache/sqlite3/README
+++ b/src/svnqt/cache/sqlite3/README
@@ -1,15 +1,12 @@
With this driver you can access the files created by sqlite3 through
-the standard Qt sql module. The driver name is QSQLITE3.
+the standard TQt sql module. The driver name is QSQLITE3.
Although there are many other solutions to access such DB files, I think
that using this driver has some advantages:
---> You use the standard Qt interface so you can reuse exinting code or
+--> You use the standard TQt interface so you can reuse exinting code or
switch to or from other DB types quite easily.
---> Soft transition to Qt 4: Qt 4 supports sqlite3, you can prepare your
- application now.
-
--> The source of this driver is smaller than any other, you can incorporate
it on your application with little overhead and without requiring external
libraries.
@@ -27,6 +24,6 @@ qmake
make
cp sqldrivers/libqsqlite3.so $TQTDIR/plugins/sqldrivers (probably as root)
-use it as any other Qt sql driver.
+use it as any other TQt sql driver.
-Have fun, Stefano !!! \ No newline at end of file
+Have fun, Stefano !!!
diff --git a/src/svnqt/cache/test/CMakeLists.txt b/src/svnqt/cache/test/CMakeLists.txt
index 09418e0..7ea8c33 100644
--- a/src/svnqt/cache/test/CMakeLists.txt
+++ b/src/svnqt/cache/test/CMakeLists.txt
@@ -1,19 +1,19 @@
-SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
-MACRO(BUILD_TEST tname)
- SET(${tname}-src ${tname}.cpp)
- IF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${tname}.h)
- SET(${tname}-src ${${tname}-src} ${tname}.h)
- ENDIF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${tname}.h)
- ADD_EXECUTABLE(${tname} ${${tname}-src})
- TARGET_LINK_LIBRARIES(${tname} ${svnqt-name} ${TQT_LIBRARIES})
- ADD_TEST(${tname} ${CMAKE_CURRENT_BINARY_DIR}/${tname})
-ENDMACRO(BUILD_TEST)
+macro(build_TEST tname)
+ set(${tname}-src ${tname}.cpp)
+ if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${tname}.h)
+ set(${tname}-src ${${tname}-src} ${tname}.h)
+ endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${tname}.h)
+ add_executable(${tname} ${${tname}-src})
+ target_link_libraries(${tname} ${svnqt-name} ${TQT_LIBRARIES})
+ add_test(${tname} ${CMAKE_CURRENT_BINARY_DIR}/${tname})
+endmaCRO(BUILD_TEST)
-IF (BUILD_TESTS)
- CONFIGURE_FILE(
+if (BUILD_TESTS)
+ configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/testconfig.h.in
${CMAKE_CURRENT_BINARY_DIR}/testconfig.h
)
- BUILD_TEST(sqlite)
-ENDIF(BUILD_TESTS)
+ build_test(sqlite)
+endif(BUILD_TESTS)
diff --git a/src/svnqt/cache/test/sqlite.cpp b/src/svnqt/cache/test/sqlite.cpp
index 07b5148..78cfc30 100644
--- a/src/svnqt/cache/test/sqlite.cpp
+++ b/src/svnqt/cache/test/sqlite.cpp
@@ -5,14 +5,14 @@
#include <tqapplication.h>
#include <tqtextstream.h>
-#include "svnqt/client.hpp"
-#include "svnqt/svnqttypes.hpp"
-#include "svnqt/log_entry.hpp"
+#include "svnqt/client.h"
+#include "svnqt/svnqttypes.h"
+#include "svnqt/log_entry.h"
-#include "svnqt/cache/LogCache.hpp"
-#include "svnqt/cache/ReposLog.hpp"
+#include "svnqt/cache/LogCache.h"
+#include "svnqt/cache/ReposLog.h"
#include "svnqt/cache/test/testconfig.h"
-#include "svnqt/cache/DatabaseException.hpp"
+#include "svnqt/cache/DatabaseException.h"
#if [[[TQT_VERSION IS DEPRECATED]]] < 0x040000
#else
diff --git a/src/svnqt/check.hpp b/src/svnqt/check.h
index 450d021..e2fbb48 100644
--- a/src/svnqt/check.hpp
+++ b/src/svnqt/check.h
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -43,8 +43,3 @@
(SVN_VER_MAJOR == (major) && SVN_VER_MINOR > (minor))
#endif
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/client.cpp b/src/svnqt/client.cpp
index f7560a4..cc5ded0 100644
--- a/src/svnqt/client.cpp
+++ b/src/svnqt/client.cpp
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -32,9 +32,9 @@
#endif
// svncpp
-#include "svnqt/client.hpp"
-#include "svnqt/client_impl.hpp"
-#include "svnqt/svnqt_defines.hpp"
+#include "svnqt/client.h"
+#include "svnqt/client_impl.h"
+#include "svnqt/svnqt_defines.h"
#include "svn_opt.h"
@@ -96,9 +96,3 @@ namespace svn
return 0L;
}
}
-
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/client.hpp b/src/svnqt/client.h
index 68d0aa0..cdd6410 100644
--- a/src/svnqt/client.hpp
+++ b/src/svnqt/client.h
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -41,11 +41,11 @@
#pragma warning (disable: 4290)
#endif
-#include "svnqt/svnqt_defines.hpp"
-#include "svnqt/svnqttypes.hpp"
-#include "svnqt/svnstream.hpp"
+#include "svnqt/svnqt_defines.h"
+#include "svnqt/svnqttypes.h"
+#include "svnqt/svnstream.h"
-// qt
+// tqt
#include <tqglobal.h>
#include <tqstring.h>
@@ -54,17 +54,17 @@
#include <tqmap.h>
// svnqt
-#include "svnqt/context.hpp"
-#include "svnqt/exception.hpp"
-#include "svnqt/path.hpp"
-#include "svnqt/entry.hpp"
-#include "svnqt/revision.hpp"
-#include "svnqt/log_entry.hpp"
-#include "svnqt/info_entry.hpp"
-#include "svnqt/annotate_line.hpp"
-#include "svnqt/stringarray.hpp"
-#include "svnqt/diffoptions.hpp"
-#include "svnqt/conflictresult.hpp"
+#include "svnqt/context.h"
+#include "svnqt/exception.h"
+#include "svnqt/path.h"
+#include "svnqt/entry.h"
+#include "svnqt/revision.h"
+#include "svnqt/log_entry.h"
+#include "svnqt/info_entry.h"
+#include "svnqt/annotate_line.h"
+#include "svnqt/stringarray.h"
+#include "svnqt/diffoptions.h"
+#include "svnqt/conflictresult.h"
class TQStringList;
@@ -136,7 +136,7 @@ namespace svn
const Revision revision = svn::Revision::HEAD,
bool detailed_remote = false,
bool hide_externals = false,
- const StringArray & changelists=StringArray() ) throw (ClientException) = 0;
+ const StringArray & changelists=StringArray() ) = 0;
/**
* Returns the status of a single file in the path.
@@ -149,7 +149,7 @@ namespace svn
* @return a Status with Statis.isVersioned = FALSE
*/
virtual StatusPtr
- singleStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD) throw (ClientException)=0;
+ singleStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD)=0;
/**
* Executes a revision checkout.
@@ -169,7 +169,7 @@ namespace svn
svn::Depth depth=DepthInfinity,
bool ignore_externals=false,
bool overwrite=false
- ) throw (ClientException) = 0;
+ ) = 0;
/**
* relocate wc @a from to @a to
@@ -177,7 +177,7 @@ namespace svn
*/
virtual void
relocate (const Path & path, const TQString &from_url,
- const TQString &to_url, bool recurse) throw (ClientException)=0;
+ const TQString &to_url, bool recurse)=0;
/**
* Sets a single file for deletion.
@@ -186,7 +186,7 @@ namespace svn
virtual svn::Revision
remove (const Path & path, bool force,
bool keep_local = true,
- const PropertiesMap&revProps = PropertiesMap()) throw (ClientException)=0;
+ const PropertiesMap&revProps = PropertiesMap())=0;
/**
* Sets files for deletion.
@@ -199,7 +199,7 @@ namespace svn
remove (const Targets & targets,
bool force,
bool keep_local=true,
- const PropertiesMap&revProps=PropertiesMap()) throw (ClientException) = 0;
+ const PropertiesMap&revProps=PropertiesMap()) = 0;
/**
* Reverts a couple of files to a pristiner state.
@@ -209,7 +209,7 @@ namespace svn
revert (const Targets & targets,
Depth depth,
const StringArray&changelist=StringArray()
- ) throw (ClientException)=0;
+ )=0;
/**
@@ -222,7 +222,7 @@ namespace svn
* @exception ClientException
*/
virtual void
- add (const Path & path, svn::Depth depth,bool force=false, bool no_ignore=false, bool add_parents = true) throw (ClientException)=0;
+ add (const Path & path, svn::Depth depth,bool force=false, bool no_ignore=false, bool add_parents = true)=0;
/**
* Updates the file or directory.
@@ -238,7 +238,7 @@ namespace svn
virtual Revisions
update (const Targets & path, const Revision & revision,
Depth depth,bool ignore_externals,bool allow_unversioned,
- bool sticky_depth) throw (ClientException) = 0;
+ bool sticky_depth) = 0;
/**
* Retrieves the contents for a specific @a revision of
@@ -252,7 +252,7 @@ namespace svn
virtual TQByteArray
cat (const Path & path,
const Revision & revision,
- const Revision & peg_revision=svn_opt_revision_unspecified) throw (ClientException)=0;
+ const Revision & peg_revision=svn_opt_revision_unspecified)=0;
/**
* Retrieves the contents for a specific @a revision of
* a @a path at @a peg_revision
@@ -267,7 +267,7 @@ namespace svn
cat(svn::stream::SvnStream&buffer,
const Path & path,
const Revision & revision,
- const Revision & peg_revision) throw (ClientException)=0;
+ const Revision & peg_revision)=0;
/**
* Retrieves the contents for a specific @a revision of
* a @a path at @a peg_revision
@@ -282,7 +282,7 @@ namespace svn
get (const Path & path,
const TQString & target,
const Revision & revision,
- const Revision & peg_revision=svn_opt_revision_unspecified) throw (ClientException)=0;
+ const Revision & peg_revision=svn_opt_revision_unspecified)=0;
/**
* Retrieves the contents for a specific @a revision of
@@ -303,7 +303,7 @@ namespace svn
const DiffOptions&diffoptions = DiffOptions(),
bool ignore_mimetypes = false,
bool include_merged_revisions = false
- ) throw (ClientException)=0;
+ )=0;
/**
* Commits changes to the repository. This usually requires
@@ -324,7 +324,7 @@ namespace svn
const svn::StringArray&contents=svn::StringArray(),
const PropertiesMap&revProps=PropertiesMap(),
bool keep_changelist=false
- ) throw (ClientException)=0;
+ )=0;
/**
* Copies a versioned file with the history preserved.
@@ -333,7 +333,7 @@ namespace svn
virtual svn::Revision
copy (const Path & srcPath,
const Revision & srcRevision,
- const Path & destPath) throw (ClientException)=0;
+ const Path & destPath)=0;
/**
* Copies a versioned file with the history preserved.
* @since subversion 1.5 api
@@ -345,7 +345,7 @@ namespace svn
const Revision & srcRevision,
const Revision & pegRevision,
const Path & destPath,
- bool asChild=false,bool makeParent=false,const PropertiesMap&revProps=PropertiesMap()) throw (ClientException)=0;
+ bool asChild=false,bool makeParent=false,const PropertiesMap&revProps=PropertiesMap())=0;
/**
* Moves or renames a file.
@@ -354,7 +354,7 @@ namespace svn
virtual svn::Revision
move (const Path & srcPath,
const Path & destPath,
- bool force) throw (ClientException)=0;
+ bool force)=0;
/**
* Moves or renames a file.
* @exception ClientException
@@ -362,7 +362,7 @@ namespace svn
virtual svn::Revision
move (const Targets & srcPath,
const Path & destPath,
- bool force,bool asChild,bool makeParent,const PropertiesMap&revProps=PropertiesMap()) throw (ClientException)=0;
+ bool force,bool asChild,bool makeParent,const PropertiesMap&revProps=PropertiesMap())=0;
/**
* Creates a directory directly in a repository or creates a
@@ -381,7 +381,7 @@ namespace svn
const TQString& message,
bool makeParent=true,
const PropertiesMap&revProps=PropertiesMap()
- ) throw (ClientException)=0;
+ )=0;
/**
* Creates a directory directly in a repository or creates a
* directory on disk and schedules it for addition. If <i>path</i>
@@ -398,7 +398,7 @@ namespace svn
const TQString& message,
bool makeParent=true,
const PropertiesMap&revProps=PropertiesMap()
- ) throw (ClientException)=0;
+ )=0;
/**
* Recursively cleans up a local directory, finishing any
@@ -407,13 +407,13 @@ namespace svn
* @exception ClientException
*/
virtual void
- cleanup (const Path & path) throw (ClientException)=0;
+ cleanup (const Path & path)=0;
/**
* Removes the 'conflicted' state on a file.
* @exception ClientException
*/
- virtual void resolve (const Path & path,Depth depth,const ConflictResult&resolution=ConflictResult()) throw (ClientException)=0;
+ virtual void resolve (const Path & path,Depth depth,const ConflictResult&resolution=ConflictResult())=0;
/**
* Exports the contents of either a subversion repository into a
@@ -439,7 +439,7 @@ namespace svn
const TQString&native_eol=TQString(),
bool ignore_externals = false,
svn::Depth depth=svn::DepthInfinity
- ) throw (ClientException)=0;
+ )=0;
/**
* Update local copy to mirror a new url. This excapsulates the
@@ -455,7 +455,7 @@ namespace svn
bool sticky_depth = true,
bool ignore_externals=false,
bool allow_unversioned=false
- ) throw (ClientException)=0;
+ )=0;
/**
* Import file or directory PATH into repository directory URL at
@@ -473,7 +473,7 @@ namespace svn
const TQString& message,
svn::Depth depth,
bool no_ignore,bool no_unknown_nodetype,
- const PropertiesMap&revProps=PropertiesMap()) throw (ClientException)=0;
+ const PropertiesMap&revProps=PropertiesMap())=0;
/**
* Merge changes from two paths into a new local path.
@@ -488,7 +488,7 @@ namespace svn
bool dry_run=false,
bool record_only=false,
const StringArray&merge_options=StringArray()
- ) throw (ClientException)=0;
+ )=0;
virtual void
merge_peg(const Path&src,
@@ -501,7 +501,7 @@ namespace svn
bool force=false,
bool record_only=false,
const StringArray&merge_options=StringArray()
- ) throw (ClientException)=0;
+ )=0;
virtual void
merge_peg(const Path&src,
@@ -513,7 +513,7 @@ namespace svn
bool dry_run=false,
bool force=false,
const StringArray&merge_options=StringArray()
- ) throw (ClientException)=0;
+ )=0;
/**
* Retrieve information for the given path
@@ -531,7 +531,7 @@ namespace svn
const Revision & rev,
const Revision & peg_revision=svn_opt_revision_unspecified,
const StringArray&changelists=StringArray()
- ) throw (ClientException)=0;
+ )=0;
/**
* Retrieve log information for the given path
@@ -558,7 +558,7 @@ namespace svn
bool strictNodeHistory=true,int limit = 0,
bool include_merged_revisions = false,
const StringArray&revprops=StringArray()
- ) throw (ClientException)=0;
+ )=0;
/**
* Retrieve log information for the given path
@@ -586,7 +586,7 @@ namespace svn
bool strictNodeHistory=true,int limit = 0,
bool include_merged_revisions = false,
const StringArray&revprops=StringArray()
- ) throw (ClientException)=0;
+ )=0;
/**
* Produce diff output which describes the delta between
@@ -618,7 +618,7 @@ namespace svn
bool noDiffDeleted,bool ignore_contenttype,
const StringArray&extra,
const StringArray&changelists
- ) throw (ClientException)=0;
+ )=0;
/**
* Same as other diff but extra options always set to empty list.
@@ -627,7 +627,7 @@ namespace svn
diff_peg (const Path & tmpPath, const Path & path,const Path&relativeTo,
const Revision & revision1, const Revision & revision2, const Revision& peg_revision,
Depth depth, bool ignoreAncestry,
- bool noDiffDeleted,bool ignore_contenttype) throw (ClientException)=0;
+ bool noDiffDeleted,bool ignore_contenttype)=0;
/**
* Produce diff output which describes the delta between
@@ -660,7 +660,7 @@ namespace svn
bool noDiffDeleted,bool ignore_contenttype,
const StringArray&extra,
const StringArray&changelists
- ) throw (ClientException)=0;
+ )=0;
/**
* Same as other diff but extra options and changelists always set to empty list.
@@ -669,7 +669,7 @@ namespace svn
diff (const Path & tmpPath, const Path & path1,const Path & path2,const Path&relativeTo,
const Revision & revision1, const Revision & revision2,
Depth depth, bool ignoreAncestry,
- bool noDiffDeleted,bool ignore_contenttype) throw (ClientException)=0;
+ bool noDiffDeleted,bool ignore_contenttype)=0;
/**
* lists entries in @a pathOrUrl no matter whether local or
@@ -690,7 +690,7 @@ namespace svn
list (const Path& pathOrUrl,
const Revision& revision,
const Revision& peg,
- svn::Depth depth,bool retrieve_locks) throw (ClientException)=0;
+ svn::Depth depth,bool retrieve_locks)=0;
/**
* lists properties in @a path no matter whether local or
@@ -840,7 +840,7 @@ namespace svn
virtual void
lock (const Targets & targets,
const TQString& message,
- bool steal_lock) throw (ClientException)=0;
+ bool steal_lock)=0;
/**
* unlock files in repository or working copy
* @param targets items to unlock
@@ -848,7 +848,7 @@ namespace svn
*/
virtual void
unlock (const Targets&targets,
- bool break_lock) throw (ClientException)=0;
+ bool break_lock)=0;
virtual void
url2Revision(const TQString&revstring,
@@ -871,8 +871,3 @@ namespace svn
}
#endif
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/client_annotate.cpp b/src/svnqt/client_annotate.cpp
index 94e5d71..541d07e 100644
--- a/src/svnqt/client_annotate.cpp
+++ b/src/svnqt/client_annotate.cpp
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -31,8 +31,8 @@
#pragma warning( disable: 4786 )// debug symbol truncated
#endif
// svncpp
-#include "svnqt/client_impl.hpp"
-#include "svnqt/svnqt_defines.hpp"
+#include "svnqt/client_impl.h"
+#include "svnqt/svnqt_defines.h"
// Subversion api
#include "svn_client.h"
@@ -90,7 +90,7 @@ namespace svn
const DiffOptions&diffoptions,
bool ignore_mimetypes,
bool include_merged_revisions
- ) throw (ClientException)
+ )
{
Pool pool;
svn_error_t *error;
diff --git a/src/svnqt/client_cat.cpp b/src/svnqt/client_cat.cpp
index 0454642..fd9fabb 100644
--- a/src/svnqt/client_cat.cpp
+++ b/src/svnqt/client_cat.cpp
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -31,25 +31,25 @@
#pragma warning( disable: 4786 )// debug symbol truncated
#endif
// svncpp
-#include "client_impl.hpp"
+#include "client_impl.h"
// Subversion api
#include "svn_client.h"
//#include "svn_io.h"
-#include "svnqt/exception.hpp"
-#include "svnqt/pool.hpp"
-#include "svnqt/status.hpp"
-#include "svnqt/svnqt_defines.hpp"
-#include "svnqt/svnstream.hpp"
-#include "svnqt/svnfilestream.hpp"
+#include "svnqt/exception.h"
+#include "svnqt/pool.h"
+#include "svnqt/status.h"
+#include "svnqt/svnqt_defines.h"
+#include "svnqt/svnstream.h"
+#include "svnqt/svnfilestream.h"
namespace svn
{
TQByteArray
Client_impl::cat(const Path & path,
const Revision & revision,
- const Revision & peg_revision) throw (ClientException)
+ const Revision & peg_revision)
{
svn::stream::SvnByteStream buffer(*m_context);
svn_error_t * error = internal_cat(path,revision,peg_revision,buffer);
@@ -63,7 +63,7 @@ namespace svn
Client_impl::cat(svn::stream::SvnStream&buffer,
const Path & path,
const Revision & revision,
- const Revision & peg_revision) throw (ClientException)
+ const Revision & peg_revision)
{
svn_error_t * error = internal_cat(path,revision,peg_revision,buffer);
if (error != 0)
@@ -74,7 +74,7 @@ namespace svn
Client_impl::get (const Path & path,
const TQString & target,
const Revision & revision,
- const Revision & peg_revision) throw (ClientException)
+ const Revision & peg_revision)
{
svn::stream::SvnFileOStream buffer(target,*m_context);
svn_error_t * error = internal_cat(path,revision,peg_revision,buffer);
@@ -97,9 +97,3 @@ namespace svn
}
}
-
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/client_diff.cpp b/src/svnqt/client_diff.cpp
index 9229a45..de5bc75 100644
--- a/src/svnqt/client_diff.cpp
+++ b/src/svnqt/client_diff.cpp
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -31,18 +31,18 @@
#pragma warning( disable: 4786 )// debug symbol truncated
#endif
// svncpp
-#include "svnqt/client_impl.hpp"
+#include "svnqt/client_impl.h"
// Subversion api
#include "svn_client.h"
#include "svn_path.h"
-#include "svnqt/exception.hpp"
-#include "svnqt/pool.hpp"
-#include "svnqt/status.hpp"
-#include "svnqt/svnqt_defines.hpp"
-#include "svnqt/helper.hpp"
-#include "diff_data.hpp"
+#include "svnqt/exception.h"
+#include "svnqt/pool.h"
+#include "svnqt/status.h"
+#include "svnqt/svnqt_defines.h"
+#include "svnqt/helper.h"
+#include "diff_data.h"
#include <tqfile.h>
#include <tqstringlist.h>
@@ -55,7 +55,7 @@ namespace svn
Client_impl::diff_peg (const Path & tmpPath, const Path & path,const Path&relativeTo,
const Revision & revision1, const Revision & revision2, const Revision& peg_revision,
Depth depth, const bool ignoreAncestry,
- const bool noDiffDeleted,const bool ignore_contenttype) throw (ClientException)
+ const bool noDiffDeleted,const bool ignore_contenttype)
{
return diff_peg(tmpPath,path,relativeTo,
revision1,revision2,peg_revision,
@@ -68,7 +68,7 @@ namespace svn
const Revision & revision1, const Revision & revision2, const Revision& peg_revision,
Depth depth, const bool ignoreAncestry,
const bool noDiffDeleted,const bool ignore_contenttype,
- const StringArray&extra,const StringArray&changelists) throw (ClientException)
+ const StringArray&extra,const StringArray&changelists)
{
Pool pool;
svn_error_t * error;
@@ -119,7 +119,7 @@ namespace svn
Client_impl::diff (const Path & tmpPath, const Path & path1,const Path&path2,const Path&relativeTo,
const Revision & revision1, const Revision & revision2,
Depth depth, const bool ignoreAncestry,
- const bool noDiffDeleted,const bool ignore_contenttype) throw (ClientException)
+ const bool noDiffDeleted,const bool ignore_contenttype)
{
return diff(tmpPath,path1,path2,relativeTo,
revision1,revision2,
@@ -132,7 +132,7 @@ namespace svn
const Revision & revision1, const Revision & revision2,
Depth depth, const bool ignoreAncestry,
const bool noDiffDeleted,const bool ignore_contenttype,
- const StringArray&extra,const StringArray&changelists) throw (ClientException)
+ const StringArray&extra,const StringArray&changelists)
{
Pool pool;
@@ -176,9 +176,3 @@ namespace svn
}
}
-
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/client_impl.cpp b/src/svnqt/client_impl.cpp
index d138016..431ca63 100644
--- a/src/svnqt/client_impl.cpp
+++ b/src/svnqt/client_impl.cpp
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -32,9 +32,9 @@
#endif
// svncpp
-#include "svnqt/client_impl.hpp"
+#include "svnqt/client_impl.h"
#include "svn_opt.h"
-#include "svnqt/svnqt_defines.hpp"
+#include "svnqt/svnqt_defines.h"
#include <tqmap.h>
#include <tqstringlist.h>
@@ -156,9 +156,3 @@ namespace svn
return hash;
}
}
-
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/client_impl.hpp b/src/svnqt/client_impl.h
index 4760e39..4aa5fc8 100644
--- a/src/svnqt/client_impl.hpp
+++ b/src/svnqt/client_impl.h
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -34,8 +34,8 @@
#include "svn_sorts.h"
#include <svn_version.h>
-#include "svnqt/client.hpp"
-#include "svnqt/svnqt_defines.hpp"
+#include "svnqt/client.h"
+#include "svnqt/svnqt_defines.h"
// Ignore MSVC 6 compiler warning: debug symbol truncated
#if defined (_MSC_VER) && _MSC_VER <= 1200
@@ -126,7 +126,7 @@ namespace svn
const Revision revision = svn::Revision::HEAD,
bool detailed_remote = false,
bool hide_externals = false,
- const StringArray & changelists=StringArray()) throw (ClientException);
+ const StringArray & changelists=StringArray());
/**
* Returns the status of a single file in the path.
@@ -139,7 +139,7 @@ namespace svn
* @return a Status with Statis.isVersioned = FALSE
*/
virtual StatusPtr
- singleStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD) throw (ClientException);
+ singleStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD);
/**
* Executes a revision checkout.
@@ -159,7 +159,7 @@ namespace svn
svn::Depth depth=DepthInfinity,
bool ignore_externals=false,
bool overwrite=false
- ) throw (ClientException);
+ );
/**
* relocate wc @a from to @a to
@@ -167,7 +167,7 @@ namespace svn
*/
virtual void
relocate (const Path & path, const TQString &from_url,
- const TQString &to_url, bool recurse) throw (ClientException);
+ const TQString &to_url, bool recurse);
/**
* Sets a single file for deletion.
@@ -176,7 +176,7 @@ namespace svn
virtual svn::Revision
remove (const Path & path, bool force,
bool keep_local = true,
- const PropertiesMap&revProps = PropertiesMap()) throw (ClientException);
+ const PropertiesMap&revProps = PropertiesMap());
/**
* Sets files for deletion.
@@ -189,7 +189,7 @@ namespace svn
remove (const Targets & targets,
bool force,
bool keep_local = true,
- const PropertiesMap&revProps = PropertiesMap()) throw (ClientException);
+ const PropertiesMap&revProps = PropertiesMap());
/**
* Reverts a couple of files to a pristiner state.
@@ -199,7 +199,7 @@ namespace svn
revert (const Targets & targets,
Depth depth,
const StringArray&changelist=StringArray()
- ) throw (ClientException);
+ );
/**
@@ -212,7 +212,7 @@ namespace svn
* @exception ClientException
* @sa svn::Depth
*/
- virtual void add (const Path & path, svn::Depth depth,bool force=false, bool no_ignore=false, bool add_parents = true) throw (ClientException);
+ virtual void add (const Path & path, svn::Depth depth,bool force=false, bool no_ignore=false, bool add_parents = true);
/**
* Updates the file or directory.
@@ -228,7 +228,7 @@ namespace svn
virtual Revisions
update (const Targets & path, const Revision & revision,
Depth depth,bool ignore_externals,bool allow_unversioned,
- bool sticky_depth) throw (ClientException);
+ bool sticky_depth);
/**
* Retrieves the contents for a specific @a revision of
@@ -243,7 +243,7 @@ namespace svn
virtual TQByteArray
cat (const Path & path,
const Revision & revision,
- const Revision & peg_revision=svn_opt_revision_unspecified) throw (ClientException);
+ const Revision & peg_revision=svn_opt_revision_unspecified);
/**
* Retrieves the contents for a specific @a revision of
* a @a path at @a peg_revision
@@ -258,7 +258,7 @@ namespace svn
cat(svn::stream::SvnStream&buffer,
const Path & path,
const Revision & revision,
- const Revision & peg_revision) throw (ClientException);
+ const Revision & peg_revision);
/**
* Retrieves the contents for a specific @a revision of
@@ -274,7 +274,7 @@ namespace svn
get (const Path & path,
const TQString & target,
const Revision & revision,
- const Revision & peg_revision=svn_opt_revision_unspecified) throw (ClientException);
+ const Revision & peg_revision=svn_opt_revision_unspecified);
/**
* Retrieves the contents for a specific @a revision of
@@ -295,7 +295,7 @@ namespace svn
const DiffOptions&diffoptions = DiffOptions(),
bool ignore_mimetypes = false,
bool include_merged_revisions = false
- ) throw (ClientException);
+ );
/**
* Commits changes to the repository. This usually requires
@@ -316,7 +316,7 @@ namespace svn
const svn::StringArray&changelist=svn::StringArray(),
const PropertiesMap&revProps=PropertiesMap(),
bool keep_changelist=false
- ) throw (ClientException);
+ );
/**
* Copies a versioned file with the history preserved.
@@ -325,7 +325,7 @@ namespace svn
virtual svn::Revision
copy (const Path & srcPath,
const Revision & srcRevision,
- const Path & destPath) throw (ClientException);
+ const Path & destPath);
/**
* Copies a versioned file with the history preserved.
* @since subversion 1.5 api
@@ -337,7 +337,7 @@ namespace svn
const Revision & srcRevision,
const Revision & pegRevision,
const Path & destPath,
- bool asChild=false,bool makeParent=false,const PropertiesMap&revProps=PropertiesMap()) throw (ClientException);
+ bool asChild=false,bool makeParent=false,const PropertiesMap&revProps=PropertiesMap());
/**
* Moves or renames a file.
@@ -346,7 +346,7 @@ namespace svn
virtual svn::Revision
move (const Path & srcPath,
const Path & destPath,
- bool force) throw (ClientException);
+ bool force);
/**
* Moves or renames a file.
@@ -355,7 +355,7 @@ namespace svn
virtual svn::Revision
move (const Targets & srcPath,
const Path & destPath,
- bool force,bool asChild,bool makeParent,const PropertiesMap&revProps=PropertiesMap()) throw (ClientException);
+ bool force,bool asChild,bool makeParent,const PropertiesMap&revProps=PropertiesMap());
/**
* Creates a directory directly in a repository or creates a
@@ -372,7 +372,7 @@ namespace svn
const TQString& message,
bool makeParent=true,
const PropertiesMap&revProps=PropertiesMap()
- ) throw (ClientException);
+ );
/**
* Creates a directory directly in a repository or creates a
* directory on disk and schedules it for addition. If <i>path</i>
@@ -388,7 +388,7 @@ namespace svn
const TQString& message,
bool makeParent=true,
const PropertiesMap&revProps=PropertiesMap()
- ) throw (ClientException);
+ );
/**
* Recursively cleans up a local directory, finishing any
@@ -397,13 +397,13 @@ namespace svn
* @exception ClientException
*/
virtual void
- cleanup (const Path & path) throw (ClientException);
+ cleanup (const Path & path);
/**
* Removes the 'conflicted' state on a file.
* @exception ClientException
*/
- virtual void resolve (const Path & path,Depth depth,const ConflictResult&resolution=ConflictResult()) throw (ClientException);
+ virtual void resolve (const Path & path,Depth depth,const ConflictResult&resolution=ConflictResult());
/**
* Exports the contents of either a subversion repository into a
@@ -428,7 +428,7 @@ namespace svn
const TQString&native_eol=TQString(),
bool ignore_externals = false,
svn::Depth depth=svn::DepthInfinity
- ) throw (ClientException);
+ );
/**
* Update local copy to mirror a new url. This excapsulates the
@@ -444,7 +444,7 @@ namespace svn
bool sticky_depth = true,
bool ignore_externals=false,
bool allow_unversioned=false
- ) throw (ClientException);
+ );
/**
* Import file or directory PATH into repository directory URL at
@@ -462,7 +462,7 @@ namespace svn
const TQString& message,
svn::Depth depth,
bool no_ignore,bool no_unknown_nodetype,
- const PropertiesMap&revProps=PropertiesMap()) throw (ClientException);
+ const PropertiesMap&revProps=PropertiesMap());
/**
* Merge changes from two paths into a new local path.
@@ -477,7 +477,7 @@ namespace svn
bool dry_run=false,
bool record_only=false,
const StringArray&merge_options=StringArray()
- ) throw (ClientException);
+ );
virtual void
merge_peg(const Path&src,
@@ -490,7 +490,7 @@ namespace svn
bool force=false,
bool record_only=false,
const StringArray&merge_options=StringArray()
- ) throw (ClientException);
+ );
virtual void
merge_peg(const Path&src,
@@ -502,7 +502,7 @@ namespace svn
bool dry_run,
bool force,
const StringArray&merge_options
- ) throw (ClientException);
+ );
/**
* Retrieve information for the given path
@@ -522,7 +522,7 @@ namespace svn
const Revision & rev,
const Revision & peg_revision=svn_opt_revision_unspecified,
const StringArray&changelists=StringArray()
- ) throw (ClientException);
+ );
/**
* Retrieve log information for the given path
* Loads the log messages result set. The first
@@ -549,7 +549,7 @@ namespace svn
bool strictNodeHistory=true,int limit=0,
bool include_merged_revisions = false,
const StringArray&revprops=StringArray()
- ) throw (ClientException);
+ );
/**
* Retrieve log information for the given path
* Loads the log messages result set. Result will stored
@@ -577,7 +577,7 @@ namespace svn
bool strictNodeHistory,int limit,
bool include_merged_revisions = false,
const StringArray&revprops=StringArray()
- ) throw (ClientException);
+ );
/**
* Produce diff output which describes the delta between
@@ -610,7 +610,7 @@ namespace svn
const StringArray&extra,
const StringArray&changelists
)
- throw (ClientException);
+ ;
/**
* Same as other diff but extra options and changelists always set to empty list.
@@ -620,7 +620,7 @@ namespace svn
const Revision & revision1, const Revision & revision2, const Revision& peg_revision,
Depth depth, bool ignoreAncestry,
bool noDiffDeleted,bool ignore_contenttype)
- throw (ClientException);
+ ;
/**
* Produce diff output which describes the delta between
@@ -654,7 +654,7 @@ namespace svn
const StringArray&extra,
const StringArray&changelists
)
- throw (ClientException);
+ ;
/**
* Same as other diff but extra options always set to empty list.
@@ -664,7 +664,7 @@ namespace svn
const Revision & revision1, const Revision & revision2,
Depth depth, bool ignoreAncestry,
bool noDiffDeleted,bool ignore_contenttype)
- throw (ClientException);
+ ;
/**
* lists entries in @a pathOrUrl no matter whether local or
@@ -682,7 +682,7 @@ namespace svn
list (const Path& pathOrUrl,
const Revision& revision,
const Revision& peg,
- svn::Depth depth,bool retrieve_locks) throw (ClientException);
+ svn::Depth depth,bool retrieve_locks);
/**
* lists properties in @a path no matter whether local or
@@ -830,7 +830,7 @@ namespace svn
virtual void
lock (const Targets & targets,
const TQString& message,
- bool steal_lock) throw (ClientException);
+ bool steal_lock);
/**
* unlock files in repository or working copy
* @param targets items to unlock
@@ -838,7 +838,7 @@ namespace svn
*/
virtual void
unlock (const Targets&targets,
- bool break_lock) throw (ClientException);
+ bool break_lock);
virtual void
url2Revision(const TQString&revstring,
@@ -875,12 +875,12 @@ namespace svn
list_simple(const Path& pathOrUrl,
const Revision& revision,
const Revision& peg,
- bool recurse) throw (ClientException);
+ bool recurse);
DirEntries
list_locks(const Path& pathOrUrl,
const Revision& revision,
const Revision& peg,
- bool recurse) throw (ClientException);
+ bool recurse);
svn_error_t * internal_cat(const Path & path,
const Revision & revision,
@@ -893,8 +893,3 @@ namespace svn
}
#endif
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/client_lock.cpp b/src/svnqt/client_lock.cpp
index 830f215..18357d5 100644
--- a/src/svnqt/client_lock.cpp
+++ b/src/svnqt/client_lock.cpp
@@ -18,15 +18,15 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
// svncpp
-#include "client_impl.hpp"
+#include "client_impl.h"
// subversion api
#include "svn_client.h"
-#include "svnqt/exception.hpp"
-#include "svnqt/pool.hpp"
-#include "svnqt/targets.hpp"
-#include "svnqt/svnqt_defines.hpp"
+#include "svnqt/exception.h"
+#include "svnqt/pool.h"
+#include "svnqt/targets.h"
+#include "svnqt/svnqt_defines.h"
namespace svn
{
@@ -34,7 +34,7 @@ namespace svn
void
Client_impl::lock (const Targets & targets,
const TQString& message,
- bool steal_lock) throw (ClientException)
+ bool steal_lock)
{
Pool pool;
svn_error_t * error =
@@ -49,7 +49,7 @@ namespace svn
void
Client_impl::unlock (const Targets&targets,
- bool break_lock) throw (ClientException)
+ bool break_lock)
{
Pool pool;
svn_error_t * error =
diff --git a/src/svnqt/client_ls.cpp b/src/svnqt/client_ls.cpp
index 054274c..477b856 100644
--- a/src/svnqt/client_ls.cpp
+++ b/src/svnqt/client_ls.cpp
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -33,18 +33,18 @@
// svncpp
-#include "svnqt/client_impl.hpp"
+#include "svnqt/client_impl.h"
// subversion api
#include "svn_client.h"
#include "svn_path.h"
//#include "svn_utf.h"
-#include "svnqt/dirent.hpp"
-#include "svnqt/exception.hpp"
-#include "svnqt/svnqt_defines.hpp"
+#include "svnqt/dirent.h"
+#include "svnqt/exception.h"
+#include "svnqt/svnqt_defines.h"
-#include "svnqt/helper.hpp"
+#include "svnqt/helper.h"
namespace svn
{
@@ -53,7 +53,7 @@ namespace svn
Client_impl::list_simple(const Path& _p,
const Revision& revision,
const Revision& peg,
- bool recurse) throw (ClientException)
+ bool recurse)
{
Pool pool;
@@ -102,7 +102,7 @@ namespace svn
Client_impl::list_locks(const Path& pathOrUrl,
const Revision& revision,
const Revision& peg,
- bool recurse) throw (ClientException)
+ bool recurse)
{
Pool pool;
@@ -174,7 +174,7 @@ namespace svn
Client_impl::list(const Path& pathOrUrl,
const Revision& revision,
const Revision& peg,
- Depth depth,bool retrieve_locks) throw (ClientException)
+ Depth depth,bool retrieve_locks)
{
#if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 4)) || (SVN_VER_MAJOR > 1)
@@ -222,9 +222,3 @@ namespace svn
#endif
}
}
-
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/client_merge.cpp b/src/svnqt/client_merge.cpp
index 0d84cc2..feb846c 100644
--- a/src/svnqt/client_merge.cpp
+++ b/src/svnqt/client_merge.cpp
@@ -1,15 +1,15 @@
-#include "svnqt/client_impl.hpp"
+#include "svnqt/client_impl.h"
// subversion api
#include "svn_client.h"
-#include "svnqt/exception.hpp"
-#include "svnqt/pool.hpp"
-#include "svnqt/targets.hpp"
-#include "svnqt/svnqt_defines.hpp"
-#include "svnqt/stringarray.hpp"
+#include "svnqt/exception.h"
+#include "svnqt/pool.h"
+#include "svnqt/targets.h"
+#include "svnqt/svnqt_defines.h"
+#include "svnqt/stringarray.h"
-#include "svnqt/helper.hpp"
+#include "svnqt/helper.h"
namespace svn
{
@@ -22,7 +22,7 @@ void Client_impl::merge (const Path & path1, const Revision & revision1,
bool dry_run,
bool record_only,
const StringArray&merge_options
- ) throw (ClientException)
+ )
{
Pool pool;
svn_error_t * error = 0;
@@ -87,7 +87,7 @@ void Client_impl::merge (const Path & path1, const Revision & revision1,
bool force,
bool record_only,
const StringArray&merge_options
- ) throw (ClientException)
+ )
{
#if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1)
Pool pool;
@@ -129,7 +129,7 @@ void Client_impl::merge (const Path & path1, const Revision & revision1,
bool dry_run,
bool force,
const StringArray&merge_options
- ) throw (ClientException)
+ )
{
#if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1)
RevisionRanges ranges;
diff --git a/src/svnqt/client_modify.cpp b/src/svnqt/client_modify.cpp
index 3d12dbd..6e55f39 100644
--- a/src/svnqt/client_modify.cpp
+++ b/src/svnqt/client_modify.cpp
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -31,18 +31,18 @@
#pragma warning( disable: 4786 )// debug symbol truncated
#endif
// svncpp
-#include "svnqt/client_impl.hpp"
+#include "svnqt/client_impl.h"
// subversion api
#include "svn_client.h"
-#include "svnqt/exception.hpp"
-#include "svnqt/pool.hpp"
-#include "svnqt/targets.hpp"
-#include "svnqt/svnqt_defines.hpp"
-#include "svnqt/stringarray.hpp"
+#include "svnqt/exception.h"
+#include "svnqt/pool.h"
+#include "svnqt/targets.h"
+#include "svnqt/svnqt_defines.h"
+#include "svnqt/stringarray.h"
-#include "svnqt/helper.hpp"
+#include "svnqt/helper.h"
namespace svn
{
@@ -53,7 +53,7 @@ namespace svn
svn::Depth depth,
bool ignore_externals,
bool overwrite
- ) throw (ClientException)
+ )
{
Pool subPool;
svn_revnum_t revnum = 0;
@@ -90,7 +90,7 @@ namespace svn
Revision Client_impl::remove (const Path & path,bool force,
bool keep_local,
- const PropertiesMap&revProps) throw (ClientException)
+ const PropertiesMap&revProps)
{
Targets targets (path.path());
return remove(targets,force,keep_local,revProps);
@@ -101,7 +101,7 @@ namespace svn
bool force,
bool keep_local,
const PropertiesMap&revProps
- ) throw (ClientException)
+ )
{
Pool pool;
@@ -141,7 +141,7 @@ namespace svn
Client_impl::revert (const Targets & targets,
Depth depth,
const StringArray&changelist
- ) throw (ClientException)
+ )
{
Pool pool;
@@ -169,7 +169,7 @@ namespace svn
void
Client_impl::add (const Path & path,
- svn::Depth depth,bool force, bool no_ignore, bool add_parents) throw (ClientException)
+ svn::Depth depth,bool force, bool no_ignore, bool add_parents)
{
Pool pool;
#if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1)
@@ -202,7 +202,7 @@ namespace svn
bool ignore_externals,
bool allow_unversioned,
bool sticky_depth
- ) throw (ClientException)
+ )
{
Pool pool;
Revisions resulting;
@@ -241,7 +241,7 @@ namespace svn
svn::Depth depth,bool keep_locks,
const svn::StringArray&changelist,
const PropertiesMap&revProps,
- bool keep_changelist) throw (ClientException)
+ bool keep_changelist)
{
Pool pool;
@@ -292,7 +292,7 @@ namespace svn
const Path & destPath,
bool asChild,bool makeParent,
const PropertiesMap&revProps
- ) throw (ClientException)
+ )
{
if (srcPaths.size()<1)
{
@@ -351,7 +351,7 @@ namespace svn
Revision
Client_impl::copy (const Path & srcPath,
const Revision & srcRevision,
- const Path & destPath) throw (ClientException)
+ const Path & destPath)
{
#if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1)
return copy(srcPath,srcRevision,srcRevision,destPath,true,false);
@@ -379,7 +379,7 @@ namespace svn
svn::Revision Client_impl::move (const Path & srcPath,
const Path & destPath,
- bool force) throw (ClientException)
+ bool force)
{
#if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1)
@@ -416,7 +416,7 @@ namespace svn
bool force,
bool asChild,
bool makeParent,
- const PropertiesMap&revProps) throw (ClientException)
+ const PropertiesMap&revProps)
{
#if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1)
Pool pool;
@@ -467,7 +467,7 @@ namespace svn
const TQString& message,
bool makeParent,
const PropertiesMap&revProps
- ) throw (ClientException)
+ )
{
Targets targets(path.path());
return mkdir(targets,message,makeParent,revProps);
@@ -478,7 +478,7 @@ namespace svn
const TQString&msg,
bool makeParent,
const PropertiesMap&revProps
- ) throw (ClientException)
+ )
{
Pool pool;
m_context->setLogMessage(msg);
@@ -515,7 +515,7 @@ namespace svn
}
void
- Client_impl::cleanup (const Path & path) throw (ClientException)
+ Client_impl::cleanup (const Path & path)
{
Pool subPool;
apr_pool_t * apr_pool = subPool.pool ();
@@ -527,7 +527,7 @@ namespace svn
throw ClientException (error);
}
- void Client_impl::resolve(const Path & path,Depth depth,const ConflictResult&resolution) throw (ClientException)
+ void Client_impl::resolve(const Path & path,Depth depth,const ConflictResult&resolution)
{
Pool pool;
#if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1)
@@ -556,7 +556,7 @@ namespace svn
bool overwrite,
const TQString&native_eol,
bool ignore_externals,
- svn::Depth depth) throw (ClientException)
+ svn::Depth depth)
{
Pool pool;
svn_revnum_t revnum = 0;
@@ -608,7 +608,7 @@ namespace svn
bool sticky_depth,
bool ignore_externals,
bool allow_unversioned
- ) throw (ClientException)
+ )
{
Pool pool;
svn_revnum_t revnum = 0;
@@ -655,7 +655,7 @@ namespace svn
svn::Depth depth,
bool no_ignore,bool no_unknown_nodetype,
const PropertiesMap&revProps
- ) throw (ClientException)
+ )
{
svn_commit_info_t *commit_info = NULL;
@@ -698,7 +698,7 @@ namespace svn
Client_impl::relocate (const Path & path,
const TQString& from_url,
const TQString& to_url,
- bool recurse) throw (ClientException)
+ bool recurse)
{
Pool pool;
svn_error_t * error =
@@ -714,9 +714,3 @@ namespace svn
}
}
-
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/client_property.cpp b/src/svnqt/client_property.cpp
index 172a453..e217e2f 100644
--- a/src/svnqt/client_property.cpp
+++ b/src/svnqt/client_property.cpp
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -31,19 +31,19 @@
#pragma warning( disable: 4786 )// debug symbol truncated
#endif
// svncpp
-#include "svnqt/client_impl.hpp"
+#include "svnqt/client_impl.h"
// subversion api
#include "svn_client.h"
//#include "svn_utf.h"
-#include "svnqt/path.hpp"
-#include "svnqt/exception.hpp"
-#include "svnqt/pool.hpp"
-#include "svnqt/revision.hpp"
-#include "svnqt/svnqt_defines.hpp"
+#include "svnqt/path.h"
+#include "svnqt/exception.h"
+#include "svnqt/pool.h"
+#include "svnqt/revision.h"
+#include "svnqt/svnqt_defines.h"
-#include "svnqt/helper.hpp"
+#include "svnqt/helper.h"
namespace svn
@@ -442,9 +442,3 @@ namespace svn
}
}
-
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/client_status.cpp b/src/svnqt/client_status.cpp
index 4b437a3..7460745 100644
--- a/src/svnqt/client_status.cpp
+++ b/src/svnqt/client_status.cpp
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2008 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -33,23 +33,23 @@
// svncpp
-#include "svnqt/client_impl.hpp"
-#include "svnqt/helper.hpp"
+#include "svnqt/client_impl.h"
+#include "svnqt/helper.h"
// Subversion api
#include "svn_client.h"
#include "svn_path.h"
//#include "svn_utf.h"
-#include "svnqt/dirent.hpp"
-#include "svnqt/exception.hpp"
-#include "svnqt/pool.hpp"
-#include "svnqt/status.hpp"
-#include "svnqt/targets.hpp"
-#include "svnqt/info_entry.hpp"
-#include "svnqt/url.hpp"
-#include "svnqt/svnqt_defines.hpp"
-#include "svnqt/context_listener.hpp"
+#include "svnqt/dirent.h"
+#include "svnqt/exception.h"
+#include "svnqt/pool.h"
+#include "svnqt/status.h"
+#include "svnqt/targets.h"
+#include "svnqt/info_entry.h"
+#include "svnqt/url.h"
+#include "svnqt/svnqt_defines.h"
+#include "svnqt/context_listener.h"
namespace svn
{
@@ -398,7 +398,7 @@ namespace svn
const Revision revision,
bool detailed_remote,
const bool hide_externals,
- const StringArray & changelists) throw (ClientException)
+ const StringArray & changelists)
{
if (Url::isValid (path.path())) {
return remoteStatus (this, path, depth, get_all, update,
@@ -483,7 +483,7 @@ namespace svn
}
StatusPtr
- Client_impl::singleStatus (const Path& path,bool update,const Revision revision) throw (ClientException)
+ Client_impl::singleStatus (const Path& path,bool update,const Revision revision)
{
if (Url::isValid (path.path()))
return remoteSingleStatus (this, path,revision, m_context);
@@ -500,7 +500,7 @@ namespace svn
bool strictNodeHistory,int limit,
bool include_merged_revisions,
const StringArray&revprops
- ) throw (ClientException)
+ )
{
Targets target(path);
Pool pool;
@@ -573,7 +573,7 @@ namespace svn
bool strictNodeHistory,int limit,
bool include_merged_revisions,
const StringArray&revprops
- ) throw (ClientException)
+ )
{
Targets target(path);
Pool pool;
@@ -647,7 +647,7 @@ namespace svn
const Revision & rev,
const Revision & peg_revision,
const StringArray&changelists
- ) throw (ClientException)
+ )
{
InfoEntries ientries;
@@ -727,9 +727,3 @@ namespace svn
}
}
-
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/cmakemodules/FindSqlite.cmake b/src/svnqt/cmakemodules/FindSqlite.cmake
index 3c50d33..29e624a 100644
--- a/src/svnqt/cmakemodules/FindSqlite.cmake
+++ b/src/svnqt/cmakemodules/FindSqlite.cmake
@@ -21,9 +21,9 @@ ELSE (SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES)
ENDIF (SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES)
IF (SQLITE_FOUND)
- MESSAGE(STATUS "Found sqlite3: ${SQLITE_LIBRARIES}")
+ message(STATUS "Found sqlite3: ${SQLITE_LIBRARIES}")
ELSE (SQLITE_FOUND)
- MESSAGE(STATUS "Could not find sqlite3")
+ message(STATUS "Could not find sqlite3")
ADD_DEFINITIONS(-DNO_SQLITE3)
ENDIF (SQLITE_FOUND)
diff --git a/src/svnqt/cmakemodules/FindSubversion.cmake b/src/svnqt/cmakemodules/FindSubversion.cmake
index 358ee3a..cc9f168 100644
--- a/src/svnqt/cmakemodules/FindSubversion.cmake
+++ b/src/svnqt/cmakemodules/FindSubversion.cmake
@@ -51,11 +51,11 @@ IF (UNIX)
)
if(NOT APR_CONFIG)
- MESSAGE(SEND_ERROR "Error: no apr-config found")
+ message(SEND_ERROR "Error: no apr-config found")
endif(NOT APR_CONFIG)
if(NOT APU_CONFIG)
- MESSAGE(SEND_ERROR "Error: no apu-config found")
+ message(SEND_ERROR "Error: no apu-config found")
endif(NOT APU_CONFIG)
EXEC_PROGRAM(${APR_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APR_INCLUDE_DIR)
@@ -186,107 +186,107 @@ IF (WIN32)
# check found libraries
if (NOT APR_LIB)
- MESSAGE(SEND_ERROR "No apr lib found!")
+ message(SEND_ERROR "No apr lib found!")
ELSE (NOT APR_LIB)
- MESSAGE(STATUS "Found apr lib: ${APR_LIB}")
+ message(STATUS "Found apr lib: ${APR_LIB}")
SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APR_LIB})
endif(NOT APR_LIB)
if (NOT APRICONV_LIB)
- MESSAGE(SEND_ERROR "No apriconv lib found!")
+ message(SEND_ERROR "No apriconv lib found!")
ELSE (NOT APRICONV_LIB)
- MESSAGE(STATUS "Found apriconv lib: ${APRICONV_LIB}")
+ message(STATUS "Found apriconv lib: ${APRICONV_LIB}")
SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APRICONV_LIB})
endif(NOT APRICONV_LIB)
if (NOT APU_LIB)
- MESSAGE(SEND_ERROR "No aprutil lib found!")
+ message(SEND_ERROR "No aprutil lib found!")
ELSE (NOT APU_LIB)
- MESSAGE(STATUS "Found aprutil lib: ${APU_LIB}")
+ message(STATUS "Found aprutil lib: ${APU_LIB}")
SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_LIB})
endif(NOT APU_LIB)
if (NOT APU_XMLLIB)
- MESSAGE(SEND_ERROR "No xml lib found!")
+ message(SEND_ERROR "No xml lib found!")
ELSE (NOT APU_XMLLIB)
- MESSAGE(STATUS "Found xml lib: ${APU_XMLLIB}")
+ message(STATUS "Found xml lib: ${APU_XMLLIB}")
SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_XMLLIB})
endif(NOT APU_XMLLIB)
if (NOT NEON_LIB)
- MESSAGE(SEND_ERROR "No neon lib found!")
+ message(SEND_ERROR "No neon lib found!")
ELSE (NOT NEON_LIB)
- MESSAGE(STATUS "Found neon lib: ${NEON_LIB}")
+ message(STATUS "Found neon lib: ${NEON_LIB}")
SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${NEON_LIB})
endif(NOT NEON_LIB)
if (NOT NEON_ZLIBSTATLIB)
- MESSAGE(SEND_ERROR "No zlibstat lib found!")
+ message(SEND_ERROR "No zlibstat lib found!")
ELSE (NOT APRICONV_LIB)
- MESSAGE(STATUS "Found zlibstat lib: ${NEON_ZLIBSTATLIB}")
+ message(STATUS "Found zlibstat lib: ${NEON_ZLIBSTATLIB}")
SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${NEON_ZLIBSTATLIB})
endif(NOT NEON_ZLIBSTATLIB)
if (NOT INTL3LIB)
- MESSAGE(SEND_ERROR "No intl3 lib found!")
+ message(SEND_ERROR "No intl3 lib found!")
ELSE (NOT INTL3LIB)
- MESSAGE(STATUS "Found intl3 lib: ${INTL3LIB}")
+ message(STATUS "Found intl3 lib: ${INTL3LIB}")
SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${INTL3LIB})
endif(NOT INTL3LIB)
if (NOT DB44_LIB)
- MESSAGE(SEND_ERROR "No db44 lib found!")
+ message(SEND_ERROR "No db44 lib found!")
ELSE (NOT DB44_LIB)
- MESSAGE(STATUS "Found db44 lib: ${DB44_LIB}")
+ message(STATUS "Found db44 lib: ${DB44_LIB}")
SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${DB44_LIB})
endif(NOT DB44_LIB)
if (NOT SUBVERSION_DELTALIB)
- MESSAGE(SEND_ERROR "No subversion delta lib found!")
+ message(SEND_ERROR "No subversion delta lib found!")
ELSE (NOT SUBVERSION_DELTALIB)
- MESSAGE(STATUS "Found subversion delta lib: ${SUBVERSION_DELTALIB}")
+ message(STATUS "Found subversion delta lib: ${SUBVERSION_DELTALIB}")
SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_DELTALIB})
endif(NOT SUBVERSION_DELTALIB)
if (NOT SUBVERSION_FSBASELIB)
- MESSAGE(SEND_ERROR "No subversion fs base lib found!")
+ message(SEND_ERROR "No subversion fs base lib found!")
ELSE (NOT SUBVERSION_FSBASELIB)
- MESSAGE(STATUS "Found subversion fs base lib: ${SUBVERSION_FSBASELIB}")
+ message(STATUS "Found subversion fs base lib: ${SUBVERSION_FSBASELIB}")
SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_FSBASELIB})
endif(NOT SUBVERSION_FSBASELIB)
if (NOT SUBVERSION_FSFSLIB)
- MESSAGE(SEND_ERROR "No subversion fs fs lib found!")
+ message(SEND_ERROR "No subversion fs fs lib found!")
ELSE (NOT SUBVERSION_FSFSLIB)
- MESSAGE(STATUS "Found subversion fs fs lib: ${SUBVERSION_FSFSLIB}")
+ message(STATUS "Found subversion fs fs lib: ${SUBVERSION_FSFSLIB}")
SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_FSFSLIB})
endif(NOT SUBVERSION_FSFSLIB)
if (NOT SUBVERSION_FSUTILLIB)
- MESSAGE(SEND_ERROR "No subversion fs util lib found!")
+ message(SEND_ERROR "No subversion fs util lib found!")
ELSE (NOT SUBVERSION_FSUTILLIB)
- MESSAGE(STATUS "Found subversion fs util lib: ${SUBVERSION_FSUTILLIB}")
+ message(STATUS "Found subversion fs util lib: ${SUBVERSION_FSUTILLIB}")
SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_FSUTILLIB})
endif(NOT SUBVERSION_FSUTILLIB)
if (NOT SUBVERSION_RALOCALLIB)
- MESSAGE(SEND_ERROR "No subversion ra local lib found!")
+ message(SEND_ERROR "No subversion ra local lib found!")
ELSE (NOT SUBVERSION_RALOCALLIB)
- MESSAGE(STATUS "Found subversion ra local lib: ${SUBVERSION_RALOCALLIB}")
+ message(STATUS "Found subversion ra local lib: ${SUBVERSION_RALOCALLIB}")
SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_RALOCALLIB})
endif(NOT SUBVERSION_RALOCALLIB)
if (NOT SUBVERSION_RANEONLIB)
- MESSAGE(SEND_ERROR "No subversion ra neon lib found!")
+ message(SEND_ERROR "No subversion ra neon lib found!")
ELSE (NOT SUBVERSION_RANEONLIB)
- MESSAGE(STATUS "Found subversion ra neon lib: ${SUBVERSION_RANEONLIB}")
+ message(STATUS "Found subversion ra neon lib: ${SUBVERSION_RANEONLIB}")
SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_RANEONLIB})
endif(NOT SUBVERSION_RANEONLIB)
if (NOT SUBVERSION_RASVNLIB)
- MESSAGE(SEND_ERROR "No subversion ra svn lib found!")
+ message(SEND_ERROR "No subversion ra svn lib found!")
ELSE (NOT SUBVERSION_RASVNLIB)
- MESSAGE(STATUS "Found subversion ra svn lib: ${SUBVERSION_RASVNLIB}")
+ message(STATUS "Found subversion ra svn lib: ${SUBVERSION_RASVNLIB}")
SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_RASVNLIB})
endif(NOT SUBVERSION_RASVNLIB)
@@ -294,57 +294,57 @@ ENDIF (WIN32)
IF(NOT SUBVERSION_INCLUDE_DIR)
- MESSAGE(SEND_ERROR "No subversion includes found!")
+ message(SEND_ERROR "No subversion includes found!")
ELSE(NOT SUBVERSION_INCLUDE_DIR)
- MESSAGE(STATUS "Found subversion include: ${SUBVERSION_INCLUDE_DIR}")
+ message(STATUS "Found subversion include: ${SUBVERSION_INCLUDE_DIR}")
ENDIF(NOT SUBVERSION_INCLUDE_DIR)
if (NOT SUBVERSION_CLIENTLIB)
- MESSAGE(SEND_ERROR "No subversion client libs found!")
+ message(SEND_ERROR "No subversion client libs found!")
ELSE (NOT SUBVERSION_CLIENTLIB)
- MESSAGE(STATUS "Found subversion client lib: ${SUBVERSION_CLIENTLIB}")
+ message(STATUS "Found subversion client lib: ${SUBVERSION_CLIENTLIB}")
SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_CLIENTLIB})
endif(NOT SUBVERSION_CLIENTLIB)
if (NOT SUBVERSION_DIFFLIB)
- MESSAGE(SEND_ERROR "No subversion diff lib found!")
+ message(SEND_ERROR "No subversion diff lib found!")
ELSE (NOT SUBVERSION_DIFFLIB)
- MESSAGE(STATUS "Found subversion diff lib: ${SUBVERSION_DIFFLIB}")
+ message(STATUS "Found subversion diff lib: ${SUBVERSION_DIFFLIB}")
SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_DIFFLIB})
endif(NOT SUBVERSION_DIFFLIB)
if (NOT SUBVERSION_FSLIB)
- MESSAGE(SEND_ERROR "No subversion fs lib found!")
+ message(SEND_ERROR "No subversion fs lib found!")
ELSE (NOT SUBVERSION_FSLIB)
- MESSAGE(STATUS "Found subversion fs lib: ${SUBVERSION_FSLIB}")
+ message(STATUS "Found subversion fs lib: ${SUBVERSION_FSLIB}")
SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_FSLIB})
endif(NOT SUBVERSION_FSLIB)
if (NOT SUBVERSION_RALIB)
- MESSAGE(SEND_ERROR "No subversion ra lib found!")
+ message(SEND_ERROR "No subversion ra lib found!")
ELSE (NOT SUBVERSION_RALIB)
- MESSAGE(STATUS "Found subversion ra lib: ${SUBVERSION_RALIB}")
+ message(STATUS "Found subversion ra lib: ${SUBVERSION_RALIB}")
SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_RALIB})
endif(NOT SUBVERSION_RALIB)
if (NOT SUBVERSION_REPOSITORYLIB)
- MESSAGE(SEND_ERROR "No subversion repository lib found!")
+ message(SEND_ERROR "No subversion repository lib found!")
ELSE (NOT SUBVERSION_REPOSITORYLIB)
- MESSAGE(STATUS "Found subversion repository lib: ${SUBVERSION_REPOSITORYLIB}")
+ message(STATUS "Found subversion repository lib: ${SUBVERSION_REPOSITORYLIB}")
SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_REPOSITORYLIB})
endif(NOT SUBVERSION_REPOSITORYLIB)
if (NOT SUBVERSION_SUBRLIB)
- MESSAGE(SEND_ERROR "No subversion subr lib found!")
+ message(SEND_ERROR "No subversion subr lib found!")
ELSE (NOT SUBVERSION_SUBRLIB)
- MESSAGE(STATUS "Found subversion subr lib: ${SUBVERSION_SUBRLIB}")
+ message(STATUS "Found subversion subr lib: ${SUBVERSION_SUBRLIB}")
SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_SUBRLIB})
endif(NOT SUBVERSION_SUBRLIB)
if (NOT SUBVERSION_WCLIB)
- MESSAGE(SEND_ERROR "No subversion wc lib found!")
+ message(SEND_ERROR "No subversion wc lib found!")
ELSE (NOT SUBVERSION_WCLIB)
- MESSAGE(STATUS "Found subversion wc lib: ${SUBVERSION_WCLIB}")
+ message(STATUS "Found subversion wc lib: ${SUBVERSION_WCLIB}")
SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${SUBVERSION_WCLIB})
endif(NOT SUBVERSION_WCLIB)
diff --git a/src/svnqt/commititem.cpp b/src/svnqt/commititem.cpp
index e39a2c4..8f9a5d6 100644
--- a/src/svnqt/commititem.cpp
+++ b/src/svnqt/commititem.cpp
@@ -17,7 +17,7 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include "commititem.hpp"
+#include "commititem.h"
#include <svn_client.h>
#include <svn_props.h>
diff --git a/src/svnqt/commititem.hpp b/src/svnqt/commititem.h
index 5951e6f..3b65df5 100644
--- a/src/svnqt/commititem.hpp
+++ b/src/svnqt/commititem.h
@@ -20,7 +20,7 @@
#ifndef SVNCOMMITITEM_H
#define SVNCOMMITITEM_H
-#include "client.hpp"
+#include "client.h"
#include <svn_types.h>
#include <apr.h>
diff --git a/src/svnqt/conflictdescription.cpp b/src/svnqt/conflictdescription.cpp
index 2ccaf38..1dc4e5d 100644
--- a/src/svnqt/conflictdescription.cpp
+++ b/src/svnqt/conflictdescription.cpp
@@ -17,8 +17,8 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include "conflictdescription.hpp"
-#include "svnqt_defines.hpp"
+#include "conflictdescription.h"
+#include "svnqt_defines.h"
#include <svn_wc.h>
diff --git a/src/svnqt/conflictdescription.hpp b/src/svnqt/conflictdescription.h
index f7e0ea7..1944827 100644
--- a/src/svnqt/conflictdescription.hpp
+++ b/src/svnqt/conflictdescription.h
@@ -22,8 +22,8 @@
struct svn_wc_conflict_description_t;
-#include "svnqt/pool.hpp"
-#include "svnqt/svnqt_defines.hpp"
+#include "svnqt/pool.h"
+#include "svnqt/svnqt_defines.h"
#include <svn_types.h>
#include <tqstring.h>
diff --git a/src/svnqt/conflictresult.cpp b/src/svnqt/conflictresult.cpp
index 798ebf6..f65bec2 100644
--- a/src/svnqt/conflictresult.cpp
+++ b/src/svnqt/conflictresult.cpp
@@ -18,9 +18,9 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include "conflictresult.hpp"
+#include "conflictresult.h"
-#include "svnqt_defines.hpp"
+#include "svnqt_defines.h"
#include <svn_wc.h>
diff --git a/src/svnqt/conflictresult.hpp b/src/svnqt/conflictresult.h
index 917b79a..50222a2 100644
--- a/src/svnqt/conflictresult.hpp
+++ b/src/svnqt/conflictresult.h
@@ -23,8 +23,8 @@
struct svn_wc_conflict_result_t;
-#include "svnqt/pool.hpp"
-#include "svnqt/svnqt_defines.hpp"
+#include "svnqt/pool.h"
+#include "svnqt/svnqt_defines.h"
#include <svn_types.h>
#include <tqstring.h>
diff --git a/src/svnqt/context.cpp b/src/svnqt/context.cpp
index 7c993ca..5ff7dea 100644
--- a/src/svnqt/context.cpp
+++ b/src/svnqt/context.cpp
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -38,10 +38,10 @@
//#include "svn_utf.h"
// svncpp
-#include "apr.hpp"
-#include "context.hpp"
-#include "context_listener.hpp"
-#include "contextdata.hpp"
+#include "apr.h"
+#include "context.h"
+#include "context_listener.h"
+#include "contextdata.h"
namespace svn
{
@@ -128,9 +128,3 @@ namespace svn
m->reset();
}
}
-
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/context.hpp b/src/svnqt/context.h
index 6bb4ad0..00b9aa4 100644
--- a/src/svnqt/context.hpp
+++ b/src/svnqt/context.h
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -31,17 +31,17 @@
#ifndef _SVNCPP_CONTEXT_HPP_
#define _SVNCPP_CONTEXT_HPP_
-#include "svnqt/svnqt_defines.hpp"
+#include "svnqt/svnqt_defines.h"
-// qt
+// tqt
#include <tqstring.h>
// Subversion api
#include "svn_client.h"
// svncpp
-#include "svnqt/pool.hpp"
-#include "svnqt/smart_pointer.hpp"
+#include "svnqt/pool.h"
+#include "svnqt/smart_pointer.h"
namespace svn
@@ -169,8 +169,3 @@ namespace svn
}
#endif
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/context_listener.hpp b/src/svnqt/context_listener.h
index df94c42..b2b42fe 100644
--- a/src/svnqt/context_listener.hpp
+++ b/src/svnqt/context_listener.h
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -32,10 +32,10 @@
#define _SVNCPP_CONTEXT_LISTENER_HPP_
// svncpp
-#include "pool.hpp"
-#include "commititem.hpp"
-#include "svnqt_defines.hpp"
-// qt
+#include "pool.h"
+#include "commititem.h"
+#include "svnqt_defines.h"
+// tqt
#include <tqstring.h>
// Subversion api
#include <svn_client.h>
@@ -264,8 +264,3 @@ namespace svn
}
#endif
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/contextdata.cpp b/src/svnqt/contextdata.cpp
index 59d724a..b670598 100644
--- a/src/svnqt/contextdata.cpp
+++ b/src/svnqt/contextdata.cpp
@@ -19,10 +19,10 @@
***************************************************************************/
-#include "contextdata.hpp"
-#include "context_listener.hpp"
-#include "conflictresult.hpp"
-#include "conflictdescription.hpp"
+#include "contextdata.h"
+#include "context_listener.h"
+#include "conflictresult.h"
+#include "conflictdescription.h"
#include <svn_config.h>
#include <svn_wc.h>
diff --git a/src/svnqt/contextdata.hpp b/src/svnqt/contextdata.h
index e38c6f2..6d41326 100644
--- a/src/svnqt/contextdata.hpp
+++ b/src/svnqt/contextdata.h
@@ -20,10 +20,10 @@
#ifndef SVNCONTEXTDATA_HPP
#define SVNCONTEXTDATA_HPP
-#include "svnqt/pool.hpp"
-#include "svnqt/apr.hpp"
-#include "svnqt/commititem.hpp"
-#include "svnqt/svnqt_defines.hpp"
+#include "svnqt/pool.h"
+#include "svnqt/apr.h"
+#include "svnqt/commititem.h"
+#include "svnqt/svnqt_defines.h"
#include <svn_client.h>
#if (SVN_VER_MAJOR >= 1) && (SVN_VER_MINOR >= 4)
diff --git a/src/svnqt/datetime.cpp b/src/svnqt/datetime.cpp
index 51625b3..ad212e0 100644
--- a/src/svnqt/datetime.cpp
+++ b/src/svnqt/datetime.cpp
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -32,7 +32,7 @@
#include "apr_date.h"
// svncpp
-#include "datetime.hpp"
+#include "datetime.h"
namespace svn
@@ -140,8 +140,8 @@ namespace svn
void DateTime::setAprTime(apr_time_t aTime)
{
- if (aTime<0)m_time.setTime_t(0,Qt::LocalTime);
- else m_time.setTime_t(aTime/(1000*1000),Qt::LocalTime);
+ if (aTime<0)m_time.setTime_t(0,TQt::LocalTime);
+ else m_time.setTime_t(aTime/(1000*1000),TQt::LocalTime);
}
TQString DateTime::toString(const TQString&format)const
diff --git a/src/svnqt/datetime.hpp b/src/svnqt/datetime.h
index f3a9236..13f4d29 100644
--- a/src/svnqt/datetime.hpp
+++ b/src/svnqt/datetime.h
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -31,7 +31,7 @@
#ifndef _SVNCPP_DATETIME_HPP_
#define _SVNCPP_DATETIME_HPP_
-#include "svnqt/svnqt_defines.hpp"
+#include "svnqt/svnqt_defines.h"
#include <tqdatetime.h>
@@ -159,8 +159,3 @@ namespace svn
}
#endif
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/diff_data.cpp b/src/svnqt/diff_data.cpp
index 756e771..0559a8e 100644
--- a/src/svnqt/diff_data.cpp
+++ b/src/svnqt/diff_data.cpp
@@ -17,9 +17,9 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include "diff_data.hpp"
-#include "svnqt/svnqt_defines.hpp"
-#include "svnqt/exception.hpp"
+#include "diff_data.h"
+#include "svnqt/svnqt_defines.h"
+#include "svnqt/exception.h"
#include <tqfile.h>
diff --git a/src/svnqt/diff_data.hpp b/src/svnqt/diff_data.h
index 92664b7..e0eb757 100644
--- a/src/svnqt/diff_data.hpp
+++ b/src/svnqt/diff_data.h
@@ -21,10 +21,10 @@
#ifndef __DIFF_DATA
#define __DIFF_DATA
-#include "svnqt/svnqt_defines.hpp"
-#include "svnqt/pool.hpp"
-#include "path.hpp"
-#include "revision.hpp"
+#include "svnqt/svnqt_defines.h"
+#include "svnqt/pool.h"
+#include "path.h"
+#include "revision.h"
#include <tqglobal.h>
diff --git a/src/svnqt/diffoptions.cpp b/src/svnqt/diffoptions.cpp
index 68681d9..499ff22 100644
--- a/src/svnqt/diffoptions.cpp
+++ b/src/svnqt/diffoptions.cpp
@@ -18,9 +18,9 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include "diffoptions.hpp"
-#include "stringarray.hpp"
-#include "pool.hpp"
+#include "diffoptions.h"
+#include "stringarray.h"
+#include "pool.h"
#include <svn_diff.h>
diff --git a/src/svnqt/diffoptions.hpp b/src/svnqt/diffoptions.h
index 17e9a98..fc72461 100644
--- a/src/svnqt/diffoptions.hpp
+++ b/src/svnqt/diffoptions.h
@@ -21,7 +21,7 @@
#ifndef _DIFF_OPTIONS_HPP
#define _DIFF_OPTIONS_HPP
-#include "svnqt/svnqt_defines.hpp"
+#include "svnqt/svnqt_defines.h"
namespace svn {
class Pool;
diff --git a/src/svnqt/dirent.cpp b/src/svnqt/dirent.cpp
index 9015d13..19316f8 100644
--- a/src/svnqt/dirent.cpp
+++ b/src/svnqt/dirent.cpp
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -29,9 +29,9 @@
*/
// svncpp
-#include "svnqt/dirent.hpp"
-#include "svnqt/lock_entry.hpp"
-#include "svnqt/svnqt_defines.hpp"
+#include "svnqt/dirent.h"
+#include "svnqt/lock_entry.h"
+#include "svnqt/svnqt_defines.h"
#include <tqstring.h>
@@ -178,9 +178,3 @@ namespace svn
return *this;
}
}
-
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/dirent.hpp b/src/svnqt/dirent.h
index 111b62e..e76fb8a 100644
--- a/src/svnqt/dirent.hpp
+++ b/src/svnqt/dirent.h
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -31,9 +31,9 @@
#ifndef _SVNCPP_DIRENT_HPP_
#define _SVNCPP_DIRENT_HPP_
-#include "svnqt/svnqt_defines.hpp"
-#include "svnqt/lock_entry.hpp"
-#include "svnqt/datetime.hpp"
+#include "svnqt/svnqt_defines.h"
+#include "svnqt/lock_entry.h"
+#include "svnqt/datetime.h"
// subversion api
#include "svn_client.h"
@@ -124,8 +124,3 @@ namespace svn
}
#endif
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/entry.cpp b/src/svnqt/entry.cpp
index 67090dc..ae29781 100644
--- a/src/svnqt/entry.cpp
+++ b/src/svnqt/entry.cpp
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -29,7 +29,7 @@
*/
// svncpp
-#include "entry.hpp"
+#include "entry.h"
namespace svn
{
diff --git a/src/svnqt/entry.hpp b/src/svnqt/entry.h
index b04fdc3..ac0be46 100644
--- a/src/svnqt/entry.hpp
+++ b/src/svnqt/entry.h
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -31,12 +31,12 @@
#define _SVNCPP_ENTRY_HPP_
// svncpp
-#include "svnqt/pool.hpp"
-#include "svnqt/lock_entry.hpp"
-#include "svnqt/dirent.hpp"
-#include "svnqt/info_entry.hpp"
-#include "svnqt/svnqt_defines.hpp"
-#include "svnqt/svnqttypes.hpp"
+#include "svnqt/pool.h"
+#include "svnqt/lock_entry.h"
+#include "svnqt/dirent.h"
+#include "svnqt/info_entry.h"
+#include "svnqt/svnqt_defines.h"
+#include "svnqt/svnqttypes.h"
// subversion api
#include "svn_wc.h"
@@ -238,8 +238,3 @@ namespace svn
}
#endif
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/exception.cpp b/src/svnqt/exception.cpp
index 925c5f5..203f4f0 100644
--- a/src/svnqt/exception.cpp
+++ b/src/svnqt/exception.cpp
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -30,8 +30,8 @@
// svncpp
-#include "exception.hpp"
-#include "svnqt/svnqt_defines.hpp"
+#include "exception.h"
+#include "svnqt/svnqt_defines.h"
#include <tqstring.h>
@@ -217,8 +217,3 @@ namespace svn
}
}
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/exception.hpp b/src/svnqt/exception.h
index f01ff85..ab255a0 100644
--- a/src/svnqt/exception.hpp
+++ b/src/svnqt/exception.h
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -31,7 +31,7 @@
#ifndef _SVNCPP_EXCEPTION_H_
#define _SVNCPP_EXCEPTION_H_
-#include "svnqt/svnqt_defines.hpp"
+#include "svnqt/svnqt_defines.h"
// subversion api
#include "svn_client.h"
#include <tqstring.h>
@@ -131,8 +131,3 @@ namespace svn
}
#endif
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/helper.hpp b/src/svnqt/helper.h
index fca54d1..440fed3 100644
--- a/src/svnqt/helper.hpp
+++ b/src/svnqt/helper.h
@@ -21,8 +21,8 @@
#ifndef __HELPER_HPP
#define __HELPER_HPP
-#include "svnqttypes.hpp"
-#include "revision.hpp"
+#include "svnqttypes.h"
+#include "revision.h"
#include <svn_types.h>
#include <iostream>
diff --git a/src/svnqt/info_entry.cpp b/src/svnqt/info_entry.cpp
index 6f76735..574d39f 100644
--- a/src/svnqt/info_entry.cpp
+++ b/src/svnqt/info_entry.cpp
@@ -17,9 +17,9 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include "svnqt/info_entry.hpp"
-#include "svnqt/svnqt_defines.hpp"
-#include "svnqt/pool.hpp"
+#include "svnqt/info_entry.h"
+#include "svnqt/svnqt_defines.h"
+#include "svnqt/pool.h"
#include <svn_client.h>
#include <svn_path.h>
diff --git a/src/svnqt/info_entry.hpp b/src/svnqt/info_entry.h
index be86639..4ac06d0 100644
--- a/src/svnqt/info_entry.hpp
+++ b/src/svnqt/info_entry.h
@@ -20,10 +20,10 @@
#ifndef __INFO_ENTRY_H
#define __INFO_ENTRY_H
-#include <svnqt/lock_entry.hpp>
-#include <svnqt/datetime.hpp>
-#include <svnqt/revision.hpp>
-#include <svnqt/svnqttypes.hpp>
+#include <svnqt/lock_entry.h>
+#include <svnqt/datetime.h>
+#include <svnqt/revision.h>
+#include <svnqt/svnqttypes.h>
#include <tqstring.h>
diff --git a/src/svnqt/lock_entry.cpp b/src/svnqt/lock_entry.cpp
index 1ddb360..6b438dc 100644
--- a/src/svnqt/lock_entry.cpp
+++ b/src/svnqt/lock_entry.cpp
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -29,8 +29,8 @@
*/
// svncpp
-#include "lock_entry.hpp"
-#include "pool.hpp"
+#include "lock_entry.h"
+#include "pool.h"
// subversion api
#include "svn_time.h"
@@ -133,9 +133,3 @@ namespace svn
comment = lock_comment?TQString::FROMUTF8(lock_comment):"";
}
}
-
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/lock_entry.hpp b/src/svnqt/lock_entry.h
index 50eb3ef..d6f1162 100644
--- a/src/svnqt/lock_entry.hpp
+++ b/src/svnqt/lock_entry.h
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -31,8 +31,8 @@
#ifndef _SVNCPP_LOCK_ENTRY_H_
#define _SVNCPP_LOCK_ENTRY_H_
-#include "svnqt/svnqt_defines.hpp"
-#include "svnqt/datetime.hpp"
+#include "svnqt/svnqt_defines.h"
+#include "svnqt/datetime.h"
#include <tqstring.h>
@@ -82,9 +82,3 @@ namespace svn
}
#endif
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
-
diff --git a/src/svnqt/log_entry.cpp b/src/svnqt/log_entry.cpp
index 720642d..69d3b12 100644
--- a/src/svnqt/log_entry.cpp
+++ b/src/svnqt/log_entry.cpp
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -28,8 +28,8 @@
* ====================================================================
*/
// svncpp
-#include "log_entry.hpp"
-#include "pool.hpp"
+#include "log_entry.h"
+#include "pool.h"
// subversion api
#include "svn_time.h"
diff --git a/src/svnqt/log_entry.hpp b/src/svnqt/log_entry.h
index ebd4350..f7de2c2 100644
--- a/src/svnqt/log_entry.hpp
+++ b/src/svnqt/log_entry.h
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -31,8 +31,8 @@
#ifndef _SVNCPP_LOG_ENTRY_H_
#define _SVNCPP_LOG_ENTRY_H_
-#include "svnqt/svnqt_defines.hpp"
-#include "svnqt/datetime.hpp"
+#include "svnqt/svnqt_defines.h"
+#include "svnqt/datetime.h"
//TQt
#include <tqglobal.h>
@@ -118,8 +118,3 @@ SVNTQT_EXPORT TQDataStream &operator>>(TQDataStream&s,svn::LogEntry&r);
SVNTQT_EXPORT TQDataStream &operator>>(TQDataStream&s,svn::LogChangePathEntry&r);
#endif
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/path.cpp b/src/svnqt/path.cpp
index ae94789..0a09bd6 100644
--- a/src/svnqt/path.cpp
+++ b/src/svnqt/path.cpp
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -36,12 +36,12 @@
#include "apr_file_io.h"
// svncpp
-#include "svnqt/path.hpp"
-#include "svnqt/pool.hpp"
-#include "svnqt/url.hpp"
-#include "svnqt/svnqt_defines.hpp"
-#include "svnqt/revision.hpp"
-#include "svnqt/exception.hpp"
+#include "svnqt/path.h"
+#include "svnqt/pool.h"
+#include "svnqt/url.h"
+#include "svnqt/svnqt_defines.h"
+#include "svnqt/revision.h"
+#include "svnqt/exception.h"
#include <tqurl.h>
@@ -270,9 +270,3 @@ namespace svn
}
}
-
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/path.hpp b/src/svnqt/path.h
index 1ad5071..d06fa77 100644
--- a/src/svnqt/path.hpp
+++ b/src/svnqt/path.h
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -32,8 +32,8 @@
#define _SVNCPP_PATH_HPP_
#include <tqstring.h>
-#include "svnqt/svnqt_defines.hpp"
-#include "svnqt/svnqttypes.hpp"
+#include "svnqt/svnqt_defines.h"
+#include "svnqt/svnqttypes.h"
namespace svn
{
@@ -193,8 +193,3 @@ namespace svn
}
#endif
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/pool.cpp b/src/svnqt/pool.cpp
index d564909..ae876ec 100644
--- a/src/svnqt/pool.cpp
+++ b/src/svnqt/pool.cpp
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -29,7 +29,7 @@
*/
// svncpp
-#include "pool.hpp"
+#include "pool.h"
namespace svn
@@ -86,9 +86,3 @@ namespace svn
// return *this;
// }
}
-
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/pool.hpp b/src/svnqt/pool.h
index ffea1ca..a2879c8 100644
--- a/src/svnqt/pool.hpp
+++ b/src/svnqt/pool.h
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -84,9 +84,3 @@ namespace svn
}
#endif
-
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/repository.cpp b/src/svnqt/repository.cpp
index 327340b..ed8d9b3 100644
--- a/src/svnqt/repository.cpp
+++ b/src/svnqt/repository.cpp
@@ -17,8 +17,8 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include "repository.hpp"
-#include "repositorydata.hpp"
+#include "repository.h"
+#include "repositorydata.h"
namespace svn {
@@ -39,7 +39,7 @@ Repository::~Repository()
/*!
\fn svn::Repository::Open(const TQString&)
*/
-void Repository::Open(const TQString&name) throw (ClientException)
+void Repository::Open(const TQString&name)
{
svn_error_t * error = m_Data->Open(name);
if (error!=0) {
@@ -47,7 +47,7 @@ void Repository::Open(const TQString&name) throw (ClientException)
}
}
-void Repository::CreateOpen(const TQString&path, const TQString&fstype, bool _bdbnosync, bool _bdbautologremove, bool _pre_1_4_compat, bool _pre_1_5_compat) throw (ClientException)
+void Repository::CreateOpen(const TQString&path, const TQString&fstype, bool _bdbnosync, bool _bdbautologremove, bool _pre_1_4_compat, bool _pre_1_5_compat)
{
svn_error_t * error = m_Data->CreateOpen(path,fstype,_bdbnosync,_bdbautologremove,_pre_1_4_compat,_pre_1_5_compat);
if (error!=0) {
@@ -57,9 +57,9 @@ void Repository::CreateOpen(const TQString&path, const TQString&fstype, bool _bd
/*!
- \fn svn::Repository::dump(const TQString&output,const svn::Revision&start,const svn::Revision&end, bool incremental, bool use_deltas)throw (ClientException)
+ \fn svn::Repository::dump(const TQString&output,const svn::Revision&start,const svn::Revision&end, bool incremental, bool use_deltas)
*/
-void Repository::dump(const TQString&output,const svn::Revision&start,const svn::Revision&end, bool incremental, bool use_deltas)throw (ClientException)
+void Repository::dump(const TQString&output,const svn::Revision&start,const svn::Revision&end, bool incremental, bool use_deltas)
{
svn_error_t * error = m_Data->dump(output,start,end,incremental,use_deltas);
if (error!=0) {
@@ -67,7 +67,7 @@ void Repository::dump(const TQString&output,const svn::Revision&start,const svn:
}
}
-void Repository::loaddump(const TQString&dump,LOAD_UUID uuida, const TQString&parentFolder, bool usePre, bool usePost)throw (ClientException)
+void Repository::loaddump(const TQString&dump,LOAD_UUID uuida, const TQString&parentFolder, bool usePre, bool usePost)
{
svn_repos_load_uuid uuid_action;
switch (uuida) {
@@ -91,7 +91,7 @@ void Repository::loaddump(const TQString&dump,LOAD_UUID uuida, const TQString&pa
/*!
\fn svn::Repository::hotcopy(const TQString&src,const TQString&dest,bool cleanlogs)
*/
-void Repository::hotcopy(const TQString&src,const TQString&dest,bool cleanlogs)throw (ClientException)
+void Repository::hotcopy(const TQString&src,const TQString&dest,bool cleanlogs)
{
svn_error_t * error = RepositoryData::hotcopy(src,dest,cleanlogs);
if (error!=0) {
diff --git a/src/svnqt/repository.hpp b/src/svnqt/repository.h
index 7f79f52..ddff4f6 100644
--- a/src/svnqt/repository.hpp
+++ b/src/svnqt/repository.h
@@ -25,9 +25,9 @@
#pragma warning (disable: 4290)
#endif
-#include "svnqt/exception.hpp"
-#include "svnqt/revision.hpp"
-#include "svnqt/svnqt_defines.hpp"
+#include "svnqt/exception.h"
+#include "svnqt/revision.h"
+#include "svnqt/svnqt_defines.h"
#include <tqstring.h>
@@ -63,7 +63,7 @@ public:
\param path Path to a local repository, must not be an url
\exception ClientException will be thrown in case of an error
*/
- void Open(const TQString&path) throw (ClientException);
+ void Open(const TQString&path);
//! Creates and open a new repository
/*!
* Creates a new repository in path with type fstype. If create succeeded open and assigns with the object.
@@ -75,7 +75,7 @@ public:
* \param _pre_1_4_compat Create repository compatibel to version earlier than 1.4 (only used with subversion 1.4)
*/
void CreateOpen(const TQString&path, const TQString&fstype, bool _bdbnosync = false,
- bool _bdbautologremove = true, bool _pre_1_4_compat=false, bool _pre_1_5_compat=false) throw (ClientException);
+ bool _bdbautologremove = true, bool _pre_1_4_compat=false, bool _pre_1_5_compat=false);
//! dump content of repository to a file
/*!
The repository must opend before. Progress message go trough the assigned svn::repository::RepositoryListener object.
@@ -87,7 +87,7 @@ public:
\param use_deltas use deltas in dump output
\exception ClientException will be thrown in case of an error
*/
- void dump(const TQString&output,const svn::Revision&start,const svn::Revision&end, bool incremental, bool use_deltas)throw (ClientException);
+ void dump(const TQString&output,const svn::Revision&start,const svn::Revision&end, bool incremental, bool use_deltas);
//! load a dump into repository
/*!
The repository must opened before. Progress message go trough the assigned svn::repository::RepositoryListener object.
@@ -98,7 +98,7 @@ public:
\param usePost use post-commit-hook
\exception ClientException will be thrown in case of an error
*/
- void loaddump(const TQString&dump,LOAD_UUID uuida, const TQString&parentFolder, bool usePre, bool usePost)throw (ClientException);
+ void loaddump(const TQString&dump,LOAD_UUID uuida, const TQString&parentFolder, bool usePre, bool usePost);
//! copy a repository to a new location
/*!
\param src the repository path to copy
@@ -106,7 +106,7 @@ public:
\param cleanlogs remove redundand log files from source
\exception ClientException will be thrown in case of an error
*/
- static void hotcopy(const TQString&src,const TQString&dest,bool cleanlogs)throw (ClientException);
+ static void hotcopy(const TQString&src,const TQString&dest,bool cleanlogs);
private:
RepositoryData*m_Data;
diff --git a/src/svnqt/repositorydata.cpp b/src/svnqt/repositorydata.cpp
index 4e6f2ba..320139f 100644
--- a/src/svnqt/repositorydata.cpp
+++ b/src/svnqt/repositorydata.cpp
@@ -17,11 +17,11 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include "svnqt/repositorydata.hpp"
-#include "svnqt/svnqt_defines.hpp"
-#include "svnqt/exception.hpp"
-#include "svnqt/repositorylistener.hpp"
-#include "svnqt/svnfilestream.hpp"
+#include "svnqt/repositorydata.h"
+#include "svnqt/svnqt_defines.h"
+#include "svnqt/exception.h"
+#include "svnqt/repositorylistener.h"
+#include "svnqt/svnfilestream.h"
#include <svn_fs.h>
#include <svn_path.h>
diff --git a/src/svnqt/repositorydata.hpp b/src/svnqt/repositorydata.h
index 5abe2ca..0efb891 100644
--- a/src/svnqt/repositorydata.hpp
+++ b/src/svnqt/repositorydata.h
@@ -20,10 +20,10 @@
#ifndef SVNREPOSITORYDATA_H
#define SVNREPOSITORYDATA_H
-#include "svnqt/pool.hpp"
-#include "svnqt/revision.hpp"
-#include "svnqt/apr.hpp"
-#include "svnqt/svnqt_defines.hpp"
+#include "svnqt/pool.h"
+#include "svnqt/revision.h"
+#include "svnqt/apr.h"
+#include "svnqt/svnqt_defines.h"
#include <tqstring.h>
diff --git a/src/svnqt/repositorylistener.cpp b/src/svnqt/repositorylistener.cpp
index 9c809a8..90b0be7 100644
--- a/src/svnqt/repositorylistener.cpp
+++ b/src/svnqt/repositorylistener.cpp
@@ -17,7 +17,7 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include "repositorylistener.hpp"
+#include "repositorylistener.h"
namespace svn {
diff --git a/src/svnqt/repositorylistener.hpp b/src/svnqt/repositorylistener.h
index b5e7d7c..a2b357a 100644
--- a/src/svnqt/repositorylistener.hpp
+++ b/src/svnqt/repositorylistener.h
@@ -24,7 +24,7 @@
@author Rajko Albrecht <ral@alwins-world.de>
*/
-#include "svnqt/svnqt_defines.hpp"
+#include "svnqt/svnqt_defines.h"
#include <tqstring.h>
namespace svn {
diff --git a/src/svnqt/revision.cpp b/src/svnqt/revision.cpp
index a5a72c8..758acf6 100644
--- a/src/svnqt/revision.cpp
+++ b/src/svnqt/revision.cpp
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -30,10 +30,10 @@
// svncpp
-#include "revision.hpp"
-#include "pool.hpp"
+#include "revision.h"
+#include "pool.h"
-// qt
+// tqt
#include "tqdatetime.h"
namespace svn
@@ -291,9 +291,3 @@ namespace svn
}
}
-
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/revision.hpp b/src/svnqt/revision.h
index 5acaab2..381b523 100644
--- a/src/svnqt/revision.hpp
+++ b/src/svnqt/revision.h
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -32,10 +32,10 @@
#define _SVNCPP_REVISION_HPP_
// svncpp
-#include <svnqt/datetime.hpp>
-#include <svnqt/svnqt_defines.hpp>
+#include <svnqt/datetime.h>
+#include <svnqt/svnqt_defines.h>
-// qt
+// tqt
#include <tqglobal.h>
#include <tqstring.h>
#include <tqtextstream.h>
@@ -211,8 +211,3 @@ inline TQTextStream& operator<<(TQTextStream&s,svn::Revision&r)
}
#endif
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/shared_pointer.hpp b/src/svnqt/shared_pointer.h
index 4e5ca5b..fa9aa2f 100644
--- a/src/svnqt/shared_pointer.hpp
+++ b/src/svnqt/shared_pointer.h
@@ -21,12 +21,12 @@
#ifndef SVNTQT_SHARED_POINTER_HPP
#define SVNTQT_SHARED_POINTER_HPP
-#include "svnqt/smart_pointer.hpp"
+#include "svnqt/smart_pointer.h"
/*!
- * \file shared_pointer.hpp
+ * \file shared_pointer.h
* \brief shared pointer adapter
- * \sa smart_pointer.hpp
+ * \sa smart_pointer.h
*/
namespace svn
diff --git a/src/svnqt/smart_pointer.hpp b/src/svnqt/smart_pointer.h
index f579160..5d6dd63 100644
--- a/src/svnqt/smart_pointer.hpp
+++ b/src/svnqt/smart_pointer.h
@@ -24,7 +24,7 @@
#include "tqmutex.h"
#endif
-#include "svnqt/svnqt_defines.hpp"
+#include "svnqt/svnqt_defines.h"
/*!
* \file smart_pointer.h
diff --git a/src/svnqt/status.cpp b/src/svnqt/status.cpp
index c5e47a3..54170b8 100644
--- a/src/svnqt/status.cpp
+++ b/src/svnqt/status.cpp
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -29,10 +29,10 @@
*/
// svncpp
-#include "status.hpp"
-#include "svnqt/svnqt_defines.hpp"
-#include "svnqt/path.hpp"
-#include "svnqt/url.hpp"
+#include "status.h"
+#include "svnqt/svnqt_defines.h"
+#include "svnqt/path.h"
+#include "svnqt/url.h"
#include "svn_path.h"
diff --git a/src/svnqt/status.hpp b/src/svnqt/status.h
index 281f905..1111284 100644
--- a/src/svnqt/status.hpp
+++ b/src/svnqt/status.h
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -34,13 +34,13 @@
#include "svn_wc.h"
// svncpp
-#include "svnqt/svnqttypes.hpp"
-#include "svnqt/entry.hpp"
-#include "svnqt/pool.hpp"
-#include "svnqt/lock_entry.hpp"
-#include "svnqt/dirent.hpp"
-#include "svnqt/info_entry.hpp"
-#include "svnqt/svnqt_defines.hpp"
+#include "svnqt/svnqttypes.h"
+#include "svnqt/entry.h"
+#include "svnqt/pool.h"
+#include "svnqt/lock_entry.h"
+#include "svnqt/dirent.h"
+#include "svnqt/info_entry.h"
+#include "svnqt/svnqt_defines.h"
namespace svn
{
@@ -48,7 +48,7 @@ namespace svn
* Subversion status API. This class wraps around
* @a svn_wc_status_t.
*
- * @see svn_wc.hpp
+ * @see svn_wc.h
* @see svn_wc_status_t
*/
class Status_private;
@@ -180,8 +180,3 @@ namespace svn
}
#endif
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/stringarray.cpp b/src/svnqt/stringarray.cpp
index 7be5039..db6209e 100644
--- a/src/svnqt/stringarray.cpp
+++ b/src/svnqt/stringarray.cpp
@@ -18,8 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include "svnqt/stringarray.hpp"
-#include "svnqt/pool.hpp"
+#include "svnqt/stringarray.h"
+#include "svnqt/pool.h"
#include <svn_types.h>
// apr api
diff --git a/src/svnqt/stringarray.hpp b/src/svnqt/stringarray.h
index 3f2c3d5..5310d68 100644
--- a/src/svnqt/stringarray.hpp
+++ b/src/svnqt/stringarray.h
@@ -21,8 +21,8 @@
#ifndef _STRING_ARRAY_HPP
#define _STRING_ARRAY_HPP
-#include "svnqt/svnqt_defines.hpp"
-#include "svnqt/svnqttypes.hpp"
+#include "svnqt/svnqt_defines.h"
+#include "svnqt/svnqttypes.h"
#include <tqglobal.h>
#include <tqstringlist.h>
diff --git a/src/svnqt/svnfilestream.cpp b/src/svnqt/svnfilestream.cpp
index b160003..32aaa66 100644
--- a/src/svnqt/svnfilestream.cpp
+++ b/src/svnqt/svnfilestream.cpp
@@ -17,7 +17,7 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include "svnfilestream.hpp"
+#include "svnfilestream.h"
#include <tqfile.h>
diff --git a/src/svnqt/svnfilestream.hpp b/src/svnqt/svnfilestream.h
index e3a9201..cd46b65 100644
--- a/src/svnqt/svnfilestream.hpp
+++ b/src/svnqt/svnfilestream.h
@@ -20,7 +20,7 @@
#ifndef SVN_STREAMSVNFILESTREAM_HPP
#define SVN_STREAMSVNFILESTREAM_HPP
-#include "svnstream.hpp"
+#include "svnstream.h"
namespace svn {
diff --git a/src/svnqt/svnqt_defines.hpp.in b/src/svnqt/svnqt_defines.h.in
index 7d35ad7..7d35ad7 100644
--- a/src/svnqt/svnqt_defines.hpp.in
+++ b/src/svnqt/svnqt_defines.h.in
diff --git a/src/svnqt/svnqttypes.hpp b/src/svnqt/svnqttypes.h
index 5d16658..66ed28f 100644
--- a/src/svnqt/svnqttypes.hpp
+++ b/src/svnqt/svnqttypes.h
@@ -21,10 +21,10 @@
#ifndef _SVNTQT_TYPES_HPP
#define _SVNTQT_TYPES_HPP
-#include "svnqt/svnqt_defines.hpp"
-#include "svnqt/shared_pointer.hpp"
+#include "svnqt/svnqt_defines.h"
+#include "svnqt/shared_pointer.h"
-// qt
+// tqt
#include <tqglobal.h>
#include <tqstring.h>
diff --git a/src/svnqt/svnstream.cpp b/src/svnqt/svnstream.cpp
index 53d115e..ca4563a 100644
--- a/src/svnqt/svnstream.cpp
+++ b/src/svnqt/svnstream.cpp
@@ -17,9 +17,9 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include "svnqt/svnstream.hpp"
-#include "svnqt/pool.hpp"
-#include "svnqt/apr.hpp"
+#include "svnqt/svnstream.h"
+#include "svnqt/pool.h"
+#include "svnqt/apr.h"
// Subversion api
#include "svn_client.h"
@@ -207,7 +207,7 @@ SvnByteStream::SvnByteStream(svn_client_ctx_t * ctx)
{
m_ByteData = new SvnByteStream_private;
if (!m_ByteData->mBuf.isOpen()) {
- setError(TQT_TQIODEVICE_OBJECT(m_ByteData->mBuf).status());
+ setError(m_ByteData->mBuf.status());
}
}
@@ -220,7 +220,7 @@ long SvnByteStream::write(const char*aData,const unsigned long max)
{
long i = m_ByteData->mBuf.writeBlock(aData,max);
if (i<0) {
- setError(TQT_TQIODEVICE_OBJECT(m_ByteData->mBuf).status());
+ setError(m_ByteData->mBuf.status());
}
return i;
}
diff --git a/src/svnqt/svnstream.hpp b/src/svnqt/svnstream.h
index 6a14640..e71034b 100644
--- a/src/svnqt/svnstream.hpp
+++ b/src/svnqt/svnstream.h
@@ -20,7 +20,7 @@
#ifndef SVNSVNSTREAM_HPP
#define SVNSVNSTREAM_HPP
-#include "svnqt/svnqt_defines.hpp"
+#include "svnqt/svnqt_defines.h"
#include <tqstring.h>
diff --git a/src/svnqt/targets.cpp b/src/svnqt/targets.cpp
index b73d768..ae6d57c 100644
--- a/src/svnqt/targets.cpp
+++ b/src/svnqt/targets.cpp
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -36,10 +36,10 @@
#include "apr_strings.h"
// svncpp
-#include "svnqt/targets.hpp"
-#include "svnqt/path.hpp"
-#include "svnqt/pool.hpp"
-#include "svnqt/svnqt_defines.hpp"
+#include "svnqt/targets.h"
+#include "svnqt/path.h"
+#include "svnqt/pool.h"
+#include "svnqt/svnqt_defines.h"
#include <tqstringlist.h>
@@ -162,9 +162,3 @@ namespace svn
}
}
}
-
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/targets.hpp b/src/svnqt/targets.h
index 305c0a2..a4de848 100644
--- a/src/svnqt/targets.hpp
+++ b/src/svnqt/targets.h
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -31,8 +31,8 @@
#ifndef _SVNCPP_TARGETS_HPP_
#define _SVNCPP_TARGETS_HPP_
-#include "svnqt/svnqt_defines.hpp"
-#include "svnqt/svnqttypes.hpp"
+#include "svnqt/svnqt_defines.h"
+#include "svnqt/svnqttypes.h"
#include <tqglobal.h>
#include <tqvaluelist.h>
@@ -157,8 +157,3 @@ namespace svn
}
#endif
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/testmain.cpp b/src/svnqt/testmain.cpp
index fd46e9b..0795001 100644
--- a/src/svnqt/testmain.cpp
+++ b/src/svnqt/testmain.cpp
@@ -17,10 +17,10 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include "client.hpp"
-#include "repository.hpp"
-#include "context.hpp"
-#include "datetime.hpp"
+#include "client.h"
+#include "repository.h"
+#include "context.h"
+#include "datetime.h"
#include <tqdatastream.h>
diff --git a/src/svnqt/tests/CMakeLists.txt b/src/svnqt/tests/CMakeLists.txt
index 78344ad..6b15073 100644
--- a/src/svnqt/tests/CMakeLists.txt
+++ b/src/svnqt/tests/CMakeLists.txt
@@ -1,23 +1,23 @@
-SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
-MACRO(BUILD_TEST tname)
- SET(${tname}-src ${tname}.cpp)
- IF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${tname}.h)
- SET(${tname}-src ${${tname}-src} ${tname}.h)
- ENDIF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${tname}.h)
- ADD_EXECUTABLE(${tname} ${${tname}-src})
- TARGET_LINK_LIBRARIES(${tname} ${svnqt-name} ${TQT_LIBRARIES})
- ADD_TEST(${tname} ${CMAKE_CURRENT_BINARY_DIR}/${tname})
-ENDMACRO(BUILD_TEST)
+macro(build_test tname)
+ set(${tname}-src ${tname}.cpp)
+ if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${tname}.h)
+ set(${tname}-src ${${tname}-src} ${tname}.h)
+ endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${tname}.h)
+ add_executable(${tname} ${${tname}-src})
+ target_link_libraries(${tname} ${svnqt-name} ${TQT_LIBRARIES})
+ add_test(${tname} ${CMAKE_CURRENT_BINARY_DIR}/${tname})
+endmacro(BUILD_TEST)
-IF (BUILD_TESTS)
- CONFIGURE_FILE(
+if (BUILD_TESTS)
+ configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/testconfig.h.in
${CMAKE_CURRENT_BINARY_DIR}/testconfig.h
)
- ADD_TEST(rmrepo "/bin/rm" "-rvf" "${CMAKE_CURRENT_BINARY_DIR}/repo")
- ADD_TEST(rmco "/bin/rm" "-rvf" "${CMAKE_CURRENT_BINARY_DIR}/co")
- BUILD_TEST(crepo)
- BUILD_TEST(lsdir)
- BUILD_TEST(ckpath)
-ENDIF(BUILD_TESTS)
+ add_test(rmrepo "/bin/rm" "-rvf" "${CMAKE_CURRENT_BINARY_DIR}/repo")
+ add_test(rmco "/bin/rm" "-rvf" "${CMAKE_CURRENT_BINARY_DIR}/co")
+ build_test(crepo)
+ build_test(lsdir)
+ build_test(ckpath)
+endif(BUILD_TESTS)
diff --git a/src/svnqt/tests/ckpath.cpp b/src/svnqt/tests/ckpath.cpp
index 64a57ca..697e153 100644
--- a/src/svnqt/tests/ckpath.cpp
+++ b/src/svnqt/tests/ckpath.cpp
@@ -1,4 +1,4 @@
-#include "src/svnqt/path.hpp"
+#include "src/svnqt/path.h"
#include <iostream>
int main(int,char**)
diff --git a/src/svnqt/tests/crepo.cpp b/src/svnqt/tests/crepo.cpp
index fa43d90..b07c09a 100644
--- a/src/svnqt/tests/crepo.cpp
+++ b/src/svnqt/tests/crepo.cpp
@@ -1,8 +1,8 @@
-#include "src/svnqt/client.hpp"
+#include "src/svnqt/client.h"
#include "src/svnqt/tests/testconfig.h"
-#include "src/svnqt/repository.hpp"
-#include "src/svnqt/repositorylistener.hpp"
-#include "src/svnqt/targets.hpp"
+#include "src/svnqt/repository.h"
+#include "src/svnqt/repositorylistener.h"
+#include "src/svnqt/targets.h"
#include "testlistener.h"
diff --git a/src/svnqt/tests/lsdir.cpp b/src/svnqt/tests/lsdir.cpp
index f3a2f6f..9edbc25 100644
--- a/src/svnqt/tests/lsdir.cpp
+++ b/src/svnqt/tests/lsdir.cpp
@@ -1,8 +1,8 @@
-#include "src/svnqt/client.hpp"
+#include "src/svnqt/client.h"
#include "src/svnqt/tests/testconfig.h"
-#include "src/svnqt/status.hpp"
-#include "src/svnqt/svnqttypes.hpp"
+#include "src/svnqt/status.h"
+#include "src/svnqt/svnqttypes.h"
#include <iostream>
int main(int,char**)
diff --git a/src/svnqt/tests/testlistener.h b/src/svnqt/tests/testlistener.h
index 3efa96d..8d1300a 100644
--- a/src/svnqt/tests/testlistener.h
+++ b/src/svnqt/tests/testlistener.h
@@ -1,7 +1,7 @@
#ifndef _TESTLISTENER_
#define _TESTLISTENER_
-#include "src/svnqt/context_listener.hpp"
+#include "src/svnqt/context_listener.h"
class TestListener:public svn::ContextListener
{
diff --git a/src/svnqt/url.cpp b/src/svnqt/url.cpp
index 64edb06..0e32af0 100644
--- a/src/svnqt/url.cpp
+++ b/src/svnqt/url.cpp
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -33,8 +33,8 @@
// svncpp
-#include "pool.hpp"
-#include "url.hpp"
+#include "pool.h"
+#include "url.h"
#include <tqglobal.h>
#include <tqvaluelist.h>
@@ -173,9 +173,3 @@ namespace svn
return mSchemas;
}
}
-
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/url.hpp b/src/svnqt/url.h
index baaab46..a8c17b0 100644
--- a/src/svnqt/url.hpp
+++ b/src/svnqt/url.h
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -31,9 +31,9 @@
#ifndef _SVNCPP_URL_H_
#define _SVNCPP_URL_H_
-#include "svnqt/svnqt_defines.hpp"
+#include "svnqt/svnqt_defines.h"
-// qt
+// tqt
#include <tqglobal.h>
#include <tqstring.h>
@@ -84,9 +84,3 @@ namespace svn
}
#endif
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
-
diff --git a/src/svnqt/version_check.cpp b/src/svnqt/version_check.cpp
index ceb8e49..fa63a00 100644
--- a/src/svnqt/version_check.cpp
+++ b/src/svnqt/version_check.cpp
@@ -17,7 +17,7 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include "version_check.hpp"
+#include "version_check.h"
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/svnqt/version_check.hpp b/src/svnqt/version_check.h
index a16f233..f6129ac 100644
--- a/src/svnqt/version_check.hpp
+++ b/src/svnqt/version_check.h
@@ -20,7 +20,7 @@
#ifndef __VERSION_CHECK_HPP
#define __VERSION_CHECK_HPP
-#include "svnqt/svnqt_defines.hpp"
+#include "svnqt/svnqt_defines.h"
class TQString;
diff --git a/src/svnqt/wc.cpp b/src/svnqt/wc.cpp
index bf3b5dd..0dccb14 100644
--- a/src/svnqt/wc.cpp
+++ b/src/svnqt/wc.cpp
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -32,10 +32,10 @@
#include "svn_wc.h"
// svncpp
-#include "exception.hpp"
-#include "path.hpp"
-#include "pool.hpp"
-#include "wc.hpp"
+#include "exception.h"
+#include "path.h"
+#include "pool.h"
+#include "wc.h"
namespace svn
{
@@ -62,7 +62,7 @@ namespace svn
void
Wc::ensureAdm (const TQString& dir, const TQString& uuid,
- const TQString& url, const Revision & revision) throw (ClientException)
+ const TQString& url, const Revision & revision)
{
Pool pool;
Path dirPath (dir);
@@ -79,7 +79,7 @@ namespace svn
throw ClientException (error);
}
- const svn_wc_entry_t *Wc::getEntry( const TQString &path ) throw ( ClientException )
+ const svn_wc_entry_t *Wc::getEntry( const TQString &path )
{
Pool pool;
Path itemPath(path);
@@ -101,7 +101,7 @@ namespace svn
return entry;
}
- TQString Wc::getUrl(const TQString&path) throw (ClientException)
+ TQString Wc::getUrl(const TQString&path)
{
TQString result = "";
const svn_wc_entry_t *entry;
@@ -111,7 +111,7 @@ namespace svn
return result;
}
- TQString Wc::getRepos(const TQString&path) throw (ClientException)
+ TQString Wc::getRepos(const TQString&path)
{
TQString result = "";
const svn_wc_entry_t *entry;
@@ -121,9 +121,3 @@ namespace svn
return result;
}
}
-
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/svnqt/wc.hpp b/src/svnqt/wc.h
index 43041ec..02c85b6 100644
--- a/src/svnqt/wc.hpp
+++ b/src/svnqt/wc.h
@@ -1,5 +1,5 @@
/*
- * Port for usage with qt-framework and development for tdesvn
+ * Port for usage with tqt-framework and development for tdesvn
* (C) 2005-2007 by Rajko Albrecht
* http://tdesvn.alwins-world.de
*/
@@ -37,9 +37,9 @@
#endif
// svncpp
-#include "svnqt/exception.hpp"
-#include "svnqt/revision.hpp"
-#include "svnqt/svnqt_defines.hpp"
+#include "svnqt/exception.h"
+#include "svnqt/revision.h"
+#include "svnqt/svnqt_defines.h"
#include <tqstring.h>
@@ -71,26 +71,21 @@ namespace svn
*/
static void
ensureAdm (const TQString& dir, const TQString& uuid,
- const TQString& url, const Revision & revision) throw (ClientException);
+ const TQString& url, const Revision & revision);
/**
* retrieve the url of a given working copy item
* @param path the working copy item to check
* @return the repository url of @a path
*/
- static TQString getUrl(const TQString&path) throw (ClientException);
- static TQString getRepos(const TQString&path) throw (ClientException);
+ static TQString getUrl(const TQString&path);
+ static TQString getRepos(const TQString&path);
static const char * ADM_DIR_NAME;
private:
- static const svn_wc_entry_t *getEntry( const TQString &path ) throw ( ClientException );
+ static const svn_wc_entry_t *getEntry( const TQString &path );
};
}
#endif
-/* -----------------------------------------------------------------
- * local variables:
- * eval: (load-file "../../rapidsvn-dev.el")
- * end:
- */
diff --git a/src/tdeiosvn/CMakeLists.txt b/src/tdeiosvn/CMakeLists.txt
index cb84de5..cd3aa8b 100644
--- a/src/tdeiosvn/CMakeLists.txt
+++ b/src/tdeiosvn/CMakeLists.txt
@@ -25,4 +25,7 @@ link_directories(
##### protocol files ############################
file( GLOB PROTFILES *.protocol )
-install( FILES ${PROTFILES} DESTINATION ${SERVICES_INSTALL_DIR} )
+tde_create_translated_desktop(
+ SOURCE ${PROTFILES}
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/src/tdeiosvn/ksvn+file.protocol b/src/tdeiosvn/ksvn+file.protocol
index c19f0d5..3fa129a 100644
--- a/src/tdeiosvn/ksvn+file.protocol
+++ b/src/tdeiosvn/ksvn+file.protocol
@@ -1,6 +1,12 @@
[Protocol]
-exec=tdeio_ksvn
+Description=Subversion ioslave
+
+Icon=remote
+defaultMimetype=application/octet-stream
protocol=ksvn+file
+class=:internet
+exec=tdeio_ksvn
+listing=Name,Size,Date,Owner
input=none
output=filesystem
reading=true
@@ -10,30 +16,4 @@ makedir=true
linking=false
moving=true
deleteRecursive=true
-listing=Name,Size,Date,Owner
-defaultMimetype=application/octet-stream
-Icon=remote
-Description=Subversion ioslave
-Description[br]=Sklav E/D Subversion
-Description[ca]=Ioslave de Subversion
-Description[cs]=Subversion protokol
-Description[de]=Ein-/Ausgabemodul für Subversion
-Description[es]=El ioslave de Subversion
-Description[et]=Subversioni IO-moodul
-Description[fr]=ioslave subversion
-Description[ga]=ioslave Subversion
-Description[hu]=Subversion TDE-protokoll
-Description[it]=Slave I/O di Subversion
-Description[pl]=Wtyczka protokołu Subversion
-Description[pt]='Ioslave' para Subversion
-Description[pt_BR]=ioslave de Subversão
-Description[ru]=Доступ к хранилищу Subversion
-Description[sl]=ioslave za Subversion
-Description[sr]=IOSlave за Subversion
-Description[sr@Latn]=IOSlave za Subversion
-Description[sv]=Subversion I/O-slav
-Description[tr]=Alt Version ioslave
-Description[uk]=Підлеглий В/В Subversion
-Description[xx]=xxSubversion ioslavexx
maxInstances=5
-class=:internet
diff --git a/src/tdeiosvn/ksvn+http.protocol b/src/tdeiosvn/ksvn+http.protocol
index 81b0c6e..02adf53 100644
--- a/src/tdeiosvn/ksvn+http.protocol
+++ b/src/tdeiosvn/ksvn+http.protocol
@@ -1,6 +1,12 @@
[Protocol]
-exec=tdeio_ksvn
+Description=Subversion ioslave
+
+Icon=remote
+defaultMimetype=application/octet-stream
protocol=ksvn+http
+class=:internet
+exec=tdeio_ksvn
+listing=Name,Size,Date,Owner
input=none
output=filesystem
reading=true
@@ -10,30 +16,4 @@ makedir=true
linking=false
moving=true
deleteRecursive=true
-listing=Name,Size,Date,Owner
-defaultMimetype=application/octet-stream
-Icon=remote
-Description=Subversion ioslave
-Description[br]=Sklav E/D Subversion
-Description[ca]=Ioslave de Subversion
-Description[cs]=Subversion protokol
-Description[de]=Ein-/Ausgabemodul für Subversion
-Description[es]=El ioslave de Subversion
-Description[et]=Subversioni IO-moodul
-Description[fr]=ioslave subversion
-Description[ga]=ioslave Subversion
-Description[hu]=Subversion TDE-protokoll
-Description[it]=Slave I/O di Subversion
-Description[pl]=Wtyczka protokołu Subversion
-Description[pt]='Ioslave' para Subversion
-Description[pt_BR]=ioslave de Subversão
-Description[ru]=Доступ к хранилищу Subversion
-Description[sl]=ioslave za Subversion
-Description[sr]=IOSlave за Subversion
-Description[sr@Latn]=IOSlave za Subversion
-Description[sv]=Subversion I/O-slav
-Description[tr]=Alt Version ioslave
-Description[uk]=Підлеглий В/В Subversion
-Description[xx]=xxSubversion ioslavexx
maxInstances=5
-class=:internet
diff --git a/src/tdeiosvn/ksvn+https.protocol b/src/tdeiosvn/ksvn+https.protocol
index 1f1cca9..61f6a28 100644
--- a/src/tdeiosvn/ksvn+https.protocol
+++ b/src/tdeiosvn/ksvn+https.protocol
@@ -1,6 +1,12 @@
[Protocol]
-exec=tdeio_ksvn
+Description=Subversion ioslave
+
+Icon=remote
+defaultMimetype=application/octet-stream
protocol=ksvn+https
+class=:internet
+exec=tdeio_ksvn
+listing=Name,Size,Date,Owner
input=none
output=filesystem
reading=true
@@ -10,30 +16,4 @@ makedir=true
linking=false
moving=true
deleteRecursive=true
-listing=Name,Size,Date,Owner
-defaultMimetype=application/octet-stream
-Icon=remote
-Description=Subversion ioslave
-Description[br]=Sklav E/D Subversion
-Description[ca]=Ioslave de Subversion
-Description[cs]=Subversion protokol
-Description[de]=Ein-/Ausgabemodul für Subversion
-Description[es]=El ioslave de Subversion
-Description[et]=Subversioni IO-moodul
-Description[fr]=ioslave subversion
-Description[ga]=ioslave Subversion
-Description[hu]=Subversion TDE-protokoll
-Description[it]=Slave I/O di Subversion
-Description[pl]=Wtyczka protokołu Subversion
-Description[pt]='Ioslave' para Subversion
-Description[pt_BR]=ioslave de Subversão
-Description[ru]=Доступ к хранилищу Subversion
-Description[sl]=ioslave za Subversion
-Description[sr]=IOSlave за Subversion
-Description[sr@Latn]=IOSlave za Subversion
-Description[sv]=Subversion I/O-slav
-Description[tr]=Alt Version ioslave
-Description[uk]=Підлеглий В/В Subversion
-Description[xx]=xxSubversion ioslavexx
maxInstances=5
-class=:internet
diff --git a/src/tdeiosvn/ksvn+ssh.protocol b/src/tdeiosvn/ksvn+ssh.protocol
index d511fad..4066359 100644
--- a/src/tdeiosvn/ksvn+ssh.protocol
+++ b/src/tdeiosvn/ksvn+ssh.protocol
@@ -1,6 +1,12 @@
[Protocol]
-exec=tdeio_ksvn
+Description=Subversion ioslave
+
+Icon=remote
+defaultMimetype=application/octet-stream
protocol=ksvn+ssh
+class=:internet
+exec=tdeio_ksvn
+listing=Name,Size,Date,Owner
input=none
output=filesystem
reading=true
@@ -10,30 +16,4 @@ makedir=true
linking=false
moving=true
deleteRecursive=true
-listing=Name,Size,Date,Owner
-defaultMimetype=application/octet-stream
-Icon=remote
-Description=Subversion ioslave
-Description[br]=Sklav E/D Subversion
-Description[ca]=Ioslave de Subversion
-Description[cs]=Subversion protokol
-Description[de]=Ein-/Ausgabemodul für Subversion
-Description[es]=El ioslave de Subversion
-Description[et]=Subversioni IO-moodul
-Description[fr]=ioslave subversion
-Description[ga]=ioslave Subversion
-Description[hu]=Subversion TDE-protokoll
-Description[it]=Slave I/O di Subversion
-Description[pl]=Wtyczka protokołu Subversion
-Description[pt]='Ioslave' para Subversion
-Description[pt_BR]=ioslave de Subversão
-Description[ru]=Доступ к хранилищу Subversion
-Description[sl]=ioslave za Subversion
-Description[sr]=IOSlave за Subversion
-Description[sr@Latn]=IOSlave za Subversion
-Description[sv]=Subversion I/O-slav
-Description[tr]=Alt Version ioslave
-Description[uk]=Підлеглий В/В Subversion
-Description[xx]=xxSubversion ioslavexx
maxInstances=5
-class=:internet
diff --git a/src/tdeiosvn/ksvn.protocol b/src/tdeiosvn/ksvn.protocol
index 7f5fc07..18967c5 100644
--- a/src/tdeiosvn/ksvn.protocol
+++ b/src/tdeiosvn/ksvn.protocol
@@ -1,6 +1,12 @@
[Protocol]
-exec=tdeio_ksvn
+Description=Subversion ioslave
+
+Icon=remote
+defaultMimetype=application/octet-stream
protocol=ksvn
+class=:internet
+exec=tdeio_ksvn
+listing=Name,Size,Date,Owner
input=none
output=filesystem
reading=true
@@ -10,30 +16,4 @@ makedir=true
linking=false
moving=true
deleteRecursive=true
-listing=Name,Size,Date,Owner
-defaultMimetype=application/octet-stream
-Icon=remote
-Description=Subversion ioslave
-Description[br]=Sklav E/D Subversion
-Description[ca]=Ioslave de Subversion
-Description[cs]=Subversion protokol
-Description[de]=Ein-/Ausgabemodul für Subversion
-Description[es]=El ioslave de Subversion
-Description[et]=Subversioni IO-moodul
-Description[fr]=ioslave subversion
-Description[ga]=ioslave Subversion
-Description[hu]=Subversion TDE-protokoll
-Description[it]=Slave I/O di Subversion
-Description[pl]=Wtyczka protokołu Subversion
-Description[pt]='Ioslave' para Subversion
-Description[pt_BR]=ioslave de Subversão
-Description[ru]=Доступ к хранилищу Subversion
-Description[sl]=ioslave za Subversion
-Description[sr]=IOSlave за Subversion
-Description[sr@Latn]=IOSlave za Subversion
-Description[sv]=Subversion I/O-slav
-Description[tr]=Alt Version ioslave
-Description[uk]=Підлеглий В/В Subversion
-Description[xx]=xxSubversion ioslavexx
maxInstances=5
-class=:internet
diff --git a/src/tdeiosvn/svn+file.protocol b/src/tdeiosvn/svn+file.protocol
index 5e735d7..3d6685f 100644
--- a/src/tdeiosvn/svn+file.protocol
+++ b/src/tdeiosvn/svn+file.protocol
@@ -1,6 +1,12 @@
[Protocol]
-exec=tdeio_ksvn
+Description=Subversion ioslave
+
+Icon=remote
+defaultMimetype=application/octet-stream
protocol=svn+file
+exec=tdeio_ksvn
+class=:internet
+listing=Name,Size,Date,Owner
input=none
output=filesystem
reading=true
@@ -10,30 +16,4 @@ makedir=true
linking=false
moving=true
deleteRecursive=true
-listing=Name,Size,Date,Owner
-defaultMimetype=application/octet-stream
-Icon=remote
-Description=Subversion ioslave
-Description[br]=Sklav E/D Subversion
-Description[ca]=Ioslave de Subversion
-Description[cs]=Subversion protokol
-Description[de]=Ein-/Ausgabemodul für Subversion
-Description[es]=El ioslave de Subversion
-Description[et]=Subversioni IO-moodul
-Description[fr]=ioslave subversion
-Description[ga]=ioslave Subversion
-Description[hu]=Subversion TDE-protokoll
-Description[it]=Slave I/O di Subversion
-Description[pl]=Wtyczka protokołu Subversion
-Description[pt]='Ioslave' para Subversion
-Description[pt_BR]=ioslave de Subversão
-Description[ru]=Доступ к хранилищу Subversion
-Description[sl]=ioslave za Subversion
-Description[sr]=IOSlave за Subversion
-Description[sr@Latn]=IOSlave za Subversion
-Description[sv]=Subversion I/O-slav
-Description[tr]=Alt Version ioslave
-Description[uk]=Підлеглий В/В Subversion
-Description[xx]=xxSubversion ioslavexx
maxInstances=5
-class=:internet
diff --git a/src/tdeiosvn/svn+http.protocol b/src/tdeiosvn/svn+http.protocol
index f224a2d..d7cfce0 100644
--- a/src/tdeiosvn/svn+http.protocol
+++ b/src/tdeiosvn/svn+http.protocol
@@ -1,6 +1,12 @@
[Protocol]
-exec=tdeio_ksvn
+Description=Subversion ioslave
+
+Icon=remote
+defaultMimetype=application/octet-stream
protocol=svn+http
+class=:internet
+exec=tdeio_ksvn
+listing=Name,Size,Date,Owner
input=none
output=filesystem
reading=true
@@ -10,30 +16,4 @@ makedir=true
linking=false
moving=true
deleteRecursive=true
-listing=Name,Size,Date,Owner
-defaultMimetype=application/octet-stream
-Icon=remote
-Description=Subversion ioslave
-Description[br]=Sklav E/D Subversion
-Description[ca]=Ioslave de Subversion
-Description[cs]=Subversion protokol
-Description[de]=Ein-/Ausgabemodul für Subversion
-Description[es]=El ioslave de Subversion
-Description[et]=Subversioni IO-moodul
-Description[fr]=ioslave subversion
-Description[ga]=ioslave Subversion
-Description[hu]=Subversion TDE-protokoll
-Description[it]=Slave I/O di Subversion
-Description[pl]=Wtyczka protokołu Subversion
-Description[pt]='Ioslave' para Subversion
-Description[pt_BR]=ioslave de Subversão
-Description[ru]=Доступ к хранилищу Subversion
-Description[sl]=ioslave za Subversion
-Description[sr]=IOSlave за Subversion
-Description[sr@Latn]=IOSlave za Subversion
-Description[sv]=Subversion I/O-slav
-Description[tr]=Alt Version ioslave
-Description[uk]=Підлеглий В/В Subversion
-Description[xx]=xxSubversion ioslavexx
maxInstances=5
-class=:internet
diff --git a/src/tdeiosvn/svn+https.protocol b/src/tdeiosvn/svn+https.protocol
index 0637629..08ee4bc 100644
--- a/src/tdeiosvn/svn+https.protocol
+++ b/src/tdeiosvn/svn+https.protocol
@@ -1,6 +1,12 @@
[Protocol]
-exec=tdeio_ksvn
+Description=Subversion ioslave
+
+Icon=remote
+defaultMimetype=application/octet-stream
protocol=svn+https
+class=:internet
+exec=tdeio_ksvn
+listing=Name,Size,Date,Owner
input=none
output=filesystem
reading=true
@@ -10,30 +16,4 @@ makedir=true
linking=false
moving=true
deleteRecursive=true
-listing=Name,Size,Date,Owner
-defaultMimetype=application/octet-stream
-Icon=remote
-Description=Subversion ioslave
-Description[br]=Sklav E/D Subversion
-Description[ca]=Ioslave de Subversion
-Description[cs]=Subversion protokol
-Description[de]=Ein-/Ausgabemodul für Subversion
-Description[es]=El ioslave de Subversion
-Description[et]=Subversioni IO-moodul
-Description[fr]=ioslave subversion
-Description[ga]=ioslave Subversion
-Description[hu]=Subversion TDE-protokoll
-Description[it]=Slave I/O di Subversion
-Description[pl]=Wtyczka protokołu Subversion
-Description[pt]='Ioslave' para Subversion
-Description[pt_BR]=ioslave de Subversão
-Description[ru]=Доступ к хранилищу Subversion
-Description[sl]=ioslave za Subversion
-Description[sr]=IOSlave за Subversion
-Description[sr@Latn]=IOSlave za Subversion
-Description[sv]=Subversion I/O-slav
-Description[tr]=Alt Version ioslave
-Description[uk]=Підлеглий В/В Subversion
-Description[xx]=xxSubversion ioslavexx
maxInstances=5
-class=:internet
diff --git a/src/tdeiosvn/svn+ssh.protocol b/src/tdeiosvn/svn+ssh.protocol
index 06c771a..3f6525a 100644
--- a/src/tdeiosvn/svn+ssh.protocol
+++ b/src/tdeiosvn/svn+ssh.protocol
@@ -1,6 +1,12 @@
[Protocol]
-exec=tdeio_ksvn
+Description=Subversion ioslave
+
+Icon=remote
+defaultMimetype=application/octet-stream
protocol=svn+ssh
+class=:internet
+exec=tdeio_ksvn
+listing=Name,Size,Date,Owner
input=none
output=filesystem
reading=true
@@ -10,30 +16,4 @@ makedir=true
linking=false
moving=true
deleteRecursive=true
-listing=Name,Size,Date,Owner
-defaultMimetype=application/octet-stream
-Icon=remote
-Description=Subversion ioslave
-Description[br]=Sklav E/D Subversion
-Description[ca]=Ioslave de Subversion
-Description[cs]=Subversion protokol
-Description[de]=Ein-/Ausgabemodul für Subversion
-Description[es]=El ioslave de Subversion
-Description[et]=Subversioni IO-moodul
-Description[fr]=ioslave subversion
-Description[ga]=ioslave Subversion
-Description[hu]=Subversion TDE-protokoll
-Description[it]=Slave I/O di Subversion
-Description[pl]=Wtyczka protokołu Subversion
-Description[pt]='Ioslave' para Subversion
-Description[pt_BR]=ioslave de Subversão
-Description[ru]=Доступ к хранилищу Subversion
-Description[sl]=ioslave za Subversion
-Description[sr]=IOSlave за Subversion
-Description[sr@Latn]=IOSlave za Subversion
-Description[sv]=Subversion I/O-slav
-Description[tr]=Alt Version ioslave
-Description[uk]=Підлеглий В/В Subversion
-Description[xx]=xxSubversion ioslavexx
maxInstances=5
-class=:internet
diff --git a/src/tdeiosvn/svn.protocol b/src/tdeiosvn/svn.protocol
index 00d381d..3bfa67c 100644
--- a/src/tdeiosvn/svn.protocol
+++ b/src/tdeiosvn/svn.protocol
@@ -1,6 +1,12 @@
[Protocol]
-exec=tdeio_ksvn
+Description=Subversion ioslave
+
+Icon=remote
+defaultMimetype=application/octet-stream
protocol=svn
+class=:internet
+exec=tdeio_ksvn
+listing=Name,Size,Date,Owner
input=none
output=filesystem
reading=true
@@ -10,30 +16,4 @@ makedir=true
linking=false
moving=true
deleteRecursive=true
-listing=Name,Size,Date,Owner
-defaultMimetype=application/octet-stream
-Icon=remote
-Description=Subversion ioslave
-Description[br]=Sklav E/D Subversion
-Description[ca]=Ioslave de Subversion
-Description[cs]=Subversion protokol
-Description[de]=Ein-/Ausgabemodul für Subversion
-Description[es]=El ioslave de Subversion
-Description[et]=Subversioni IO-moodul
-Description[fr]=ioslave subversion
-Description[ga]=ioslave Subversion
-Description[hu]=Subversion TDE-protokoll
-Description[it]=Slave I/O di Subversion
-Description[pl]=Wtyczka protokołu Subversion
-Description[pt]='Ioslave' para Subversion
-Description[pt_BR]=ioslave de Subversão
-Description[ru]=Доступ к хранилищу Subversion
-Description[sl]=ioslave za Subversion
-Description[sr]=IOSlave за Subversion
-Description[sr@Latn]=IOSlave za Subversion
-Description[sv]=Subversion I/O-slav
-Description[tr]=Alt Version ioslave
-Description[uk]=Підлеглий В/В Subversion
-Description[xx]=xxSubversion ioslavexx
maxInstances=5
-class=:internet
diff --git a/src/tdeiosvn/tdeiobytestream.h b/src/tdeiosvn/tdeiobytestream.h
index ebe1a91..34a8b46 100644
--- a/src/tdeiosvn/tdeiobytestream.h
+++ b/src/tdeiosvn/tdeiobytestream.h
@@ -20,7 +20,7 @@
#ifndef TDEIOBYTESTREAM_H
#define TDEIOBYTESTREAM_H
-#include "svnstream.hpp"
+#include "svnstream.h"
#include <tdeio/global.h>
#include <kmimetype.h>
diff --git a/src/tdeiosvn/tdeiolistener.cpp b/src/tdeiosvn/tdeiolistener.cpp
index 9f4531d..dc36588 100644
--- a/src/tdeiosvn/tdeiolistener.cpp
+++ b/src/tdeiosvn/tdeiolistener.cpp
@@ -83,7 +83,7 @@ bool KioListener::contextGetLogMessage (TQString & msg,const svn::CommitItemList
}
}
- if (replyType!=TQSTRINGLIST_OBJECT_NAME_STRING) {
+ if (replyType!="TQStringList") {
msg = "Wrong reply type";
kdWarning()<<msg<<endl;
return false;
@@ -334,7 +334,7 @@ bool KioListener::contextSslClientCertPrompt (TQString & certFile)
kdWarning()<<"Communication with dcop failed"<<endl;
return false;
}
- if (replyType!=TQSTRING_OBJECT_NAME_STRING) {
+ if (replyType!="TQString") {
kdWarning()<<"Wrong reply type"<<endl;
return false;
}
@@ -377,7 +377,7 @@ bool KioListener::contextGetLogin (const TQString & realm, TQString & username,
kdWarning()<<"Communication with dcop failed"<<endl;
return false;
}
- if (replyType!=TQSTRINGLIST_OBJECT_NAME_STRING) {
+ if (replyType!="TQStringList") {
kdWarning()<<"Wrong reply type"<<endl;
return false;
}
diff --git a/src/tdeiosvn/tdeiolistener.h b/src/tdeiosvn/tdeiolistener.h
index 6663239..eda598d 100644
--- a/src/tdeiosvn/tdeiolistener.h
+++ b/src/tdeiosvn/tdeiolistener.h
@@ -20,7 +20,7 @@
#ifndef TDEIOLISTENER_H
#define TDEIOLISTENER_H
-#include "context_listener.hpp"
+#include "context_listener.h"
#include "pwstorage.h"
namespace TDEIO {
diff --git a/src/tdeiosvn/tdeiosvn.cpp b/src/tdeiosvn/tdeiosvn.cpp
index 97c293a..b44251f 100644
--- a/src/tdeiosvn/tdeiosvn.cpp
+++ b/src/tdeiosvn/tdeiosvn.cpp
@@ -21,12 +21,12 @@
#include "tdeiosvn.h"
#include "tdeiolistener.h"
-#include "svnqttypes.hpp"
-#include "dirent.hpp"
-#include "url.hpp"
-#include "status.hpp"
-#include "targets.hpp"
-#include "info_entry.hpp"
+#include "svnqttypes.h"
+#include "dirent.h"
+#include "url.h"
+#include "status.h"
+#include "targets.h"
+#include "info_entry.h"
#include "tdesvnsettings.h"
#include "sub2qt.h"
#include "sshagent.h"
@@ -697,7 +697,7 @@ void tdeio_svnProtocol::commit(const KURL::List&url)
kdWarning()<<msg<<endl;
return;
}
- if (replyType!=TQSTRINGLIST_OBJECT_NAME_STRING) {
+ if (replyType!="TQStringList") {
msg = "Wrong reply type";
kdWarning()<<msg<<endl;
return;
diff --git a/src/tdesvn.cpp b/src/tdesvn.cpp
index 5aa30f2..cd277d1 100644
--- a/src/tdesvn.cpp
+++ b/src/tdesvn.cpp
@@ -114,7 +114,7 @@ tdesvn::tdesvn()
// now that the Part is loaded, we cast it to a Part to get
// our hands on it
- m_part = static_cast<KParts::ReadOnlyPart *>(cfa->createAppPart(this,"tdesvn_part", TQT_TQOBJECT(this), "tdesvn_part", "KParts::ReadOnlyPart",TQStringList()));
+ m_part = static_cast<KParts::ReadOnlyPart *>(cfa->createAppPart(this,"tdesvn_part", this, "tdesvn_part", "KParts::ReadOnlyPart",TQStringList()));
if (m_part)
{
@@ -123,22 +123,22 @@ tdesvn::tdesvn()
TDEAction*tmpAction;
tmpAction = new TDEAction(i18n("Create and open new repository"),"document-new",
- TDEShortcut(),TQT_TQOBJECT(m_part->widget()),TQT_SLOT(slotCreateRepo()),actionCollection(),"subversion_create_repo");
+ TDEShortcut(),m_part->widget(),TQ_SLOT(slotCreateRepo()),actionCollection(),"subversion_create_repo");
tmpAction->setToolTip(i18n("Create and opens a new local subversion repository"));
tmpAction = new TDEAction(i18n("Dump repository to file"),"document-new",
- TDEShortcut(),TQT_TQOBJECT(m_part->widget()),TQT_SLOT(slotDumpRepo()),actionCollection(),"subversion_dump_repo");
+ TDEShortcut(),m_part->widget(),TQ_SLOT(slotDumpRepo()),actionCollection(),"subversion_dump_repo");
tmpAction->setToolTip(i18n("Dump a subversion repository to a file"));
tmpAction = new TDEAction(i18n("Hotcopy a repository"),"document-new",
- TDEShortcut(),TQT_TQOBJECT(m_part->widget()),TQT_SLOT(slotHotcopy()),actionCollection(),"subversion_hotcopy_repo");
+ TDEShortcut(),m_part->widget(),TQ_SLOT(slotHotcopy()),actionCollection(),"subversion_hotcopy_repo");
tmpAction->setToolTip(i18n("Hotcopy a subversion repository to a new folder"));
tmpAction = new TDEAction(i18n("Load dump into repository"),"document-new",
- TDEShortcut(),TQT_TQOBJECT(m_part->widget()),TQT_SLOT(slotLoaddump()),actionCollection(),"subversion_load_repo");
+ TDEShortcut(),m_part->widget(),TQ_SLOT(slotLoaddump()),actionCollection(),"subversion_load_repo");
tmpAction->setToolTip(i18n("Load a dump file into a repository."));
tmpAction = new TDEAction(i18n("Add ssh identities to ssh-agent"),"password",
- TDEShortcut(),TQT_TQOBJECT(m_part),TQT_SLOT(slotSshAdd()),actionCollection(),"tdesvn_ssh_add");
+ TDEShortcut(),m_part,TQ_SLOT(slotSshAdd()),actionCollection(),"tdesvn_ssh_add");
tmpAction->setToolTip(i18n("Force add ssh-identities to ssh-agent for future use."));
tmpAction = new TDEAction(i18n("Info about tdesvn part"), "tdesvn",
- TDEShortcut(), TQT_TQOBJECT(m_part), TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_tdesvnpart");
+ TDEShortcut(), m_part, TQ_SLOT(showAboutApplication()), actionCollection(), "help_about_tdesvnpart");
tmpAction->setToolTip(i18n("Shows info about the tdesvn plugin not the standalone app."));
/* enable tooltips in statusbar for menu */
@@ -169,10 +169,10 @@ tdesvn::tdesvn()
void tdesvn::connectActionCollection( TDEActionCollection *coll )
{
if (!coll)return;
- connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ),
- this, TQT_SLOT( changeStatusbar( const TQString & ) ) );
- connect( coll, TQT_SIGNAL( clearStatusText() ),
- this, TQT_SLOT( resetStatusBar() ) );
+ connect( coll, TQ_SIGNAL( actionStatusText( const TQString & ) ),
+ this, TQ_SLOT( changeStatusbar( const TQString & ) ) );
+ connect( coll, TQ_SIGNAL( clearStatusText() ),
+ this, TQ_SLOT( resetStatusBar() ) );
}
void tdesvn::disconnectActionCollection( TDEActionCollection *coll )
@@ -220,13 +220,13 @@ void tdesvn::load(const KURL& url,bool addRescent)
void tdesvn::setupActions()
{
TDEAction*ac;
- KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
- KStdAction::openNew(TQT_TQOBJECT(this),TQT_SLOT(fileNew()),actionCollection());
- ac = KStdAction::close(TQT_TQOBJECT(this),TQT_SLOT(fileClose()),actionCollection());
+ KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
+ KStdAction::openNew(this,TQ_SLOT(fileNew()),actionCollection());
+ ac = KStdAction::close(this,TQ_SLOT(fileClose()),actionCollection());
ac->setEnabled(getMemberList()->count()>1);
- KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
+ KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
- TDERecentFilesAction*rac = KStdAction::openRecent(TQT_TQOBJECT(this),TQT_SLOT(loadRescent(const KURL&)),actionCollection());
+ TDERecentFilesAction*rac = KStdAction::openRecent(this,TQ_SLOT(loadRescent(const KURL&)),actionCollection());
if (rac)
{
rac->setMaxItems(8);
@@ -234,10 +234,10 @@ void tdesvn::setupActions()
rac->setText(i18n("Recent opened URLs"));
}
- KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
- KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
+ KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection());
+ KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection());
- m_statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowStatusbar()), actionCollection());
+ m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection());
TDEToggleAction *toggletemp;
toggletemp = new TDEToggleAction(i18n("Load last opened URL on start"),TDEShortcut(),
@@ -245,7 +245,7 @@ void tdesvn::setupActions()
toggletemp->setToolTip(i18n("Reload last opened url if no one is given on commandline"));
TDEConfigGroup cs(TDEGlobal::config(),"startup");
toggletemp->setChecked(cs.readBoolEntry("load_last_on_start",false));
- connect(toggletemp,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotLoadLast(bool)));
+ connect(toggletemp,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotLoadLast(bool)));
}
void tdesvn::optionsShowStatusbar()
@@ -371,8 +371,8 @@ void tdesvn::optionsConfigureToolbars()
// use the standard toolbar editor
KEditToolbar dlg(factory());
- connect(&dlg, TQT_SIGNAL(newToolbarConfig()),
- this, TQT_SLOT(applyNewToolbarConfig()));
+ connect(&dlg, TQ_SIGNAL(newToolbarConfig()),
+ this, TQ_SLOT(applyNewToolbarConfig()));
dlg.exec();
}
diff --git a/src/tdesvn.desktop b/src/tdesvn.desktop
index fd0edae..e41ec14 100644
--- a/src/tdesvn.desktop
+++ b/src/tdesvn.desktop
@@ -1,22 +1,17 @@
[Desktop Entry]
-Encoding=UTF-8
Name=TDESVN
+
GenericName=SVN Client
-GenericName[de]=Graphische Oberfläche für SVN
-GenericName[es]=Cliente SVN
-GenericName[lt]=SVN klientas
+
+Comment=A Subversion client for TDE
+
+Type=Application
Exec=tdesvn %i %m -caption "%c"
Icon=tdesvn
-Type=Application
-X-DocPath=tdesvn/index.html
-Comment=A Subversion client for TDE
-Comment[de]=Ein Subversionclient für TDE
-Comment[nl]=Een Subversion-client voor TDE
-Comment[es]=Un cliente de Subversion para TDE
-Comment[lt]=Subversion klientas skirtas TDE
Terminal=false
MimeType=inode/directory;
+Categories=Qt;TDE;Development;
+X-DocPath=tdesvn/index.html
X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
X-TDE-BrowserView-Args=DetailedList
X-TDE-Library=tdesvnpart
-Categories=Qt;TDE;Development;
diff --git a/src/tdesvn.h b/src/tdesvn.h
index 72c785f..9ec922c 100644
--- a/src/tdesvn.h
+++ b/src/tdesvn.h
@@ -45,7 +45,7 @@ class KBookmarkMenu;
*/
class tdesvn : public KParts::MainWindow,public KBookmarkOwner
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/src/tdesvn_events.h b/src/tdesvn_events.h
index 021add1..d2ada3e 100644
--- a/src/tdesvn_events.h
+++ b/src/tdesvn_events.h
@@ -2,7 +2,7 @@
#define __TDESVN_EVENTS_H
#include <tqevent.h>
-#include "src/svnqt/svnqt_defines.hpp"
+#include "src/svnqt/svnqt_defines.h"
class FillCacheStatusEvent:public TQCustomEvent
{
diff --git a/src/tdesvn_part.cpp b/src/tdesvn_part.cpp
index aca3898..03b1eab 100644
--- a/src/tdesvn_part.cpp
+++ b/src/tdesvn_part.cpp
@@ -28,8 +28,8 @@
#include "cmdexecsettings_impl.h"
#include "tdesvnview.h"
#include "commandline_part.h"
-#include "version_check.hpp"
-#include "url.hpp"
+#include "version_check.h"
+#include "url.h"
#include "helpers/ktranslateurl.h"
#include "helpers/sshagent.h"
@@ -54,7 +54,6 @@
extern "C" { KDESVN_EXPORT void *init_tdesvnpart() { return new tdesvnPartFactory; } }
static const char version[] = VERSION;
-TQString tdesvnPart::m_Extratext = "";
static const char description[] =
I18N_NOOP("A Subversion Client for TDE (dynamic Part component)");
@@ -96,12 +95,12 @@ void tdesvnPart::init( TQWidget *parentWidget, const char *widgetName,bool full)
#else
setXMLFile("tdesvn_part.rc");
#endif
- connect(m_view,TQT_SIGNAL(sigShowPopup(const TQString&,TQWidget**)),this,TQT_SLOT(slotDispPopup(const TQString&,TQWidget**)));
- connect(m_view,TQT_SIGNAL(sigSwitchUrl(const KURL&)),this,TQT_SLOT(openURL(const KURL&)));
- connect(this,TQT_SIGNAL(refreshTree()),m_view,TQT_SLOT(refreshCurrentTree()));
- connect(m_view,TQT_SIGNAL(setWindowCaption(const TQString&)),this,TQT_SIGNAL(setWindowCaption(const TQString&)));
- connect(m_view,TQT_SIGNAL(sigUrlChanged( const TQString&)),this,TQT_SLOT(slotUrlChanged(const TQString&)));
- connect(this,TQT_SIGNAL(settingsChanged()),widget(),TQT_SLOT(slotSettingsChanged()));
+ connect(m_view,TQ_SIGNAL(sigShowPopup(const TQString&,TQWidget**)),this,TQ_SLOT(slotDispPopup(const TQString&,TQWidget**)));
+ connect(m_view,TQ_SIGNAL(sigSwitchUrl(const KURL&)),this,TQ_SLOT(openURL(const KURL&)));
+ connect(this,TQ_SIGNAL(refreshTree()),m_view,TQ_SLOT(refreshCurrentTree()));
+ connect(m_view,TQ_SIGNAL(setWindowCaption(const TQString&)),this,TQ_SIGNAL(setWindowCaption(const TQString&)));
+ connect(m_view,TQ_SIGNAL(sigUrlChanged( const TQString&)),this,TQ_SLOT(slotUrlChanged(const TQString&)));
+ connect(this,TQ_SIGNAL(settingsChanged()),widget(),TQ_SLOT(slotSettingsChanged()));
m_browserExt->setPropertiesActionEnabled(false);
}
@@ -156,7 +155,7 @@ void tdesvnPart::slotDispPopup(const TQString&name,TQWidget**target)
TDEAboutData* tdesvnPart::createAboutData()
{
- m_Extratext = TQString(I18N_NOOP("Built with Subversion library: %1\n")).arg(svn::Version::linked_version());
+ TQString m_Extratext = TQString(I18N_NOOP("Built with Subversion library: %1\n")).arg(svn::Version::linked_version());
m_Extratext+=TQString(I18N_NOOP("Running Subversion library: %1")).arg(svn::Version::running_version());
TDEAboutData*about = new TDEAboutData("tdesvnpart", I18N_NOOP("tdesvn Part"), version, description,
@@ -182,37 +181,37 @@ void tdesvnPart::setupActions()
toggletemp = new TDEToggleAction(i18n("Logs follow node changes"),TDEShortcut(),
actionCollection(),"toggle_log_follows");
toggletemp->setChecked(Kdesvnsettings::log_follows_nodes());
- connect(toggletemp,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotLogFollowNodes(bool)));
+ connect(toggletemp,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotLogFollowNodes(bool)));
toggletemp = new TDEToggleAction(i18n("Display ignored files"),TDEShortcut(),
actionCollection(),"toggle_ignored_files");
toggletemp->setChecked(Kdesvnsettings::display_ignored_files());
- connect(toggletemp,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotDisplayIgnored(bool)));
+ connect(toggletemp,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotDisplayIgnored(bool)));
toggletemp = new TDEToggleAction(i18n("Display unknown files"),TDEShortcut(),
actionCollection(),"toggle_unknown_files");
toggletemp->setChecked(Kdesvnsettings::display_unknown_files());
- connect(toggletemp,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotDisplayUnkown(bool)));
+ connect(toggletemp,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotDisplayUnkown(bool)));
toggletemp = new TDEToggleAction(i18n("Hide unchanged files"),TDEShortcut(),
actionCollection(),"toggle_hide_unchanged_files");
toggletemp->setChecked(Kdesvnsettings::hide_unchanged_files());
- connect(toggletemp,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotHideUnchanged(bool)));
+ connect(toggletemp,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotHideUnchanged(bool)));
toggletemp = new TDEToggleAction(i18n("Work online"),TDEShortcut(),
actionCollection(),"toggle_network");
toggletemp->setChecked(Kdesvnsettings::network_on());
- connect(toggletemp,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotEnableNetwork(bool)));
+ connect(toggletemp,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotEnableNetwork(bool)));
kdDebug()<<"Appname = " << (TQString)kapp->instanceName() << endl;
- TDEAction * t = KStdAction::preferences(this, TQT_SLOT(slotShowSettings()), actionCollection(),"tdesvnpart_pref");
+ TDEAction * t = KStdAction::preferences(this, TQ_SLOT(slotShowSettings()), actionCollection(),"tdesvnpart_pref");
t->setText(i18n("&Configure %1...").arg("Kdesvn"));
if (TQString(kapp->instanceName())!=TQString("tdesvn")) {
- (void)new TDEAction(i18n("&About tdesvn part"), "tdesvn", 0, this, TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_tdesvnpart");
- (void)new TDEAction(i18n("Tdesvn &Handbook"), "help", 0, this, TQT_SLOT(appHelpActivated()), actionCollection(), "help_tdesvn");
- (void)new TDEAction(i18n("Send Bugreport for tdesvn"), 0, 0, this, TQT_SLOT(reportBug()), actionCollection(), "report_bug");
+ (void)new TDEAction(i18n("&About tdesvn part"), "tdesvn", 0, this, TQ_SLOT(showAboutApplication()), actionCollection(), "help_about_tdesvnpart");
+ (void)new TDEAction(i18n("Tdesvn &Handbook"), "help", 0, this, TQ_SLOT(appHelpActivated()), actionCollection(), "help_tdesvn");
+ (void)new TDEAction(i18n("Send Bugreport for tdesvn"), 0, 0, this, TQ_SLOT(reportBug()), actionCollection(), "report_bug");
}
actionCollection()->setHighlightingEnabled(true);
}
@@ -365,7 +364,7 @@ void tdesvnPart::slotShowSettings()
dialog->addPage(new CmdExecSettings_impl(0,"cmdexec_items"),
"TDEIO/"+i18n("Commandline"),"terminal",i18n("Settings for commandline and TDEIO execution"),true);
- connect(dialog,TQT_SIGNAL(settingsChanged()),this,TQT_SLOT(slotSettingsChanged()));
+ connect(dialog,TQ_SIGNAL(settingsChanged()),this,TQ_SLOT(slotSettingsChanged()));
dialog->show();
}
diff --git a/src/tdesvn_part.h b/src/tdesvn_part.h
index 2076d51..56c2914 100644
--- a/src/tdesvn_part.h
+++ b/src/tdesvn_part.h
@@ -45,7 +45,7 @@ class TDEAboutApplication;
*/
class KDESVN_EXPORT tdesvnPart : public KParts::ReadOnlyPart
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -97,7 +97,6 @@ protected slots:
private:
tdesvnView *m_view;
KdesvnBrowserExtension*m_browserExt;
- static TQString m_Extratext;
protected slots:
void slotSettingsChanged();
protected slots:
@@ -111,7 +110,7 @@ class TDECmdLineArgs;
/* we make it ourself 'cause we will enhance a little bit! */
class KDESVN_EXPORT cFactory : public KParts::Factory
{
- Q_OBJECT
+ TQ_OBJECT
public:
cFactory():KParts::Factory(){}
@@ -135,7 +134,7 @@ typedef cFactory tdesvnPartFactory;
class TDEPARTS_EXPORT KdesvnBrowserExtension : public KParts::BrowserExtension
{
- Q_OBJECT
+ TQ_OBJECT
public:
KdesvnBrowserExtension( tdesvnPart * );
diff --git a/src/tdesvnd/CMakeLists.txt b/src/tdesvnd/CMakeLists.txt
index d1da1f3..a4f2a8c 100644
--- a/src/tdesvnd/CMakeLists.txt
+++ b/src/tdesvnd/CMakeLists.txt
@@ -28,7 +28,11 @@ link_directories(
set( ACTION_MENU "X-TDE-GetActionMenu=kded tdesvnd getActionMenu(KURL::List)" )
-configure_file (tdesvn_subversion.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/tdesvn_subversion.desktop @ONLY )
-
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/tdesvn_subversion.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus )
-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/tdesvnd.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
+tde_create_translated_desktop(
+ SOURCE tdesvn_subversion.desktop.cmake
+ DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus
+)
+tde_create_translated_desktop(
+ SOURCE tdesvnd.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}/kded
+)
diff --git a/src/tdesvnd/tdesvn_subversion.desktop.cmake b/src/tdesvnd/tdesvn_subversion.desktop.cmake
new file mode 100644
index 0000000..aca5d5a
--- /dev/null
+++ b/src/tdesvnd/tdesvn_subversion.desktop.cmake
@@ -0,0 +1,130 @@
+[Desktop Entry]
+Encoding=UTF-8
+X-TDE-ServiceTypes=inode/directory,all/allfiles
+X-TDE-Submenu=Subversion (tdesvn)
+
+@ACTION_MENU@
+
+[Desktop Action Log]
+Name=Subversion log (last 100)
+Comment=Displays the subversion log
+Icon=tdesvnlog
+Exec=tdesvn exec -r HEAD:1 -l 100 log %U
+
+[Desktop Action Info]
+Name=Detailed subversion info
+Icon=tdesvninfo
+Exec=tdesvn exec info %U
+
+[Desktop Action Add]
+Name=Add to Repository
+Icon=tdesvnadd
+Exec=tdesvn exec add %U
+
+[Desktop Action Addnew]
+Name=Check for unversioned items
+Icon=tdesvnaddrecursive
+Exec=tdesvn exec addnew %U
+
+[Desktop Action Delete]
+Name=Delete From Repository
+Icon=tdesvndelete
+Exec=tdesvn exec rm %U
+
+[Desktop Action Revert]
+Name=Revert Local Changes
+Comment=Remove any changes made locally. Warning - this cannot be undone.
+Icon=undo
+Exec=tdesvn exec revert %U
+
+[Desktop Action Rename]
+Name=Rename...
+Comment=Rename a file locally and in the repository. Use this rather than adding and deleting to rename a file.
+Icon=pencil
+Exec=tdesvn exec mv %U
+
+[Desktop Action Import]
+Name=Import Repository
+Comment=Put folder into an existing repository to put it under revision control.
+Icon=svn_import
+Exec=tdeio_svn_helper -i %U
+
+[Desktop Action Checkout]
+Name=Checkout From Repository...
+Comment=Checkout out files from an existing repository into this folder.
+Icon=tdesvncheckout
+Exec=tdesvn exec checkout %U
+
+[Desktop Action Switch]
+Name=Switch...
+Comment=Switch given working copy to another branch
+Icon=tdesvnswitch
+Exec=tdesvn exec switch %U
+
+[Desktop Action Merge]
+Name=Merge...
+Comment=Merge changes between this and another branch
+Icon=svn_merge
+Exec=tdeio_svn_helper -m %U
+
+[Desktop Action Blame]
+Name=Blame...
+Comment=See who wrote each line of the file and in what revision
+Icon=tdesvnblame
+Exec=tdesvn exec blame %U
+
+[Desktop Action CreatePatch]
+Name=Create Patch...
+Exec=tdeio_svn_helper -p %U
+
+[Desktop Action Export]
+Name=Export...
+Comment=Checkout out an unversioned copy of a tree from a repository
+Icon=tdesvnexport
+Exec=tdesvn exec export %U
+
+[Desktop Action Diff]
+Name=Diff (local)
+Comment=Show local changes since last update
+Icon=tdesvndiff
+Exec=tdesvn exec diff %U
+
+[Desktop Action Update]
+Name=TDESvn Update
+Icon=tdesvnupdate
+Exec=tdesvn exec update %U
+
+[Desktop Action Commit]
+Name=TDESvn Commit
+Icon=tdesvncommit
+Exec=tdesvn exec commit %U
+
+[Desktop Action Checkout]
+Name=Checkout From Repository...
+Comment=Checkout out files from an existing repository into this folder.
+Icon=tdesvncheckout
+Exec=tdesvn exec checkout %U
+
+[Desktop Action Export]
+Name=Export...
+Comment=Checkout out an unversioned copy of a tree from a repository
+Icon=tdesvnexport
+Exec=tdesvn exec export %U
+
+[Desktop Action Checkoutto]
+Name=Checkout from a repository...
+Comment=Checkout out files from an existing repository into this folder.
+Icon=tdesvncheckout
+Exec=tdesvn exec checkoutto %U
+
+[Desktop Action Exportto]
+Name=Export from a subversion repository...
+Comment=Checkout out an unversioned copy of a tree from a repository
+Icon=tdesvnexport
+Exec=tdesvn exec exportto %U
+
+[Desktop Action Tree]
+Name=Display revision tree
+Comment=Show complete revision tree
+Icon=tdesvnlog
+Exec=tdesvn exec tree %U
diff --git a/src/tdesvnd/tdesvn_subversion.desktop.in b/src/tdesvnd/tdesvn_subversion.desktop.in
deleted file mode 100644
index cb78850..0000000
--- a/src/tdesvnd/tdesvn_subversion.desktop.in
+++ /dev/null
@@ -1,368 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-X-TDE-ServiceTypes=inode/directory,all/allfiles
-X-TDE-Submenu=Subversion (tdesvn)
-
-@ACTION_MENU@
-
-[Desktop Action Log]
-Name=Subversion log (last 100)
-Name[es]=Mostrar registros (últimos 100)
-Icon=tdesvnlog
-Exec=tdesvn exec -r HEAD:1 -l 100 log %U
-Comment=Displays the subversion log
-Comment[es]=Muestra los registros de Subversion
-
-[Desktop Action Info]
-Name=Detailed subversion info
-Name[es]=Información detallada
-Icon=tdesvninfo
-Exec=tdesvn exec info %U
-
-[Desktop Action Add]
-Name=Add to Repository
-Name[bg]=Добавяне в хранилището
-Name[da]=Tilføj til lager
-Name[et]=Hoidlasse lisamine
-Name[sr]=Додај у складиште
-Name[sr@Latn]=Dodaj u skladište
-Name[sv]=Lägg till i arkiv
-Name[tr]=Depoya Ekle
-Name[es]=Añadir al Repositorio
-Icon=tdesvnadd
-Exec=tdesvn exec add %U
-
-[Desktop Action Addnew]
-Name=Check for unversioned items
-Name[es]=Mostrar elementos no versionados
-Icon=tdesvnaddrecursive
-Exec=tdesvn exec addnew %U
-
-[Desktop Action Delete]
-Name=Delete From Repository
-Name[bg]=Изтриване от хранилището
-Name[da]=Slet fra lager
-Name[et]=Hoidlast kustutamine
-Name[sr]=Обриши из складишта
-Name[sr@Latn]=Obriši iz skladišta
-Name[sv]=Ta bort från arkiv
-Name[tr]=Depodan Sil
-Name[es]=Eliminar del Repositorio
-Icon=tdesvndelete
-Exec=tdesvn exec rm %U
-
-[Desktop Action Revert]
-Name=Revert Local Changes
-Name[bg]=Игнориране на локалните промени
-Name[da]=Vend lokale ændringer om
-Name[et]=Kohalike muudatuste tühistamine
-Name[sr]=Одбаци локалне измене
-Name[sr@Latn]=Odbaci lokalne izmene
-Name[sv]=Återställ lokal ändring
-Name[tr]=Yerel Değişiklikleri Ters Çevir
-Name[es]=Deshacer cambios locales
-Icon=undo
-Exec=tdesvn exec revert %U
-Comment=Remove any changes made locally. Warning - this cannot be undone.
-Comment[bg]=Премахване на локалните промени, които са направени. Забележете, че данните ще се загубят безвъзвратно.
-Comment[da]=Fjern alle ændringer der er lavet lokalt. Advarsel - dette kan ikke fortrydes.
-Comment[et]=Eemaldab kõik kohalikud muudatused. Hoiatus: seda ei saa tagasi võtta.
-Comment[sr]=Уклони све локално направљене измене. Упозорење: ово се не може опозвати.
-Comment[sr@Latn]=Ukloni sve lokalno napravljene izmene. Upozorenje: ovo se ne može opozvati.
-Comment[sv]=Tar bort alla ändringar som gjorts lokalt. Varning: detta kan inte ångras.
-Comment[tr]=Yerel olarak yapılan değişiklikleri kaldır. Dikkat - bu işlem geri alınamaz.
-Comment[es]=Deshace cualquier cambio realizado localmente. Aviso - no se puede invertir el proceso.
-
-[Desktop Action Rename]
-Name=Rename...
-Name[bg]=Преименуване...
-Name[br]=Adenvel ...
-Name[cy]=Ail-enwi...
-Name[da]=Omdøb...
-Name[et]=Ümbernimetamine...
-Name[ga]=Athainmnigh...
-Name[sr]=Преименуј...
-Name[sr@Latn]=Preimenuj...
-Name[sv]=Byt namn...
-Name[tr]=Yeniden Adlandır...
-Name[es]=Renombrar...
-Icon=pencil
-Exec=tdesvn exec mv %U
-Comment=Rename a file locally and in the repository. Use this rather than adding and deleting to rename a file.
-Comment[bg]=Преименуване на файл локално и в хранилището. За предпочитане е да използвате този метод, вместо изтриване и добавяне.
-Comment[da]=Omdøb en fil lokalt og i lageret. Brug dette i stedet for at tilføje og slette fro at omdøbe en fil.
-Comment[et]=Faili ümbernimetamine nii kohalikult kui hoidlas. See on eelistatud viis faili ümbernimetamisel lisamise ja kustutamise asemel.
-Comment[sr]=Преименуј фајл локално и у складишту. Користите ово уместо трика са додавањем и брисањем фајла.
-Comment[sr@Latn]=Preimenuj fajl lokalno i u skladištu. Koristite ovo umesto trika sa dodavanjem i brisanjem fajla.
-Comment[sv]=Byt namn på en fil lokalt och i arkivet. Använd detta istället för att lägga till och ta bort för att byta namn på en fil.
-Comment[es]=Renombra un fichero localmente y en el repositorio. Utilizar ésto en lugar de añadir y borrar el fichero.
-
-[Desktop Action Import]
-Name=Import Repository
-Name[bg]=Импорт на директория
-Name[da]=Importér lager
-Name[et]=Hoidla import
-Name[sr]=Увези складиште
-Name[sr@Latn]=Uvezi skladište
-Name[sv]=Importera arkiv
-Name[tr]=Depoyu İçe Aktar
-Name[es]=Importar Repositorio
-Icon=svn_import
-Exec=tdeio_svn_helper -i %U
-Comment=Put folder into an existing repository to put it under revision control.
-Comment[bg]=Импорт на директория в съществуващо хранилище.
-Comment[da]=Put mappe ind i et eksisterende lager for at få den ind under revisionskontrol.
-Comment[et]=Kataloogi lisamine olemasolevasse versioonikontrolli süsteemi hoidlasse.
-Comment[sr]=Стави фасциклу у постојеће складиште, ради стављања под контролу ревизија.
-Comment[sr@Latn]=Stavi fasciklu u postojeće skladište, radi stavljanja pod kontrolu revizija.
-Comment[sv]=Lägg till katalog i ett befintligt arkiv för att få den under versionskontroll
-Comment[tr]=Dizini başka bie alt düzeltme controlünde var olan bir depo içine koy.
-Comment[es]=Poner la carpeta en un repositorio existente para tenerla bajo control de versiones.
-
-[Desktop Action Checkout]
-Name=Checkout From Repository...
-Name[bg]=Изтегляне от хранилището...
-Name[da]=Tjek ud fra lager...
-Name[et]=Hoidla väljavõte...
-Name[sr]=Довуци из складишта...
-Name[sr@Latn]=Dovuci iz skladišta...
-Name[sv]=Checka ut från ett arkiv...
-Name[tr]=Depodan Kontrol Et...
-Name[es]=Obtener del Repositorio...
-Icon=tdesvncheckout
-Exec=tdesvn exec checkout %U
-Comment=Checkout out files from an existing repository into this folder.
-Comment[bg]=Изтегляне на файлове от хранилището в текущата директория.
-Comment[da]=Tjek filer ud fra et eksisterende lager til denne mappe.
-Comment[et]=Olemasoleva hoidla failide väljavõte sellesse kataloogi.
-Comment[sr]=Довуци фајлове из постојећег складишта у ову фасциклу.
-Comment[sr@Latn]=Dovuci fajlove iz postojećeg skladišta u ovu fasciklu.
-Comment[sv]=Checka ut filer från ett befintligt arkiv till katalogen.
-Comment[tr]=Bu dizinde var olan bir depodan hatalı dosyaları kontrol et.
-Comment[es]=Extrae ficheros de un repositorio existente hacia esta carpeta.
-
-[Desktop Action Switch]
-Name=Switch...
-Name[bg]=Превключване...
-Name[et]=Lülitumine...
-Name[sr]=Пребаци...
-Name[sr@Latn]=Prebaci...
-Name[sv]=Byt...
-Name[tr]=Değiştir...
-Name[es]=Relocalizar...
-Icon=tdesvnswitch
-Comment=Switch given working copy to another branch
-Comment[bg]=Превключване на работното копие към друго разклонение.
-Comment[da]=Skift given arbejdskopi til en anden gren.
-Comment[et]=Antud töökoopia lülitamine teise harru
-Comment[sr]=Пребаци дату радну копију на другу грану
-Comment[sr@Latn]=Prebaci datu radnu kopiju na drugu granu
-Comment[sv]=Byt angiven arbetskopia till en annan gren
-Comment[tr]=Çalışan belirli bir kopyayı başka bölüme değiştir
-Comment[es]=Relocaliza la copia de trabajo hacia otra rama
-Exec=tdesvn exec switch %U
-
-[Desktop Action Merge]
-Name=Merge...
-Name[bg]=Смесване...
-Name[da]=Indflet...
-Name[et]=Ühendamine...
-Name[sr]=Стопи...
-Name[sr@Latn]=Stopi...
-Name[sv]=Sammanfoga...
-Name[tr]=Birleştir...
-Name[es]=Fusionar...
-Icon=svn_merge
-Comment=Merge changes between this and another branch
-Comment[bg]=Смесване на промените от това разклонение с друго разклонение.
-Comment[da]=Indflet ændringer mellem denne og en anden gren
-Comment[et]=Selle ja teise haru muudatuste ühendamine
-Comment[sr]=Стопи измене између ове и друге гране
-Comment[sr@Latn]=Stopi izmene između ove i druge grane
-Comment[sv]=Sammanfoga ändringar mellan den här och en annan gren
-Comment[tr]=Bu ve başka bölüm arasındaki değişiklikleri birleştir
-Comment[es]=Fusionar cambios entre esta rama y otra
-Exec=tdeio_svn_helper -m %U
-
-[Desktop Action Blame]
-Name=Blame...
-Name[bg]=Информация...
-Name[et]=Autorsus...
-Name[pa]=ਬਲਾਮੀ...
-Name[sr]=Окриви...
-Name[sr@Latn]=Okrivi...
-Name[sv]=Klandra...
-Name[es]=Ver anotado...
-Icon=tdesvnblame
-Comment=See who wrote each line of the file and in what revision
-Comment[bg]=Информация за файла.
-Comment[da]=Se hvem der skrev hver linje i filen og i hvilken revision
-Comment[et]=Vaatamine, kes ja millises versioonis mingi faili rea kirjutas
-Comment[sr]=Прикажи за сваку линију фајла ко ју је написао и у којој ревизији
-Comment[sr@Latn]=Prikaži za svaku liniju fajla ko ju je napisao i u kojoj reviziji
-Comment[sv]=Se vem som skrev varje rad i filen och för vilken version
-Comment[es]=Ver quién escribió cada línea del fichero y en qué revisión
-Exec=tdesvn exec blame %U
-
-[Desktop Action CreatePatch]
-Name=Create Patch...
-Name[bg]=Създаване на кръпка...
-Name[da]=Lav rettelse...
-Name[et]=Paiga loomine...
-Name[pa]=ਪੈਂਚ ਬਣਾਓ...
-Name[sr]=Направи закрпу...
-Name[sr@Latn]=Napravi zakrpu...
-Name[sv]=Skapa programfix...
-Name[tr]=Yama Oluştur...
-Name[es]=Crear Parche...
-Exec=tdeio_svn_helper -p %U
-
-[Desktop Action Export]
-Name=Export...
-Name[bg]=Експорт...
-Name[br]=Ezporzh ...
-Name[cy]=Allforio...
-Name[da]=Eksportér...
-Name[et]=Eksport...
-Name[ga]=Easpórtáil...
-Name[sr]=Извези...
-Name[sr@Latn]=Izvezi...
-Name[sv]=Exportera...
-Name[tr]=Dışa Aktar...
-Name[es]=Exportar...
-Icon=tdesvnexport
-Exec=tdesvn exec export %U
-Comment=Checkout out an unversioned copy of a tree from a repository
-Comment[bg]=Изтегляне на копие на дървото от хранилището.
-Comment[da]=Tjek en kopi uden version ud af et træ fra et lager
-Comment[et]=Hoidla failipuu versioonita koopia väljavõte
-Comment[sr]=Довуци неверзирану копију стабла из складишта
-Comment[sr@Latn]=Dovuci neverziranu kopiju stabla iz skladišta
-Comment[sv]=Checka ut en kopia utan versionskontroll från ett arkiv
-Comment[tr]=Depodaki bir ağaçtan kusurlu bir versionsuz kopyayı kontrol et
-Comment[es]=Obtener una copia no versionada de un árbol de un repositorio
-
-[Desktop Action Diff]
-Name=Diff (local)
-Name[bg]=Разлика (локално)
-Name[da]=Diff (lokal)
-Name[et]=Võrdlemine (kohalik)
-Name[ga]=Diff (logánta)
-Name[sr]=Разликуј (локално)
-Name[sr@Latn]=Razlikuj (lokalno)
-Name[sv]=Jämför (lokalt)
-Name[tr]=Diff (yerel)
-Name[es]=Ver diferencias (locales)
-Icon=tdesvndiff
-Exec=tdesvn exec diff %U
-Comment=Show local changes since last update
-Comment[bg]=Показване на локалните промени след последното обновяване.
-Comment[da]=Vis lokale ændringer siden sidste opdatering
-Comment[et]=Kohalike muudatuste näitamine pärast viimast uuendamist
-Comment[sr]=Прикажи локалне измене од последњег ажурирања
-Comment[sr@Latn]=Prikaži lokalne izmene od poslednjeg ažuriranja
-Comment[sv]=Visa lokala ändringar sedan senaste uppdateringen
-Comment[tr]=Son güncellemeden sonraki yerel değişiklikleri göster
-Comment[es]=Mostrar cambios locales desde la última actualización
-
-[Desktop Action Update]
-Name=TDESvn Update
-Name[bg]=Обновяване SVN
-Name[da]=SVN Opdatér
-Name[et]=SVN uuendamine
-Name[sr]=SVN ажурирање
-Name[sr@Latn]=SVN ažuriranje
-Name[sv]=SVN-uppdatera
-Name[tr]=SVN Güncelleme
-Name[es]=(SVN) Actualizar
-Icon=tdesvnupdate
-Exec=tdesvn exec update %U
-
-[Desktop Action Commit]
-Name=TDESvn Commit
-Name[bg]=Предаване SVN
-Name[et]=SVN sissekanne
-Name[sr]=SVN предаја
-Name[sr@Latn]=SVN predaja
-Name[sv]=SVN-arkivera
-Name[tr]=SVN Teslim Etme
-Name[es]=(SVN) Confirmar
-Icon=tdesvncommit
-Exec=tdesvn exec commit %U
-
-[Desktop Action Checkout]
-Name=Checkout From Repository...
-Name[bg]=Изтегляне от хранилището...
-Name[da]=Tjek ud fra lager...
-Name[et]=Hoidla väljavõte...
-Name[sr]=Довуци из складишта...
-Name[sr@Latn]=Dovuci iz skladišta...
-Name[sv]=Checka ut från ett arkiv...
-Name[tr]=Depodan Kontrol Et...
-Name[es]=(SVN) Obtener del Repositorio...
-Icon=tdesvncheckout
-Exec=tdesvn exec checkout %U
-Comment=Checkout out files from an existing repository into this folder.
-Comment[bg]=Изтегляне на файлове от хранилището в текущата директория.
-Comment[da]=Tjek filer ud fra et eksisterende lager til denne mappe.
-Comment[et]=Olemasoleva hoidla failide väljavõte sellesse kataloogi.
-Comment[sr]=Довуци фајлове из постојећег складишта у ову фасциклу.
-Comment[sr@Latn]=Dovuci fajlove iz postojećeg skladišta u ovu fasciklu.
-Comment[sv]=Checka ut filer från ett befintligt arkiv till katalogen.
-Comment[tr]=Bu dizinde var olan bir depodan hatalı dosyaları kontrol et.
-Comment[es]=Extraer ficheros de un repositorio existente hacia esta carpeta.
-
-[Desktop Action Export]
-Name=Export ...
-Name[bg]=Експорт...
-Name[br]=Ezporzh ...
-Name[cy]=Allforio...
-Name[da]=Eksportér...
-Name[et]=Eksport...
-Name[ga]=Easpórtáil...
-Name[sr]=Извези...
-Name[sr@Latn]=Izvezi...
-Name[sv]=Exportera...
-Name[tr]=Dışa Aktar...
-Name[es]=(SVN) Exportar...
-Icon=tdesvnexport
-Exec=tdesvn exec export %U
-Comment=Checkout out an unversioned copy of a tree from a repository
-Comment[bg]=Изтегляне на копие на дървото от хранилището.
-Comment[da]=Tjek en kopi uden version ud af et træ fra et lager
-Comment[et]=Hoidla failipuu versioonita koopia väljavõte
-Comment[sr]=Довуци неверзирану копију стабла из складишта
-Comment[sr@Latn]=Dovuci neverziranu kopiju stabla iz skladišta
-Comment[sv]=Checka ut en kopia utan versionskontroll från ett arkiv
-Comment[tr]=Depodaki bir ağaçtan kusurlu bir versionsuz kopyayı kontrol et
-Comment[es]=Obtener una copia no versionada del árbol de un repositorio
-
-[Desktop Action Checkoutto]
-Name=Checkout from a repository...
-Name[de]=Checkout einer Repository
-Name[es]=Obtener de Subversion...
-Icon=tdesvncheckout
-Exec=tdesvn exec checkoutto %U
-Comment=Checkout out files from an existing repository into this folder.
-Comment[de]=Erzeuge eine Arbeitskopie von einer Repository
-Comment[es]=Extraer ficheros de un repositorio existente hacia esta carpeta.
-
-[Desktop Action Exportto]
-Name=Export from a subversion repository...
-Name[de]=Exportiere von einer Subversion Repository...
-Name[es]=Exportar de Subversion...
-Icon=tdesvnexport
-Exec=tdesvn exec exportto %U
-Comment=Checkout out an unversioned copy of a tree from a repository
-Comment[de]=Hole eine unversionierte Kopie eines Baums von einer Repository
-Comment[es]=Obtener una copia no versionada del árbol de un repositorio
-
-[Desktop Action Tree]
-Name=Display revision tree
-Name[de]=Zeige Revisionsbaum
-Name[es]=Mostrar árbol de revisiones
-Icon=tdesvnlog
-Exec=tdesvn exec tree %U
-Comment[de]=Zeige den kompletten Revisionsbaum
-Comment=Show complete revision tree
-Comment[es]=Muestra el árbol de revisiones completo
diff --git a/src/tdesvnd/tdesvnd.desktop b/src/tdesvnd/tdesvnd.desktop
index 7fc5d9c..b4a0f29 100644
--- a/src/tdesvnd/tdesvnd.desktop
+++ b/src/tdesvnd/tdesvnd.desktop
@@ -1,13 +1,12 @@
[Desktop Entry]
-Encoding=UTF-8
-Type=Service
Name=TDESVND Subversion Module
-Name[es]=módulo para subversion tdesvnd
+
Comment=Provides subversion client services
+
+Type=Service
X-TDE-ServiceTypes=KDEDModule
X-TDE-ModuleType=Library
X-TDE-Library=tdesvnd
X-TDE-FactoryName=tdesvnd
X-TDE-Kded-autoload=false
X-TDE-Kded-load-on-demand=true
-
diff --git a/src/tdesvnd/tdesvnd_dcop.cpp b/src/tdesvnd/tdesvnd_dcop.cpp
index 6e58707..2bc7173 100644
--- a/src/tdesvnd/tdesvnd_dcop.cpp
+++ b/src/tdesvnd/tdesvnd_dcop.cpp
@@ -25,11 +25,11 @@
#include "logmsg_impl.h"
#include "tdesvnsettings.h"
#include "pwstorage.h"
-#include "client.hpp"
-#include "revision.hpp"
-#include "status.hpp"
-#include "context_listener.hpp"
-#include "url.hpp"
+#include "client.h"
+#include "revision.h"
+#include "status.h"
+#include "context_listener.h"
+#include "url.h"
#include "ktranslateurl.h"
#include <kdebug.h>
diff --git a/src/tdesvnd/tdesvnd_dcop.h b/src/tdesvnd/tdesvnd_dcop.h
index 6b23f65..cfb49e0 100644
--- a/src/tdesvnd/tdesvnd_dcop.h
+++ b/src/tdesvnd/tdesvnd_dcop.h
@@ -32,7 +32,7 @@ class IListener;
class tdesvnd_dcop : public KDEDModule
{
-// Q_OBJECT
+// TQ_OBJECT
//
K_DCOP
diff --git a/src/tdesvnview.cpp b/src/tdesvnview.cpp
index cfa690a..ab5c67b 100644
--- a/src/tdesvnview.cpp
+++ b/src/tdesvnview.cpp
@@ -28,10 +28,10 @@
#include "svnfrontend/stopdlg.h"
#include "svnfrontend/fronthelpers/propertylist.h"
#include "tdesvnsettings.h"
-#include "url.hpp"
-#include "repository.hpp"
-#include "version_check.hpp"
-#include "svnqttypes.hpp"
+#include "url.h"
+#include "repository.h"
+#include "version_check.h"
+#include "svnqttypes.h"
#include <tqpainter.h>
#include <tqlayout.h>
@@ -69,31 +69,31 @@ tdesvnView::tdesvnView(TDEActionCollection*aCollection,TQWidget *parent,const ch
m_topLayout = new TQVBoxLayout(this);
m_Splitter = new TQSplitter( this, "m_Splitter" );
- m_Splitter->setOrientation( Qt::Vertical );
+ m_Splitter->setOrientation( TQt::Vertical );
m_flist=new tdesvnfilelist(m_Collection,m_Splitter);
m_infoSplitter = new TQSplitter(m_Splitter);
- m_infoSplitter->setOrientation( Qt::Horizontal );
+ m_infoSplitter->setOrientation( TQt::Horizontal );
m_infoSplitter->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 1, m_infoSplitter->sizePolicy().hasHeightForWidth() ) );
m_LogWindow=new KTextBrowser(m_infoSplitter);
Propertylist*pl = new Propertylist(m_infoSplitter);
pl->setCommitchanges(true);
- pl->addCallback(TQT_TQOBJECT(m_flist));
- connect(m_flist,TQT_SIGNAL(sigProplist(const svn::PathPropertiesMapListPtr&,bool,const TQString&)),
- pl,TQT_SLOT(displayList(const svn::PathPropertiesMapListPtr&,bool,const TQString&)));
+ pl->addCallback(m_flist);
+ connect(m_flist,TQ_SIGNAL(sigProplist(const svn::PathPropertiesMapListPtr&,bool,const TQString&)),
+ pl,TQ_SLOT(displayList(const svn::PathPropertiesMapListPtr&,bool,const TQString&)));
m_flist->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 1, m_flist->sizePolicy().hasHeightForWidth() ) );
m_topLayout->addWidget(m_Splitter);
- connect(m_flist,TQT_SIGNAL(sigLogMessage(const TQString&)),this,TQT_SLOT(slotAppendLog(const TQString&)));
- connect(m_flist,TQT_SIGNAL(changeCaption(const TQString&)),this,TQT_SLOT(slotSetTitle(const TQString&)));
- connect(m_flist,TQT_SIGNAL(sigShowPopup(const TQString&,TQWidget**)),this,TQT_SLOT(slotDispPopup(const TQString&,TQWidget**)));
- connect(m_flist,TQT_SIGNAL(sigUrlOpend(bool)),parent,TQT_SLOT(slotUrlOpened(bool)));
- connect(m_flist,TQT_SIGNAL(sigSwitchUrl(const KURL&)),this,TQT_SIGNAL(sigSwitchUrl(const KURL&)));
- connect(m_flist,TQT_SIGNAL(sigUrlChanged( const TQString& )),this,TQT_SLOT(slotUrlChanged(const TQString&)));
- connect(m_flist,TQT_SIGNAL(sigCacheStatus(TQ_LONG,TQ_LONG)),this,TQT_SLOT(fillCacheStatus(TQ_LONG,TQ_LONG)));
- connect(this,TQT_SIGNAL(sigMakeBaseDirs()),m_flist,TQT_SLOT(slotMkBaseDirs()));
+ connect(m_flist,TQ_SIGNAL(sigLogMessage(const TQString&)),this,TQ_SLOT(slotAppendLog(const TQString&)));
+ connect(m_flist,TQ_SIGNAL(changeCaption(const TQString&)),this,TQ_SLOT(slotSetTitle(const TQString&)));
+ connect(m_flist,TQ_SIGNAL(sigShowPopup(const TQString&,TQWidget**)),this,TQ_SLOT(slotDispPopup(const TQString&,TQWidget**)));
+ connect(m_flist,TQ_SIGNAL(sigUrlOpend(bool)),parent,TQ_SLOT(slotUrlOpened(bool)));
+ connect(m_flist,TQ_SIGNAL(sigSwitchUrl(const KURL&)),this,TQ_SIGNAL(sigSwitchUrl(const KURL&)));
+ connect(m_flist,TQ_SIGNAL(sigUrlChanged( const TQString& )),this,TQ_SLOT(slotUrlChanged(const TQString&)));
+ connect(m_flist,TQ_SIGNAL(sigCacheStatus(TQ_LONG,TQ_LONG)),this,TQ_SLOT(fillCacheStatus(TQ_LONG,TQ_LONG)));
+ connect(this,TQ_SIGNAL(sigMakeBaseDirs()),m_flist,TQ_SLOT(slotMkBaseDirs()));
TDEConfigGroup cs(Kdesvnsettings::self()->config(),"tdesvn-mainlayout");
TQString t1 = cs.readEntry("split1",TQString());
if (!t1.isEmpty()) {
@@ -239,7 +239,7 @@ void tdesvnView::slotSettingsChanged()
void tdesvnView::slotCreateRepo()
{
KDialogBase * dlg = new KDialogBase(
- TQT_TQWIDGET(TDEApplication::activeModalWidget()),
+ TDEApplication::activeModalWidget(),
"create_repository",
true,
i18n("Create new repository"),
@@ -287,7 +287,7 @@ void tdesvnView::slotCreateRepo()
void tdesvnView::slotHotcopy()
{
KDialogBase * dlg = new KDialogBase(
- TQT_TQWIDGET(TDEApplication::activeModalWidget()),
+ TDEApplication::activeModalWidget(),
"hotcopy_repository",
true,
i18n("Hotcopy a repository"),
@@ -322,7 +322,7 @@ void tdesvnView::slotHotcopy()
void tdesvnView::slotLoaddump()
{
KDialogBase dlg(
- TQT_TQWIDGET(TDEApplication::activeModalWidget()),
+ TDEApplication::activeModalWidget(),
"hotcopy_repository",
true,
i18n("Hotcopy a repository"),
@@ -360,7 +360,7 @@ void tdesvnView::slotLoaddump()
break;
}
try {
- StopDlg sdlg(TQT_TQOBJECT(this),this,0,"Load Dump",i18n("Loading a dump into a repository."));
+ StopDlg sdlg(this,this,0,"Load Dump",i18n("Loading a dump into a repository."));
_rep.loaddump(ptr->dumpFile(),_act,ptr->parentPath(),ptr->usePre(),ptr->usePost());
slotAppendLog(i18n("Loading dump finished."));
}catch (const svn::ClientException&e) {
@@ -372,7 +372,7 @@ void tdesvnView::slotLoaddump()
void tdesvnView::slotDumpRepo()
{
KDialogBase * dlg = new KDialogBase(
- TQT_TQWIDGET(TDEApplication::activeModalWidget()),
+ TDEApplication::activeModalWidget(),
"dump_repository",
true,
i18n("Dump a repository"),
@@ -421,7 +421,7 @@ void tdesvnView::slotDumpRepo()
}
try {
- StopDlg sdlg(TQT_TQOBJECT(this),this,0,"Dump",i18n("Dumping a repository"));
+ StopDlg sdlg(this,this,0,"Dump",i18n("Dumping a repository"));
_rep->dump(out,st,en,incr,diffs);
slotAppendLog(i18n("Dump finished."));
}catch (const svn::ClientException&e) {
diff --git a/src/tdesvnview.h b/src/tdesvnview.h
index 7c9690c..36ab5f3 100644
--- a/src/tdesvnview.h
+++ b/src/tdesvnview.h
@@ -22,7 +22,7 @@
#ifndef _TDESVNVIEW_H_
#define _TDESVNVIEW_H_
-#include "repositorylistener.hpp"
+#include "repositorylistener.h"
#include <tqwidget.h>
#include <tdeparts/part.h>
@@ -51,7 +51,7 @@ class KProgress;
*/
class tdesvnView : public TQWidget,public svn::repository::RepositoryListener
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/src/urldlg.cpp b/src/urldlg.cpp
index 4a6571d..cace72b 100644
--- a/src/urldlg.cpp
+++ b/src/urldlg.cpp
@@ -71,10 +71,10 @@ void UrlDlg::init_dlg()
urlRequester_->setFocus();
KFile::Mode mode = static_cast<KFile::Mode>(KFile::ExistingOnly|KFile::Directory);
urlRequester_->setMode(mode);
- connect(urlRequester_->comboBox(),TQT_SIGNAL(textChanged(const TQString&)),TQT_SLOT(slotTextChanged(const TQString&)));
+ connect(urlRequester_->comboBox(),TQ_SIGNAL(textChanged(const TQString&)),TQ_SLOT(slotTextChanged(const TQString&)));
enableButtonOK( false );
enableButton( KDialogBase::User1, false );
- connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotClear()));
+ connect( this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(slotClear()));
urlRequester_->adjustSize();
resize(TQSize(400,sizeHint().height()));
}
diff --git a/src/urldlg.h b/src/urldlg.h
index b9ab82a..e0aa2aa 100644
--- a/src/urldlg.h
+++ b/src/urldlg.h
@@ -30,7 +30,7 @@ class KURLRequester;
*/
class UrlDlg : public KDialogBase
{
-Q_OBJECT
+TQ_OBJECT
public:
UrlDlg(TQWidget *parent = 0, const char *name = 0);