[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=8aee997

The following commit has been merged in the master branch:
commit 8aee99702be675079cfdbcb7c941112179f3c4db
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Mar 12 03:25:54 2011 +0000

    Renamed filterbar.cpp to filter-bar.cpp with appropriate changes
---
 CMakeLists.txt                  | 2 +-
 filterbar.cpp => filter-bar.cpp | 4 ++--
 filterbar.h => filter-bar.h     | 0
 main-widget.ui                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6bbb090..0164cb5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ set (contactlist_SRCS
      contact-model-item.cpp
      tree-node.cpp
      accounts-model-item.cpp
-     filterbar.cpp
+     filter-bar.cpp
      main.cpp
      main-widget.cpp
 )
diff --git a/filterbar.cpp b/filter-bar.cpp
similarity index 98%
rename from filterbar.cpp
rename to filter-bar.cpp
index 3f4b7c2..13102f5 100644
--- a/filterbar.cpp
+++ b/filter-bar.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
-#include "filterbar.h"
+#include "filter-bar.h"
 
 #include <QBoxLayout>
 #include <QKeyEvent>
@@ -93,4 +93,4 @@ void FilterBar::keyReleaseEvent(QKeyEvent* event)
     }
 }
 
-#include "filterbar.moc"
+#include "filter-bar.moc"
diff --git a/filterbar.h b/filter-bar.h
similarity index 100%
rename from filterbar.h
rename to filter-bar.h
diff --git a/main-widget.ui b/main-widget.ui
index 9fcad66..de1dc96 100644
--- a/main-widget.ui
+++ b/main-widget.ui
@@ -84,7 +84,7 @@
   <customwidget>
    <class>FilterBar</class>
    <extends>QWidget</extends>
-   <header>filterbar.h</header>
+   <header>filter-bar.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

-- 
ktp-contact-list packaging