[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=bd13514

The following commit has been merged in the master branch:
commit bd135149f50720b1ff33d5b7155a806b5d59f84e
Author: Francesco Nwokeka <francesco.nwokeka at gmail.com>
Date:   Thu Jun 23 20:06:11 2011 +0200

    Moved dialogs to dialogs folder
    
    keep files tidy
---
 CMakeLists.txt                                                 | 9 ++++-----
 add-contact-dialog.cpp => dialogs/add-contact-dialog.cpp       | 0
 add-contact-dialog.h => dialogs/add-contact-dialog.h           | 0
 add-contact-dialog.ui => dialogs/add-contact-dialog.ui         | 0
 remove-contact-dialog.cpp => dialogs/remove-contact-dialog.cpp | 0
 remove-contact-dialog.h => dialogs/remove-contact-dialog.h     | 0
 remove-contact-dialog.ui => dialogs/remove-contact-dialog.ui   | 0
 main-widget.cpp                                                | 5 +++--
 8 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b78e36..9586fa7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,20 +35,19 @@ set (contactlist_SRCS
      filter-bar.cpp
      main.cpp
      main-widget.cpp
-     add-contact-dialog.cpp
-     remove-contact-dialog.cpp
      fetch-avatar-job.cpp
-
      groups-model-item.cpp
      groups-model.cpp
      proxy-tree-node.cpp
+     dialogs/add-contact-dialog.cpp
+     dialogs/remove-contact-dialog.cpp
 )
 
 
 kde4_add_ui_files (contactlist_SRCS
                    main-widget.ui
-                   add-contact-dialog.ui
-                   remove-contact-dialog.ui
+                   dialogs/add-contact-dialog.ui
+                   dialogs/remove-contact-dialog.ui
 )
 
 add_subdirectory (icons)
diff --git a/add-contact-dialog.cpp b/dialogs/add-contact-dialog.cpp
similarity index 100%
rename from add-contact-dialog.cpp
rename to dialogs/add-contact-dialog.cpp
diff --git a/add-contact-dialog.h b/dialogs/add-contact-dialog.h
similarity index 100%
rename from add-contact-dialog.h
rename to dialogs/add-contact-dialog.h
diff --git a/add-contact-dialog.ui b/dialogs/add-contact-dialog.ui
similarity index 100%
rename from add-contact-dialog.ui
rename to dialogs/add-contact-dialog.ui
diff --git a/remove-contact-dialog.cpp b/dialogs/remove-contact-dialog.cpp
similarity index 100%
rename from remove-contact-dialog.cpp
rename to dialogs/remove-contact-dialog.cpp
diff --git a/remove-contact-dialog.h b/dialogs/remove-contact-dialog.h
similarity index 100%
rename from remove-contact-dialog.h
rename to dialogs/remove-contact-dialog.h
diff --git a/remove-contact-dialog.ui b/dialogs/remove-contact-dialog.ui
similarity index 100%
rename from remove-contact-dialog.ui
rename to dialogs/remove-contact-dialog.ui
diff --git a/main-widget.cpp b/main-widget.cpp
index a4aff5d..94b9d05 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -60,8 +60,8 @@
 #include "contact-delegate.h"
 #include "contact-delegate-compact.h"
 #include "contact-model-item.h"
-#include "add-contact-dialog.h"
-#include "remove-contact-dialog.h"
+#include "dialogs/add-contact-dialog.h"
+#include "dialogs/remove-contact-dialog.h"
 #include "fetch-avatar-job.h"
 #include "groups-model.h"
 #include "groups-model-item.h"
@@ -181,6 +181,7 @@ MainWidget::MainWidget(QWidget *parent)
     }
 
     settingsButtonMenu->addMenu(setDelegateTypeMenu);
+
     settingsButtonMenu->addSeparator();
     settingsButtonMenu->addMenu(helpMenu());
 

-- 
ktp-contact-list packaging