diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:12:24 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:12:24 -0600 |
| commit | 5a480fa57527b23c47e908ff9b6395da1c36f270 (patch) | |
| tree | 55a467c48fbc0eb7affa6e6a4e4419dabf3b3294 | |
| parent | 8504a35d5c044ae41dc372758e2feb0a00dc42ee (diff) | |
| download | knutclient-5a480fa5.tar.gz knutclient-5a480fa5.zip | |
Rename many classes and header files to avoid conflicts with KDE4
| -rwxr-xr-x | src/knutdock.h | 2 | ||||
| -rw-r--r-- | src/knutmainwindow.h | 4 | ||||
| -rw-r--r-- | src/knutnewupsdlg.cpp | 2 | ||||
| -rw-r--r-- | src/knutnewupsdlg.h | 2 | ||||
| -rw-r--r-- | src/knutprefdlg.h | 4 | ||||
| -rwxr-xr-x | src/knutprintupsvar.h | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/knutdock.h b/src/knutdock.h index d4016d5..26a9bad 100755 --- a/src/knutdock.h +++ b/src/knutdock.h @@ -24,7 +24,7 @@ #include <ksystemtray.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <tqobject.h> diff --git a/src/knutmainwindow.h b/src/knutmainwindow.h index 723a727..029460d 100644 --- a/src/knutmainwindow.h +++ b/src/knutmainwindow.h @@ -32,8 +32,8 @@ #include "knutpanelmeter.h" #include <kapp.h> -#include <kmainwindow.h> -#include <kaction.h> +#include <tdemainwindow.h> +#include <tdeaction.h> //#include <kprogress.h> diff --git a/src/knutnewupsdlg.cpp b/src/knutnewupsdlg.cpp index 1f9688c..3c7aaf9 100644 --- a/src/knutnewupsdlg.cpp +++ b/src/knutnewupsdlg.cpp @@ -19,7 +19,7 @@ #include <klocale.h> #include <kmessagebox.h> -#include <kactionselector.h> +#include <tdeactionselector.h> #include <tqstring.h> #include <tqlayout.h> diff --git a/src/knutnewupsdlg.h b/src/knutnewupsdlg.h index 16a7c19..c660a41 100644 --- a/src/knutnewupsdlg.h +++ b/src/knutnewupsdlg.h @@ -25,7 +25,7 @@ #include <kcombobox.h> #include <klineedit.h> #include <kpushbutton.h> -#include <kactionselector.h> +#include <tdeactionselector.h> #include <tqlistbox.h> diff --git a/src/knutprefdlg.h b/src/knutprefdlg.h index a813f4c..f89771e 100644 --- a/src/knutprefdlg.h +++ b/src/knutprefdlg.h @@ -26,9 +26,9 @@ #include <kdialogbase.h> #include <kpushbutton.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <klocale.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kcolorbtn.h> #include <kcombobox.h> diff --git a/src/knutprintupsvar.h b/src/knutprintupsvar.h index 5792f6f..698d196 100755 --- a/src/knutprintupsvar.h +++ b/src/knutprintupsvar.h @@ -27,7 +27,7 @@ #include <kdialogbase.h> #include <kcombobox.h> #include <kpushbutton.h> -#include <klistview.h> +#include <tdelistview.h> #include <tqvariant.h> |