1043 files changed, 13 insertions, 12 deletions

diff --git a/CMakeL10n.txt b/CMakeL10n.txt
index 30f9d05..a9c7e38 100644
--- a/CMakeL10n.txt
+++ b/CMakeL10n.txt
@@ -23,4 +23,4 @@ include( TDEL10n )
 
 ##### create translation templates ##############
 
-tde_l10n_create_template( "messages/ktorrent" )
+tde_l10n_auto_add_subdirectories( )
diff --git a/Makefile.am b/Makefile.am
index fd2862c..ca487be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = doc libktorrent plugins apps scripts translations
+SUBDIRS = doc src translations
 
 # $(UTESTS_DIR)
 
diff --git a/src/CMakeL10n.txt b/src/CMakeL10n.txt
new file mode 100644
index 0000000..a44265c
--- /dev/null
+++ b/src/CMakeL10n.txt
@@ -0,0 +1,3 @@
+##### create translation templates ##############
+
+tde_l10n_create_template( "messages/ktorrent" )
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..c697655
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = libktorrent plugins apps scripts
diff --git a/apps/Makefile.am b/src/apps/Makefile.am
index 09a6602..09a6602 100644
--- a/apps/Makefile.am
+++ b/src/apps/Makefile.am
diff --git a/apps/ktcachecheck/Makefile.am b/src/apps/ktcachecheck/Makefile.am
index a9f5d3e..a9f5d3e 100644
--- a/apps/ktcachecheck/Makefile.am
+++ b/src/apps/ktcachecheck/Makefile.am
diff --git a/apps/ktcachecheck/cachecheck.cpp b/src/apps/ktcachecheck/cachecheck.cpp
index 191ed7a..191ed7a 100644
--- a/apps/ktcachecheck/cachecheck.cpp
+++ b/src/apps/ktcachecheck/cachecheck.cpp
diff --git a/apps/ktcachecheck/cachechecker.cpp b/src/apps/ktcachecheck/cachechecker.cpp
index 3c3b35e..3c3b35e 100644
--- a/apps/ktcachecheck/cachechecker.cpp
+++ b/src/apps/ktcachecheck/cachechecker.cpp
diff --git a/apps/ktcachecheck/cachechecker.h b/src/apps/ktcachecheck/cachechecker.h
index 27d58ac..27d58ac 100644
--- a/apps/ktcachecheck/cachechecker.h
+++ b/src/apps/ktcachecheck/cachechecker.h
diff --git a/apps/ktcachecheck/multicachechecker.cpp b/src/apps/ktcachecheck/multicachechecker.cpp
index 53e8fee..53e8fee 100644
--- a/apps/ktcachecheck/multicachechecker.cpp
+++ b/src/apps/ktcachecheck/multicachechecker.cpp
diff --git a/apps/ktcachecheck/multicachechecker.h b/src/apps/ktcachecheck/multicachechecker.h
index fc57792..fc57792 100644
--- a/apps/ktcachecheck/multicachechecker.h
+++ b/src/apps/ktcachecheck/multicachechecker.h
diff --git a/apps/ktcachecheck/singlecachechecker.cpp b/src/apps/ktcachecheck/singlecachechecker.cpp
index ab64fc3..ab64fc3 100644
--- a/apps/ktcachecheck/singlecachechecker.cpp
+++ b/src/apps/ktcachecheck/singlecachechecker.cpp
diff --git a/apps/ktcachecheck/singlecachechecker.h b/src/apps/ktcachecheck/singlecachechecker.h
index fdec69d..fdec69d 100644
--- a/apps/ktcachecheck/singlecachechecker.h
+++ b/src/apps/ktcachecheck/singlecachechecker.h
diff --git a/apps/ktorrent/Makefile.am b/src/apps/ktorrent/Makefile.am
index 87182d1..4df281b 100644
--- a/apps/ktorrent/Makefile.am
+++ b/src/apps/ktorrent/Makefile.am
@@ -7,7 +7,7 @@ bin_PROGRAMS = ktorrent
 
 
 # set the include path for X, qt and KDE
-INCLUDES = -I$(top_srcdir)/libktorrent -I$(top_builddir)/libktorrent $(all_includes)
+INCLUDES = -I$(top_srcdir)/src/libktorrent -I$(top_builddir)/src/libktorrent $(all_includes)
 
 # the library search path. 
 ktorrent_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
