nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

check for sstream header

Browse source
This commit is contained in:
fluxgen 2003-11-17 00:33:16 +00:00
parent f592b67c70
commit a2f947e300
2 changed files with 37 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/ClientPattern.cc
View file

@ -20,7 +20,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: ClientPattern.cc,v 1.4 2003/10/12 16:25:28 rathnor Exp $ // $Id: ClientPattern.cc,v 1.5 2003/11/17 00:29:30 fluxgen Exp $
#include "ClientPattern.hh" #include "ClientPattern.hh"
#include "RegExp.hh" #include "RegExp.hh"
@ -34,7 +34,6 @@
#include <iostream> #include <iostream>
#include <sstream>
#include <fstream> #include <fstream>
#include <string> #include <string>
#include <memory> #include <memory>
@ -43,6 +42,21 @@
// needed as well for index on some systems (e.g. solaris) // needed as well for index on some systems (e.g. solaris)
#include <strings.h> #include <strings.h>
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif // HAVE_CONFIG_H
#ifdef HAVE_SSTREAM
#include <sstream>
#define FB_istringstream istringstream
#elif HAVE_STRSTREAM
#include <strstream>
#define FB_istringstream istrstream
#else
#error "You dont have sstream or strstream headers!"
#endif // HAVE_STRSTREAM
using namespace std; using namespace std;
ClientPattern::ClientPattern(): ClientPattern::ClientPattern():
@ -120,7 +134,7 @@ ClientPattern::ClientPattern(const char *str):
str+pos, str+pos,
'{', '}'); '{', '}');
if (err > 0) { if (err > 0) {
istringstream iss(number.c_str()); FB_istringstream iss(number.c_str());
iss >> m_matchlimit; iss >> m_matchlimit;
pos+=err; pos+=err;
} }

25
src/FbCommandFactory.cc
View file

@ -20,7 +20,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: FbCommandFactory.cc,v 1.19 2003/10/25 22:11:22 fluxgen Exp $ // $Id: FbCommandFactory.cc,v 1.20 2003/11/17 00:33:16 fluxgen Exp $
#include "FbCommandFactory.hh" #include "FbCommandFactory.hh"
@ -36,7 +36,22 @@
#include "FbTk/MacroCommand.hh" #include "FbTk/MacroCommand.hh"
#include <string> #include <string>
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif // HAVE_CONFIG_H
#ifdef HAVE_SSTREAM
#include <sstream> #include <sstream>
#define FB_istringstream istringstream
#elif HAVE_STRSTREAM
#include <strstream>
#define FB_istringstream istrstream
#else
#error "You dont have sstream or strstream headers!"
#endif // HAVE_STRSTREAM
using namespace std;
// autoregister this module to command parser // autoregister this module to command parser
FbCommandFactory FbCommandFactory::s_autoreg; FbCommandFactory FbCommandFactory::s_autoreg;
@ -141,13 +156,13 @@ FbTk::Command *FbCommandFactory::stringToCommand(const std::string &command,
else if (command == "maximizehorizontal") else if (command == "maximizehorizontal")
return new CurrentWindowCmd(&FluxboxWindow::maximizeHorizontal); return new CurrentWindowCmd(&FluxboxWindow::maximizeHorizontal);
else if (command == "resize") { else if (command == "resize") {
std::istringstream is(arguments); FB_istringstream is(arguments.c_str());
int dx = 0, dy = 0; int dx = 0, dy = 0;
is >> dx >> dy; is >> dx >> dy;
return new ResizeCmd(dx, dy); return new ResizeCmd(dx, dy);
} }
else if (command == "resizeto") { else if (command == "resizeto") {
std::istringstream is(arguments); FB_istringstream is(arguments.c_str());
int dx = 0, dy = 0; int dx = 0, dy = 0;
is >> dx >> dy; is >> dx >> dy;
return new ResizeToCmd(dx, dy); return new ResizeToCmd(dx, dy);
@ -157,13 +172,13 @@ FbTk::Command *FbCommandFactory::stringToCommand(const std::string &command,
else if (command == "resizevertical") else if (command == "resizevertical")
return new ResizeCmd(0,atoi(arguments.c_str())); return new ResizeCmd(0,atoi(arguments.c_str()));
else if (command == "moveto") { else if (command == "moveto") {
std::istringstream is(arguments); FB_istringstream is(arguments.c_str());
int dx = 0, dy = 0; int dx = 0, dy = 0;
is >> dx >> dy; is >> dx >> dy;
return new MoveToCmd(dx,dy); return new MoveToCmd(dx,dy);
} }
else if (command == "move") { else if (command == "move") {
std::istringstream is(arguments); FB_istringstream is(arguments.c_str());
int dx = 0, dy = 0; int dx = 0, dy = 0;
is >> dx >> dy; is >> dx >> dy;
return new MoveCmd(dx, dy); return new MoveCmd(dx, dy);