From a1aa8254a43d6f819fc0d297a40246abd0ede32e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Mon, 25 Feb 2013 23:09:09 +0100
Subject: [PATCH] Fix unintended rename of kastaskpopup

---
 kicker/extensions/kasbar/CMakeLists.txt                     | 2 +-
 kicker/extensions/kasbar/Makefile.am                        | 2 +-
 kicker/extensions/kasbar/kastaskitem.cpp                    | 2 +-
 .../kasbar/{kastastdepopup.cpp => kastaskpopup.cpp}         | 6 +++---
 .../extensions/kasbar/{kastastdepopup.h => kastaskpopup.h}  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename kicker/extensions/kasbar/{kastastdepopup.cpp => kastaskpopup.cpp} (98%)
 rename kicker/extensions/kasbar/{kastastdepopup.h => kastaskpopup.h} (99%)

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
similarity index 98%
rename from kicker/extensions/kasbar/kastastdepopup.cpp
rename to 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
similarity index 99%
rename from kicker/extensions/kasbar/kastastdepopup.h
rename to 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