From fccf6d244a4d60c3138afa81266e22ac65adddbc Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:20:21 -0600 Subject: Rename many classes and header files to avoid conflicts with KDE4 --- kbruch/src/mainqtwidget.cpp | 4 ++-- kbruch/src/mainqtwidget.h | 2 +- kbruch/src/taskvieweroptionsbase.ui | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'kbruch/src') diff --git a/kbruch/src/mainqtwidget.cpp b/kbruch/src/mainqtwidget.cpp index 096bc467..b0b8ee98 100644 --- a/kbruch/src/mainqtwidget.cpp +++ b/kbruch/src/mainqtwidget.cpp @@ -18,9 +18,9 @@ #include -#include +#include #include -#include +#include #include #include #include diff --git a/kbruch/src/mainqtwidget.h b/kbruch/src/mainqtwidget.h index 1868d9c6..4b58000c 100644 --- a/kbruch/src/mainqtwidget.h +++ b/kbruch/src/mainqtwidget.h @@ -17,7 +17,7 @@ #ifndef MAINTQTWIDGET_H #define MAINTQTWIDGET_H -#include +#include class KJanusWidget; diff --git a/kbruch/src/taskvieweroptionsbase.ui b/kbruch/src/taskvieweroptionsbase.ui index 72f2077a..a35ec107 100644 --- a/kbruch/src/taskvieweroptionsbase.ui +++ b/kbruch/src/taskvieweroptionsbase.ui @@ -216,7 +216,7 @@ - kfontdialog.h + tdefontdialog.h kcolorbutton.h kcolorbutton.h kcolorbutton.h -- cgit v1.2.1