#include "GuiApplication.h"
+#include "lcolorcache.h"
#include "qt_helpers.h"
#include "QLImage.h"
#include "socket_callback.h"
#include "support/package.h"
#include "BufferView.h"
+#include "Color.h"
#include "lyx_main.h"
#include "lyxrc.h"
#include "debug.h"
namespace {
-map<int, shared_ptr<socket_callback> > socket_callbacks;
+std::map<int, boost::shared_ptr<socket_callback> > socket_callbacks;
int getDPI()
{
namespace lyx {
-lyx::frontend::Application * createApplication(int & argc, char * argv[])
+frontend::Application * createApplication(int & argc, char * argv[])
{
- GuiApplication app(argc, argv);
+ frontend::GuiApplication app(argc, argv);
return &app;
}
string const GuiApplication::hexName(LColor_color col)
{
- return ltrim(fromqstr(lcolorcache.get(col).name()), "#");
+ return lyx::support::ltrim(fromqstr(lcolorcache.get(col).name()), "#");
}
void GuiApplication::registerSocketCallback(int fd, boost::function<void()> func)
{
- socket_callbacks[fd] = shared_ptr<socket_callback>(new socket_callback(fd, func));
+ socket_callbacks[fd] = boost::shared_ptr<socket_callback>(new socket_callback(fd, func));
}