Skip to content

Commit ebc3869

Browse files
MKleusbergMKleusberg
committed
Rename sqlb::Object::ObjectTypes enum to sqlb::Object::Types
The 'Object' parts seemed a little redundant before.
1 parent 649f2b8 commit ebc3869

File tree

9 files changed

+38
-38
lines changed

9 files changed

+38
-38
lines changed

‎src/DbStructureModel.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -181,15 +181,15 @@ void DbStructureModel::reloadData()
181181
QString type;
182182
switch((*it).gettype())
183183
{
184-
case sqlb::Object::ObjectTypes::Table: type = "table"; break;
185-
case sqlb::Object::ObjectTypes::Index: type = "index"; break;
186-
case sqlb::Object::ObjectTypes::Trigger: type = "trigger"; break;
187-
case sqlb::Object::ObjectTypes::View: type = "view"; break;
184+
case sqlb::Object::Types::Table: type = "table"; break;
185+
case sqlb::Object::Types::Index: type = "index"; break;
186+
case sqlb::Object::Types::Trigger: type = "trigger"; break;
187+
case sqlb::Object::Types::View: type = "view"; break;
188188
}
189189
QTreeWidgetItem* item = addNode(typeToParentItem.value(type), *it);
190190

191191
// If it is a table or view add the field nodes
192-
if((*it).gettype() == sqlb::Object::ObjectTypes::Table || (*it).gettype() == sqlb::Object::ObjectTypes::View)
192+
if((*it).gettype() == sqlb::Object::Types::Table || (*it).gettype() == sqlb::Object::Types::View)
193193
{
194194
// Add extra node for browsable section
195195
addNode(typeToParentItem.value("browsable"), *it);
@@ -290,10 +290,10 @@ QTreeWidgetItem* DbStructureModel::addNode(QTreeWidgetItem* parent, const DBBrow
290290
QString type;
291291
switch(object.gettype())
292292
{
293-
case sqlb::Object::ObjectTypes::Table: type = "table"; break;
294-
case sqlb::Object::ObjectTypes::Index: type = "index"; break;
295-
case sqlb::Object::ObjectTypes::Trigger: type = "trigger"; break;
296-
case sqlb::Object::ObjectTypes::View: type = "view"; break;
293+
case sqlb::Object::Types::Table: type = "table"; break;
294+
case sqlb::Object::Types::Index: type = "index"; break;
295+
case sqlb::Object::Types::Trigger: type = "trigger"; break;
296+
case sqlb::Object::Types::View: type = "view"; break;
297297
}
298298

299299
QTreeWidgetItem *item = new QTreeWidgetItem(parent);

‎src/ForeignKeyEditorDelegate.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ ForeignKeyEditorDelegate::ForeignKeyEditorDelegate(const DBBrowserDB& db, sqlb::
8181
{
8282
const auto objects = m_db.getBrowsableObjects();
8383
for (auto& obj : objects) {
84-
if (obj.gettype() == sqlb::Object::ObjectTypes::Table) {
84+
if (obj.gettype() == sqlb::Object::Types::Table) {
8585
QString tableName = obj.object->name();
8686
m_tablesIds.insert(tableName, obj.object.dynamicCast<sqlb::Table>()->fieldNames());
8787
}

‎src/ImportCsvDialog.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ void ImportCsvDialog::accept()
186186
objectMap objects = pdb->getBrowsableObjects();
187187
for(auto it=objects.constBegin();it!=objects.constEnd();++it)
188188
{
189-
if(it.value().gettype() == sqlb::Object::ObjectTypes::Table && it.value().getname() == ui->editName->text())
189+
if(it.value().gettype() == sqlb::Object::Types::Table && it.value().getname() == ui->editName->text())
190190
{
191191
if((size_t)it.value().object.dynamicCast<sqlb::Table>()->fields().size() != csv.columns())
192192
{

‎src/MainWindow.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ void MainWindow::populateTable()
499499
}
500500

501501
// Activate the add and delete record buttons and editing only if a table has been selected
502-
bool editable = db.getObjectByName(tablename)->type() == sqlb::Object::ObjectTypes::Table && !db.readOnly();
502+
bool editable = db.getObjectByName(tablename)->type() == sqlb::Object::Types::Table && !db.readOnly();
503503
ui->buttonNewRecord->setEnabled(editable);
504504
ui->buttonDeleteRecord->setEnabled(editable);
505505
ui->dataTable->setEditTriggers(editable ? QAbstractItemView::SelectedClicked | QAbstractItemView::AnyKeyPressed | QAbstractItemView::EditKeyPressed : QAbstractItemView::NoEditTriggers);
@@ -817,7 +817,7 @@ void MainWindow::doubleClickTable(const QModelIndex& index)
817817

818818
// * Don't allow editing of other objects than tables (on the browse table) *
819819
bool isEditingAllowed = (m_currentTabTableModel == m_browseTableModel) &&
820-
(db.getObjectByName(ui->comboBrowseTable->currentText())->type() == sqlb::Object::ObjectTypes::Table);
820+
(db.getObjectByName(ui->comboBrowseTable->currentText())->type() == sqlb::Object::Types::Table);
821821

822822
// Enable or disable the Apply, Null, & Import buttons in the Edit Cell
823823
// dock depending on the value of the "isEditingAllowed" bool above
@@ -841,7 +841,7 @@ void MainWindow::dataTableSelectionChanged(const QModelIndex& index)
841841
}
842842

843843
bool editingAllowed = (m_currentTabTableModel == m_browseTableModel) &&
844-
(db.getObjectByName(ui->comboBrowseTable->currentText())->type() == sqlb::Object::ObjectTypes::Table);
844+
(db.getObjectByName(ui->comboBrowseTable->currentText())->type() == sqlb::Object::Types::Table);
845845

846846
// Don't allow editing of other objects than tables
847847
editDock->setReadOnly(!editingAllowed);
@@ -2238,7 +2238,7 @@ void MainWindow::showDataColumnPopupMenu(const QPoint& pos)
22382238
void MainWindow::showRecordPopupMenu(const QPoint& pos)
22392239
{
22402240
const QString sCurrentTable = ui->comboBrowseTable->currentText();
2241-
if(!(db.getObjectByName(sCurrentTable)->type() == sqlb::Object::ObjectTypes::Table && !db.readOnly()))
2241+
if(!(db.getObjectByName(sCurrentTable)->type() == sqlb::Object::Types::Table && !db.readOnly()))
22422242
return;
22432243

22442244
int row = ui->dataTable->verticalHeader()->logicalIndexAt(pos);

‎src/sqlitedb.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ bool DBBrowserDB::dump(const QString& filename,
594594
for(auto it=objMap.constBegin();it!=objMap.constEnd();++it)
595595
{
596596
// Make sure it's not a table again
597-
if(it.value().gettype() == sqlb::Object::ObjectTypes::Table)
597+
if(it.value().gettype() == sqlb::Object::Types::Table)
598598
continue;
599599

600600
// Write the SQL string used to create this object to the output file
@@ -1076,11 +1076,11 @@ bool DBBrowserDB::renameColumn(const QString& tablename, const sqlb::Table& tabl
10761076
for(auto it=objMap.constBegin();it!=objMap.constEnd();++it)
10771077
{
10781078
// If this object references the table and it's not the table itself save it's SQL string
1079-
if((*it).getTableName() == tablename && (*it).gettype() != sqlb::Object::ObjectTypes::Table)
1079+
if((*it).getTableName() == tablename && (*it).gettype() != sqlb::Object::Types::Table)
10801080
{
10811081
// If this is an index, update the fields first. This highly increases the chance that the SQL statement won't throw an
10821082
// error later on when we try to recreate it.
1083-
if((*it).gettype() == sqlb::Object::ObjectTypes::Index)
1083+
if((*it).gettype() == sqlb::Object::Types::Index)
10841084
{
10851085
sqlb::IndexPtr idx = (*it).object.dynamicCast<sqlb::Index>();
10861086
for(int i=0;i<idx->columns().size();i++)
@@ -1240,34 +1240,34 @@ void DBBrowserDB::updateSchema( )
12401240
QString val_temp = QString::fromUtf8((const char*)sqlite3_column_text(vm, 4));
12411241
val_sql.replace("\r", "");
12421242

1243-
sqlb::Object::ObjectTypes type;
1243+
sqlb::Object::Types type;
12441244
if(val_type == "table")
1245-
type = sqlb::Object::ObjectTypes::Table;
1245+
type = sqlb::Object::Types::Table;
12461246
else if(val_type == "index")
1247-
type = sqlb::Object::ObjectTypes::Index;
1247+
type = sqlb::Object::Types::Index;
12481248
else if(val_type == "trigger")
1249-
type = sqlb::Object::ObjectTypes::Trigger;
1249+
type = sqlb::Object::Types::Trigger;
12501250
else if(val_type == "view")
1251-
type = sqlb::Object::ObjectTypes::View;
1251+
type = sqlb::Object::Types::View;
12521252
else
12531253
continue;
12541254

12551255
DBBrowserObject obj(val_name, val_sql, type, val_tblname);
1256-
if((type == sqlb::Object::ObjectTypes::Table || type == sqlb::Object::ObjectTypes::Index) && !val_sql.isEmpty())
1256+
if((type == sqlb::Object::Types::Table || type == sqlb::Object::Types::Index) && !val_sql.isEmpty())
12571257
{
12581258
obj.object = sqlb::Object::parseSQL(type, val_sql);
12591259
if(val_temp == "1")
12601260
obj.object->setTemporary(true);
12611261

12621262
// For virtual tables query the column list using the SQLite pragma
1263-
if(type == sqlb::Object::ObjectTypes::Table && obj.object.dynamicCast<sqlb::Table>()->isVirtual())
1263+
if(type == sqlb::Object::Types::Table && obj.object.dynamicCast<sqlb::Table>()->isVirtual())
12641264
{
12651265
sqlb::TablePtr tab = obj.object.dynamicCast<sqlb::Table>();
12661266
auto columns = queryColumnInformation(val_name);
12671267
foreach(const auto& column, columns)
12681268
tab->addField(sqlb::FieldPtr(new sqlb::Field(column.first, column.second)));
12691269
}
1270-
} else if(type == sqlb::Object::ObjectTypes::View) {
1270+
} else if(type == sqlb::Object::Types::View) {
12711271
// For views we currently can't rely on our grammar parser to get the column list. Use the pragma offered by SQLite instead
12721272
auto columns = queryColumnInformation(val_name);
12731273
sqlb::Table* view_dummy = new sqlb::Table("");

‎src/sqlitedb.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@ class DBBrowserObject
2222
{
2323
public:
2424
DBBrowserObject() : name( "" ) { }
25-
DBBrowserObject(const QString& wname, const QString& wsql, sqlb::Object::ObjectTypes wtype, const QString& tbl_name)
25+
DBBrowserObject(const QString& wname, const QString& wsql, sqlb::Object::Types wtype, const QString& tbl_name)
2626
: name( wname), sql( wsql ), type(wtype), table_name(tbl_name)
2727
{ }
2828

2929
QString getname() const { return name; }
3030
QString getsql() const { return sql; }
31-
sqlb::Object::ObjectTypes gettype() const { return type; }
31+
sqlb::Object::Types gettype() const { return type; }
3232
QString getTableName() const { return table_name; }
3333

3434
sqlb::ObjectPtr object;
3535
private:
3636
QString name;
3737
QString sql;
38-
sqlb::Object::ObjectTypes type;
38+
sqlb::Object::Types type;
3939
QString table_name; // The name of the table this object references, interesting for views, triggers and indices
4040
};
4141

‎src/sqlitetablemodel.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ void SqliteTableModel::setTable(const QString& table, const QVector<QString>& di
4747
m_vDataTypes.push_back(SQLITE_INTEGER);
4848

4949
bool allOk = false;
50-
if(m_db.getObjectByName(table)->type() == sqlb::Object::ObjectTypes::Table)
50+
if(m_db.getObjectByName(table)->type() == sqlb::Object::Types::Table)
5151
{
5252
sqlb::TablePtr t = m_db.getObjectByName(table).dynamicCast<sqlb::Table>();
5353
if(t && t->fields().size()) // parsing was OK

‎src/sqlitetypes.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,16 @@ class CreateIndexWalker
6464
antlr::RefAST m_root;
6565
};
6666

67-
ObjectPtr Object::parseSQL(Object::ObjectTypes type, const QString& sSQL)
67+
ObjectPtr Object::parseSQL(Object::Types type, const QString& sSQL)
6868
{
6969
// Parse SQL statement according to type
7070
ObjectPtr result;
7171
switch(type)
7272
{
73-
case Object::ObjectTypes::Table:
73+
case Object::Types::Table:
7474
result = Table::parseSQL(sSQL);
7575
break;
76-
case Object::ObjectTypes::Index:
76+
case Object::Types::Index:
7777
result = Index::parseSQL(sSQL);
7878
break;
7979
default:

‎src/sqlitetypes.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ QStringList fieldVectorToFieldNames(const sqlb::FieldVector& vector);
3333
class Object
3434
{
3535
public:
36-
enum ObjectTypes
36+
enum Types
3737
{
3838
Table,
3939
Index,
@@ -44,7 +44,7 @@ class Object
4444
explicit Object(const QString& name): m_name(name), m_temporary(false), m_fullyParsed(false) {}
4545
virtual ~Object() {}
4646

47-
virtual ObjectTypes type() const = 0;
47+
virtual Types type() const = 0;
4848

4949
void setName(const QString& name) { m_name = name; }
5050
const QString& name() const { return m_name; }
@@ -74,7 +74,7 @@ class Object
7474
* @param sSQL The create statement.
7575
* @return The parsed database object. The object may be empty if parsing failed.
7676
*/
77-
static ObjectPtr parseSQL(Object::ObjectTypes type, const QString& sSQL);
77+
static ObjectPtr parseSQL(Object::Types type, const QString& sSQL);
7878

7979
protected:
8080
QString m_name;
@@ -223,7 +223,7 @@ class Table : public Object
223223
explicit Table(const QString& name): Object(name), m_rowidColumn("_rowid_") {}
224224
virtual ~Table();
225225

226-
virtual ObjectTypes type() const { return Object::Table; }
226+
virtual Types type() const { return Object::Table; }
227227

228228
const FieldVector& fields() const { return m_fields; }
229229

@@ -320,7 +320,7 @@ class Index : public Object
320320
explicit Index(const QString& name): Object(name), m_unique(false) {}
321321
virtual ~Index();
322322

323-
virtual ObjectTypes type() const { return Object::Index; }
323+
virtual Types type() const { return Object::Index; }
324324

325325
virtual QString baseTable() const { return m_table; }
326326

0 commit comments

Comments
 (0)