diff --git a/apps/ktorrent/README b/src/apps/ktorrent/README
index 39de8b2..39de8b2 100644
--- a/apps/ktorrent/README
+++ b/src/apps/ktorrent/README
diff --git a/apps/ktorrent/addpeerwidget.cpp b/src/apps/ktorrent/addpeerwidget.cpp
index 063a6a9..063a6a9 100644
--- a/apps/ktorrent/addpeerwidget.cpp
+++ b/src/apps/ktorrent/addpeerwidget.cpp
diff --git a/apps/ktorrent/addpeerwidget.h b/src/apps/ktorrent/addpeerwidget.h
index ed394a8..ed394a8 100644
--- a/apps/ktorrent/addpeerwidget.h
+++ b/src/apps/ktorrent/addpeerwidget.h
diff --git a/apps/ktorrent/addpeerwidgetbase.ui b/src/apps/ktorrent/addpeerwidgetbase.ui
index fbd148b..fbd148b 100644
--- a/apps/ktorrent/addpeerwidgetbase.ui
+++ b/src/apps/ktorrent/addpeerwidgetbase.ui
diff --git a/apps/ktorrent/advancedpref.ui b/src/apps/ktorrent/advancedpref.ui
index 0d8c387..0d8c387 100644
--- a/apps/ktorrent/advancedpref.ui
+++ b/src/apps/ktorrent/advancedpref.ui
diff --git a/apps/ktorrent/custom_widgets.cw b/src/apps/ktorrent/custom_widgets.cw
index 9e8426d..9e8426d 100644
--- a/apps/ktorrent/custom_widgets.cw
+++ b/src/apps/ktorrent/custom_widgets.cw
diff --git a/apps/ktorrent/dcopinterface.h b/src/apps/ktorrent/dcopinterface.h
index af00593..af00593 100644
--- a/apps/ktorrent/dcopinterface.h
+++ b/src/apps/ktorrent/dcopinterface.h
diff --git a/apps/ktorrent/downloadpref.ui b/src/apps/ktorrent/downloadpref.ui
index 091aa6d..091aa6d 100644
--- a/apps/ktorrent/downloadpref.ui
+++ b/src/apps/ktorrent/downloadpref.ui
diff --git a/apps/ktorrent/fileselectdlg.cpp b/src/apps/ktorrent/fileselectdlg.cpp
index a6dec27..a6dec27 100644
--- a/apps/ktorrent/fileselectdlg.cpp
+++ b/src/apps/ktorrent/fileselectdlg.cpp
diff --git a/apps/ktorrent/fileselectdlg.h b/src/apps/ktorrent/fileselectdlg.h
index 3a941c2..3a941c2 100644
--- a/apps/ktorrent/fileselectdlg.h
+++ b/src/apps/ktorrent/fileselectdlg.h
diff --git a/apps/ktorrent/fileselectdlgbase.ui b/src/apps/ktorrent/fileselectdlgbase.ui
index 9c27cd7..9c27cd7 100644
--- a/apps/ktorrent/fileselectdlgbase.ui
+++ b/src/apps/ktorrent/fileselectdlgbase.ui
diff --git a/apps/ktorrent/filterbar.cpp b/src/apps/ktorrent/filterbar.cpp
index d83895b..d83895b 100644
--- a/apps/ktorrent/filterbar.cpp
+++ b/src/apps/ktorrent/filterbar.cpp
diff --git a/apps/ktorrent/filterbar.h b/src/apps/ktorrent/filterbar.h
index 151fa73..151fa73 100644
--- a/apps/ktorrent/filterbar.h
+++ b/src/apps/ktorrent/filterbar.h
diff --git a/apps/ktorrent/generalpref.ui b/src/apps/ktorrent/generalpref.ui
index 452c1df..452c1df 100644
--- a/apps/ktorrent/generalpref.ui
+++ b/src/apps/ktorrent/generalpref.ui
diff --git a/apps/ktorrent/groups/Makefile.am b/src/apps/ktorrent/groups/Makefile.am
index c1c3308..c1c3308 100644
--- a/apps/ktorrent/groups/Makefile.am
+++ b/src/apps/ktorrent/groups/Makefile.am
diff --git a/apps/ktorrent/groups/activedownloadsgroup.cpp b/src/apps/ktorrent/groups/activedownloadsgroup.cpp
index a260f5a..a260f5a 100644
--- a/apps/ktorrent/groups/activedownloadsgroup.cpp
+++ b/src/apps/ktorrent/groups/activedownloadsgroup.cpp
diff --git a/apps/ktorrent/groups/activedownloadsgroup.h b/src/apps/ktorrent/groups/activedownloadsgroup.h
index de62493..de62493 100644
--- a/apps/ktorrent/groups/activedownloadsgroup.h
+++ b/src/apps/ktorrent/groups/activedownloadsgroup.h
diff --git a/apps/ktorrent/groups/activegroup.cpp b/src/apps/ktorrent/groups/activegroup.cpp
index 7a5e640..7a5e640 100644
--- a/apps/ktorrent/groups/activegroup.cpp
+++ b/src/apps/ktorrent/groups/activegroup.cpp
diff --git a/apps/ktorrent/groups/activegroup.h b/src/apps/ktorrent/groups/activegroup.h
index 73e2aef..73e2aef 100644
--- a/apps/ktorrent/groups/activegroup.h
+++ b/src/apps/ktorrent/groups/activegroup.h
diff --git a/apps/ktorrent/groups/activeuploadsgroup.cpp b/src/apps/ktorrent/groups/activeuploadsgroup.cpp
index 6415eb9..6415eb9 100644
--- a/apps/ktorrent/groups/activeuploadsgroup.cpp
+++ b/src/apps/ktorrent/groups/activeuploadsgroup.cpp
diff --git a/apps/ktorrent/groups/activeuploadsgroup.h b/src/apps/ktorrent/groups/activeuploadsgroup.h
index 02fd468..02fd468 100644
--- a/apps/ktorrent/groups/activeuploadsgroup.h
+++ b/src/apps/ktorrent/groups/activeuploadsgroup.h
diff --git a/apps/ktorrent/groups/allgroup.cpp b/src/apps/ktorrent/groups/allgroup.cpp
index 6b8ffb5..6b8ffb5 100644
--- a/apps/ktorrent/groups/allgroup.cpp
+++ b/src/apps/ktorrent/groups/allgroup.cpp
diff --git a/apps/ktorrent/groups/allgroup.h b/src/apps/ktorrent/groups/allgroup.h
index 399691b..399691b 100644
--- a/apps/ktorrent/groups/allgroup.h
+++ b/src/apps/ktorrent/groups/allgroup.h
diff --git a/apps/ktorrent/groups/downloadgroup.cpp b/src/apps/ktorrent/groups/downloadgroup.cpp
index 2dfcf0d..2dfcf0d 100644
--- a/apps/ktorrent/groups/downloadgroup.cpp
+++ b/src/apps/ktorrent/groups/downloadgroup.cpp
diff --git a/apps/ktorrent/groups/downloadgroup.h b/src/apps/ktorrent/groups/downloadgroup.h
index 959f74b..959f74b 100644
--- a/apps/ktorrent/groups/downloadgroup.h
+++ b/src/apps/ktorrent/groups/downloadgroup.h
diff --git a/apps/ktorrent/groups/group.cpp b/src/apps/ktorrent/groups/group.cpp
index 7a3cbf2..7a3cbf2 100644
--- a/apps/ktorrent/groups/group.cpp
+++ b/src/apps/ktorrent/groups/group.cpp
diff --git a/apps/ktorrent/groups/group.h b/src/apps/ktorrent/groups/group.h
index 9f4775d..9f4775d 100644
--- a/apps/ktorrent/groups/group.h
+++ b/src/apps/ktorrent/groups/group.h
diff --git a/apps/ktorrent/groups/groupmanager.cpp b/src/apps/ktorrent/groups/groupmanager.cpp
index 6cfd193..6cfd193 100644
--- a/apps/ktorrent/groups/groupmanager.cpp
+++ b/src/apps/ktorrent/groups/groupmanager.cpp
diff --git a/apps/ktorrent/groups/groupmanager.h b/src/apps/ktorrent/groups/groupmanager.h
index 5c5491e..5c5491e 100644
--- a/apps/ktorrent/groups/groupmanager.h
+++ b/src/apps/ktorrent/groups/groupmanager.h
diff --git a/apps/ktorrent/groups/groupview.cpp b/src/apps/ktorrent/groups/groupview.cpp
index eeef28b..eeef28b 100644
--- a/apps/ktorrent/groups/groupview.cpp
+++ b/src/apps/ktorrent/groups/groupview.cpp
diff --git a/apps/ktorrent/groups/groupview.h b/src/apps/ktorrent/groups/groupview.h
index 00a47ed..00a47ed 100644
--- a/apps/ktorrent/groups/groupview.h
+++ b/src/apps/ktorrent/groups/groupview.h
diff --git a/apps/ktorrent/groups/inactivedownloadsgroup.cpp b/src/apps/ktorrent/groups/inactivedownloadsgroup.cpp
index c6b37bc..c6b37bc 100644
--- a/apps/ktorrent/groups/inactivedownloadsgroup.cpp
+++ b/src/apps/ktorrent/groups/inactivedownloadsgroup.cpp
diff --git a/apps/ktorrent/groups/inactivedownloadsgroup.h b/src/apps/ktorrent/groups/inactivedownloadsgroup.h
index 4b80ca6..4b80ca6 100644
--- a/apps/ktorrent/groups/inactivedownloadsgroup.h
+++ b/src/apps/ktorrent/groups/inactivedownloadsgroup.h
diff --git a/apps/ktorrent/groups/inactivegroup.cpp b/src/apps/ktorrent/groups/inactivegroup.cpp
index 326436f..326436f 100644
--- a/apps/ktorrent/groups/inactivegroup.cpp
+++ b/src/apps/ktorrent/groups/inactivegroup.cpp
diff --git a/apps/ktorrent/groups/inactivegroup.h b/src/apps/ktorrent/groups/inactivegroup.h
index 027138f..027138f 100644
--- a/apps/ktorrent/groups/inactivegroup.h
+++ b/src/apps/ktorrent/groups/inactivegroup.h
diff --git a/apps/ktorrent/groups/inactiveuploadsgroup.cpp b/src/apps/ktorrent/groups/inactiveuploadsgroup.cpp
index 967dc9c..967dc9c 100644
--- a/apps/ktorrent/groups/inactiveuploadsgroup.cpp
+++ b/src/apps/ktorrent/groups/inactiveuploadsgroup.cpp
diff --git a/apps/ktorrent/groups/inactiveuploadsgroup.h b/src/apps/ktorrent/groups/inactiveuploadsgroup.h
index 78e1840..78e1840 100644
--- a/apps/ktorrent/groups/inactiveuploadsgroup.h
+++ b/src/apps/ktorrent/groups/inactiveuploadsgroup.h
diff --git a/apps/ktorrent/groups/queueddownloadsgroup.cpp b/src/apps/ktorrent/groups/queueddownloadsgroup.cpp
index 36fab9f..36fab9f 100644
--- a/apps/ktorrent/groups/queueddownloadsgroup.cpp
+++ b/src/apps/ktorrent/groups/queueddownloadsgroup.cpp
diff --git a/apps/ktorrent/groups/queueddownloadsgroup.h b/src/apps/ktorrent/groups/queueddownloadsgroup.h
index 019a69c..019a69c 100644
--- a/apps/ktorrent/groups/queueddownloadsgroup.h
+++ b/src/apps/ktorrent/groups/queueddownloadsgroup.h
diff --git a/apps/ktorrent/groups/queueduploadsgroup.cpp b/src/apps/ktorrent/groups/queueduploadsgroup.cpp
index c51ab42..c51ab42 100644
--- a/apps/ktorrent/groups/queueduploadsgroup.cpp
+++ b/src/apps/ktorrent/groups/queueduploadsgroup.cpp
diff --git a/apps/ktorrent/groups/queueduploadsgroup.h b/src/apps/ktorrent/groups/queueduploadsgroup.h
index 601e02f..601e02f 100644
--- a/apps/ktorrent/groups/queueduploadsgroup.h
+++ b/src/apps/ktorrent/groups/queueduploadsgroup.h
diff --git a/apps/ktorrent/groups/torrentdrag.cpp b/src/apps/ktorrent/groups/torrentdrag.cpp
index c7296fe..c7296fe 100644
--- a/apps/ktorrent/groups/torrentdrag.cpp
+++ b/src/apps/ktorrent/groups/torrentdrag.cpp
diff --git a/apps/ktorrent/groups/torrentdrag.h b/src/apps/ktorrent/groups/torrentdrag.h
index 6943d18..6943d18 100644
--- a/apps/ktorrent/groups/torrentdrag.h
+++ b/src/apps/ktorrent/groups/torrentdrag.h
diff --git a/apps/ktorrent/groups/torrentgroup.cpp b/src/apps/ktorrent/groups/torrentgroup.cpp
index d44b744..d44b744 100644
--- a/apps/ktorrent/groups/torrentgroup.cpp
+++ b/src/apps/ktorrent/groups/torrentgroup.cpp
diff --git a/apps/ktorrent/groups/torrentgroup.h b/src/apps/ktorrent/groups/torrentgroup.h
index 14f1b37..14f1b37 100644
--- a/apps/ktorrent/groups/torrentgroup.h
+++ b/src/apps/ktorrent/groups/torrentgroup.h
diff --git a/apps/ktorrent/groups/uploadgroup.cpp b/src/apps/ktorrent/groups/uploadgroup.cpp
index 3a320b5..3a320b5 100644
--- a/apps/ktorrent/groups/uploadgroup.cpp
+++ b/src/apps/ktorrent/groups/uploadgroup.cpp
diff --git a/apps/ktorrent/groups/uploadgroup.h b/src/apps/ktorrent/groups/uploadgroup.h
index f90a5bd..f90a5bd 100644
--- a/apps/ktorrent/groups/uploadgroup.h
+++ b/src/apps/ktorrent/groups/uploadgroup.h
diff --git a/apps/ktorrent/groups/userdownloadsgroup.cpp b/src/apps/ktorrent/groups/userdownloadsgroup.cpp
index ff1b13b..ff1b13b 100644
--- a/apps/ktorrent/groups/userdownloadsgroup.cpp
+++ b/src/apps/ktorrent/groups/userdownloadsgroup.cpp
diff --git a/apps/ktorrent/groups/userdownloadsgroup.h b/src/apps/ktorrent/groups/userdownloadsgroup.h
index a77e7ac..a77e7ac 100644
--- a/apps/ktorrent/groups/userdownloadsgroup.h
+++ b/src/apps/ktorrent/groups/userdownloadsgroup.h
diff --git a/apps/ktorrent/groups/useruploadsgroup.cpp b/src/apps/ktorrent/groups/useruploadsgroup.cpp
index f8c9d96..f8c9d96 100644
--- a/apps/ktorrent/groups/useruploadsgroup.cpp
+++ b/src/apps/ktorrent/groups/useruploadsgroup.cpp
diff --git a/apps/ktorrent/groups/useruploadsgroup.h b/src/apps/ktorrent/groups/useruploadsgroup.h
index 9286c88..9286c88 100644
--- a/apps/ktorrent/groups/useruploadsgroup.h
+++ b/src/apps/ktorrent/groups/useruploadsgroup.h
diff --git a/apps/ktorrent/hi128-app-ktorrent.png b/src/apps/ktorrent/hi128-app-ktorrent.png
index fbe2294..fbe2294 100644
--- a/apps/ktorrent/hi128-app-ktorrent.png
+++ b/src/apps/ktorrent/hi128-app-ktorrent.png
diff --git a/apps/ktorrent/hi128-mime-torrent.png b/src/apps/ktorrent/hi128-mime-torrent.png
index f8ee4f1..f8ee4f1 100644
--- a/apps/ktorrent/hi128-mime-torrent.png
+++ b/src/apps/ktorrent/hi128-mime-torrent.png
diff --git a/apps/ktorrent/hi16-app-ktorrent.png b/src/apps/ktorrent/hi16-app-ktorrent.png
index 6956852..6956852 100644
--- a/apps/ktorrent/hi16-app-ktorrent.png
+++ b/src/apps/ktorrent/hi16-app-ktorrent.png
diff --git a/apps/ktorrent/hi16-mime-torrent.png b/src/apps/ktorrent/hi16-mime-torrent.png
index 36c11bf..36c11bf 100644
--- a/apps/ktorrent/hi16-mime-torrent.png
+++ b/src/apps/ktorrent/hi16-mime-torrent.png
diff --git a/apps/ktorrent/hi22-action-ktencrypted.png b/src/apps/ktorrent/hi22-action-ktencrypted.png
index cb66fb9..cb66fb9 100644
--- a/apps/ktorrent/hi22-action-ktencrypted.png
+++ b/src/apps/ktorrent/hi22-action-ktencrypted.png
diff --git a/apps/ktorrent/hi22-action-ktremove.png b/src/apps/ktorrent/hi22-action-ktremove.png
index 7df1928..7df1928 100644
--- a/apps/ktorrent/hi22-action-ktremove.png
+++ b/src/apps/ktorrent/hi22-action-ktremove.png
diff --git a/apps/ktorrent/hi22-action-ktstart.png b/src/apps/ktorrent/hi22-action-ktstart.png
index a55e49c..a55e49c 100644
--- a/apps/ktorrent/hi22-action-ktstart.png
+++ b/src/apps/ktorrent/hi22-action-ktstart.png
diff --git a/apps/ktorrent/hi22-action-ktstart_all.png b/src/apps/ktorrent/hi22-action-ktstart_all.png
index f46ed84..f46ed84 100644
--- a/apps/ktorrent/hi22-action-ktstart_all.png
+++ b/src/apps/ktorrent/hi22-action-ktstart_all.png
diff --git a/apps/ktorrent/hi22-action-ktstop.png b/src/apps/ktorrent/hi22-action-ktstop.png
index 9c464de..9c464de 100644
--- a/apps/ktorrent/hi22-action-ktstop.png
+++ b/src/apps/ktorrent/hi22-action-ktstop.png
diff --git a/apps/ktorrent/hi22-action-ktstop_all.png b/src/apps/ktorrent/hi22-action-ktstop_all.png
index 73b548b..73b548b 100644
--- a/apps/ktorrent/hi22-action-ktstop_all.png
+++ b/src/apps/ktorrent/hi22-action-ktstop_all.png
diff --git a/apps/ktorrent/hi22-app-ktorrent.png b/src/apps/ktorrent/hi22-app-ktorrent.png
index 0b04e49..0b04e49 100644
--- a/apps/ktorrent/hi22-app-ktorrent.png
+++ b/src/apps/ktorrent/hi22-app-ktorrent.png
diff --git a/apps/ktorrent/hi22-mime-torrent.png b/src/apps/ktorrent/hi22-mime-torrent.png
index 5e28465..5e28465 100644
--- a/apps/ktorrent/hi22-mime-torrent.png
+++ b/src/apps/ktorrent/hi22-mime-torrent.png
diff --git a/apps/ktorrent/hi32-app-ktorrent.png b/src/apps/ktorrent/hi32-app-ktorrent.png
index b074bed..b074bed 100644
--- a/apps/ktorrent/hi32-app-ktorrent.png
+++ b/src/apps/ktorrent/hi32-app-ktorrent.png
diff --git a/apps/ktorrent/hi32-mime-torrent.png b/src/apps/ktorrent/hi32-mime-torrent.png
index dbaca97..dbaca97 100644
--- a/apps/ktorrent/hi32-mime-torrent.png
+++ b/src/apps/ktorrent/hi32-mime-torrent.png
diff --git a/apps/ktorrent/hi48-action-ktplugins.png b/src/apps/ktorrent/hi48-action-ktplugins.png
index 936fd6a..936fd6a 100644
--- a/apps/ktorrent/hi48-action-ktplugins.png
+++ b/src/apps/ktorrent/hi48-action-ktplugins.png
diff --git a/apps/ktorrent/hi48-app-ktorrent.png b/src/apps/ktorrent/hi48-app-ktorrent.png
index f2c81eb..f2c81eb 100644
--- a/apps/ktorrent/hi48-app-ktorrent.png
+++ b/src/apps/ktorrent/hi48-app-ktorrent.png
diff --git a/apps/ktorrent/hi48-mime-torrent.png b/src/apps/ktorrent/hi48-mime-torrent.png
index 95b3c0d..95b3c0d 100644
--- a/apps/ktorrent/hi48-mime-torrent.png
+++ b/src/apps/ktorrent/hi48-mime-torrent.png
diff --git a/apps/ktorrent/hi64-action-ktinfowidget.png b/src/apps/ktorrent/hi64-action-ktinfowidget.png
index 703696d..703696d 100644
--- a/apps/ktorrent/hi64-action-ktinfowidget.png
+++ b/src/apps/ktorrent/hi64-action-ktinfowidget.png
diff --git a/apps/ktorrent/hi64-action-ktqueuemanager.png b/src/apps/ktorrent/hi64-action-ktqueuemanager.png
index 7e21b70..7e21b70 100644
--- a/apps/ktorrent/hi64-action-ktqueuemanager.png
+++ b/src/apps/ktorrent/hi64-action-ktqueuemanager.png
diff --git a/apps/ktorrent/hi64-action-ktupnp.png b/src/apps/ktorrent/hi64-action-ktupnp.png
index 2c7df7d..2c7df7d 100644
--- a/apps/ktorrent/hi64-action-ktupnp.png
+++ b/src/apps/ktorrent/hi64-action-ktupnp.png
diff --git a/apps/ktorrent/hi64-app-ktorrent.png b/src/apps/ktorrent/hi64-app-ktorrent.png
index 453488b..453488b 100644
--- a/apps/ktorrent/hi64-app-ktorrent.png
+++ b/src/apps/ktorrent/hi64-app-ktorrent.png
diff --git a/apps/ktorrent/hi64-filesys-ktprefdownloads.png b/src/apps/ktorrent/hi64-filesys-ktprefdownloads.png
index 8efc3d8..8efc3d8 100644
--- a/apps/ktorrent/hi64-filesys-ktprefdownloads.png
+++ b/src/apps/ktorrent/hi64-filesys-ktprefdownloads.png
diff --git a/apps/ktorrent/hi64-mime-torrent.png b/src/apps/ktorrent/hi64-mime-torrent.png
index 2e7f063..2e7f063 100644
--- a/apps/ktorrent/hi64-mime-torrent.png
+++ b/src/apps/ktorrent/hi64-mime-torrent.png
diff --git a/apps/ktorrent/hisc-app-ktorrent.svgz b/src/apps/ktorrent/hisc-app-ktorrent.svgz
index 3d068d8..3d068d8 100644
--- a/apps/ktorrent/hisc-app-ktorrent.svgz
+++ b/src/apps/ktorrent/hisc-app-ktorrent.svgz
diff --git a/apps/ktorrent/hisc-mime-torrent.svgz b/src/apps/ktorrent/hisc-mime-torrent.svgz
index beb7c28..beb7c28 100644
--- a/apps/ktorrent/hisc-mime-torrent.svgz
+++ b/src/apps/ktorrent/hisc-mime-torrent.svgz
diff --git a/apps/ktorrent/ipfilterwidget.cpp b/src/apps/ktorrent/ipfilterwidget.cpp
index 22c77f7..22c77f7 100644
--- a/apps/ktorrent/ipfilterwidget.cpp
+++ b/src/apps/ktorrent/ipfilterwidget.cpp
diff --git a/apps/ktorrent/ipfilterwidget.h b/src/apps/ktorrent/ipfilterwidget.h
index d8a49e1..d8a49e1 100644
--- a/apps/ktorrent/ipfilterwidget.h
+++ b/src/apps/ktorrent/ipfilterwidget.h
diff --git a/apps/ktorrent/ipfilterwidgetbase.ui b/src/apps/ktorrent/ipfilterwidgetbase.ui
index 6ef38e1..6ef38e1 100644
--- a/apps/ktorrent/ipfilterwidgetbase.ui
+++ b/src/apps/ktorrent/ipfilterwidgetbase.ui
diff --git a/apps/ktorrent/ktorrent.cpp b/src/apps/ktorrent/ktorrent.cpp
index 432d481..432d481 100644
--- a/apps/ktorrent/ktorrent.cpp
+++ b/src/apps/ktorrent/ktorrent.cpp
diff --git a/apps/ktorrent/ktorrent.desktop b/src/apps/ktorrent/ktorrent.desktop
index 3e9bdaa..3e9bdaa 100644
--- a/apps/ktorrent/ktorrent.desktop
+++ b/src/apps/ktorrent/ktorrent.desktop
diff --git a/apps/ktorrent/ktorrent.h b/src/apps/ktorrent/ktorrent.h
index 6669443..6669443 100644
--- a/apps/ktorrent/ktorrent.h
+++ b/src/apps/ktorrent/ktorrent.h
diff --git a/apps/ktorrent/ktorrentapp.cpp b/src/apps/ktorrent/ktorrentapp.cpp
index 9ced625..9ced625 100644
--- a/apps/ktorrent/ktorrentapp.cpp
+++ b/src/apps/ktorrent/ktorrentapp.cpp
diff --git a/apps/ktorrent/ktorrentapp.h b/src/apps/ktorrent/ktorrentapp.h
index 489eb04..489eb04 100644
--- a/apps/ktorrent/ktorrentapp.h
+++ b/src/apps/ktorrent/ktorrentapp.h
diff --git a/apps/ktorrent/ktorrentcore.cpp b/src/apps/ktorrent/ktorrentcore.cpp
index c2aacf4..c2aacf4 100644
--- a/apps/ktorrent/ktorrentcore.cpp
+++ b/src/apps/ktorrent/ktorrentcore.cpp
diff --git a/apps/ktorrent/ktorrentcore.h b/src/apps/ktorrent/ktorrentcore.h
index 4c79ad5..4c79ad5 100644
--- a/apps/ktorrent/ktorrentcore.h
+++ b/src/apps/ktorrent/ktorrentcore.h
diff --git a/apps/ktorrent/ktorrentdcop.cpp b/src/apps/ktorrent/ktorrentdcop.cpp
index 10e09cb..10e09cb 100644
--- a/apps/ktorrent/ktorrentdcop.cpp
+++ b/src/apps/ktorrent/ktorrentdcop.cpp
diff --git a/apps/ktorrent/ktorrentdcop.h b/src/apps/ktorrent/ktorrentdcop.h
index 14f30ba..14f30ba 100644
--- a/apps/ktorrent/ktorrentdcop.h
+++ b/src/apps/ktorrent/ktorrentdcop.h
diff --git a/apps/ktorrent/ktorrentplugin.desktop b/src/apps/ktorrent/ktorrentplugin.desktop
index 29436c8..29436c8 100644
--- a/apps/ktorrent/ktorrentplugin.desktop
+++ b/src/apps/ktorrent/ktorrentplugin.desktop
diff --git a/apps/ktorrent/ktorrentui.rc b/src/apps/ktorrent/ktorrentui.rc
index a5845a1..a5845a1 100644
--- a/apps/ktorrent/ktorrentui.rc
+++ b/src/apps/ktorrent/ktorrentui.rc
diff --git a/apps/ktorrent/ktorrentview.cpp b/src/apps/ktorrent/ktorrentview.cpp
index 4d3983b..4d3983b 100644
--- a/apps/ktorrent/ktorrentview.cpp
+++ b/src/apps/ktorrent/ktorrentview.cpp
diff --git a/apps/ktorrent/ktorrentview.h b/src/apps/ktorrent/ktorrentview.h
index bf52598..bf52598 100644
--- a/apps/ktorrent/ktorrentview.h
+++ b/src/apps/ktorrent/ktorrentview.h
diff --git a/apps/ktorrent/ktorrentviewitem.cpp b/src/apps/ktorrent/ktorrentviewitem.cpp
index 4a60329..4a60329 100644
--- a/apps/ktorrent/ktorrentviewitem.cpp
+++ b/src/apps/ktorrent/ktorrentviewitem.cpp
diff --git a/apps/ktorrent/ktorrentviewitem.h b/src/apps/ktorrent/ktorrentviewitem.h
index 575844d..575844d 100644
--- a/apps/ktorrent/ktorrentviewitem.h
+++ b/src/apps/ktorrent/ktorrentviewitem.h
diff --git a/apps/ktorrent/ktorrentviewmenu.cpp b/src/apps/ktorrent/ktorrentviewmenu.cpp
index 5dca77e..5dca77e 100644
--- a/apps/ktorrent/ktorrentviewmenu.cpp
+++ b/src/apps/ktorrent/ktorrentviewmenu.cpp
diff --git a/apps/ktorrent/ktorrentviewmenu.h b/src/apps/ktorrent/ktorrentviewmenu.h
index 75c5112..75c5112 100644
--- a/apps/ktorrent/ktorrentviewmenu.h
+++ b/src/apps/ktorrent/ktorrentviewmenu.h
diff --git a/apps/ktorrent/leaktrace.cpp b/src/apps/ktorrent/leaktrace.cpp
index 76439ce..76439ce 100644
--- a/apps/ktorrent/leaktrace.cpp
+++ b/src/apps/ktorrent/leaktrace.cpp
diff --git a/apps/ktorrent/main.cpp b/src/apps/ktorrent/main.cpp
index a6b67c8..a6b67c8 100644
--- a/apps/ktorrent/main.cpp
+++ b/src/apps/ktorrent/main.cpp
diff --git a/apps/ktorrent/newui/Makefile.am b/src/apps/ktorrent/newui/Makefile.am
index 6c6576b..871fbb1 100644
--- a/apps/ktorrent/newui/Makefile.am
+++ b/src/apps/ktorrent/newui/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/libktorrent -I$(top_builddir)/libktorrent/ $(all_includes)
+INCLUDES = -I$(top_srcdir)/src/libktorrent -I$(top_builddir)/src/libktorrent/ $(all_includes)
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libnewui.la
diff --git a/apps/ktorrent/newui/button.cpp b/src/apps/ktorrent/newui/button.cpp
index d2d839b..d2d839b 100644
--- a/apps/ktorrent/newui/button.cpp
+++ b/src/apps/ktorrent/newui/button.cpp
diff --git a/apps/ktorrent/newui/button.h b/src/apps/ktorrent/newui/button.h
index 23c45c1..23c45c1 100644
--- a/apps/ktorrent/newui/button.h
+++ b/src/apps/ktorrent/newui/button.h
diff --git a/apps/ktorrent/newui/buttonbar.cpp b/src/apps/ktorrent/newui/buttonbar.cpp
index 640fb3e..640fb3e 100644
--- a/apps/ktorrent/newui/buttonbar.cpp
+++ b/src/apps/ktorrent/newui/buttonbar.cpp
diff --git a/apps/ktorrent/newui/buttonbar.h b/src/apps/ktorrent/newui/buttonbar.h
index 3f23957..3f23957 100644
--- a/apps/ktorrent/newui/buttonbar.h
+++ b/src/apps/ktorrent/newui/buttonbar.h
diff --git a/apps/ktorrent/newui/comdefs.h b/src/apps/ktorrent/newui/comdefs.h
index 8233f12..8233f12 100644
--- a/apps/ktorrent/newui/comdefs.h
+++ b/src/apps/ktorrent/newui/comdefs.h
diff --git a/apps/ktorrent/newui/ddockwindow.cpp b/src/apps/ktorrent/newui/ddockwindow.cpp
index b52815f..b52815f 100644
--- a/apps/ktorrent/newui/ddockwindow.cpp
+++ b/src/apps/ktorrent/newui/ddockwindow.cpp
diff --git a/apps/ktorrent/newui/ddockwindow.h b/src/apps/ktorrent/newui/ddockwindow.h
index 84b5163..84b5163 100644
--- a/apps/ktorrent/newui/ddockwindow.h
+++ b/src/apps/ktorrent/newui/ddockwindow.h
diff --git a/apps/ktorrent/newui/dmainwindow.cpp b/src/apps/ktorrent/newui/dmainwindow.cpp
index d4a2424..d4a2424 100644
--- a/apps/ktorrent/newui/dmainwindow.cpp
+++ b/src/apps/ktorrent/newui/dmainwindow.cpp
diff --git a/apps/ktorrent/newui/dmainwindow.h b/src/apps/ktorrent/newui/dmainwindow.h
index 7483971..7483971 100644
--- a/apps/ktorrent/newui/dmainwindow.h
+++ b/src/apps/ktorrent/newui/dmainwindow.h
diff --git a/apps/ktorrent/newui/docksplitter.cpp b/src/apps/ktorrent/newui/docksplitter.cpp
index 115abf2..115abf2 100644
--- a/apps/ktorrent/newui/docksplitter.cpp
+++ b/src/apps/ktorrent/newui/docksplitter.cpp
diff --git a/apps/ktorrent/newui/docksplitter.h b/src/apps/ktorrent/newui/docksplitter.h
index 3856c4c..3856c4c 100644
--- a/apps/ktorrent/newui/docksplitter.h
+++ b/src/apps/ktorrent/newui/docksplitter.h
diff --git a/apps/ktorrent/newui/dtabwidget.cpp b/src/apps/ktorrent/newui/dtabwidget.cpp
index c74e1d6..c74e1d6 100644
--- a/apps/ktorrent/newui/dtabwidget.cpp
+++ b/src/apps/ktorrent/newui/dtabwidget.cpp
diff --git a/apps/ktorrent/newui/dtabwidget.h b/src/apps/ktorrent/newui/dtabwidget.h
index 529a42d..529a42d 100644
--- a/apps/ktorrent/newui/dtabwidget.h
+++ b/src/apps/ktorrent/newui/dtabwidget.h
diff --git a/apps/ktorrent/pastedialog.cpp b/src/apps/ktorrent/pastedialog.cpp
index 82cf6df..82cf6df 100644
--- a/apps/ktorrent/pastedialog.cpp
+++ b/src/apps/ktorrent/pastedialog.cpp
diff --git a/apps/ktorrent/pastedialog.h b/src/apps/ktorrent/pastedialog.h
index cb31cd2..cb31cd2 100644
--- a/apps/ktorrent/pastedialog.h
+++ b/src/apps/ktorrent/pastedialog.h
diff --git a/apps/ktorrent/pastedlgbase.ui b/src/apps/ktorrent/pastedlgbase.ui
index 4c9539a..4c9539a 100644
--- a/apps/ktorrent/pastedlgbase.ui
+++ b/src/apps/ktorrent/pastedlgbase.ui
diff --git a/apps/ktorrent/pref.cpp b/src/apps/ktorrent/pref.cpp
index da52905..da52905 100644
--- a/apps/ktorrent/pref.cpp
+++ b/src/apps/ktorrent/pref.cpp
diff --git a/apps/ktorrent/pref.h b/src/apps/ktorrent/pref.h
index f9a4331..f9a4331 100644
--- a/apps/ktorrent/pref.h
+++ b/src/apps/ktorrent/pref.h
diff --git a/apps/ktorrent/queuedialog.cpp b/src/apps/ktorrent/queuedialog.cpp
index 69bb1ea..69bb1ea 100644
--- a/apps/ktorrent/queuedialog.cpp
+++ b/src/apps/ktorrent/queuedialog.cpp
diff --git a/apps/ktorrent/queuedialog.h b/src/apps/ktorrent/queuedialog.h
index ae8629c..ae8629c 100644
--- a/apps/ktorrent/queuedialog.h
+++ b/src/apps/ktorrent/queuedialog.h
diff --git a/apps/ktorrent/queuedlg.ui b/src/apps/ktorrent/queuedlg.ui
index 9bd5532..9bd5532 100644
--- a/apps/ktorrent/queuedlg.ui
+++ b/src/apps/ktorrent/queuedlg.ui
diff --git a/apps/ktorrent/scandialog.cpp b/src/apps/ktorrent/scandialog.cpp
index 834539d..834539d 100644
--- a/apps/ktorrent/scandialog.cpp
+++ b/src/apps/ktorrent/scandialog.cpp
diff --git a/apps/ktorrent/scandialog.h b/src/apps/ktorrent/scandialog.h
index b22e1b8..b22e1b8 100644
--- a/apps/ktorrent/scandialog.h
+++ b/src/apps/ktorrent/scandialog.h
diff --git a/apps/ktorrent/scandlgbase.ui b/src/apps/ktorrent/scandlgbase.ui
index 44facbb..44facbb 100644
--- a/apps/ktorrent/scandlgbase.ui
+++ b/src/apps/ktorrent/scandlgbase.ui
diff --git a/apps/ktorrent/speedlimitsdlg.cpp b/src/apps/ktorrent/speedlimitsdlg.cpp
index 70e2f1c..70e2f1c 100644
--- a/apps/ktorrent/speedlimitsdlg.cpp
+++ b/src/apps/ktorrent/speedlimitsdlg.cpp
diff --git a/apps/ktorrent/speedlimitsdlg.h b/src/apps/ktorrent/speedlimitsdlg.h
index 01d3e31..01d3e31 100644
--- a/apps/ktorrent/speedlimitsdlg.h
+++ b/src/apps/ktorrent/speedlimitsdlg.h
diff --git a/apps/ktorrent/speedlimitsdlgbase.ui b/src/apps/ktorrent/speedlimitsdlgbase.ui
index c3997a7..c3997a7 100644
--- a/apps/ktorrent/speedlimitsdlgbase.ui
+++ b/src/apps/ktorrent/speedlimitsdlgbase.ui
diff --git a/apps/ktorrent/torrentcreatordlg.cpp b/src/apps/ktorrent/torrentcreatordlg.cpp
index 25c5e37..25c5e37 100644
--- a/apps/ktorrent/torrentcreatordlg.cpp
+++ b/src/apps/ktorrent/torrentcreatordlg.cpp
diff --git a/apps/ktorrent/torrentcreatordlg.h b/src/apps/ktorrent/torrentcreatordlg.h
index 76ce111..76ce111 100644
--- a/apps/ktorrent/torrentcreatordlg.h
+++ b/src/apps/ktorrent/torrentcreatordlg.h
diff --git a/apps/ktorrent/torrentcreatordlgbase.ui b/src/apps/ktorrent/torrentcreatordlgbase.ui
index 97488be..97488be 100644
--- a/apps/ktorrent/torrentcreatordlgbase.ui
+++ b/src/apps/ktorrent/torrentcreatordlgbase.ui
diff --git a/apps/ktorrent/trayhoverpopup.cpp b/src/apps/ktorrent/trayhoverpopup.cpp
index b325184..b325184 100644
--- a/apps/ktorrent/trayhoverpopup.cpp
+++ b/src/apps/ktorrent/trayhoverpopup.cpp
diff --git a/apps/ktorrent/trayhoverpopup.h b/src/apps/ktorrent/trayhoverpopup.h
index c3cf9fb..c3cf9fb 100644
--- a/apps/ktorrent/trayhoverpopup.h
+++ b/src/apps/ktorrent/trayhoverpopup.h
diff --git a/apps/ktorrent/trayicon.cpp b/src/apps/ktorrent/trayicon.cpp
index 19667ab..19667ab 100644
--- a/apps/ktorrent/trayicon.cpp
+++ b/src/apps/ktorrent/trayicon.cpp
diff --git a/apps/ktorrent/trayicon.h b/src/apps/ktorrent/trayicon.h
index f31767d..f31767d 100644
--- a/apps/ktorrent/trayicon.h
+++ b/src/apps/ktorrent/trayicon.h
diff --git a/apps/ktorrent/viewmanager.cpp b/src/apps/ktorrent/viewmanager.cpp
index eef9d06..eef9d06 100644
--- a/apps/ktorrent/viewmanager.cpp
+++ b/src/apps/ktorrent/viewmanager.cpp
diff --git a/apps/ktorrent/viewmanager.h b/src/apps/ktorrent/viewmanager.h
index e402a92..e402a92 100644
--- a/apps/ktorrent/viewmanager.h
+++ b/src/apps/ktorrent/viewmanager.h
diff --git a/apps/ktorrent/x-bittorrent.desktop b/src/apps/ktorrent/x-bittorrent.desktop
index 7fba36f..7fba36f 100644
--- a/apps/ktorrent/x-bittorrent.desktop
+++ b/src/apps/ktorrent/x-bittorrent.desktop
diff --git a/apps/kttorinfo/Makefile.am b/src/apps/kttorinfo/Makefile.am
index 0736208..0736208 100644
--- a/apps/kttorinfo/Makefile.am
+++ b/src/apps/kttorinfo/Makefile.am
diff --git a/apps/kttorinfo/main.cpp b/src/apps/kttorinfo/main.cpp
index 2208f7f..2208f7f 100644
--- a/apps/kttorinfo/main.cpp
+++ b/src/apps/kttorinfo/main.cpp
diff --git a/apps/ktupnptest/Makefile.am b/src/apps/ktupnptest/Makefile.am
index 9920c54..9920c54 100644
--- a/apps/ktupnptest/Makefile.am
+++ b/src/apps/ktupnptest/Makefile.am
diff --git a/apps/ktupnptest/main.cpp b/src/apps/ktupnptest/main.cpp
index 2493f36..2493f36 100644
--- a/apps/ktupnptest/main.cpp
+++ b/src/apps/ktupnptest/main.cpp
diff --git a/apps/ktupnptest/mainwidget.ui b/src/apps/ktupnptest/mainwidget.ui
index 7faa40d..7faa40d 100644
--- a/apps/ktupnptest/mainwidget.ui
+++ b/src/apps/ktupnptest/mainwidget.ui
diff --git a/apps/ktupnptest/upnptestapp.cpp b/src/apps/ktupnptest/upnptestapp.cpp
index a6e0852..a6e0852 100644
--- a/apps/ktupnptest/upnptestapp.cpp
+++ b/src/apps/ktupnptest/upnptestapp.cpp
diff --git a/apps/ktupnptest/upnptestapp.h b/src/apps/ktupnptest/upnptestapp.h
index 7c5ac98..7c5ac98 100644
--- a/apps/ktupnptest/upnptestapp.h
+++ b/src/apps/ktupnptest/upnptestapp.h
diff --git a/estimation-scripts/EstimationResults.rb b/src/estimation-scripts/EstimationResults.rb
index 01eedcc..01eedcc 100644
--- a/estimation-scripts/EstimationResults.rb
+++ b/src/estimation-scripts/EstimationResults.rb
diff --git a/estimation-scripts/Estimators.rb b/src/estimation-scripts/Estimators.rb
index 1ef0c6e..1ef0c6e 100644
--- a/estimation-scripts/Estimators.rb
+++ b/src/estimation-scripts/Estimators.rb
diff --git a/estimation-scripts/README b/src/estimation-scripts/README
index c1066a6..c1066a6 100644
--- a/estimation-scripts/README
+++ b/src/estimation-scripts/README
diff --git a/estimation-scripts/Sample.rb b/src/estimation-scripts/Sample.rb
index b0c38c2..b0c38c2 100644
--- a/estimation-scripts/Sample.rb
+++ b/src/estimation-scripts/Sample.rb
diff --git a/estimation-scripts/demo.rb b/src/estimation-scripts/demo.rb
index 9cf235b..9cf235b 100644
--- a/estimation-scripts/demo.rb
+++ b/src/estimation-scripts/demo.rb
diff --git a/estimation-scripts/enable-logging.diff b/src/estimation-scripts/enable-logging.diff
index 172b6cf..172b6cf 100644
--- a/estimation-scripts/enable-logging.diff
+++ b/src/estimation-scripts/enable-logging.diff
diff --git a/estimation-scripts/processlog.rb b/src/estimation-scripts/processlog.rb
index c750ba5..c750ba5 100644
--- a/estimation-scripts/processlog.rb
+++ b/src/estimation-scripts/processlog.rb
diff --git a/libktorrent/Makefile.am b/src/libktorrent/Makefile.am
index d5537c5..d5537c5 100644
--- a/libktorrent/Makefile.am
+++ b/src/libktorrent/Makefile.am
diff --git a/libktorrent/datachecker/Makefile.am b/src/libktorrent/datachecker/Makefile.am
index b5e9ee0..b5e9ee0 100644
--- a/libktorrent/datachecker/Makefile.am
+++ b/src/libktorrent/datachecker/Makefile.am
diff --git a/libktorrent/datachecker/datachecker.cpp b/src/libktorrent/datachecker/datachecker.cpp
index 04bd08e..04bd08e 100644
--- a/libktorrent/datachecker/datachecker.cpp
+++ b/src/libktorrent/datachecker/datachecker.cpp
diff --git a/libktorrent/datachecker/datachecker.h b/src/libktorrent/datachecker/datachecker.h
index e038152..e038152 100644
--- a/libktorrent/datachecker/datachecker.h
+++ b/src/libktorrent/datachecker/datachecker.h
diff --git a/libktorrent/datachecker/datacheckerlistener.cpp b/src/libktorrent/datachecker/datacheckerlistener.cpp
index a4a2201..a4a2201 100644
--- a/libktorrent/datachecker/datacheckerlistener.cpp
+++ b/src/libktorrent/datachecker/datacheckerlistener.cpp
diff --git a/libktorrent/datachecker/datacheckerlistener.h b/src/libktorrent/datachecker/datacheckerlistener.h
index a770bab..a770bab 100644
--- a/libktorrent/datachecker/datacheckerlistener.h
+++ b/src/libktorrent/datachecker/datacheckerlistener.h
diff --git a/libktorrent/datachecker/datacheckerthread.cpp b/src/libktorrent/datachecker/datacheckerthread.cpp
index fcbdf3d..fcbdf3d 100644
--- a/libktorrent/datachecker/datacheckerthread.cpp
+++ b/src/libktorrent/datachecker/datacheckerthread.cpp
diff --git a/libktorrent/datachecker/datacheckerthread.h b/src/libktorrent/datachecker/datacheckerthread.h
index 207b245..207b245 100644
--- a/libktorrent/datachecker/datacheckerthread.h
+++ b/src/libktorrent/datachecker/datacheckerthread.h
diff --git a/libktorrent/datachecker/multidatachecker.cpp b/src/libktorrent/datachecker/multidatachecker.cpp
index 6fe8e39..6fe8e39 100644
--- a/libktorrent/datachecker/multidatachecker.cpp
+++ b/src/libktorrent/datachecker/multidatachecker.cpp
diff --git a/libktorrent/datachecker/multidatachecker.h b/src/libktorrent/datachecker/multidatachecker.h
index bb68a06..bb68a06 100644
--- a/libktorrent/datachecker/multidatachecker.h
+++ b/src/libktorrent/datachecker/multidatachecker.h
diff --git a/libktorrent/datachecker/singledatachecker.cpp b/src/libktorrent/datachecker/singledatachecker.cpp
index 4ecc268..4ecc268 100644
--- a/libktorrent/datachecker/singledatachecker.cpp
+++ b/src/libktorrent/datachecker/singledatachecker.cpp
diff --git a/libktorrent/datachecker/singledatachecker.h b/src/libktorrent/datachecker/singledatachecker.h
index 3b86829..3b86829 100644
--- a/libktorrent/datachecker/singledatachecker.h
+++ b/src/libktorrent/datachecker/singledatachecker.h
diff --git a/libktorrent/expandablewidget.cpp b/src/libktorrent/expandablewidget.cpp
index 2302329..2302329 100644
--- a/libktorrent/expandablewidget.cpp
+++ b/src/libktorrent/expandablewidget.cpp
diff --git a/libktorrent/expandablewidget.h b/src/libktorrent/expandablewidget.h
index 6aa0709..6aa0709 100644
--- a/libktorrent/expandablewidget.h
+++ b/src/libktorrent/expandablewidget.h
diff --git a/libktorrent/functions.cpp b/src/libktorrent/functions.cpp
index a6e703b..a6e703b 100644
--- a/libktorrent/functions.cpp
+++ b/src/libktorrent/functions.cpp
diff --git a/libktorrent/functions.h b/src/libktorrent/functions.h
index 4b2a9ee..4b2a9ee 100644
--- a/libktorrent/functions.h
+++ b/src/libktorrent/functions.h
diff --git a/libktorrent/interfaces/Makefile.am b/src/libktorrent/interfaces/Makefile.am
index dca1a4a..dca1a4a 100644
--- a/libktorrent/interfaces/Makefile.am
+++ b/src/libktorrent/interfaces/Makefile.am
diff --git a/libktorrent/interfaces/chunkdownloadinterface.cpp b/src/libktorrent/interfaces/chunkdownloadinterface.cpp
index d991605..d991605 100644
--- a/libktorrent/interfaces/chunkdownloadinterface.cpp
+++ b/src/libktorrent/interfaces/chunkdownloadinterface.cpp
diff --git a/libktorrent/interfaces/chunkdownloadinterface.h b/src/libktorrent/interfaces/chunkdownloadinterface.h
index 0945006..0945006 100644
--- a/libktorrent/interfaces/chunkdownloadinterface.h
+++ b/src/libktorrent/interfaces/chunkdownloadinterface.h
diff --git a/libktorrent/interfaces/coreinterface.cpp b/src/libktorrent/interfaces/coreinterface.cpp
index cb350d8..cb350d8 100644
--- a/libktorrent/interfaces/coreinterface.cpp
+++ b/src/libktorrent/interfaces/coreinterface.cpp
diff --git a/libktorrent/interfaces/coreinterface.h b/src/libktorrent/interfaces/coreinterface.h
index f42c966..f42c966 100644
--- a/libktorrent/interfaces/coreinterface.h
+++ b/src/libktorrent/interfaces/coreinterface.h
diff --git a/libktorrent/interfaces/exitoperation.cpp b/src/libktorrent/interfaces/exitoperation.cpp
index 7d1867e..7d1867e 100644
--- a/libktorrent/interfaces/exitoperation.cpp
+++ b/src/libktorrent/interfaces/exitoperation.cpp
diff --git a/libktorrent/interfaces/exitoperation.h b/src/libktorrent/interfaces/exitoperation.h
index e9c0ae5..e9c0ae5 100644
--- a/libktorrent/interfaces/exitoperation.h
+++ b/src/libktorrent/interfaces/exitoperation.h
diff --git a/libktorrent/interfaces/filetreediritem.cpp b/src/libktorrent/interfaces/filetreediritem.cpp
index 167ff2d..167ff2d 100644
--- a/libktorrent/interfaces/filetreediritem.cpp
+++ b/src/libktorrent/interfaces/filetreediritem.cpp
diff --git a/libktorrent/interfaces/filetreediritem.h b/src/libktorrent/interfaces/filetreediritem.h
index 6b35031..6b35031 100644
--- a/libktorrent/interfaces/filetreediritem.h
+++ b/src/libktorrent/interfaces/filetreediritem.h
diff --git a/libktorrent/interfaces/filetreeitem.cpp b/src/libktorrent/interfaces/filetreeitem.cpp
index ca431b5..ca431b5 100644
--- a/libktorrent/interfaces/filetreeitem.cpp
+++ b/src/libktorrent/interfaces/filetreeitem.cpp
diff --git a/libktorrent/interfaces/filetreeitem.h b/src/libktorrent/interfaces/filetreeitem.h
index 5cc17f9..5cc17f9 100644
--- a/libktorrent/interfaces/filetreeitem.h
+++ b/src/libktorrent/interfaces/filetreeitem.h
diff --git a/libktorrent/interfaces/functions.cpp b/src/libktorrent/interfaces/functions.cpp
index 096a48c..096a48c 100644
--- a/libktorrent/interfaces/functions.cpp
+++ b/src/libktorrent/interfaces/functions.cpp
diff --git a/libktorrent/interfaces/functions.h b/src/libktorrent/interfaces/functions.h
index 4ffe9a9..4ffe9a9 100644
--- a/libktorrent/interfaces/functions.h
+++ b/src/libktorrent/interfaces/functions.h
diff --git a/libktorrent/interfaces/guiinterface.cpp b/src/libktorrent/interfaces/guiinterface.cpp
index 635415e..635415e 100644
--- a/libktorrent/interfaces/guiinterface.cpp
+++ b/src/libktorrent/interfaces/guiinterface.cpp
diff --git a/libktorrent/interfaces/guiinterface.h b/src/libktorrent/interfaces/guiinterface.h
index 69d168b..69d168b 100644
--- a/libktorrent/interfaces/guiinterface.h
+++ b/src/libktorrent/interfaces/guiinterface.h
diff --git a/libktorrent/interfaces/ipblockinginterface.cpp b/src/libktorrent/interfaces/ipblockinginterface.cpp
index e92e24c..e92e24c 100644
--- a/libktorrent/interfaces/ipblockinginterface.cpp
+++ b/src/libktorrent/interfaces/ipblockinginterface.cpp
diff --git a/libktorrent/interfaces/ipblockinginterface.h b/src/libktorrent/interfaces/ipblockinginterface.h
index 236a549..236a549 100644
--- a/libktorrent/interfaces/ipblockinginterface.h
+++ b/src/libktorrent/interfaces/ipblockinginterface.h
diff --git a/libktorrent/interfaces/logmonitorinterface.cpp b/src/libktorrent/interfaces/logmonitorinterface.cpp
index df77a53..df77a53 100644
--- a/libktorrent/interfaces/logmonitorinterface.cpp
+++ b/src/libktorrent/interfaces/logmonitorinterface.cpp
diff --git a/libktorrent/interfaces/logmonitorinterface.h b/src/libktorrent/interfaces/logmonitorinterface.h
index 54e1a21..54e1a21 100644
--- a/libktorrent/interfaces/logmonitorinterface.h
+++ b/src/libktorrent/interfaces/logmonitorinterface.h
diff --git a/libktorrent/interfaces/monitorinterface.cpp b/src/libktorrent/interfaces/monitorinterface.cpp
index d3d0c52..d3d0c52 100644
--- a/libktorrent/interfaces/monitorinterface.cpp
+++ b/src/libktorrent/interfaces/monitorinterface.cpp
diff --git a/libktorrent/interfaces/monitorinterface.h b/src/libktorrent/interfaces/monitorinterface.h
index a199800..a199800 100644
--- a/libktorrent/interfaces/monitorinterface.h
+++ b/src/libktorrent/interfaces/monitorinterface.h
diff --git a/libktorrent/interfaces/peerinterface.cpp b/src/libktorrent/interfaces/peerinterface.cpp
index a4ab246..a4ab246 100644
--- a/libktorrent/interfaces/peerinterface.cpp
+++ b/src/libktorrent/interfaces/peerinterface.cpp
diff --git a/libktorrent/interfaces/peerinterface.h b/src/libktorrent/interfaces/peerinterface.h
index d5424ac..d5424ac 100644
--- a/libktorrent/interfaces/peerinterface.h
+++ b/src/libktorrent/interfaces/peerinterface.h
diff --git a/libktorrent/interfaces/peersource.cpp b/src/libktorrent/interfaces/peersource.cpp
index 6a1eb87..6a1eb87 100644
--- a/libktorrent/interfaces/peersource.cpp
+++ b/src/libktorrent/interfaces/peersource.cpp
diff --git a/libktorrent/interfaces/peersource.h b/src/libktorrent/interfaces/peersource.h
index 0b8a852..0b8a852 100644
--- a/libktorrent/interfaces/peersource.h
+++ b/src/libktorrent/interfaces/peersource.h
diff --git a/libktorrent/interfaces/plugin.cpp b/src/libktorrent/interfaces/plugin.cpp
index 92a4f22..92a4f22 100644
--- a/libktorrent/interfaces/plugin.cpp
+++ b/src/libktorrent/interfaces/plugin.cpp
diff --git a/libktorrent/interfaces/plugin.h b/src/libktorrent/interfaces/plugin.h
index c2446e9..c2446e9 100644
--- a/libktorrent/interfaces/plugin.h
+++ b/src/libktorrent/interfaces/plugin.h
diff --git a/libktorrent/interfaces/prefpageinterface.cpp b/src/libktorrent/interfaces/prefpageinterface.cpp
index ae6414f..ae6414f 100644
--- a/libktorrent/interfaces/prefpageinterface.cpp
+++ b/src/libktorrent/interfaces/prefpageinterface.cpp
diff --git a/libktorrent/interfaces/prefpageinterface.h b/src/libktorrent/interfaces/prefpageinterface.h
index 850a344..850a344 100644
--- a/libktorrent/interfaces/prefpageinterface.h
+++ b/src/libktorrent/interfaces/prefpageinterface.h
diff --git a/libktorrent/interfaces/torrentfileinterface.cpp b/src/libktorrent/interfaces/torrentfileinterface.cpp
index d49414e..d49414e 100644
--- a/libktorrent/interfaces/torrentfileinterface.cpp
+++ b/src/libktorrent/interfaces/torrentfileinterface.cpp
diff --git a/libktorrent/interfaces/torrentfileinterface.h b/src/libktorrent/interfaces/torrentfileinterface.h
index c9381a9..c9381a9 100644
--- a/libktorrent/interfaces/torrentfileinterface.h
+++ b/src/libktorrent/interfaces/torrentfileinterface.h
diff --git a/libktorrent/interfaces/torrentinterface.cpp b/src/libktorrent/interfaces/torrentinterface.cpp
index 763bd55..763bd55 100644
--- a/libktorrent/interfaces/torrentinterface.cpp
+++ b/src/libktorrent/interfaces/torrentinterface.cpp
diff --git a/libktorrent/interfaces/torrentinterface.h b/src/libktorrent/interfaces/torrentinterface.h
index 92b5f2c..92b5f2c 100644
--- a/libktorrent/interfaces/torrentinterface.h
+++ b/src/libktorrent/interfaces/torrentinterface.h
diff --git a/libktorrent/interfaces/trackerslist.cpp b/src/libktorrent/interfaces/trackerslist.cpp
index c119625..c119625 100644
--- a/libktorrent/interfaces/trackerslist.cpp
+++ b/src/libktorrent/interfaces/trackerslist.cpp
diff --git a/libktorrent/interfaces/trackerslist.h b/src/libktorrent/interfaces/trackerslist.h
index 55dc05e..55dc05e 100644
--- a/libktorrent/interfaces/trackerslist.h
+++ b/src/libktorrent/interfaces/trackerslist.h
diff --git a/libktorrent/kademlia/Makefile.am b/src/libktorrent/kademlia/Makefile.am
index 1b567b2..1b567b2 100644
--- a/libktorrent/kademlia/Makefile.am
+++ b/src/libktorrent/kademlia/Makefile.am
diff --git a/libktorrent/kademlia/announcetask.cpp b/src/libktorrent/kademlia/announcetask.cpp
index 95f4020..95f4020 100644
--- a/libktorrent/kademlia/announcetask.cpp
+++ b/src/libktorrent/kademlia/announcetask.cpp
diff --git a/libktorrent/kademlia/announcetask.h b/src/libktorrent/kademlia/announcetask.h
index 02dec19..02dec19 100644
--- a/libktorrent/kademlia/announcetask.h
+++ b/src/libktorrent/kademlia/announcetask.h
diff --git a/libktorrent/kademlia/database.cpp b/src/libktorrent/kademlia/database.cpp
index 447975f..447975f 100644
--- a/libktorrent/kademlia/database.cpp
+++ b/src/libktorrent/kademlia/database.cpp
diff --git a/libktorrent/kademlia/database.h b/src/libktorrent/kademlia/database.h
index 365f6bb..365f6bb 100644
--- a/libktorrent/kademlia/database.h
+++ b/src/libktorrent/kademlia/database.h
diff --git a/libktorrent/kademlia/dht.cpp b/src/libktorrent/kademlia/dht.cpp
index ff14340..ff14340 100644
--- a/libktorrent/kademlia/dht.cpp
+++ b/src/libktorrent/kademlia/dht.cpp
diff --git a/libktorrent/kademlia/dht.h b/src/libktorrent/kademlia/dht.h
index 0e6207d..0e6207d 100644
--- a/libktorrent/kademlia/dht.h
+++ b/src/libktorrent/kademlia/dht.h
diff --git a/libktorrent/kademlia/dhtbase.cpp b/src/libktorrent/kademlia/dhtbase.cpp
index b0ff582..b0ff582 100644
--- a/libktorrent/kademlia/dhtbase.cpp
+++ b/src/libktorrent/kademlia/dhtbase.cpp
diff --git a/libktorrent/kademlia/dhtbase.h b/src/libktorrent/kademlia/dhtbase.h
index 57c42a6..57c42a6 100644
--- a/libktorrent/kademlia/dhtbase.h
+++ b/src/libktorrent/kademlia/dhtbase.h
diff --git a/libktorrent/kademlia/dhttrackerbackend.cpp b/src/libktorrent/kademlia/dhttrackerbackend.cpp
index 024abd7..024abd7 100644
--- a/libktorrent/kademlia/dhttrackerbackend.cpp
+++ b/src/libktorrent/kademlia/dhttrackerbackend.cpp
diff --git a/libktorrent/kademlia/dhttrackerbackend.h b/src/libktorrent/kademlia/dhttrackerbackend.h
index 6994cdb..6994cdb 100644
--- a/libktorrent/kademlia/dhttrackerbackend.h
+++ b/src/libktorrent/kademlia/dhttrackerbackend.h
diff --git a/libktorrent/kademlia/kbucket.cpp b/src/libktorrent/kademlia/kbucket.cpp
index f8d77c2..f8d77c2 100644
--- a/libktorrent/kademlia/kbucket.cpp
+++ b/src/libktorrent/kademlia/kbucket.cpp
diff --git a/libktorrent/kademlia/kbucket.h b/src/libktorrent/kademlia/kbucket.h
index a31b713..a31b713 100644
--- a/libktorrent/kademlia/kbucket.h
+++ b/src/libktorrent/kademlia/kbucket.h
diff --git a/libktorrent/kademlia/kclosestnodessearch.cpp b/src/libktorrent/kademlia/kclosestnodessearch.cpp
index 5421b6c..5421b6c 100644
--- a/libktorrent/kademlia/kclosestnodessearch.cpp
+++ b/src/libktorrent/kademlia/kclosestnodessearch.cpp
diff --git a/libktorrent/kademlia/kclosestnodessearch.h b/src/libktorrent/kademlia/kclosestnodessearch.h
index f4b460d..f4b460d 100644
--- a/libktorrent/kademlia/kclosestnodessearch.h
+++ b/src/libktorrent/kademlia/kclosestnodessearch.h
diff --git a/libktorrent/kademlia/key.cpp b/src/libktorrent/kademlia/key.cpp
index 35ecfff..35ecfff 100644
--- a/libktorrent/kademlia/key.cpp
+++ b/src/libktorrent/kademlia/key.cpp
diff --git a/libktorrent/kademlia/key.h b/src/libktorrent/kademlia/key.h
index e383a5e..e383a5e 100644
--- a/libktorrent/kademlia/key.h
+++ b/src/libktorrent/kademlia/key.h
diff --git a/libktorrent/kademlia/node.cpp b/src/libktorrent/kademlia/node.cpp
index bd450e4..bd450e4 100644
--- a/libktorrent/kademlia/node.cpp
+++ b/src/libktorrent/kademlia/node.cpp
diff --git a/libktorrent/kademlia/node.h b/src/libktorrent/kademlia/node.h
index 38ddd38..38ddd38 100644
--- a/libktorrent/kademlia/node.h
+++ b/src/libktorrent/kademlia/node.h
diff --git a/libktorrent/kademlia/nodelookup.cpp b/src/libktorrent/kademlia/nodelookup.cpp
index d1544b6..d1544b6 100644
--- a/libktorrent/kademlia/nodelookup.cpp
+++ b/src/libktorrent/kademlia/nodelookup.cpp
diff --git a/libktorrent/kademlia/nodelookup.h b/src/libktorrent/kademlia/nodelookup.h
index ff19e92..ff19e92 100644
--- a/libktorrent/kademlia/nodelookup.h
+++ b/src/libktorrent/kademlia/nodelookup.h
diff --git a/libktorrent/kademlia/pack.cpp b/src/libktorrent/kademlia/pack.cpp
index 200c686..200c686 100644
--- a/libktorrent/kademlia/pack.cpp
+++ b/src/libktorrent/kademlia/pack.cpp
diff --git a/libktorrent/kademlia/pack.h b/src/libktorrent/kademlia/pack.h
index 46c2405..46c2405 100644
--- a/libktorrent/kademlia/pack.h
+++ b/src/libktorrent/kademlia/pack.h
diff --git a/libktorrent/kademlia/rpccall.cpp b/src/libktorrent/kademlia/rpccall.cpp
index 17a15de..17a15de 100644
--- a/libktorrent/kademlia/rpccall.cpp
+++ b/src/libktorrent/kademlia/rpccall.cpp
diff --git a/libktorrent/kademlia/rpccall.h b/src/libktorrent/kademlia/rpccall.h
index 1b718d9..1b718d9 100644
--- a/libktorrent/kademlia/rpccall.h
+++ b/src/libktorrent/kademlia/rpccall.h
diff --git a/libktorrent/kademlia/rpcmsg.cpp b/src/libktorrent/kademlia/rpcmsg.cpp
index b5b2b7d..b5b2b7d 100644
--- a/libktorrent/kademlia/rpcmsg.cpp
+++ b/src/libktorrent/kademlia/rpcmsg.cpp
diff --git a/libktorrent/kademlia/rpcmsg.h b/src/libktorrent/kademlia/rpcmsg.h
index acdae14..acdae14 100644
--- a/libktorrent/kademlia/rpcmsg.h
+++ b/src/libktorrent/kademlia/rpcmsg.h
diff --git a/libktorrent/kademlia/rpcserver.cpp b/src/libktorrent/kademlia/rpcserver.cpp
index 960a2d8..960a2d8 100644
--- a/libktorrent/kademlia/rpcserver.cpp
+++ b/src/libktorrent/kademlia/rpcserver.cpp
diff --git a/libktorrent/kademlia/rpcserver.h b/src/libktorrent/kademlia/rpcserver.h
index 19af2f8..19af2f8 100644
--- a/libktorrent/kademlia/rpcserver.h
+++ b/src/libktorrent/kademlia/rpcserver.h
diff --git a/libktorrent/kademlia/task.cpp b/src/libktorrent/kademlia/task.cpp
index 8dcb521..8dcb521 100644
--- a/libktorrent/kademlia/task.cpp
+++ b/src/libktorrent/kademlia/task.cpp
diff --git a/libktorrent/kademlia/task.h b/src/libktorrent/kademlia/task.h
index c54470b..c54470b 100644
--- a/libktorrent/kademlia/task.h
+++ b/src/libktorrent/kademlia/task.h
diff --git a/libktorrent/kademlia/taskmanager.cpp b/src/libktorrent/kademlia/taskmanager.cpp
index 4e1e21a..4e1e21a 100644
--- a/libktorrent/kademlia/taskmanager.cpp
+++ b/src/libktorrent/kademlia/taskmanager.cpp
diff --git a/libktorrent/kademlia/taskmanager.h b/src/libktorrent/kademlia/taskmanager.h
index 5349d8c..5349d8c 100644
--- a/libktorrent/kademlia/taskmanager.h
+++ b/src/libktorrent/kademlia/taskmanager.h
diff --git a/libktorrent/ktorrent.kcfg b/src/libktorrent/ktorrent.kcfg
index 2d1e9b2..2d1e9b2 100644
--- a/libktorrent/ktorrent.kcfg
+++ b/src/libktorrent/ktorrent.kcfg
diff --git a/libktorrent/ktversion.h b/src/libktorrent/ktversion.h
index 494b1be..494b1be 100644
--- a/libktorrent/ktversion.h
+++ b/src/libktorrent/ktversion.h
diff --git a/libktorrent/labelview.cpp b/src/libktorrent/labelview.cpp
index b488271..b488271 100644
--- a/libktorrent/labelview.cpp
+++ b/src/libktorrent/labelview.cpp
diff --git a/libktorrent/labelview.h b/src/libktorrent/labelview.h
index 4cdcb64..4cdcb64 100644
--- a/libktorrent/labelview.h
+++ b/src/libktorrent/labelview.h
diff --git a/libktorrent/labelviewitembase.ui b/src/libktorrent/labelviewitembase.ui
index fbce874..fbce874 100644
--- a/libktorrent/labelviewitembase.ui
+++ b/src/libktorrent/labelviewitembase.ui
diff --git a/libktorrent/migrate/Makefile.am b/src/libktorrent/migrate/Makefile.am
index 9bb5528..9bb5528 100644
--- a/libktorrent/migrate/Makefile.am
+++ b/src/libktorrent/migrate/Makefile.am
diff --git a/libktorrent/migrate/cachemigrate.cpp b/src/libktorrent/migrate/cachemigrate.cpp
index 9006e2a..9006e2a 100644
--- a/libktorrent/migrate/cachemigrate.cpp
+++ b/src/libktorrent/migrate/cachemigrate.cpp
diff --git a/libktorrent/migrate/cachemigrate.h b/src/libktorrent/migrate/cachemigrate.h
index fc618f1..fc618f1 100644
--- a/libktorrent/migrate/cachemigrate.h
+++ b/src/libktorrent/migrate/cachemigrate.h
diff --git a/libktorrent/migrate/ccmigrate.cpp b/src/libktorrent/migrate/ccmigrate.cpp
index 631ac6f..631ac6f 100644
--- a/libktorrent/migrate/ccmigrate.cpp
+++ b/src/libktorrent/migrate/ccmigrate.cpp
diff --git a/libktorrent/migrate/ccmigrate.h b/src/libktorrent/migrate/ccmigrate.h
index 5272bf5..5272bf5 100644
--- a/libktorrent/migrate/ccmigrate.h
+++ b/src/libktorrent/migrate/ccmigrate.h
diff --git a/libktorrent/migrate/migrate.cpp b/src/libktorrent/migrate/migrate.cpp
index 4de80cc..4de80cc 100644
--- a/libktorrent/migrate/migrate.cpp
+++ b/src/libktorrent/migrate/migrate.cpp
diff --git a/libktorrent/migrate/migrate.h b/src/libktorrent/migrate/migrate.h
index 8a943b4..8a943b4 100644
--- a/libktorrent/migrate/migrate.h
+++ b/src/libktorrent/migrate/migrate.h
diff --git a/libktorrent/mse/Makefile.am b/src/libktorrent/mse/Makefile.am
index d6a8ac5..d6a8ac5 100644
--- a/libktorrent/mse/Makefile.am
+++ b/src/libktorrent/mse/Makefile.am
diff --git a/libktorrent/mse/bigint.cpp b/src/libktorrent/mse/bigint.cpp
index e2746f6..e2746f6 100644
--- a/libktorrent/mse/bigint.cpp
+++ b/src/libktorrent/mse/bigint.cpp
diff --git a/libktorrent/mse/bigint.h b/src/libktorrent/mse/bigint.h
index 39bb865..39bb865 100644
--- a/libktorrent/mse/bigint.h
+++ b/src/libktorrent/mse/bigint.h
diff --git a/libktorrent/mse/encryptedauthenticate.cpp b/src/libktorrent/mse/encryptedauthenticate.cpp
index e60aa22..e60aa22 100644
--- a/libktorrent/mse/encryptedauthenticate.cpp
+++ b/src/libktorrent/mse/encryptedauthenticate.cpp
diff --git a/libktorrent/mse/encryptedauthenticate.h b/src/libktorrent/mse/encryptedauthenticate.h
index 85c591b..85c591b 100644
--- a/libktorrent/mse/encryptedauthenticate.h
+++ b/src/libktorrent/mse/encryptedauthenticate.h
diff --git a/libktorrent/mse/encryptedserverauthenticate.cpp b/src/libktorrent/mse/encryptedserverauthenticate.cpp
index 40353ad..40353ad 100644
--- a/libktorrent/mse/encryptedserverauthenticate.cpp
+++ b/src/libktorrent/mse/encryptedserverauthenticate.cpp
diff --git a/libktorrent/mse/encryptedserverauthenticate.h b/src/libktorrent/mse/encryptedserverauthenticate.h
index bcdc13a..bcdc13a 100644
--- a/libktorrent/mse/encryptedserverauthenticate.h
+++ b/src/libktorrent/mse/encryptedserverauthenticate.h
diff --git a/libktorrent/mse/functions.cpp b/src/libktorrent/mse/functions.cpp
index a478cda..a478cda 100644
--- a/libktorrent/mse/functions.cpp
+++ b/src/libktorrent/mse/functions.cpp
diff --git a/libktorrent/mse/functions.h b/src/libktorrent/mse/functions.h
index 95e8e5d..95e8e5d 100644
--- a/libktorrent/mse/functions.h
+++ b/src/libktorrent/mse/functions.h
diff --git a/libktorrent/mse/rc4encryptor.cpp b/src/libktorrent/mse/rc4encryptor.cpp
index 422fe5d..422fe5d 100644
--- a/libktorrent/mse/rc4encryptor.cpp
+++ b/src/libktorrent/mse/rc4encryptor.cpp
diff --git a/libktorrent/mse/rc4encryptor.h b/src/libktorrent/mse/rc4encryptor.h
index 650b54e..650b54e 100644
--- a/libktorrent/mse/rc4encryptor.h
+++ b/src/libktorrent/mse/rc4encryptor.h
diff --git a/libktorrent/mse/streamsocket.cpp b/src/libktorrent/mse/streamsocket.cpp
index 08f2d7b..08f2d7b 100644
--- a/libktorrent/mse/streamsocket.cpp
+++ b/src/libktorrent/mse/streamsocket.cpp
diff --git a/libktorrent/mse/streamsocket.h b/src/libktorrent/mse/streamsocket.h
index c653e5d..c653e5d 100644
--- a/libktorrent/mse/streamsocket.h
+++ b/src/libktorrent/mse/streamsocket.h
diff --git a/libktorrent/net/Makefile.am b/src/libktorrent/net/Makefile.am
index e67354c..e67354c 100644
--- a/libktorrent/net/Makefile.am
+++ b/src/libktorrent/net/Makefile.am
diff --git a/libktorrent/net/address.cpp b/src/libktorrent/net/address.cpp
index d4877da..d4877da 100644
--- a/libktorrent/net/address.cpp
+++ b/src/libktorrent/net/address.cpp
diff --git a/libktorrent/net/address.h b/src/libktorrent/net/address.h
index af39380..af39380 100644
--- a/libktorrent/net/address.h
+++ b/src/libktorrent/net/address.h
diff --git a/libktorrent/net/bufferedsocket.cpp b/src/libktorrent/net/bufferedsocket.cpp
index 2165f70..2165f70 100644
--- a/libktorrent/net/bufferedsocket.cpp
+++ b/src/libktorrent/net/bufferedsocket.cpp
diff --git a/libktorrent/net/bufferedsocket.h b/src/libktorrent/net/bufferedsocket.h
index 2e594df..2e594df 100644
--- a/libktorrent/net/bufferedsocket.h
+++ b/src/libktorrent/net/bufferedsocket.h
diff --git a/libktorrent/net/circularbuffer.cpp b/src/libktorrent/net/circularbuffer.cpp
index abce80a..abce80a 100644
--- a/libktorrent/net/circularbuffer.cpp
+++ b/src/libktorrent/net/circularbuffer.cpp
diff --git a/libktorrent/net/circularbuffer.h b/src/libktorrent/net/circularbuffer.h
index 6d45723..6d45723 100644
--- a/libktorrent/net/circularbuffer.h
+++ b/src/libktorrent/net/circularbuffer.h
diff --git a/libktorrent/net/downloadthread.cpp b/src/libktorrent/net/downloadthread.cpp
index ae0f0b9..ae0f0b9 100644
--- a/libktorrent/net/downloadthread.cpp
+++ b/src/libktorrent/net/downloadthread.cpp
diff --git a/libktorrent/net/downloadthread.h b/src/libktorrent/net/downloadthread.h
index 08e9e46..08e9e46 100644
--- a/libktorrent/net/downloadthread.h
+++ b/src/libktorrent/net/downloadthread.h
diff --git a/libktorrent/net/networkthread.cpp b/src/libktorrent/net/networkthread.cpp
index 40791c9..40791c9 100644
--- a/libktorrent/net/networkthread.cpp
+++ b/src/libktorrent/net/networkthread.cpp
diff --git a/libktorrent/net/networkthread.h b/src/libktorrent/net/networkthread.h
index d31ae3e..d31ae3e 100644
--- a/libktorrent/net/networkthread.h
+++ b/src/libktorrent/net/networkthread.h
diff --git a/libktorrent/net/portlist.cpp b/src/libktorrent/net/portlist.cpp
index 56076ed..56076ed 100644
--- a/libktorrent/net/portlist.cpp
+++ b/src/libktorrent/net/portlist.cpp
diff --git a/libktorrent/net/portlist.h b/src/libktorrent/net/portlist.h
index c1a6e99..c1a6e99 100644
--- a/libktorrent/net/portlist.h
+++ b/src/libktorrent/net/portlist.h
diff --git a/libktorrent/net/socket.cpp b/src/libktorrent/net/socket.cpp
index e1e67ea..e1e67ea 100644
--- a/libktorrent/net/socket.cpp
+++ b/src/libktorrent/net/socket.cpp
diff --git a/libktorrent/net/socket.h b/src/libktorrent/net/socket.h
index db8953b..db8953b 100644
--- a/libktorrent/net/socket.h
+++ b/src/libktorrent/net/socket.h
diff --git a/libktorrent/net/socketgroup.cpp b/src/libktorrent/net/socketgroup.cpp
index 8c9c5e7..8c9c5e7 100644
--- a/libktorrent/net/socketgroup.cpp
+++ b/src/libktorrent/net/socketgroup.cpp
diff --git a/libktorrent/net/socketgroup.h b/src/libktorrent/net/socketgroup.h
index ba08029..ba08029 100644
--- a/libktorrent/net/socketgroup.h
+++ b/src/libktorrent/net/socketgroup.h
diff --git a/libktorrent/net/socketmonitor.cpp b/src/libktorrent/net/socketmonitor.cpp
index 123536a..123536a 100644
--- a/libktorrent/net/socketmonitor.cpp
+++ b/src/libktorrent/net/socketmonitor.cpp
diff --git a/libktorrent/net/socketmonitor.h b/src/libktorrent/net/socketmonitor.h
index 6fc63c1..6fc63c1 100644
--- a/libktorrent/net/socketmonitor.h
+++ b/src/libktorrent/net/socketmonitor.h
diff --git a/libktorrent/net/speed.cpp b/src/libktorrent/net/speed.cpp
index e4328fc..e4328fc 100644
--- a/libktorrent/net/speed.cpp
+++ b/src/libktorrent/net/speed.cpp
diff --git a/libktorrent/net/speed.h b/src/libktorrent/net/speed.h
index a9ea561..a9ea561 100644
--- a/libktorrent/net/speed.h
+++ b/src/libktorrent/net/speed.h
diff --git a/libktorrent/net/uploadthread.cpp b/src/libktorrent/net/uploadthread.cpp
index 0023cf6..0023cf6 100644
--- a/libktorrent/net/uploadthread.cpp
+++ b/src/libktorrent/net/uploadthread.cpp
diff --git a/libktorrent/net/uploadthread.h b/src/libktorrent/net/uploadthread.h
index b273846..b273846 100644
--- a/libktorrent/net/uploadthread.h
+++ b/src/libktorrent/net/uploadthread.h
diff --git a/libktorrent/pluginmanager.cpp b/src/libktorrent/pluginmanager.cpp
index cd5a1eb..cd5a1eb 100644
--- a/libktorrent/pluginmanager.cpp
+++ b/src/libktorrent/pluginmanager.cpp
diff --git a/libktorrent/pluginmanager.h b/src/libktorrent/pluginmanager.h
index b86e521..b86e521 100644
--- a/libktorrent/pluginmanager.h
+++ b/src/libktorrent/pluginmanager.h
diff --git a/libktorrent/pluginmanagerprefpage.cpp b/src/libktorrent/pluginmanagerprefpage.cpp
index a426ca4..a426ca4 100644
--- a/libktorrent/pluginmanagerprefpage.cpp
+++ b/src/libktorrent/pluginmanagerprefpage.cpp
diff --git a/libktorrent/pluginmanagerprefpage.h b/src/libktorrent/pluginmanagerprefpage.h
index 7caa75a..7caa75a 100644
--- a/libktorrent/pluginmanagerprefpage.h
+++ b/src/libktorrent/pluginmanagerprefpage.h
diff --git a/libktorrent/pluginmanagerwidget.ui b/src/libktorrent/pluginmanagerwidget.ui
index 628bb8f..628bb8f 100644
--- a/libktorrent/pluginmanagerwidget.ui
+++ b/src/libktorrent/pluginmanagerwidget.ui
diff --git a/libktorrent/settings.kcfgc b/src/libktorrent/settings.kcfgc
index f6817f5..f6817f5 100644
--- a/libktorrent/settings.kcfgc
+++ b/src/libktorrent/settings.kcfgc
diff --git a/libktorrent/torrent/Makefile.am b/src/libktorrent/torrent/Makefile.am
index 5c28ab1..2f7ba68 100644
--- a/libktorrent/torrent/Makefile.am
+++ b/src/libktorrent/torrent/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/libktorrent -I$(top_builddir)/libktorrent $(all_includes)
+INCLUDES = -I$(top_srcdir)/src/libktorrent -I$(top_builddir)/src/libktorrent $(all_includes)
 
 METASOURCES = AUTO
 
