Rename ExportCsvDialog to ExportData dialog

Sorry for the big change but I think it's preferable to not call it CSV dialog when it's not just doing CSV.
heyuanchao · Aug 25, 2016 · a1e08b3 · a1e08b3
1 parent 3ef9491
commit a1e08b3
Show file tree

Hide file tree

Showing 18 changed files with 304 additions and 304 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -71,7 +71,7 @@ set(SQLB_MOC_HDR
 	src/CreateIndexDialog.h
 	src/EditDialog.h
 	src/EditTableDialog.h
-	src/ExportCsvDialog.h
+	src/ExportDataDialog.h
 	src/ExtendedTableWidget.h
 	src/FilterTableHeader.h
 	src/ImportCsvDialog.h
@@ -96,7 +96,7 @@ set(SQLB_SRC
 	src/CreateIndexDialog.cpp
 	src/EditDialog.cpp
 	src/EditTableDialog.cpp
-	src/ExportCsvDialog.cpp
+	src/ExportDataDialog.cpp
 	src/ExtendedTableWidget.cpp
 	src/FilterTableHeader.cpp
 	src/ImportCsvDialog.cpp
@@ -127,7 +127,7 @@ set(SQLB_FORMS
 	src/CreateIndexDialog.ui
 	src/EditDialog.ui
 	src/EditTableDialog.ui
-	src/ExportCsvDialog.ui
+	src/ExportDataDialog.ui
 	src/ImportCsvDialog.ui
 	src/MainWindow.ui
 	src/PreferencesDialog.ui

diff --git a/src/ExportCsvDialog.cpp → src/ExportDataDialog.cpp b/src/ExportCsvDialog.cpp → src/ExportDataDialog.cpp
@@ -1,5 +1,5 @@
-#include "ExportCsvDialog.h"
-#include "ui_ExportCsvDialog.h"
+#include "ExportDataDialog.h"
+#include "ui_ExportDataDialog.h"
 #include "sqlitedb.h"
 #include "PreferencesDialog.h"
 #include "sqlitetablemodel.h"
@@ -15,9 +15,9 @@
 #include <QJsonObject>
 #endif
 
-ExportCsvDialog::ExportCsvDialog(DBBrowserDB* db, ExportFormats format, QWidget* parent, const QString& query, const QString& selection)
+ExportDataDialog::ExportDataDialog(DBBrowserDB* db, ExportFormats format, QWidget* parent, const QString& query, const QString& selection)
     : QDialog(parent),
-      ui(new Ui::ExportCsvDialog),
+      ui(new Ui::ExportDataDialog),
       pdb(db),
       m_format(format),
       m_sQuery(query)
@@ -64,12 +64,12 @@ ExportCsvDialog::ExportCsvDialog(DBBrowserDB* db, ExportFormats format, QWidget*
     }
 }
 
-ExportCsvDialog::~ExportCsvDialog()
+ExportDataDialog::~ExportDataDialog()
 {
     delete ui;
 }
 
-bool ExportCsvDialog::exportQuery(const QString& sQuery, const QString& sFilename)
+bool ExportDataDialog::exportQuery(const QString& sQuery, const QString& sFilename)
 {
     switch(m_format)
     {
@@ -82,7 +82,7 @@ bool ExportCsvDialog::exportQuery(const QString& sQuery, const QString& sFilenam
     }
 }
 
-bool ExportCsvDialog::exportQueryCsv(const QString& sQuery, const QString& sFilename)
+bool ExportDataDialog::exportQueryCsv(const QString& sQuery, const QString& sFilename)
 {
     // Prepare the quote and separating characters
     QChar quoteChar = currentQuoteChar();
@@ -171,7 +171,7 @@ bool ExportCsvDialog::exportQueryCsv(const QString& sQuery, const QString& sFile
     return true;
 }
 
-bool ExportCsvDialog::exportQueryJson(const QString& sQuery, const QString& sFilename)
+bool ExportDataDialog::exportQueryJson(const QString& sQuery, const QString& sFilename)
 {
 #if QT_VERSION_MAJOR < 5
     return false;
@@ -239,7 +239,7 @@ bool ExportCsvDialog::exportQueryJson(const QString& sQuery, const QString& sFil
 #endif
 }
 
-void ExportCsvDialog::accept()
+void ExportDataDialog::accept()
 {
     QString file_dialog_filter;
     QString default_file_extension;
@@ -336,7 +336,7 @@ void ExportCsvDialog::accept()
     QDialog::accept();
 }
 
-void ExportCsvDialog::showCustomCharEdits()
+void ExportDataDialog::showCustomCharEdits()
 {
     // Retrieve selection info for the quote, separator, and newline widgets
     int quoteIndex = ui->comboQuoteCharacter->currentIndex();
@@ -357,7 +357,7 @@ void ExportCsvDialog::showCustomCharEdits()
     ui->editCustomNewLine->setVisible(newLineVisible);
 }
 
-void ExportCsvDialog::setQuoteChar(const QChar& c)
+void ExportDataDialog::setQuoteChar(const QChar& c)
 {
     QComboBox* combo = ui->comboQuoteCharacter;
 
@@ -387,7 +387,7 @@ void ExportCsvDialog::setQuoteChar(const QChar& c)
     }
 }
 
-char ExportCsvDialog::currentQuoteChar() const
+char ExportDataDialog::currentQuoteChar() const
 {
     QComboBox* combo = ui->comboQuoteCharacter;
 
@@ -416,7 +416,7 @@ char ExportCsvDialog::currentQuoteChar() const
     }
 }
 
-void ExportCsvDialog::setSeparatorChar(const QChar& c)
+void ExportDataDialog::setSeparatorChar(const QChar& c)
 {
     QComboBox* combo = ui->comboFieldSeparator;
 
@@ -452,7 +452,7 @@ void ExportCsvDialog::setSeparatorChar(const QChar& c)
     }
 }
 
-char ExportCsvDialog::currentSeparatorChar() const
+char ExportDataDialog::currentSeparatorChar() const
 {
     QComboBox* combo = ui->comboFieldSeparator;
 
@@ -484,7 +484,7 @@ char ExportCsvDialog::currentSeparatorChar() const
     }
 }
 
-void ExportCsvDialog::setNewLineString(const QString& s)
+void ExportDataDialog::setNewLineString(const QString& s)
 {
     QComboBox* combo = ui->comboNewLineString;
 
@@ -503,7 +503,7 @@ void ExportCsvDialog::setNewLineString(const QString& s)
     }
 }
 
