Also added a qmake switch that enables advanced b0rkage at build-time. I mean it.
+sputdev {
+ DEFINES *= SPUTDEV
+}
+
win32:static {
CONFIG = release warn_on uic resources qt windows static
}
win32:static {
CONFIG = release warn_on uic resources qt windows static
}
Global::RunMode Global::runMode;
uint Global::defaultPort;
Global::RunMode Global::runMode;
uint Global::defaultPort;
extern RunMode runMode;
extern unsigned int defaultPort;
extern RunMode runMode;
extern unsigned int defaultPort;
- extern bool SPUTDEV; // FIXME This is for internal use only!
void registerMetaTypes();
};
void registerMetaTypes();
};
// Check if a non-standard core port is requested
QStringList args = QCoreApplication::arguments(); // TODO Build a CLI parser
// Check if a non-standard core port is requested
QStringList args = QCoreApplication::arguments(); // TODO Build a CLI parser
- Global::SPUTDEV = args.contains("--sputdev"); // This enables various debug features for Sput. Do not touch.
+ Global::DEBUG = args.contains("--debug"); // This enables various debug features.
Global::defaultPort = 4242;
int idx;
Global::defaultPort = 4242;
int idx;
Global::runMode = Global::ClientOnly;
Global::defaultPort = 4242;
Global::runMode = Global::ClientOnly;
Global::defaultPort = 4242;
- Global::SPUTDEV = true;
Network::setDefaultCodecForServer("ISO-8859-1");
Network::setDefaultCodecForEncoding("UTF-8");
Network::setDefaultCodecForServer("ISO-8859-1");
Network::setDefaultCodecForEncoding("UTF-8");
AbstractChatView *BufferWidget::createChatView(BufferId id) {
QWidget *chatView;
AbstractChatView *BufferWidget::createChatView(BufferId id) {
QWidget *chatView;
- if(Global::SPUTDEV) {
- chatView = new ChatView(Client::buffer(id), this);
- } else {
- chatView = new ChatWidget(id, this);
- }
+#ifdef SPUTDEV
+ chatView = new ChatView(Client::buffer(id), this);
+#else
+ chatView = new ChatWidget(id, this);
+#endif
_chatViews[id] = chatView;
ui.stackedWidget->addWidget(chatView);
chatView->setFocusProxy(this);
_chatViews[id] = chatView;
ui.stackedWidget->addWidget(chatView);
chatView->setFocusProxy(this);
ui.bufferWidget->setModel(Client::bufferModel());
ui.bufferWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
ui.bufferWidget->setModel(Client::bufferModel());
ui.bufferWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
//showSettingsDlg();
//showAboutDlg();
//showNetworkDlg();
//showSettingsDlg();
//showAboutDlg();
//showNetworkDlg();
}
AbstractUiMsg *MainWin::layoutMsg(const Message &msg) {
}
AbstractUiMsg *MainWin::layoutMsg(const Message &msg) {
- if(Global::SPUTDEV) return new ChatLine(msg);
+#ifdef SPUTDEV
+ return new ChatLine(msg);
+#else
return new ChatLineOld(msg);
return new ChatLineOld(msg);
}
void MainWin::showCoreConnectionDlg(bool autoConnect) {
}
void MainWin::showCoreConnectionDlg(bool autoConnect) {
continue;
bool isActive = networkIdx.data(NetworkModel::ItemActiveRole).toBool();
continue;
bool isActive = networkIdx.data(NetworkModel::ItemActiveRole).toBool();
- if(Global::SPUTDEV) {
- if(isExpanded(networkIdx) != isActive) setExpanded(networkIdx, true);
- } else {
- if(isExpanded(networkIdx) != isActive)
- setExpanded(networkIdx, isActive);
- }
+#ifdef SPUTDEV
+ if(isExpanded(networkIdx) != isActive) setExpanded(networkIdx, true);
+#else
+ if(isExpanded(networkIdx) != isActive) setExpanded(networkIdx, isActive);
+#endif