diff --git a/libktorrent/torrent/advancedchokealgorithm.cpp b/src/libktorrent/torrent/advancedchokealgorithm.cpp
index 7ca0578..7ca0578 100644
--- a/libktorrent/torrent/advancedchokealgorithm.cpp
+++ b/src/libktorrent/torrent/advancedchokealgorithm.cpp
diff --git a/libktorrent/torrent/advancedchokealgorithm.h b/src/libktorrent/torrent/advancedchokealgorithm.h
index f8a1086..f8a1086 100644
--- a/libktorrent/torrent/advancedchokealgorithm.h
+++ b/src/libktorrent/torrent/advancedchokealgorithm.h
diff --git a/libktorrent/torrent/announcelist.cpp b/src/libktorrent/torrent/announcelist.cpp
index 65424d0..65424d0 100644
--- a/libktorrent/torrent/announcelist.cpp
+++ b/src/libktorrent/torrent/announcelist.cpp
diff --git a/libktorrent/torrent/announcelist.h b/src/libktorrent/torrent/announcelist.h
index 3cb9edd..3cb9edd 100644
--- a/libktorrent/torrent/announcelist.h
+++ b/src/libktorrent/torrent/announcelist.h
diff --git a/libktorrent/torrent/authenticate.cpp b/src/libktorrent/torrent/authenticate.cpp
index bb7fe3a..bb7fe3a 100644
--- a/libktorrent/torrent/authenticate.cpp
+++ b/src/libktorrent/torrent/authenticate.cpp
diff --git a/libktorrent/torrent/authenticate.h b/src/libktorrent/torrent/authenticate.h
index eceda08..eceda08 100644
--- a/libktorrent/torrent/authenticate.h
+++ b/src/libktorrent/torrent/authenticate.h
diff --git a/libktorrent/torrent/authenticatebase.cpp b/src/libktorrent/torrent/authenticatebase.cpp
index 51d3f26..51d3f26 100644
--- a/libktorrent/torrent/authenticatebase.cpp
+++ b/src/libktorrent/torrent/authenticatebase.cpp
diff --git a/libktorrent/torrent/authenticatebase.h b/src/libktorrent/torrent/authenticatebase.h
index a425118..a425118 100644
--- a/libktorrent/torrent/authenticatebase.h
+++ b/src/libktorrent/torrent/authenticatebase.h
diff --git a/libktorrent/torrent/authenticationmonitor.cpp b/src/libktorrent/torrent/authenticationmonitor.cpp
index 08215d0..08215d0 100644
--- a/libktorrent/torrent/authenticationmonitor.cpp
+++ b/src/libktorrent/torrent/authenticationmonitor.cpp
diff --git a/libktorrent/torrent/authenticationmonitor.h b/src/libktorrent/torrent/authenticationmonitor.h
index 43a4ebb..43a4ebb 100644
--- a/libktorrent/torrent/authenticationmonitor.h
+++ b/src/libktorrent/torrent/authenticationmonitor.h
diff --git a/libktorrent/torrent/bdecoder.cpp b/src/libktorrent/torrent/bdecoder.cpp
index 38bc67b..38bc67b 100644
--- a/libktorrent/torrent/bdecoder.cpp
+++ b/src/libktorrent/torrent/bdecoder.cpp
diff --git a/libktorrent/torrent/bdecoder.h b/src/libktorrent/torrent/bdecoder.h
index 438a656..438a656 100644
--- a/libktorrent/torrent/bdecoder.h
+++ b/src/libktorrent/torrent/bdecoder.h
diff --git a/libktorrent/torrent/bencoder.cpp b/src/libktorrent/torrent/bencoder.cpp
index cb82db7..cb82db7 100644
--- a/libktorrent/torrent/bencoder.cpp
+++ b/src/libktorrent/torrent/bencoder.cpp
diff --git a/libktorrent/torrent/bencoder.h b/src/libktorrent/torrent/bencoder.h
index eb84c39..eb84c39 100644
--- a/libktorrent/torrent/bencoder.h
+++ b/src/libktorrent/torrent/bencoder.h
diff --git a/libktorrent/torrent/bnode.cpp b/src/libktorrent/torrent/bnode.cpp
index c32f09b..c32f09b 100644
--- a/libktorrent/torrent/bnode.cpp
+++ b/src/libktorrent/torrent/bnode.cpp
diff --git a/libktorrent/torrent/bnode.h b/src/libktorrent/torrent/bnode.h
index 84b306e..84b306e 100644
--- a/libktorrent/torrent/bnode.h
+++ b/src/libktorrent/torrent/bnode.h
diff --git a/libktorrent/torrent/cache.cpp b/src/libktorrent/torrent/cache.cpp
index 927e631..927e631 100644
--- a/libktorrent/torrent/cache.cpp
+++ b/src/libktorrent/torrent/cache.cpp
diff --git a/libktorrent/torrent/cache.h b/src/libktorrent/torrent/cache.h
index 0b3cc4d..0b3cc4d 100644
--- a/libktorrent/torrent/cache.h
+++ b/src/libktorrent/torrent/cache.h
diff --git a/libktorrent/torrent/cachefile.cpp b/src/libktorrent/torrent/cachefile.cpp
index fc7cd33..fc7cd33 100644
--- a/libktorrent/torrent/cachefile.cpp
+++ b/src/libktorrent/torrent/cachefile.cpp
diff --git a/libktorrent/torrent/cachefile.h b/src/libktorrent/torrent/cachefile.h
index 749f46a..749f46a 100644
--- a/libktorrent/torrent/cachefile.h
+++ b/src/libktorrent/torrent/cachefile.h
diff --git a/libktorrent/torrent/cap.cpp b/src/libktorrent/torrent/cap.cpp
index 9338444..9338444 100644
--- a/libktorrent/torrent/cap.cpp
+++ b/src/libktorrent/torrent/cap.cpp
diff --git a/libktorrent/torrent/cap.h b/src/libktorrent/torrent/cap.h
index 712f5fa..712f5fa 100644
--- a/libktorrent/torrent/cap.h
+++ b/src/libktorrent/torrent/cap.h
diff --git a/libktorrent/torrent/choker.cpp b/src/libktorrent/torrent/choker.cpp
index 6162644..6162644 100644
--- a/libktorrent/torrent/choker.cpp
+++ b/src/libktorrent/torrent/choker.cpp
diff --git a/libktorrent/torrent/choker.h b/src/libktorrent/torrent/choker.h
index b44fc48..b44fc48 100644
--- a/libktorrent/torrent/choker.h
+++ b/src/libktorrent/torrent/choker.h
diff --git a/libktorrent/torrent/chunk.cpp b/src/libktorrent/torrent/chunk.cpp
index 6873713..6873713 100644
--- a/libktorrent/torrent/chunk.cpp
+++ b/src/libktorrent/torrent/chunk.cpp
diff --git a/libktorrent/torrent/chunk.h b/src/libktorrent/torrent/chunk.h
index 0896e96..0896e96 100644
--- a/libktorrent/torrent/chunk.h
+++ b/src/libktorrent/torrent/chunk.h
diff --git a/libktorrent/torrent/chunkcounter.cpp b/src/libktorrent/torrent/chunkcounter.cpp
index 95b7535..95b7535 100644
--- a/libktorrent/torrent/chunkcounter.cpp
+++ b/src/libktorrent/torrent/chunkcounter.cpp
diff --git a/libktorrent/torrent/chunkcounter.h b/src/libktorrent/torrent/chunkcounter.h
index ac2ec49..ac2ec49 100644
--- a/libktorrent/torrent/chunkcounter.h
+++ b/src/libktorrent/torrent/chunkcounter.h
diff --git a/libktorrent/torrent/chunkdownload.cpp b/src/libktorrent/torrent/chunkdownload.cpp
index 6f21fcf..6f21fcf 100644
--- a/libktorrent/torrent/chunkdownload.cpp
+++ b/src/libktorrent/torrent/chunkdownload.cpp
diff --git a/libktorrent/torrent/chunkdownload.h b/src/libktorrent/torrent/chunkdownload.h
index a432c28..a432c28 100644
--- a/libktorrent/torrent/chunkdownload.h
+++ b/src/libktorrent/torrent/chunkdownload.h
diff --git a/libktorrent/torrent/chunkmanager.cpp b/src/libktorrent/torrent/chunkmanager.cpp
index fe40850..fe40850 100644
--- a/libktorrent/torrent/chunkmanager.cpp
+++ b/src/libktorrent/torrent/chunkmanager.cpp
diff --git a/libktorrent/torrent/chunkmanager.h b/src/libktorrent/torrent/chunkmanager.h
index bbf81df..bbf81df 100644
--- a/libktorrent/torrent/chunkmanager.h
+++ b/src/libktorrent/torrent/chunkmanager.h
diff --git a/libktorrent/torrent/chunkselector.cpp b/src/libktorrent/torrent/chunkselector.cpp
index d5d6cc6..d5d6cc6 100644
--- a/libktorrent/torrent/chunkselector.cpp
+++ b/src/libktorrent/torrent/chunkselector.cpp
diff --git a/libktorrent/torrent/chunkselector.h b/src/libktorrent/torrent/chunkselector.h
index 3ba2f8a..3ba2f8a 100644
--- a/libktorrent/torrent/chunkselector.h
+++ b/src/libktorrent/torrent/chunkselector.h
diff --git a/libktorrent/torrent/dndfile.cpp b/src/libktorrent/torrent/dndfile.cpp
index 23f0f1c..23f0f1c 100644
--- a/libktorrent/torrent/dndfile.cpp
+++ b/src/libktorrent/torrent/dndfile.cpp
diff --git a/libktorrent/torrent/dndfile.h b/src/libktorrent/torrent/dndfile.h
index 09873d1..09873d1 100644
--- a/libktorrent/torrent/dndfile.h
+++ b/src/libktorrent/torrent/dndfile.h
diff --git a/libktorrent/torrent/downloadcap.cpp b/src/libktorrent/torrent/downloadcap.cpp
index 73e0cbb..73e0cbb 100644
--- a/libktorrent/torrent/downloadcap.cpp
+++ b/src/libktorrent/torrent/downloadcap.cpp
diff --git a/libktorrent/torrent/downloadcap.h b/src/libktorrent/torrent/downloadcap.h
index e05be21..e05be21 100644
--- a/libktorrent/torrent/downloadcap.h
+++ b/src/libktorrent/torrent/downloadcap.h
diff --git a/libktorrent/torrent/downloader.cpp b/src/libktorrent/torrent/downloader.cpp
index dc00927..dc00927 100644
--- a/libktorrent/torrent/downloader.cpp
+++ b/src/libktorrent/torrent/downloader.cpp
diff --git a/libktorrent/torrent/downloader.h b/src/libktorrent/torrent/downloader.h
index 5cafc6f..5cafc6f 100644
--- a/libktorrent/torrent/downloader.h
+++ b/src/libktorrent/torrent/downloader.h
diff --git a/libktorrent/torrent/globals.cpp b/src/libktorrent/torrent/globals.cpp
index 51dd7a1..51dd7a1 100644
--- a/libktorrent/torrent/globals.cpp
+++ b/src/libktorrent/torrent/globals.cpp
diff --git a/libktorrent/torrent/globals.h b/src/libktorrent/torrent/globals.h
index 16de41e..16de41e 100644
--- a/libktorrent/torrent/globals.h
+++ b/src/libktorrent/torrent/globals.h
diff --git a/libktorrent/torrent/httptracker.cpp b/src/libktorrent/torrent/httptracker.cpp
index c6dd983..c6dd983 100644
--- a/libktorrent/torrent/httptracker.cpp
+++ b/src/libktorrent/torrent/httptracker.cpp
diff --git a/libktorrent/torrent/httptracker.h b/src/libktorrent/torrent/httptracker.h
index 1037bf2..1037bf2 100644
--- a/libktorrent/torrent/httptracker.h
+++ b/src/libktorrent/torrent/httptracker.h
diff --git a/libktorrent/torrent/ipblocklist.cpp b/src/libktorrent/torrent/ipblocklist.cpp
index f524d6b..f524d6b 100644
--- a/libktorrent/torrent/ipblocklist.cpp
+++ b/src/libktorrent/torrent/ipblocklist.cpp
diff --git a/libktorrent/torrent/ipblocklist.h b/src/libktorrent/torrent/ipblocklist.h
index 6439972..6439972 100644
--- a/libktorrent/torrent/ipblocklist.h
+++ b/src/libktorrent/torrent/ipblocklist.h
diff --git a/libktorrent/torrent/movedatafilesjob.cpp b/src/libktorrent/torrent/movedatafilesjob.cpp
index 7db1472..7db1472 100644
--- a/libktorrent/torrent/movedatafilesjob.cpp
+++ b/src/libktorrent/torrent/movedatafilesjob.cpp
diff --git a/libktorrent/torrent/movedatafilesjob.h b/src/libktorrent/torrent/movedatafilesjob.h
index afc98ca..afc98ca 100644
--- a/libktorrent/torrent/movedatafilesjob.h
+++ b/src/libktorrent/torrent/movedatafilesjob.h
diff --git a/libktorrent/torrent/multifilecache.cpp b/src/libktorrent/torrent/multifilecache.cpp
index aaa2797..aaa2797 100644
--- a/libktorrent/torrent/multifilecache.cpp
+++ b/src/libktorrent/torrent/multifilecache.cpp
diff --git a/libktorrent/torrent/multifilecache.h b/src/libktorrent/torrent/multifilecache.h
index 7de197a..7de197a 100644
--- a/libktorrent/torrent/multifilecache.h
+++ b/src/libktorrent/torrent/multifilecache.h
diff --git a/libktorrent/torrent/newchokealgorithm.cpp b/src/libktorrent/torrent/newchokealgorithm.cpp
index 875f356..875f356 100644
--- a/libktorrent/torrent/newchokealgorithm.cpp
+++ b/src/libktorrent/torrent/newchokealgorithm.cpp
diff --git a/libktorrent/torrent/newchokealgorithm.h b/src/libktorrent/torrent/newchokealgorithm.h
index 9a0738a..9a0738a 100644
--- a/libktorrent/torrent/newchokealgorithm.h
+++ b/src/libktorrent/torrent/newchokealgorithm.h
diff --git a/libktorrent/torrent/oldchokealgorithm.cpp b/src/libktorrent/torrent/oldchokealgorithm.cpp
index 6c529ce..6c529ce 100644
--- a/libktorrent/torrent/oldchokealgorithm.cpp
+++ b/src/libktorrent/torrent/oldchokealgorithm.cpp
diff --git a/libktorrent/torrent/oldchokealgorithm.h b/src/libktorrent/torrent/oldchokealgorithm.h
index bc813a8..bc813a8 100644
--- a/libktorrent/torrent/oldchokealgorithm.h
+++ b/src/libktorrent/torrent/oldchokealgorithm.h
diff --git a/libktorrent/torrent/packet.cpp b/src/libktorrent/torrent/packet.cpp
index e5b1aa0..e5b1aa0 100644
--- a/libktorrent/torrent/packet.cpp
+++ b/src/libktorrent/torrent/packet.cpp
diff --git a/libktorrent/torrent/packet.h b/src/libktorrent/torrent/packet.h
index d9eb550..d9eb550 100644
--- a/libktorrent/torrent/packet.h
+++ b/src/libktorrent/torrent/packet.h
diff --git a/libktorrent/torrent/packetreader.cpp b/src/libktorrent/torrent/packetreader.cpp
index b17becc..b17becc 100644
--- a/libktorrent/torrent/packetreader.cpp
+++ b/src/libktorrent/torrent/packetreader.cpp
diff --git a/libktorrent/torrent/packetreader.h b/src/libktorrent/torrent/packetreader.h
index 782604d..782604d 100644
--- a/libktorrent/torrent/packetreader.h
+++ b/src/libktorrent/torrent/packetreader.h
diff --git a/libktorrent/torrent/packetwriter.cpp b/src/libktorrent/torrent/packetwriter.cpp
index 21d26cf..21d26cf 100644
--- a/libktorrent/torrent/packetwriter.cpp
+++ b/src/libktorrent/torrent/packetwriter.cpp
diff --git a/libktorrent/torrent/packetwriter.h b/src/libktorrent/torrent/packetwriter.h
index 8330b65..8330b65 100644
--- a/libktorrent/torrent/packetwriter.h
+++ b/src/libktorrent/torrent/packetwriter.h
diff --git a/libktorrent/torrent/peer.cpp b/src/libktorrent/torrent/peer.cpp
index 6e5f519..6e5f519 100644
--- a/libktorrent/torrent/peer.cpp
+++ b/src/libktorrent/torrent/peer.cpp
diff --git a/libktorrent/torrent/peer.h b/src/libktorrent/torrent/peer.h
index 549ab5d..549ab5d 100644
--- a/libktorrent/torrent/peer.h
+++ b/src/libktorrent/torrent/peer.h
diff --git a/libktorrent/torrent/peerdownloader.cpp b/src/libktorrent/torrent/peerdownloader.cpp
index 4909c5a..4909c5a 100644
--- a/libktorrent/torrent/peerdownloader.cpp
+++ b/src/libktorrent/torrent/peerdownloader.cpp
diff --git a/libktorrent/torrent/peerdownloader.h b/src/libktorrent/torrent/peerdownloader.h
index 5b22739..5b22739 100644
--- a/libktorrent/torrent/peerdownloader.h
+++ b/src/libktorrent/torrent/peerdownloader.h
diff --git a/libktorrent/torrent/peerid.cpp b/src/libktorrent/torrent/peerid.cpp
index f15d5f2..f15d5f2 100644
--- a/libktorrent/torrent/peerid.cpp
+++ b/src/libktorrent/torrent/peerid.cpp
diff --git a/libktorrent/torrent/peerid.h b/src/libktorrent/torrent/peerid.h
index 8ebea9a..8ebea9a 100644
--- a/libktorrent/torrent/peerid.h
+++ b/src/libktorrent/torrent/peerid.h
diff --git a/libktorrent/torrent/peermanager.cpp b/src/libktorrent/torrent/peermanager.cpp
index ee0cd38..ee0cd38 100644
--- a/libktorrent/torrent/peermanager.cpp
+++ b/src/libktorrent/torrent/peermanager.cpp
diff --git a/libktorrent/torrent/peermanager.h b/src/libktorrent/torrent/peermanager.h
index 1a87dbb..1a87dbb 100644
--- a/libktorrent/torrent/peermanager.h
+++ b/src/libktorrent/torrent/peermanager.h
diff --git a/libktorrent/torrent/peersourcemanager.cpp b/src/libktorrent/torrent/peersourcemanager.cpp
index c85c144..c85c144 100644
--- a/libktorrent/torrent/peersourcemanager.cpp
+++ b/src/libktorrent/torrent/peersourcemanager.cpp
diff --git a/libktorrent/torrent/peersourcemanager.h b/src/libktorrent/torrent/peersourcemanager.h
index e7de4f8..e7de4f8 100644
--- a/libktorrent/torrent/peersourcemanager.h
+++ b/src/libktorrent/torrent/peersourcemanager.h
diff --git a/libktorrent/torrent/peeruploader.cpp b/src/libktorrent/torrent/peeruploader.cpp
index 1127f22..1127f22 100644
--- a/libktorrent/torrent/peeruploader.cpp
+++ b/src/libktorrent/torrent/peeruploader.cpp
diff --git a/libktorrent/torrent/peeruploader.h b/src/libktorrent/torrent/peeruploader.h
index 596cdbb..596cdbb 100644
--- a/libktorrent/torrent/peeruploader.h
+++ b/src/libktorrent/torrent/peeruploader.h
diff --git a/libktorrent/torrent/piece.cpp b/src/libktorrent/torrent/piece.cpp
index 0fff862..0fff862 100644
--- a/libktorrent/torrent/piece.cpp
+++ b/src/libktorrent/torrent/piece.cpp
diff --git a/libktorrent/torrent/piece.h b/src/libktorrent/torrent/piece.h
index 9e749db..9e749db 100644
--- a/libktorrent/torrent/piece.h
+++ b/src/libktorrent/torrent/piece.h
diff --git a/libktorrent/torrent/preallocationthread.cpp b/src/libktorrent/torrent/preallocationthread.cpp
index dfa8c56..dfa8c56 100644
--- a/libktorrent/torrent/preallocationthread.cpp
+++ b/src/libktorrent/torrent/preallocationthread.cpp
diff --git a/libktorrent/torrent/preallocationthread.h b/src/libktorrent/torrent/preallocationthread.h
index 581017d..581017d 100644
--- a/libktorrent/torrent/preallocationthread.h
+++ b/src/libktorrent/torrent/preallocationthread.h
diff --git a/libktorrent/torrent/queuemanager.cpp b/src/libktorrent/torrent/queuemanager.cpp
index e4d063c..e4d063c 100644
--- a/libktorrent/torrent/queuemanager.cpp
+++ b/src/libktorrent/torrent/queuemanager.cpp
diff --git a/libktorrent/torrent/queuemanager.h b/src/libktorrent/torrent/queuemanager.h
index 96bc586..96bc586 100644
--- a/libktorrent/torrent/queuemanager.h
+++ b/src/libktorrent/torrent/queuemanager.h
diff --git a/libktorrent/torrent/request.cpp b/src/libktorrent/torrent/request.cpp
index 413eb11..413eb11 100644
--- a/libktorrent/torrent/request.cpp
+++ b/src/libktorrent/torrent/request.cpp
diff --git a/libktorrent/torrent/request.h b/src/libktorrent/torrent/request.h
index aeeff78..aeeff78 100644
--- a/libktorrent/torrent/request.h
+++ b/src/libktorrent/torrent/request.h
diff --git a/libktorrent/torrent/server.cpp b/src/libktorrent/torrent/server.cpp
index 758ebf5..758ebf5 100644
--- a/libktorrent/torrent/server.cpp
+++ b/src/libktorrent/torrent/server.cpp
diff --git a/libktorrent/torrent/server.h b/src/libktorrent/torrent/server.h
index 6d994a2..6d994a2 100644
--- a/libktorrent/torrent/server.h
+++ b/src/libktorrent/torrent/server.h
diff --git a/libktorrent/torrent/serverauthenticate.cpp b/src/libktorrent/torrent/serverauthenticate.cpp
index 9f7c76f..9f7c76f 100644
--- a/libktorrent/torrent/serverauthenticate.cpp
+++ b/src/libktorrent/torrent/serverauthenticate.cpp
diff --git a/libktorrent/torrent/serverauthenticate.h b/src/libktorrent/torrent/serverauthenticate.h
index 63ebff8..63ebff8 100644
--- a/libktorrent/torrent/serverauthenticate.h
+++ b/src/libktorrent/torrent/serverauthenticate.h
diff --git a/libktorrent/torrent/singlefilecache.cpp b/src/libktorrent/torrent/singlefilecache.cpp
index c89c0be..c89c0be 100644
--- a/libktorrent/torrent/singlefilecache.cpp
+++ b/src/libktorrent/torrent/singlefilecache.cpp
diff --git a/libktorrent/torrent/singlefilecache.h b/src/libktorrent/torrent/singlefilecache.h
index 4a787b1..4a787b1 100644
--- a/libktorrent/torrent/singlefilecache.h
+++ b/src/libktorrent/torrent/singlefilecache.h
diff --git a/libktorrent/torrent/speedestimater.cpp b/src/libktorrent/torrent/speedestimater.cpp
index 7752999..7752999 100644
--- a/libktorrent/torrent/speedestimater.cpp
+++ b/src/libktorrent/torrent/speedestimater.cpp
diff --git a/libktorrent/torrent/speedestimater.h b/src/libktorrent/torrent/speedestimater.h
index 16bbdcc..16bbdcc 100644
--- a/libktorrent/torrent/speedestimater.h
+++ b/src/libktorrent/torrent/speedestimater.h
diff --git a/libktorrent/torrent/statsfile.cpp b/src/libktorrent/torrent/statsfile.cpp
index 772f6be..772f6be 100644
--- a/libktorrent/torrent/statsfile.cpp
+++ b/src/libktorrent/torrent/statsfile.cpp
diff --git a/libktorrent/torrent/statsfile.h b/src/libktorrent/torrent/statsfile.h
index 3b3decb..3b3decb 100644
--- a/libktorrent/torrent/statsfile.h
+++ b/src/libktorrent/torrent/statsfile.h
diff --git a/libktorrent/torrent/timeestimator.cpp b/src/libktorrent/torrent/timeestimator.cpp
index 7d18300..7d18300 100644
--- a/libktorrent/torrent/timeestimator.cpp
+++ b/src/libktorrent/torrent/timeestimator.cpp
diff --git a/libktorrent/torrent/timeestimator.h b/src/libktorrent/torrent/timeestimator.h
index 972e239..972e239 100644
--- a/libktorrent/torrent/timeestimator.h
+++ b/src/libktorrent/torrent/timeestimator.h
diff --git a/libktorrent/torrent/torrent.cpp b/src/libktorrent/torrent/torrent.cpp
index a829230..a829230 100644
--- a/libktorrent/torrent/torrent.cpp
+++ b/src/libktorrent/torrent/torrent.cpp
diff --git a/libktorrent/torrent/torrent.h b/src/libktorrent/torrent/torrent.h
index 05c28cc..05c28cc 100644
--- a/libktorrent/torrent/torrent.h
+++ b/src/libktorrent/torrent/torrent.h
diff --git a/libktorrent/torrent/torrentcontrol.cpp b/src/libktorrent/torrent/torrentcontrol.cpp
index 9771e80..9771e80 100644
--- a/libktorrent/torrent/torrentcontrol.cpp
+++ b/src/libktorrent/torrent/torrentcontrol.cpp
diff --git a/libktorrent/torrent/torrentcontrol.h b/src/libktorrent/torrent/torrentcontrol.h
index 14fd6f6..14fd6f6 100644
--- a/libktorrent/torrent/torrentcontrol.h
+++ b/src/libktorrent/torrent/torrentcontrol.h
diff --git a/libktorrent/torrent/torrentcreator.cpp b/src/libktorrent/torrent/torrentcreator.cpp
index 35c8c3e..35c8c3e 100644
--- a/libktorrent/torrent/torrentcreator.cpp
+++ b/src/libktorrent/torrent/torrentcreator.cpp
diff --git a/libktorrent/torrent/torrentcreator.h b/src/libktorrent/torrent/torrentcreator.h
index e1e2545..e1e2545 100644
--- a/libktorrent/torrent/torrentcreator.h
+++ b/src/libktorrent/torrent/torrentcreator.h
diff --git a/libktorrent/torrent/torrentfile.cpp b/src/libktorrent/torrent/torrentfile.cpp
index 106e66f..106e66f 100644
--- a/libktorrent/torrent/torrentfile.cpp
+++ b/src/libktorrent/torrent/torrentfile.cpp
diff --git a/libktorrent/torrent/torrentfile.h b/src/libktorrent/torrent/torrentfile.h
index f2a96a7..f2a96a7 100644
--- a/libktorrent/torrent/torrentfile.h
+++ b/src/libktorrent/torrent/torrentfile.h
diff --git a/libktorrent/torrent/torrentmonitor.cpp b/src/libktorrent/torrent/torrentmonitor.cpp
index ff33acb..ff33acb 100644
--- a/libktorrent/torrent/torrentmonitor.cpp
+++ b/src/libktorrent/torrent/torrentmonitor.cpp
diff --git a/libktorrent/torrent/torrentmonitor.h b/src/libktorrent/torrent/torrentmonitor.h
index 52e3835..52e3835 100644
--- a/libktorrent/torrent/torrentmonitor.h
+++ b/src/libktorrent/torrent/torrentmonitor.h
diff --git a/libktorrent/torrent/tracker.cpp b/src/libktorrent/torrent/tracker.cpp
index 4848765..4848765 100644
--- a/libktorrent/torrent/tracker.cpp
+++ b/src/libktorrent/torrent/tracker.cpp
diff --git a/libktorrent/torrent/tracker.h b/src/libktorrent/torrent/tracker.h
index 72c9468..72c9468 100644
--- a/libktorrent/torrent/tracker.h
+++ b/src/libktorrent/torrent/tracker.h
diff --git a/libktorrent/torrent/udptracker.cpp b/src/libktorrent/torrent/udptracker.cpp
index 89f58b8..89f58b8 100644
--- a/libktorrent/torrent/udptracker.cpp
+++ b/src/libktorrent/torrent/udptracker.cpp
diff --git a/libktorrent/torrent/udptracker.h b/src/libktorrent/torrent/udptracker.h
index 2da26d8..2da26d8 100644
--- a/libktorrent/torrent/udptracker.h
+++ b/src/libktorrent/torrent/udptracker.h
diff --git a/libktorrent/torrent/udptrackersocket.cpp b/src/libktorrent/torrent/udptrackersocket.cpp
index eb8dc8b..eb8dc8b 100644
--- a/libktorrent/torrent/udptrackersocket.cpp
+++ b/src/libktorrent/torrent/udptrackersocket.cpp
diff --git a/libktorrent/torrent/udptrackersocket.h b/src/libktorrent/torrent/udptrackersocket.h
index 5b48f18..5b48f18 100644
--- a/libktorrent/torrent/udptrackersocket.h
+++ b/src/libktorrent/torrent/udptrackersocket.h
diff --git a/libktorrent/torrent/uploadcap.cpp b/src/libktorrent/torrent/uploadcap.cpp
index 701d854..701d854 100644
--- a/libktorrent/torrent/uploadcap.cpp
+++ b/src/libktorrent/torrent/uploadcap.cpp
diff --git a/libktorrent/torrent/uploadcap.h b/src/libktorrent/torrent/uploadcap.h
index f766f59..f766f59 100644
--- a/libktorrent/torrent/uploadcap.h
+++ b/src/libktorrent/torrent/uploadcap.h
diff --git a/libktorrent/torrent/uploader.cpp b/src/libktorrent/torrent/uploader.cpp
index 0cf3677..0cf3677 100644
--- a/libktorrent/torrent/uploader.cpp
+++ b/src/libktorrent/torrent/uploader.cpp
diff --git a/libktorrent/torrent/uploader.h b/src/libktorrent/torrent/uploader.h
index 06ce331..06ce331 100644
--- a/libktorrent/torrent/uploader.h
+++ b/src/libktorrent/torrent/uploader.h
diff --git a/libktorrent/torrent/upspeedestimater.cpp b/src/libktorrent/torrent/upspeedestimater.cpp
index 08137f5..08137f5 100644
--- a/libktorrent/torrent/upspeedestimater.cpp
+++ b/src/libktorrent/torrent/upspeedestimater.cpp
diff --git a/libktorrent/torrent/upspeedestimater.h b/src/libktorrent/torrent/upspeedestimater.h
index 27c0c06..27c0c06 100644
--- a/libktorrent/torrent/upspeedestimater.h
+++ b/src/libktorrent/torrent/upspeedestimater.h
diff --git a/libktorrent/torrent/utpex.cpp b/src/libktorrent/torrent/utpex.cpp
index 68361e0..68361e0 100644
--- a/libktorrent/torrent/utpex.cpp
+++ b/src/libktorrent/torrent/utpex.cpp
diff --git a/libktorrent/torrent/utpex.h b/src/libktorrent/torrent/utpex.h
index cab2f39..cab2f39 100644
--- a/libktorrent/torrent/utpex.h
+++ b/src/libktorrent/torrent/utpex.h
diff --git a/libktorrent/torrent/value.cpp b/src/libktorrent/torrent/value.cpp
index 4d8641c..4d8641c 100644
--- a/libktorrent/torrent/value.cpp
+++ b/src/libktorrent/torrent/value.cpp
diff --git a/libktorrent/torrent/value.h b/src/libktorrent/torrent/value.h
index 7926af4..7926af4 100644
--- a/libktorrent/torrent/value.h
+++ b/src/libktorrent/torrent/value.h
diff --git a/libktorrent/util/Makefile.am b/src/libktorrent/util/Makefile.am
index c7f46ae..c7f46ae 100644
--- a/libktorrent/util/Makefile.am
+++ b/src/libktorrent/util/Makefile.am
diff --git a/libktorrent/util/array.cpp b/src/libktorrent/util/array.cpp
index e57091d..e57091d 100644
--- a/libktorrent/util/array.cpp
+++ b/src/libktorrent/util/array.cpp
diff --git a/libktorrent/util/array.h b/src/libktorrent/util/array.h
index 1694e2a..1694e2a 100644
--- a/libktorrent/util/array.h
+++ b/src/libktorrent/util/array.h
diff --git a/libktorrent/util/autorotatelogjob.cpp b/src/libktorrent/util/autorotatelogjob.cpp
index 100c0b9..100c0b9 100644
--- a/libktorrent/util/autorotatelogjob.cpp
+++ b/src/libktorrent/util/autorotatelogjob.cpp
diff --git a/libktorrent/util/autorotatelogjob.h b/src/libktorrent/util/autorotatelogjob.h
index 222a99c..222a99c 100644
--- a/libktorrent/util/autorotatelogjob.h
+++ b/src/libktorrent/util/autorotatelogjob.h
diff --git a/libktorrent/util/bitset.cpp b/src/libktorrent/util/bitset.cpp
index 6139e01..6139e01 100644
--- a/libktorrent/util/bitset.cpp
+++ b/src/libktorrent/util/bitset.cpp
diff --git a/libktorrent/util/bitset.h b/src/libktorrent/util/bitset.h
index 32e7e48..32e7e48 100644
--- a/libktorrent/util/bitset.h
+++ b/src/libktorrent/util/bitset.h
diff --git a/libktorrent/util/constants.h b/src/libktorrent/util/constants.h
index 0551f60..0551f60 100644
--- a/libktorrent/util/constants.h
+++ b/src/libktorrent/util/constants.h
diff --git a/libktorrent/util/error.cpp b/src/libktorrent/util/error.cpp
index dd3e15d..dd3e15d 100644
--- a/libktorrent/util/error.cpp
+++ b/src/libktorrent/util/error.cpp
diff --git a/libktorrent/util/error.h b/src/libktorrent/util/error.h
index 49aa95d..49aa95d 100644
--- a/libktorrent/util/error.h
+++ b/src/libktorrent/util/error.h
diff --git a/libktorrent/util/file.cpp b/src/libktorrent/util/file.cpp
index 95af348..95af348 100644
--- a/libktorrent/util/file.cpp
+++ b/src/libktorrent/util/file.cpp
diff --git a/libktorrent/util/file.h b/src/libktorrent/util/file.h
index c6567f8..c6567f8 100644
--- a/libktorrent/util/file.h
+++ b/src/libktorrent/util/file.h
diff --git a/libktorrent/util/fileops.cpp b/src/libktorrent/util/fileops.cpp
index 29e7549..29e7549 100644
--- a/libktorrent/util/fileops.cpp
+++ b/src/libktorrent/util/fileops.cpp
diff --git a/libktorrent/util/fileops.h b/src/libktorrent/util/fileops.h
index d1c3437..d1c3437 100644
--- a/libktorrent/util/fileops.h
+++ b/src/libktorrent/util/fileops.h
diff --git a/libktorrent/util/functions.cpp b/src/libktorrent/util/functions.cpp
index 2480a24..2480a24 100644
--- a/libktorrent/util/functions.cpp
+++ b/src/libktorrent/util/functions.cpp
diff --git a/libktorrent/util/functions.h b/src/libktorrent/util/functions.h
index 9295b83..9295b83 100644
--- a/libktorrent/util/functions.h
+++ b/src/libktorrent/util/functions.h
diff --git a/libktorrent/util/httprequest.cpp b/src/libktorrent/util/httprequest.cpp
index ff40e4c..ff40e4c 100644
--- a/libktorrent/util/httprequest.cpp
+++ b/src/libktorrent/util/httprequest.cpp
diff --git a/libktorrent/util/httprequest.h b/src/libktorrent/util/httprequest.h
index fd9e7b7..fd9e7b7 100644
--- a/libktorrent/util/httprequest.h
+++ b/src/libktorrent/util/httprequest.h
diff --git a/libktorrent/util/log.cpp b/src/libktorrent/util/log.cpp
index 422effe..422effe 100644
--- a/libktorrent/util/log.cpp
+++ b/src/libktorrent/util/log.cpp
diff --git a/libktorrent/util/log.h b/src/libktorrent/util/log.h
index 742b753..742b753 100644
--- a/libktorrent/util/log.h
+++ b/src/libktorrent/util/log.h
diff --git a/libktorrent/util/mmapfile.cpp b/src/libktorrent/util/mmapfile.cpp
index b60bef9..b60bef9 100644
--- a/libktorrent/util/mmapfile.cpp
+++ b/src/libktorrent/util/mmapfile.cpp
diff --git a/libktorrent/util/mmapfile.h b/src/libktorrent/util/mmapfile.h
index 4d68fd2..4d68fd2 100644
--- a/libktorrent/util/mmapfile.h
+++ b/src/libktorrent/util/mmapfile.h
diff --git a/libktorrent/util/profiler.cpp b/src/libktorrent/util/profiler.cpp
index 4da9e7f..4da9e7f 100644
--- a/libktorrent/util/profiler.cpp
+++ b/src/libktorrent/util/profiler.cpp
diff --git a/libktorrent/util/profiler.h b/src/libktorrent/util/profiler.h
index 1b220b1..1b220b1 100644
--- a/libktorrent/util/profiler.h
+++ b/src/libktorrent/util/profiler.h
diff --git a/libktorrent/util/ptrmap.cpp b/src/libktorrent/util/ptrmap.cpp
index 28a4340..28a4340 100644
--- a/libktorrent/util/ptrmap.cpp
+++ b/src/libktorrent/util/ptrmap.cpp
diff --git a/libktorrent/util/ptrmap.h b/src/libktorrent/util/ptrmap.h
index 36e1c20..36e1c20 100644
--- a/libktorrent/util/ptrmap.h
+++ b/src/libktorrent/util/ptrmap.h
diff --git a/libktorrent/util/sha1hash.cpp b/src/libktorrent/util/sha1hash.cpp
index 6cdbbc4..6cdbbc4 100644
--- a/libktorrent/util/sha1hash.cpp
+++ b/src/libktorrent/util/sha1hash.cpp
diff --git a/libktorrent/util/sha1hash.h b/src/libktorrent/util/sha1hash.h
index dba66c9..dba66c9 100644
--- a/libktorrent/util/sha1hash.h
+++ b/src/libktorrent/util/sha1hash.h
diff --git a/libktorrent/util/sha1hashgen.cpp b/src/libktorrent/util/sha1hashgen.cpp
index bacca62..bacca62 100644
--- a/libktorrent/util/sha1hashgen.cpp
+++ b/src/libktorrent/util/sha1hashgen.cpp
diff --git a/libktorrent/util/sha1hashgen.h b/src/libktorrent/util/sha1hashgen.h
index 08cc3ad..08cc3ad 100644
--- a/libktorrent/util/sha1hashgen.h
+++ b/src/libktorrent/util/sha1hashgen.h
diff --git a/libktorrent/util/timer.cpp b/src/libktorrent/util/timer.cpp
index a35ffc0..a35ffc0 100644
--- a/libktorrent/util/timer.cpp
+++ b/src/libktorrent/util/timer.cpp
diff --git a/libktorrent/util/timer.h b/src/libktorrent/util/timer.h
index edef755..edef755 100644
--- a/libktorrent/util/timer.h
+++ b/src/libktorrent/util/timer.h
diff --git a/libktorrent/util/urlencoder.cpp b/src/libktorrent/util/urlencoder.cpp
index 9d2b92b..9d2b92b 100644
--- a/libktorrent/util/urlencoder.cpp
+++ b/src/libktorrent/util/urlencoder.cpp
diff --git a/libktorrent/util/urlencoder.h b/src/libktorrent/util/urlencoder.h
index c6fd3ec..c6fd3ec 100644
--- a/libktorrent/util/urlencoder.h
+++ b/src/libktorrent/util/urlencoder.h
diff --git a/libktorrent/util/waitjob.cpp b/src/libktorrent/util/waitjob.cpp
index d236b6d..d236b6d 100644
--- a/libktorrent/util/waitjob.cpp
+++ b/src/libktorrent/util/waitjob.cpp
diff --git a/libktorrent/util/waitjob.h b/src/libktorrent/util/waitjob.h
index 6f9bdd5..6f9bdd5 100644
--- a/libktorrent/util/waitjob.h
+++ b/src/libktorrent/util/waitjob.h
diff --git a/plugins/Makefile.am b/src/plugins/Makefile.am
index ad2e28c..ad2e28c 100644
--- a/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
diff --git a/plugins/infowidget/GeoIP.c b/src/plugins/infowidget/GeoIP.c
index 32ce476..32ce476 100644
--- a/plugins/infowidget/GeoIP.c
+++ b/src/plugins/infowidget/GeoIP.c
diff --git a/plugins/infowidget/GeoIP.h b/src/plugins/infowidget/GeoIP.h
index f85092c..f85092c 100644
--- a/plugins/infowidget/GeoIP.h
+++ b/src/plugins/infowidget/GeoIP.h
diff --git a/plugins/infowidget/Makefile.am b/src/plugins/infowidget/Makefile.am
index ace5e0d..ace5e0d 100644
--- a/plugins/infowidget/Makefile.am
+++ b/src/plugins/infowidget/Makefile.am
diff --git a/plugins/infowidget/availabilitychunkbar.cpp b/src/plugins/infowidget/availabilitychunkbar.cpp
index 4b50f27..4b50f27 100644
--- a/plugins/infowidget/availabilitychunkbar.cpp
+++ b/src/plugins/infowidget/availabilitychunkbar.cpp
diff --git a/plugins/infowidget/availabilitychunkbar.h b/src/plugins/infowidget/availabilitychunkbar.h
index ce8ba27..ce8ba27 100644
--- a/plugins/infowidget/availabilitychunkbar.h
+++ b/src/plugins/infowidget/availabilitychunkbar.h
diff --git a/plugins/infowidget/chunkbar.cpp b/src/plugins/infowidget/chunkbar.cpp
index 794bf5a..794bf5a 100644
--- a/plugins/infowidget/chunkbar.cpp
+++ b/src/plugins/infowidget/chunkbar.cpp
diff --git a/plugins/infowidget/chunkbar.h b/src/plugins/infowidget/chunkbar.h
index 593acfe..593acfe 100644
--- a/plugins/infowidget/chunkbar.h
+++ b/src/plugins/infowidget/chunkbar.h
diff --git a/plugins/infowidget/chunkdownloadview.cpp b/src/plugins/infowidget/chunkdownloadview.cpp
index e67da32..e67da32 100644
--- a/plugins/infowidget/chunkdownloadview.cpp
+++ b/src/plugins/infowidget/chunkdownloadview.cpp
diff --git a/plugins/infowidget/chunkdownloadview.h b/src/plugins/infowidget/chunkdownloadview.h
index b72c07b..b72c07b 100644
--- a/plugins/infowidget/chunkdownloadview.h
+++ b/src/plugins/infowidget/chunkdownloadview.h
diff --git a/plugins/infowidget/chunkdownloadviewbase.ui b/src/plugins/infowidget/chunkdownloadviewbase.ui
index 4bdc2c1..4bdc2c1 100644
--- a/plugins/infowidget/chunkdownloadviewbase.ui
+++ b/src/plugins/infowidget/chunkdownloadviewbase.ui
diff --git a/plugins/infowidget/downloadedchunkbar.cpp b/src/plugins/infowidget/downloadedchunkbar.cpp
index 4d72a60..4d72a60 100644
--- a/plugins/infowidget/downloadedchunkbar.cpp
+++ b/src/plugins/infowidget/downloadedchunkbar.cpp
diff --git a/plugins/infowidget/downloadedchunkbar.h b/src/plugins/infowidget/downloadedchunkbar.h
index fa0fea2..fa0fea2 100644
--- a/plugins/infowidget/downloadedchunkbar.h
+++ b/src/plugins/infowidget/downloadedchunkbar.h
diff --git a/plugins/infowidget/fileview.cpp b/src/plugins/infowidget/fileview.cpp
index 63436fb..63436fb 100644
--- a/plugins/infowidget/fileview.cpp
+++ b/src/plugins/infowidget/fileview.cpp
diff --git a/plugins/infowidget/fileview.h b/src/plugins/infowidget/fileview.h
index e42935d..e42935d 100644
--- a/plugins/infowidget/fileview.h
+++ b/src/plugins/infowidget/fileview.h
diff --git a/plugins/infowidget/flagdb.cpp b/src/plugins/infowidget/flagdb.cpp
index 50a15e2..50a15e2 100644
--- a/plugins/infowidget/flagdb.cpp
+++ b/src/plugins/infowidget/flagdb.cpp
diff --git a/plugins/infowidget/flagdb.h b/src/plugins/infowidget/flagdb.h
index 9002671..9002671 100644
--- a/plugins/infowidget/flagdb.h
+++ b/src/plugins/infowidget/flagdb.h
diff --git a/plugins/infowidget/floatspinbox.cpp b/src/plugins/infowidget/floatspinbox.cpp
index d463d9a..d463d9a 100644
--- a/plugins/infowidget/floatspinbox.cpp
+++ b/src/plugins/infowidget/floatspinbox.cpp
diff --git a/plugins/infowidget/floatspinbox.h b/src/plugins/infowidget/floatspinbox.h
index 50c6b0c..50c6b0c 100644
--- a/plugins/infowidget/floatspinbox.h
+++ b/src/plugins/infowidget/floatspinbox.h
diff --git a/plugins/infowidget/geoip/FLAGS_LICENCE b/src/plugins/infowidget/geoip/FLAGS_LICENCE
index 368a8fe..368a8fe 100644
--- a/plugins/infowidget/geoip/FLAGS_LICENCE
+++ b/src/plugins/infowidget/geoip/FLAGS_LICENCE
diff --git a/plugins/infowidget/geoip/GeoIP-LICENSE.txt b/src/plugins/infowidget/geoip/GeoIP-LICENSE.txt
index 457710d..457710d 100644
--- a/plugins/infowidget/geoip/GeoIP-LICENSE.txt
+++ b/src/plugins/infowidget/geoip/GeoIP-LICENSE.txt
diff --git a/plugins/infowidget/geoip/Makefile.am b/src/plugins/infowidget/geoip/Makefile.am
index 1a7d6c4..1a7d6c4 100644
--- a/plugins/infowidget/geoip/Makefile.am
+++ b/src/plugins/infowidget/geoip/Makefile.am
diff --git a/plugins/infowidget/geoip/ad.png b/src/plugins/infowidget/geoip/ad.png
index 6c79257..6c79257 100644
--- a/plugins/infowidget/geoip/ad.png
+++ b/src/plugins/infowidget/geoip/ad.png
diff --git a/plugins/infowidget/geoip/ae.png b/src/plugins/infowidget/geoip/ae.png
index 4e343d8..4e343d8 100644
--- a/plugins/infowidget/geoip/ae.png
+++ b/src/plugins/infowidget/geoip/ae.png
diff --git a/plugins/infowidget/geoip/af.png b/src/plugins/infowidget/geoip/af.png
index 0792930..0792930 100644
--- a/plugins/infowidget/geoip/af.png
+++ b/src/plugins/infowidget/geoip/af.png
diff --git a/plugins/infowidget/geoip/ag.png b/src/plugins/infowidget/geoip/ag.png
index 973c64b..973c64b 100644
--- a/plugins/infowidget/geoip/ag.png
+++ b/src/plugins/infowidget/geoip/ag.png
diff --git a/plugins/infowidget/geoip/ai.png b/src/plugins/infowidget/geoip/ai.png
index 47fd6a7..47fd6a7 100644
--- a/plugins/infowidget/geoip/ai.png
+++ b/src/plugins/infowidget/geoip/ai.png
diff --git a/plugins/infowidget/geoip/al.png b/src/plugins/infowidget/geoip/al.png
index a385c56..a385c56 100644
--- a/plugins/infowidget/geoip/al.png
+++ b/src/plugins/infowidget/geoip/al.png
diff --git a/plugins/infowidget/geoip/am.png b/src/plugins/infowidget/geoip/am.png
index 42bb4ee..42bb4ee 100644
--- a/plugins/infowidget/geoip/am.png
+++ b/src/plugins/infowidget/geoip/am.png
diff --git a/plugins/infowidget/geoip/an.png b/src/plugins/infowidget/geoip/an.png
index a085af7..a085af7 100644
--- a/plugins/infowidget/geoip/an.png
+++ b/src/plugins/infowidget/geoip/an.png
diff --git a/plugins/infowidget/geoip/ao.png b/src/plugins/infowidget/geoip/ao.png
index a949c2d..a949c2d 100644
--- a/plugins/infowidget/geoip/ao.png
+++ b/src/plugins/infowidget/geoip/ao.png
diff --git a/plugins/infowidget/geoip/aq.png b/src/plugins/infowidget/geoip/aq.png
index 31bcd6e..31bcd6e 100644
--- a/plugins/infowidget/geoip/aq.png
+++ b/src/plugins/infowidget/geoip/aq.png
diff --git a/plugins/infowidget/geoip/ar.png b/src/plugins/infowidget/geoip/ar.png
index 4adc0d2..4adc0d2 100644
--- a/plugins/infowidget/geoip/ar.png
+++ b/src/plugins/infowidget/geoip/ar.png
diff --git a/plugins/infowidget/geoip/as.png b/src/plugins/infowidget/geoip/as.png
index fb57a01..fb57a01 100644
--- a/plugins/infowidget/geoip/as.png
+++ b/src/plugins/infowidget/geoip/as.png
diff --git a/plugins/infowidget/geoip/at.png b/src/plugins/infowidget/geoip/at.png
index d07949a..d07949a 100644
--- a/plugins/infowidget/geoip/at.png
+++ b/src/plugins/infowidget/geoip/at.png
diff --git a/plugins/infowidget/geoip/au.png b/src/plugins/infowidget/geoip/au.png
index c678f14..c678f14 100644
--- a/plugins/infowidget/geoip/au.png
+++ b/src/plugins/infowidget/geoip/au.png
diff --git a/plugins/infowidget/geoip/aw.png b/src/plugins/infowidget/geoip/aw.png
index ae3b5cf..ae3b5cf 100644
--- a/plugins/infowidget/geoip/aw.png
+++ b/src/plugins/infowidget/geoip/aw.png
diff --git a/plugins/infowidget/geoip/az.png b/src/plugins/infowidget/geoip/az.png
index 0c996ff..0c996ff 100644
--- a/plugins/infowidget/geoip/az.png
+++ b/src/plugins/infowidget/geoip/az.png
diff --git a/plugins/infowidget/geoip/ba.png b/src/plugins/infowidget/geoip/ba.png
index 0616606..0616606 100644
--- a/plugins/infowidget/geoip/ba.png
+++ b/src/plugins/infowidget/geoip/ba.png
diff --git a/plugins/infowidget/geoip/bb.png b/src/plugins/infowidget/geoip/bb.png
index fea000a..fea000a 100644
--- a/plugins/infowidget/geoip/bb.png
+++ b/src/plugins/infowidget/geoip/bb.png
diff --git a/plugins/infowidget/geoip/bd.png b/src/plugins/infowidget/geoip/bd.png
index 1d61698..1d61698 100644
--- a/plugins/infowidget/geoip/bd.png
+++ b/src/plugins/infowidget/geoip/bd.png
diff --git a/plugins/infowidget/geoip/be.png b/src/plugins/infowidget/geoip/be.png
index 42a5707..42a5707 100644
--- a/plugins/infowidget/geoip/be.png
+++ b/src/plugins/infowidget/geoip/be.png
diff --git a/plugins/infowidget/geoip/bf.png b/src/plugins/infowidget/geoip/bf.png
index c6af9b5..c6af9b5 100644
--- a/plugins/infowidget/geoip/bf.png
+++ b/src/plugins/infowidget/geoip/bf.png
diff --git a/plugins/infowidget/geoip/bg.png b/src/plugins/infowidget/geoip/bg.png
index 9392514..9392514 100644
--- a/plugins/infowidget/geoip/bg.png
+++ b/src/plugins/infowidget/geoip/bg.png
diff --git a/plugins/infowidget/geoip/bh.png b/src/plugins/infowidget/geoip/bh.png
index 8d0083e..8d0083e 100644
--- a/plugins/infowidget/geoip/bh.png
+++ b/src/plugins/infowidget/geoip/bh.png
diff --git a/plugins/infowidget/geoip/bi.png b/src/plugins/infowidget/geoip/bi.png
index 9fc22cc..9fc22cc 100644
--- a/plugins/infowidget/geoip/bi.png
+++ b/src/plugins/infowidget/geoip/bi.png
diff --git a/plugins/infowidget/geoip/bj.png b/src/plugins/infowidget/geoip/bj.png
index c1a87b9..c1a87b9 100644
--- a/plugins/infowidget/geoip/bj.png
+++ b/src/plugins/infowidget/geoip/bj.png
diff --git a/plugins/infowidget/geoip/bm.png b/src/plugins/infowidget/geoip/bm.png
index 6d83eba..6d83eba 100644
--- a/plugins/infowidget/geoip/bm.png
+++ b/src/plugins/infowidget/geoip/bm.png
diff --git a/plugins/infowidget/geoip/bn.png b/src/plugins/infowidget/geoip/bn.png
index 1ae2348..1ae2348 100644
--- a/plugins/infowidget/geoip/bn.png
+++ b/src/plugins/infowidget/geoip/bn.png
diff --git a/plugins/infowidget/geoip/bo.png b/src/plugins/infowidget/geoip/bo.png
index 786b481..786b481 100644
--- a/plugins/infowidget/geoip/bo.png
+++ b/src/plugins/infowidget/geoip/bo.png
diff --git a/plugins/infowidget/geoip/br.png b/src/plugins/infowidget/geoip/br.png
index aa14bc7..aa14bc7 100644
--- a/plugins/infowidget/geoip/br.png
+++ b/src/plugins/infowidget/geoip/br.png
diff --git a/plugins/infowidget/geoip/bs.png b/src/plugins/infowidget/geoip/bs.png
index 40166af..40166af 100644
--- a/plugins/infowidget/geoip/bs.png
+++ b/src/plugins/infowidget/geoip/bs.png
diff --git a/plugins/infowidget/geoip/bt.png b/src/plugins/infowidget/geoip/bt.png
index ef50d74..ef50d74 100644
--- a/plugins/infowidget/geoip/bt.png
+++ b/src/plugins/infowidget/geoip/bt.png
diff --git a/plugins/infowidget/geoip/bv.png b/src/plugins/infowidget/geoip/bv.png
index 04c5f5f..04c5f5f 100644
--- a/plugins/infowidget/geoip/bv.png
+++ b/src/plugins/infowidget/geoip/bv.png
diff --git a/plugins/infowidget/geoip/bw.png b/src/plugins/infowidget/geoip/bw.png
index c1f81ca..c1f81ca 100644
--- a/plugins/infowidget/geoip/bw.png
+++ b/src/plugins/infowidget/geoip/bw.png
diff --git a/plugins/infowidget/geoip/by.png b/src/plugins/infowidget/geoip/by.png
index c66bb28..c66bb28 100644
--- a/plugins/infowidget/geoip/by.png
+++ b/src/plugins/infowidget/geoip/by.png
diff --git a/plugins/infowidget/geoip/bz.png b/src/plugins/infowidget/geoip/bz.png
index 714eacf..714eacf 100644
--- a/plugins/infowidget/geoip/bz.png
+++ b/src/plugins/infowidget/geoip/bz.png
diff --git a/plugins/infowidget/geoip/ca.png b/src/plugins/infowidget/geoip/ca.png
index b6b5701..b6b5701 100644
--- a/plugins/infowidget/geoip/ca.png
+++ b/src/plugins/infowidget/geoip/ca.png
diff --git a/plugins/infowidget/geoip/cc.png b/src/plugins/infowidget/geoip/cc.png
index 6478802..6478802 100644
--- a/plugins/infowidget/geoip/cc.png
+++ b/src/plugins/infowidget/geoip/cc.png
diff --git a/plugins/infowidget/geoip/cd.png b/src/plugins/infowidget/geoip/cd.png
index 470c689..470c689 100644
--- a/plugins/infowidget/geoip/cd.png
+++ b/src/plugins/infowidget/geoip/cd.png
diff --git a/plugins/infowidget/geoip/cf.png b/src/plugins/infowidget/geoip/cf.png
index 0e9206b..0e9206b 100644
--- a/plugins/infowidget/geoip/cf.png
+++ b/src/plugins/infowidget/geoip/cf.png
diff --git a/plugins/infowidget/geoip/cg.png b/src/plugins/infowidget/geoip/cg.png
index fb03dc9..fb03dc9 100644
--- a/plugins/infowidget/geoip/cg.png
+++ b/src/plugins/infowidget/geoip/cg.png
diff --git a/plugins/infowidget/geoip/ch.png b/src/plugins/infowidget/geoip/ch.png
index bddc7d2..bddc7d2 100644
--- a/plugins/infowidget/geoip/ch.png
+++ b/src/plugins/infowidget/geoip/ch.png
diff --git a/plugins/infowidget/geoip/ci.png b/src/plugins/infowidget/geoip/ci.png
index e2617bb..e2617bb 100644
--- a/plugins/infowidget/geoip/ci.png
+++ b/src/plugins/infowidget/geoip/ci.png
diff --git a/plugins/infowidget/geoip/ck.png b/src/plugins/infowidget/geoip/ck.png
index 6c8b2da..6c8b2da 100644
--- a/plugins/infowidget/geoip/ck.png
+++ b/src/plugins/infowidget/geoip/ck.png
diff --git a/plugins/infowidget/geoip/cl.png b/src/plugins/infowidget/geoip/cl.png
index 559332d..559332d 100644
--- a/plugins/infowidget/geoip/cl.png
+++ b/src/plugins/infowidget/geoip/cl.png
diff --git a/plugins/infowidget/geoip/cm.png b/src/plugins/infowidget/geoip/cm.png
index f8ed6ea..f8ed6ea 100644
--- a/plugins/infowidget/geoip/cm.png
+++ b/src/plugins/infowidget/geoip/cm.png
diff --git a/plugins/infowidget/geoip/cn.png b/src/plugins/infowidget/geoip/cn.png
index 63cbdbc..63cbdbc 100644
--- a/plugins/infowidget/geoip/cn.png
+++ b/src/plugins/infowidget/geoip/cn.png
diff --git a/plugins/infowidget/geoip/co.png b/src/plugins/infowidget/geoip/co.png
index f6abf92..f6abf92 100644
--- a/plugins/infowidget/geoip/co.png
+++ b/src/plugins/infowidget/geoip/co.png
diff --git a/plugins/infowidget/geoip/cr.png b/src/plugins/infowidget/geoip/cr.png
index 87e54ea..87e54ea 100644
--- a/plugins/infowidget/geoip/cr.png
+++ b/src/plugins/infowidget/geoip/cr.png
diff --git a/plugins/infowidget/geoip/cs.png b/src/plugins/infowidget/geoip/cs.png
index 23f8583..23f8583 100644
--- a/plugins/infowidget/geoip/cs.png
+++ b/src/plugins/infowidget/geoip/cs.png
diff --git a/plugins/infowidget/geoip/cu.png b/src/plugins/infowidget/geoip/cu.png
index 8d2a700..8d2a700 100644
--- a/plugins/infowidget/geoip/cu.png
+++ b/src/plugins/infowidget/geoip/cu.png
diff --git a/plugins/infowidget/geoip/cv.png b/src/plugins/infowidget/geoip/cv.png
index 51bf11b..51bf11b 100644
--- a/plugins/infowidget/geoip/cv.png
+++ b/src/plugins/infowidget/geoip/cv.png
diff --git a/plugins/infowidget/geoip/cx.png b/src/plugins/infowidget/geoip/cx.png
index 8e4bde4..8e4bde4 100644
--- a/plugins/infowidget/geoip/cx.png
+++ b/src/plugins/infowidget/geoip/cx.png
diff --git a/plugins/infowidget/geoip/cy.png b/src/plugins/infowidget/geoip/cy.png
index 3f6d729..3f6d729 100644
--- a/plugins/infowidget/geoip/cy.png
+++ b/src/plugins/infowidget/geoip/cy.png
diff --git a/plugins/infowidget/geoip/cz.png b/src/plugins/infowidget/geoip/cz.png
index cbc2c78..cbc2c78 100644
--- a/plugins/infowidget/geoip/cz.png
+++ b/src/plugins/infowidget/geoip/cz.png
diff --git a/plugins/infowidget/geoip/de.png b/src/plugins/infowidget/geoip/de.png
index 0a74410..0a74410 100644
--- a/plugins/infowidget/geoip/de.png
+++ b/src/plugins/infowidget/geoip/de.png
diff --git a/plugins/infowidget/geoip/dj.png b/src/plugins/infowidget/geoip/dj.png
index e593841..e593841 100644
--- a/plugins/infowidget/geoip/dj.png
+++ b/src/plugins/infowidget/geoip/dj.png
diff --git a/plugins/infowidget/geoip/dk.png b/src/plugins/infowidget/geoip/dk.png
index 6e4bec9..6e4bec9 100644
--- a/plugins/infowidget/geoip/dk.png
+++ b/src/plugins/infowidget/geoip/dk.png
diff --git a/plugins/infowidget/geoip/dm.png b/src/plugins/infowidget/geoip/dm.png
index f92556b..f92556b 100644
--- a/plugins/infowidget/geoip/dm.png
+++ b/src/plugins/infowidget/geoip/dm.png
diff --git a/plugins/infowidget/geoip/do.png b/src/plugins/infowidget/geoip/do.png
index 91e6d86..91e6d86 100644
--- a/plugins/infowidget/geoip/do.png
+++ b/src/plugins/infowidget/geoip/do.png
diff --git a/plugins/infowidget/geoip/dz.png b/src/plugins/infowidget/geoip/dz.png
index 6625b3f..6625b3f 100644
--- a/plugins/infowidget/geoip/dz.png
+++ b/src/plugins/infowidget/geoip/dz.png
diff --git a/plugins/infowidget/geoip/ec.png b/src/plugins/infowidget/geoip/ec.png
index 3589217..3589217 100644
--- a/plugins/infowidget/geoip/ec.png
+++ b/src/plugins/infowidget/geoip/ec.png
diff --git a/plugins/infowidget/geoip/ee.png b/src/plugins/infowidget/geoip/ee.png
index fafaa81..fafaa81 100644
--- a/plugins/infowidget/geoip/ee.png
+++ b/src/plugins/infowidget/geoip/ee.png
diff --git a/plugins/infowidget/geoip/eg.png b/src/plugins/infowidget/geoip/eg.png
index 0e02c2a..0e02c2a 100644
--- a/plugins/infowidget/geoip/eg.png
+++ b/src/plugins/infowidget/geoip/eg.png
diff --git a/plugins/infowidget/geoip/eh.png b/src/plugins/infowidget/geoip/eh.png
index 528350f..528350f 100644
--- a/plugins/infowidget/geoip/eh.png
+++ b/src/plugins/infowidget/geoip/eh.png
diff --git a/plugins/infowidget/geoip/er.png b/src/plugins/infowidget/geoip/er.png
index 4e10435..4e10435 100644
--- a/plugins/infowidget/geoip/er.png
+++ b/src/plugins/infowidget/geoip/er.png
diff --git a/plugins/infowidget/geoip/es.png b/src/plugins/infowidget/geoip/es.png
index 7bf2626..7bf2626 100644
--- a/plugins/infowidget/geoip/es.png
+++ b/src/plugins/infowidget/geoip/es.png
diff --git a/plugins/infowidget/geoip/et.png b/src/plugins/infowidget/geoip/et.png
index 1bdb3ad..1bdb3ad 100644
--- a/plugins/infowidget/geoip/et.png
+++ b/src/plugins/infowidget/geoip/et.png
diff --git a/plugins/infowidget/geoip/eu.png b/src/plugins/infowidget/geoip/eu.png
index 7dcedc7..7dcedc7 100644
--- a/plugins/infowidget/geoip/eu.png
+++ b/src/plugins/infowidget/geoip/eu.png
diff --git a/plugins/infowidget/geoip/fi.png b/src/plugins/infowidget/geoip/fi.png
index 96ae42c..96ae42c 100644
--- a/plugins/infowidget/geoip/fi.png
+++ b/src/plugins/infowidget/geoip/fi.png
diff --git a/plugins/infowidget/geoip/fj.png b/src/plugins/infowidget/geoip/fj.png
index d7a4362..d7a4362 100644
--- a/plugins/infowidget/geoip/fj.png
+++ b/src/plugins/infowidget/geoip/fj.png
diff --git a/plugins/infowidget/geoip/fk.png b/src/plugins/infowidget/geoip/fk.png
index 45734c4..45734c4 100644
--- a/plugins/infowidget/geoip/fk.png
+++ b/src/plugins/infowidget/geoip/fk.png
diff --git a/plugins/infowidget/geoip/fm.png b/src/plugins/infowidget/geoip/fm.png
index 80005b9..80005b9 100644
--- a/plugins/infowidget/geoip/fm.png
+++ b/src/plugins/infowidget/geoip/fm.png
diff --git a/plugins/infowidget/geoip/fo.png b/src/plugins/infowidget/geoip/fo.png
index 79287b4..79287b4 100644
--- a/plugins/infowidget/geoip/fo.png
+++ b/src/plugins/infowidget/geoip/fo.png
diff --git a/plugins/infowidget/geoip/fr.png b/src/plugins/infowidget/geoip/fr.png
index bb56940..bb56940 100644
--- a/plugins/infowidget/geoip/fr.png
+++ b/src/plugins/infowidget/geoip/fr.png
diff --git a/plugins/infowidget/geoip/ga.png b/src/plugins/infowidget/geoip/ga.png
index eb2f99d..eb2f99d 100644
--- a/plugins/infowidget/geoip/ga.png
+++ b/src/plugins/infowidget/geoip/ga.png
diff --git a/plugins/infowidget/geoip/gb.png b/src/plugins/infowidget/geoip/gb.png
index 8a7a6f9..8a7a6f9 100644
--- a/plugins/infowidget/geoip/gb.png
+++ b/src/plugins/infowidget/geoip/gb.png
diff --git a/plugins/infowidget/geoip/gd.png b/src/plugins/infowidget/geoip/gd.png
index b7fcdbb..b7fcdbb 100644
--- a/plugins/infowidget/geoip/gd.png
+++ b/src/plugins/infowidget/geoip/gd.png
diff --git a/plugins/infowidget/geoip/ge.png b/src/plugins/infowidget/geoip/ge.png
index 613eb9b..613eb9b 100644
--- a/plugins/infowidget/geoip/ge.png
+++ b/src/plugins/infowidget/geoip/ge.png
diff --git a/plugins/infowidget/geoip/geoip.dat b/src/plugins/infowidget/geoip/geoip.dat
index 1f7ca0f..1f7ca0f 100644
--- a/plugins/infowidget/geoip/geoip.dat
+++ b/src/plugins/infowidget/geoip/geoip.dat
diff --git a/plugins/infowidget/geoip/gf.png b/src/plugins/infowidget/geoip/gf.png
index fa7abfc..fa7abfc 100644
--- a/plugins/infowidget/geoip/gf.png
+++ b/src/plugins/infowidget/geoip/gf.png
diff --git a/plugins/infowidget/geoip/gh.png b/src/plugins/infowidget/geoip/gh.png
index 8398f15..8398f15 100644
--- a/plugins/infowidget/geoip/gh.png
+++ b/src/plugins/infowidget/geoip/gh.png
diff --git a/plugins/infowidget/geoip/gi.png b/src/plugins/infowidget/geoip/gi.png
index 56174e5..56174e5 100644
--- a/plugins/infowidget/geoip/gi.png
+++ b/src/plugins/infowidget/geoip/gi.png
diff --git a/plugins/infowidget/geoip/gl.png b/src/plugins/infowidget/geoip/gl.png
index 8fdea6d..8fdea6d 100644
--- a/plugins/infowidget/geoip/gl.png
+++ b/src/plugins/infowidget/geoip/gl.png
diff --git a/plugins/infowidget/geoip/gm.png b/src/plugins/infowidget/geoip/gm.png
index 1ebfb0a..1ebfb0a 100644
--- a/plugins/infowidget/geoip/gm.png
+++ b/src/plugins/infowidget/geoip/gm.png
diff --git a/plugins/infowidget/geoip/gn.png b/src/plugins/infowidget/geoip/gn.png
index b3aeb4d..b3aeb4d 100644
--- a/plugins/infowidget/geoip/gn.png
+++ b/src/plugins/infowidget/geoip/gn.png
diff --git a/plugins/infowidget/geoip/gp.png b/src/plugins/infowidget/geoip/gp.png
index e6a822a..e6a822a 100644
--- a/plugins/infowidget/geoip/gp.png
+++ b/src/plugins/infowidget/geoip/gp.png
diff --git a/plugins/infowidget/geoip/gq.png b/src/plugins/infowidget/geoip/gq.png
index 55e5de6..55e5de6 100644
--- a/plugins/infowidget/geoip/gq.png
+++ b/src/plugins/infowidget/geoip/gq.png
diff --git a/plugins/infowidget/geoip/gr.png b/src/plugins/infowidget/geoip/gr.png
index 93bf5be..93bf5be 100644
--- a/plugins/infowidget/geoip/gr.png
+++ b/src/plugins/infowidget/geoip/gr.png
diff --git a/plugins/infowidget/geoip/gs.png b/src/plugins/infowidget/geoip/gs.png
index 34d6f11..34d6f11 100644
--- a/plugins/infowidget/geoip/gs.png
+++ b/src/plugins/infowidget/geoip/gs.png
diff --git a/plugins/infowidget/geoip/gt.png b/src/plugins/infowidget/geoip/gt.png
index 8cf6f11..8cf6f11 100644
--- a/plugins/infowidget/geoip/gt.png
+++ b/src/plugins/infowidget/geoip/gt.png
diff --git a/plugins/infowidget/geoip/gu.png b/src/plugins/infowidget/geoip/gu.png
index 6c7d40c..6c7d40c 100644
--- a/plugins/infowidget/geoip/gu.png
+++ b/src/plugins/infowidget/geoip/gu.png
diff --git a/plugins/infowidget/geoip/gw.png b/src/plugins/infowidget/geoip/gw.png
index f0a8e54..f0a8e54 100644
--- a/plugins/infowidget/geoip/gw.png
+++ b/src/plugins/infowidget/geoip/gw.png
diff --git a/plugins/infowidget/geoip/gy.png b/src/plugins/infowidget/geoip/gy.png
index 617a502..617a502 100644
--- a/plugins/infowidget/geoip/gy.png
+++ b/src/plugins/infowidget/geoip/gy.png
diff --git a/plugins/infowidget/geoip/hk.png b/src/plugins/infowidget/geoip/hk.png
index a13f5af..a13f5af 100644
--- a/plugins/infowidget/geoip/hk.png
+++ b/src/plugins/infowidget/geoip/hk.png
diff --git a/plugins/infowidget/geoip/hm.png b/src/plugins/infowidget/geoip/hm.png
index 7d77e1a..7d77e1a 100644
--- a/plugins/infowidget/geoip/hm.png
+++ b/src/plugins/infowidget/geoip/hm.png
diff --git a/plugins/infowidget/geoip/hn.png b/src/plugins/infowidget/geoip/hn.png
index 8a8745c..8a8745c 100644
--- a/plugins/infowidget/geoip/hn.png
+++ b/src/plugins/infowidget/geoip/hn.png
diff --git a/plugins/infowidget/geoip/hr.png b/src/plugins/infowidget/geoip/hr.png
index 05ce72d..05ce72d 100644
--- a/plugins/infowidget/geoip/hr.png
+++ b/src/plugins/infowidget/geoip/hr.png
diff --git a/plugins/infowidget/geoip/ht.png b/src/plugins/infowidget/geoip/ht.png
index 179d91c..179d91c 100644
--- a/plugins/infowidget/geoip/ht.png
+++ b/src/plugins/infowidget/geoip/ht.png
diff --git a/plugins/infowidget/geoip/hu.png b/src/plugins/infowidget/geoip/hu.png
index 32f5c2d..32f5c2d 100644
--- a/plugins/infowidget/geoip/hu.png
+++ b/src/plugins/infowidget/geoip/hu.png
diff --git a/plugins/infowidget/geoip/id.png b/src/plugins/infowidget/geoip/id.png
index 866961f..866961f 100644
--- a/plugins/infowidget/geoip/id.png
+++ b/src/plugins/infowidget/geoip/id.png
diff --git a/plugins/infowidget/geoip/ie.png b/src/plugins/infowidget/geoip/ie.png
index 103bd47..103bd47 100644
--- a/plugins/infowidget/geoip/ie.png
+++ b/src/plugins/infowidget/geoip/ie.png
diff --git a/plugins/infowidget/geoip/il.png b/src/plugins/infowidget/geoip/il.png
index 1de07d2..1de07d2 100644
--- a/plugins/infowidget/geoip/il.png
+++ b/src/plugins/infowidget/geoip/il.png
diff --git a/plugins/infowidget/geoip/in.png b/src/plugins/infowidget/geoip/in.png
index 5048509..5048509 100644
--- a/plugins/infowidget/geoip/in.png
+++ b/src/plugins/infowidget/geoip/in.png
diff --git a/plugins/infowidget/geoip/io.png b/src/plugins/infowidget/geoip/io.png
index 5fb1355..5fb1355 100644
--- a/plugins/infowidget/geoip/io.png
+++ b/src/plugins/infowidget/geoip/io.png
diff --git a/plugins/infowidget/geoip/iq.png b/src/plugins/infowidget/geoip/iq.png
index ec04fe3..ec04fe3 100644
--- a/plugins/infowidget/geoip/iq.png
+++ b/src/plugins/infowidget/geoip/iq.png
diff --git a/plugins/infowidget/geoip/ir.png b/src/plugins/infowidget/geoip/ir.png
index 1fb19c8..1fb19c8 100644
--- a/plugins/infowidget/geoip/ir.png
+++ b/src/plugins/infowidget/geoip/ir.png
diff --git a/plugins/infowidget/geoip/is.png b/src/plugins/infowidget/geoip/is.png
index 12538b1..12538b1 100644
--- a/plugins/infowidget/geoip/is.png
+++ b/src/plugins/infowidget/geoip/is.png
diff --git a/plugins/infowidget/geoip/it.png b/src/plugins/infowidget/geoip/it.png
index cee752b..cee752b 100644
--- a/plugins/infowidget/geoip/it.png
+++ b/src/plugins/infowidget/geoip/it.png
diff --git a/plugins/infowidget/geoip/jm.png b/src/plugins/infowidget/geoip/jm.png
index aa25040..aa25040 100644
--- a/plugins/infowidget/geoip/jm.png
+++ b/src/plugins/infowidget/geoip/jm.png
diff --git a/plugins/infowidget/geoip/jo.png b/src/plugins/infowidget/geoip/jo.png
index 9ad5e6b..9ad5e6b 100644
--- a/plugins/infowidget/geoip/jo.png
+++ b/src/plugins/infowidget/geoip/jo.png
diff --git a/plugins/infowidget/geoip/jp.png b/src/plugins/infowidget/geoip/jp.png
index 92a718c..92a718c 100644
--- a/plugins/infowidget/geoip/jp.png
+++ b/src/plugins/infowidget/geoip/jp.png
diff --git a/plugins/infowidget/geoip/ke.png b/src/plugins/infowidget/geoip/ke.png
index 1703e58..1703e58 100644
--- a/plugins/infowidget/geoip/ke.png
+++ b/src/plugins/infowidget/geoip/ke.png
diff --git a/plugins/infowidget/geoip/kg.png b/src/plugins/infowidget/geoip/kg.png
index ce21e9e..ce21e9e 100644
--- a/plugins/infowidget/geoip/kg.png
+++ b/src/plugins/infowidget/geoip/kg.png
diff --git a/plugins/infowidget/geoip/kh.png b/src/plugins/infowidget/geoip/kh.png
index 51b550d..51b550d 100644
--- a/plugins/infowidget/geoip/kh.png
+++ b/src/plugins/infowidget/geoip/kh.png
diff --git a/plugins/infowidget/geoip/ki.png b/src/plugins/infowidget/geoip/ki.png
index c0b8d69..c0b8d69 100644
--- a/plugins/infowidget/geoip/ki.png
+++ b/src/plugins/infowidget/geoip/ki.png
diff --git a/plugins/infowidget/geoip/km.png b/src/plugins/infowidget/geoip/km.png
index 9c8ef45..9c8ef45 100644
--- a/plugins/infowidget/geoip/km.png
+++ b/src/plugins/infowidget/geoip/km.png
diff --git a/plugins/infowidget/geoip/kn.png b/src/plugins/infowidget/geoip/kn.png
index a731c3b..a731c3b 100644
--- a/plugins/infowidget/geoip/kn.png
+++ b/src/plugins/infowidget/geoip/kn.png
diff --git a/plugins/infowidget/geoip/kp.png b/src/plugins/infowidget/geoip/kp.png
index 368d52c..368d52c 100644
--- a/plugins/infowidget/geoip/kp.png
+++ b/src/plugins/infowidget/geoip/kp.png
diff --git a/plugins/infowidget/geoip/kr.png b/src/plugins/infowidget/geoip/kr.png
index bb87cae..bb87cae 100644
--- a/plugins/infowidget/geoip/kr.png
+++ b/src/plugins/infowidget/geoip/kr.png
diff --git a/plugins/infowidget/geoip/kw.png b/src/plugins/infowidget/geoip/kw.png
index 077c3a2..077c3a2 100644
--- a/plugins/infowidget/geoip/kw.png
+++ b/src/plugins/infowidget/geoip/kw.png
diff --git a/plugins/infowidget/geoip/ky.png b/src/plugins/infowidget/geoip/ky.png
index 8393fda..8393fda 100644
--- a/plugins/infowidget/geoip/ky.png
+++ b/src/plugins/infowidget/geoip/ky.png
diff --git a/plugins/infowidget/geoip/kz.png b/src/plugins/infowidget/geoip/kz.png
index 23d933d..23d933d 100644
--- a/plugins/infowidget/geoip/kz.png
+++ b/src/plugins/infowidget/geoip/kz.png
diff --git a/plugins/infowidget/geoip/la.png b/src/plugins/infowidget/geoip/la.png
index 94d1d5b..94d1d5b 100644
--- a/plugins/infowidget/geoip/la.png
+++ b/src/plugins/infowidget/geoip/la.png
diff --git a/plugins/infowidget/geoip/lb.png b/src/plugins/infowidget/geoip/lb.png
index 03632b5..03632b5 100644
--- a/plugins/infowidget/geoip/lb.png
+++ b/src/plugins/infowidget/geoip/lb.png
diff --git a/plugins/infowidget/geoip/lc.png b/src/plugins/infowidget/geoip/lc.png
index db71de5..db71de5 100644
--- a/plugins/infowidget/geoip/lc.png
+++ b/src/plugins/infowidget/geoip/lc.png
diff --git a/plugins/infowidget/geoip/li.png b/src/plugins/infowidget/geoip/li.png
index 434689b..434689b 100644
--- a/plugins/infowidget/geoip/li.png
+++ b/src/plugins/infowidget/geoip/li.png
diff --git a/plugins/infowidget/geoip/lk.png b/src/plugins/infowidget/geoip/lk.png
index 813298b..813298b 100644
--- a/plugins/infowidget/geoip/lk.png
+++ b/src/plugins/infowidget/geoip/lk.png
diff --git a/plugins/infowidget/geoip/lr.png b/src/plugins/infowidget/geoip/lr.png
index 9181a94..9181a94 100644
--- a/plugins/infowidget/geoip/lr.png
+++ b/src/plugins/infowidget/geoip/lr.png
diff --git a/plugins/infowidget/geoip/ls.png b/src/plugins/infowidget/geoip/ls.png
index 40bc932..40bc932 100644
--- a/plugins/infowidget/geoip/ls.png
+++ b/src/plugins/infowidget/geoip/ls.png
diff --git a/plugins/infowidget/geoip/lt.png b/src/plugins/infowidget/geoip/lt.png
index 980a277..980a277 100644
--- a/plugins/infowidget/geoip/lt.png
+++ b/src/plugins/infowidget/geoip/lt.png
diff --git a/plugins/infowidget/geoip/lu.png b/src/plugins/infowidget/geoip/lu.png
index 0ff0539..0ff0539 100644
--- a/plugins/infowidget/geoip/lu.png
+++ b/src/plugins/infowidget/geoip/lu.png
diff --git a/plugins/infowidget/geoip/lv.png b/src/plugins/infowidget/geoip/lv.png
index cb3098c..cb3098c 100644
--- a/plugins/infowidget/geoip/lv.png
+++ b/src/plugins/infowidget/geoip/lv.png
diff --git a/plugins/infowidget/geoip/ly.png b/src/plugins/infowidget/geoip/ly.png
index e18232a..e18232a 100644
--- a/plugins/infowidget/geoip/ly.png
+++ b/src/plugins/infowidget/geoip/ly.png
diff --git a/plugins/infowidget/geoip/ma.png b/src/plugins/infowidget/geoip/ma.png
index 0df5621..0df5621 100644
--- a/plugins/infowidget/geoip/ma.png
+++ b/src/plugins/infowidget/geoip/ma.png
diff --git a/plugins/infowidget/geoip/mc.png b/src/plugins/infowidget/geoip/mc.png
index 4b4a703..4b4a703 100644
--- a/plugins/infowidget/geoip/mc.png
+++ b/src/plugins/infowidget/geoip/mc.png
diff --git a/plugins/infowidget/geoip/md.png b/src/plugins/infowidget/geoip/md.png
index a329574..a329574 100644
--- a/plugins/infowidget/geoip/md.png
+++ b/src/plugins/infowidget/geoip/md.png
diff --git a/plugins/infowidget/geoip/mg.png b/src/plugins/infowidget/geoip/mg.png
index ec1be7f..ec1be7f 100644
--- a/plugins/infowidget/geoip/mg.png
+++ b/src/plugins/infowidget/geoip/mg.png
diff --git a/plugins/infowidget/geoip/mh.png b/src/plugins/infowidget/geoip/mh.png
index ff94bdf..ff94bdf 100644
--- a/plugins/infowidget/geoip/mh.png
+++ b/src/plugins/infowidget/geoip/mh.png
diff --git a/plugins/infowidget/geoip/mk.png b/src/plugins/infowidget/geoip/mk.png
index 4512925..4512925 100644
--- a/plugins/infowidget/geoip/mk.png
+++ b/src/plugins/infowidget/geoip/mk.png
diff --git a/plugins/infowidget/geoip/ml.png b/src/plugins/infowidget/geoip/ml.png
index 3025064..3025064 100644
--- a/plugins/infowidget/geoip/ml.png
+++ b/src/plugins/infowidget/geoip/ml.png
diff --git a/plugins/infowidget/geoip/mm.png b/src/plugins/infowidget/geoip/mm.png
index 43cc773..43cc773 100644
--- a/plugins/infowidget/geoip/mm.png
+++ b/src/plugins/infowidget/geoip/mm.png
diff --git a/plugins/infowidget/geoip/mn.png b/src/plugins/infowidget/geoip/mn.png
index 7abe1d2..7abe1d2 100644
--- a/plugins/infowidget/geoip/mn.png
+++ b/src/plugins/infowidget/geoip/mn.png
diff --git a/plugins/infowidget/geoip/mo.png b/src/plugins/infowidget/geoip/mo.png
index 8baad35..8baad35 100644
--- a/plugins/infowidget/geoip/mo.png
+++ b/src/plugins/infowidget/geoip/mo.png
diff --git a/plugins/infowidget/geoip/mp.png b/src/plugins/infowidget/geoip/mp.png
index c905cd0..c905cd0 100644
--- a/plugins/infowidget/geoip/mp.png
+++ b/src/plugins/infowidget/geoip/mp.png
diff --git a/plugins/infowidget/geoip/mq.png b/src/plugins/infowidget/geoip/mq.png
index f88e4fe..f88e4fe 100644
--- a/plugins/infowidget/geoip/mq.png
+++ b/src/plugins/infowidget/geoip/mq.png
diff --git a/plugins/infowidget/geoip/mr.png b/src/plugins/infowidget/geoip/mr.png
index ee04526..ee04526 100644
--- a/plugins/infowidget/geoip/mr.png
+++ b/src/plugins/infowidget/geoip/mr.png
diff --git a/plugins/infowidget/geoip/ms.png b/src/plugins/infowidget/geoip/ms.png
index b20d935..b20d935 100644
--- a/plugins/infowidget/geoip/ms.png
+++ b/src/plugins/infowidget/geoip/ms.png
diff --git a/plugins/infowidget/geoip/mt.png b/src/plugins/infowidget/geoip/mt.png
index 204dcb4..204dcb4 100644
--- a/plugins/infowidget/geoip/mt.png
+++ b/src/plugins/infowidget/geoip/mt.png
diff --git a/plugins/infowidget/geoip/mu.png b/src/plugins/infowidget/geoip/mu.png
index 9d5dc4b..9d5dc4b 100644
--- a/plugins/infowidget/geoip/mu.png
+++ b/src/plugins/infowidget/geoip/mu.png
diff --git a/plugins/infowidget/geoip/mv.png b/src/plugins/infowidget/geoip/mv.png
index f3140b6..f3140b6 100644
--- a/plugins/infowidget/geoip/mv.png
+++ b/src/plugins/infowidget/geoip/mv.png
diff --git a/plugins/infowidget/geoip/mw.png b/src/plugins/infowidget/geoip/mw.png
index 9a09e30..9a09e30 100644
--- a/plugins/infowidget/geoip/mw.png
+++ b/src/plugins/infowidget/geoip/mw.png
diff --git a/plugins/infowidget/geoip/mx.png b/src/plugins/infowidget/geoip/mx.png
index 6e018a8..6e018a8 100644
--- a/plugins/infowidget/geoip/mx.png
+++ b/src/plugins/infowidget/geoip/mx.png
diff --git a/plugins/infowidget/geoip/my.png b/src/plugins/infowidget/geoip/my.png
index 24d5312..24d5312 100644
--- a/plugins/infowidget/geoip/my.png
+++ b/src/plugins/infowidget/geoip/my.png
diff --git a/plugins/infowidget/geoip/mz.png b/src/plugins/infowidget/geoip/mz.png
index fdd596d..fdd596d 100644
--- a/plugins/infowidget/geoip/mz.png
+++ b/src/plugins/infowidget/geoip/mz.png
diff --git a/plugins/infowidget/geoip/na.png b/src/plugins/infowidget/geoip/na.png
index 8f666bd..8f666bd 100644
--- a/plugins/infowidget/geoip/na.png
+++ b/src/plugins/infowidget/geoip/na.png
diff --git a/plugins/infowidget/geoip/nc.png b/src/plugins/infowidget/geoip/nc.png
index ee6e0bc..ee6e0bc 100644
--- a/plugins/infowidget/geoip/nc.png
+++ b/src/plugins/infowidget/geoip/nc.png
diff --git a/plugins/infowidget/geoip/ne.png b/src/plugins/infowidget/geoip/ne.png
index 104d221..104d221 100644
--- a/plugins/infowidget/geoip/ne.png
+++ b/src/plugins/infowidget/geoip/ne.png
diff --git a/plugins/infowidget/geoip/nf.png b/src/plugins/infowidget/geoip/nf.png
index 81ba2c2..81ba2c2 100644
--- a/plugins/infowidget/geoip/nf.png
+++ b/src/plugins/infowidget/geoip/nf.png
diff --git a/plugins/infowidget/geoip/ng.png b/src/plugins/infowidget/geoip/ng.png
index 823a2df..823a2df 100644
--- a/plugins/infowidget/geoip/ng.png
+++ b/src/plugins/infowidget/geoip/ng.png
diff --git a/plugins/infowidget/geoip/ni.png b/src/plugins/infowidget/geoip/ni.png
index 5fe169c..5fe169c 100644
--- a/plugins/infowidget/geoip/ni.png
+++ b/src/plugins/infowidget/geoip/ni.png
diff --git a/plugins/infowidget/geoip/nl.png b/src/plugins/infowidget/geoip/nl.png
index d18023e..d18023e 100644
--- a/plugins/infowidget/geoip/nl.png
+++ b/src/plugins/infowidget/geoip/nl.png
diff --git a/plugins/infowidget/geoip/no.png b/src/plugins/infowidget/geoip/no.png
index 56ab362..56ab362 100644
--- a/plugins/infowidget/geoip/no.png
+++ b/src/plugins/infowidget/geoip/no.png
diff --git a/plugins/infowidget/geoip/np.png b/src/plugins/infowidget/geoip/np.png
index 8a77700..8a77700 100644
--- a/plugins/infowidget/geoip/np.png
+++ b/src/plugins/infowidget/geoip/np.png
diff --git a/plugins/infowidget/geoip/nr.png b/src/plugins/infowidget/geoip/nr.png
index 3d5a8fd..3d5a8fd 100644
--- a/plugins/infowidget/geoip/nr.png
+++ b/src/plugins/infowidget/geoip/nr.png
diff --git a/plugins/infowidget/geoip/nu.png b/src/plugins/infowidget/geoip/nu.png
index 11c5a8a..11c5a8a 100644
--- a/plugins/infowidget/geoip/nu.png
+++ b/src/plugins/infowidget/geoip/nu.png
diff --git a/plugins/infowidget/geoip/nz.png b/src/plugins/infowidget/geoip/nz.png
index ff91224..ff91224 100644
--- a/plugins/infowidget/geoip/nz.png
+++ b/src/plugins/infowidget/geoip/nz.png
diff --git a/plugins/infowidget/geoip/om.png b/src/plugins/infowidget/geoip/om.png
index 9293a30..9293a30 100644
--- a/plugins/infowidget/geoip/om.png
+++ b/src/plugins/infowidget/geoip/om.png
diff --git a/plugins/infowidget/geoip/pa.png b/src/plugins/infowidget/geoip/pa.png
index 0b04b5b..0b04b5b 100644
--- a/plugins/infowidget/geoip/pa.png
+++ b/src/plugins/infowidget/geoip/pa.png
diff --git a/plugins/infowidget/geoip/pe.png b/src/plugins/infowidget/geoip/pe.png
index 6125956..6125956 100644
--- a/plugins/infowidget/geoip/pe.png
+++ b/src/plugins/infowidget/geoip/pe.png
diff --git a/plugins/infowidget/geoip/pf.png b/src/plugins/infowidget/geoip/pf.png
index 52c2d1f..52c2d1f 100644
--- a/plugins/infowidget/geoip/pf.png
+++ b/src/plugins/infowidget/geoip/pf.png
diff --git a/plugins/infowidget/geoip/pg.png b/src/plugins/infowidget/geoip/pg.png
index 2157102..2157102 100644
--- a/plugins/infowidget/geoip/pg.png
+++ b/src/plugins/infowidget/geoip/pg.png
diff --git a/plugins/infowidget/geoip/ph.png b/src/plugins/infowidget/geoip/ph.png
index a4ac0b6..a4ac0b6 100644
--- a/plugins/infowidget/geoip/ph.png
+++ b/src/plugins/infowidget/geoip/ph.png
diff --git a/plugins/infowidget/geoip/pk.png b/src/plugins/infowidget/geoip/pk.png
index 9fd80db..9fd80db 100644
--- a/plugins/infowidget/geoip/pk.png
+++ b/src/plugins/infowidget/geoip/pk.png
diff --git a/plugins/infowidget/geoip/pl.png b/src/plugins/infowidget/geoip/pl.png
index 4ad9208..4ad9208 100644
--- a/plugins/infowidget/geoip/pl.png
+++ b/src/plugins/infowidget/geoip/pl.png
diff --git a/plugins/infowidget/geoip/pm.png b/src/plugins/infowidget/geoip/pm.png
index f90f9a1..f90f9a1 100644
--- a/plugins/infowidget/geoip/pm.png
+++ b/src/plugins/infowidget/geoip/pm.png
diff --git a/plugins/infowidget/geoip/pn.png b/src/plugins/infowidget/geoip/pn.png
index 2c91d41..2c91d41 100644
--- a/plugins/infowidget/geoip/pn.png
+++ b/src/plugins/infowidget/geoip/pn.png
diff --git a/plugins/infowidget/geoip/pr.png b/src/plugins/infowidget/geoip/pr.png
index c71421c..c71421c 100644
--- a/plugins/infowidget/geoip/pr.png
+++ b/src/plugins/infowidget/geoip/pr.png
diff --git a/plugins/infowidget/geoip/ps.png b/src/plugins/infowidget/geoip/ps.png
index aec6b35..aec6b35 100644
--- a/plugins/infowidget/geoip/ps.png
+++ b/src/plugins/infowidget/geoip/ps.png
diff --git a/plugins/infowidget/geoip/pt.png b/src/plugins/infowidget/geoip/pt.png
index 6d7d54e..6d7d54e 100644
--- a/plugins/infowidget/geoip/pt.png
+++ b/src/plugins/infowidget/geoip/pt.png
diff --git a/plugins/infowidget/geoip/pw.png b/src/plugins/infowidget/geoip/pw.png
index 1233430..1233430 100644
--- a/plugins/infowidget/geoip/pw.png
+++ b/src/plugins/infowidget/geoip/pw.png
diff --git a/plugins/infowidget/geoip/py.png b/src/plugins/infowidget/geoip/py.png
index 5df7dd8..5df7dd8 100644
--- a/plugins/infowidget/geoip/py.png
+++ b/src/plugins/infowidget/geoip/py.png
diff --git a/plugins/infowidget/geoip/qa.png b/src/plugins/infowidget/geoip/qa.png
index 2999fab..2999fab 100644
--- a/plugins/infowidget/geoip/qa.png
+++ b/src/plugins/infowidget/geoip/qa.png
diff --git a/plugins/infowidget/geoip/re.png b/src/plugins/infowidget/geoip/re.png
index fef5239..fef5239 100644
--- a/plugins/infowidget/geoip/re.png
+++ b/src/plugins/infowidget/geoip/re.png
diff --git a/plugins/infowidget/geoip/ro.png b/src/plugins/infowidget/geoip/ro.png
index a652c68..a652c68 100644
--- a/plugins/infowidget/geoip/ro.png
+++ b/src/plugins/infowidget/geoip/ro.png
diff --git a/plugins/infowidget/geoip/ru.png b/src/plugins/infowidget/geoip/ru.png
index 7471ba5..7471ba5 100644
--- a/plugins/infowidget/geoip/ru.png
+++ b/src/plugins/infowidget/geoip/ru.png
diff --git a/plugins/infowidget/geoip/rw.png b/src/plugins/infowidget/geoip/rw.png
index d6d3e42..d6d3e42 100644
--- a/plugins/infowidget/geoip/rw.png
+++ b/src/plugins/infowidget/geoip/rw.png
diff --git a/plugins/infowidget/geoip/sa.png b/src/plugins/infowidget/geoip/sa.png
index 0034951..0034951 100644
--- a/plugins/infowidget/geoip/sa.png
+++ b/src/plugins/infowidget/geoip/sa.png
diff --git a/plugins/infowidget/geoip/sb.png b/src/plugins/infowidget/geoip/sb.png
index c14eff5..c14eff5 100644
--- a/plugins/infowidget/geoip/sb.png
+++ b/src/plugins/infowidget/geoip/sb.png
diff --git a/plugins/infowidget/geoip/sc.png b/src/plugins/infowidget/geoip/sc.png
index 8595229..8595229 100644
--- a/plugins/infowidget/geoip/sc.png
+++ b/src/plugins/infowidget/geoip/sc.png
diff --git a/plugins/infowidget/geoip/sd.png b/src/plugins/infowidget/geoip/sd.png
index 6de6ddd..6de6ddd 100644
--- a/plugins/infowidget/geoip/sd.png
+++ b/src/plugins/infowidget/geoip/sd.png
diff --git a/plugins/infowidget/geoip/se.png b/src/plugins/infowidget/geoip/se.png
index 44bd94c..44bd94c 100644
--- a/plugins/infowidget/geoip/se.png
+++ b/src/plugins/infowidget/geoip/se.png
diff --git a/plugins/infowidget/geoip/sg.png b/src/plugins/infowidget/geoip/sg.png
index 354681d..354681d 100644
--- a/plugins/infowidget/geoip/sg.png
+++ b/src/plugins/infowidget/geoip/sg.png
diff --git a/plugins/infowidget/geoip/sh.png b/src/plugins/infowidget/geoip/sh.png
index 082543a..082543a 100644
--- a/plugins/infowidget/geoip/sh.png
+++ b/src/plugins/infowidget/geoip/sh.png
diff --git a/plugins/infowidget/geoip/si.png b/src/plugins/infowidget/geoip/si.png
index c0c773d..c0c773d 100644
--- a/plugins/infowidget/geoip/si.png
+++ b/src/plugins/infowidget/geoip/si.png
diff --git a/plugins/infowidget/geoip/sj.png b/src/plugins/infowidget/geoip/sj.png
index f42b564..f42b564 100644
--- a/plugins/infowidget/geoip/sj.png
+++ b/src/plugins/infowidget/geoip/sj.png
diff --git a/plugins/infowidget/geoip/sk.png b/src/plugins/infowidget/geoip/sk.png
index 1a475a3..1a475a3 100644
--- a/plugins/infowidget/geoip/sk.png
+++ b/src/plugins/infowidget/geoip/sk.png
diff --git a/plugins/infowidget/geoip/sl.png b/src/plugins/infowidget/geoip/sl.png
index 133272b..133272b 100644
--- a/plugins/infowidget/geoip/sl.png
+++ b/src/plugins/infowidget/geoip/sl.png
diff --git a/plugins/infowidget/geoip/sm.png b/src/plugins/infowidget/geoip/sm.png
index c92d649..c92d649 100644
--- a/plugins/infowidget/geoip/sm.png
+++ b/src/plugins/infowidget/geoip/sm.png
diff --git a/plugins/infowidget/geoip/sn.png b/src/plugins/infowidget/geoip/sn.png
index 904de47..904de47 100644
--- a/plugins/infowidget/geoip/sn.png
+++ b/src/plugins/infowidget/geoip/sn.png
diff --git a/plugins/infowidget/geoip/so.png b/src/plugins/infowidget/geoip/so.png
index e92bc22..e92bc22 100644
--- a/plugins/infowidget/geoip/so.png
+++ b/src/plugins/infowidget/geoip/so.png
diff --git a/plugins/infowidget/geoip/sr.png b/src/plugins/infowidget/geoip/sr.png
index 7950528..7950528 100644
--- a/plugins/infowidget/geoip/sr.png
+++ b/src/plugins/infowidget/geoip/sr.png
diff --git a/plugins/infowidget/geoip/st.png b/src/plugins/infowidget/geoip/st.png
index 0eac625..0eac625 100644
--- a/plugins/infowidget/geoip/st.png
+++ b/src/plugins/infowidget/geoip/st.png
diff --git a/plugins/infowidget/geoip/sv.png b/src/plugins/infowidget/geoip/sv.png
index ac7e32a..ac7e32a 100644
--- a/plugins/infowidget/geoip/sv.png
+++ b/src/plugins/infowidget/geoip/sv.png
diff --git a/plugins/infowidget/geoip/sy.png b/src/plugins/infowidget/geoip/sy.png
index 5d8f81d..5d8f81d 100644
--- a/plugins/infowidget/geoip/sy.png
+++ b/src/plugins/infowidget/geoip/sy.png
diff --git a/plugins/infowidget/geoip/sz.png b/src/plugins/infowidget/geoip/sz.png
index 64b0611..64b0611 100644
--- a/plugins/infowidget/geoip/sz.png
+++ b/src/plugins/infowidget/geoip/sz.png
diff --git a/plugins/infowidget/geoip/tc.png b/src/plugins/infowidget/geoip/tc.png
index 1580f66..1580f66 100644
--- a/plugins/infowidget/geoip/tc.png
+++ b/src/plugins/infowidget/geoip/tc.png
diff --git a/plugins/infowidget/geoip/td.png b/src/plugins/infowidget/geoip/td.png
index 3e9d4eb..3e9d4eb 100644
--- a/plugins/infowidget/geoip/td.png
+++ b/src/plugins/infowidget/geoip/td.png
diff --git a/plugins/infowidget/geoip/tf.png b/src/plugins/infowidget/geoip/tf.png
index 4d1ffbe..4d1ffbe 100644
--- a/plugins/infowidget/geoip/tf.png
+++ b/src/plugins/infowidget/geoip/tf.png
diff --git a/plugins/infowidget/geoip/tg.png b/src/plugins/infowidget/geoip/tg.png
index cd5be57..cd5be57 100644
--- a/plugins/infowidget/geoip/tg.png
+++ b/src/plugins/infowidget/geoip/tg.png
diff --git a/plugins/infowidget/geoip/th.png b/src/plugins/infowidget/geoip/th.png
index d7b7eee..d7b7eee 100644
--- a/plugins/infowidget/geoip/th.png
+++ b/src/plugins/infowidget/geoip/th.png
diff --git a/plugins/infowidget/geoip/tj.png b/src/plugins/infowidget/geoip/tj.png
index f873509..f873509 100644
--- a/plugins/infowidget/geoip/tj.png
+++ b/src/plugins/infowidget/geoip/tj.png
diff --git a/plugins/infowidget/geoip/tk.png b/src/plugins/infowidget/geoip/tk.png
index ae2e51d..ae2e51d 100644
--- a/plugins/infowidget/geoip/tk.png
+++ b/src/plugins/infowidget/geoip/tk.png
diff --git a/plugins/infowidget/geoip/tl.png b/src/plugins/infowidget/geoip/tl.png
index 45ea272..45ea272 100644
--- a/plugins/infowidget/geoip/tl.png
+++ b/src/plugins/infowidget/geoip/tl.png
diff --git a/plugins/infowidget/geoip/tm.png b/src/plugins/infowidget/geoip/tm.png
index 49bdd96..49bdd96 100644
--- a/plugins/infowidget/geoip/tm.png
+++ b/src/plugins/infowidget/geoip/tm.png
diff --git a/plugins/infowidget/geoip/tn.png b/src/plugins/infowidget/geoip/tn.png
index 702cfcb..702cfcb 100644
--- a/plugins/infowidget/geoip/tn.png
+++ b/src/plugins/infowidget/geoip/tn.png
diff --git a/plugins/infowidget/geoip/to.png b/src/plugins/infowidget/geoip/to.png
index f79a329..f79a329 100644
--- a/plugins/infowidget/geoip/to.png
+++ b/src/plugins/infowidget/geoip/to.png
diff --git a/plugins/infowidget/geoip/tp.png b/src/plugins/infowidget/geoip/tp.png
index cf52ab2..cf52ab2 100644
--- a/plugins/infowidget/geoip/tp.png
+++ b/src/plugins/infowidget/geoip/tp.png
diff --git a/plugins/infowidget/geoip/tr.png b/src/plugins/infowidget/geoip/tr.png
index 6bee31c..6bee31c 100644
--- a/plugins/infowidget/geoip/tr.png
+++ b/src/plugins/infowidget/geoip/tr.png
diff --git a/plugins/infowidget/geoip/tt.png b/src/plugins/infowidget/geoip/tt.png
index 391fc51..391fc51 100644
--- a/plugins/infowidget/geoip/tt.png
+++ b/src/plugins/infowidget/geoip/tt.png
diff --git a/plugins/infowidget/geoip/tv.png b/src/plugins/infowidget/geoip/tv.png
index 37e05fd..37e05fd 100644
--- a/plugins/infowidget/geoip/tv.png
+++ b/src/plugins/infowidget/geoip/tv.png
diff --git a/plugins/infowidget/geoip/tw.png b/src/plugins/infowidget/geoip/tw.png
index bf02e45..bf02e45 100644
--- a/plugins/infowidget/geoip/tw.png
+++ b/src/plugins/infowidget/geoip/tw.png
diff --git a/plugins/infowidget/geoip/tz.png b/src/plugins/infowidget/geoip/tz.png
index 55fee25..55fee25 100644
--- a/plugins/infowidget/geoip/tz.png
+++ b/src/plugins/infowidget/geoip/tz.png
diff --git a/plugins/infowidget/geoip/ua.png b/src/plugins/infowidget/geoip/ua.png
index d1633c8..d1633c8 100644
--- a/plugins/infowidget/geoip/ua.png
+++ b/src/plugins/infowidget/geoip/ua.png
diff --git a/plugins/infowidget/geoip/ug.png b/src/plugins/infowidget/geoip/ug.png
index fb42945..fb42945 100644
--- a/plugins/infowidget/geoip/ug.png
+++ b/src/plugins/infowidget/geoip/ug.png
diff --git a/plugins/infowidget/geoip/um.png b/src/plugins/infowidget/geoip/um.png
index 5bae9cc..5bae9cc 100644
--- a/plugins/infowidget/geoip/um.png
+++ b/src/plugins/infowidget/geoip/um.png
diff --git a/plugins/infowidget/geoip/us.png b/src/plugins/infowidget/geoip/us.png
index 0c86308..0c86308 100644
--- a/plugins/infowidget/geoip/us.png
+++ b/src/plugins/infowidget/geoip/us.png
diff --git a/plugins/infowidget/geoip/uy.png b/src/plugins/infowidget/geoip/uy.png
index 33e72c6..33e72c6 100644
--- a/plugins/infowidget/geoip/uy.png
+++ b/src/plugins/infowidget/geoip/uy.png
diff --git a/plugins/infowidget/geoip/uz.png b/src/plugins/infowidget/geoip/uz.png
index b3f52e2..b3f52e2 100644
--- a/plugins/infowidget/geoip/uz.png
+++ b/src/plugins/infowidget/geoip/uz.png
diff --git a/plugins/infowidget/geoip/va.png b/src/plugins/infowidget/geoip/va.png
index 0719d84..0719d84 100644
--- a/plugins/infowidget/geoip/va.png
+++ b/src/plugins/infowidget/geoip/va.png
diff --git a/plugins/infowidget/geoip/vc.png b/src/plugins/infowidget/geoip/vc.png
index 59d7764..59d7764 100644
--- a/plugins/infowidget/geoip/vc.png
+++ b/src/plugins/infowidget/geoip/vc.png
diff --git a/plugins/infowidget/geoip/ve.png b/src/plugins/infowidget/geoip/ve.png
index 9080d0d..9080d0d 100644
--- a/plugins/infowidget/geoip/ve.png
+++ b/src/plugins/infowidget/geoip/ve.png
diff --git a/plugins/infowidget/geoip/vg.png b/src/plugins/infowidget/geoip/vg.png
index f8592e5..f8592e5 100644
--- a/plugins/infowidget/geoip/vg.png
+++ b/src/plugins/infowidget/geoip/vg.png
diff --git a/plugins/infowidget/geoip/vi.png b/src/plugins/infowidget/geoip/vi.png
index 2252cd0..2252cd0 100644
--- a/plugins/infowidget/geoip/vi.png
+++ b/src/plugins/infowidget/geoip/vi.png
diff --git a/plugins/infowidget/geoip/vn.png b/src/plugins/infowidget/geoip/vn.png
index fdcdcfa..fdcdcfa 100644
--- a/plugins/infowidget/geoip/vn.png
+++ b/src/plugins/infowidget/geoip/vn.png
diff --git a/plugins/infowidget/geoip/vu.png b/src/plugins/infowidget/geoip/vu.png
index b60c22e..b60c22e 100644
--- a/plugins/infowidget/geoip/vu.png
+++ b/src/plugins/infowidget/geoip/vu.png
diff --git a/plugins/infowidget/geoip/wf.png b/src/plugins/infowidget/geoip/wf.png
index ef12a01..ef12a01 100644
--- a/plugins/infowidget/geoip/wf.png
+++ b/src/plugins/infowidget/geoip/wf.png
diff --git a/plugins/infowidget/geoip/ws.png b/src/plugins/infowidget/geoip/ws.png
index de73922..de73922 100644
--- a/plugins/infowidget/geoip/ws.png
+++ b/src/plugins/infowidget/geoip/ws.png
diff --git a/plugins/infowidget/geoip/ye.png b/src/plugins/infowidget/geoip/ye.png
index 7631624..7631624 100644
--- a/plugins/infowidget/geoip/ye.png
+++ b/src/plugins/infowidget/geoip/ye.png
diff --git a/plugins/infowidget/geoip/yt.png b/src/plugins/infowidget/geoip/yt.png
index 56ad306..56ad306 100644
--- a/plugins/infowidget/geoip/yt.png
+++ b/src/plugins/infowidget/geoip/yt.png
diff --git a/plugins/infowidget/geoip/yu.png b/src/plugins/infowidget/geoip/yu.png
index 5306cdb..5306cdb 100644
--- a/plugins/infowidget/geoip/yu.png
+++ b/src/plugins/infowidget/geoip/yu.png
diff --git a/plugins/infowidget/geoip/za.png b/src/plugins/infowidget/geoip/za.png
index bdef019..bdef019 100644
--- a/plugins/infowidget/geoip/za.png
+++ b/src/plugins/infowidget/geoip/za.png
diff --git a/plugins/infowidget/geoip/zm.png b/src/plugins/infowidget/geoip/zm.png
index dff2d14..dff2d14 100644
--- a/plugins/infowidget/geoip/zm.png
+++ b/src/plugins/infowidget/geoip/zm.png
diff --git a/plugins/infowidget/geoip/zw.png b/src/plugins/infowidget/geoip/zw.png
index f4cfc36..f4cfc36 100644
--- a/plugins/infowidget/geoip/zw.png
+++ b/src/plugins/infowidget/geoip/zw.png
diff --git a/plugins/infowidget/infowidgetplugin.cpp b/src/plugins/infowidget/infowidgetplugin.cpp
index 00df391..00df391 100644
--- a/plugins/infowidget/infowidgetplugin.cpp
+++ b/src/plugins/infowidget/infowidgetplugin.cpp
diff --git a/plugins/infowidget/infowidgetplugin.h b/src/plugins/infowidget/infowidgetplugin.h
index 01796ec..01796ec 100644
--- a/plugins/infowidget/infowidgetplugin.h
+++ b/src/plugins/infowidget/infowidgetplugin.h
diff --git a/plugins/infowidget/infowidgetpluginsettings.kcfgc b/src/plugins/infowidget/infowidgetpluginsettings.kcfgc
index a6d8cb9..a6d8cb9 100644
--- a/plugins/infowidget/infowidgetpluginsettings.kcfgc
+++ b/src/plugins/infowidget/infowidgetpluginsettings.kcfgc
diff --git a/plugins/infowidget/infowidgetprefpage.cpp b/src/plugins/infowidget/infowidgetprefpage.cpp
index 63e2987..63e2987 100644
--- a/plugins/infowidget/infowidgetprefpage.cpp
+++ b/src/plugins/infowidget/infowidgetprefpage.cpp
diff --git a/plugins/infowidget/infowidgetprefpage.h b/src/plugins/infowidget/infowidgetprefpage.h
index 1274462..1274462 100644
--- a/plugins/infowidget/infowidgetprefpage.h
+++ b/src/plugins/infowidget/infowidgetprefpage.h
diff --git a/plugins/infowidget/iwfiletreediritem.cpp b/src/plugins/infowidget/iwfiletreediritem.cpp
index 7bfe462..7bfe462 100644
--- a/plugins/infowidget/iwfiletreediritem.cpp
+++ b/src/plugins/infowidget/iwfiletreediritem.cpp
diff --git a/plugins/infowidget/iwfiletreediritem.h b/src/plugins/infowidget/iwfiletreediritem.h
index 4a1cd4c..4a1cd4c 100644
--- a/plugins/infowidget/iwfiletreediritem.h
+++ b/src/plugins/infowidget/iwfiletreediritem.h
diff --git a/plugins/infowidget/iwfiletreeitem.cpp b/src/plugins/infowidget/iwfiletreeitem.cpp
index d641fe5..d641fe5 100644
--- a/plugins/infowidget/iwfiletreeitem.cpp
+++ b/src/plugins/infowidget/iwfiletreeitem.cpp
diff --git a/plugins/infowidget/iwfiletreeitem.h b/src/plugins/infowidget/iwfiletreeitem.h
index 20972fa..20972fa 100644
--- a/plugins/infowidget/iwfiletreeitem.h
+++ b/src/plugins/infowidget/iwfiletreeitem.h
diff --git a/plugins/infowidget/iwpref.ui b/src/plugins/infowidget/iwpref.ui
index c39fdf8..c39fdf8 100644
--- a/plugins/infowidget/iwpref.ui
+++ b/src/plugins/infowidget/iwpref.ui
diff --git a/plugins/infowidget/ktinfowidgetplugin.desktop b/src/plugins/infowidget/ktinfowidgetplugin.desktop
index 8ea5368..8ea5368 100644
--- a/plugins/infowidget/ktinfowidgetplugin.desktop
+++ b/src/plugins/infowidget/ktinfowidgetplugin.desktop
diff --git a/plugins/infowidget/ktinfowidgetplugin.kcfg b/src/plugins/infowidget/ktinfowidgetplugin.kcfg
index 51048fa..51048fa 100644
--- a/plugins/infowidget/ktinfowidgetplugin.kcfg
+++ b/src/plugins/infowidget/ktinfowidgetplugin.kcfg
diff --git a/plugins/infowidget/ktorrentmonitor.cpp b/src/plugins/infowidget/ktorrentmonitor.cpp
index 7494a5c..7494a5c 100644
--- a/plugins/infowidget/ktorrentmonitor.cpp
+++ b/src/plugins/infowidget/ktorrentmonitor.cpp
diff --git a/plugins/infowidget/ktorrentmonitor.h b/src/plugins/infowidget/ktorrentmonitor.h
index 6a312a2..6a312a2 100644
--- a/plugins/infowidget/ktorrentmonitor.h
+++ b/src/plugins/infowidget/ktorrentmonitor.h
diff --git a/plugins/infowidget/localefloatvalidator.cpp b/src/plugins/infowidget/localefloatvalidator.cpp
index 48aa75c..48aa75c 100644
--- a/plugins/infowidget/localefloatvalidator.cpp
+++ b/src/plugins/infowidget/localefloatvalidator.cpp
diff --git a/plugins/infowidget/localefloatvalidator.h b/src/plugins/infowidget/localefloatvalidator.h
index 83be87d..83be87d 100644
--- a/plugins/infowidget/localefloatvalidator.h
+++ b/src/plugins/infowidget/localefloatvalidator.h
diff --git a/plugins/infowidget/peerview.cpp b/src/plugins/infowidget/peerview.cpp
index 6f4a19c..6f4a19c 100644
--- a/plugins/infowidget/peerview.cpp
+++ b/src/plugins/infowidget/peerview.cpp
diff --git a/plugins/infowidget/peerview.h b/src/plugins/infowidget/peerview.h
index b75371d..b75371d 100644
--- a/plugins/infowidget/peerview.h
+++ b/src/plugins/infowidget/peerview.h
diff --git a/plugins/infowidget/statustab.cpp b/src/plugins/infowidget/statustab.cpp
index b87487f..b87487f 100644
--- a/plugins/infowidget/statustab.cpp
+++ b/src/plugins/infowidget/statustab.cpp
diff --git a/plugins/infowidget/statustab.h b/src/plugins/infowidget/statustab.h
index d044011..d044011 100644
--- a/plugins/infowidget/statustab.h
+++ b/src/plugins/infowidget/statustab.h
diff --git a/plugins/infowidget/statustabbase.ui b/src/plugins/infowidget/statustabbase.ui
index 8f7bb83..8f7bb83 100644
--- a/plugins/infowidget/statustabbase.ui
+++ b/src/plugins/infowidget/statustabbase.ui
diff --git a/plugins/infowidget/trackerview.cpp b/src/plugins/infowidget/trackerview.cpp
index 4dd4f96..4dd4f96 100644
--- a/plugins/infowidget/trackerview.cpp
+++ b/src/plugins/infowidget/trackerview.cpp
diff --git a/plugins/infowidget/trackerview.h b/src/plugins/infowidget/trackerview.h
index 44d8872..44d8872 100644
--- a/plugins/infowidget/trackerview.h
+++ b/src/plugins/infowidget/trackerview.h
diff --git a/plugins/infowidget/trackerviewbase.ui b/src/plugins/infowidget/trackerviewbase.ui
index 3ec9d91..3ec9d91 100644
--- a/plugins/infowidget/trackerviewbase.ui
+++ b/src/plugins/infowidget/trackerviewbase.ui
diff --git a/plugins/ipfilter/Makefile.am b/src/plugins/ipfilter/Makefile.am
index c2395b0..c2395b0 100644
--- a/plugins/ipfilter/Makefile.am
+++ b/src/plugins/ipfilter/Makefile.am
diff --git a/plugins/ipfilter/antip2p.cpp b/src/plugins/ipfilter/antip2p.cpp
index 2f9fb55..2f9fb55 100644
--- a/plugins/ipfilter/antip2p.cpp
+++ b/src/plugins/ipfilter/antip2p.cpp
diff --git a/plugins/ipfilter/antip2p.h b/src/plugins/ipfilter/antip2p.h
index ce54c53..ce54c53 100644
--- a/plugins/ipfilter/antip2p.h
+++ b/src/plugins/ipfilter/antip2p.h
diff --git a/plugins/ipfilter/convert_dlg.ui b/src/plugins/ipfilter/convert_dlg.ui
index de0aa40..de0aa40 100644
--- a/plugins/ipfilter/convert_dlg.ui
+++ b/src/plugins/ipfilter/convert_dlg.ui
diff --git a/plugins/ipfilter/convertdialog.cpp b/src/plugins/ipfilter/convertdialog.cpp
index e2686fd..e2686fd 100644
--- a/plugins/ipfilter/convertdialog.cpp
+++ b/src/plugins/ipfilter/convertdialog.cpp
diff --git a/plugins/ipfilter/convertdialog.h b/src/plugins/ipfilter/convertdialog.h
index cf292a3..cf292a3 100644
--- a/plugins/ipfilter/convertdialog.h
+++ b/src/plugins/ipfilter/convertdialog.h
diff --git a/plugins/ipfilter/ipblockingpref.ui b/src/plugins/ipfilter/ipblockingpref.ui
index 3435167..3435167 100644
--- a/plugins/ipfilter/ipblockingpref.ui
+++ b/src/plugins/ipfilter/ipblockingpref.ui
diff --git a/plugins/ipfilter/ipblockingprefpage.cpp b/src/plugins/ipfilter/ipblockingprefpage.cpp
index a797f93..a797f93 100644
--- a/plugins/ipfilter/ipblockingprefpage.cpp
+++ b/src/plugins/ipfilter/ipblockingprefpage.cpp
diff --git a/plugins/ipfilter/ipblockingprefpage.h b/src/plugins/ipfilter/ipblockingprefpage.h
index 1e6d19e..1e6d19e 100644
--- a/plugins/ipfilter/ipblockingprefpage.h
+++ b/src/plugins/ipfilter/ipblockingprefpage.h
diff --git a/plugins/ipfilter/ipfilterplugin.cpp b/src/plugins/ipfilter/ipfilterplugin.cpp
index 96f71bf..96f71bf 100644
--- a/plugins/ipfilter/ipfilterplugin.cpp
+++ b/src/plugins/ipfilter/ipfilterplugin.cpp
diff --git a/plugins/ipfilter/ipfilterplugin.h b/src/plugins/ipfilter/ipfilterplugin.h
index 2ef114a..2ef114a 100644
--- a/plugins/ipfilter/ipfilterplugin.h
+++ b/src/plugins/ipfilter/ipfilterplugin.h
diff --git a/plugins/ipfilter/ipfilterpluginsettings.kcfgc b/src/plugins/ipfilter/ipfilterpluginsettings.kcfgc
index 29f74c4..29f74c4 100644
--- a/plugins/ipfilter/ipfilterpluginsettings.kcfgc
+++ b/src/plugins/ipfilter/ipfilterpluginsettings.kcfgc
diff --git a/plugins/ipfilter/ktipfilterplugin.desktop b/src/plugins/ipfilter/ktipfilterplugin.desktop
index 4435c28..4435c28 100644
--- a/plugins/ipfilter/ktipfilterplugin.desktop
+++ b/src/plugins/ipfilter/ktipfilterplugin.desktop
diff --git a/plugins/ipfilter/ktipfilterplugin.kcfg b/src/plugins/ipfilter/ktipfilterplugin.kcfg
index 18ab419..18ab419 100644
--- a/plugins/ipfilter/ktipfilterplugin.kcfg
+++ b/src/plugins/ipfilter/ktipfilterplugin.kcfg
diff --git a/plugins/logviewer/Makefile.am b/src/plugins/logviewer/Makefile.am
index e11e126..e11e126 100644
--- a/plugins/logviewer/Makefile.am
+++ b/src/plugins/logviewer/Makefile.am
diff --git a/plugins/logviewer/ktlogviewerplugin.desktop b/src/plugins/logviewer/ktlogviewerplugin.desktop
index 4d7c9ad..4d7c9ad 100644
--- a/plugins/logviewer/ktlogviewerplugin.desktop
+++ b/src/plugins/logviewer/ktlogviewerplugin.desktop
diff --git a/plugins/logviewer/ktlogviewerplugin.kcfg b/src/plugins/logviewer/ktlogviewerplugin.kcfg
index c6e4a25..c6e4a25 100644
--- a/plugins/logviewer/ktlogviewerplugin.kcfg
+++ b/src/plugins/logviewer/ktlogviewerplugin.kcfg
diff --git a/plugins/logviewer/logflags.cpp b/src/plugins/logviewer/logflags.cpp
index c6ab95b..c6ab95b 100644
--- a/plugins/logviewer/logflags.cpp
+++ b/src/plugins/logviewer/logflags.cpp
diff --git a/plugins/logviewer/logflags.h b/src/plugins/logviewer/logflags.h
index 618a020..618a020 100644
--- a/plugins/logviewer/logflags.h
+++ b/src/plugins/logviewer/logflags.h
diff --git a/plugins/logviewer/logprefpage.cpp b/src/plugins/logviewer/logprefpage.cpp
index 34a2c3f..34a2c3f 100644
--- a/plugins/logviewer/logprefpage.cpp
+++ b/src/plugins/logviewer/logprefpage.cpp
diff --git a/plugins/logviewer/logprefpage.h b/src/plugins/logviewer/logprefpage.h
index 1176d92..1176d92 100644
--- a/plugins/logviewer/logprefpage.h
+++ b/src/plugins/logviewer/logprefpage.h
diff --git a/plugins/logviewer/logprefwidget.cpp b/src/plugins/logviewer/logprefwidget.cpp
index 66a6cdb..66a6cdb 100644
--- a/plugins/logviewer/logprefwidget.cpp
+++ b/src/plugins/logviewer/logprefwidget.cpp
diff --git a/plugins/logviewer/logprefwidget.h b/src/plugins/logviewer/logprefwidget.h
index 4b23949..4b23949 100644
--- a/plugins/logviewer/logprefwidget.h
+++ b/src/plugins/logviewer/logprefwidget.h
diff --git a/plugins/logviewer/logprefwidgetbase.ui b/src/plugins/logviewer/logprefwidgetbase.ui
index 1fcf3bb..1fcf3bb 100644
--- a/plugins/logviewer/logprefwidgetbase.ui
+++ b/src/plugins/logviewer/logprefwidgetbase.ui
diff --git a/plugins/logviewer/logviewer.cpp b/src/plugins/logviewer/logviewer.cpp
index 8b1be8a..8b1be8a 100644
--- a/plugins/logviewer/logviewer.cpp
+++ b/src/plugins/logviewer/logviewer.cpp
diff --git a/plugins/logviewer/logviewer.h b/src/plugins/logviewer/logviewer.h
index e8a1476..e8a1476 100644
--- a/plugins/logviewer/logviewer.h
+++ b/src/plugins/logviewer/logviewer.h
diff --git a/plugins/logviewer/logviewerplugin.cpp b/src/plugins/logviewer/logviewerplugin.cpp
index 55ccb9f..55ccb9f 100644
--- a/plugins/logviewer/logviewerplugin.cpp
+++ b/src/plugins/logviewer/logviewerplugin.cpp
diff --git a/plugins/logviewer/logviewerplugin.h b/src/plugins/logviewer/logviewerplugin.h
index 7742880..7742880 100644
--- a/plugins/logviewer/logviewerplugin.h
+++ b/src/plugins/logviewer/logviewerplugin.h
diff --git a/plugins/logviewer/logviewerpluginsettings.kcfgc b/src/plugins/logviewer/logviewerpluginsettings.kcfgc
index dfd7768..dfd7768 100644
--- a/plugins/logviewer/logviewerpluginsettings.kcfgc
+++ b/src/plugins/logviewer/logviewerpluginsettings.kcfgc
diff --git a/plugins/partfileimport/Makefile.am b/src/plugins/partfileimport/Makefile.am
index 263f8a0..263f8a0 100644
--- a/plugins/partfileimport/Makefile.am
+++ b/src/plugins/partfileimport/Makefile.am
diff --git a/plugins/partfileimport/importdialog.cpp b/src/plugins/partfileimport/importdialog.cpp
index f570012..f570012 100644
--- a/plugins/partfileimport/importdialog.cpp
+++ b/src/plugins/partfileimport/importdialog.cpp
diff --git a/plugins/partfileimport/importdialog.h b/src/plugins/partfileimport/importdialog.h
index c422da8..c422da8 100644
--- a/plugins/partfileimport/importdialog.h
+++ b/src/plugins/partfileimport/importdialog.h
diff --git a/plugins/partfileimport/importdlgbase.ui b/src/plugins/partfileimport/importdlgbase.ui
index c48abef..c48abef 100644
--- a/plugins/partfileimport/importdlgbase.ui
+++ b/src/plugins/partfileimport/importdlgbase.ui
diff --git a/plugins/partfileimport/ktpartfileimportplugin.desktop b/src/plugins/partfileimport/ktpartfileimportplugin.desktop
index e84cbaf..e84cbaf 100644
--- a/plugins/partfileimport/ktpartfileimportplugin.desktop
+++ b/src/plugins/partfileimport/ktpartfileimportplugin.desktop
diff --git a/plugins/partfileimport/ktpartfileimportpluginui.rc b/src/plugins/partfileimport/ktpartfileimportpluginui.rc
index f8867e3..f8867e3 100644
--- a/plugins/partfileimport/ktpartfileimportpluginui.rc
+++ b/src/plugins/partfileimport/ktpartfileimportpluginui.rc
diff --git a/plugins/partfileimport/partfileimportplugin.cpp b/src/plugins/partfileimport/partfileimportplugin.cpp
index ab05633..ab05633 100644
--- a/plugins/partfileimport/partfileimportplugin.cpp
+++ b/src/plugins/partfileimport/partfileimportplugin.cpp
diff --git a/plugins/partfileimport/partfileimportplugin.h b/src/plugins/partfileimport/partfileimportplugin.h
index 7525bec..7525bec 100644
--- a/plugins/partfileimport/partfileimportplugin.h
+++ b/src/plugins/partfileimport/partfileimportplugin.h
diff --git a/plugins/rssfeed/Makefile.am b/src/plugins/rssfeed/Makefile.am
index e5fa2ed..e5fa2ed 100644
--- a/plugins/rssfeed/Makefile.am
+++ b/src/plugins/rssfeed/Makefile.am
diff --git a/plugins/rssfeed/ktrssfeedplugin.desktop b/src/plugins/rssfeed/ktrssfeedplugin.desktop
index 99f6fb3..99f6fb3 100644
--- a/plugins/rssfeed/ktrssfeedplugin.desktop
+++ b/src/plugins/rssfeed/ktrssfeedplugin.desktop
diff --git a/plugins/rssfeed/ktrssfeedplugin.kcfg b/src/plugins/rssfeed/ktrssfeedplugin.kcfg
index 86499cb..86499cb 100644
--- a/plugins/rssfeed/ktrssfeedplugin.kcfg
+++ b/src/plugins/rssfeed/ktrssfeedplugin.kcfg
diff --git a/plugins/rssfeed/rss/COPYING b/src/plugins/rssfeed/rss/COPYING
index cca2a5c..cca2a5c 100644
--- a/plugins/rssfeed/rss/COPYING
+++ b/src/plugins/rssfeed/rss/COPYING
diff --git a/plugins/rssfeed/rss/Makefile.am b/src/plugins/rssfeed/rss/Makefile.am
index 8053f92..8053f92 100644
--- a/plugins/rssfeed/rss/Makefile.am
+++ b/src/plugins/rssfeed/rss/Makefile.am
diff --git a/plugins/rssfeed/rss/README b/src/plugins/rssfeed/rss/README
index 77d9450..77d9450 100644
--- a/plugins/rssfeed/rss/README
+++ b/src/plugins/rssfeed/rss/README
diff --git a/plugins/rssfeed/rss/article.cpp b/src/plugins/rssfeed/rss/article.cpp
index 14c9f21..14c9f21 100644
--- a/plugins/rssfeed/rss/article.cpp
+++ b/src/plugins/rssfeed/rss/article.cpp
diff --git a/plugins/rssfeed/rss/article.h b/src/plugins/rssfeed/rss/article.h
index 563492d..563492d 100644
--- a/plugins/rssfeed/rss/article.h
+++ b/src/plugins/rssfeed/rss/article.h
diff --git a/plugins/rssfeed/rss/document.cpp b/src/plugins/rssfeed/rss/document.cpp
index 7dfcd0a..7dfcd0a 100644
--- a/plugins/rssfeed/rss/document.cpp
+++ b/src/plugins/rssfeed/rss/document.cpp
diff --git a/plugins/rssfeed/rss/document.h b/src/plugins/rssfeed/rss/document.h
index 840bb1e..840bb1e 100644
--- a/plugins/rssfeed/rss/document.h
+++ b/src/plugins/rssfeed/rss/document.h
diff --git a/plugins/rssfeed/rss/global.h b/src/plugins/rssfeed/rss/global.h
index d3a7514..d3a7514 100644
--- a/plugins/rssfeed/rss/global.h
+++ b/src/plugins/rssfeed/rss/global.h
diff --git a/plugins/rssfeed/rss/image.cpp b/src/plugins/rssfeed/rss/image.cpp
index 65aaf53..65aaf53 100644
--- a/plugins/rssfeed/rss/image.cpp
+++ b/src/plugins/rssfeed/rss/image.cpp
diff --git a/plugins/rssfeed/rss/image.h b/src/plugins/rssfeed/rss/image.h
index 19a8103..19a8103 100644
--- a/plugins/rssfeed/rss/image.h
+++ b/src/plugins/rssfeed/rss/image.h
diff --git a/plugins/rssfeed/rss/librss.doxyfile b/src/plugins/rssfeed/rss/librss.doxyfile
index c81ac16..c81ac16 100644
--- a/plugins/rssfeed/rss/librss.doxyfile
+++ b/src/plugins/rssfeed/rss/librss.doxyfile
diff --git a/plugins/rssfeed/rss/librss.h b/src/plugins/rssfeed/rss/librss.h
index 3eb4f36..3eb4f36 100644
--- a/plugins/rssfeed/rss/librss.h
+++ b/src/plugins/rssfeed/rss/librss.h
diff --git a/plugins/rssfeed/rss/loader.cpp b/src/plugins/rssfeed/rss/loader.cpp
index 06f95d6..06f95d6 100644
--- a/plugins/rssfeed/rss/loader.cpp
+++ b/src/plugins/rssfeed/rss/loader.cpp
diff --git a/plugins/rssfeed/rss/loader.h b/src/plugins/rssfeed/rss/loader.h
index 7d2dbc0..7d2dbc0 100644
--- a/plugins/rssfeed/rss/loader.h
+++ b/src/plugins/rssfeed/rss/loader.h
diff --git a/plugins/rssfeed/rss/rss-faq.html b/src/plugins/rssfeed/rss/rss-faq.html
index 480b19f..480b19f 100644
--- a/plugins/rssfeed/rss/rss-faq.html
+++ b/src/plugins/rssfeed/rss/rss-faq.html
diff --git a/plugins/rssfeed/rss/testlibrss.cpp b/src/plugins/rssfeed/rss/testlibrss.cpp
index a6e970e..a6e970e 100644
--- a/plugins/rssfeed/rss/testlibrss.cpp
+++ b/src/plugins/rssfeed/rss/testlibrss.cpp
diff --git a/plugins/rssfeed/rss/testlibrss.h b/src/plugins/rssfeed/rss/testlibrss.h
index 2a918a5..2a918a5 100644
--- a/plugins/rssfeed/rss/testlibrss.h
+++ b/src/plugins/rssfeed/rss/testlibrss.h
diff --git a/plugins/rssfeed/rss/textinput.cpp b/src/plugins/rssfeed/rss/textinput.cpp
index a32c9f5..a32c9f5 100644
--- a/plugins/rssfeed/rss/textinput.cpp
+++ b/src/plugins/rssfeed/rss/textinput.cpp
diff --git a/plugins/rssfeed/rss/textinput.h b/src/plugins/rssfeed/rss/textinput.h
index dd46d17..dd46d17 100644
--- a/plugins/rssfeed/rss/textinput.h
+++ b/src/plugins/rssfeed/rss/textinput.h
diff --git a/plugins/rssfeed/rss/tools_p.cpp b/src/plugins/rssfeed/rss/tools_p.cpp
index e608f04..e608f04 100644
--- a/plugins/rssfeed/rss/tools_p.cpp
+++ b/src/plugins/rssfeed/rss/tools_p.cpp
diff --git a/plugins/rssfeed/rss/tools_p.h b/src/plugins/rssfeed/rss/tools_p.h
index c242766..c242766 100644
--- a/plugins/rssfeed/rss/tools_p.h
+++ b/src/plugins/rssfeed/rss/tools_p.h
diff --git a/plugins/rssfeed/rssarticle.cpp b/src/plugins/rssfeed/rssarticle.cpp
index a73b3c9..a73b3c9 100644
--- a/plugins/rssfeed/rssarticle.cpp
+++ b/src/plugins/rssfeed/rssarticle.cpp
diff --git a/plugins/rssfeed/rssarticle.h b/src/plugins/rssfeed/rssarticle.h
index e727456..e727456 100644
--- a/plugins/rssfeed/rssarticle.h
+++ b/src/plugins/rssfeed/rssarticle.h
diff --git a/plugins/rssfeed/rssfeed.cpp b/src/plugins/rssfeed/rssfeed.cpp
index b479849..b479849 100644
--- a/plugins/rssfeed/rssfeed.cpp
+++ b/src/plugins/rssfeed/rssfeed.cpp
diff --git a/plugins/rssfeed/rssfeed.h b/src/plugins/rssfeed/rssfeed.h
index 214177b..214177b 100644
--- a/plugins/rssfeed/rssfeed.h
+++ b/src/plugins/rssfeed/rssfeed.h
diff --git a/plugins/rssfeed/rssfeedmanager.cpp b/src/plugins/rssfeed/rssfeedmanager.cpp
index a8ffc31..a8ffc31 100644
--- a/plugins/rssfeed/rssfeedmanager.cpp
+++ b/src/plugins/rssfeed/rssfeedmanager.cpp
diff --git a/plugins/rssfeed/rssfeedmanager.h b/src/plugins/rssfeed/rssfeedmanager.h
index fd6cb57..fd6cb57 100644
--- a/plugins/rssfeed/rssfeedmanager.h
+++ b/src/plugins/rssfeed/rssfeedmanager.h
diff --git a/plugins/rssfeed/rssfeedplugin.cpp b/src/plugins/rssfeed/rssfeedplugin.cpp
index 4a60921..4a60921 100644
--- a/plugins/rssfeed/rssfeedplugin.cpp
+++ b/src/plugins/rssfeed/rssfeedplugin.cpp
diff --git a/plugins/rssfeed/rssfeedplugin.h b/src/plugins/rssfeed/rssfeedplugin.h
index c268097..c268097 100644
--- a/plugins/rssfeed/rssfeedplugin.h
+++ b/src/plugins/rssfeed/rssfeedplugin.h
diff --git a/plugins/rssfeed/rssfeedwidget.ui b/src/plugins/rssfeed/rssfeedwidget.ui
index 1b34e9c..1b34e9c 100644
--- a/plugins/rssfeed/rssfeedwidget.ui
+++ b/src/plugins/rssfeed/rssfeedwidget.ui
diff --git a/plugins/rssfeed/rssfilter.cpp b/src/plugins/rssfeed/rssfilter.cpp
index 32d13d0..32d13d0 100644
--- a/plugins/rssfeed/rssfilter.cpp
+++ b/src/plugins/rssfeed/rssfilter.cpp
diff --git a/plugins/rssfeed/rssfilter.h b/src/plugins/rssfeed/rssfilter.h
index eba0a21..eba0a21 100644
--- a/plugins/rssfeed/rssfilter.h
+++ b/src/plugins/rssfeed/rssfilter.h
diff --git a/plugins/rssfeed/rsslinkdownloader.cpp b/src/plugins/rssfeed/rsslinkdownloader.cpp
index 92bb90d..92bb90d 100644
--- a/plugins/rssfeed/rsslinkdownloader.cpp
+++ b/src/plugins/rssfeed/rsslinkdownloader.cpp
diff --git a/plugins/rssfeed/rsslinkdownloader.h b/src/plugins/rssfeed/rsslinkdownloader.h
index 486eed8..486eed8 100644
--- a/plugins/rssfeed/rsslinkdownloader.h
+++ b/src/plugins/rssfeed/rsslinkdownloader.h
diff --git a/plugins/scanfolder/Makefile.am b/src/plugins/scanfolder/Makefile.am
index 49ba5a7..49ba5a7 100644
--- a/plugins/scanfolder/Makefile.am
+++ b/src/plugins/scanfolder/Makefile.am
diff --git a/plugins/scanfolder/ktscanfolderplugin.desktop b/src/plugins/scanfolder/ktscanfolderplugin.desktop
index 53c7a6c..53c7a6c 100644
--- a/plugins/scanfolder/ktscanfolderplugin.desktop
+++ b/src/plugins/scanfolder/ktscanfolderplugin.desktop
diff --git a/plugins/scanfolder/ktscanfolderplugin.kcfg b/src/plugins/scanfolder/ktscanfolderplugin.kcfg
index f9b919f..f9b919f 100644
--- a/plugins/scanfolder/ktscanfolderplugin.kcfg
+++ b/src/plugins/scanfolder/ktscanfolderplugin.kcfg
diff --git a/plugins/scanfolder/scanfolder.cpp b/src/plugins/scanfolder/scanfolder.cpp
index 135aea2..135aea2 100644
--- a/plugins/scanfolder/scanfolder.cpp
+++ b/src/plugins/scanfolder/scanfolder.cpp
diff --git a/plugins/scanfolder/scanfolder.h b/src/plugins/scanfolder/scanfolder.h
index 58fbd04..58fbd04 100644
--- a/plugins/scanfolder/scanfolder.h
+++ b/src/plugins/scanfolder/scanfolder.h
diff --git a/plugins/scanfolder/scanfolderplugin.cpp b/src/plugins/scanfolder/scanfolderplugin.cpp
index 710d1d0..710d1d0 100644
--- a/plugins/scanfolder/scanfolderplugin.cpp
+++ b/src/plugins/scanfolder/scanfolderplugin.cpp
diff --git a/plugins/scanfolder/scanfolderplugin.h b/src/plugins/scanfolder/scanfolderplugin.h
index 3ea18ce..3ea18ce 100644
--- a/plugins/scanfolder/scanfolderplugin.h
+++ b/src/plugins/scanfolder/scanfolderplugin.h
diff --git a/plugins/scanfolder/scanfolderpluginsettings.kcfgc b/src/plugins/scanfolder/scanfolderpluginsettings.kcfgc
index 7550c9d..7550c9d 100644
--- a/plugins/scanfolder/scanfolderpluginsettings.kcfgc
+++ b/src/plugins/scanfolder/scanfolderpluginsettings.kcfgc
diff --git a/plugins/scanfolder/scanfolderprefpage.cpp b/src/plugins/scanfolder/scanfolderprefpage.cpp
index 8846aa9..8846aa9 100644
--- a/plugins/scanfolder/scanfolderprefpage.cpp
+++ b/src/plugins/scanfolder/scanfolderprefpage.cpp
diff --git a/plugins/scanfolder/scanfolderprefpage.h b/src/plugins/scanfolder/scanfolderprefpage.h
index cb2f80c..cb2f80c 100644
--- a/plugins/scanfolder/scanfolderprefpage.h
+++ b/src/plugins/scanfolder/scanfolderprefpage.h
diff --git a/plugins/scanfolder/scanfolderprefpagewidget.cpp b/src/plugins/scanfolder/scanfolderprefpagewidget.cpp
index 14b89ff..14b89ff 100644
--- a/plugins/scanfolder/scanfolderprefpagewidget.cpp
+++ b/src/plugins/scanfolder/scanfolderprefpagewidget.cpp
diff --git a/plugins/scanfolder/scanfolderprefpagewidget.h b/src/plugins/scanfolder/scanfolderprefpagewidget.h
index 963ca40..963ca40 100644
--- a/plugins/scanfolder/scanfolderprefpagewidget.h
+++ b/src/plugins/scanfolder/scanfolderprefpagewidget.h
diff --git a/plugins/scanfolder/sfprefwidgetbase.ui b/src/plugins/scanfolder/sfprefwidgetbase.ui
index 1e696e6..1e696e6 100644
--- a/plugins/scanfolder/sfprefwidgetbase.ui
+++ b/src/plugins/scanfolder/sfprefwidgetbase.ui
diff --git a/plugins/scheduler/Makefile.am b/src/plugins/scheduler/Makefile.am
index 5b388eb..5b388eb 100644
--- a/plugins/scheduler/Makefile.am
+++ b/src/plugins/scheduler/Makefile.am
diff --git a/plugins/scheduler/bwscheduler.cpp b/src/plugins/scheduler/bwscheduler.cpp
index 5515c12..5515c12 100644
--- a/plugins/scheduler/bwscheduler.cpp
+++ b/src/plugins/scheduler/bwscheduler.cpp
diff --git a/plugins/scheduler/bwscheduler.h b/src/plugins/scheduler/bwscheduler.h
index e752b1d..e752b1d 100644
--- a/plugins/scheduler/bwscheduler.h
+++ b/src/plugins/scheduler/bwscheduler.h
diff --git a/plugins/scheduler/bwspage.ui b/src/plugins/scheduler/bwspage.ui
index b5e1db1..b5e1db1 100644
--- a/plugins/scheduler/bwspage.ui
+++ b/src/plugins/scheduler/bwspage.ui
diff --git a/plugins/scheduler/bwsprefpage.cpp b/src/plugins/scheduler/bwsprefpage.cpp
index e69de29..e69de29 100644
--- a/plugins/scheduler/bwsprefpage.cpp
+++ b/src/plugins/scheduler/bwsprefpage.cpp
diff --git a/plugins/scheduler/bwsprefpage.h b/src/plugins/scheduler/bwsprefpage.h
index e69de29..e69de29 100644
--- a/plugins/scheduler/bwsprefpage.h
+++ b/src/plugins/scheduler/bwsprefpage.h
diff --git a/plugins/scheduler/bwsprefpagewidget.cpp b/src/plugins/scheduler/bwsprefpagewidget.cpp
index 45b975a..45b975a 100644
--- a/plugins/scheduler/bwsprefpagewidget.cpp
+++ b/src/plugins/scheduler/bwsprefpagewidget.cpp
diff --git a/plugins/scheduler/bwsprefpagewidget.h b/src/plugins/scheduler/bwsprefpagewidget.h
index d87a2bc..d87a2bc 100644
--- a/plugins/scheduler/bwsprefpagewidget.h
+++ b/src/plugins/scheduler/bwsprefpagewidget.h
diff --git a/plugins/scheduler/bwswidget.cpp b/src/plugins/scheduler/bwswidget.cpp
index 8585e95..8585e95 100644
--- a/plugins/scheduler/bwswidget.cpp
+++ b/src/plugins/scheduler/bwswidget.cpp
diff --git a/plugins/scheduler/bwswidget.h b/src/plugins/scheduler/bwswidget.h
index 9cb36ae..9cb36ae 100644
--- a/plugins/scheduler/bwswidget.h
+++ b/src/plugins/scheduler/bwswidget.h
diff --git a/plugins/scheduler/cell-a-0000.png b/src/plugins/scheduler/cell-a-0000.png
index 75326d8..75326d8 100644
--- a/plugins/scheduler/cell-a-0000.png
+++ b/src/plugins/scheduler/cell-a-0000.png
diff --git a/plugins/scheduler/cell-a-0001.png b/src/plugins/scheduler/cell-a-0001.png
index 0377dea..0377dea 100644
--- a/plugins/scheduler/cell-a-0001.png
+++ b/src/plugins/scheduler/cell-a-0001.png
diff --git a/plugins/scheduler/cell-a-0002.png b/src/plugins/scheduler/cell-a-0002.png
index 707f13f..707f13f 100644
--- a/plugins/scheduler/cell-a-0002.png
+++ b/src/plugins/scheduler/cell-a-0002.png
diff --git a/plugins/scheduler/cell-a-0003.png b/src/plugins/scheduler/cell-a-0003.png
index 095a792..095a792 100644
--- a/plugins/scheduler/cell-a-0003.png
+++ b/src/plugins/scheduler/cell-a-0003.png
diff --git a/plugins/scheduler/cell-a-0004.png b/src/plugins/scheduler/cell-a-0004.png
index 5ea2e01..5ea2e01 100644
--- a/plugins/scheduler/cell-a-0004.png
+++ b/src/plugins/scheduler/cell-a-0004.png
diff --git a/plugins/scheduler/cell-b-0000.png b/src/plugins/scheduler/cell-b-0000.png
index 60607f7..60607f7 100644
--- a/plugins/scheduler/cell-b-0000.png
+++ b/src/plugins/scheduler/cell-b-0000.png
diff --git a/plugins/scheduler/cell-b-0001.png b/src/plugins/scheduler/cell-b-0001.png
index 2ba0868..2ba0868 100644
--- a/plugins/scheduler/cell-b-0001.png
+++ b/src/plugins/scheduler/cell-b-0001.png
diff --git a/plugins/scheduler/cell-b-0002.png b/src/plugins/scheduler/cell-b-0002.png
index 8dfbad0..8dfbad0 100644
--- a/plugins/scheduler/cell-b-0002.png
+++ b/src/plugins/scheduler/cell-b-0002.png
diff --git a/plugins/scheduler/cell-b-0003.png b/src/plugins/scheduler/cell-b-0003.png
index 5d516dd..5d516dd 100644
--- a/plugins/scheduler/cell-b-0003.png
+++ b/src/plugins/scheduler/cell-b-0003.png
diff --git a/plugins/scheduler/cell-b-0004.png b/src/plugins/scheduler/cell-b-0004.png
index a197546..a197546 100644
--- a/plugins/scheduler/cell-b-0004.png
+++ b/src/plugins/scheduler/cell-b-0004.png
diff --git a/plugins/scheduler/ktschedulerplugin.desktop b/src/plugins/scheduler/ktschedulerplugin.desktop
index ea35426..ea35426 100644
--- a/plugins/scheduler/ktschedulerplugin.desktop
+++ b/src/plugins/scheduler/ktschedulerplugin.desktop
diff --git a/plugins/scheduler/ktschedulerplugin.kcfg b/src/plugins/scheduler/ktschedulerplugin.kcfg
index 7f752b3..7f752b3 100644
--- a/plugins/scheduler/ktschedulerplugin.kcfg
+++ b/src/plugins/scheduler/ktschedulerplugin.kcfg
diff --git a/plugins/scheduler/ktschedulerpluginui.rc b/src/plugins/scheduler/ktschedulerpluginui.rc
index 217e103..217e103 100644
--- a/plugins/scheduler/ktschedulerpluginui.rc
+++ b/src/plugins/scheduler/ktschedulerpluginui.rc
diff --git a/plugins/scheduler/schedulerpage.ui b/src/plugins/scheduler/schedulerpage.ui
index ce0cfb6..ce0cfb6 100644
--- a/plugins/scheduler/schedulerpage.ui
+++ b/src/plugins/scheduler/schedulerpage.ui
diff --git a/plugins/scheduler/schedulerplugin.cpp b/src/plugins/scheduler/schedulerplugin.cpp
index e0a71e7..e0a71e7 100644
--- a/plugins/scheduler/schedulerplugin.cpp
+++ b/src/plugins/scheduler/schedulerplugin.cpp
diff --git a/plugins/scheduler/schedulerplugin.h b/src/plugins/scheduler/schedulerplugin.h
index 9143d99..9143d99 100644
--- a/plugins/scheduler/schedulerplugin.h
+++ b/src/plugins/scheduler/schedulerplugin.h
diff --git a/plugins/scheduler/schedulerpluginsettings.kcfgc b/src/plugins/scheduler/schedulerpluginsettings.kcfgc
index 5c66442..5c66442 100644
--- a/plugins/scheduler/schedulerpluginsettings.kcfgc
+++ b/src/plugins/scheduler/schedulerpluginsettings.kcfgc
diff --git a/plugins/scheduler/schedulerprefpage.cpp b/src/plugins/scheduler/schedulerprefpage.cpp
index 3977a14..3977a14 100644
--- a/plugins/scheduler/schedulerprefpage.cpp
+++ b/src/plugins/scheduler/schedulerprefpage.cpp
diff --git a/plugins/scheduler/schedulerprefpage.h b/src/plugins/scheduler/schedulerprefpage.h
index 56fbe3b..56fbe3b 100644
--- a/plugins/scheduler/schedulerprefpage.h
+++ b/src/plugins/scheduler/schedulerprefpage.h
diff --git a/plugins/scheduler/schedulerprefpagewidget.cpp b/src/plugins/scheduler/schedulerprefpagewidget.cpp
index 156f46f..156f46f 100644
--- a/plugins/scheduler/schedulerprefpagewidget.cpp
+++ b/src/plugins/scheduler/schedulerprefpagewidget.cpp
diff --git a/plugins/scheduler/schedulerprefpagewidget.h b/src/plugins/scheduler/schedulerprefpagewidget.h
index 5a3c5c3..5a3c5c3 100644
--- a/plugins/scheduler/schedulerprefpagewidget.h
+++ b/src/plugins/scheduler/schedulerprefpagewidget.h
diff --git a/plugins/search/Makefile.am b/src/plugins/search/Makefile.am
index 9e5b312..9e5b312 100644
--- a/plugins/search/Makefile.am
+++ b/src/plugins/search/Makefile.am
diff --git a/plugins/search/htmlpart.cpp b/src/plugins/search/htmlpart.cpp
index 1f3a50d..1f3a50d 100644
--- a/plugins/search/htmlpart.cpp
+++ b/src/plugins/search/htmlpart.cpp
diff --git a/plugins/search/htmlpart.h b/src/plugins/search/htmlpart.h
index 5ed8f19..5ed8f19 100644
--- a/plugins/search/htmlpart.h
+++ b/src/plugins/search/htmlpart.h
diff --git a/plugins/search/ktsearchplugin.desktop b/src/plugins/search/ktsearchplugin.desktop
index 9feabe0..9feabe0 100644
--- a/plugins/search/ktsearchplugin.desktop
+++ b/src/plugins/search/ktsearchplugin.desktop
diff --git a/plugins/search/ktsearchplugin.kcfg b/src/plugins/search/ktsearchplugin.kcfg
index fdcc141..fdcc141 100644
--- a/plugins/search/ktsearchplugin.kcfg
+++ b/src/plugins/search/ktsearchplugin.kcfg
diff --git a/plugins/search/searchbar.ui b/src/plugins/search/searchbar.ui
index 562a0dd..562a0dd 100644
--- a/plugins/search/searchbar.ui
+++ b/src/plugins/search/searchbar.ui
diff --git a/plugins/search/searchenginelist.cpp b/src/plugins/search/searchenginelist.cpp
index 3381bf0..3381bf0 100644
--- a/plugins/search/searchenginelist.cpp
+++ b/src/plugins/search/searchenginelist.cpp
diff --git a/plugins/search/searchenginelist.h b/src/plugins/search/searchenginelist.h
index 4b4d68e..4b4d68e 100644
--- a/plugins/search/searchenginelist.h
+++ b/src/plugins/search/searchenginelist.h
diff --git a/plugins/search/searchplugin.cpp b/src/plugins/search/searchplugin.cpp
index dc62c6c..dc62c6c 100644
--- a/plugins/search/searchplugin.cpp
+++ b/src/plugins/search/searchplugin.cpp
diff --git a/plugins/search/searchplugin.h b/src/plugins/search/searchplugin.h
index f7f41e7..f7f41e7 100644
--- a/plugins/search/searchplugin.h
+++ b/src/plugins/search/searchplugin.h
diff --git a/plugins/search/searchpluginsettings.kcfgc b/src/plugins/search/searchpluginsettings.kcfgc
index 09cfd64..09cfd64 100644
--- a/plugins/search/searchpluginsettings.kcfgc
+++ b/src/plugins/search/searchpluginsettings.kcfgc
diff --git a/plugins/search/searchpref.ui b/src/plugins/search/searchpref.ui
index 0c169bf..0c169bf 100644
--- a/plugins/search/searchpref.ui
+++ b/src/plugins/search/searchpref.ui
diff --git a/plugins/search/searchprefpage.cpp b/src/plugins/search/searchprefpage.cpp
index 89246bc..89246bc 100644
--- a/plugins/search/searchprefpage.cpp
+++ b/src/plugins/search/searchprefpage.cpp
diff --git a/plugins/search/searchprefpage.h b/src/plugins/search/searchprefpage.h
index add87a9..add87a9 100644
--- a/plugins/search/searchprefpage.h
+++ b/src/plugins/search/searchprefpage.h
diff --git a/plugins/search/searchtab.cpp b/src/plugins/search/searchtab.cpp
index dc68dc4..dc68dc4 100644
--- a/plugins/search/searchtab.cpp
+++ b/src/plugins/search/searchtab.cpp
diff --git a/plugins/search/searchtab.h b/src/plugins/search/searchtab.h
index 35fecfb..35fecfb 100644
--- a/plugins/search/searchtab.h
+++ b/src/plugins/search/searchtab.h
diff --git a/plugins/search/searchwidget.cpp b/src/plugins/search/searchwidget.cpp
index 39ec574..39ec574 100644
--- a/plugins/search/searchwidget.cpp
+++ b/src/plugins/search/searchwidget.cpp
diff --git a/plugins/search/searchwidget.h b/src/plugins/search/searchwidget.h
index e556f10..e556f10 100644
--- a/plugins/search/searchwidget.h
+++ b/src/plugins/search/searchwidget.h
diff --git a/plugins/stats/ChartDrawer.cpp b/src/plugins/stats/ChartDrawer.cpp
index ad4ff67..ad4ff67 100644
--- a/plugins/stats/ChartDrawer.cpp
+++ b/src/plugins/stats/ChartDrawer.cpp
diff --git a/plugins/stats/ChartDrawer.h b/src/plugins/stats/ChartDrawer.h
index 83a4e32..83a4e32 100644
--- a/plugins/stats/ChartDrawer.h
+++ b/src/plugins/stats/ChartDrawer.h
diff --git a/plugins/stats/ChartDrawerData.cpp b/src/plugins/stats/ChartDrawerData.cpp
index ba03261..ba03261 100644
--- a/plugins/stats/ChartDrawerData.cpp
+++ b/src/plugins/stats/ChartDrawerData.cpp
diff --git a/plugins/stats/ChartDrawerData.h b/src/plugins/stats/ChartDrawerData.h
index 19d16e5..19d16e5 100644
--- a/plugins/stats/ChartDrawerData.h
+++ b/src/plugins/stats/ChartDrawerData.h
diff --git a/plugins/stats/Makefile.am b/src/plugins/stats/Makefile.am
index 5e0f760..efe26b6 100644
--- a/plugins/stats/Makefile.am
+++ b/src/plugins/stats/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/libktorrent -I$(top_builddir)/libktorrent $(all_includes)
+INCLUDES = -I$(top_srcdir)/src/libktorrent -I$(top_builddir)/src/libktorrent $(all_includes)
 	
 METASOURCES = AUTO
 		
