summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Heinecke <aheinecke@intevation.de>2016-08-04 10:42:57 (GMT)
committerAndre Heinecke <aheinecke@intevation.de>2016-08-04 10:49:00 (GMT)
commit36ff83c012335bfec009353c412e96ed38854f05 (patch)
treec55231f276708fea5b737d56cfd960b8feadb8ee
parentd025eb8cf71451276c6164a493c133aa158b911c (diff)
Remove splashscreen code from selftestcommand
Splashscreen is gone for good.
-rw-r--r--src/commands/selftestcommand.cpp21
-rw-r--r--src/commands/selftestcommand.h3
2 files changed, 0 insertions, 24 deletions
diff --git a/src/commands/selftestcommand.cpp b/src/commands/selftestcommand.cpp
index 64fbeba..50fc205 100644
--- a/src/commands/selftestcommand.cpp
+++ b/src/commands/selftestcommand.cpp
@@ -53,7 +53,6 @@
#include <KLocalizedString>
#include <KConfigGroup>
-#include <QSplashScreen>
#include <KSharedConfig>
#include <boost/shared_ptr.hpp>
@@ -118,11 +117,6 @@ private:
} else {
dialog->show();
}
-#ifndef QT_NO_SPLASHSCREEN
- if (splash) {
- splash->finish(dialog);
- }
-#endif // QT_NO_SPLASHSCREEN
}
bool runAtStartUp() const
@@ -198,9 +192,6 @@ private:
}
private:
-#ifndef QT_NO_SPLASHSCREEN
- QPointer<QSplashScreen> splash;
-#endif // QT_NO_SPLASHSCREEN
QPointer<SelfTestDialog> dialog;
bool canceled;
bool automatic;
@@ -220,9 +211,6 @@ const SelfTestCommand::Private *SelfTestCommand::d_func() const
SelfTestCommand::Private::Private(SelfTestCommand *qq, KeyListController *c)
: Command::Private(qq, c),
-#ifndef QT_NO_SPLASHSCREEN
- splash(),
-#endif // QT_NO_SPLASHSCREEN
dialog(),
canceled(false),
automatic(false)
@@ -262,15 +250,6 @@ void SelfTestCommand::setAutomaticMode(bool on)
}
}
-void SelfTestCommand::setSplashScreen(QSplashScreen *splash)
-{
-#ifndef QT_NO_SPLASHSCREEN
- d->splash = splash;
-#else
- Q_UNUSED(splash);
-#endif // QT_NO_SPLASHSCREEN
-}
-
bool SelfTestCommand::isCanceled() const
{
return d->canceled;
diff --git a/src/commands/selftestcommand.h b/src/commands/selftestcommand.h
index 20c30bc..10cbac6 100644
--- a/src/commands/selftestcommand.h
+++ b/src/commands/selftestcommand.h
@@ -35,8 +35,6 @@
#include <commands/command.h>
-class QSplashScreen;
-
namespace Kleo
{
namespace Commands
@@ -51,7 +49,6 @@ public:
~SelfTestCommand();
void setAutomaticMode(bool automatic);
- void setSplashScreen(QSplashScreen *splash);
bool isCanceled() const;