summaryrefslogtreecommitdiffstats
path: root/kspread
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:12:56 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:12:56 -0600
commitece35c015c54312eb13f583cc247cdd9a4051b4d (patch)
tree2c0599b8705e881f2b53678f48e97ffe4f616d22 /kspread
parentc260bb1b22af487f2410c2c7f6c35db3fe1d57b9 (diff)
downloadkoffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.tar.gz
koffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kspread')
-rw-r--r--kspread/dialogs/SheetSelectWidget.ui4
-rw-r--r--kspread/dialogs/kspread_dlg_database.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_styles.cc2
-rw-r--r--kspread/dialogs/link.cc2
-rw-r--r--kspread/kspread_editors.cc2
-rw-r--r--kspread/kspread_view.cc4
-rw-r--r--kspread/templates/HomeFamily/Makefile.am4
-rw-r--r--kspread/templates/HomeFamily/VacationChectdelist.desktop16
-rw-r--r--kspread/templates/HomeFamily/VacationChectdelist.kst2
9 files changed, 19 insertions, 19 deletions
diff --git a/kspread/dialogs/SheetSelectWidget.ui b/kspread/dialogs/SheetSelectWidget.ui
index 9e6dfc84..c4f4db58 100644
--- a/kspread/dialogs/SheetSelectWidget.ui
+++ b/kspread/dialogs/SheetSelectWidget.ui
@@ -260,11 +260,11 @@ It is even possible to print a sheet more than once. Just insert the desired she
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
- <includehint>klistview.h</includehint>
+ <includehint>tdelistview.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
- <includehint>klistview.h</includehint>
+ <includehint>tdelistview.h</includehint>
</includehints>
</UI>
diff --git a/kspread/dialogs/kspread_dlg_database.cc b/kspread/dialogs/kspread_dlg_database.cc
index 946ee3c5..5f955074 100644
--- a/kspread/dialogs/kspread_dlg_database.cc
+++ b/kspread/dialogs/kspread_dlg_database.cc
@@ -28,7 +28,7 @@
#include "kspread_view.h"
#include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <knumvalidator.h>
diff --git a/kspread/dialogs/kspread_dlg_styles.cc b/kspread/dialogs/kspread_dlg_styles.cc
index 2821f5e2..fdb8d6fe 100644
--- a/kspread/dialogs/kspread_dlg_styles.cc
+++ b/kspread/dialogs/kspread_dlg_styles.cc
@@ -24,7 +24,7 @@
#include <kcombobox.h>
#include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include "kspread_canvas.h"
diff --git a/kspread/dialogs/link.cc b/kspread/dialogs/link.cc
index 9523cf83..eb1dfe87 100644
--- a/kspread/dialogs/link.cc
+++ b/kspread/dialogs/link.cc
@@ -35,7 +35,7 @@
#include <klineedit.h>
#include <kmessagebox.h>
#include <klocale.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
#include <kurlrequester.h>
using namespace KSpread;
diff --git a/kspread/kspread_editors.cc b/kspread/kspread_editors.cc
index 6fefd272..4af76159 100644
--- a/kspread/kspread_editors.cc
+++ b/kspread/kspread_editors.cc
@@ -29,7 +29,7 @@
#include "formula.h"
#include "functions.h"
-#include <klistbox.h>
+#include <tdelistbox.h>
#include <tqapplication.h>
#include <tqlistbox.h>
diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc
index ede60281..64d6aa5b 100644
--- a/kspread/kspread_view.cc
+++ b/kspread/kspread_view.cc
@@ -54,7 +54,7 @@
#include <kdebug.h>
#include <kfind.h>
#include <kfinddialog.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
#include <kinputdialog.h>
#include <kmessagebox.h>
#include <knotifyclient.h>
@@ -69,7 +69,7 @@
#include <kstandarddirs.h>
#include <ktempfile.h>
#include <tdeparts/partmanager.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kpushbutton.h>
// KOffice includes
diff --git a/kspread/templates/HomeFamily/Makefile.am b/kspread/templates/HomeFamily/Makefile.am
index 78372a09..5916798a 100644
--- a/kspread/templates/HomeFamily/Makefile.am
+++ b/kspread/templates/HomeFamily/Makefile.am
@@ -1,7 +1,7 @@
-template_DATA = .directory BMI.desktop MenuPlan.desktop VacationChecklist.desktop CreditCardTracker.desktop
+template_DATA = .directory BMI.desktop MenuPlan.desktop VacationChectdelist.desktop CreditCardTracker.desktop
templatedir = $(kde_datadir)/kspread/templates/HomeFamily
-templatesrc_DATA = BMI.kst MenuPlan.kst VacationChecklist.kst CreditCardTracker.kst
+templatesrc_DATA = BMI.kst MenuPlan.kst VacationChectdelist.kst CreditCardTracker.kst
templatesrcdir = $(kde_datadir)/kspread/templates/HomeFamily/.source
kspreadicondir = $(kde_datadir)/kspread/icons
diff --git a/kspread/templates/HomeFamily/VacationChectdelist.desktop b/kspread/templates/HomeFamily/VacationChectdelist.desktop
index 2655c7e3..ba1192ff 100644
--- a/kspread/templates/HomeFamily/VacationChectdelist.desktop
+++ b/kspread/templates/HomeFamily/VacationChectdelist.desktop
@@ -1,21 +1,21 @@
[Desktop Entry]
Type=Link
-URL=.source/VacationChecklist.kst
-Name=Vacation Checklist
+URL=.source/VacationChectdelist.kst
+Name=Vacation Chectdelist
Name[bg]=Ваканция
Name[ca]=Llista de comprovació de vacances
Name[cs]=Dovolená
Name[cy]=Rhestr Wirio Gwyliau
-Name[da]=Ferie-tjekliste
-Name[de]=Urlaubs-Checkliste
+Name[da]=Ferie-tjetdeliste
+Name[de]=Urlaubs-Chectdeliste
Name[el]=Λίστα ελέγχου διακοπών
-Name[eo]=Marklisto por Feriado
+Name[eo]=Martdelisto por Feriado
Name[es]=Lista de comprobación de vacaciones
Name[et]=Puhkuseplaan
Name[eu]=Oporretako zerrenda
Name[fa]=فهرست بررسی تعطیلی
Name[fi]=Loman tarkistuslista
-Name[fr]=Checklist des vacances
+Name[fr]=Chectdelist des vacances
Name[fy]=Fakânsje kontrôlelist
Name[gl]=Lista para Viaxes
Name[he]=בדיקת חופשות
@@ -26,11 +26,11 @@ Name[it]=Lista per le vacanze
Name[ja]=休暇チェックリスト
Name[km]=បញ្ជី​វិស្សមកាល
Name[ms]=Senarai Semak Percutian
-Name[nb]=Sjekkliste for ferie
+Name[nb]=Sjektdeliste for ferie
Name[nds]=Oorlööf-Pröövlist
Name[ne]=बिदा जाँचसूची
Name[nl]=Vakantie-controlelijst
-Name[nn]=Sjekkliste for ferie
+Name[nn]=Sjektdeliste for ferie
Name[pl]=Wakacyjny spis kontrolny
Name[pt]=Lista para Férias
Name[pt_BR]=Lista de Verificação de Férias
diff --git a/kspread/templates/HomeFamily/VacationChectdelist.kst b/kspread/templates/HomeFamily/VacationChectdelist.kst
index 141ff1e4..281ef3e0 100644
--- a/kspread/templates/HomeFamily/VacationChectdelist.kst
+++ b/kspread/templates/HomeFamily/VacationChectdelist.kst
@@ -176,7 +176,7 @@
<format bgcolor="#ffffff" parent="Default" >
<font size="22" bold="yes" weight="75" />
</format>
- <text outStr="Vacation Checklist" dataType="Str" >Vacation Checklist</text>
+ <text outStr="Vacation Chectdelist" dataType="Str" >Vacation Chectdelist</text>
</cell>
<cell row="1" column="2" >
<format bgcolor="#ffffff" parent="Default" >