summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorisanae <14251494+isanae@users.noreply.github.com>2019-09-11 23:34:54 -0400
committerisanae <14251494+isanae@users.noreply.github.com>2019-09-11 23:34:54 -0400
commit06218502ed5379555eda1504e6b05f2ef6dfb292 (patch)
tree801c9efe4021ad1fc7e0c16f94c5a8111f80fc8c
parent09f98576e882a5fef68cdefdff939834a8782eaa (diff)
fixes for ExpanderWidget
removed dead code in MainWindow
-rw-r--r--src/CMakeLists.txt3
-rw-r--r--src/mainwindow.cpp11
-rw-r--r--src/mainwindow.h3
-rw-r--r--src/modinfodialogconflicts.h2
-rw-r--r--src/settings.h6
-rw-r--r--src/settingsutilities.h6
6 files changed, 8 insertions, 23 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ea27184b..60822834 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -136,7 +136,6 @@ SET(organizer_SRCS
apiuseraccount.cpp
filerenamer.cpp
texteditor.cpp
- expanderwidget.cpp
env.cpp
envmetrics.cpp
envmodule.cpp
@@ -260,7 +259,6 @@ SET(organizer_HDRS
apiuseraccount.h
filerenamer.h
texteditor.h
- expanderwidget.h
env.h
envmetrics.h
envmodule.h
@@ -478,7 +476,6 @@ set(utilities
)
set(widgets
- expanderwidget
genericicondelegate
filerenamer
filterwidget
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 657c1a27..054262e9 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -2561,17 +2561,6 @@ void MainWindow::modInstalled(const QString &modName)
modUpdateCheck(IDs);
}
-void MainWindow::procError(QProcess::ProcessError error)
-{
- reportError(tr("failed to spawn notepad.exe: %1").arg(error));
- this->sender()->deleteLater();
-}
-
-void MainWindow::procFinished(int, QProcess::ExitStatus)
-{
- this->sender()->deleteLater();
-}
-
void MainWindow::showMessage(const QString &message)
{
MessageDialog::showMessage(message, this);
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 6f06b9d5..1f997ab1 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -489,9 +489,6 @@ private slots:
void doMoveOverwriteContentToMod(const QString &modAbsolutePath);
void clearOverwrite();
- void procError(QProcess::ProcessError error);
- void procFinished(int exitCode, QProcess::ExitStatus exitStatus);
-
// nexus related
void checkModsForUpdates();
diff --git a/src/modinfodialogconflicts.h b/src/modinfodialogconflicts.h
index a77c2ac9..ad305dfc 100644
--- a/src/modinfodialogconflicts.h
+++ b/src/modinfodialogconflicts.h
@@ -33,7 +33,7 @@ signals:
private:
struct Expanders
{
- ExpanderWidget overwrite, overwritten, nonconflict;
+ MOBase::ExpanderWidget overwrite, overwritten, nonconflict;
};
ConflictsTab* m_tab;
diff --git a/src/settings.h b/src/settings.h
index 91b87e29..815ed160 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -32,13 +32,13 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
namespace MOBase {
class IPlugin;
class IPluginGame;
+ class ExpanderWidget;
}
class QSplitter;
class ServerList;
class Settings;
-class ExpanderWidget;
// helper class that calls restoreGeometry() in the constructor and
@@ -153,8 +153,8 @@ public:
void saveState(const QSplitter* splitter);
bool restoreState(QSplitter* splitter) const;
- void saveState(const ExpanderWidget* expander);
- bool restoreState(ExpanderWidget* expander) const;
+ void saveState(const MOBase::ExpanderWidget* expander);
+ bool restoreState(MOBase::ExpanderWidget* expander) const;
void saveVisibility(const QWidget* w);
bool restoreVisibility(QWidget* w, std::optional<bool> def={}) const;
diff --git a/src/settingsutilities.h b/src/settingsutilities.h
index d99abb06..c3eef12f 100644
--- a/src/settingsutilities.h
+++ b/src/settingsutilities.h
@@ -3,7 +3,9 @@
#include <log.h>
-class ExpanderWidget;
+namespace MOBase {
+ class ExpanderWidget;
+}
template <class T, class=void>
struct ValueConverter
@@ -241,7 +243,7 @@ private:
QString widgetNameWithTopLevel(const QWidget* widget);
QString widgetName(const QMainWindow* w);
QString widgetName(const QHeaderView* w);
-QString widgetName(const ExpanderWidget* w);
+QString widgetName(const MOBase::ExpanderWidget* w);
QString widgetName(const QWidget* w);
template <class Widget>