0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get rid of junky timestamps, along with some select pointless log messages

Browse Source
This commit is contained in:
Petr Mrázek 2013-10-06 03:07:57 +02:00
parent 9cef16a47d
commit 8b18af0515
6 changed files with 54 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MultiMC.cpp
View File

@ -133,7 +133,7 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
// and instances // and instances
m_instances.reset(new InstanceList(m_settings->get("InstanceDir").toString(), this)); m_instances.reset(new InstanceList(m_settings->get("InstanceDir").toString(), this));
std::cout << "Loading Instances..." << std::endl; QLOG_INFO() << "Loading Instances...";
m_instances->loadList(); m_instances->loadList();
// init the http meta cache // init the http meta cache

2
depends/util/src/pathutils.cpp
View File

@ -75,7 +75,6 @@ bool ensureFilePathExists(QString filenamepath)
QDir dir; QDir dir;
QString ensuredPath = a.path(); QString ensuredPath = a.path();
bool success = dir.mkpath ( ensuredPath ); bool success = dir.mkpath ( ensuredPath );
qDebug() << "ensureFilePathExists:" << success << ensuredPath << filenamepath;
return success; return success;
} }
@ -85,7 +84,6 @@ bool ensureFolderPathExists(QString foldernamepath)
QDir dir; QDir dir;
QString ensuredPath = a.filePath(); QString ensuredPath = a.filePath();
bool success = dir.mkpath ( ensuredPath ); bool success = dir.mkpath ( ensuredPath );
qDebug() << "ensureFolderPathExists:" << success << ensuredPath << foldernamepath;
return success; return success;
} }

4
gui/mainwindow.cpp
View File

@ -437,7 +437,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
// settings->getConfig().setValue("MainWindowState", saveState()); // settings->getConfig().setValue("MainWindowState", saveState());
QMainWindow::closeEvent(event); QMainWindow::closeEvent(event);
} }
/*
void MainWindow::on_instanceView_customContextMenuRequested(const QPoint &pos) void MainWindow::on_instanceView_customContextMenuRequested(const QPoint &pos)
{ {
QMenu *instContextMenu = new QMenu("Instance", this); QMenu *instContextMenu = new QMenu("Instance", this);
@ -447,7 +447,7 @@ void MainWindow::on_instanceView_customContextMenuRequested(const QPoint &pos)
instContextMenu->exec(view->mapToGlobal(pos)); instContextMenu->exec(view->mapToGlobal(pos));
} }
*/
void MainWindow::on_actionLaunchInstance_triggered() void MainWindow::on_actionLaunchInstance_triggered()
{ {
if (m_selectedInstance) if (m_selectedInstance)

6
gui/mainwindow.h
View File

@ -49,7 +49,6 @@ public:
// Browser Dialog // Browser Dialog
void openWebPage(QUrl url); void openWebPage(QUrl url);
private slots: private slots:
void onCatToggled(bool); void onCatToggled(bool);
@ -81,7 +80,7 @@ private slots:
void on_mainToolBar_visibilityChanged(bool); void on_mainToolBar_visibilityChanged(bool);
void on_instanceView_customContextMenuRequested(const QPoint &pos); // void on_instanceView_customContextMenuRequested(const QPoint &pos);
void on_actionLaunchInstance_triggered(); void on_actionLaunchInstance_triggered();
@ -99,10 +98,8 @@ private slots:
void doLogin(const QString &errorMsg = ""); void doLogin(const QString &errorMsg = "");
void onLoginComplete(); void onLoginComplete();
void onGameUpdateComplete(); void onGameUpdateComplete();
void onGameUpdateError(QString error); void onGameUpdateError(QString error);
@ -129,6 +126,7 @@ public slots:
protected: protected:
bool eventFilter(QObject *obj, QEvent *ev); bool eventFilter(QObject *obj, QEvent *ev);
void setCatBackground(bool enabled); void setCatBackground(bool enabled);
private: private:
Ui::MainWindow *ui; Ui::MainWindow *ui;

8
logger/QsLog.cpp
View File

@ -56,13 +56,12 @@ static const char *LevelToText(Level theLevel)
class LoggerImpl class LoggerImpl
{ {
public: public:
LoggerImpl() : level(InfoLevel), start_time(QDateTime::currentDateTime()) LoggerImpl() : level(InfoLevel)
{ {
} }
QMutex logMutex; QMutex logMutex;
Level level; Level level;
DestinationList destList; DestinationList destList;
QDateTime start_time;
}; };
Logger::Logger() : d(new LoggerImpl) Logger::Logger() : d(new LoggerImpl)
@ -94,10 +93,7 @@ Level Logger::loggingLevel() const
void Logger::Helper::writeToLog() void Logger::Helper::writeToLog()
{ {
const char *const levelName = LevelToText(level); const char *const levelName = LevelToText(level);
const QString completeMessage(QString("%1\t%2\t%3") const QString completeMessage(QString("%1\t%2").arg(levelName, 5).arg(buffer));
.arg(QDateTime::currentDateTime().toString(fmtDateTime))
.arg(levelName, 5)
.arg(buffer));
Logger &logger = Logger::instance(); Logger &logger = Logger::instance();
QMutexLocker lock(&logger.d->logMutex); QMutexLocker lock(&logger.d->logMutex);

2
logic/lists/InstanceList.cpp
View File

@ -316,7 +316,7 @@ InstanceList::InstListError InstanceList::loadList()
{ {
inst->setGroupInitial((*iter)); inst->setGroupInitial((*iter));
} }
QLOG_INFO() << QString("Loaded instance %1").arg(inst->name()).toUtf8(); QLOG_INFO() << "Loaded instance " << inst->name();
inst->setParent(this); inst->setParent(this);
m_instances.append(inst); m_instances.append(inst);
connect(instPtr, SIGNAL(propertiesChanged(BaseInstance *)), this, connect(instPtr, SIGNAL(propertiesChanged(BaseInstance *)), this,