aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/FbCommandFactory.cc2
-rw-r--r--src/FbTk/Font.cc14
-rw-r--r--src/Remember.cc9
3 files changed, 8 insertions, 17 deletions
diff --git a/src/FbCommandFactory.cc b/src/FbCommandFactory.cc
index 8279edb..ec91a86 100644
--- a/src/FbCommandFactory.cc
+++ b/src/FbCommandFactory.cc
@@ -358,7 +358,7 @@ FbTk::Command *FbCommandFactory::stringToCommand(const std::string &command,
358 // 358 //
359 else if (command == "deiconify") { 359 else if (command == "deiconify") {
360 360
361 FbTk_istringstream iss(arguments); 361 FbTk_istringstream iss(arguments.c_str());
362 string mode; 362 string mode;
363 string d; 363 string d;
364 DeiconifyCmd::Destination dest; 364 DeiconifyCmd::Destination dest;
diff --git a/src/FbTk/Font.cc b/src/FbTk/Font.cc
index 3b17fda..05dae54 100644
--- a/src/FbTk/Font.cc
+++ b/src/FbTk/Font.cc
@@ -23,6 +23,7 @@
23 23
24 24
25#include "StringUtil.hh" 25#include "StringUtil.hh"
26#include "stringstream.hh"
26#include "Font.hh" 27#include "Font.hh"
27#include "FontImp.hh" 28#include "FontImp.hh"
28#include "I18n.hh" 29#include "I18n.hh"
@@ -69,15 +70,6 @@
69#include <typeinfo> 70#include <typeinfo>
70#include <langinfo.h> 71#include <langinfo.h>
71 72
72#ifdef HAVE_SSTREAM
73#include <sstream>
74#define FB_istringstream istringstream
75#elif HAVE_STRSTREAM
76#include <strstream>
77#define FB_istringstream istrstream
78#else
79#error "You dont have sstream or strstream headers!"
80#endif // HAVE_STRSTREAM
81 73
82#ifdef HAVE_CSTDLIB 74#ifdef HAVE_CSTDLIB
83 #include <cstdlib> 75 #include <cstdlib>
@@ -202,14 +194,14 @@ int extract_shadow_options(const std::string& opts,
202 } 194 }
203 else if ( (*token).find("offsetx=", 0) != std::string::npos ) { 195 else if ( (*token).find("offsetx=", 0) != std::string::npos ) {
204 size_t s= (*token).find_first_of('='); 196 size_t s= (*token).find_first_of('=');
205 FB_istringstream o((*token).substr(s + 1, (*token).length())); 197 FbTk_istringstream o((*token).substr(s + 1, (*token).length()).c_str());
206 if ( !o.eof() ) { 198 if ( !o.eof() ) {
207 o >> offx; 199 o >> offx;
208 } 200 }
209 } 201 }
210 else if ( (*token).find("offsety=", 0) != std::string::npos ) { 202 else if ( (*token).find("offsety=", 0) != std::string::npos ) {
211 size_t s= (*token).find_first_of('='); 203 size_t s= (*token).find_first_of('=');
212 FB_istringstream o((*token).substr(s + 1, (*token).length())); 204 FbTk_istringstream o((*token).substr(s + 1, (*token).length()).c_str());
213 if ( !o.eof() ) { 205 if ( !o.eof() ) {
214 o >> offy; 206 o >> offy;
215 } 207 }
diff --git a/src/Remember.cc b/src/Remember.cc
index c49ee35..b15a861 100644
--- a/src/Remember.cc
+++ b/src/Remember.cc
@@ -354,7 +354,6 @@ int Remember::parseApp(ifstream &file, Application &app, string *first_line) {
354 iss >> w >> h; 354 iss >> w >> h;
355 app.rememberDimensions(w,h); 355 app.rememberDimensions(w,h);
356 } else if (str_key == "Position") { 356 } else if (str_key == "Position") {
357 FbTk_istringstream iss;
358 unsigned int r= 0; 357 unsigned int r= 0;
359 unsigned int x= 0; 358 unsigned int x= 0;
360 unsigned int y= 0; 359 unsigned int y= 0;
@@ -370,13 +369,13 @@ int Remember::parseApp(ifstream &file, Application &app, string *first_line) {
370 else if ( str_option == "CENTER" ) r= POS_CENTER; 369 else if ( str_option == "CENTER" ) r= POS_CENTER;
371 else if ( str_option == "WINCENTER" ) r= POS_WINCENTER; 370 else if ( str_option == "WINCENTER" ) r= POS_WINCENTER;
372 else { 371 else {
373 iss.str(str_option); 372 FbTk_istringstream iss_r(str_option.c_str());
374 iss >> r; 373 iss_r >> r;
375 } 374 }
376 } 375 }
377 376
378 iss.str(str_label.c_str()); 377 FbTk_istringstream iss_xy(str_label.c_str());
379 iss >> x >> y; 378 iss_xy >> x >> y;
380 app.rememberPosition(x, y, r); 379 app.rememberPosition(x, y, r);
381 } else if (str_key == "Shaded") { 380 } else if (str_key == "Shaded") {
382 app.rememberShadedstate((str_label=="yes")); 381 app.rememberShadedstate((str_label=="yes"));