-QString ExportCsvDialog::currentNewLineString() const
+QString ExportDataDialog::currentNewLineString() const
 {
     QComboBox* combo = ui->comboNewLineString;
 

diff --git a/src/ExportCsvDialog.h → src/ExportDataDialog.h b/src/ExportCsvDialog.h → src/ExportDataDialog.h
@@ -1,15 +1,15 @@
-#ifndef EXPORTCSVDIALOG_H
-#define EXPORTCSVDIALOG_H
+#ifndef ExportDataDialog_H
+#define ExportDataDialog_H
 
 #include <QDialog>
 
 class DBBrowserDB;
 
 namespace Ui {
-class ExportCsvDialog;
+class ExportDataDialog;
 }
 
-class ExportCsvDialog : public QDialog
+class ExportDataDialog : public QDialog
 {
     Q_OBJECT
 
@@ -20,8 +20,8 @@ class ExportCsvDialog : public QDialog
         ExportFormatJson,
     };
 
-    explicit ExportCsvDialog(DBBrowserDB* db, ExportFormats format, QWidget* parent = 0, const QString& query = "", const QString& selection = "");
-    ~ExportCsvDialog();
+    explicit ExportDataDialog(DBBrowserDB* db, ExportFormats format, QWidget* parent = 0, const QString& query = "", const QString& selection = "");
+    ~ExportDataDialog();
 
 private slots:
     virtual void accept();
@@ -42,7 +42,7 @@ private slots:
     bool exportQueryJson(const QString& sQuery, const QString& sFilename);
 
 private:
-    Ui::ExportCsvDialog* ui;
+    Ui::ExportDataDialog* ui;
     DBBrowserDB* pdb;
 
     ExportFormats m_format;

diff --git a/src/ExportCsvDialog.ui → src/ExportDataDialog.ui b/src/ExportCsvDialog.ui → src/ExportDataDialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>ExportCsvDialog</class>
- <widget class="QDialog" name="ExportCsvDialog">
+ <class>ExportDataDialog</class>
+ <widget class="QDialog" name="ExportDataDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -324,7 +324,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>ExportCsvDialog</receiver>
+   <receiver>ExportDataDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -340,7 +340,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>ExportCsvDialog</receiver>
+   <receiver>ExportDataDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -356,7 +356,7 @@
   <connection>
    <sender>comboFieldSeparator</sender>
    <signal>currentIndexChanged(int)</signal>
-   <receiver>ExportCsvDialog</receiver>
+   <receiver>ExportDataDialog</receiver>
    <slot>showCustomCharEdits()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -372,7 +372,7 @@
   <connection>
    <sender>comboQuoteCharacter</sender>
    <signal>currentIndexChanged(int)</signal>
-   <receiver>ExportCsvDialog</receiver>
+   <receiver>ExportDataDialog</receiver>
    <slot>showCustomCharEdits()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -388,7 +388,7 @@
   <connection>
    <sender>comboNewLineString</sender>
    <signal>currentIndexChanged(int)</signal>
-   <receiver>ExportCsvDialog</receiver>
+   <receiver>ExportDataDialog</receiver>
    <slot>showCustomCharEdits()</slot>
    <hints>
     <hint type="sourcelabel">

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -5,7 +5,7 @@
 #include "AboutDialog.h"
 #include "EditTableDialog.h"
 #include "ImportCsvDialog.h"
-#include "ExportCsvDialog.h"
+#include "ExportDataDialog.h"
 #include "PreferencesDialog.h"
 #include "EditDialog.h"
 #include "sqlitetablemodel.h"
@@ -1066,7 +1066,7 @@ void MainWindow::exportTableToCSV()
         current_table = ui->comboBrowseTable->currentText();
 
     // Open dialog
-    ExportCsvDialog dialog(&db, ExportCsvDialog::ExportFormatCsv, this, "", current_table);
+    ExportDataDialog dialog(&db, ExportDataDialog::ExportFormatCsv, this, "", current_table);
     dialog.exec();
 }
 
