[settings/konq] Clean up

Remove obsolete README

Remove obsolete, uninstalled .desktop files

Simplify KPluginFactory macro

Remove unneede usage of X-KDE-PluginKeyword

settings/konq/CMakeLists.txt

 add_definitions(-DTRANSLATION_DOMAIN=\"kcmkonq\")
 set(kcm_konq_PART_SRCS
    behaviour.cpp
-   konqkcmfactory.cpp
 )
 
 add_library(kcm_konq MODULE ${kcm_konq_PART_SRCS})
@@ -15,7 +14,6 @@ install(TARGETS kcm_konq  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
 ########### install files ###############
 install( FILES
    filebehavior.desktop
-   #fileappearance.desktop
    DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
 install( FILES overlapping.png onlyone.png  DESTINATION  ${KDE_INSTALL_DATADIR}/kcontrol/pics )
 

settings/konq/README

-This module contains a combination of configuration items which at first
-sight seem to be a rather weird combination.
-
-It contains configuration for:
-* KDesktop
-* Konqueror 
-* Number of virtual desktops. (Handled by KWin via NETWM)
-* Behaviour of desktop borders (Handled by KWin)
-
-The reason for this combination is that the configuration of KDesktop and 
-Konqueror is very similar codewise. On the other hand, the number of virtual
-desktops, border behaviour and the other KDesktop options belongs together 
-from a user interface point of view. The result is that all these options 
-are now grouped together here.
-
-In total it provide 3 configuration modules:
-* desktop.desktop (Desktop configuration)
-* kcmkonq.desktop (File browser configuration)
-* virtualdesktops.desktop (Configuration of virtual desktops)

settings/konq/behaviour.cpp

@@ -32,13 +32,13 @@
 // KDE
 #include <KLocalizedString>
 
+#include <KPluginFactory>
 #include <kurlrequester.h>
 #include <kconfiggroup.h>
 #include <QStandardPaths>
 #include <KSharedConfig>
 
-// Local
-#include "konqkcmfactory.h"
+K_PLUGIN_FACTORY(KBehaviourOptionsFactory, registerPlugin<KBehaviourOptions>();)
 
 KBehaviourOptions::KBehaviourOptions(QWidget *parent, const QVariantList &)
     : KCModule(parent)
@@ -142,3 +142,4 @@ void KBehaviourOptions::updateWinPixmap(bool b)
     }
 }
 
+#include "behaviour.moc"

settings/konq/filebehavior.desktop

@@ -5,7 +5,6 @@ X-DocPath=kcontrol5/filemanager/index.html
 Icon=system-file-manager
 
 X-KDE-Library=kcm_konq
-X-KDE-PluginKeyword=behavior
 
 Name=Behavior
 Name[af]=Gedrag

settings/konq/konqkcmfactory.cpp

-/*  This file is part of the KDE project
-    Copyright (C) 2006-2007 Matthias Kretz <kretz@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 version 2 as published by the Free Software Foundation.
-
-    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.
-
-*/
-
-#include "konqkcmfactory.h"
-#include "behaviour.h"
-
-
-K_PLUGIN_FACTORY_DEFINITION(KonqKcmFactory,
-                            registerPlugin<KBehaviourOptions>("behavior");
-                            //registerPlugin<DesktopBehaviorModule>("dbehavior");
-                            //registerPlugin<KonqFontOptions>("appearance");
-                            //registerPlugin<KonqFontOptionsDesktop>("dappearance");
-                           )
-#include "moc_konqkcmfactory.cpp"

settings/konq/konqkcmfactory.h

-/*  This file is part of the KDE project
-    Copyright (C) 2006-2007 Matthias Kretz <kretz@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 version 2 as published by the Free Software Foundation.
-
-    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 KONQKCMFACTORY_H
-#define KONQKCMFACTORY_H
-
-#include <KPluginFactory>
-
-K_PLUGIN_FACTORY_DECLARATION(KonqKcmFactory)
-
-#endif // KONQKCMFACTORY_H