[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=8a2eb47

The following commit has been merged in the master branch:
commit 8a2eb47da2b4f7578e80fdb875c429a8dc3ffdf9
Author: Dominik Cermak <d.cermak at arcor.de>
Date:   Tue Dec 20 20:13:17 2011 +0100

    Krazy: Fix header guards
---
 config/appearance-config.h  | 8 ++++----
 lib/channel-contact-model.h | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/config/appearance-config.h b/config/appearance-config.h
index e3da64c..876d0ed 100644
--- a/config/appearance-config.h
+++ b/config/appearance-config.h
@@ -17,8 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
+#ifndef APPEARANCE_CONFIG_H
+#define APPEARANCE_CONFIG_H
 
 #include "adium-theme-header-info.h"
 
@@ -60,7 +60,7 @@ private Q_SLOTS:
 private:
     Ui::ChatWindowConfig *ui;
     AdiumThemeHeaderInfo m_demoChatHeader;
-    
+
 };
 
-#endif // MAINWINDOW_H
+#endif // APPEARANCE_CONFIG_H
diff --git a/lib/channel-contact-model.h b/lib/channel-contact-model.h
index 91fe4ad..4ebdafe 100644
--- a/lib/channel-contact-model.h
+++ b/lib/channel-contact-model.h
@@ -17,8 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#ifndef CHANNELCONTACTLIST_H
-#define CHANNELCONTACTLIST_H
+#ifndef CHANNEL_CONTACT_MODEL_H
+#define CHANNEL_CONTACT_MODEL_H
 
 #include <QtCore/QAbstractListModel>
 
@@ -66,4 +66,4 @@ private:
     QList<Tp::ContactPtr> m_contacts;
 };
 
-#endif // CHANNELCONTACTLIST_H
+#endif // CHANNEL_CONTACT_MODEL_H

-- 
ktp-text-ui packaging