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

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

Git commit 1c511e3584c50e98d0c97bc282209896461af53f by Montel Laurent.
Committed on 31/05/2013 at 19:22.
Pushed by mlaurent into branch 'master'.

Move to own directory

M  +6    -6    kmail/CMakeLists.txt
M  +1    -1    kmail/configuredialog/configuredialog.cpp
R  +0    -0    kmail/identity/identityaddvcarddialog.cpp [from: kmail/ident=
ityaddvcarddialog.cpp - 100% similarity]
R  +0    -0    kmail/identity/identityaddvcarddialog.h [from: kmail/identit=
yaddvcarddialog.h - 100% similarity]
R  +0    -0    kmail/identity/identitydialog.cpp [from: kmail/identitydialo=
g.cpp - 100% similarity]
R  +0    -0    kmail/identity/identitydialog.h [from: kmail/identitydialog.=
h - 100% similarity]
R  +0    -0    kmail/identity/identityeditvcarddialog.cpp [from: kmail/iden=
tityeditvcarddialog.cpp - 100% similarity]
R  +0    -0    kmail/identity/identityeditvcarddialog.h [from: kmail/identi=
tyeditvcarddialog.h - 100% similarity]
R  +0    -0    kmail/identity/identitylistview.cpp [from: kmail/identitylis=
tview.cpp - 100% similarity]
R  +0    -0    kmail/identity/identitylistview.h [from: kmail/identitylistv=
iew.h - 100% similarity]
R  +0    -0    kmail/identity/identitypage.cpp [from: kmail/identitypage.cp=
p - 100% similarity]
R  +0    -0    kmail/identity/identitypage.h [from: kmail/identitypage.h - =
100% similarity]
R  +0    -0    kmail/identity/newidentitydialog.cpp [from: kmail/newidentit=
ydialog.cpp - 100% similarity]
R  +0    -0    kmail/identity/newidentitydialog.h [from: kmail/newidentityd=
ialog.h - 100% similarity]
M  +1    -1    kmail/kcm_kmail.cpp
M  +7    -7    kmail/kcm_kpimidentities/CMakeLists.txt
M  +1    -1    kmail/ui/identitypage.ui

http://commits.kde.org/kdepim/1c511e3584c50e98d0c97bc282209896461af53f

diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt
index 0f00e2c..80e9816 100644
--- a/kmail/CMakeLists.txt
+++ b/kmail/CMakeLists.txt
@@ -77,8 +77,8 @@ if (NOT WINCE AND KDEPIM_BUILD_DESKTOP)
      configuredialog/configuredialoglistview.cpp
      configuredialog/configuredialog.cpp
      configuredialog/configuredialog_p.cpp
-     identitylistview.cpp
-     identitydialog.cpp
+     identity/identitylistview.cpp
+     identity/identitydialog.cpp
      globalsettings.cpp
      snippetwidget.cpp
      kmreaderwin.cpp
@@ -110,15 +110,15 @@ if (NOT WINCE AND KDEPIM_BUILD_DESKTOP)
      tagactionmanager.cpp
      foldershortcutactionmanager.cpp
      addressvalidationjob.cpp
-     identitypage.cpp
-     newidentitydialog.cpp
+     identity/identitypage.cpp
+     identity/newidentitydialog.cpp
      searchdialog/kmsearchmessagemodel.cpp
      searchdialog/kmsearchfilterproxymodel.cpp
      kmknotify.cpp
      tagselectdialog.cpp
      configuredialog/accountconfigorderdialog.cpp
-     identityeditvcarddialog.cpp
-     identityaddvcarddialog.cpp
+     identity/identityeditvcarddialog.cpp
+     identity/identityaddvcarddialog.cpp
      attachmentmissingwarning.cpp
      createnewcontactjob.cpp
      externaleditorwarning.cpp
diff --git a/kmail/configuredialog/configuredialog.cpp b/kmail/configuredia=
log/configuredialog.cpp
index 55070bb..1f74061 100644
--- a/kmail/configuredialog/configuredialog.cpp
+++ b/kmail/configuredialog/configuredialog.cpp
@@ -26,7 +26,7 @@
 #include "configuredialog.h"
 #include "configuredialog_p.h"
 #include "ui_accountspagereceivingtab.h"
-#include "identitypage.h"
+#include "identity/identitypage.h"
 =

 #include "globalsettings.h"
 #include "templatesconfiguration_kfg.h"
