diff options
Diffstat (limited to 'src/svnfrontend')
-rw-r--r-- | src/svnfrontend/blamedisplay.ui | 3 | ||||
-rw-r--r-- | src/svnfrontend/blamedisplay_impl.cpp | 12 | ||||
-rw-r--r-- | src/svnfrontend/fillcachethread.cpp | 8 | ||||
-rw-r--r-- | src/svnfrontend/fillcachethread.h | 1 | ||||
-rw-r--r-- | src/svnfrontend/fronthelpers/checkoutinfo.ui | 4 | ||||
-rw-r--r-- | src/svnfrontend/modifiedthread.h | 1 | ||||
-rw-r--r-- | src/svnfrontend/svnlogdlg.ui | 3 | ||||
-rw-r--r-- | src/svnfrontend/tcontextlistener.cpp | 8 | ||||
-rw-r--r-- | src/svnfrontend/threadcontextlistenerdata.h | 3 |
9 files changed, 26 insertions, 17 deletions
diff --git a/src/svnfrontend/blamedisplay.ui b/src/svnfrontend/blamedisplay.ui index 4a6851c..dd33704 100644 --- a/src/svnfrontend/blamedisplay.ui +++ b/src/svnfrontend/blamedisplay.ui @@ -97,6 +97,9 @@ <slot>slotItemDoubleClicked(TQListViewItem*)</slot> </connection> </connections> +<forwards> + <forward>class TQListViewItem;</forward> +</forwards> <Q_SLOTS> <slot access="protected">slotContextMenuRequested(KListView*,TQListViewItem*, const TQPoint&)</slot> <slot access="protected">slotItemDoubleClicked(TQListViewItem*)</slot> diff --git a/src/svnfrontend/blamedisplay_impl.cpp b/src/svnfrontend/blamedisplay_impl.cpp index 0c5d9c1..06727a5 100644 --- a/src/svnfrontend/blamedisplay_impl.cpp +++ b/src/svnfrontend/blamedisplay_impl.cpp @@ -19,11 +19,11 @@ ***************************************************************************/ #include "blamedisplay_impl.h" #include "simple_logcb.h" -#include "src/settings/tdesvnsettings.h" -#include "src/svnqt/log_entry.hpp" -#include "fronthelpers/cursorstack.h" -#include "fronthelpers/widgetblockstack.h" -#include "src/ksvnwidgets/encodingselector_impl.h" +#include "tdesvnsettings.h" +#include "log_entry.hpp" +#include "cursorstack.h" +#include "widgetblockstack.h" +#include "encodingselector_impl.h" #include <klistview.h> #include <kglobalsettings.h> @@ -66,7 +66,7 @@ public: void localeChanged() { if (!codec_searched) { - cc = TQTextCodec::codecForName(Kdesvnsettings::locale_for_blame()); + cc = TQTextCodec::codecForName(Kdesvnsettings::locale_for_blame().ascii()); codec_searched = true; } if (cc) { diff --git a/src/svnfrontend/fillcachethread.cpp b/src/svnfrontend/fillcachethread.cpp index 3f994bf..e2ee7f4 100644 --- a/src/svnfrontend/fillcachethread.cpp +++ b/src/svnfrontend/fillcachethread.cpp @@ -20,10 +20,10 @@ #include "fillcachethread.h" #include "tcontextlistener.h" -#include "src/svnqt/cache/LogCache.hpp" -#include "src/svnqt/cache/ReposLog.hpp" -#include "src/svnqt/cache/DatabaseException.hpp" -#include "src/tdesvn_events.h" +#include "LogCache.hpp" +#include "ReposLog.hpp" +#include "DatabaseException.hpp" +#include "tdesvn_events.h" #include <tqobject.h> #include <kdebug.h> diff --git a/src/svnfrontend/fillcachethread.h b/src/svnfrontend/fillcachethread.h index 295f28b..1b20e73 100644 --- a/src/svnfrontend/fillcachethread.h +++ b/src/svnfrontend/fillcachethread.h @@ -29,6 +29,7 @@ #include <tqthread.h> #include <tqevent.h> +#include <tqmutex.h> class TQObject; diff --git a/src/svnfrontend/fronthelpers/checkoutinfo.ui b/src/svnfrontend/fronthelpers/checkoutinfo.ui index 9334675..048711e 100644 --- a/src/svnfrontend/fronthelpers/checkoutinfo.ui +++ b/src/svnfrontend/fronthelpers/checkoutinfo.ui @@ -186,7 +186,7 @@ </customwidget> <customwidget> <class>DepthSelector</class> - <header location="local">src/ksvnwidgets/depthselector.h</header> + <header location="local">depthselector.h</header> <sizehint> <width>-1</width> <height>30</height> @@ -218,6 +218,6 @@ <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>rangeinput_impl.h</includehint> - <includehint>src/ksvnwidgets/depthselector.h</includehint> + <includehint>depthselector.h</includehint> </includehints> </UI> diff --git a/src/svnfrontend/modifiedthread.h b/src/svnfrontend/modifiedthread.h index 0574c73..93beb33 100644 --- a/src/svnfrontend/modifiedthread.h +++ b/src/svnfrontend/modifiedthread.h @@ -29,6 +29,7 @@ #include <tqthread.h> #include <tqevent.h> +#include <tqmutex.h> class TQObject; diff --git a/src/svnfrontend/svnlogdlg.ui b/src/svnfrontend/svnlogdlg.ui index f6ba858..1c139cb 100644 --- a/src/svnfrontend/svnlogdlg.ui +++ b/src/svnfrontend/svnlogdlg.ui @@ -462,6 +462,9 @@ <slot access="protected">slotRevisionSelected()</slot> <slot access="protected">slotGetLogs()</slot> </Q_SLOTS> +<forwards> + <forward>class TQListViewItem;</forward> +</forwards> <layoutdefaults spacing="2" margin="2"/> <includehints> <includehint>kpushbutton.h</includehint> diff --git a/src/svnfrontend/tcontextlistener.cpp b/src/svnfrontend/tcontextlistener.cpp index 315daed..53d7892 100644 --- a/src/svnfrontend/tcontextlistener.cpp +++ b/src/svnfrontend/tcontextlistener.cpp @@ -20,10 +20,10 @@ #include "tcontextlistener.h" #include "ccontextlistener.h" -#include "src/ksvnwidgets/authdialogimpl.h" -#include "src/ksvnwidgets/logmsg_impl.h" -#include "src/ksvnwidgets/ssltrustprompt_impl.h" -#include "src/helpers/stringhelper.h" +#include "authdialogimpl.h" +#include "logmsg_impl.h" +#include "ssltrustprompt_impl.h" +#include "stringhelper.h" #include "threadcontextlistenerdata.h" #include <kapplication.h> diff --git a/src/svnfrontend/threadcontextlistenerdata.h b/src/svnfrontend/threadcontextlistenerdata.h index 82726a7..285817c 100644 --- a/src/svnfrontend/threadcontextlistenerdata.h +++ b/src/svnfrontend/threadcontextlistenerdata.h @@ -20,10 +20,11 @@ #ifndef THREADCONTEXTLISTENERDATA_H #define THREADCONTEXTLISTENERDATA_H -#include "src/svnqt/context_listener.hpp" +#include "context_listener.hpp" #include <tqthread.h> #include <tqstring.h> +#include <tqwaitcondition.h> /** @author Rajko Albrecht |