mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-05-22 21:48:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Clean up code, especially includes

Browse Source 
Clean up the entire code a bit, especially by deleting unneeded defines
and includes. This should make the code a bit clearer and faster to
compile.
This commit is contained in:
Martin Kleusberg
2012-12-31 18:01:48 +01:00
parent cb4686dbbf
commit 979ed7a007
30 changed files with 25 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SQLLogDock.cpp
+1 -2
View File
@@ -1,9 +1,8 @@
#include "SQLLogDock.h"
#include <QScrollBar>
#include "sqlitedb.h"
#include "sqlitesyntaxhighlighter.h"
/*
* Constructs a sqlLogForm as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
src/SQLLogDock.h
-1
View File
@@ -3,7 +3,6 @@
#include <QTextEdit>
#include <QStackedWidget>
#include <QtGui/QAction>
#include <QtGui/QComboBox>
#include <QtGui/QDockWidget>
#include <QtGui/QHBoxLayout>
src/browsermain.cpp
-1
View File
@@ -1,5 +1,4 @@
#include "mainwindow.h"
#include <QApplication>
#if defined(Q_WS_MAC)
src/choosetableform.cpp
-4
View File
@@ -1,9 +1,5 @@
#include "choosetableform.h"
#include <qvariant.h>
#include <qimage.h>
#include <qpixmap.h>
/*
* Constructs a chooseTableForm as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
src/choosetableform.h
-19
View File
@@ -1,32 +1,15 @@
#ifndef CHOOSETABLEFORM_H
#define CHOOSETABLEFORM_H
#include <qvariant.h>
/* QT_BEGIN_NAMESPACE and QT_END_NAMESPACE weren't introduced into QT right away... */
#ifndef QT_BEGIN_NAMESPACE
#define QT_BEGIN_NAMESPACE
#endif
#ifndef QT_END_NAMESPACE
#define QT_END_NAMESPACE
#endif
#include <QtCore/QVariant>
#include <QtGui/QAction>
#include <QtGui/QApplication>
#include <QtGui/QButtonGroup>
#include <QtGui/QComboBox>
#include <QtGui/QDialog>
#include <QtGui/QHBoxLayout>
#include <QtGui/QHeaderView>
#include <QtGui/QLabel>
#include <QtGui/QPushButton>
#include <QtGui/QSpacerItem>
#include <QtGui/QVBoxLayout>
QT_BEGIN_NAMESPACE
class Ui_chooseTableForm
{
public:
@@ -125,8 +108,6 @@ namespace Ui {
class chooseTableForm: public Ui_chooseTableForm {};
} // namespace Ui
QT_END_NAMESPACE
class chooseTableForm : public QDialog, public Ui::chooseTableForm
{
Q_OBJECT
src/createindexform.cpp
+1 -6
View File
@@ -1,10 +1,5 @@
#include "createindexform.h"
#include <qvariant.h>
#include <qimage.h>
#include <qpixmap.h>
#include "qmessagebox.h"
#include <QMessageBox>
/*
* Constructs a createIndexForm as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
src/createindexform.h
-19
View File
@@ -1,27 +1,12 @@
#ifndef CREATEINDEXFORM_H
#define CREATEINDEXFORM_H
#include <qvariant.h>
/* QT_BEGIN_NAMESPACE and QT_END_NAMESPACE weren't introduced into QT right away... */
#ifndef QT_BEGIN_NAMESPACE
#define QT_BEGIN_NAMESPACE
#endif
#ifndef QT_END_NAMESPACE
#define QT_END_NAMESPACE
#endif
#include <QGroupBox>
#include <QtCore/QVariant>
#include <QtGui/QAction>
#include <QtGui/QApplication>
#include <QtGui/QButtonGroup>
#include <QtGui/QComboBox>
#include <QtGui/QDialog>
#include <QtGui/QGridLayout>
#include <QtGui/QHBoxLayout>
#include <QtGui/QHeaderView>
#include <QtGui/QLabel>
#include <QtGui/QLineEdit>
#include <QtGui/QPushButton>
@@ -29,8 +14,6 @@
#include <QtGui/QVBoxLayout>
#include "sqlitedb.h"
QT_BEGIN_NAMESPACE
class Ui_createIndexForm
{
public:
@@ -250,8 +233,6 @@ namespace Ui {
class createIndexForm: public Ui_createIndexForm {};
} // namespace Ui
QT_END_NAMESPACE
class createIndexForm : public QDialog, public Ui::createIndexForm
{
Q_OBJECT
src/createtableform.cpp
+1 -6
View File
@@ -1,10 +1,5 @@
#include "createtableform.h"
#include <qvariant.h>
#include <qimage.h>
#include <qpixmap.h>
#include "qmessagebox.h"
#include <QMessageBox>
#include "editfieldform.h"
/*
* Constructs a createTableForm as a child of 'parent', with the
src/createtableform.h
+1 -26
View File
@@ -1,41 +1,18 @@
#ifndef CREATETABLEFORM_H
#define CREATETABLEFORM_H
#include <qvariant.h>
/* QT_BEGIN_NAMESPACE and QT_END_NAMESPACE weren't introduced into QT right away... */
#ifndef QT_BEGIN_NAMESPACE
#define QT_BEGIN_NAMESPACE
#endif
#ifndef QT_END_NAMESPACE
#define QT_END_NAMESPACE
#endif
#include <QtCore/QVariant>
#include <QtGui/QGroupBox>
#include <QtGui/QTreeWidget>
#include <QtGui/QTreeWidgetItem>
#include <QtGui/QHeaderView>
#include <QtGui/QAction>
#include <QtGui/QApplication>
#include <QtGui/QButtonGroup>
#include <QtGui/QDialog>
#include <QtGui/QHBoxLayout>
#include <QtGui/QHeaderView>
#include <QtGui/QLabel>
#include <QtGui/QLineEdit>
#include <QtGui/QPushButton>
//#include <QtGui/QSpacerItem>
#include <QtGui/QStatusBar>
#include <QtGui/QVBoxLayout>
#include "sqlitedb.h"
QT_BEGIN_NAMESPACE
class DBBrowserDB;
class Ui_createTableForm
{
@@ -208,8 +185,6 @@ namespace Ui {
class createTableForm: public Ui_createTableForm {};
} // namespace Ui
QT_END_NAMESPACE
class createTableForm : public QDialog, public Ui::createTableForm
{
Q_OBJECT
src/deleteindexform.cpp
+1 -6
View File
@@ -1,10 +1,5 @@
#include "deleteindexform.h"
#include <qvariant.h>
#include <qimage.h>
#include <qpixmap.h>
#include "qmessagebox.h"
#include <QMessageBox>
/*
* Constructs a deleteIndexForm as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
src/deleteindexform.h
+1 -22
View File
@@ -1,34 +1,15 @@
#ifndef DELETEINDEXFORM_H
#define DELETEINDEXFORM_H
#include <qvariant.h>
/* QT_BEGIN_NAMESPACE and QT_END_NAMESPACE weren't introduced into QT right away... */
#ifndef QT_BEGIN_NAMESPACE
#define QT_BEGIN_NAMESPACE
#endif
#ifndef QT_END_NAMESPACE
#define QT_END_NAMESPACE
#endif
#include <QtCore/QVariant>
#include <QtGui/QAction>
#include <QtGui/QApplication>
#include <QtGui/QButtonGroup>
#include <QtGui/QComboBox>
#include <QtGui/QDialog>
#include <QtGui/QHBoxLayout>
#include <QtGui/QHeaderView>
#include <QtGui/QLabel>
#include <QtGui/QPushButton>
#include <QtGui/QSpacerItem>
#include <QtGui/QVBoxLayout>
#include "QtCore/QStringRef"
#include "QtCore/QStringList"
#include "sqlitedb.h"
QT_BEGIN_NAMESPACE
#include <QtCore/QStringList>
class Ui_deleteIndexForm
{
@@ -128,8 +109,6 @@ namespace Ui {
class deleteIndexForm: public Ui_deleteIndexForm {};
} // namespace Ui
QT_END_NAMESPACE
class deleteIndexForm : public QDialog, public Ui::deleteIndexForm
{
Q_OBJECT
src/deletetableform.cpp
+1 -5
View File
@@ -1,10 +1,6 @@
#include "deletetableform.h"
#include <QMessageBox>
#include <qvariant.h>
#include <qimage.h>
#include <qpixmap.h>
#include "qmessagebox.h"
/*
* Constructs a deleteTableForm as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
src/deletetableform.h
+1 -22
View File
@@ -1,34 +1,15 @@
#ifndef DELETETABLEFORM_H
#define DELETETABLEFORM_H
#include <qvariant.h>
/* QT_BEGIN_NAMESPACE and QT_END_NAMESPACE weren't introduced into QT right away... */
#ifndef QT_BEGIN_NAMESPACE
#define QT_BEGIN_NAMESPACE
#endif
#ifndef QT_END_NAMESPACE
#define QT_END_NAMESPACE
#endif
#include <QtCore/QVariant>
#include <QtGui/QAction>
#include <QtGui/QApplication>
#include <QtGui/QButtonGroup>
#include <QtGui/QComboBox>
#include <QtGui/QDialog>
#include <QtGui/QHBoxLayout>
#include <QtGui/QHeaderView>
#include <QtGui/QLabel>
#include <QtGui/QPushButton>
#include <QtGui/QSpacerItem>
#include <QtGui/QVBoxLayout>
#include "QtCore/QStringRef"
#include "QtCore/QStringList"
#include "sqlitedb.h"
QT_BEGIN_NAMESPACE
#include <QtCore/QStringList>
class Ui_deleteTableForm
{
@@ -128,8 +109,6 @@ namespace Ui {
class deleteTableForm: public Ui_deleteTableForm {};
} // namespace Ui
QT_END_NAMESPACE
class deleteTableForm : public QDialog, public Ui::deleteTableForm
{
Q_OBJECT
src/editfieldform.h
+2 -1
View File
@@ -2,7 +2,8 @@
#define EDITFIELDFORM_H
#include <QDialog>
#include "sqlitedb.h"
class DBBrowserDB;
namespace Ui {
class editFieldForm;
src/editform.cpp
+2 -6
View File
@@ -1,13 +1,9 @@
#include "editform.h"
#include <QTextStream>
#include <qvariant.h>
#include <qmessagebox.h>
#include <qimage.h>
#include <qpixmap.h>
#include <QMessageBox>
#include <QFileDialog>
#include "sqlitedb.h"
/*
* Constructs a editForm as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
src/editform.h
-23
View File
@@ -1,27 +1,11 @@
#ifndef EDITFORM_H
#define EDITFORM_H
#include <qvariant.h>
/* QT_BEGIN_NAMESPACE and QT_END_NAMESPACE weren't introduced into QT right away... */
#ifndef QT_BEGIN_NAMESPACE
#define QT_BEGIN_NAMESPACE
#endif
#ifndef QT_END_NAMESPACE
#define QT_END_NAMESPACE
#endif
#include <QFrame>
#include <QTextEdit>
#include <QtCore/QVariant>
#include <QtGui/QAction>
#include <QtGui/QApplication>
#include <QtGui/QButtonGroup>
#include <QtGui/QDialog>
#include <QtGui/QGridLayout>
#include <QtGui/QHBoxLayout>
#include <QtGui/QHeaderView>
#include <QtGui/QLabel>
#include <QtGui/QPushButton>
#include <QtGui/QSpacerItem>
@@ -29,12 +13,7 @@
#include <QtGui/QVBoxLayout>
#include <QtGui/QWidget>
#include <QtGui/QApplication>
#include <QtCore/QFile>
#include <QtGui/QImage>
#include <QtGui/QStackedWidget>
#include <stdlib.h>
QT_BEGIN_NAMESPACE
class Ui_editForm
{
@@ -254,8 +233,6 @@ namespace Ui {
class editForm: public Ui_editForm {};
} // namespace Ui
QT_END_NAMESPACE
class editForm : public QDialog, public Ui::editForm
{
Q_OBJECT
src/edittableform.cpp
+1
View File
@@ -3,6 +3,7 @@
#include "editfieldform.h"
#include <QMessageBox>
#include <QPushButton>
#include "sqlitedb.h"
/*
* Constructs a editTableForm as a child of 'parent', with the
src/edittableform.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define EDITTABLEFORM_H
#include <QDialog>
#include "sqlitedb.h"
class DBBrowserDB;
namespace Ui {
class editTableForm;
src/exporttablecsvform.cpp
-4
View File
@@ -1,9 +1,5 @@
#include "exporttablecsvform.h"
#include <qvariant.h>
#include <qimage.h>
#include <qpixmap.h>
/*
* Constructs a exportTableCSVForm as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
src/exporttablecsvform.h
-19
View File
@@ -1,32 +1,15 @@
#ifndef EXPORTTABLECSVFORM_H
#define EXPORTTABLECSVFORM_H
#include <qvariant.h>
/* QT_BEGIN_NAMESPACE and QT_END_NAMESPACE weren't introduced into QT right away... */
#ifndef QT_BEGIN_NAMESPACE
#define QT_BEGIN_NAMESPACE
#endif
#ifndef QT_END_NAMESPACE
#define QT_END_NAMESPACE
#endif
#include <QtCore/QVariant>
#include <QtGui/QAction>
#include <QtGui/QApplication>
#include <QtGui/QButtonGroup>
#include <QtGui/QComboBox>
#include <QtGui/QDialog>
#include <QtGui/QHBoxLayout>
#include <QtGui/QHeaderView>
#include <QtGui/QLabel>
#include <QtGui/QPushButton>
#include <QtGui/QSpacerItem>
#include <QtGui/QVBoxLayout>
QT_BEGIN_NAMESPACE
class Ui_exportTableCSVForm
{
public:
@@ -125,8 +108,6 @@ namespace Ui {
class exportTableCSVForm: public Ui_exportTableCSVForm {};
} // namespace Ui
QT_END_NAMESPACE
class exportTableCSVForm : public QDialog, public Ui::exportTableCSVForm
{
Q_OBJECT
src/findform.cpp
-4
View File
@@ -1,9 +1,5 @@
#include "findform.h"
#include <qvariant.h>
#include <qimage.h>
#include <qpixmap.h>
/*
* Constructs a findForm as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
src/findform.h
-20
View File
@@ -1,27 +1,11 @@
#ifndef FINDFORM_H
#define FINDFORM_H
#include <qvariant.h>
/* QT_BEGIN_NAMESPACE and QT_END_NAMESPACE weren't introduced into QT right away... */
#ifndef QT_BEGIN_NAMESPACE
#define QT_BEGIN_NAMESPACE
#endif
#ifndef QT_END_NAMESPACE
#define QT_END_NAMESPACE
#endif
#include <QTableWidget>
#include <QtCore/QVariant>
#include <QtGui/QAction>
#include <QtGui/QApplication>
#include <QtGui/QButtonGroup>
#include <QtGui/QComboBox>
#include <QtGui/QDialog>
#include <QtGui/QGridLayout>
#include <QtGui/QHBoxLayout>
#include <QtGui/QHeaderView>
#include <QtGui/QLabel>
#include <QtGui/QLineEdit>
#include <QtGui/QPushButton>
@@ -29,8 +13,6 @@
#include <QtGui/QVBoxLayout>
#include "sqlitedb.h"
QT_BEGIN_NAMESPACE
class Ui_findForm
{
public:
@@ -162,8 +144,6 @@ namespace Ui {
class findForm: public Ui_findForm {};
} // namespace Ui
QT_END_NAMESPACE
class findForm : public QDialog, public Ui::findForm
{
Q_OBJECT
src/importcsvform.cpp
+2 -6
View File
@@ -1,11 +1,7 @@
#include "importcsvform.h"
#include <qvariant.h>
#include <qmessagebox.h>
#include <qapplication.h>
#include <qimage.h>
#include <qpixmap.h>
#include <QMessageBox>
#include <QProgressDialog>
#include "sqlitedb.h"
/*
* Constructs a importCSVForm as a child of 'parent', with the
src/importcsvform.h
+1 -20
View File
@@ -1,38 +1,21 @@
#ifndef IMPORTCSVFORM_H
#define IMPORTCSVFORM_H
#include <qvariant.h>
/* QT_BEGIN_NAMESPACE and QT_END_NAMESPACE weren't introduced into QT right away... */
#ifndef QT_BEGIN_NAMESPACE
#define QT_BEGIN_NAMESPACE
#endif
#ifndef QT_END_NAMESPACE
#define QT_END_NAMESPACE
#endif
#include <QTableWidget>
#include <QtCore/QVariant>
#include <QtGui/QAction>
#include <QtGui/QApplication>
#include <QtGui/QButtonGroup>
#include <QtGui/QCheckBox>
#include <QtGui/QComboBox>
#include <QtGui/QDialog>
#include <QtGui/QGridLayout>
#include <QtGui/QHBoxLayout>
#include <QtGui/QHeaderView>
#include <QtGui/QLabel>
#include <QtGui/QLineEdit>
#include <QtGui/QPushButton>
#include <QtGui/QSpacerItem>
#include <QtGui/QVBoxLayout>
#include <QtCore/QStringRef>
#include <QtCore/QStringList>
#include "sqlitedb.h"
QT_BEGIN_NAMESPACE
class DBBrowserDB;
class Ui_importCSVForm
{
@@ -206,8 +189,6 @@ namespace Ui {
class importCSVForm: public Ui_importCSVForm {};
} // namespace Ui
QT_END_NAMESPACE
class importCSVForm : public QDialog, public Ui::importCSVForm
{
Q_OBJECT
src/mainwindow.cpp
-5
View File
@@ -1,20 +1,15 @@
#include "mainwindow.h"
#include "ui_mainwindow.h"
#include <QtGui/QFileDialog>
#include <QSettings>
#include <QFile>
#include <QApplication>
#include <QVariant>
#include <QImage>
#include <QPixmap>
#include <QTextStream>
#include <QWhatsThis>
#include <QMessageBox>
#include <QUrl>
#include <QStandardItemModel>
#include <QDragEnterEvent>
#include "createtableform.h"
#include "createindexform.h"
#include "deletetableform.h"
src/mainwindow.h
+1 -1
View File
@@ -2,7 +2,6 @@
#define MAINFORM_H
#include <QMainWindow>
#include <QIntValidator>
#include "sqlitedb.h"
#define ORDERMODE_ASC 0
@@ -14,6 +13,7 @@ class editForm;
class findForm;
class SQLiteSyntaxHighlighter;
class QStandardItemModel;
class QIntValidator;
namespace Ui {
class MainWindow;
src/preferencesform.cpp
+2 -24
View File
@@ -1,12 +1,7 @@
#include "preferencesform.h"
#include "ui_preferencesform.h"
#include <qvariant.h>
#include <qimage.h>
#include <qpixmap.h>
#include "qdir.h"
#include "qsettings.h"
#include <QDir>
#include <QSettings>
#include <QFileDialog>
#include "sqlitedb.h"
@@ -34,24 +29,11 @@ preferencesForm::~preferencesForm()
delete ui;
}
/****************************************************************************
** ui.h extension file, included from the uic-generated form implementation.
**
** If you want to add, delete, or rename functions or slots, use
** Qt Designer to update this file, preserving your code.
**
** You should not define a constructor or destructor in this file.
** Instead, write your code in functions called init() and destroy().
** These will automatically be called by the form's constructor and
** destructor.
*****************************************************************************/
void preferencesForm::init()
{
loadSettings();
}
void preferencesForm::defaultDataChanged( int which )
{
if (which==2) {
@@ -73,7 +55,6 @@ void preferencesForm::defaultTextChanged( int which )
}
void preferencesForm::encodingChanged( int which )
{
if (which==1) {
@@ -83,7 +64,6 @@ void preferencesForm::encodingChanged( int which )
}
}
void preferencesForm::chooseLocation()
{
QString s = QFileDialog::getExistingDirectory(
@@ -99,7 +79,6 @@ void preferencesForm::chooseLocation()
}
}
void preferencesForm::loadSettings()
{
QSettings settings(QApplication::organizationName(), g_sApplicationNameShort);
@@ -140,7 +119,6 @@ void preferencesForm::loadSettings()
ui->locationEdit->setText(defaultlocation);
}
void preferencesForm::saveSettings()
{
QSettings settings(QApplication::organizationName(), g_sApplicationNameShort);
src/sqlbrowser_util.c
-2
View File
@@ -4,8 +4,6 @@
#include <stdlib.h>
#include <string.h>
#include "sqlite_source/sqlite3.h"
/*following routines extracted from shell.c for dump support*/
/*
src/sqlitedb.cpp
+3 -4
View File
@@ -1,10 +1,9 @@
#include "sqlitedb.h"
#include "sqlbrowser_util.h"
#include <stdlib.h>
#include <qregexp.h>
#include <qimage.h>
#include <qfile.h>
#include <qmessagebox.h>
#include <QRegExp>
#include <QFile>
#include <QMessageBox>
#include <QProgressDialog>
#include "SQLLogDock.h"
#include <QApplication>
src/sqlitedb.h
+2 -3
View File
@@ -1,9 +1,8 @@
#ifndef SQLITEDB_H
#define SQLITEDB_H
#include <qstringlist.h>
#include <qmap.h>
#include <qobject.h>
#include <QStringList>
#include <QMap>
#include "sqlite3.h"
#include "sqlitebrowsertypes.h"