IWorker -> AbstractWorkerに変更。

diff --git a/Gefu.pro b/Gefu.pro
index 9dcbb1f..04149f9 100644 (file)
--- a/Gefu.pro
+++ b/Gefu.pro
@@ -19,7 +19,6 @@ SOURCES += main.cpp\
     renamemultidialog.cpp \
     operationdialog.cpp \
     irenamedialog.cpp \
-    iworker.cpp \
     renameworker.cpp \
     deleteworker.cpp \
     overwritedialog.cpp \
@@ -36,7 +35,8 @@ SOURCES += main.cpp\
     anyview.cpp \
     folderpanel.cpp \
     bookmarkdialog.cpp \
-    simpleimageview.cpp
+    simpleimageview.cpp \
+    abstractworker.cpp
 
 HEADERS  += mainwindow.h \
     renamesingledialog.h \
@@ -44,7 +44,6 @@ HEADERS  += mainwindow.h \
     operationdialog.h \
     common.h \
     irenamedialog.h \
-    iworker.h \
     renameworker.h \
     deleteworker.h \
     overwritedialog.h \
@@ -62,7 +61,8 @@ HEADERS  += mainwindow.h \
     anyview.h \
     folderpanel.h \
     bookmarkdialog.h \
-    simpleimageview.h
+    simpleimageview.h \
+    abstractworker.h
 
 FORMS    += mainwindow.ui \
     renamesingledialog.ui \

diff --git a/abstractworker.cpp b/abstractworker.cpp
new file mode 100644 (file)
index 0000000..d76c5d7
--- /dev/null
+++ b/abstractworker.cpp
@@ -0,0 +1,23 @@
+#include "abstractworker.h"\r
+\r
+AbstractWorker::AbstractWorker(QObject *parent) :\r
+    QObject(parent),\r
+    m_progressText(NULL),\r
+    m_Mutex(),\r
+    m_stopRequested(false)\r
+{\r
+}\r
+\r
+void AbstractWorker::setProgressText(QLabel *label) {\r
+    m_progressText = label;\r
+}\r
+\r
+void AbstractWorker::requestStop() {\r
+    QMutexLocker lock(&m_Mutex);\r
+    m_stopRequested = true;\r
+}\r
+\r
+bool AbstractWorker::isStopRequested() {\r
+    QMutexLocker lock(&m_Mutex);\r
+    return m_stopRequested;\r
+}\r

diff --git a/abstractworker.h b/abstractworker.h
new file mode 100644 (file)
index 0000000..0e9cfa0
--- /dev/null
+++ b/abstractworker.h
@@ -0,0 +1,37 @@
+#ifndef ABSTRACTWORKER_H\r
+#define ABSTRACTWORKER_H\r
+\r
+#include <QLabel>\r
+#include <QMutex>\r
+#include <QObject>\r
+\r
+class AbstractWorker : public QObject\r
+{\r
+    Q_OBJECT\r
+public:\r
+    explicit AbstractWorker(QObject *parent = 0);\r
+\r
+    void setProgressText(QLabel *label);\r
+    void requestStop();\r
+\r
+protected:\r
+    QLabel *m_progressText;\r
+\r
+    bool isStopRequested();\r
+\r
+signals:\r
+    void canceled();\r
+    void finished();\r
+    void operation(const QString &msg);\r
+    void success(const QString &msg);\r
+    void error(const QString &msg);\r
+\r
+public slots:\r
+    virtual void operate() = 0;\r
+\r
+private:\r
+    QMutex m_Mutex;\r
+    bool m_stopRequested;\r
+};\r
+\r
+#endif // ABSTRACTWORKER_H\r

diff --git a/copymoveworker.cpp b/copymoveworker.cpp
index f23ee70..efe891b 100644 (file)
--- a/copymoveworker.cpp
+++ b/copymoveworker.cpp
@@ -7,7 +7,7 @@
 #include <QThread>\r
 \r
 CopyMoveWorker::CopyMoveWorker(QObject *parent) :\r
-    IWorker(parent),\r
+    AbstractWorker(parent),\r
     m_CopyList(NULL),\r
     m_tgtDir(),\r
     m_CopyMap(),\r

diff --git a/copymoveworker.h b/copymoveworker.h
index 7cdac09..c677fe4 100644 (file)
--- a/copymoveworker.h
+++ b/copymoveworker.h
@@ -2,12 +2,12 @@
 #define COPYWORKER_H\r
 \r
 #include "common.h"\r
-#include "iworker.h"\r
+#include "abstractworker.h"\r
 \r
 #include <QFileInfo>\r
 #include <QMap>\r
 \r
