[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=2f57987

The following commit has been merged in the master branch:
commit 2f57987bfe279a480102918754dda98d90ede432
Author: Florian Reinhard <florian.reinhard at googlemail.com>
Date:   Fri Mar 11 13:00:13 2011 +0100

    Rename files according to naming scheme.
---
 CMakeLists.txt                                              | 12 ++++++------
 accountbutton.cpp => account-button.cpp                     |  2 +-
 accountbutton.h => account-button.h                         |  0
 accountfiltermodel.cpp => account-filter-model.cpp          |  2 +-
 accountfiltermodel.h => account-filter-model.h              |  0
 contactdelegateoverlay.cpp => contact-delegate-overlay.cpp  |  6 +++---
 contactdelegateoverlay.h => contact-delegate-overlay.h      |  0
 contactdelegate.cpp => contact-delegate.cpp                 |  2 +-
 contactdelegate.h => contact-delegate.h                     |  2 +-
 contactoverlays.cpp => contact-overlays.cpp                 |  2 +-
 contactoverlays.h => contact-overlays.h                     |  4 ++--
 contactviewhoverbutton.cpp => contact-view-hover-button.cpp |  2 +-
 contactviewhoverbutton.h => contact-view-hover-button.h     |  0
 main-widget.cpp                                             |  8 ++++----
 14 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d8ab75..f2c4994 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,13 +24,13 @@ include_directories (${KDE4_INCLUDES}
 )
 
 set (contactlist_SRCS
-     contactviewhoverbutton.cpp
-     contactoverlays.cpp
-     contactdelegateoverlay.cpp
-     contactdelegate.cpp
-     accountbutton.cpp
+     contact-view-hover-button.cpp
+     contact-overlays.cpp
+     contact-delegate-overlay.cpp
+     contact-delegate.cpp
+     account-button.cpp
      accounts-model.cpp
-     accountfiltermodel.cpp
+     account-filter-model.cpp
      contact-model-item.cpp
      tree-node.cpp
      accounts-model-item.cpp
diff --git a/accountbutton.cpp b/account-button.cpp
similarity index 99%
rename from accountbutton.cpp
rename to account-button.cpp
index 1938f39..eea2c4e 100644
--- a/accountbutton.cpp
+++ b/account-button.cpp
@@ -29,7 +29,7 @@
 
 #include <TelepathyQt4/PendingOperation>
 
-#include "accountbutton.h"
+#include "account-button.h"
 
 static Tp::ConnectionPresenceType accountPresenceTypes[] = { Tp::ConnectionPresenceTypeAvailable,
     Tp::ConnectionPresenceTypeAway,
diff --git a/accountbutton.h b/account-button.h
similarity index 100%
rename from accountbutton.h
rename to account-button.h
diff --git a/accountfiltermodel.cpp b/account-filter-model.cpp
similarity index 98%
rename from accountfiltermodel.cpp
rename to account-filter-model.cpp
index 71e8433..e716248 100644
--- a/accountfiltermodel.cpp
+++ b/account-filter-model.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "accountfiltermodel.h"
+#include "account-filter-model.h"
 #include "accounts-model.h"
 
 AccountFilterModel::AccountFilterModel(QObject *parent)
diff --git a/accountfiltermodel.h b/account-filter-model.h
similarity index 100%
rename from accountfiltermodel.h
rename to account-filter-model.h
diff --git a/contactdelegateoverlay.cpp b/contact-delegate-overlay.cpp
similarity index 98%
rename from contactdelegateoverlay.cpp
rename to contact-delegate-overlay.cpp
index bf1fd56..ef7ea08 100644
--- a/contactdelegateoverlay.cpp
+++ b/contact-delegate-overlay.cpp
@@ -25,8 +25,8 @@
 
 #include <KDebug>
 
-#include "contactdelegateoverlay.h"
-#include "contactviewhoverbutton.h"
+#include "contact-delegate-overlay.h"
+#include "contact-view-hover-button.h"
 
 ContactDelegateOverlay::ContactDelegateOverlay(QObject* parent)
     : QObject(parent), m_view(0), m_delegate(0)
@@ -385,4 +385,4 @@ void ContactDelegateOverlayContainer::drawDelegates(QPainter* p, const QStyleOpt
     }
 }
 
-#include "contactdelegateoverlay.moc"
\ No newline at end of file
+#include "contact-delegate-overlay.moc"
\ No newline at end of file
diff --git a/contactdelegateoverlay.h b/contact-delegate-overlay.h
similarity index 100%
rename from contactdelegateoverlay.h
rename to contact-delegate-overlay.h
diff --git a/contactdelegate.cpp b/contact-delegate.cpp
similarity index 99%
rename from contactdelegate.cpp
rename to contact-delegate.cpp
index 6c470ac..ce1b4ad 100644
--- a/contactdelegate.cpp
+++ b/contact-delegate.cpp
@@ -1,4 +1,4 @@
-#include "contactdelegate.h"
+#include "contact-delegate.h"
 
 #include <QtGui/QPainter>
 #include <QApplication>
diff --git a/contactdelegate.h b/contact-delegate.h
similarity index 96%
rename from contactdelegate.h
rename to contact-delegate.h
index 34ec76d..20daa62 100644
--- a/contactdelegate.h
+++ b/contact-delegate.h
@@ -3,7 +3,7 @@
 
 #include <QStyledItemDelegate>
 
-#include "contactdelegateoverlay.h"
+#include "contact-delegate-overlay.h"
 
 class ContactDelegate : public QStyledItemDelegate, public ContactDelegateOverlayContainer
 {
diff --git a/contactoverlays.cpp b/contact-overlays.cpp
similarity index 99%
rename from contactoverlays.cpp
rename to contact-overlays.cpp
index 9c106db..a826667 100644
--- a/contactoverlays.cpp
+++ b/contact-overlays.cpp
@@ -19,7 +19,7 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "contactoverlays.moc"
+#include "contact-overlays.moc"
 
 #include <KLocale>
 #include <KIconLoader>
diff --git a/contactoverlays.h b/contact-overlays.h
similarity index 97%
rename from contactoverlays.h
rename to contact-overlays.h
index 51d12a9..c858b73 100644
--- a/contactoverlays.h
+++ b/contact-overlays.h
@@ -24,8 +24,8 @@
 
 #include <KGuiItem>
 
-#include "contactdelegateoverlay.h"
-#include "contactviewhoverbutton.h"
+#include "contact-delegate-overlay.h"
+#include "contact-view-hover-button.h"
 
 class TextChannelContactOverlay : public HoverButtonDelegateOverlay
 {
diff --git a/contactviewhoverbutton.cpp b/contact-view-hover-button.cpp
similarity index 99%
rename from contactviewhoverbutton.cpp
rename to contact-view-hover-button.cpp
index f06626b..a0857bd 100644
--- a/contactviewhoverbutton.cpp
+++ b/contact-view-hover-button.cpp
@@ -20,7 +20,7 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "contactviewhoverbutton.moc"
+#include "contact-view-hover-button.moc"
 
 // Qt includes
 
diff --git a/contactviewhoverbutton.h b/contact-view-hover-button.h
similarity index 100%
rename from contactviewhoverbutton.h
rename to contact-view-hover-button.h
diff --git a/main-widget.cpp b/main-widget.cpp
index bb86281..65c0885 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -39,11 +39,11 @@
 
 #include "main-widget.h"
 #include "ui_main-widget.h"
-#include "accountbutton.h"
-#include "contactoverlays.h"
+#include "account-button.h"
+#include "contact-overlays.h"
 #include "accounts-model.h"
-#include "accountfiltermodel.h"
-#include "contactdelegate.h"
+#include "account-filter-model.h"
+#include "contact-delegate.h"
 
 #define PREFERRED_TEXTCHAT_HANDLER "org.freedesktop.Telepathy.Client.KDEChatHandler"
 

-- 
ktp-contact-list packaging