summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-02-25 23:09:09 +0100
committerSlávek Banko <slavek.banko@axis.cz>2013-02-25 23:09:09 +0100
commita1aa8254a43d6f819fc0d297a40246abd0ede32e (patch)
treefd14404e1c777b0800b91e9501f20f5bd3924fd7
parentad3d38518e495179bd08e506fcd7ae1f77663d0b (diff)
downloadtdebase-a1aa8254a43d6f819fc0d297a40246abd0ede32e.tar.gz
tdebase-a1aa8254a43d6f819fc0d297a40246abd0ede32e.zip
Fix unintended rename of kastaskpopup
-rw-r--r--kicker/extensions/kasbar/CMakeLists.txt2
-rw-r--r--kicker/extensions/kasbar/Makefile.am2
-rw-r--r--kicker/extensions/kasbar/kastaskitem.cpp2
-rw-r--r--kicker/extensions/kasbar/kastaskpopup.cpp (renamed from kicker/extensions/kasbar/kastastdepopup.cpp)6
-rw-r--r--kicker/extensions/kasbar/kastaskpopup.h (renamed from kicker/extensions/kasbar/kastastdepopup.h)2
5 files changed, 7 insertions, 7 deletions
diff --git a/kicker/extensions/kasbar/CMakeLists.txt b/kicker/extensions/kasbar/CMakeLists.txt
index 31a1db895..c9fd0e736 100644
--- a/kicker/extensions/kasbar/CMakeLists.txt
+++ b/kicker/extensions/kasbar/CMakeLists.txt
@@ -33,7 +33,7 @@ set( target kasbar )
set( ${target}_SRCS
kasbar.cpp kasitem.cpp kastaskitem.cpp kastasker.cpp
- kaspopup.cpp kastastdepopup.cpp kasstartupitem.cpp
+ kaspopup.cpp kastaskpopup.cpp kasstartupitem.cpp
kasaboutdlg.cpp kasprefsdlg.cpp kasclockitem.cpp
kasgroupitem.cpp kasresources.cpp kasgrouper.cpp
kasloaditem.cpp
diff --git a/kicker/extensions/kasbar/Makefile.am b/kicker/extensions/kasbar/Makefile.am
index 25635299d..e186aad17 100644
--- a/kicker/extensions/kasbar/Makefile.am
+++ b/kicker/extensions/kasbar/Makefile.am
@@ -8,7 +8,7 @@ lib_LTLIBRARIES = libkasbar.la
libkasbar_la_SOURCES = kasbar.cpp kasitem.cpp \
kastaskitem.cpp kastasker.cpp kaspopup.cpp \
- kastastdepopup.cpp kasstartupitem.cpp \
+ kastaskpopup.cpp kasstartupitem.cpp \
kasaboutdlg.cpp kasprefsdlg.cpp kasclockitem.cpp \
kasgroupitem.cpp kasresources.cpp kasgrouper.cpp \
kasloaditem.cpp
diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp
index f9fb23649..0f57524cc 100644
--- a/kicker/extensions/kasbar/kastaskitem.cpp
+++ b/kicker/extensions/kasbar/kastaskitem.cpp
@@ -81,7 +81,7 @@
#include <taskrmbmenu.h>
#include "kastasker.h"
-#include "kastastdepopup.h"
+#include "kastaskpopup.h"
#include "kastaskitem.h"
#include "kasbarextension.h"
diff --git a/kicker/extensions/kasbar/kastastdepopup.cpp b/kicker/extensions/kasbar/kastaskpopup.cpp
index 292b6d86f..7b5fe4ed5 100644
--- a/kicker/extensions/kasbar/kastastdepopup.cpp
+++ b/kicker/extensions/kasbar/kastaskpopup.cpp
@@ -1,4 +1,4 @@
-/* kastastdepopup.cpp
+/* kastaskpopup.cpp
**
** Copyright (C) 2001-2004 Richard Moore <rich@kde.org>
** Contributor: Mosfet
@@ -63,8 +63,8 @@
#include "kastaskitem.h"
#include "kastasker.h"
-#include "kastastdepopup.h"
-#include "kastastdepopup.moc"
+#include "kastaskpopup.h"
+#include "kastaskpopup.moc"
static const int TITLE_HEIGHT = 13;
diff --git a/kicker/extensions/kasbar/kastastdepopup.h b/kicker/extensions/kasbar/kastaskpopup.h
index 60cff87bb..dcdc33107 100644
--- a/kicker/extensions/kasbar/kastastdepopup.h
+++ b/kicker/extensions/kasbar/kastaskpopup.h
@@ -1,4 +1,4 @@
-/* kastastdepopup.h
+/* kastaskpopup.h
**
** Copyright (C) 2001-2004 Richard Moore <rich@kde.org>
** Contributor: Mosfet