[SCM] ktp-send-file packaging branch, master, updated. debian/15.12.1-2-216-g8f07cdf

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-send-file.git;a=commitdiff;h=1c4492b

The following commit has been merged in the master branch:
commit 1c4492bddbac6d0938132a4580d38d75af233fb5
Author: Dominik Cermak <d.cermak at arcor.de>
Date:   Fri Dec 16 16:59:12 2011 +0100

    Fix krazy issues in send-file
    
    Fixed Copyright headers.
    Changed header guard to not have trailing or leading underscores.
    
    REVIEW: 103419
---
 flat-model-proxy.cpp | 2 +-
 flat-model-proxy.h   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/flat-model-proxy.cpp b/flat-model-proxy.cpp
index a3dc56d..b9a2a43 100644
--- a/flat-model-proxy.cpp
+++ b/flat-model-proxy.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of TelepathyQt4Yell Models
  *
- * Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/>
+ * Copyright (C) 2010 Collabora Ltd. <info at collabora.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/flat-model-proxy.h b/flat-model-proxy.h
index b592f48..f0a8903 100644
--- a/flat-model-proxy.h
+++ b/flat-model-proxy.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of TelepathyQt4Yell Models
  *
- * Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/>
+ * Copyright (C) 2010 Collabora Ltd. <info at collabora.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TelepathyQt4Yell_Models_flat_model_proxy_h_HEADER_GUARD_
-#define _TelepathyQt4Yell_Models_flat_model_proxy_h_HEADER_GUARD_
+#ifndef TelepathyQt4Yell_Models_flat_model_proxy_h_HEADER_GUARD
+#define TelepathyQt4Yell_Models_flat_model_proxy_h_HEADER_GUARD
 
 
 #include <QAbstractProxyModel>
@@ -61,4 +61,4 @@ private:
 
 
 
-#endif // _TelepathyQt4Yell_Models_flat_model_proxy_h_HEADER_GUARD_
+#endif // TelepathyQt4Yell_Models_flat_model_proxy_h_HEADER_GUARD

-- 
ktp-send-file packaging