Rename KStartup for enhanced compatibility with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 31fde11959
commit 9a9f0befb2

@ -17,7 +17,7 @@
#include <kstandarddirs.h>
#include <tqtimer.h>
KStartupLogo::KStartupLogo(TQWidget * parent, const char *name)
TDEStartupLogo::TDEStartupLogo(TQWidget * parent, const char *name)
: TQWidget(parent,name, TQt::WStyle_NoBorder | TQt::WStyle_Customize | TQt::WDestructiveClose )
,m_bReadyToHide(false) {
//pm.load(locate("appdata", "pics/startlogo.png"));
@ -35,21 +35,21 @@ KStartupLogo::KStartupLogo(TQWidget * parent, const char *name)
timer->start(2000, true);
}
KStartupLogo::~KStartupLogo() {
TDEStartupLogo::~TDEStartupLogo() {
delete timer;
}
void KStartupLogo::mousePressEvent( TQMouseEvent*) {
void TDEStartupLogo::mousePressEvent( TQMouseEvent*) {
// for the haters of raising startlogos
if (m_bReadyToHide)
hide();
}
void KStartupLogo::timerDone() {
void TDEStartupLogo::timerDone() {
this->hide();
}
void KStartupLogo::setHideEnabled(bool bEnabled) {
void TDEStartupLogo::setHideEnabled(bool bEnabled) {
m_bReadyToHide = bEnabled;
}
#include "kstartuplogo.moc"

@ -24,12 +24,12 @@
* This class is mostly borrowed from another project, probably KMyMoney2.
* Bugs and comments to uml-devel@lists.sf.net or http://bugs.kde.org
*/
class KStartupLogo : public TQWidget {
class TDEStartupLogo : public TQWidget {
Q_OBJECT
public:
KStartupLogo(TQWidget *parent=0, const char *name=0);
~KStartupLogo();
TDEStartupLogo(TQWidget *parent=0, const char *name=0);
~TDEStartupLogo();
void setHideEnabled(bool bEnabled);
protected:

@ -62,7 +62,7 @@ bool getShowGUI(TDECmdLineArgs *args);
* @param showGUI If the GUI should be shown.
* @return The startup logo for the application, or a null pointer if it shouldn't be shown.
*/
KStartupLogo* showStartupLogo(TDEConfig* cfg, bool showGUI);
TDEStartupLogo* showStartupLogo(TDEConfig* cfg, bool showGUI);
/**
* Initializes the document used by the application.
@ -110,7 +110,7 @@ int main(int argc, char *argv[]) {
flushEvents();
TDEConfig * cfg = app.config();
KStartupLogo* startLogo = showStartupLogo(cfg, showGUI);
TDEStartupLogo* startLogo = showStartupLogo(cfg, showGUI);
if (showGUI) {
uml->show();
@ -145,18 +145,18 @@ bool getShowGUI(TDECmdLineArgs *args) {
return true;
}
KStartupLogo* showStartupLogo(TDEConfig* cfg, bool showGUI) {
KStartupLogo* startLogo = 0L;
TDEStartupLogo* showStartupLogo(TDEConfig* cfg, bool showGUI) {
TDEStartupLogo* startLogo = 0L;
cfg->setGroup( "General Options" );
bool showLogo = cfg->readBoolEntry( "logo", true );
if (showGUI && showLogo) {
#if KDE_IS_VERSION(3,3,90)
startLogo = new KStartupLogo(0);
startLogo = new TDEStartupLogo(0);
startLogo->setHideEnabled(true);
KWin::setMainWindow(startLogo, UMLApp::app()->winId());
#else
startLogo = new KStartupLogo(UMLApp::app());
startLogo = new TDEStartupLogo(UMLApp::app());
startLogo->setHideEnabled(true);
#endif
KWin::setState(startLogo->winId(), NET::KeepAbove);

Loading…
Cancel
Save