@@ -1083,7 +1083,7 @@ void MainWindow::exportTableToJson()
         current_table = ui->comboBrowseTable->currentText();
 
     // Open dialog
-    ExportCsvDialog dialog(&db, ExportCsvDialog::ExportFormatJson, this, "", current_table);
+    ExportDataDialog dialog(&db, ExportDataDialog::ExportFormatJson, this, "", current_table);
     dialog.exec();
 }
 

diff --git a/src/SqlExecutionArea.cpp b/src/SqlExecutionArea.cpp
@@ -5,7 +5,7 @@
 #include "sqlitetablemodel.h"
 #include "sqlitedb.h"
 #include "PreferencesDialog.h"
-#include "ExportCsvDialog.h"
+#include "ExportDataDialog.h"
 
 #include <QMenu>
 #include <QInputDialog>
@@ -84,7 +84,7 @@ void SqlExecutionArea::enableSaveButton(bool enable)
 
 void SqlExecutionArea::saveAsCsv()
 {
-    ExportCsvDialog dialog(db, ExportCsvDialog::ExportFormatCsv, this, model->query());
+    ExportDataDialog dialog(db, ExportDataDialog::ExportFormatCsv, this, model->query());
     dialog.exec();
 }
 

diff --git a/src/src.pro b/src/src.pro
@@ -31,7 +31,7 @@ HEADERS += \
     EditTableDialog.h \
     PreferencesDialog.h \
     EditDialog.h \
-    ExportCsvDialog.h \
+    ExportDataDialog.h \
     ImportCsvDialog.h \
     sqltextedit.h \
     sqlitetypes.h \
@@ -63,7 +63,7 @@ SOURCES += \
     PreferencesDialog.cpp \
     AboutDialog.cpp \
     EditDialog.cpp \
-    ExportCsvDialog.cpp \
+    ExportDataDialog.cpp \
     ImportCsvDialog.cpp \
     sqltextedit.cpp \
     sqlitetypes.cpp \
@@ -95,7 +95,7 @@ FORMS += \
     EditTableDialog.ui \
     PreferencesDialog.ui \
     EditDialog.ui \
-    ExportCsvDialog.ui \
+    ExportDataDialog.ui \
     ImportCsvDialog.ui \
     SqlExecutionArea.ui \
     VacuumDialog.ui \