[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/konqueror/settings/filetypes
From:       Matthias Kretz <kretz () kde ! org>
Date:       2006-07-21 8:02:25
Message-ID: 1153468945.498597.19836.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 564753 by mkretz:

KGenericFactory and KCModule servicetype


 M  +3 -3      CMakeLists.txt  
 M  +3 -5      filetypes.desktop  
 M  +6 -2      filetypesview.cpp  
 M  +1 -1      filetypesview.h  


--- trunk/KDE/kdebase/konqueror/settings/filetypes/CMakeLists.txt #564752:564753
@@ -3,9 +3,9 @@
 
 ########### next target ###############
 
-set(libfiletypes_SRCS filetypesview.cpp filetypedetails.cpp filegroupdetails.cpp \
kservicelistwidget.cpp typeslistitem.cpp newtypedlg.cpp kserviceselectdlg.cpp ) \
+set(libfiletypes_SRCS filetypedetails.cpp filegroupdetails.cpp \
kservicelistwidget.cpp typeslistitem.cpp newtypedlg.cpp kserviceselectdlg.cpp )  
-set(kcm_filetypes_PART_SRCS control.cpp ${libfiletypes_SRCS})
+set(kcm_filetypes_PART_SRCS filetypesview.cpp ${libfiletypes_SRCS})
 
 kde4_automoc(${kcm_filetypes_PART_SRCS})
 
@@ -36,7 +36,7 @@
 
 ########### install files ###############
 
-install( FILES filetypes.desktop  DESTINATION  ${XDG_APPS_DIR} )
+install( FILES filetypes.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
 
 
 
--- trunk/KDE/kdebase/konqueror/settings/filetypes/filetypes.desktop #564752:564753
@@ -1,13 +1,12 @@
 [Desktop Entry]
 Encoding=UTF-8
 Icon=filetypes
-Type=Application
+Type=Service
+ServiceTypes=KCModule
 Exec=kcmshell filetypes
 DocPath=kcontrol/filetypes/index.html
-Categories=Qt;KDE;X-KDE-settings-components;
 
-
-X-KDE-Library=filetypes
+X-KDE-Library=kcm_filetypes
 X-KDE-ParentApp=kcontrol
 
 Name=File Associations
@@ -21,4 +20,3 @@
 Keywords=Filetypes,File Associations,Mime Types,File Patterns,Files,Pattern
 Keywords[fr]=types de fichiers,associations de fichiers,types MIME,motifs de \
fichier,fichiers,motif,extension,extensions de fichiers,applications  \
Keywords[x-test]=xxFiletypes,File Associations,Mime Types,File \
                Patterns,Files,Patternxx
-
--- trunk/KDE/kdebase/konqueror/settings/filetypes/filetypesview.cpp #564752:564753
@@ -19,6 +19,7 @@
 #include <klocale.h>
 #include <kservicetypeprofile.h>
 #include <kstandarddirs.h>
+#include <kgenericfactory.h>
 
 #include "newtypedlg.h"
 #include "filetypedetails.h"
@@ -26,8 +27,11 @@
 #include "filetypesview.h"
 #include <ksycoca.h>
 
-FileTypesView::FileTypesView(KInstance *inst, QWidget *parent)
-  : KCModule(inst, parent)
+typedef KGenericFactory<FileTypesView> FileTypesViewFactory;
+K_EXPORT_COMPONENT_FACTORY(filetypes, FileTypesViewFactory("filetypes"))
+
+FileTypesView::FileTypesView(QWidget *parent, const QStringList &)
+  : KCModule(FileTypesViewFactory::instance(), parent)
 {
   m_konqConfig = KSharedConfig::openConfig("konquerorrc", false, false);
 
--- trunk/KDE/kdebase/konqueror/settings/filetypes/filetypesview.h #564752:564753
@@ -28,7 +28,7 @@
 {
   Q_OBJECT
 public:
-  FileTypesView(KInstance *inst, QWidget *parent);
+  FileTypesView(QWidget *parent, const QStringList &args);
   ~FileTypesView();
 
   void load();


[prev in list] [next in list] [prev in thread] [next in thread]