summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt10
-rw-r--r--src/commandline_part.cpp2
-rw-r--r--src/settings/CMakeLists.txt5
-rw-r--r--src/settings/cmdexecsettings_impl.h2
-rw-r--r--src/settings/diffmergesettings_impl.h2
-rw-r--r--src/settings/dispcolorsettings_impl.h2
-rw-r--r--src/settings/displaysettings_impl.h2
-rw-r--r--src/settings/revisiontreesettingsdlg_impl.h2
-rw-r--r--src/settings/subversionsettings_impl.h2
-rw-r--r--src/svnfrontend/filelistviewitem.h2
-rw-r--r--src/svnfrontend/fronthelpers/propertylist.h2
-rw-r--r--src/svnfrontend/itemdisplay.h2
-rw-r--r--src/svnfrontend/stopdlg.h2
-rw-r--r--src/svnfrontend/svnitem.h4
-rw-r--r--src/svnfrontend/tdesvnfilelist.h4
-rw-r--r--src/tdesvn_part.cpp16
-rw-r--r--src/tdesvnview.cpp10
-rw-r--r--src/tdesvnview.h2
18 files changed, 41 insertions, 32 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 02b1dc8..1dba60d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,7 +15,12 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/src
${CMAKE_SOURCE_DIR}/src
+ ${CMAKE_SOURCE_DIR}/src/settings
+ ${CMAKE_SOURCE_DIR}/src/svnqt
${CMAKE_BINARY_DIR}/src/svnqt
+ ${CMAKE_SOURCE_DIR}/src/svnfrontend/fronthelpers/
+ /usr/include/subversion-1
+ /usr/include/apr-1.0
)
link_directories(
@@ -54,6 +59,11 @@ set( target tdesvnpart )
set( ${target}_SRCS
tdesvn_events.cpp tdesvn_events.h tdesvn_part.cpp settings/tdesvnsettings.kcfgc
+ settings/dispcolor_settings.ui settings/display_settings.ui settings/revisiontree_settings.ui
+ settings/subversion_settings.ui settings/cmdexecsettings.ui
+ settings/diffmergesettings.ui
+ svnfrontend/createrepo_dlg.ui svnfrontend/dumprepo_dlg.ui
+ svnfrontend/hotcopydlg.ui svnfrontend/loaddmpdlg.ui
tdesvnview.cpp commandline_part.cpp
)
diff --git a/src/commandline_part.cpp b/src/commandline_part.cpp
index 338dce4..3037cd1 100644
--- a/src/commandline_part.cpp
+++ b/src/commandline_part.cpp
@@ -33,7 +33,7 @@ commandline_part::commandline_part(TQObject *parent, const char *name,KCmdLineAr
KStandardDirs::kde_default("data")+ TQString::tqfromLatin1( inst->instanceName() ) + '/' );
- m_pCPart = new CommandExec(this,name?TQString(name)+TQString("_exec"):TQString::tqfromLatin1("command_executer"),args);
+ m_pCPart = new CommandExec(this,TQString(name?TQString(name)+TQString("_exec"):TQString::tqfromLatin1("command_executer")).ascii(),args);
}
commandline_part::~commandline_part()
diff --git a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt
index 7676ef5..bd1ee7e 100644
--- a/src/settings/CMakeLists.txt
+++ b/src/settings/CMakeLists.txt
@@ -15,6 +15,7 @@ include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/src
${CMAKE_SOURCE_DIR}/src
+ ${CMAKE_SOURCE_DIR}/src/settings
${CMAKE_CURRENT_BINARY_DIR}
)
@@ -25,8 +26,6 @@ link_directories(
##### tdesvncfgreader ###########################
-file (GLOB hdr RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.h")
-
tde_add_library( tdesvncfgreader STATIC AUTOMOC
SOURCES dispcolor_settings.ui
display_settings.ui revisiontree_settings.ui
@@ -34,7 +33,7 @@ tde_add_library( tdesvncfgreader STATIC AUTOMOC
diffmergesettings.ui dispcolorsettings_impl.cpp
displaysettings_impl.cpp revisiontreesettingsdlg_impl.cpp
subversionsettings_impl.cpp cmdexecsettings_impl.cpp
- diffmergesettings_impl.cpp tdesvnsettings.kcfgc ${hdr}
+ diffmergesettings_impl.cpp tdesvnsettings.kcfgc
# LINK kio-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/src/settings/cmdexecsettings_impl.h b/src/settings/cmdexecsettings_impl.h
index 13e61d9..2f0fe19 100644
--- a/src/settings/cmdexecsettings_impl.h
+++ b/src/settings/cmdexecsettings_impl.h
@@ -21,7 +21,7 @@
#ifndef CMDEXECSETTINGS_IMPL_H
#define CMDEXECSETTINGS_IMPL_H
-#include "src/settings/cmdexecsettings.h"
+#include "cmdexecsettings.h"
class CmdExecSettings_impl : public CmdExecSettings
{
diff --git a/src/settings/diffmergesettings_impl.h b/src/settings/diffmergesettings_impl.h
index 198ffe6..8c08d05 100644
--- a/src/settings/diffmergesettings_impl.h
+++ b/src/settings/diffmergesettings_impl.h
@@ -20,7 +20,7 @@
#ifndef DIFFMERGESETTINGS_IMPL_H
#define DIFFMERGESETTINGS_IMPL_H
-#include "src/settings/diffmergesettings.h"
+#include "diffmergesettings.h"
class DiffMergeSettings_impl: public DiffMergeSettings {
Q_OBJECT
diff --git a/src/settings/dispcolorsettings_impl.h b/src/settings/dispcolorsettings_impl.h
index dd97247..03030b5 100644
--- a/src/settings/dispcolorsettings_impl.h
+++ b/src/settings/dispcolorsettings_impl.h
@@ -20,7 +20,7 @@
#ifndef DISPCOLORSETTINGS_IMPL_H
#define DISPCOLORSETTINGS_IMPL_H
-#include "src/settings/dispcolor_settings.h"
+#include "dispcolor_settings.h"
class DispColorSettings_impl: public DispColorSettings {
Q_OBJECT
diff --git a/src/settings/displaysettings_impl.h b/src/settings/displaysettings_impl.h
index 7b731c0..f1be11b 100644
--- a/src/settings/displaysettings_impl.h
+++ b/src/settings/displaysettings_impl.h
@@ -20,7 +20,7 @@
#ifndef DISPLAYSETTINGS_IMPL_H
#define DISPLAYSETTINGS_IMPL_H
-#include "src/settings/display_settings.h"
+#include "display_settings.h"
class DisplaySettings_impl: public DisplaySettings {
Q_OBJECT
diff --git a/src/settings/revisiontreesettingsdlg_impl.h b/src/settings/revisiontreesettingsdlg_impl.h
index dcf69c2..1ff54e5 100644
--- a/src/settings/revisiontreesettingsdlg_impl.h
+++ b/src/settings/revisiontreesettingsdlg_impl.h
@@ -20,7 +20,7 @@
#ifndef REVISIONTREESETTINGSDLG_IMPL_H
#define REVISIONTREESETTINGSDLG_IMPL_H
-#include "src/settings/revisiontree_settings.h"
+#include "revisiontree_settings.h"
class RevisiontreeSettingsDlg_impl: public RevisiontreeSettingsDlg
{
diff --git a/src/settings/subversionsettings_impl.h b/src/settings/subversionsettings_impl.h
index 5bb84c2..bba2713 100644
--- a/src/settings/subversionsettings_impl.h
+++ b/src/settings/subversionsettings_impl.h
@@ -21,7 +21,7 @@
#ifndef SUBVERSIONSETTINGS_IMPL_H
#define SUBVERSIONSETTINGS_IMPL_H
-#include "src/settings/subversion_settings.h"
+#include "subversion_settings.h"
class SubversionSettings_impl : public SubversionSettings
{
diff --git a/src/svnfrontend/filelistviewitem.h b/src/svnfrontend/filelistviewitem.h
index f8a95e5..cc82456 100644
--- a/src/svnfrontend/filelistviewitem.h
+++ b/src/svnfrontend/filelistviewitem.h
@@ -24,7 +24,7 @@
#include <klistview.h>
#include <tqdatetime.h>
#include <tqptrlist.h>
-#include "src/svnqt/svnqttypes.hpp"
+#include "svnqttypes.hpp"
class TQPainter;
class KFileItem;
diff --git a/src/svnfrontend/fronthelpers/propertylist.h b/src/svnfrontend/fronthelpers/propertylist.h
index 49ac137..9d9a9e0 100644
--- a/src/svnfrontend/fronthelpers/propertylist.h
+++ b/src/svnfrontend/fronthelpers/propertylist.h
@@ -21,7 +21,7 @@
#define PROPERTYLIST_H
#include <klistview.h>
-#include "src/svnqt/svnqttypes.hpp"
+#include "svnqttypes.hpp"
/**
@author
diff --git a/src/svnfrontend/itemdisplay.h b/src/svnfrontend/itemdisplay.h
index caf09da..f4d1f28 100644
--- a/src/svnfrontend/itemdisplay.h
+++ b/src/svnfrontend/itemdisplay.h
@@ -21,7 +21,7 @@
#ifndef __ITEMDISPLAY_H
#define __ITEMDISPLAY_H
-#include "src/svnqt/svnqttypes.hpp"
+#include "svnqttypes.hpp"
#include <tqptrlist.h>
#include <tqstring.h>
#include <kurl.h>
diff --git a/src/svnfrontend/stopdlg.h b/src/svnfrontend/stopdlg.h
index 0194fcc..973d30e 100644
--- a/src/svnfrontend/stopdlg.h
+++ b/src/svnfrontend/stopdlg.h
@@ -20,7 +20,7 @@
#ifndef STOPDLG_H
#define STOPDLG_H
-#include "src/svnfrontend/fronthelpers/cursorstack.h"
+#include "cursorstack.h"
#include <kdialogbase.h>
diff --git a/src/svnfrontend/svnitem.h b/src/svnfrontend/svnitem.h
index 68dd328..11458fa 100644
--- a/src/svnfrontend/svnitem.h
+++ b/src/svnfrontend/svnitem.h
@@ -21,8 +21,8 @@
#ifndef __SVN_ITEM_H
#define __SVN_ITEM_H
-#include "src/svnqt/smart_pointer.hpp"
-#include "src/svnqt/svnqttypes.hpp"
+#include "smart_pointer.hpp"
+#include "svnqttypes.hpp"
#include <kmimetype.h>
#include <tqstring.h>
#include <tqdatetime.h>
diff --git a/src/svnfrontend/tdesvnfilelist.h b/src/svnfrontend/tdesvnfilelist.h
index d1a9f78..97cb902 100644
--- a/src/svnfrontend/tdesvnfilelist.h
+++ b/src/svnfrontend/tdesvnfilelist.h
@@ -22,8 +22,8 @@
#include "itemdisplay.h"
#include "filelistviewitem.h"
-#include "src/svnqt/status.hpp"
-#include "src/svnqt/client.hpp"
+#include "status.hpp"
+#include "client.hpp"
#include <klistview.h>
#include <kurl.h>
diff --git a/src/tdesvn_part.cpp b/src/tdesvn_part.cpp
index a2fbba6..bc67df2 100644
--- a/src/tdesvn_part.cpp
+++ b/src/tdesvn_part.cpp
@@ -19,13 +19,13 @@
***************************************************************************/
#include "tdesvn_part.h"
-#include "src/settings/tdesvnsettings.h"
-#include "settings/displaysettings_impl.h"
-#include "settings/dispcolorsettings_impl.h"
-#include "settings/revisiontreesettingsdlg_impl.h"
-#include "settings/diffmergesettings_impl.h"
-#include "settings/subversionsettings_impl.h"
-#include "settings/cmdexecsettings_impl.h"
+#include "tdesvnsettings.h"
+#include "displaysettings_impl.h"
+#include "dispcolorsettings_impl.h"
+#include "revisiontreesettingsdlg_impl.h"
+#include "diffmergesettings_impl.h"
+#include "subversionsettings_impl.h"
+#include "cmdexecsettings_impl.h"
#include "tdesvnview.h"
#include "commandline_part.h"
#include "src/svnqt/version_check.hpp"
@@ -163,7 +163,7 @@ KAboutData* tdesvnPart::createAboutData()
KAboutData::License_GPL, "(C) 2005-2007 Rajko Albrecht",0,
0, "[email protected]");
about->addAuthor( "Rajko Albrecht", 0, "[email protected]" );
- about->setOtherText(m_Extratext);
+ about->setOtherText(m_Extratext.ascii());
about->setHomepage("http://tdesvn.alwins-world.de/");
about->setBugAddress("[email protected]");
about->setTranslator(I18N_NOOP("tdesvn: NAME OF TRANSLATORS\\nYour names"),
diff --git a/src/tdesvnview.cpp b/src/tdesvnview.cpp
index 5ba64a1..f354e0a 100644
--- a/src/tdesvnview.cpp
+++ b/src/tdesvnview.cpp
@@ -27,11 +27,11 @@
#include "svnfrontend/loaddmpdlg_impl.h"
#include "svnfrontend/stopdlg.h"
#include "svnfrontend/fronthelpers/propertylist.h"
-#include "src/settings/tdesvnsettings.h"
-#include "src/svnqt/url.hpp"
-#include "src/svnqt/repository.hpp"
-#include "src/svnqt/version_check.hpp"
-#include "src/svnqt/svnqttypes.hpp"
+#include "tdesvnsettings.h"
+#include "url.hpp"
+#include "repository.hpp"
+#include "version_check.hpp"
+#include "svnqttypes.hpp"
#include <tqpainter.h>
#include <tqlayout.h>
diff --git a/src/tdesvnview.h b/src/tdesvnview.h
index 00c68b6..3988ed7 100644
--- a/src/tdesvnview.h
+++ b/src/tdesvnview.h
@@ -22,7 +22,7 @@
#ifndef _KDESVNVIEW_H_
#define _KDESVNVIEW_H_
-#include "src/svnqt/repositorylistener.hpp"
+#include "repositorylistener.hpp"
#include <tqwidget.h>
#include <kparts/part.h>
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-11 20:55:20 +0000