diff --git a/kmail/identityaddvcarddialog.cpp b/kmail/identity/identityaddv=
carddialog.cpp
similarity index 100%
rename from kmail/identityaddvcarddialog.cpp
rename to kmail/identity/identityaddvcarddialog.cpp
diff --git a/kmail/identityaddvcarddialog.h b/kmail/identity/identityaddvca=
rddialog.h
similarity index 100%
rename from kmail/identityaddvcarddialog.h
rename to kmail/identity/identityaddvcarddialog.h
diff --git a/kmail/identitydialog.cpp b/kmail/identity/identitydialog.cpp
similarity index 100%
rename from kmail/identitydialog.cpp
rename to kmail/identity/identitydialog.cpp
diff --git a/kmail/identitydialog.h b/kmail/identity/identitydialog.h
similarity index 100%
rename from kmail/identitydialog.h
rename to kmail/identity/identitydialog.h
diff --git a/kmail/identityeditvcarddialog.cpp b/kmail/identity/identityedi=
tvcarddialog.cpp
similarity index 100%
rename from kmail/identityeditvcarddialog.cpp
rename to kmail/identity/identityeditvcarddialog.cpp
diff --git a/kmail/identityeditvcarddialog.h b/kmail/identity/identityeditv=
carddialog.h
similarity index 100%
rename from kmail/identityeditvcarddialog.h
rename to kmail/identity/identityeditvcarddialog.h
diff --git a/kmail/identitylistview.cpp b/kmail/identity/identitylistview.c=
pp
similarity index 100%
rename from kmail/identitylistview.cpp
rename to kmail/identity/identitylistview.cpp
diff --git a/kmail/identitylistview.h b/kmail/identity/identitylistview.h
similarity index 100%
rename from kmail/identitylistview.h
rename to kmail/identity/identitylistview.h
diff --git a/kmail/identitypage.cpp b/kmail/identity/identitypage.cpp
similarity index 100%
rename from kmail/identitypage.cpp
rename to kmail/identity/identitypage.cpp
diff --git a/kmail/identitypage.h b/kmail/identity/identitypage.h
similarity index 100%
rename from kmail/identitypage.h
rename to kmail/identity/identitypage.h
diff --git a/kmail/newidentitydialog.cpp b/kmail/identity/newidentitydialog=
.cpp
similarity index 100%
rename from kmail/newidentitydialog.cpp
rename to kmail/identity/newidentitydialog.cpp
diff --git a/kmail/newidentitydialog.h b/kmail/identity/newidentitydialog.h
similarity index 100%
rename from kmail/newidentitydialog.h
rename to kmail/identity/newidentitydialog.h
diff --git a/kmail/kcm_kmail.cpp b/kmail/kcm_kmail.cpp
index 5513fac..a4ba460 100644
--- a/kmail/kcm_kmail.cpp
+++ b/kmail/kcm_kmail.cpp
@@ -23,7 +23,7 @@
 // This must be first
 #include "configuredialog/configuredialog.h"
 #include "configuredialog/configuredialog_p.h"
-#include "identitypage.h"
+#include "identity/identitypage.h"
 #include <kcmodule.h>
 #include <kcomponentdata.h>
 =

diff --git a/kmail/kcm_kpimidentities/CMakeLists.txt b/kmail/kcm_kpimidenti=
ties/CMakeLists.txt
index 261446a..35029de 100644
--- a/kmail/kcm_kpimidentities/CMakeLists.txt
+++ b/kmail/kcm_kpimidentities/CMakeLists.txt
@@ -1,16 +1,16 @@
 ### Identity KCM, eventually to be moved out of KMail ###
 =

-include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. )
+include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE=
_DIR}/../identity )
 add_definitions( -DKCM_KPIMIDENTITIES_STANDALONE )
 set(kcm_identities_srcs
   kcm_kpimidentities.cpp
   ../addressvalidationjob.cpp
-  ../identitypage.cpp
-  ../identitydialog.cpp
-  ../identitylistview.cpp
-  ../newidentitydialog.cpp
-  ../identityeditvcarddialog.cpp
-  ../identityaddvcarddialog.cpp
+  ../identity/identitypage.cpp
+  ../identity/identitydialog.cpp
+  ../identity/identitylistview.cpp
+  ../identity/newidentitydialog.cpp
+  ../identity/identityeditvcarddialog.cpp
+  ../identity/identityaddvcarddialog.cpp
 )
 if (NOT WINCE)
 set(kcm_identities_srcs
diff --git a/kmail/ui/identitypage.ui b/kmail/ui/identitypage.ui
index 84a50f2..1fb16f7 100644
--- a/kmail/ui/identitypage.ui
+++ b/kmail/ui/identitypage.ui
@@ -111,7 +111,7 @@
   <customwidget>
    <class>KMail::IdentityListView</class>
    <extends>QWidget</extends>
-   <header>identitylistview.h</header>
+   <header>identity/identitylistview.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
[prev in list] [next in list] [prev in thread] [next in thread]