Rename KStartup for enhanced compatibility with KDE4

5 files changed, 17 insertions, 17 deletions

diff --git a/ChangeLog.original b/ChangeLog.original
index af2d7b8..d017315 100644
--- a/ChangeLog.original
+++ b/ChangeLog.original
@@ -140,7 +140,7 @@
   Michael.
 
 0.2pre1 - 0.2pre2
-  Fixed the KStartupLogo class to actually find the picture to display on startup.
+  Fixed the TDEStartupLogo class to actually find the picture to display on startup.
   Stopped using the DateInput class from calendar-0.13 and am now using my own widget, with
     some code temporarily used from KDatePicker until that widget gets updated in KDE (if it
     ever does, Iv'e mailed the maintainer requesting a change to the widgets code (16/08/00) ).
diff --git a/kmymoney2/kmymoney2.cpp b/kmymoney2/kmymoney2.cpp
index 8c58101..13ef387 100644
--- a/kmymoney2/kmymoney2.cpp
+++ b/kmymoney2/kmymoney2.cpp
@@ -5852,7 +5852,7 @@ void KMyMoney2App::webConnect(const TQString& url, const TQCString& asn_id)
 
   // Bring this window to the forefront.  This method was suggested by
   // Lubos Lunak <l.lunak@suse.cz> of the KDE core development team.
-  KStartupInfo::setNewStartupId(this, asn_id);
+  TDEStartupInfo::setNewStartupId(this, asn_id);
 
   // Make sure we have an open file
   if ( ! myMoneyView->fileOpen() &&
diff --git a/kmymoney2/kstartuplogo.cpp b/kmymoney2/kstartuplogo.cpp
index 7b52bb5..770d592 100644
--- a/kmymoney2/kstartuplogo.cpp
+++ b/kmymoney2/kstartuplogo.cpp
@@ -38,7 +38,7 @@
 #include "kstartuplogo.h"
 #include "kmymoneyglobalsettings.h"
 
-class KStartupSplash::Private
+class TDEStartupSplash::Private
 {
   public:
     TQString message;
@@ -46,18 +46,18 @@ class KStartupSplash::Private
     int align;
 };
 
-KStartupSplash::KStartupSplash(const TQPixmap &pixmap, WFlags f) :
+TDEStartupSplash::TDEStartupSplash(const TQPixmap &pixmap, WFlags f) :
   KSplashScreen(pixmap, f),
   d(new Private)
 {
 }
 
-KStartupSplash::~KStartupSplash()
+TDEStartupSplash::~TDEStartupSplash()
 {
   delete d;
 }
 
-void KStartupSplash::message( const TQString &message, int alignment, const TQColor &color)
+void TDEStartupSplash::message( const TQString &message, int alignment, const TQColor &color)
 {
   d->message = message;
   d->align = alignment;
@@ -67,7 +67,7 @@ void KStartupSplash::message( const TQString &message, int alignment, const TQCo
   KSplashScreen::clear();
 }
 
-void KStartupSplash::drawContents( TQPainter *painter )
+void TDEStartupSplash::drawContents( TQPainter *painter )
 {
   painter->setPen( d->color );
   TQRect r = rect();
@@ -75,7 +75,7 @@ void KStartupSplash::drawContents( TQPainter *painter )
   painter->drawText( r, d->align, d->message);
 }
 
-KStartupLogo::KStartupLogo() :
+TDEStartupLogo::TDEStartupLogo() :
   TQObject(0, 0),
   m_splash(0)
 {
@@ -91,7 +91,7 @@ KStartupLogo::KStartupLogo() :
     backGround.fill(TDEGlobalSettings::highlightColor());
     bitBlt ( &backGround, 0, 0, &splashPixmap, 0, 0, splashPixmap.width(), splashPixmap.height(), TQt::CopyROP );
 
-    KStartupSplash* splash = new KStartupSplash(backGround);
+    TDEStartupSplash* splash = new TDEStartupSplash(backGround);
     splash->setFixedSize(backGround.size());
 
     // FIXME: I added the 'Loading file...' message here, because this was the only
@@ -105,7 +105,7 @@ KStartupLogo::KStartupLogo() :
   }
 }
 
-KStartupLogo::~KStartupLogo()
+TDEStartupLogo::~TDEStartupLogo()
 {
     delete m_splash;
 }
diff --git a/kmymoney2/kstartuplogo.h b/kmymoney2/kstartuplogo.h
index faad1a2..682d004 100644
--- a/kmymoney2/kstartuplogo.h
+++ b/kmymoney2/kstartuplogo.h
@@ -31,13 +31,13 @@
 // ----------------------------------------------------------------------------
 // Project Includes
 
-class KStartupSplash : public KSplashScreen
+class TDEStartupSplash : public KSplashScreen
 {
   Q_OBJECT
   
   public:
-    KStartupSplash(const TQPixmap &pixmap, WFlags f = 0);
-    ~KStartupSplash();
+    TDEStartupSplash(const TQPixmap &pixmap, WFlags f = 0);
+    ~TDEStartupSplash();
     void message( const TQString &message, int alignment = AlignLeft, const TQColor &color = black);
 
   protected:
@@ -49,13 +49,13 @@ class KStartupSplash : public KSplashScreen
 };
 
 // Simple class that just shows a picture
-class KStartupLogo : public TQObject
+class TDEStartupLogo : public TQObject
 {
   Q_OBJECT
   
 public:
-  KStartupLogo();
-  ~KStartupLogo();
+  TDEStartupLogo();
+  ~TDEStartupLogo();
 
 private:
   TQGuardedPtr<TQWidget>  m_splash;
diff --git a/kmymoney2/main.cpp b/kmymoney2/main.cpp
index 7dde3b4..d31c7d5 100644
--- a/kmymoney2/main.cpp
+++ b/kmymoney2/main.cpp
@@ -139,7 +139,7 @@ int main(int argc, char *argv[])
   }
 
   // show startup logo
-  KStartupLogo* splash = new KStartupLogo();
+  TDEStartupLogo* splash = new TDEStartupLogo();
   a->processEvents();
 
   args = TDECmdLineArgs::parsedArgs();