eelke/pgLab
1
0
Fork 0
Code Issues 28 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fixed some small details the analyzer was complaining about.

Browse source
This commit is contained in:
eelke 2018-12-09 21:10:35 +01:00
parent e32c82ac6f
commit 9e645db1a8
7 changed files with 40 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/QueuedBackgroundTask.cpp
View file

@ -5,7 +5,7 @@
//{} //{}
QueuedBackgroundTask::QueuedBackgroundTask(CompletionFunction on_completion) QueuedBackgroundTask::QueuedBackgroundTask(CompletionFunction on_completion)
: m_completionFunction(on_completion) : m_completionFunction(std::move(on_completion))
{ {
setAutoDelete(false); setAutoDelete(false);
} }

62
core/SqlLexer.cpp
View file

@ -1,7 +1,7 @@
#include "SqlLexer.h" #include "SqlLexer.h"
SqlLexer::SqlLexer(const QString &block, LexerState currentstate) SqlLexer::SqlLexer(QString block, LexerState currentstate)
: m_block(block) : m_block(std::move(block))
, m_state(currentstate) , m_state(currentstate)
{} {}
@ -207,21 +207,20 @@ bool SqlLexer::parseSingleQuotedString(int startpos, int &length, BasicTokenType
tokentype = BasicTokenType::QuotedString; tokentype = BasicTokenType::QuotedString;
return true; return true;
} }
else {
nextChar(); nextChar();
if (c == '\'') { if (c == '\'') {
// maybe end of string literal // maybe end of string literal
if (peekChar() == '\'') { if (peekChar() == '\'') {
// Nope, just double quote to escape quote // Nope, just double quote to escape quote
nextChar(); // eat it nextChar(); // eat it
} }
else { else {
length = m_pos - startpos; length = m_pos - startpos;
tokentype = BasicTokenType::QuotedString; tokentype = BasicTokenType::QuotedString;
return true; return true;
} }
} }
}
} }
} }
@ -236,21 +235,20 @@ bool SqlLexer::parseDoubleQuotedIdentifier(int startpos, int &length, BasicToken
tokentype = BasicTokenType::QuotedIdentifier; tokentype = BasicTokenType::QuotedIdentifier;
return true; return true;
} }
else {
nextChar(); nextChar();
if (c == '"') { if (c == '"') {
// maybe end of string literal // maybe end of string literal
if (peekChar() == '"') { if (peekChar() == '"') {
// Nope, just double quote to escape quote // Nope, just double quote to escape quote
nextChar(); // eat it nextChar(); // eat it
} }
else { else {
length = m_pos - startpos; length = m_pos - startpos;
tokentype = BasicTokenType::QuotedIdentifier; tokentype = BasicTokenType::QuotedIdentifier;
return true; return true;
} }
} }
}
} }
} }

2
core/SqlLexer.h
View file

@ -37,7 +37,7 @@ public:
class SqlLexer { class SqlLexer {
public: public:
SqlLexer(const QString &block, LexerState currentstate); SqlLexer(QString block, LexerState currentstate);
QChar nextChar(); QChar nextChar();
QChar peekChar(); QChar peekChar();
/** /**

6
pglab/BackupDialog.cpp
View file

@ -64,7 +64,7 @@ void BackupDialog::disconnectCurrentProcess()
} }
void BackupDialog::writeOutput(QString s) void BackupDialog::writeOutput(const QString &s)
{ {
ui->stdOutput->appendPlainText(s); ui->stdOutput->appendPlainText(s);
QScrollBar *bar = ui->stdOutput->verticalScrollBar(); QScrollBar *bar = ui->stdOutput->verticalScrollBar();
@ -153,7 +153,7 @@ void BackupDialog::setParams(QStringList &args)
int format_index = ui->backupFormat->currentIndex(); int format_index = ui->backupFormat->currentIndex();
auto format_model_base = ui->backupFormat->model(); auto format_model_base = ui->backupFormat->model();
BackupFormatModel *bfm = dynamic_cast<BackupFormatModel *>(format_model_base); auto *bfm = dynamic_cast<BackupFormatModel *>(format_model_base);
if (bfm) { if (bfm) {
QVariant v = bfm->data(bfm->index(format_index, 1)); QVariant v = bfm->data(bfm->index(format_index, 1));
QString format("-F"); QString format("-F");
@ -252,7 +252,7 @@ void BackupDialog::on_backupFormat_currentIndexChanged(int /*index*/)
{ {
int format_index = ui->backupFormat->currentIndex(); int format_index = ui->backupFormat->currentIndex();
auto format_model_base = ui->backupFormat->model(); auto format_model_base = ui->backupFormat->model();
BackupFormatModel *bfm = dynamic_cast<BackupFormatModel *>(format_model_base); auto *bfm = dynamic_cast<BackupFormatModel *>(format_model_base);
if (bfm) { if (bfm) {
QVariant v = bfm->data(bfm->index(format_index, 1)); QVariant v = bfm->data(bfm->index(format_index, 1));
QString format = v.toString(); QString format = v.toString();

2
pglab/BackupDialog.h
View file

@ -28,7 +28,7 @@ private:
QProcess *m_process = nullptr; QProcess *m_process = nullptr;
ConnectionConfig m_config; ConnectionConfig m_config;
void writeOutput(QString s); void writeOutput(const QString &s);
void setParams(QStringList &args); void setParams(QStringList &args);
private slots: private slots:

2
pglab/BackupRestore.cpp
View file

@ -24,7 +24,7 @@ void setupEnvironment(const ConnectionConfig &cc)
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void Backup(QString dest_file_name) void Backup(const QString &dest_file_name)
{ {
// QString command_line = "\"" + ExecutableDump + "\" "; // QString command_line = "\"" + ExecutableDump + "\" ";

6
pglab/CodeGenerator.cpp
View file

@ -23,9 +23,9 @@ CodeGenerator::~CodeGenerator()
void CodeGenerator::Init(std::shared_ptr<PgDatabaseCatalog> catalog, QString query, void CodeGenerator::Init(std::shared_ptr<PgDatabaseCatalog> catalog, QString query,
std::shared_ptr<const Pgsql::Result> dbres) std::shared_ptr<const Pgsql::Result> dbres)
{ {
m_catalog = catalog; m_catalog = std::move(catalog);
m_query = query; m_query = std::move(query);
m_dbres = dbres; m_dbres = std::move(dbres);
generateCode(); generateCode();