diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:15 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:15 -0600 |
| commit | 64df902cf71a8ee258fb85f6be26248f399aa01f (patch) | |
| tree | dba58f705042c22cea26b678d5b0e4e9a34bf202 /knotes | |
| parent | de53c98cab07e9c4b0f5e25dab82830fb6fc67ec (diff) | |
| download | tdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.tar.gz tdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'knotes')
| -rw-r--r-- | knotes/TODO | 2 | ||||
| -rw-r--r-- | knotes/knote.cpp | 4 | ||||
| -rw-r--r-- | knotes/knote.h | 2 | ||||
| -rw-r--r-- | knotes/knoteconfigdlg.cpp | 2 | ||||
| -rw-r--r-- | knotes/knoteconfigdlg.h | 2 | ||||
| -rw-r--r-- | knotes/knoteslegacy.cpp | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/knotes/TODO b/knotes/TODO index 202f563d7..70e3eb6a5 100644 --- a/knotes/TODO +++ b/knotes/TODO @@ -34,7 +34,7 @@ TODO: => use the static KNotesGlobalConfig object and copy the important stuff over Disadv: some keys and defaults must be defined in both config files (and thus, TDEConfig XT specs) - => how about one kconfig Xt spec and inheriting from the TDEConfigSkeleton or make the + => how about one tdeconfig Xt spec and inheriting from the TDEConfigSkeleton or make the TDEConfigSkeleton inherit something? * global config dialog: use "Defaults" in the side bar and add a page with two tabs, Display and Editor, respectively diff --git a/knotes/knote.cpp b/knotes/knote.cpp index a90d891b9..dd3940c80 100644 --- a/knotes/knote.cpp +++ b/knotes/knote.cpp @@ -51,8 +51,8 @@ #include <kinputdialog.h> #include <kmdcodec.h> #include <kglobalsettings.h> -#include <kfiledialog.h> -#include <kio/netaccess.h> +#include <tdefiledialog.h> +#include <tdeio/netaccess.h> #include <libkcal/journal.h> diff --git a/knotes/knote.h b/knotes/knote.h index 880a85a4b..cc12dcdc2 100644 --- a/knotes/knote.h +++ b/knotes/knote.h @@ -27,7 +27,7 @@ #include <tqpoint.h> #include <tqcolor.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kxmlguiclient.h> class TQLabel; diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp index f35ad9e96..6b01b7b86 100644 --- a/knotes/knoteconfigdlg.cpp +++ b/knotes/knoteconfigdlg.cpp @@ -26,7 +26,7 @@ #include <tqtabwidget.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kiconloader.h> #include <kcolorbutton.h> diff --git a/knotes/knoteconfigdlg.h b/knotes/knoteconfigdlg.h index 5d7118ca7..a72859a1f 100644 --- a/knotes/knoteconfigdlg.h +++ b/knotes/knoteconfigdlg.h @@ -21,7 +21,7 @@ #ifndef KNOTECONFIGDLG_H #define KNOTECONFIGDLG_H -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> class TQString; class KNoteConfig; diff --git a/knotes/knoteslegacy.cpp b/knotes/knoteslegacy.cpp index 6c59f13ea..fc8c71b4a 100644 --- a/knotes/knoteslegacy.cpp +++ b/knotes/knoteslegacy.cpp @@ -31,7 +31,7 @@ #include <kurl.h> #include <kstandarddirs.h> #include <ksimpleconfig.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <unistd.h> |