Rename KInstance and KAboutData to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent d4da4b0c32
commit 655931fdf8

@ -16,9 +16,9 @@ static const KCmdLineOptions options[] =
{ 0, 0, 0 } { 0, 0, 0 }
}; };
static KAboutData about( static TDEAboutData about(
APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION, APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION,
I18N_NOOP("Graphical disk-usage information"), KAboutData::License_GPL_V2, I18N_NOOP("Graphical disk-usage information"), TDEAboutData::License_GPL_V2,
I18N_NOOP("(C )2006 Max Howell"), 0, I18N_NOOP("(C )2006 Max Howell"), 0,
"http://www.methylblue.com/filelight/", "filelight@methylblue.com" ); "http://www.methylblue.com/filelight/", "filelight@methylblue.com" );

@ -173,10 +173,10 @@ Part::configFilelight()
dialog->show(); //deletes itself dialog->show(); //deletes itself
} }
KAboutData* TDEAboutData*
Part::createAboutData() Part::createAboutData()
{ {
return new KAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION ); return new TDEAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION );
} }
bool bool

@ -9,7 +9,7 @@
#include <kparts/part.h> #include <kparts/part.h>
#include <kurl.h> #include <kurl.h>
class KAboutData; class TDEAboutData;
using KParts::StatusBarExtension; using KParts::StatusBarExtension;
namespace RadialMap { class Widget; } namespace RadialMap { class Widget; }
class Directory; class Directory;
@ -39,7 +39,7 @@ namespace Filelight
TQString prettyURL() const { return m_url.protocol() == "file" ? m_url.path() : m_url.prettyURL(); } TQString prettyURL() const { return m_url.protocol() == "file" ? m_url.path() : m_url.prettyURL(); }
static KAboutData *createAboutData(); static TDEAboutData *createAboutData();
public slots: public slots:
virtual bool openURL( const KURL& ); virtual bool openURL( const KURL& );

Loading…
Cancel
Save