From f72c3f47af428432c81869a364b7b3ed7d00dd49 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Fri, 12 Jun 2020 18:33:24 +0900
Subject: KNetworkconf: remove unnecessary interface.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 841be226d1acbb1ed00a0e280b9994a187b93e57)
---
 knetworkconf/knetworkconf/CMakeLists.txt      |  2 +-
 knetworkconf/knetworkconf/knetworkconf.cpp    |  1 +
 knetworkconf/knetworkconf/knetworkconf.h      |  5 ++--
 knetworkconf/knetworkconf/knetworkconfiface.h | 34 ---------------------------
 4 files changed, 4 insertions(+), 38 deletions(-)
 delete mode 100644 knetworkconf/knetworkconf/knetworkconfiface.h

diff --git a/knetworkconf/knetworkconf/CMakeLists.txt b/knetworkconf/knetworkconf/CMakeLists.txt
index f32a460..a87ef3d 100644
--- a/knetworkconf/knetworkconf/CMakeLists.txt
+++ b/knetworkconf/knetworkconf/CMakeLists.txt
@@ -25,7 +25,7 @@ tde_add_kpart( kcm_knetworkconfmodule AUTOMOC
     kroutinginfo.cpp kreloadnetworkdlg.ui kaddressvalidator.cpp kdnsinfo.cpp
     knetworkinfo.cpp kadddevicedlg.ui kadddnsserverdlg.ui
     knetworkconfigparser.cpp knetworkinterface.cpp knetworkconfdlg.ui
-    knetworkconf.cpp main.cpp kadddevicedlgextension.ui knetworkconfiface.skel
+    knetworkconf.cpp main.cpp kadddevicedlgextension.ui
     kwirelessinterface.cpp kadddevicewifiext.ui kadddevicecontainer.cpp
     kprofileslistviewtooltip.cpp
   LINK tdeui-shared
diff --git a/knetworkconf/knetworkconf/knetworkconf.cpp b/knetworkconf/knetworkconf/knetworkconf.cpp
index 9459cb1..36d4a46 100644
--- a/knetworkconf/knetworkconf/knetworkconf.cpp
+++ b/knetworkconf/knetworkconf/knetworkconf.cpp
@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include <kiconloader.h>
+#include <dcopclient.h>
 
 #include "knetworkconf.h"
 
diff --git a/knetworkconf/knetworkconf/knetworkconf.h b/knetworkconf/knetworkconf/knetworkconf.h
index 9daa2e5..990bef1 100644
--- a/knetworkconf/knetworkconf/knetworkconf.h
+++ b/knetworkconf/knetworkconf/knetworkconf.h
@@ -55,7 +55,7 @@
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 
-#include <dcopclient.h>
+#include <dcopobject.h>
 
 #include "knetworkconfdlg.h"
 #include "kadddnsserverdlg.h"
@@ -70,11 +70,10 @@
 #include "kknownhostinfo.h"
 #include "knetworkinterface.h"
 #include "kadddevicedlgextension.h"
-#include "knetworkconfiface.h"
 #include "kprofileslistviewtooltip.h"
 
 /** KNetworkConf is the base class of the project */
-class KNetworkConf : public KNetworkConfDlg, virtual public KNetworkConfIface
+class KNetworkConf : public KNetworkConfDlg, public DCOPObject
 {
   Q_OBJECT
   
diff --git a/knetworkconf/knetworkconf/knetworkconfiface.h b/knetworkconf/knetworkconf/knetworkconfiface.h
deleted file mode 100644
index 36dfb14..0000000
--- a/knetworkconf/knetworkconf/knetworkconfiface.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- c++ -*-
- *
- * knetworkconfiface.h
- *
- * Copyright (C) 2004 Juan Luis Baptiste <juan.baptiste@kdemail.net>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- */
-
-#ifndef knetworkconf_iface_h
-#define knetworkconf_iface_h
-
-#include <dcopobject.h>
-
-class KNetworkConfIface: virtual public DCOPObject
-{
-    K_DCOP
-    k_dcop:
-};
-
-#endif
-- 
cgit v1.2.1