Change default backend from Nettools to Sys.

Some indentation cosmetic.

Signed-off-by: gregory guy <gregory-tde@laposte.net>

5 files changed, 16 insertions, 22 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1bfc7f..c8fdd9d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,16 +41,16 @@ tde_setup_paths( )
 
 ##### optional stuff
 
-option( WITH_ALL_OPTIONS "Enable all optional support" OFF                                          )
+option( WITH_ALL_OPTIONS    "Enable all optional support" OFF )
 option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
-option( WITH_LIBIW "Enable build with libiw" ${WITH_ALL_OPTIONS} )
+option( WITH_LIBIW          "Enable build with libiw"                           ${WITH_ALL_OPTIONS} )
 
 
 ##### user requested modules
 
-option( BUILD_ALL "Build all" ON                             )
-option( BUILD_DOC "Build documentation" ${BUILD_ALL}         )
-option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )
+option( BUILD_ALL          "Build all" ON )
+option( BUILD_DOC          "Build documentation" ${BUILD_ALL} )
+option( BUILD_TRANSLATIONS "Build translations"  ${BUILD_ALL} )
 
 
 ##### configure checks
diff --git a/src/kcm/configdialog.cpp b/src/kcm/configdialog.cpp
index 3118ce6..589c65e 100644
--- a/src/kcm/configdialog.cpp
+++ b/src/kcm/configdialog.cpp
@@ -269,7 +269,7 @@ void ConfigDialog::load()
 
     // select the backend from the config file
     bool foundBackend = false;
-    TQString backend = config->readEntry( "Backend", "Nettools" );
+    TQString backend = config->readEntry( "Backend", "Sys" );
     int i;
     for ( i = 0; KCMRegistry[i].name != TQString(); i++ )
     {
@@ -282,7 +282,7 @@ void ConfigDialog::load()
 
     if ( !foundBackend )
     {
-        i = 0; // use the first backend (Nettools)
+        i = 0; // use the first backend (Sys)
     }
     mDlg->comboBoxBackends->setCurrentItem( i );
     mDlg->textLabelBackendDescription->setText( KCMRegistry[i].description );
diff --git a/src/knemod/backends/daemonregistry.h b/src/knemod/backends/daemonregistry.h
index 1c0674b..26af5ae 100644
--- a/src/knemod/backends/daemonregistry.h
+++ b/src/knemod/backends/daemonregistry.h
@@ -46,8 +46,8 @@ struct DaemonRegistryEntry
 
 DaemonRegistryEntry DaemonRegistry[] =
 {
-    { "Nettools", NetToolsBackend::createInstance },
     { "Sys", SysBackend::createInstance },
+    { "Nettools", NetToolsBackend::createInstance },
     { TQString(), 0 }
 };
 
diff --git a/src/knemod/backends/kcmregistry.h b/src/knemod/backends/kcmregistry.h
index 0dde2e8..28ffec4 100644
--- a/src/knemod/backends/kcmregistry.h
+++ b/src/knemod/backends/kcmregistry.h
@@ -42,19 +42,13 @@ struct KCMRegistryEntry
 
 KCMRegistryEntry KCMRegistry[] =
 {
-    { "Nettools",
-      i18n( "Uses the tools from the nettool packge like ifconfig, "    \
-            "iwconfig and route to read the necessary information "     \
-            "from the ouput of these commands.\n"                       \
-            "This backend works rather stable but causes a relativly "  \
-            "high CPU load." ) },
     { "Sys",
       i18n( "Uses the sys filesystem available in 2.6 kernels and "     \
-            "direct system calls to the Linux kernel.\n"                \
-            "This backend is rather new, so expect minor problems. "    \
-            "As an advantage this backend should reduce the CPU load "  \
-            "and should not access the harddisc while gathering "       \
-            "information." ) },
+            "direct system calls to the Linux kernel." ) },
+    { "Nettools",
+      i18n( "Uses the tools from the net-tools package like ifconfig, " \
+            "iwconfig and route to read the necessary information "     \
+            "from the ouput of these commands.") },
     { TQString(), TQString() }
 };
 
diff --git a/src/knemod/knemodaemon.cpp b/src/knemod/knemodaemon.cpp
index 4666476..0ad399e 100644
--- a/src/knemod/knemodaemon.cpp
+++ b/src/knemod/knemodaemon.cpp
@@ -58,7 +58,7 @@ KNemoDaemon::KNemoDaemon( const TQCString& name )
     // select the backend from the config file
     TDEConfig* config = new TDEConfig( "knemorc", true );
     config->setGroup( "General" );
-    mBackendName = config->readEntry( "Backend", "Nettools" );
+    mBackendName = config->readEntry( "Backend", "Sys" );
     delete config;
 
     bool foundBackend = false;
@@ -74,7 +74,7 @@ KNemoDaemon::KNemoDaemon( const TQCString& name )
 
     if ( !foundBackend )
     {
-        i = 0; // use the first backend (Nettools)
+        i = 0; // use the first backend (Sys)
     }
     mBackend = ( *DaemonRegistry[i].function )( mInterfaceDict );
 
@@ -195,7 +195,7 @@ void KNemoDaemon::reparseConfiguration()
     mPollTimer->changeInterval( mGeneralData.pollInterval * 1000 );
 
     // select the backend from the config file
-    TQString backend = config->readEntry( "Backend", "Nettools" );
+    TQString backend = config->readEntry( "Backend", "Sys" );
 
     if ( mBackendName != backend )
     {