diff --git a/plugins/stats/PeerMonitor.cpp b/src/plugins/stats/PeerMonitor.cpp
index 083e158..083e158 100644
--- a/plugins/stats/PeerMonitor.cpp
+++ b/src/plugins/stats/PeerMonitor.cpp
diff --git a/plugins/stats/PeerMonitor.h b/src/plugins/stats/PeerMonitor.h
index 3489378..3489378 100644
--- a/plugins/stats/PeerMonitor.h
+++ b/src/plugins/stats/PeerMonitor.h
diff --git a/plugins/stats/StatsCon.cpp b/src/plugins/stats/StatsCon.cpp
index d2f8d5f..d2f8d5f 100644
--- a/plugins/stats/StatsCon.cpp
+++ b/src/plugins/stats/StatsCon.cpp
diff --git a/plugins/stats/StatsCon.h b/src/plugins/stats/StatsCon.h
index 00deae5..00deae5 100644
--- a/plugins/stats/StatsCon.h
+++ b/src/plugins/stats/StatsCon.h
diff --git a/plugins/stats/StatsPluginPrefs.cpp b/src/plugins/stats/StatsPluginPrefs.cpp
index e9becd6..e9becd6 100644
--- a/plugins/stats/StatsPluginPrefs.cpp
+++ b/src/plugins/stats/StatsPluginPrefs.cpp
diff --git a/plugins/stats/StatsPluginPrefs.h b/src/plugins/stats/StatsPluginPrefs.h
index 047b921..047b921 100644
--- a/plugins/stats/StatsPluginPrefs.h
+++ b/src/plugins/stats/StatsPluginPrefs.h
diff --git a/plugins/stats/StatsPluginPrefsPage.cpp b/src/plugins/stats/StatsPluginPrefsPage.cpp
index e641349..e641349 100644
--- a/plugins/stats/StatsPluginPrefsPage.cpp
+++ b/src/plugins/stats/StatsPluginPrefsPage.cpp
diff --git a/plugins/stats/StatsPluginPrefsPage.h b/src/plugins/stats/StatsPluginPrefsPage.h
index eca849f..eca849f 100644
--- a/plugins/stats/StatsPluginPrefsPage.h
+++ b/src/plugins/stats/StatsPluginPrefsPage.h
diff --git a/plugins/stats/StatsSpd.cpp b/src/plugins/stats/StatsSpd.cpp
index d48e2fd..d48e2fd 100644
--- a/plugins/stats/StatsSpd.cpp
+++ b/src/plugins/stats/StatsSpd.cpp
diff --git a/plugins/stats/StatsSpd.h b/src/plugins/stats/StatsSpd.h
index 5ec2578..5ec2578 100644
--- a/plugins/stats/StatsSpd.h
+++ b/src/plugins/stats/StatsSpd.h
diff --git a/plugins/stats/ktstatsplugin.desktop b/src/plugins/stats/ktstatsplugin.desktop
index 21a2901..21a2901 100644
--- a/plugins/stats/ktstatsplugin.desktop
+++ b/src/plugins/stats/ktstatsplugin.desktop
diff --git a/plugins/stats/ktstatsplugin.kcfg b/src/plugins/stats/ktstatsplugin.kcfg
index 43c5dd4..43c5dd4 100644
--- a/plugins/stats/ktstatsplugin.kcfg
+++ b/src/plugins/stats/ktstatsplugin.kcfg
diff --git a/plugins/stats/sprefwgt.ui b/src/plugins/stats/sprefwgt.ui
index b6ce139..b6ce139 100644
--- a/plugins/stats/sprefwgt.ui
+++ b/src/plugins/stats/sprefwgt.ui
diff --git a/plugins/stats/statsconwgt.ui b/src/plugins/stats/statsconwgt.ui
index 3565a3c..3565a3c 100644
--- a/plugins/stats/statsconwgt.ui
+++ b/src/plugins/stats/statsconwgt.ui
diff --git a/plugins/stats/statsplugin.cpp b/src/plugins/stats/statsplugin.cpp
index 6693ebd..6693ebd 100644
--- a/plugins/stats/statsplugin.cpp
+++ b/src/plugins/stats/statsplugin.cpp
diff --git a/plugins/stats/statsplugin.h b/src/plugins/stats/statsplugin.h
index 4abb9eb..4abb9eb 100644
--- a/plugins/stats/statsplugin.h
+++ b/src/plugins/stats/statsplugin.h
diff --git a/plugins/stats/statspluginsettings.kcfgc b/src/plugins/stats/statspluginsettings.kcfgc
index 034322e..034322e 100644
--- a/plugins/stats/statspluginsettings.kcfgc
+++ b/src/plugins/stats/statspluginsettings.kcfgc
diff --git a/plugins/stats/statsspdwgt.ui b/src/plugins/stats/statsspdwgt.ui
index b04e19a..b04e19a 100644
--- a/plugins/stats/statsspdwgt.ui
+++ b/src/plugins/stats/statsspdwgt.ui
diff --git a/plugins/upnp/Makefile.am b/src/plugins/upnp/Makefile.am
index 467ebc4..467ebc4 100644
--- a/plugins/upnp/Makefile.am
+++ b/src/plugins/upnp/Makefile.am
diff --git a/plugins/upnp/ktupnpplugin.desktop b/src/plugins/upnp/ktupnpplugin.desktop
index ea17434..ea17434 100644
--- a/plugins/upnp/ktupnpplugin.desktop
+++ b/src/plugins/upnp/ktupnpplugin.desktop
diff --git a/plugins/upnp/ktupnpplugin.kcfg b/src/plugins/upnp/ktupnpplugin.kcfg
index acce783..acce783 100644
--- a/plugins/upnp/ktupnpplugin.kcfg
+++ b/src/plugins/upnp/ktupnpplugin.kcfg
diff --git a/plugins/upnp/soap.cpp b/src/plugins/upnp/soap.cpp
index c44ab1e..c44ab1e 100644
--- a/plugins/upnp/soap.cpp
+++ b/src/plugins/upnp/soap.cpp
diff --git a/plugins/upnp/soap.h b/src/plugins/upnp/soap.h
index 6632342..6632342 100644
--- a/plugins/upnp/soap.h
+++ b/src/plugins/upnp/soap.h
diff --git a/plugins/upnp/upnpdescriptionparser.cpp b/src/plugins/upnp/upnpdescriptionparser.cpp
index eb9d360..eb9d360 100644
--- a/plugins/upnp/upnpdescriptionparser.cpp
+++ b/src/plugins/upnp/upnpdescriptionparser.cpp
diff --git a/plugins/upnp/upnpdescriptionparser.h b/src/plugins/upnp/upnpdescriptionparser.h
index 2aaacfe..2aaacfe 100644
--- a/plugins/upnp/upnpdescriptionparser.h
+++ b/src/plugins/upnp/upnpdescriptionparser.h
diff --git a/plugins/upnp/upnpmcastsocket.cpp b/src/plugins/upnp/upnpmcastsocket.cpp
index 91c9dd9..91c9dd9 100644
--- a/plugins/upnp/upnpmcastsocket.cpp
+++ b/src/plugins/upnp/upnpmcastsocket.cpp
diff --git a/plugins/upnp/upnpmcastsocket.h b/src/plugins/upnp/upnpmcastsocket.h
index fbd63df..fbd63df 100644
--- a/plugins/upnp/upnpmcastsocket.h
+++ b/src/plugins/upnp/upnpmcastsocket.h
diff --git a/plugins/upnp/upnpplugin.cpp b/src/plugins/upnp/upnpplugin.cpp
index 4b57b37..4b57b37 100644
--- a/plugins/upnp/upnpplugin.cpp
+++ b/src/plugins/upnp/upnpplugin.cpp
diff --git a/plugins/upnp/upnpplugin.h b/src/plugins/upnp/upnpplugin.h
index 5f4700f..5f4700f 100644
--- a/plugins/upnp/upnpplugin.h
+++ b/src/plugins/upnp/upnpplugin.h
diff --git a/plugins/upnp/upnppluginsettings.kcfgc b/src/plugins/upnp/upnppluginsettings.kcfgc
index 8917f80..8917f80 100644
--- a/plugins/upnp/upnppluginsettings.kcfgc
+++ b/src/plugins/upnp/upnppluginsettings.kcfgc
diff --git a/plugins/upnp/upnpprefpage.cpp b/src/plugins/upnp/upnpprefpage.cpp
index 067cbef..067cbef 100644
--- a/plugins/upnp/upnpprefpage.cpp
+++ b/src/plugins/upnp/upnpprefpage.cpp
diff --git a/plugins/upnp/upnpprefpage.h b/src/plugins/upnp/upnpprefpage.h
index b66576e..b66576e 100644
--- a/plugins/upnp/upnpprefpage.h
+++ b/src/plugins/upnp/upnpprefpage.h
diff --git a/plugins/upnp/upnpprefwidget.cpp b/src/plugins/upnp/upnpprefwidget.cpp
index dd61a3c..dd61a3c 100644
--- a/plugins/upnp/upnpprefwidget.cpp
+++ b/src/plugins/upnp/upnpprefwidget.cpp
diff --git a/plugins/upnp/upnpprefwidget.h b/src/plugins/upnp/upnpprefwidget.h
index bcd9ac1..bcd9ac1 100644
--- a/plugins/upnp/upnpprefwidget.h
+++ b/src/plugins/upnp/upnpprefwidget.h
diff --git a/plugins/upnp/upnprouter.cpp b/src/plugins/upnp/upnprouter.cpp
index c3ece93..c3ece93 100644
--- a/plugins/upnp/upnprouter.cpp
+++ b/src/plugins/upnp/upnprouter.cpp
diff --git a/plugins/upnp/upnprouter.h b/src/plugins/upnp/upnprouter.h
index 6dbf828..6dbf828 100644
--- a/plugins/upnp/upnprouter.h
+++ b/src/plugins/upnp/upnprouter.h
diff --git a/plugins/upnp/upnpwidget.ui b/src/plugins/upnp/upnpwidget.ui
index 6879d86..6879d86 100644
--- a/plugins/upnp/upnpwidget.ui
+++ b/src/plugins/upnp/upnpwidget.ui
diff --git a/plugins/webinterface/Makefile.am b/src/plugins/webinterface/Makefile.am
index 6626957..5492966 100644
--- a/plugins/webinterface/Makefile.am
+++ b/src/plugins/webinterface/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/libktorrent -I$(top_builddir)/libktorrent $(all_includes)
+INCLUDES = -I$(top_srcdir)/src/libktorrent -I$(top_builddir)/src/libktorrent $(all_includes)
 
 METASOURCES = AUTO
 kde_module_LTLIBRARIES = ktwebinterfaceplugin.la
