summaryrefslogtreecommitdiffstats
path: root/kicker/kicker/buttons
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:19:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:19:22 -0600
commita5430e4b98efd05937bd3bfe78c56eb826f145fa (patch)
tree1af88f74a9d800399de58491b215fb303cbfb1f3 /kicker/kicker/buttons
parenteba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff)
downloadtdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz
tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kicker/kicker/buttons')
-rw-r--r--kicker/kicker/buttons/bookmarksbutton.cpp4
-rw-r--r--kicker/kicker/buttons/windowlist.desktop2
2 files changed, 3 insertions, 3 deletions
diff --git a/kicker/kicker/buttons/bookmarksbutton.cpp b/kicker/kicker/buttons/bookmarksbutton.cpp
index 5dc8190ac..8b4559c52 100644
--- a/kicker/kicker/buttons/bookmarksbutton.cpp
+++ b/kicker/kicker/buttons/bookmarksbutton.cpp
@@ -23,12 +23,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqtooltip.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kbookmark.h>
#include <kbookmarkmenu.h>
#include <konqbookmarkmanager.h>
#include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include "bookmarksbutton.h"
#include "bookmarksbutton.moc"
diff --git a/kicker/kicker/buttons/windowlist.desktop b/kicker/kicker/buttons/windowlist.desktop
index f3d15fd69..3b2e677fb 100644
--- a/kicker/kicker/buttons/windowlist.desktop
+++ b/kicker/kicker/buttons/windowlist.desktop
@@ -25,7 +25,7 @@ Name[fy]=Finsterlistmenu
Name[gl]=Lista de Fiestras
Name[he]=תפריט רשימת חלונות
Name[hr]=Izbornik popisa prozora
-Name[hu]=Ablaklista menü
+Name[hu]=Ablatdelista menü
Name[is]=Gluggalista valmynd
Name[it]=Menu elenco delle finestre
Name[ja]=ウィンドウリストメニュー