[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.5FE94A6085 () git ! kde ! org
[Download RAW message or body]

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

Move to own directory

M  +4    -4    kmail/CMakeLists.txt
M  +1    -1    kmail/kmkernel.cpp
M  +1    -1    kmail/kmmainwidget.cpp
R  +0    -0    kmail/searchdialog/kmsearchfilterproxymodel.cpp [from: kmail=
/kmsearchfilterproxymodel.cpp - 100% similarity]
R  +0    -0    kmail/searchdialog/kmsearchfilterproxymodel.h [from: kmail/k=
msearchfilterproxymodel.h - 100% similarity]
R  +0    -0    kmail/searchdialog/kmsearchmessagemodel.cpp [from: kmail/kms=
earchmessagemodel.cpp - 100% similarity]
R  +0    -0    kmail/searchdialog/kmsearchmessagemodel.h [from: kmail/kmsea=
rchmessagemodel.h - 100% similarity]
R  +0    -0    kmail/searchdialog/searchdescriptionattribute.cpp [from: kma=
il/searchdescriptionattribute.cpp - 100% similarity]
R  +0    -0    kmail/searchdialog/searchdescriptionattribute.h [from: kmail=
/searchdescriptionattribute.h - 100% similarity]
R  +0    -0    kmail/searchdialog/searchwindow.cpp [from: kmail/searchwindo=
w.cpp - 100% similarity]
R  +0    -0    kmail/searchdialog/searchwindow.h [from: kmail/searchwindow.=
h - 100% similarity]

http://commits.kde.org/kdepim/55579b9e0dd9eab421089ceb921b7b6171816d64

diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt
index 46963f5..0f00e2c 100644
--- a/kmail/CMakeLists.txt
+++ b/kmail/CMakeLists.txt
@@ -86,7 +86,7 @@ if (NOT WINCE AND KDEPIM_BUILD_DESKTOP)
      xfaceconfigurator.cpp
      undostack.cpp
      kmkernel.cpp
-     searchwindow.cpp
+     searchdialog/searchwindow.cpp
      kmcommands.cpp
      kmreadermainwin.cpp
      kmstartup.cpp
@@ -106,14 +106,14 @@ if (NOT WINCE AND KDEPIM_BUILD_DESKTOP)
      attachmentcontroller.cpp
      attachmentview.cpp
      archivefolderdialog.cpp
-     searchdescriptionattribute.cpp
+     searchdialog/searchdescriptionattribute.cpp
      tagactionmanager.cpp
      foldershortcutactionmanager.cpp
      addressvalidationjob.cpp
      identitypage.cpp
      newidentitydialog.cpp
-     kmsearchmessagemodel.cpp
-     kmsearchfilterproxymodel.cpp
+     searchdialog/kmsearchmessagemodel.cpp
+     searchdialog/kmsearchfilterproxymodel.cpp
      kmknotify.cpp
      tagselectdialog.cpp
      configuredialog/accountconfigorderdialog.cpp
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 5b61a80..0bb2d39 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -108,7 +108,7 @@ using KMail::MailServiceImpl;
 #include "util.h"
 #include "mailcommon/mailkernel.h"
 =

-#include "searchdescriptionattribute.h"
+#include "searchdialog/searchdescriptionattribute.h"
 =

 using namespace MailCommon;
 =

diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index eb50fd6..aae7755 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -22,7 +22,7 @@
 // KMail includes
 #include "kmreadermainwin.h"
 #include "composer.h"
-#include "searchwindow.h"
+#include "searchdialog/searchwindow.h"
 #include "antispamwizard.h"
 #include "statusbarlabel.h"
 #include "undostack.h"
diff --git a/kmail/kmsearchfilterproxymodel.cpp b/kmail/searchdialog/kmsear=
chfilterproxymodel.cpp
similarity index 100%
rename from kmail/kmsearchfilterproxymodel.cpp
rename to kmail/searchdialog/kmsearchfilterproxymodel.cpp
diff --git a/kmail/kmsearchfilterproxymodel.h b/kmail/searchdialog/kmsearch=
filterproxymodel.h
similarity index 100%
rename from kmail/kmsearchfilterproxymodel.h
rename to kmail/searchdialog/kmsearchfilterproxymodel.h
diff --git a/kmail/kmsearchmessagemodel.cpp b/kmail/searchdialog/kmsearchme=
ssagemodel.cpp
similarity index 100%
rename from kmail/kmsearchmessagemodel.cpp
rename to kmail/searchdialog/kmsearchmessagemodel.cpp
diff --git a/kmail/kmsearchmessagemodel.h b/kmail/searchdialog/kmsearchmess=
agemodel.h
similarity index 100%
rename from kmail/kmsearchmessagemodel.h
rename to kmail/searchdialog/kmsearchmessagemodel.h
diff --git a/kmail/searchdescriptionattribute.cpp b/kmail/searchdialog/sear=
chdescriptionattribute.cpp
similarity index 100%
rename from kmail/searchdescriptionattribute.cpp
rename to kmail/searchdialog/searchdescriptionattribute.cpp
diff --git a/kmail/searchdescriptionattribute.h b/kmail/searchdialog/search=
descriptionattribute.h
similarity index 100%
rename from kmail/searchdescriptionattribute.h
rename to kmail/searchdialog/searchdescriptionattribute.h
diff --git a/kmail/searchwindow.cpp b/kmail/searchdialog/searchwindow.cpp
similarity index 100%
rename from kmail/searchwindow.cpp
rename to kmail/searchdialog/searchwindow.cpp
diff --git a/kmail/searchwindow.h b/kmail/searchdialog/searchwindow.h
similarity index 100%
rename from kmail/searchwindow.h
rename to kmail/searchdialog/searchwindow.h

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