diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:39 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:39 -0600 |
| commit | ff94d46e423398804d2ae63faeb114c2cf604fc4 (patch) | |
| tree | 4481ffd491d15ac15081cea46d7cc298ef6351a4 /kompare/komparepart | |
| parent | b9553cef2a3cd9f5b89c8aca6f4b7781a079dbb7 (diff) | |
| download | tdesdk-ff94d46e423398804d2ae63faeb114c2cf604fc4.tar.gz tdesdk-ff94d46e423398804d2ae63faeb114c2cf604fc4.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kompare/komparepart')
| -rw-r--r-- | kompare/komparepart/kompare_part.cpp | 6 | ||||
| -rw-r--r-- | kompare/komparepart/komparesaveoptionswidget.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp index 52de1f5f..097eb5db 100644 --- a/kompare/komparepart/kompare_part.cpp +++ b/kompare/komparepart/kompare_part.cpp @@ -27,8 +27,8 @@ #include <kaction.h> #include <kapplication.h> #include <kdebug.h> -#include <kfiletreeview.h> -#include <kfiledialog.h> +#include <tdefiletreeview.h> +#include <tdefiledialog.h> #include <klocale.h> #include <kmessagebox.h> #include <kstdaction.h> @@ -37,7 +37,7 @@ #include <tdeparts/genericfactory.h> //#include <ktempdir.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include "diffmodel.h" #include "komparelistview.h" diff --git a/kompare/komparepart/komparesaveoptionswidget.cpp b/kompare/komparepart/komparesaveoptionswidget.cpp index 723093ac..95a641cb 100644 --- a/kompare/komparepart/komparesaveoptionswidget.cpp +++ b/kompare/komparepart/komparesaveoptionswidget.cpp @@ -24,7 +24,7 @@ #include <tqspinbox.h> #include <kdebug.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kurlrequester.h> #include "diffsettings.h" |