diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:21:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:21:55 -0600 |
| commit | d318087925a540a204c9d3820d5a09fbda58b8b2 (patch) | |
| tree | b8dde6aa5d6559b81c6667d8364a4364c27bcba4 /ktnef | |
| parent | 6cc5f72b33f1d281de3e1bf809b1b5e77d5c96cf (diff) | |
| download | tdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.tar.gz tdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'ktnef')
| -rw-r--r-- | ktnef/gui/attachpropertydialog.cpp | 2 | ||||
| -rw-r--r-- | ktnef/gui/attachpropertydialogbase.ui | 2 | ||||
| -rw-r--r-- | ktnef/gui/ktnefmain.cpp | 6 | ||||
| -rw-r--r-- | ktnef/gui/ktnefmain.h | 2 | ||||
| -rw-r--r-- | ktnef/gui/ktnefview.h | 2 | ||||
| -rw-r--r-- | ktnef/gui/messagepropertydialog.cpp | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/ktnef/gui/attachpropertydialog.cpp b/ktnef/gui/attachpropertydialog.cpp index 222c3f1b3..a6ffe4d94 100644 --- a/ktnef/gui/attachpropertydialog.cpp +++ b/ktnef/gui/attachpropertydialog.cpp @@ -23,7 +23,7 @@ #include "qwmf.h" #include <tqlabel.h> -#include <klistview.h> +#include <tdelistview.h> #include <kmimetype.h> #include <kdebug.h> #include <klocale.h> diff --git a/ktnef/gui/attachpropertydialogbase.ui b/ktnef/gui/attachpropertydialogbase.ui index ce443f36d..919b85480 100644 --- a/ktnef/gui/attachpropertydialogbase.ui +++ b/ktnef/gui/attachpropertydialogbase.ui @@ -276,6 +276,6 @@ </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/ktnef/gui/ktnefmain.cpp b/ktnef/gui/ktnefmain.cpp index ecd17bd22..735085331 100644 --- a/ktnef/gui/ktnefmain.cpp +++ b/ktnef/gui/ktnefmain.cpp @@ -26,19 +26,19 @@ #include "messagepropertydialog.h" #include <tqpopupmenu.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kapplication.h> #include <kiconloader.h> #include <tqpixmap.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <tqmessagebox.h> #include <tdefiledialog.h> #include <tqdir.h> #include <kprocess.h> #include <kglobal.h> #include <kstandarddirs.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <kdialogbase.h> #include <ktempfile.h> diff --git a/ktnef/gui/ktnefmain.h b/ktnef/gui/ktnefmain.h index 3d7901b0e..491d6aa77 100644 --- a/ktnef/gui/ktnefmain.h +++ b/ktnef/gui/ktnefmain.h @@ -18,7 +18,7 @@ #ifndef KTNEFMAIN_H #define KTNEFMAIN_H -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <tqstring.h> #include <tqlistview.h> diff --git a/ktnef/gui/ktnefview.h b/ktnef/gui/ktnefview.h index f6ffc6f81..0ddec104f 100644 --- a/ktnef/gui/ktnefview.h +++ b/ktnef/gui/ktnefview.h @@ -18,7 +18,7 @@ #ifndef KTNEFWIDGET_H #define KTNEFWIDGET_H -#include <klistview.h> +#include <tdelistview.h> #include <tqptrlist.h> #include <tdepimmacros.h> diff --git a/ktnef/gui/messagepropertydialog.cpp b/ktnef/gui/messagepropertydialog.cpp index 73aba4ff9..ba4dad91f 100644 --- a/ktnef/gui/messagepropertydialog.cpp +++ b/ktnef/gui/messagepropertydialog.cpp @@ -19,7 +19,7 @@ #include "attachpropertydialog.h" #include "ktnef/ktnefmessage.h" -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> MessagePropertyDialog::MessagePropertyDialog( TQWidget *parent, KTNEFMessage *msg ) |