diff --git a/plugins/webinterface/httpclienthandler.cpp b/src/plugins/webinterface/httpclienthandler.cpp
index bc2a4f6..bc2a4f6 100644
--- a/plugins/webinterface/httpclienthandler.cpp
+++ b/src/plugins/webinterface/httpclienthandler.cpp
diff --git a/plugins/webinterface/httpclienthandler.h b/src/plugins/webinterface/httpclienthandler.h
index 8afbc39..8afbc39 100644
--- a/plugins/webinterface/httpclienthandler.h
+++ b/src/plugins/webinterface/httpclienthandler.h
diff --git a/plugins/webinterface/httpresponseheader.cpp b/src/plugins/webinterface/httpresponseheader.cpp
index 3056f79..3056f79 100644
--- a/plugins/webinterface/httpresponseheader.cpp
+++ b/src/plugins/webinterface/httpresponseheader.cpp
diff --git a/plugins/webinterface/httpresponseheader.h b/src/plugins/webinterface/httpresponseheader.h
index 417fe6b..417fe6b 100644
--- a/plugins/webinterface/httpresponseheader.h
+++ b/src/plugins/webinterface/httpresponseheader.h
diff --git a/plugins/webinterface/httpserver.cpp b/src/plugins/webinterface/httpserver.cpp
index 0860903..0860903 100644
--- a/plugins/webinterface/httpserver.cpp
+++ b/src/plugins/webinterface/httpserver.cpp
diff --git a/plugins/webinterface/httpserver.h b/src/plugins/webinterface/httpserver.h
index 33eeddf..33eeddf 100644
--- a/plugins/webinterface/httpserver.h
+++ b/src/plugins/webinterface/httpserver.h
diff --git a/plugins/webinterface/ktwebinterfaceplugin.desktop b/src/plugins/webinterface/ktwebinterfaceplugin.desktop
index aa2dfa5..aa2dfa5 100644
--- a/plugins/webinterface/ktwebinterfaceplugin.desktop
+++ b/src/plugins/webinterface/ktwebinterfaceplugin.desktop
diff --git a/plugins/webinterface/ktwebinterfaceplugin.kcfg b/src/plugins/webinterface/ktwebinterfaceplugin.kcfg
index cbfd5e7..cbfd5e7 100644
--- a/plugins/webinterface/ktwebinterfaceplugin.kcfg
+++ b/src/plugins/webinterface/ktwebinterfaceplugin.kcfg
diff --git a/plugins/webinterface/php_handler.cpp b/src/plugins/webinterface/php_handler.cpp
index 6586f7e..6586f7e 100644
--- a/plugins/webinterface/php_handler.cpp
+++ b/src/plugins/webinterface/php_handler.cpp
diff --git a/plugins/webinterface/php_handler.h b/src/plugins/webinterface/php_handler.h
index e817b51..e817b51 100644
--- a/plugins/webinterface/php_handler.h
+++ b/src/plugins/webinterface/php_handler.h
diff --git a/plugins/webinterface/php_interface.cpp b/src/plugins/webinterface/php_interface.cpp
index eb42684..eb42684 100644
--- a/plugins/webinterface/php_interface.cpp
+++ b/src/plugins/webinterface/php_interface.cpp
diff --git a/plugins/webinterface/php_interface.h b/src/plugins/webinterface/php_interface.h
index acfd8c7..acfd8c7 100644
--- a/plugins/webinterface/php_interface.h
+++ b/src/plugins/webinterface/php_interface.h
diff --git a/plugins/webinterface/webinterfaceplugin.cpp b/src/plugins/webinterface/webinterfaceplugin.cpp
index fb47d03..fb47d03 100644
--- a/plugins/webinterface/webinterfaceplugin.cpp
+++ b/src/plugins/webinterface/webinterfaceplugin.cpp
diff --git a/plugins/webinterface/webinterfaceplugin.h b/src/plugins/webinterface/webinterfaceplugin.h
index 0edb5ed..0edb5ed 100644
--- a/plugins/webinterface/webinterfaceplugin.h
+++ b/src/plugins/webinterface/webinterfaceplugin.h
diff --git a/plugins/webinterface/webinterfacepluginsettings.kcfgc b/src/plugins/webinterface/webinterfacepluginsettings.kcfgc
index 1306161..1306161 100644
--- a/plugins/webinterface/webinterfacepluginsettings.kcfgc
+++ b/src/plugins/webinterface/webinterfacepluginsettings.kcfgc
diff --git a/plugins/webinterface/webinterfacepref.ui b/src/plugins/webinterface/webinterfacepref.ui
index 5830b0c..5830b0c 100644
--- a/plugins/webinterface/webinterfacepref.ui
+++ b/src/plugins/webinterface/webinterfacepref.ui
diff --git a/plugins/webinterface/webinterfaceprefpage.cpp b/src/plugins/webinterface/webinterfaceprefpage.cpp
index ecc7a62..ecc7a62 100644
--- a/plugins/webinterface/webinterfaceprefpage.cpp
+++ b/src/plugins/webinterface/webinterfaceprefpage.cpp
diff --git a/plugins/webinterface/webinterfaceprefpage.h b/src/plugins/webinterface/webinterfaceprefpage.h
index f05c723..f05c723 100644
--- a/plugins/webinterface/webinterfaceprefpage.h
+++ b/src/plugins/webinterface/webinterfaceprefpage.h
diff --git a/plugins/webinterface/webinterfaceprefwidget.cpp b/src/plugins/webinterface/webinterfaceprefwidget.cpp
index 92b983a..92b983a 100644
--- a/plugins/webinterface/webinterfaceprefwidget.cpp
+++ b/src/plugins/webinterface/webinterfaceprefwidget.cpp
diff --git a/plugins/webinterface/webinterfaceprefwidget.h b/src/plugins/webinterface/webinterfaceprefwidget.h
index 0f227ee..0f227ee 100644
--- a/plugins/webinterface/webinterfaceprefwidget.h
+++ b/src/plugins/webinterface/webinterfaceprefwidget.h
diff --git a/plugins/webinterface/www/Makefile.am b/src/plugins/webinterface/www/Makefile.am
index 8a92573..8a92573 100644
--- a/plugins/webinterface/www/Makefile.am
+++ b/src/plugins/webinterface/www/Makefile.am
diff --git a/plugins/webinterface/www/coldmilk/Makefile.am b/src/plugins/webinterface/www/coldmilk/Makefile.am
index d6a5f08..d6a5f08 100644
--- a/plugins/webinterface/www/coldmilk/Makefile.am
+++ b/src/plugins/webinterface/www/coldmilk/Makefile.am
diff --git a/plugins/webinterface/www/coldmilk/favicon.ico b/src/plugins/webinterface/www/coldmilk/favicon.ico
index 3213b23..3213b23 100644
--- a/plugins/webinterface/www/coldmilk/favicon.ico
+++ b/src/plugins/webinterface/www/coldmilk/favicon.ico
diff --git a/plugins/webinterface/www/coldmilk/icon.png b/src/plugins/webinterface/www/coldmilk/icon.png
index fbe2294..fbe2294 100644
--- a/plugins/webinterface/www/coldmilk/icon.png
+++ b/src/plugins/webinterface/www/coldmilk/icon.png
diff --git a/plugins/webinterface/www/coldmilk/icons/16x16/Makefile.am b/src/plugins/webinterface/www/coldmilk/icons/16x16/Makefile.am
index 7380c25..7380c25 100644
--- a/plugins/webinterface/www/coldmilk/icons/16x16/Makefile.am
+++ b/src/plugins/webinterface/www/coldmilk/icons/16x16/Makefile.am
diff --git a/plugins/webinterface/www/coldmilk/icons/16x16/edit_user.png b/src/plugins/webinterface/www/coldmilk/icons/16x16/edit_user.png
index c8135c8..c8135c8 100644
--- a/plugins/webinterface/www/coldmilk/icons/16x16/edit_user.png
+++ b/src/plugins/webinterface/www/coldmilk/icons/16x16/edit_user.png
diff --git a/plugins/webinterface/www/coldmilk/icons/16x16/high_priority.png b/src/plugins/webinterface/www/coldmilk/icons/16x16/high_priority.png
index 3bb3d2c..3bb3d2c 100644
--- a/plugins/webinterface/www/coldmilk/icons/16x16/high_priority.png
+++ b/src/plugins/webinterface/www/coldmilk/icons/16x16/high_priority.png
diff --git a/plugins/webinterface/www/coldmilk/icons/16x16/low_priority.png b/src/plugins/webinterface/www/coldmilk/icons/16x16/low_priority.png
index e6bea7d..e6bea7d 100644
--- a/plugins/webinterface/www/coldmilk/icons/16x16/low_priority.png
+++ b/src/plugins/webinterface/www/coldmilk/icons/16x16/low_priority.png
diff --git a/plugins/webinterface/www/coldmilk/icons/16x16/normal_priority.png b/src/plugins/webinterface/www/coldmilk/icons/16x16/normal_priority.png
index d4dcb20..d4dcb20 100644
--- a/plugins/webinterface/www/coldmilk/icons/16x16/normal_priority.png
+++ b/src/plugins/webinterface/www/coldmilk/icons/16x16/normal_priority.png
diff --git a/plugins/webinterface/www/coldmilk/icons/16x16/only_seed.png b/src/plugins/webinterface/www/coldmilk/icons/16x16/only_seed.png
index fae2635..fae2635 100644
--- a/plugins/webinterface/www/coldmilk/icons/16x16/only_seed.png
+++ b/src/plugins/webinterface/www/coldmilk/icons/16x16/only_seed.png
diff --git a/plugins/webinterface/www/coldmilk/icons/22x22/Makefile.am b/src/plugins/webinterface/www/coldmilk/icons/22x22/Makefile.am
index 2bd411f..2bd411f 100644
--- a/plugins/webinterface/www/coldmilk/icons/22x22/Makefile.am
+++ b/src/plugins/webinterface/www/coldmilk/icons/22x22/Makefile.am
diff --git a/plugins/webinterface/www/coldmilk/icons/22x22/exit.png b/src/plugins/webinterface/www/coldmilk/icons/22x22/exit.png
index 8c8cbd4..8c8cbd4 100644
--- a/plugins/webinterface/www/coldmilk/icons/22x22/exit.png
+++ b/src/plugins/webinterface/www/coldmilk/icons/22x22/exit.png
diff --git a/plugins/webinterface/www/coldmilk/icons/22x22/ktstart_all.png b/src/plugins/webinterface/www/coldmilk/icons/22x22/ktstart_all.png
index f46ed84..f46ed84 100644
--- a/plugins/webinterface/www/coldmilk/icons/22x22/ktstart_all.png
+++ b/src/plugins/webinterface/www/coldmilk/icons/22x22/ktstart_all.png
diff --git a/plugins/webinterface/www/coldmilk/icons/22x22/ktstop_all.png b/src/plugins/webinterface/www/coldmilk/icons/22x22/ktstop_all.png
index 73b548b..73b548b 100644
--- a/plugins/webinterface/www/coldmilk/icons/22x22/ktstop_all.png
+++ b/src/plugins/webinterface/www/coldmilk/icons/22x22/ktstop_all.png
diff --git a/plugins/webinterface/www/coldmilk/icons/22x22/remove.png b/src/plugins/webinterface/www/coldmilk/icons/22x22/remove.png
index 7df1928..7df1928 100644
--- a/plugins/webinterface/www/coldmilk/icons/22x22/remove.png
+++ b/src/plugins/webinterface/www/coldmilk/icons/22x22/remove.png
diff --git a/plugins/webinterface/www/coldmilk/icons/22x22/start.png b/src/plugins/webinterface/www/coldmilk/icons/22x22/start.png
index a55e49c..a55e49c 100644
--- a/plugins/webinterface/www/coldmilk/icons/22x22/start.png
+++ b/src/plugins/webinterface/www/coldmilk/icons/22x22/start.png
diff --git a/plugins/webinterface/www/coldmilk/icons/22x22/stop.png b/src/plugins/webinterface/www/coldmilk/icons/22x22/stop.png
index 9c464de..9c464de 100644
--- a/plugins/webinterface/www/coldmilk/icons/22x22/stop.png
+++ b/src/plugins/webinterface/www/coldmilk/icons/22x22/stop.png
diff --git a/plugins/webinterface/www/coldmilk/icons/32x32/Makefile.am b/src/plugins/webinterface/www/coldmilk/icons/32x32/Makefile.am
index a2b93df..a2b93df 100644
--- a/plugins/webinterface/www/coldmilk/icons/32x32/Makefile.am
+++ b/src/plugins/webinterface/www/coldmilk/icons/32x32/Makefile.am
diff --git a/plugins/webinterface/www/coldmilk/icons/32x32/configure.png b/src/plugins/webinterface/www/coldmilk/icons/32x32/configure.png
index d0e5539..d0e5539 100644
--- a/plugins/webinterface/www/coldmilk/icons/32x32/configure.png
+++ b/src/plugins/webinterface/www/coldmilk/icons/32x32/configure.png
diff --git a/plugins/webinterface/www/coldmilk/icons/32x32/extender_opened.png b/src/plugins/webinterface/www/coldmilk/icons/32x32/extender_opened.png
index 9488d81..9488d81 100644
--- a/plugins/webinterface/www/coldmilk/icons/32x32/extender_opened.png
+++ b/src/plugins/webinterface/www/coldmilk/icons/32x32/extender_opened.png
diff --git a/plugins/webinterface/www/coldmilk/icons/32x32/fileopen.png b/src/plugins/webinterface/www/coldmilk/icons/32x32/fileopen.png
index 9d19a5a..9d19a5a 100644
--- a/plugins/webinterface/www/coldmilk/icons/32x32/fileopen.png
+++ b/src/plugins/webinterface/www/coldmilk/icons/32x32/fileopen.png
diff --git a/plugins/webinterface/www/coldmilk/icons/32x32/folder1.png b/src/plugins/webinterface/www/coldmilk/icons/32x32/folder1.png
index d719405..d719405 100644
--- a/plugins/webinterface/www/coldmilk/icons/32x32/folder1.png
+++ b/src/plugins/webinterface/www/coldmilk/icons/32x32/folder1.png
diff --git a/plugins/webinterface/www/coldmilk/icons/48x48/Makefile.am b/src/plugins/webinterface/www/coldmilk/icons/48x48/Makefile.am
index 9318a0c..9318a0c 100644
--- a/plugins/webinterface/www/coldmilk/icons/48x48/Makefile.am
+++ b/src/plugins/webinterface/www/coldmilk/icons/48x48/Makefile.am
diff --git a/plugins/webinterface/www/coldmilk/icons/48x48/exit.png b/src/plugins/webinterface/www/coldmilk/icons/48x48/exit.png
index 1b2e5eb..1b2e5eb 100644
--- a/plugins/webinterface/www/coldmilk/icons/48x48/exit.png
+++ b/src/plugins/webinterface/www/coldmilk/icons/48x48/exit.png
diff --git a/plugins/webinterface/www/coldmilk/icons/48x48/switchuser.png b/src/plugins/webinterface/www/coldmilk/icons/48x48/switchuser.png
index a1f5b80..a1f5b80 100644
--- a/plugins/webinterface/www/coldmilk/icons/48x48/switchuser.png
+++ b/src/plugins/webinterface/www/coldmilk/icons/48x48/switchuser.png
diff --git a/plugins/webinterface/www/coldmilk/icons/64x64/Makefile.am b/src/plugins/webinterface/www/coldmilk/icons/64x64/Makefile.am
index 3ff3ae0..3ff3ae0 100644
--- a/plugins/webinterface/www/coldmilk/icons/64x64/Makefile.am
+++ b/src/plugins/webinterface/www/coldmilk/icons/64x64/Makefile.am
diff --git a/plugins/webinterface/www/coldmilk/icons/64x64/down.png b/src/plugins/webinterface/www/coldmilk/icons/64x64/down.png
index cb1d047..cb1d047 100644
--- a/plugins/webinterface/www/coldmilk/icons/64x64/down.png
+++ b/src/plugins/webinterface/www/coldmilk/icons/64x64/down.png
diff --git a/plugins/webinterface/www/coldmilk/icons/64x64/folder1_man.png b/src/plugins/webinterface/www/coldmilk/icons/64x64/folder1_man.png
index 3861718..3861718 100644
--- a/plugins/webinterface/www/coldmilk/icons/64x64/folder1_man.png
+++ b/src/plugins/webinterface/www/coldmilk/icons/64x64/folder1_man.png
diff --git a/plugins/webinterface/www/coldmilk/icons/64x64/looknfeel.png b/src/plugins/webinterface/www/coldmilk/icons/64x64/looknfeel.png
index 51c28fe..51c28fe 100644
--- a/plugins/webinterface/www/coldmilk/icons/64x64/looknfeel.png
+++ b/src/plugins/webinterface/www/coldmilk/icons/64x64/looknfeel.png
diff --git a/plugins/webinterface/www/coldmilk/icons/Makefile.am b/src/plugins/webinterface/www/coldmilk/icons/Makefile.am
index cbe7db5..cbe7db5 100644
--- a/plugins/webinterface/www/coldmilk/icons/Makefile.am
+++ b/src/plugins/webinterface/www/coldmilk/icons/Makefile.am
diff --git a/plugins/webinterface/www/coldmilk/interface.js b/src/plugins/webinterface/www/coldmilk/interface.js
index 2f361a5..2f361a5 100644
--- a/plugins/webinterface/www/coldmilk/interface.js
+++ b/src/plugins/webinterface/www/coldmilk/interface.js
diff --git a/plugins/webinterface/www/coldmilk/interface.php b/src/plugins/webinterface/www/coldmilk/interface.php
index 246f347..246f347 100644
--- a/plugins/webinterface/www/coldmilk/interface.php
+++ b/src/plugins/webinterface/www/coldmilk/interface.php
diff --git a/plugins/webinterface/www/coldmilk/login.html b/src/plugins/webinterface/www/coldmilk/login.html
index fa95faf..fa95faf 100644
--- a/plugins/webinterface/www/coldmilk/login.html
+++ b/src/plugins/webinterface/www/coldmilk/login.html
diff --git a/plugins/webinterface/www/coldmilk/page_update.js b/src/plugins/webinterface/www/coldmilk/page_update.js
index c004456..c004456 100644
--- a/plugins/webinterface/www/coldmilk/page_update.js
+++ b/src/plugins/webinterface/www/coldmilk/page_update.js
diff --git a/plugins/webinterface/www/coldmilk/rest.php b/src/plugins/webinterface/www/coldmilk/rest.php
index bab7e68..bab7e68 100644
--- a/plugins/webinterface/www/coldmilk/rest.php
+++ b/src/plugins/webinterface/www/coldmilk/rest.php
diff --git a/plugins/webinterface/www/coldmilk/shutdown.php b/src/plugins/webinterface/www/coldmilk/shutdown.php
index 92862c4..92862c4 100644
--- a/plugins/webinterface/www/coldmilk/shutdown.php
+++ b/src/plugins/webinterface/www/coldmilk/shutdown.php
diff --git a/plugins/webinterface/www/coldmilk/style.css b/src/plugins/webinterface/www/coldmilk/style.css
index 69010dc..69010dc 100644
--- a/plugins/webinterface/www/coldmilk/style.css
+++ b/src/plugins/webinterface/www/coldmilk/style.css
diff --git a/plugins/webinterface/www/default/Makefile.am b/src/plugins/webinterface/www/default/Makefile.am
index 01f09df..01f09df 100644
--- a/plugins/webinterface/www/default/Makefile.am
+++ b/src/plugins/webinterface/www/default/Makefile.am
diff --git a/plugins/webinterface/www/default/details.php b/src/plugins/webinterface/www/default/details.php
index a19d57e..a19d57e 100644
--- a/plugins/webinterface/www/default/details.php
+++ b/src/plugins/webinterface/www/default/details.php
diff --git a/plugins/webinterface/www/default/favicon.ico b/src/plugins/webinterface/www/default/favicon.ico
index 3213b23..3213b23 100644
--- a/plugins/webinterface/www/default/favicon.ico
+++ b/src/plugins/webinterface/www/default/favicon.ico
diff --git a/plugins/webinterface/www/default/grad1.jpg b/src/plugins/webinterface/www/default/grad1.jpg
index 762baa0..762baa0 100644
--- a/plugins/webinterface/www/default/grad1.jpg
+++ b/src/plugins/webinterface/www/default/grad1.jpg
diff --git a/plugins/webinterface/www/default/grad2.jpg b/src/plugins/webinterface/www/default/grad2.jpg
index bc4d77e..bc4d77e 100644
--- a/plugins/webinterface/www/default/grad2.jpg
+++ b/src/plugins/webinterface/www/default/grad2.jpg
diff --git a/plugins/webinterface/www/default/header_tile.png b/src/plugins/webinterface/www/default/header_tile.png
index 9dd45b6..9dd45b6 100644
--- a/plugins/webinterface/www/default/header_tile.png
+++ b/src/plugins/webinterface/www/default/header_tile.png
diff --git a/plugins/webinterface/www/default/high_priority.png b/src/plugins/webinterface/www/default/high_priority.png
index 3bb3d2c..3bb3d2c 100644
--- a/plugins/webinterface/www/default/high_priority.png
+++ b/src/plugins/webinterface/www/default/high_priority.png
diff --git a/plugins/webinterface/www/default/icon.png b/src/plugins/webinterface/www/default/icon.png
index fbe2294..fbe2294 100644
--- a/plugins/webinterface/www/default/icon.png
+++ b/src/plugins/webinterface/www/default/icon.png
diff --git a/plugins/webinterface/www/default/interface.php b/src/plugins/webinterface/www/default/interface.php
index 6432798..6432798 100644
--- a/plugins/webinterface/www/default/interface.php
+++ b/src/plugins/webinterface/www/default/interface.php
diff --git a/plugins/webinterface/www/default/ktorrentwebinterfacelogo.png b/src/plugins/webinterface/www/default/ktorrentwebinterfacelogo.png
index 6146fb1..6146fb1 100644
--- a/plugins/webinterface/www/default/ktorrentwebinterfacelogo.png
+++ b/src/plugins/webinterface/www/default/ktorrentwebinterfacelogo.png
diff --git a/plugins/webinterface/www/default/login.html b/src/plugins/webinterface/www/default/login.html
index 93ac1e6..93ac1e6 100644
--- a/plugins/webinterface/www/default/login.html
+++ b/src/plugins/webinterface/www/default/login.html
diff --git a/plugins/webinterface/www/default/low_priority.png b/src/plugins/webinterface/www/default/low_priority.png
index e6bea7d..e6bea7d 100644
--- a/plugins/webinterface/www/default/low_priority.png
+++ b/src/plugins/webinterface/www/default/low_priority.png
diff --git a/plugins/webinterface/www/default/menu_bg.png b/src/plugins/webinterface/www/default/menu_bg.png
index 298fef1..298fef1 100644
--- a/plugins/webinterface/www/default/menu_bg.png
+++ b/src/plugins/webinterface/www/default/menu_bg.png
diff --git a/plugins/webinterface/www/default/normal_priority.png b/src/plugins/webinterface/www/default/normal_priority.png
index d4dcb20..d4dcb20 100644
--- a/plugins/webinterface/www/default/normal_priority.png
+++ b/src/plugins/webinterface/www/default/normal_priority.png
diff --git a/plugins/webinterface/www/default/only_seed.png b/src/plugins/webinterface/www/default/only_seed.png
index fae2635..fae2635 100644
--- a/plugins/webinterface/www/default/only_seed.png
+++ b/src/plugins/webinterface/www/default/only_seed.png
diff --git a/plugins/webinterface/www/default/remove.png b/src/plugins/webinterface/www/default/remove.png
index 5b30781..5b30781 100644
--- a/plugins/webinterface/www/default/remove.png
+++ b/src/plugins/webinterface/www/default/remove.png
diff --git a/plugins/webinterface/www/default/shutdown.php b/src/plugins/webinterface/www/default/shutdown.php
index f87a199..f87a199 100644
--- a/plugins/webinterface/www/default/shutdown.php
+++ b/src/plugins/webinterface/www/default/shutdown.php
diff --git a/plugins/webinterface/www/default/start.png b/src/plugins/webinterface/www/default/start.png
index 31a78ca..31a78ca 100644
--- a/plugins/webinterface/www/default/start.png
+++ b/src/plugins/webinterface/www/default/start.png
diff --git a/plugins/webinterface/www/default/stop.png b/src/plugins/webinterface/www/default/stop.png
index 82afb10..82afb10 100644
--- a/plugins/webinterface/www/default/stop.png
+++ b/src/plugins/webinterface/www/default/stop.png
diff --git a/plugins/webinterface/www/default/style.css b/src/plugins/webinterface/www/default/style.css
index 3af4bb5..3af4bb5 100644
--- a/plugins/webinterface/www/default/style.css
+++ b/src/plugins/webinterface/www/default/style.css
diff --git a/plugins/webinterface/www/default/stylen.css b/src/plugins/webinterface/www/default/stylen.css
index 68966fd..68966fd 100644
--- a/plugins/webinterface/www/default/stylen.css
+++ b/src/plugins/webinterface/www/default/stylen.css
diff --git a/plugins/webinterface/www/default/wz_tooltip.js b/src/plugins/webinterface/www/default/wz_tooltip.js
index 1329a1b..1329a1b 100644
--- a/plugins/webinterface/www/default/wz_tooltip.js
+++ b/src/plugins/webinterface/www/default/wz_tooltip.js
diff --git a/plugins/webinterface/www/mobile/Makefile.am b/src/plugins/webinterface/www/mobile/Makefile.am
index 3aae8b4..3aae8b4 100644
--- a/plugins/webinterface/www/mobile/Makefile.am
+++ b/src/plugins/webinterface/www/mobile/Makefile.am
diff --git a/plugins/webinterface/www/mobile/favicon.ico b/src/plugins/webinterface/www/mobile/favicon.ico
index 3213b23..3213b23 100644
--- a/plugins/webinterface/www/mobile/favicon.ico
+++ b/src/plugins/webinterface/www/mobile/favicon.ico
diff --git a/plugins/webinterface/www/mobile/interface.php b/src/plugins/webinterface/www/mobile/interface.php
index 57582de..57582de 100644
--- a/plugins/webinterface/www/mobile/interface.php
+++ b/src/plugins/webinterface/www/mobile/interface.php
diff --git a/plugins/webinterface/www/mobile/ktorrentwebinterfacelogo.png b/src/plugins/webinterface/www/mobile/ktorrentwebinterfacelogo.png
index 6146fb1..6146fb1 100644
--- a/plugins/webinterface/www/mobile/ktorrentwebinterfacelogo.png
+++ b/src/plugins/webinterface/www/mobile/ktorrentwebinterfacelogo.png
diff --git a/plugins/webinterface/www/mobile/login.html b/src/plugins/webinterface/www/mobile/login.html
index 359c44c..359c44c 100644
--- a/plugins/webinterface/www/mobile/login.html
+++ b/src/plugins/webinterface/www/mobile/login.html
diff --git a/plugins/webinterface/www/mobile/remove.png b/src/plugins/webinterface/www/mobile/remove.png
index 281edd3..281edd3 100644
--- a/plugins/webinterface/www/mobile/remove.png
+++ b/src/plugins/webinterface/www/mobile/remove.png
diff --git a/plugins/webinterface/www/mobile/settings.php b/src/plugins/webinterface/www/mobile/settings.php
index b763bb1..b763bb1 100644
--- a/plugins/webinterface/www/mobile/settings.php
+++ b/src/plugins/webinterface/www/mobile/settings.php
diff --git a/plugins/webinterface/www/mobile/start.png b/src/plugins/webinterface/www/mobile/start.png
index d071181..d071181 100644
--- a/plugins/webinterface/www/mobile/start.png
+++ b/src/plugins/webinterface/www/mobile/start.png
diff --git a/plugins/webinterface/www/mobile/stop.png b/src/plugins/webinterface/www/mobile/stop.png
index 3c6942a..3c6942a 100644
--- a/plugins/webinterface/www/mobile/stop.png
+++ b/src/plugins/webinterface/www/mobile/stop.png
diff --git a/plugins/webinterface/www/mobile/torrent.php b/src/plugins/webinterface/www/mobile/torrent.php
index a1e451d..a1e451d 100644
--- a/plugins/webinterface/www/mobile/torrent.php
+++ b/src/plugins/webinterface/www/mobile/torrent.php
diff --git a/plugins/zeroconf/Makefile.am b/src/plugins/zeroconf/Makefile.am
index 0fb602a..594adf8 100644
--- a/plugins/zeroconf/Makefile.am
+++ b/src/plugins/zeroconf/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/libktorrent -I$(top_builddir)/libktorrent $(all_includes)
+INCLUDES = -I$(top_srcdir)/src/libktorrent -I$(top_builddir)/src/libktorrent $(all_includes)
 	
 METASOURCES = AUTO
 		
