Removed old strstream code and switch to sstream permanently.

Inspired by similar work on tdeadmin.

Signed-off-by: Michele Calgaro <[email protected]>

7 files changed, 3 insertions, 36 deletions

diff --git a/kgamma/ConfigureChecks.cmake b/kgamma/ConfigureChecks.cmake
index 14815e43..8cd1745b 100644
--- a/kgamma/ConfigureChecks.cmake
+++ b/kgamma/ConfigureChecks.cmake
@@ -15,8 +15,3 @@ pkg_search_module( XXF86VM xxf86vm )
 if( NOT XXF86VM_FOUND )
   tde_message_fatal( "xxf86vm is required, but was not found on your system" )
 endif( )
-
-tde_save( CMAKE_REQUIRED_INCLUDES )
-set( CMAKE_REQUIRED_INCLUDES ${TQT_INCLUDE_DIRS} )
-check_include_file_cxx( sstream HAVE_SSTREAM )
-tde_restore( CMAKE_REQUIRED_INCLUDES )
diff --git a/kgamma/configure.in.in b/kgamma/configure.in.in
index 0324904b..22c6a7f7 100644
--- a/kgamma/configure.in.in
+++ b/kgamma/configure.in.in
@@ -58,8 +58,3 @@ fi
 if eval "test \"`echo $ac_cv_lib_vm`\" = no"; then
     DO_NOT_COMPILE="$DO_NOT_COMPILE kgamma"
 fi
-
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-KDE_CHECK_HEADERS(sstream)
-AC_LANG_RESTORE
diff --git a/kgamma/kcmkgamma/CMakeLists.txt b/kgamma/kcmkgamma/CMakeLists.txt
index 2f75f1dd..ade17bf5 100644
--- a/kgamma/kcmkgamma/CMakeLists.txt
+++ b/kgamma/kcmkgamma/CMakeLists.txt
@@ -30,10 +30,6 @@ install( FILES kgamma.desktop DESTINATION ${APPS_INSTALL_DIR}/.hidden )
 
 #### kcmkgamma (module) #########################
 
-if( HAVE_SSTREAM )
-  set_source_files_properties( xvidextwrap.cpp PROPERTIES COMPILE_FLAGS "-DHAVE_SSTREAM" )
-endif( )
-
 tde_add_kpart( kcm_kgamma AUTOMOC
   SOURCES
     xf86configpath.cpp xvidextwrap.cpp
diff --git a/kgamma/kcmkgamma/xvidextwrap.cpp b/kgamma/kcmkgamma/xvidextwrap.cpp
index f7bf532b..9cbbf250 100644
--- a/kgamma/kcmkgamma/xvidextwrap.cpp
+++ b/kgamma/kcmkgamma/xvidextwrap.cpp
@@ -28,15 +28,10 @@
 
 #include <vector>
 #include <string>
+#include <sstream>
 
 #include <config.h>
 
-#ifdef HAVE_SSTREAM
-#include <sstream>
-#else
-#include <strstream.h>
-#define istringstream istrstream
-#endif
 
 #include <kdebug.h>
 
diff --git a/kgamma/xf86gammacfg/CMakeLists.txt b/kgamma/xf86gammacfg/CMakeLists.txt
index 60dd67c5..420c9163 100644
--- a/kgamma/xf86gammacfg/CMakeLists.txt
+++ b/kgamma/xf86gammacfg/CMakeLists.txt
@@ -17,10 +17,6 @@ include_directories(
 
 #### xf86gammacfg (executable) ##################
 
-if( HAVE_SSTREAM )
-  set_source_files_properties( xf86gammacfg.cpp PROPERTIES COMPILE_FLAGS "-DHAVE_SSTREAM" )
-endif( )
-
 tde_add_executable( xf86gammacfg
   SOURCES xf86gammacfg.cpp
   DESTINATION ${BIN_INSTALL_DIR}
diff --git a/kgamma/xf86gammacfg/xf86gammacfg.cpp b/kgamma/xf86gammacfg/xf86gammacfg.cpp
index db98a8fb..640940e7 100644
--- a/kgamma/xf86gammacfg/xf86gammacfg.cpp
+++ b/kgamma/xf86gammacfg/xf86gammacfg.cpp
@@ -23,15 +23,10 @@
 #include <fstream>
 #include <string>
 #include <vector>
+#include <sstream>
 
 #include <config.h>
 
-#ifdef HAVE_SSTREAM
-#include <sstream>
-#else
-#include <strstream.h>
-#define istringstream istrstream
-#endif
 
 using namespace std;
 
diff --git a/ksvg/impl/libs/libtext2path/src/Tools.h b/ksvg/impl/libs/libtext2path/src/Tools.h
index c7753365..6bf33bf7 100644
--- a/ksvg/impl/libs/libtext2path/src/Tools.h
+++ b/ksvg/impl/libs/libtext2path/src/Tools.h
@@ -24,12 +24,7 @@
 #include <list>
 #include <string>
 #include <config.h>
-#ifdef HAVE_SSTREAM
-#  include <sstream>
-#else
-#  include <strstream>
-#  define ostringstream ostrstream
-#endif
+#include <sstream>
 
 #define T2PMAX(a, b) ((b) < (a) ? (a) : (b))
 #define T2PMIN(a, b) ((a) < (b) ? (a) : (b))