summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 19:51:08 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 19:51:08 -0600
commit655931fdf8306a67463d4ad8aa08c9373e512a7c (patch)
tree1e34761a442fa6159b01b5220581c3aadcbcc5a5 /src
parentd4da4b0c3286d135d265176a937ce7b9c8fa0125 (diff)
downloadfilelight-655931fdf8306a67463d4ad8aa08c9373e512a7c.tar.gz
filelight-655931fdf8306a67463d4ad8aa08c9373e512a7c.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'src')
-rw-r--r--src/app/main.cpp4
-rw-r--r--src/part/part.cpp4
-rw-r--r--src/part/part.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp
index b315cc9..bb4f94f 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -16,9 +16,9 @@ static const KCmdLineOptions options[] =
{ 0, 0, 0 }
};
-static KAboutData about(
+static TDEAboutData about(
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,
"http://www.methylblue.com/filelight/", "filelight@methylblue.com" );
diff --git a/src/part/part.cpp b/src/part/part.cpp
index 8de3c8c..b519044 100644
--- a/src/part/part.cpp
+++ b/src/part/part.cpp
@@ -173,10 +173,10 @@ Part::configFilelight()
dialog->show(); //deletes itself
}
-KAboutData*
+TDEAboutData*
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
diff --git a/src/part/part.h b/src/part/part.h
index f9be062..809b133 100644
--- a/src/part/part.h
+++ b/src/part/part.h
@@ -9,7 +9,7 @@
#include <kparts/part.h>
#include <kurl.h>
-class KAboutData;
+class TDEAboutData;
using KParts::StatusBarExtension;
namespace RadialMap { class Widget; }
class Directory;
@@ -39,7 +39,7 @@ namespace Filelight
TQString prettyURL() const { return m_url.protocol() == "file" ? m_url.path() : m_url.prettyURL(); }
- static KAboutData *createAboutData();
+ static TDEAboutData *createAboutData();
public slots:
virtual bool openURL( const KURL& );