summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-19 23:53:31 -0600
committerTimothy Pearson <[email protected]>2013-01-19 23:53:31 -0600
commit59839acb406a92c7dbcea401687f58af40765ce8 (patch)
tree5c590e71ed852d9ed47e35eb063018953f5f17a0 /src
parentb1043889eb2d54f6f53f883f88b154d80663fbe0 (diff)
downloaddolphin-59839acb406a92c7dbcea401687f58af40765ce8.tar.gz
dolphin-59839acb406a92c7dbcea401687f58af40765ce8.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'src')
-rw-r--r--src/dolphin.cpp2
-rw-r--r--src/dolphindetailsview.cpp2
-rw-r--r--src/dolphinview.cpp2
-rw-r--r--src/main.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/dolphin.cpp b/src/dolphin.cpp
index a278231..00cc57a 100644
--- a/src/dolphin.cpp
+++ b/src/dolphin.cpp
@@ -104,7 +104,7 @@ void Dolphin::setActiveView(DolphinView* view)
void Dolphin::dropURLs(const KURL::List& urls,
const KURL& destination)
{
- const ButtonState keyboardState = KApplication::keyboardMouseState();
+ const ButtonState keyboardState = TDEApplication::keyboardMouseState();
const bool shiftPressed = (keyboardState & ShiftButton) > 0;
const bool controlPressed = (keyboardState & ControlButton) > 0;
diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index db5016e..c24ed4c 100644
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -379,7 +379,7 @@ void DolphinDetailsView::contentsMousePressEvent(TQMouseEvent* event)
KFileDetailView::contentsMousePressEvent(event);
}
else if (event->button() == Qt::LeftButton) {
- const ButtonState keyboardState = KApplication::keyboardMouseState();
+ const ButtonState keyboardState = TDEApplication::keyboardMouseState();
const bool isSelectionActive = (keyboardState & ShiftButton) ||
(keyboardState & ControlButton);
if (!isSelectionActive) {
diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 05e0d53..67db2ee 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -645,7 +645,7 @@ void DolphinView::slotURLChanged(const KURL& url)
void DolphinView::triggerIconsViewItem(TQIconViewItem* item)
{
- const ButtonState keyboardState = KApplication::keyboardMouseState();
+ const ButtonState keyboardState = TDEApplication::keyboardMouseState();
const bool isSelectionActive = ((keyboardState & ShiftButton) > 0) ||
((keyboardState & ControlButton) > 0);
if ((item != 0) && !isSelectionActive) {
diff --git a/src/main.cpp b/src/main.cpp
index 9c56f86..0fbac4f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -56,7 +56,7 @@ int main(int argc, char **argv)
TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions(options);
- KApplication app;
+ TDEApplication app;
Dolphin& mainWin = Dolphin::mainWin();
mainWin.show();