[education/rkward] rkward: Delay icon initialization some further

Thomas Friedrichsmeier null at kde.org
Mon Mar 3 09:58:33 GMT 2025


Git commit 6b4d0e3718e532a6a986a155734b2341766f3d90 by Thomas Friedrichsmeier.
Committed on 03/03/2025 at 09:54.
Pushed by tfry into branch 'master'.

Delay icon initialization some further

M  +0    -2    rkward/main.cpp
M  +4    -2    rkward/rkward.cpp

https://invent.kde.org/education/rkward/-/commit/6b4d0e3718e532a6a986a155734b2341766f3d90

diff --git a/rkward/main.cpp b/rkward/main.cpp
index 6986194af..2526b2f9d 100644
--- a/rkward/main.cpp
+++ b/rkward/main.cpp
@@ -197,8 +197,6 @@ int main (int argc, char *argv[]) {
 	aboutData.setOtherText(QString("<p><b>%1</b></p><ul><li><a href=\"https://www.jstatsoft.org/article/view/v049i09\">%2</a></li><li>Friedrichsmeier, T. & the RKWard Team (%3). RKWard: %4. Version %5. %6</li></ul>").arg(i18n("How to cite:"), i18n("Peer-reviewed article in the Journal of Statistical Software"), aboutData.copyrightStatement().right(4), aboutData.shortDescription(), aboutData.version(), aboutData.homepage()));
 	KAboutData::setApplicationData (aboutData);
 
-	RKStandardIcons::initIcons ();
-	QApplication::setWindowIcon(RKStandardIcons::getIcon(RKStandardIcons::RKWardIcon));
 #ifdef WITH_KCRASH
 	KCrash::setDrKonqiEnabled(true);
 	KCrash::initialize();
diff --git a/rkward/rkward.cpp b/rkward/rkward.cpp
index d6fea299b..07f4a7a29 100644
--- a/rkward/rkward.cpp
+++ b/rkward/rkward.cpp
@@ -116,8 +116,6 @@ RKWardMainWindow::RKWardMainWindow() : KParts::MainWindow() {
 	RK_TRACE(APP);
 	RK_ASSERT(rkward_mainwin == nullptr);
 
-	Q_INIT_RESOURCE(resources);
-	Q_INIT_RESOURCE(icons);
 	testmode_suppress_dialogs = false;
 	gui_rebuild_locked = true;
 	no_ask_save = true;
@@ -130,6 +128,10 @@ RKWardMainWindow::RKWardMainWindow() : KParts::MainWindow() {
 
 	///////////////////////////////////////////////////////////////////
 	// call inits to invoke all other construction parts
+	Q_INIT_RESOURCE(resources);
+	Q_INIT_RESOURCE(icons);
+	RKStandardIcons::initIcons();
+	QApplication::setWindowIcon(RKStandardIcons::getIcon(RKStandardIcons::RKWardIcon));
 	initActions();
 
 	new RKWorkplace (this);



More information about the rkward-tracker mailing list