From ed99a30644c19b0a3cf0d2147243532df4daa16b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:57:54 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 tdeabc/plugins/net/resourcenetconfig.h | 53 ++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 tdeabc/plugins/net/resourcenetconfig.h

(limited to 'tdeabc/plugins/net/resourcenetconfig.h')

diff --git a/tdeabc/plugins/net/resourcenetconfig.h b/tdeabc/plugins/net/resourcenetconfig.h
new file mode 100644
index 000000000..3c8986122
--- /dev/null
+++ b/tdeabc/plugins/net/resourcenetconfig.h
@@ -0,0 +1,53 @@
+/*
+    This file is part of libkabc.
+    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#ifndef RESOURCENETCONFIG_H
+#define RESOURCENETCONFIG_H
+
+#include <kcombobox.h>
+#include <kurlrequester.h>
+
+#include <tderesources/configwidget.h>
+
+namespace KABC {
+
+class KABC_EXPORT ResourceNetConfig : public KRES::ConfigWidget
+{ 
+  Q_OBJECT
+
+  public:
+    ResourceNetConfig( TQWidget* parent = 0, const char* name = 0 );
+
+    void setEditMode( bool value );
+
+  public slots:
+    void loadSettings( KRES::Resource *resource );
+    void saveSettings( KRES::Resource *resource );
+
+  private:
+    KComboBox* mFormatBox;
+    KURLRequester* mUrlEdit;
+
+    TQStringList mFormatTypes;
+    bool mInEditMode;
+};
+
+}
+#endif
-- 
cgit v1.2.1


From 45f3927b0ffec2599bc0e1ce361c5386474a85f4 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 20 Feb 2013 16:26:45 -0600
Subject: Rename KABC namespace

---
 tdeabc/plugins/net/resourcenetconfig.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tdeabc/plugins/net/resourcenetconfig.h')

diff --git a/tdeabc/plugins/net/resourcenetconfig.h b/tdeabc/plugins/net/resourcenetconfig.h
index 3c8986122..f2ba37800 100644
--- a/tdeabc/plugins/net/resourcenetconfig.h
+++ b/tdeabc/plugins/net/resourcenetconfig.h
@@ -26,7 +26,7 @@
 
 #include <tderesources/configwidget.h>
 
-namespace KABC {
+namespace TDEABC {
 
 class KABC_EXPORT ResourceNetConfig : public KRES::ConfigWidget
 { 
-- 
cgit v1.2.1