[rkward-cvs] SF.net SVN: rkward: [884] trunk/rkward/rkward

[tfry at users.sourceforge.net]

Revision: 884
          http://svn.sourceforge.net/rkward/?rev=884&view=rev
Author:   tfry
Date:     2006-10-19 08:10:32 -0700 (Thu, 19 Oct 2006)

Log Message:
-----------
Small cleanups

Modified Paths:
--------------
    trunk/rkward/rkward/rkward.cpp
    trunk/rkward/rkward/rkward.h

Modified: trunk/rkward/rkward/rkward.cpp
===================================================================
--- trunk/rkward/rkward/rkward.cpp	2006-10-19 15:05:39 UTC (rev 883)
+++ trunk/rkward/rkward/rkward.cpp	2006-10-19 15:10:32 UTC (rev 884)
@@ -110,9 +110,8 @@
 	///////////////////////////////////////////////////////////////////
 	// build the interface
 
-	// use the absolute path to your rkwardui.rc file for testing purpose in createGUI();
-	setXMLFile( "rkwardui.rc" );
-	createShellGUI ( true );
+	setXMLFile ("rkwardui.rc");
+	createShellGUI (true);
 
 	connect (this, SIGNAL (childWindowCloseRequest (KMdiChildView *)), this, SLOT (slotChildWindowCloseRequest (KMdiChildView *)));
 
@@ -121,9 +120,7 @@
 
 	initial_url = load_url;
 
-	startup_timer = new QTimer (this);
-	startup_timer->start (50);
-	connect (startup_timer, SIGNAL (timeout ()), this, SLOT (doPostInit ()));
+	QTimer::singleShot (50, this, SLOT (doPostInit ()));
 
 	part_manager = new KParts::PartManager( this );
 	// When the manager says the active part changes,
@@ -139,10 +136,6 @@
 	layout->addWidget (RKWorkplace::mainWorkplace ()->view ());
 	connect (RKWorkplace::mainWorkplace ()->view (), SIGNAL (captionChanged (const QString &)), this, SLOT (setCaption (const QString &)));
 
-/*	// a few calls to setCaption too many result from the lines below, but it seems to be the only way to catch all cases where the caption should be changed
-	connect (this, SIGNAL (viewActivated (KMdiChildView *)), this, SLOT (viewChanged (KMdiChildView *)));
-	connect (this, SIGNAL (viewDeactivated (KMdiChildView *)), this, SLOT (viewChanged (KMdiChildView *))); */
-
 	if (!kapp->dcopClient ()->isRegistered ()) {
 		kapp->dcopClient ()->registerAs ("rkward");
 		kapp->dcopClient ()->setDefaultObject (objId ());
@@ -160,7 +153,6 @@
 
 void RKwardApp::doPostInit () {
 	RK_TRACE (APP);
-	delete startup_timer;
 
 	readOptions();
 	object_browser = new RObjectBrowser ();

Modified: trunk/rkward/rkward/rkward.h
===================================================================
--- trunk/rkward/rkward/rkward.h	2006-10-19 15:05:39 UTC (rev 883)
+++ trunk/rkward/rkward/rkward.h	2006-10-19 15:10:32 UTC (rev 884)
@@ -44,7 +44,6 @@
 #include <kurl.h>
 #include <kparts/partmanager.h>
 
-class QTimer;
 class QLabel;
 // forward declaration of the RKward classes
 class RSettings;
@@ -238,9 +237,6 @@
 	/** Finds plugins and inserts them into the menu-structure */
 	void initPlugins ();
 
-	/** Used to receive a signal during startup AFTER the exec loop was entered */
-	QTimer *startup_timer;
-	
 	RObjectBrowser *object_browser;
 	
 	KURL *initial_url;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.