-class CopyMoveWorker : public IWorker\r
+class CopyMoveWorker : public AbstractWorker\r
 {\r
     Q_OBJECT\r
 public:\r

diff --git a/deleteworker.cpp b/deleteworker.cpp
index 478de33..65fcac1 100644 (file)
--- a/deleteworker.cpp
+++ b/deleteworker.cpp
@@ -4,7 +4,7 @@
 #include <QDebug>\r
 \r
 DeleteWorker::DeleteWorker(QObject *parent) :\r
-    IWorker(parent),\r
+    AbstractWorker(parent),\r
     m_DeleteList(NULL),\r
     m_Targets()\r
 {\r

diff --git a/deleteworker.h b/deleteworker.h
index addedd8..4c178ce 100644 (file)
--- a/deleteworker.h
+++ b/deleteworker.h
@@ -1,11 +1,11 @@
 #ifndef DELETEWORKER_H\r
 #define DELETEWORKER_H\r
 \r
-#include "iworker.h"\r
+#include "abstractworker.h"\r
 \r
 #include <QFileInfoList>\r
 \r
-class DeleteWorker : public IWorker\r
+class DeleteWorker : public AbstractWorker\r
 {\r
     Q_OBJECT\r
 public:\r

diff --git a/iworker.cpp b/iworker.cpp
deleted file mode 100644 (file)
index 0483a97..0000000
--- a/iworker.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "iworker.h"\r
-\r
-IWorker::IWorker(QObject *parent) :\r
-    QObject(parent),\r
-    m_progressText(NULL),\r
-    m_Mutex(),\r
-    m_stopRequested(false)\r
-{\r
-}\r

diff --git a/iworker.h b/iworker.h
deleted file mode 100644 (file)
index a19c4fb..0000000
--- a/iworker.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef IWORKER_H\r
-#define IWORKER_H\r
-\r
-#include <QLabel>\r
-#include <QMutex>\r
-#include <QObject>\r
-\r
-class IWorker : public QObject\r
-{\r
-    Q_OBJECT\r
-public:\r
-    explicit IWorker(QObject *parent = 0);\r
-\r
-    void setProgressText(QLabel *label) {\r
-        m_progressText = label;\r
-    }\r
-\r
-    void requestStop() {\r
-        QMutexLocker lock(&m_Mutex);\r
-        m_stopRequested = true;\r
-    }\r
-\r
-protected:\r
-    QLabel *m_progressText;\r
-\r
-    bool isStopRequested() {\r
-        QMutexLocker lock(&m_Mutex);\r
-        return m_stopRequested;\r
-    }\r
-\r
-signals:\r
-    void canceled();\r
-    void finished();\r
-    void operation(const QString &msg);\r
-    void success(const QString &msg);\r
-    void error(const QString &msg);\r
-\r
-public slots:\r
-    virtual void operate() = 0;\r
-\r
-private:\r
-    QMutex m_Mutex;\r
-    bool m_stopRequested;\r
-};\r
-\r
-#endif // IWORKER_H\r

diff --git a/mainwindow.cpp b/mainwindow.cpp
index b2f059a..f0486d6 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -474,7 +474,6 @@ void MainWindow::dropAccept(const QFileInfoList &list, QDropEvent *event)
     FolderView *view = static_cast<FolderView*>(sender());\r
     Q_CHECK_PTR(view);\r
 \r
-    bool move = false;\r
     QMenu menu(this);\r
     QAction *actCopy = menu.addAction(tr("コピー"));\r
     QAction *actMove = menu.addAction(tr("移動"));\r

diff --git a/mainwindow.ui b/mainwindow.ui
index f74a95a..d0138cd 100644 (file)
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -6,8 +6,8 @@
    <rect>\r
     <x>0</x>\r
     <y>0</y>\r
-    <width>828</width>\r
-    <height>365</height>\r
+    <width>656</width>\r
+    <height>133</height>\r
    </rect>\r
   </property>\r
   <property name="windowTitle">\r
@@ -18,60 +18,27 @@
     <normaloff>:/images/Gefu.png</normaloff>:/images/Gefu.png</iconset>\r
   </property>\r
   <widget class="QWidget" name="centralWidget">\r
-   <layout class="QVBoxLayout" name="verticalLayout_3">\r
-    <property name="spacing">\r
-     <number>0</number>\r
-    </property>\r
-    <property name="leftMargin">\r
-     <number>0</number>\r
-    </property>\r
-    <property name="topMargin">\r
-     <number>0</number>\r
-    </property>\r
-    <property name="rightMargin">\r
-     <number>0</number>\r
-    </property>\r
-    <property name="bottomMargin">\r
-     <number>0</number>\r
-    </property>\r
+   <layout class="QVBoxLayout" name="verticalLayout">\r
     <item>\r
      <widget class="QSplitter" name="splitter">\r
       <property name="orientation">\r
        <enum>Qt::Horizontal</enum>\r
       </property>\r
-      <widget class="QWidget" name="layoutWidget">\r
-       <layout class="QVBoxLayout" name="verticalLayout_2">\r
-        <property name="spacing">\r
-         <number>0</number>\r
-        </property>\r
-        <item>\r
-         <widget class="AnyView" name="pane1" native="true">\r
-          <property name="sizePolicy">\r
-           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">\r
-            <horstretch>0</horstretch>\r
-            <verstretch>0</verstretch>\r
-           </sizepolicy>\r
-          </property>\r
-         </widget>\r
-        </item>\r
-       </layout>\r
+      <widget class="AnyView" name="pane1" native="true">\r
+       <property name="sizePolicy">\r
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">\r
+         <horstretch>0</horstretch>\r
+         <verstretch>0</verstretch>\r
+        </sizepolicy>\r
+       </property>\r
       </widget>\r
-      <widget class="QWidget" name="layoutWidget">\r
-       <layout class="QVBoxLayout" name="verticalLayout_1">\r
-        <property name="spacing">\r
-         <number>0</number>\r
-        </property>\r
-        <item>\r
-         <widget class="AnyView" name="pane2" native="true">\r
-          <property name="sizePolicy">\r
-           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">\r
-            <horstretch>0</horstretch>\r
-            <verstretch>0</verstretch>\r
-           </sizepolicy>\r
-          </property>\r
-         </widget>\r
-        </item>\r
-       </layout>\r
+      <widget class="AnyView" name="pane2" native="true">\r
+       <property name="sizePolicy">\r
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">\r
+         <horstretch>0</horstretch>\r
+         <verstretch>0</verstretch>\r
+        </sizepolicy>\r
+       </property>\r
       </widget>\r
      </widget>\r
     </item>\r
@@ -131,7 +98,7 @@
     <rect>\r
      <x>0</x>\r
      <y>0</y>\r
-     <width>828</width>\r
+     <width>656</width>\r
      <height>22</height>\r
     </rect>\r
    </property>\r

diff --git a/operationdialog.h b/operationdialog.h
index 5821c77..8c2f2ae 100644 (file)
--- a/operationdialog.h
+++ b/operationdialog.h
@@ -1,7 +1,7 @@
 #ifndef OPERATIONDIALOG_H\r
 #define OPERATIONDIALOG_H\r
 \r
-#include "iworker.h"\r
+#include "abstractworker.h"\r
 #include <QDialog>\r
 \r
 namespace Ui {\r
@@ -16,7 +16,7 @@ public:
     explicit OperationDialog(QWidget *parent = 0);\r
     ~OperationDialog();\r
 \r
-    void setWorker(IWorker *worker) {\r
+    void setWorker(AbstractWorker *worker) {\r
         m_worker = worker;\r
     }\r
     void setAutoClose(bool yes);\r
@@ -27,7 +27,7 @@ protected:
 \r
 private:\r
     Ui::OperationDialog *ui;\r
-    IWorker *m_worker;\r
+    AbstractWorker *m_worker;\r
     bool m_Error;\r
 \r
 private slots:\r

diff --git a/renameworker.cpp b/renameworker.cpp
index ac813d9..f998b3c 100644 (file)
--- a/renameworker.cpp
+++ b/renameworker.cpp
@@ -3,7 +3,7 @@
 #include <QFileInfo>\r
 \r
 RenameWorker::RenameWorker(QObject *parent) :\r
-    IWorker(parent),\r
+    AbstractWorker(parent),\r
     m_RenameMap(NULL)\r
 {\r
 }\r

diff --git a/renameworker.h b/renameworker.h
index d7f72f4..f571501 100644 (file)
--- a/renameworker.h
+++ b/renameworker.h
@@ -2,9 +2,9 @@
 #define RENAMEWORKER_H\r
 \r
 #include "common.h"\r
-#include "iworker.h"\r
+#include "abstractworker.h"\r
 \r
-class RenameWorker : public IWorker\r
+class RenameWorker : public AbstractWorker\r
 {\r
     Q_OBJECT\r
 public:\r

diff --git a/version.h b/version.h
index 742b8a2..cd1694d 100644 (file)
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #ifndef VERSION_H
 #define VERSION_H
 
-#define VERSION_VALUE   0.20
+#define VERSION_VALUE   0.21
 
 #endif // VERSION_H