[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim] kmail: Move in own directory
From:       Montel Laurent <montel () kde ! org>
Date:       2013-05-31 17:49:46
Message-ID: 20130531174946.4F9A4A6078 () git ! kde ! org
[Download RAW message or body]

Git commit 12e3694e40fd4e1a127e2312ff09364cc7fb3e2c by Montel Laurent.
Committed on 31/05/2013 at 18:12.
Pushed by mlaurent into branch 'master'.

Move in own directory

M  +4    -4    kmail/CMakeLists.txt
R  +0    -0    kmail/configuredialog/configagentdelegate.cpp [from: kmail/c=
onfigagentdelegate.cpp - 100% similarity]
R  +0    -0    kmail/configuredialog/configagentdelegate.h [from: kmail/con=
figagentdelegate.h - 100% similarity]
R  +0    -0    kmail/configuredialog/configmodule.h [from: kmail/configmodu=
le.h - 100% similarity]
R  +0    -0    kmail/configuredialog/configuredialog.cpp [from: kmail/confi=
guredialog.cpp - 100% similarity]
R  +0    -0    kmail/configuredialog/configuredialog.h [from: kmail/configu=
redialog.h - 100% similarity]
R  +0    -0    kmail/configuredialog/configuredialog_p.cpp [from: kmail/con=
figuredialog_p.cpp - 100% similarity]
R  +0    -0    kmail/configuredialog/configuredialog_p.h [from: kmail/confi=
guredialog_p.h - 100% similarity]
R  +0    -0    kmail/configuredialog/configuredialoglistview.cpp [from: kma=
il/configuredialoglistview.cpp - 100% similarity]
R  +0    -0    kmail/configuredialog/configuredialoglistview.h [from: kmail=
/configuredialoglistview.h - 100% similarity]
M  +1    -1    kmail/identitypage.h
M  +2    -2    kmail/kcm_kmail.cpp
M  +1    -1    kmail/kmkernel.cpp

http://commits.kde.org/kdepim/12e3694e40fd4e1a127e2312ff09364cc7fb3e2c

diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt
index 7db4106..c4a26c8 100644
--- a/kmail/CMakeLists.txt
+++ b/kmail/CMakeLists.txt
@@ -73,10 +73,10 @@ if (NOT WINCE AND KDEPIM_BUILD_DESKTOP)
      collectionpage/collectionshortcutpage.cpp
      colorlistbox.cpp
      kmmainwin.cpp
-     configagentdelegate.cpp
-     configuredialoglistview.cpp
-     configuredialog.cpp
-     configuredialog_p.cpp
+     configuredialog/configagentdelegate.cpp
+     configuredialog/configuredialoglistview.cpp
+     configuredialog/configuredialog.cpp
+     configuredialog/configuredialog_p.cpp
      identitylistview.cpp
      identitydialog.cpp
      globalsettings.cpp
diff --git a/kmail/configagentdelegate.cpp b/kmail/configuredialog/configag=
entdelegate.cpp
similarity index 100%
rename from kmail/configagentdelegate.cpp
rename to kmail/configuredialog/configagentdelegate.cpp
diff --git a/kmail/configagentdelegate.h b/kmail/configuredialog/configagen=
tdelegate.h
similarity index 100%
rename from kmail/configagentdelegate.h
rename to kmail/configuredialog/configagentdelegate.h
diff --git a/kmail/configmodule.h b/kmail/configuredialog/configmodule.h
similarity index 100%
rename from kmail/configmodule.h
rename to kmail/configuredialog/configmodule.h
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog/configuredia=
log.cpp
similarity index 100%
rename from kmail/configuredialog.cpp
rename to kmail/configuredialog/configuredialog.cpp
diff --git a/kmail/configuredialog.h b/kmail/configuredialog/configuredialo=
g.h
similarity index 100%
rename from kmail/configuredialog.h
rename to kmail/configuredialog/configuredialog.h
diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog/configured=
ialog_p.cpp
similarity index 100%
rename from kmail/configuredialog_p.cpp
rename to kmail/configuredialog/configuredialog_p.cpp
diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog/configuredia=
log_p.h
similarity index 100%
rename from kmail/configuredialog_p.h
rename to kmail/configuredialog/configuredialog_p.h
diff --git a/kmail/configuredialoglistview.cpp b/kmail/configuredialog/conf=
iguredialoglistview.cpp
similarity index 100%
rename from kmail/configuredialoglistview.cpp
rename to kmail/configuredialog/configuredialoglistview.cpp
diff --git a/kmail/configuredialoglistview.h b/kmail/configuredialog/config=
uredialoglistview.h
similarity index 100%
rename from kmail/configuredialoglistview.h
rename to kmail/configuredialog/configuredialoglistview.h
diff --git a/kmail/identitypage.h b/kmail/identitypage.h
index 8a39871..96593b8 100644
--- a/kmail/identitypage.h
+++ b/kmail/identitypage.h
@@ -26,7 +26,7 @@
 =

 #include "kmail_export.h"
 =

-#include "configmodule.h"
+#include "configuredialog/configmodule.h"
 #include "ui_identitypage.h"
 =

 namespace KPIMIdentities {
diff --git a/kmail/kcm_kmail.cpp b/kmail/kcm_kmail.cpp
index 082ce7b..5513fac 100644
--- a/kmail/kcm_kmail.cpp
+++ b/kmail/kcm_kmail.cpp
@@ -21,8 +21,8 @@
  */
 =

 // This must be first
-#include "configuredialog.h"
-#include "configuredialog_p.h"
+#include "configuredialog/configuredialog.h"
+#include "configuredialog/configuredialog_p.h"
 #include "identitypage.h"
 #include <kcmodule.h>
 #include <kcomponentdata.h>
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 8958db5..5b61a80 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -15,7 +15,7 @@ using KPIM::BroadcastStatus;
 #include "kmmainwidget.h"
 #include "recentaddresses.h"
 using KPIM::RecentAddresses;
-#include "configuredialog.h"
+#include "configuredialog/configuredialog.h"
 #include "kmcommands.h"
 #include "kmsystemtray.h"
 #include "stringutil.h"

[prev in list] [next in list] [prev in thread] [next in thread]