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

List:       kde-commits
Subject:    playground/network/networkkio/ioslave
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2009-03-01 0:14:41
Message-ID: 1235866481.446914.6842.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 933467 by kossebau:

changed: move mimetype estimation into own class

 M  +1 -0      CMakeLists.txt  
 A             mimetypes.cpp   [License: LGPL]
 A             mimetypes.h   [License: LGPL]
 M  +7 -16     networkslave.cpp  


--- trunk/playground/network/networkkio/ioslave/CMakeLists.txt #933466:933467
@@ -8,6 +8,7 @@
   networkinitwatcher.cpp
   networkthread.cpp
   networkuri.cpp
+  mimetypes.cpp
   networkslave.cpp
   main.cpp
 )
--- trunk/playground/network/networkkio/ioslave/networkslave.cpp #933466:933467
@@ -25,6 +25,7 @@
 // ioslave
 #include "networkuri.h"
 #include "networkthread.h"
+#include "mimetypes.h"
 // network
 #include "network.h"
 #include "netdevice.h"
@@ -36,16 +37,6 @@
 
 #include <KDebug>
 
-static const char* const DeviceMimetype[] =
-{
-    "inode/vnd.kde.device.unknown",
-    "inode/vnd.kde.device.printer",
-    "inode/vnd.kde.device.server",
-    "inode/vnd.kde.device.router",
-    "inode/vnd.kde.device.workstation"
-};
-
-static const char NetworkMimetype[] = "inode/vnd.kde.network";
 // static const char NetworkIconName[] = "network-workgroup";
 
 
@@ -117,7 +108,7 @@
 
     if( type == NetworkUri::Domain )
     {
-        mimeType( NetworkMimetype );
+        mimeType( Mimetypes::NetworkMimetype );
         finished();
         successfulMimetyping = true;
     }
@@ -132,7 +123,7 @@
             {
                 if( type == NetworkUri::Device )
                 {
-                    mimeType( DeviceMimetype[device.type()] );
+                    mimeType( Mimetypes::DeviceMimetype[device.type()] );
                     finished();
                     successfulMimetyping = true;
                 }
@@ -149,7 +140,7 @@
                         {
                             const QString url = service.url();
                             redirection( url );
-                            //mimeType( service.mimetype() );
+                            //mimeType( Mimetypes::mimetypeForServiceType(service.type()) );
                             finished();
                             successfulMimetyping = true;
                             break;
@@ -318,7 +309,7 @@
 {
     entry->insert( KIO::UDSEntry::UDS_FILE_TYPE,    S_IFDIR );
 //     entry->insert( KIO::UDSEntry::UDS_ICON_NAME,    NetworkIconName );
-    entry->insert( KIO::UDSEntry::UDS_MIME_TYPE,    NetworkMimetype );
+    entry->insert( KIO::UDSEntry::UDS_MIME_TYPE,    Mimetypes::NetworkMimetype );
 
 }
 
@@ -328,7 +319,7 @@
     entry->insert( KIO::UDSEntry::UDS_DISPLAY_NAME, device.name() );
     entry->insert( KIO::UDSEntry::UDS_FILE_TYPE,    S_IFDIR );
 //     entry->insert( KIO::UDSEntry::UDS_ICON_NAME,    NetDevice::iconName(device.type()) );
-    entry->insert( KIO::UDSEntry::UDS_MIME_TYPE,    DeviceMimetype[device.type()] );
+    entry->insert( KIO::UDSEntry::UDS_MIME_TYPE,    Mimetypes::DeviceMimetype[device.type()] );
 
 }
 
@@ -338,7 +329,7 @@
     entry->insert( KIO::UDSEntry::UDS_DISPLAY_NAME, service.name() );
     entry->insert( KIO::UDSEntry::UDS_FILE_TYPE,    S_IFDIR );
 //     entry->insert( KIO::UDSEntry::UDS_ICON_NAME,    service.iconName() );
-    entry->insert( KIO::UDSEntry::UDS_MIME_TYPE,    service.mimetype() );
+    entry->insert( KIO::UDSEntry::UDS_MIME_TYPE,    Mimetypes::mimetypeForServiceType(service.type()) );
     if( !service.url().isEmpty() )
         entry->insert( KIO::UDSEntry::UDS_TARGET_URL, service.url() );
 }
[prev in list] [next in list] [prev in thread] [next in thread]