summaryrefslogtreecommitdiffstats
path: root/src/global.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:05:29 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:05:29 -0600
commite54e867af243223a620f12bf260e1af9ac9f6dc5 (patch)
tree0e741cd6800d16c390671051ae525f760d87cdb5 /src/global.h
parent934db26c3f8efe148a5680c22f965ee10f818a61 (diff)
downloadbasket-e54e867af243223a620f12bf260e1af9ac9f6dc5.tar.gz
basket-e54e867af243223a620f12bf260e1af9ac9f6dc5.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'src/global.h')
-rw-r--r--src/global.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/global.h b/src/global.h
index 35571ac..49ac04a 100644
--- a/src/global.h
+++ b/src/global.h
@@ -50,7 +50,7 @@ class Global
static SystemTray *systemTray;
static BNPView *bnpView;
static TDEGlobalAccel *globalAccel;
- static KConfig *basketConfig;
+ static TDEConfig *basketConfig;
static AboutData basketAbout;
// Application Folders:
@@ -64,7 +64,7 @@ class Global
// Various Things:
static TQString openNoteIcon(); /// << @return the icon used for the "Open" action on notes.
static KMainWindow* mainWindow();
- static KConfig* config();
+ static TDEConfig* config();
static TDEAboutData* about() { return &basketAbout; };
};