diff --git a/plugins/zeroconf/avahiservice.cpp b/src/plugins/zeroconf/avahiservice.cpp
index aebaa00..aebaa00 100644
--- a/plugins/zeroconf/avahiservice.cpp
+++ b/src/plugins/zeroconf/avahiservice.cpp
diff --git a/plugins/zeroconf/avahiservice.h b/src/plugins/zeroconf/avahiservice.h
index f85062f..f85062f 100644
--- a/plugins/zeroconf/avahiservice.h
+++ b/src/plugins/zeroconf/avahiservice.h
diff --git a/plugins/zeroconf/ktzeroconfplugin.desktop b/src/plugins/zeroconf/ktzeroconfplugin.desktop
index 2cabcc7..2cabcc7 100644
--- a/plugins/zeroconf/ktzeroconfplugin.desktop
+++ b/src/plugins/zeroconf/ktzeroconfplugin.desktop
diff --git a/plugins/zeroconf/localbrowser.cpp b/src/plugins/zeroconf/localbrowser.cpp
index 6306788..6306788 100644
--- a/plugins/zeroconf/localbrowser.cpp
+++ b/src/plugins/zeroconf/localbrowser.cpp
diff --git a/plugins/zeroconf/localbrowser.h b/src/plugins/zeroconf/localbrowser.h
index 0e06b99..0e06b99 100644
--- a/plugins/zeroconf/localbrowser.h
+++ b/src/plugins/zeroconf/localbrowser.h
diff --git a/plugins/zeroconf/zeroconfplugin.cpp b/src/plugins/zeroconf/zeroconfplugin.cpp
index 6307bdd..6307bdd 100644
--- a/plugins/zeroconf/zeroconfplugin.cpp
+++ b/src/plugins/zeroconf/zeroconfplugin.cpp
diff --git a/plugins/zeroconf/zeroconfplugin.h b/src/plugins/zeroconf/zeroconfplugin.h
index 5fabfab..5fabfab 100644
--- a/plugins/zeroconf/zeroconfplugin.h
+++ b/src/plugins/zeroconf/zeroconfplugin.h
diff --git a/scripts/Makefile.am b/src/scripts/Makefile.am
index 2c6a020..2c6a020 100644
--- a/scripts/Makefile.am
+++ b/src/scripts/Makefile.am
diff --git a/scripts/ktshell b/src/scripts/ktshell
index 45979e0..45979e0 100755
--- a/scripts/ktshell
+++ b/src/scripts/ktshell
diff --git a/utests/Makefile.am b/src/utests/Makefile.am
index 78de5ad..78de5ad 100644
--- a/utests/Makefile.am
+++ b/src/utests/Makefile.am
diff --git a/utests/biginttest.cpp b/src/utests/biginttest.cpp
index 514663e..514663e 100644
--- a/utests/biginttest.cpp
+++ b/src/utests/biginttest.cpp
diff --git a/utests/biginttest.h b/src/utests/biginttest.h
index 2e4073b..2e4073b 100644
--- a/utests/biginttest.h
+++ b/src/utests/biginttest.h
diff --git a/utests/dhtmsgparsetest.cpp b/src/utests/dhtmsgparsetest.cpp
index 38a0deb..38a0deb 100644
--- a/utests/dhtmsgparsetest.cpp
+++ b/src/utests/dhtmsgparsetest.cpp
diff --git a/utests/dhtmsgparsetest.h b/src/utests/dhtmsgparsetest.h
index 8e2c774..8e2c774 100644
--- a/utests/dhtmsgparsetest.h
+++ b/src/utests/dhtmsgparsetest.h
diff --git a/utests/difflehellmantest.cpp b/src/utests/difflehellmantest.cpp
index b261d5a..b261d5a 100644
--- a/utests/difflehellmantest.cpp
+++ b/src/utests/difflehellmantest.cpp
diff --git a/utests/difflehellmantest.h b/src/utests/difflehellmantest.h
index c065894..c065894 100644
--- a/utests/difflehellmantest.h
+++ b/src/utests/difflehellmantest.h
diff --git a/utests/main.cpp b/src/utests/main.cpp
index 7618cac..7618cac 100644
--- a/utests/main.cpp
+++ b/src/utests/main.cpp
diff --git a/utests/rc4test.cpp b/src/utests/rc4test.cpp
index add45ff..add45ff 100644
--- a/utests/rc4test.cpp
+++ b/src/utests/rc4test.cpp
diff --git a/utests/rc4test.h b/src/utests/rc4test.h
index b92afae..b92afae 100644
--- a/utests/rc4test.h
+++ b/src/utests/rc4test.h
diff --git a/utests/testrunner.cpp b/src/utests/testrunner.cpp
index 3e0c2aa..3e0c2aa 100644
--- a/utests/testrunner.cpp
+++ b/src/utests/testrunner.cpp
diff --git a/utests/testrunner.h b/src/utests/testrunner.h
index edc56b4..edc56b4 100644
--- a/utests/testrunner.h
+++ b/src/utests/testrunner.h
diff --git a/utests/unittest.cpp b/src/utests/unittest.cpp
index 2aaa2d6..2aaa2d6 100644
--- a/utests/unittest.cpp
+++ b/src/utests/unittest.cpp
diff --git a/utests/unittest.h b/src/utests/unittest.h
index 02889a5..02889a5 100644
--- a/utests/unittest.h
+++ b/src/utests/unittest.h
diff --git a/utests/upnpparsedescriptiontest.cpp b/src/utests/upnpparsedescriptiontest.cpp
index 787378f..787378f 100644
--- a/utests/upnpparsedescriptiontest.cpp
+++ b/src/utests/upnpparsedescriptiontest.cpp
diff --git a/utests/upnpparsedescriptiontest.h b/src/utests/upnpparsedescriptiontest.h
index 29d4e1e..29d4e1e 100644
--- a/utests/upnpparsedescriptiontest.h
+++ b/src/utests/upnpparsedescriptiontest.h
diff --git a/utests/upnpparseresponsetest.cpp b/src/utests/upnpparseresponsetest.cpp
index 97102cf..97102cf 100644
--- a/utests/upnpparseresponsetest.cpp
+++ b/src/utests/upnpparseresponsetest.cpp
diff --git a/utests/upnpparseresponsetest.h b/src/utests/upnpparseresponsetest.h
index 5186fd5..5186fd5 100644
--- a/utests/upnpparseresponsetest.h
+++ b/src/utests/upnpparseresponsetest.h
diff --git a/subdirs b/subdirs
index 8fcd62e..51d9b55 100644
--- a/subdirs
+++ b/subdirs
@@ -1,6 +1,3 @@
-apps
 doc
-libktorrent
-plugins
-scripts
+src
 translations