diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:09:51 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:09:51 -0600 |
| commit | cf94951d4cb0dd12b9904a87db01b5185d5f11c5 (patch) | |
| tree | f59e493636f1bfd657b0d3677f722d38791e689f | |
| parent | 1d88613b6be64c0b6588952dd1f81396168be44b (diff) | |
| download | filelight-cf94951d4cb0dd12b9904a87db01b5185d5f11c5.tar.gz filelight-cf94951d4cb0dd12b9904a87db01b5185d5f11c5.zip | |
Rename many classes and header files to avoid conflicts with KDE4
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | src/app/historyAction.cpp | 2 | ||||
| -rw-r--r-- | src/app/historyAction.h | 2 | ||||
| -rw-r--r-- | src/app/mainWindow.cpp | 6 | ||||
| -rw-r--r-- | src/part/part.cpp | 2 | ||||
| -rw-r--r-- | src/part/radialMap/widgetEvents.cpp | 2 |
6 files changed, 8 insertions, 8 deletions
@@ -14,7 +14,7 @@ if the view is square shrink the map slightly as a slightly rectangular view is preferable use kdirwatcher, then move rescan to scan menu, rename force rescan clicking center goes up directory - refactor disklister.cpp + refactor distdelister.cpp implement vectors instead of double-linked lists for file data Trace inodes in binarytree to avoid recursive hardlinks and counting same directory tree twice admin mode diff --git a/src/app/historyAction.cpp b/src/app/historyAction.cpp index 5bb1309..6729087 100644 --- a/src/app/historyAction.cpp +++ b/src/app/historyAction.cpp @@ -3,7 +3,7 @@ #include "historyAction.h" -#include <kaccel.h> +#include <tdeaccel.h> #include <tdeconfig.h> #include <klocale.h> diff --git a/src/app/historyAction.h b/src/app/historyAction.h index 350b165..cd9b60a 100644 --- a/src/app/historyAction.h +++ b/src/app/historyAction.h @@ -4,7 +4,7 @@ #ifndef HISTORYACTION_H #define HISTORYACTION_H -#include <kaction.h> +#include <tdeaction.h> #include <kurl.h> #include <tqstringlist.h> diff --git a/src/app/mainWindow.cpp b/src/app/mainWindow.cpp index cb617e9..18457b7 100644 --- a/src/app/mainWindow.cpp +++ b/src/app/mainWindow.cpp @@ -6,8 +6,8 @@ #include "historyAction.h" #include <cstdlib> //std::exit() -#include <kaccel.h> //TDEStdAccel namespace -#include <kaction.h> +#include <tdeaccel.h> //TDEStdAccel namespace +#include <tdeaction.h> #include <kapplication.h> //setupActions() #include <kcombobox.h> //locationbar #include <tdeconfig.h> @@ -19,7 +19,7 @@ #include <kmessagebox.h> #include <kshell.h> #include <kstatusbar.h> -#include <ktoolbar.h> +#include <tdetoolbar.h> #include <kurl.h> #include <kurlcompletion.h> //locationbar #include <tqobjectlist.h> diff --git a/src/part/part.cpp b/src/part/part.cpp index 609da9a..ab15ab2 100644 --- a/src/part/part.cpp +++ b/src/part/part.cpp @@ -13,7 +13,7 @@ #include "summaryWidget.h" #include <kaboutdata.h> //::createAboutData() -#include <kaction.h> +#include <tdeaction.h> #include <klocale.h> #include <kmessagebox.h> //::start() //#include <konq_operations.h> diff --git a/src/part/radialMap/widgetEvents.cpp b/src/part/radialMap/widgetEvents.cpp index 8e78a70..03f6ec0 100644 --- a/src/part/radialMap/widgetEvents.cpp +++ b/src/part/radialMap/widgetEvents.cpp @@ -12,7 +12,7 @@ #include <tdeio/job.h> //::mousePressEvent() #include <klocale.h> #include <kmessagebox.h> //::mousePressEvent() -#include <kpopupmenu.h> //::mousePressEvent() +#include <tdepopupmenu.h> //::mousePressEvent() #include <krun.h> //::mousePressEvent() #include <kurldrag.h> #include <tqapplication.h>//TQApplication::setOverrideCursor() |