diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:50:36 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:50:36 -0600 |
| commit | 8a2b1b754727b006e9fdf9601c5961dcf841bbc7 (patch) | |
| tree | fe526b9fd38cd2ba731772f2aeb83251e43518e3 /src/global.h | |
| parent | 7fab4be56b6ad900ba26f3f1df23f569008ef876 (diff) | |
| download | basket-8a2b1b754727b006e9fdf9601c5961dcf841bbc7.tar.gz basket-8a2b1b754727b006e9fdf9601c5961dcf841bbc7.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'src/global.h')
| -rw-r--r-- | src/global.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/global.h b/src/global.h index dcfc93e..7c4af68 100644 --- a/src/global.h +++ b/src/global.h @@ -31,7 +31,7 @@ class SystemTray; class BNPView; class KGlobalAccel; class KMainWindow; -class KAboutData; +class TDEAboutData; /** Handle all global variables of the application. * This file only declare classes : developer should include @@ -65,7 +65,7 @@ class Global static TQString openNoteIcon(); /// << @return the icon used for the "Open" action on notes. static KMainWindow* mainWindow(); static KConfig* config(); - static KAboutData* about() { return &basketAbout; }; + static TDEAboutData* about() { return &basketAbout; }; }; #endif // GLOBAL_H |