summaryrefslogtreecommitdiffstats
path: root/Sluift
diff options
context:
space:
mode:
Diffstat (limited to 'Sluift')
-rw-r--r--Sluift/Console.h2
-rw-r--r--Sluift/ITunesInterface.h2
-rw-r--r--Sluift/Terminal.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/Sluift/Console.h b/Sluift/Console.h
index d1687bf..6ed6f58 100644
--- a/Sluift/Console.h
+++ b/Sluift/Console.h
@@ -1,41 +1,41 @@
/*
* Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
#include <string>
-#include <boost/optional/optional_fwd.hpp>
+#include <boost/optional/optional.hpp>
#include <Swiften/Base/Override.h>
#include <Sluift/Completer.h>
struct lua_State;
namespace Swift {
class Terminal;
class Console : public Completer {
public:
Console(lua_State* L, Terminal* terminal);
virtual ~Console();
void run();
static int call(lua_State* L, int numberOfArguments, bool keepResult);
private:
std::string getPrompt(bool firstLine) const;
std::string getErrorMessage() const;
bool readCommand();
int tryLoadCommand(const std::string& command);
virtual std::vector<std::string> getCompletions(const std::string&, int start, int end) SWIFTEN_OVERRIDE;
private:
lua_State* L;
Terminal* terminal;
diff --git a/Sluift/ITunesInterface.h b/Sluift/ITunesInterface.h
index d09982b..d44dcb1 100644
--- a/Sluift/ITunesInterface.h
+++ b/Sluift/ITunesInterface.h
@@ -1,40 +1,40 @@
/*
* Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
#include <memory>
#include <string>
-#include <boost/optional/optional_fwd.hpp>
+#include <boost/optional/optional.hpp>
#include <Swiften/Base/API.h>
namespace Swift {
class SWIFTEN_API ITunesInterface {
public:
struct Track {
std::string name;
std::string artist;
std::string album;
long trackNumber;
double duration;
long rating;
};
ITunesInterface();
virtual ~ITunesInterface();
boost::optional<Track> getCurrentTrack() const;
private:
bool haveApplication() const;
private:
struct Private;
const std::unique_ptr<Private> p;
};
}
diff --git a/Sluift/Terminal.h b/Sluift/Terminal.h
index 9d44095..3443d16 100644
--- a/Sluift/Terminal.h
+++ b/Sluift/Terminal.h
@@ -1,36 +1,36 @@
/*
* Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
#include <string>
-#include <boost/optional/optional_fwd.hpp>
+#include <boost/optional/optional.hpp>
namespace Swift {
class Completer;
class Terminal {
public:
Terminal();
virtual ~Terminal();
Completer* getCompleter() const {
return completer;
}
void setCompleter(Completer* completer) {
this->completer = completer;
}
virtual boost::optional<std::string> readLine(const std::string& prompt) = 0;
virtual void addToHistory(const std::string& command) = 0;
virtual void printError(const std::string& message) = 0;
private:
Completer* completer;
};
}