summaryrefslogtreecommitdiffstats
path: root/kspread
diff options
context:
space:
mode:
Diffstat (limited to 'kspread')
-rw-r--r--kspread/Makefile.am8
-rw-r--r--kspread/dialogs/kspread_dlg_preference.cc2
-rw-r--r--kspread/kspread_canvas.cc2
-rw-r--r--kspread/kspread_doc.cc14
-rw-r--r--kspread/kspread_doc.h4
-rw-r--r--kspread/kspread_events.h2
-rw-r--r--kspread/kspread_object.cc2
-rw-r--r--kspread/kspread_view.cc64
-rw-r--r--kspread/plugins/calculator/main.h2
-rw-r--r--kspread/plugins/insertcalendar/kspread_plugininsertcalendar.h2
-rw-r--r--kspread/plugins/scripting/Makefile.am2
-rw-r--r--kspread/plugins/scripting/kspreadcore/Makefile.am2
-rw-r--r--kspread/plugins/scripting/scripting.h2
13 files changed, 54 insertions, 54 deletions
diff --git a/kspread/Makefile.am b/kspread/Makefile.am
index d65764f9..3ba5c117 100644
--- a/kspread/Makefile.am
+++ b/kspread/Makefile.am
@@ -28,12 +28,12 @@ libkspreadcommon_la_SOURCES = digest.cc commands.cc damages.cc dependencies.cc \
kspread_genvalidationstyle.cc region.cc selection.cc manipulator.cc manipulator_data.cc \
kspread_generalProperty.cpp kspread_propertyEditor.cpp
-libkspreadcommon_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lkutils
+libkspreadcommon_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -ltdeutils
libkspreadcommon_la_LIBADD = $(top_builddir)/interfaces/libkochart.la \
dialogs/libdialogs.la tests/libtests.la \
- $(LIB_KOFFICEUI) $(LIB_KOTEXT) -lkspell
+ $(LIB_KOFFICEUI) $(LIB_KOTEXT) -ltdespell
-libkspreadpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+libkspreadpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
libkspreadpart_la_LIBADD = libkspreadcommon.la
libkspreadpart_la_SOURCES = kspread_factory_init.cc
@@ -44,7 +44,7 @@ METASOURCES = AUTO
tdeinit_LTLIBRARIES = kspread.la
bin_PROGRAMS =
kspread_la_SOURCES = main.cc
-kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
kspread_la_LIBADD = $(LIB_KOFFICECORE)
xdg_apps_DATA = kspread.desktop
diff --git a/kspread/dialogs/kspread_dlg_preference.cc b/kspread/dialogs/kspread_dlg_preference.cc
index 4895cac2..a64f2d69 100644
--- a/kspread/dialogs/kspread_dlg_preference.cc
+++ b/kspread/dialogs/kspread_dlg_preference.cc
@@ -35,7 +35,7 @@
#include <kconfig.h>
#include <kstatusbar.h>
#include <knuminput.h>
-#include <kspell.h>
+#include <tdespell.h>
#include <kmessagebox.h>
#include <tdeversion.h>
#include <kcolorbutton.h>
diff --git a/kspread/kspread_canvas.cc b/kspread/kspread_canvas.cc
index 51d561cd..780dd5af 100644
--- a/kspread/kspread_canvas.cc
+++ b/kspread/kspread_canvas.cc
@@ -59,7 +59,7 @@
#include <kcursor.h>
#include <kdebug.h>
#include <kmessagebox.h>
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
#include <krun.h>
#include <kmimetype.h>
#include <ksharedptr.h>
diff --git a/kspread/kspread_doc.cc b/kspread/kspread_doc.cc
index ad28bb78..f3c78e9f 100644
--- a/kspread/kspread_doc.cc
+++ b/kspread/kspread_doc.cc
@@ -1459,17 +1459,17 @@ MethodOfCalc Doc::getTypeOfCalc() const
return d->calcMethod;
}
-void Doc::setKSpellConfig(KSpellConfig _kspell)
+void Doc::setKSpellConfig(KSpellConfig _tdespell)
{
if (d->spellConfig == 0 )
d->spellConfig = new KSpellConfig();
- d->spellConfig->setNoRootAffix(_kspell.noRootAffix ());
- d->spellConfig->setRunTogether(_kspell.runTogether ());
- d->spellConfig->setDictionary(_kspell.dictionary ());
- d->spellConfig->setDictFromList(_kspell.dictFromList());
- d->spellConfig->setEncoding(_kspell.encoding());
- d->spellConfig->setClient(_kspell.client());
+ d->spellConfig->setNoRootAffix(_tdespell.noRootAffix ());
+ d->spellConfig->setRunTogether(_tdespell.runTogether ());
+ d->spellConfig->setDictionary(_tdespell.dictionary ());
+ d->spellConfig->setDictFromList(_tdespell.dictFromList());
+ d->spellConfig->setEncoding(_tdespell.encoding());
+ d->spellConfig->setClient(_tdespell.client());
}
KSpellConfig * Doc::getKSpellConfig()
diff --git a/kspread/kspread_doc.h b/kspread/kspread_doc.h
index e0455278..40a6e48c 100644
--- a/kspread/kspread_doc.h
+++ b/kspread/kspread_doc.h
@@ -391,9 +391,9 @@ public:
/**
- * get custom kspell config
+ * get custom tdespell config
*/
- void setKSpellConfig(KSpellConfig _kspell);
+ void setKSpellConfig(KSpellConfig _tdespell);
KSpellConfig * getKSpellConfig();
bool dontCheckUpperWord() const;
diff --git a/kspread/kspread_events.h b/kspread/kspread_events.h
index 1a240fdb..b89fa98e 100644
--- a/kspread/kspread_events.h
+++ b/kspread/kspread_events.h
@@ -7,7 +7,7 @@
#include <string.h>
-#include <kparts/event.h>
+#include <tdeparts/event.h>
#include <koffice_export.h>
#include "region.h"
diff --git a/kspread/kspread_object.cc b/kspread/kspread_object.cc
index 8c273700..2a3bffb0 100644
--- a/kspread/kspread_object.cc
+++ b/kspread/kspread_object.cc
@@ -26,7 +26,7 @@
#include <kapplication.h>
#include <kdebug.h>
#include <kimageeffect.h>
-#include <kparts/partmanager.h>
+#include <tdeparts/partmanager.h>
#include <koChart.h>
#include <tqbitmap.h>
diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc
index a76bd3d8..664edf4e 100644
--- a/kspread/kspread_view.cc
+++ b/kspread/kspread_view.cc
@@ -62,13 +62,13 @@
#include <kprocio.h>
#include <kreplace.h>
#include <kreplacedialog.h>
-#include <kspell.h>
-#include <kspelldlg.h>
+#include <tdespell.h>
+#include <tdespelldlg.h>
#include <kstatusbar.h>
#include <kstdaction.h>
#include <kstandarddirs.h>
#include <ktempfile.h>
-#include <kparts/partmanager.h>
+#include <tdeparts/partmanager.h>
#include <klistview.h>
#include <kpushbutton.h>
@@ -246,7 +246,7 @@ public:
// spell-check context
struct
{
- KSpell * kspell;
+ KSpell * tdespell;
Sheet * firstSpellSheet;
Sheet * currentSpellSheet;
Cell * currentCell;
@@ -1774,7 +1774,7 @@ View::View( TQWidget *_parent, const char *_name,
d->searchInSheets.firstSheet = 0;
// spell-check context
- d->spell.kspell = 0;
+ d->spell.tdespell = 0;
d->spell.macroCmdSpellCheck = 0;
d->spell.firstSpellSheet = 0;
d->spell.currentSpellSheet = 0;
@@ -1873,7 +1873,7 @@ View::~View()
}*/
- delete d->spell.kspell;
+ delete d->spell.tdespell;
d->canvas->endChoose();
d->activeSheet = 0; // set the active sheet to 0L so that when during destruction
@@ -2248,7 +2248,7 @@ void View::recalcWorkSheet()
void View::extraSpelling()
{
- if ( d->spell.kspell )
+ if ( d->spell.tdespell )
return; // Already in progress
if (d->activeSheet == 0L)
@@ -2296,33 +2296,33 @@ void View::startKSpell()
doc()->getKSpellConfig()->setReplaceAllList( d->spell.replaceAll );
}
- d->spell.kspell = new KSpell( this, i18n( "Spell Checking" ), TQT_TQOBJECT(this),
+ d->spell.tdespell = new KSpell( this, i18n( "Spell Checking" ), TQT_TQOBJECT(this),
TQT_SLOT( spellCheckerReady() ),
doc()->getKSpellConfig() );
- d->spell.kspell->setIgnoreUpperWords( doc()->dontCheckUpperWord() );
- d->spell.kspell->setIgnoreTitleCase( doc()->dontCheckTitleCase() );
+ d->spell.tdespell->setIgnoreUpperWords( doc()->dontCheckUpperWord() );
+ d->spell.tdespell->setIgnoreTitleCase( doc()->dontCheckTitleCase() );
- TQT_BASE_OBJECT_NAME::connect( d->spell.kspell, TQT_SIGNAL( death() ),
+ TQT_BASE_OBJECT_NAME::connect( d->spell.tdespell, TQT_SIGNAL( death() ),
this, TQT_SLOT( spellCheckerFinished() ) );
- TQT_BASE_OBJECT_NAME::connect( d->spell.kspell, TQT_SIGNAL( misspelling( const TQString &,
+ TQT_BASE_OBJECT_NAME::connect( d->spell.tdespell, TQT_SIGNAL( misspelling( const TQString &,
const TQStringList &,
unsigned int) ),
this, TQT_SLOT( spellCheckerMisspelling( const TQString &,
const TQStringList &,
unsigned int) ) );
- TQT_BASE_OBJECT_NAME::connect( d->spell.kspell, TQT_SIGNAL( corrected( const TQString &,
+ TQT_BASE_OBJECT_NAME::connect( d->spell.tdespell, TQT_SIGNAL( corrected( const TQString &,
const TQString &,
unsigned int) ),
this, TQT_SLOT( spellCheckerCorrected( const TQString &,
const TQString &,
unsigned int ) ) );
- TQT_BASE_OBJECT_NAME::connect( d->spell.kspell, TQT_SIGNAL( done( const TQString & ) ),
+ TQT_BASE_OBJECT_NAME::connect( d->spell.tdespell, TQT_SIGNAL( done( const TQString & ) ),
this, TQT_SLOT( spellCheckerDone( const TQString & ) ) );
- TQT_BASE_OBJECT_NAME::connect( d->spell.kspell, TQT_SIGNAL( ignoreall (const TQString & ) ),
+ TQT_BASE_OBJECT_NAME::connect( d->spell.tdespell, TQT_SIGNAL( ignoreall (const TQString & ) ),
this, TQT_SLOT( spellCheckerIgnoreAll( const TQString & ) ) );
- TQT_BASE_OBJECT_NAME::connect( d->spell.kspell, TQT_SIGNAL( replaceall( const TQString & , const TQString & )), this, TQT_SLOT( spellCheckerReplaceAll( const TQString & , const TQString & )));
+ TQT_BASE_OBJECT_NAME::connect( d->spell.tdespell, TQT_SIGNAL( replaceall( const TQString & , const TQString & )), this, TQT_SLOT( spellCheckerReplaceAll( const TQString & , const TQString & )));
}
@@ -2354,7 +2354,7 @@ void View::spellCheckerReady()
// check text only
if ( d->spell.currentCell->value().isString() )
{
- d->spell.kspell->check( d->spell.currentCell->text(), true );
+ d->spell.tdespell->check( d->spell.currentCell->text(), true );
return;
}
@@ -2397,7 +2397,7 @@ void View::spellCheckerReady()
d->spell.spellCurrCellX = x;
d->spell.spellCurrCellY = y;
- d->spell.kspell->check( cell->text(), true );
+ d->spell.tdespell->check( cell->text(), true );
return;
}
@@ -2426,9 +2426,9 @@ void View::spellCleanup()
if ( d->canvas )
d->canvas->setCursor( ArrowCursor );
- d->spell.kspell->cleanUp();
- delete d->spell.kspell;
- d->spell.kspell = 0L;
+ d->spell.tdespell->cleanUp();
+ delete d->spell.tdespell;
+ d->spell.tdespell = 0L;
d->spell.firstSpellSheet = 0L;
d->spell.currentSpellSheet = 0L;
d->spell.currentCell = 0L;
@@ -2548,11 +2548,11 @@ void View::spellCheckerCorrected( const TQString & old, const TQString & corr,
void View::spellCheckerDone( const TQString & )
{
- int result = d->spell.kspell->dlgResult();
+ int result = d->spell.tdespell->dlgResult();
- d->spell.kspell->cleanUp();
- delete d->spell.kspell;
- d->spell.kspell = 0L;
+ d->spell.tdespell->cleanUp();
+ delete d->spell.tdespell;
+ d->spell.tdespell = 0L;
if ( result != KS_CANCEL && result != KS_STOP )
{
@@ -2591,19 +2591,19 @@ void View::spellCheckerFinished()
if (d->canvas)
d->canvas->setCursor( ArrowCursor );
- KSpell::spellStatus status = d->spell.kspell->status();
- d->spell.kspell->cleanUp();
- delete d->spell.kspell;
- d->spell.kspell = 0L;
+ KSpell::spellStatus status = d->spell.tdespell->status();
+ d->spell.tdespell->cleanUp();
+ delete d->spell.tdespell;
+ d->spell.tdespell = 0L;
d->spell.replaceAll.clear();
- bool kspellNotConfigured=false;
+ bool tdespellNotConfigured=false;
if (status == KSpell::Error)
{
KMessageBox::sorry(this, i18n("ISpell could not be started.\n"
"Please make sure you have ISpell properly configured and in your PATH."));
- kspellNotConfigured=true;
+ tdespellNotConfigured=true;
}
else if (status == KSpell::Crashed)
{
@@ -2617,7 +2617,7 @@ void View::spellCheckerFinished()
d->spell.macroCmdSpellCheck=0L;
- if (kspellNotConfigured)
+ if (tdespellNotConfigured)
{
PreferenceDialog configDlg( this, 0 );
configDlg.openPage( PreferenceDialog::KS_SPELLING);
diff --git a/kspread/plugins/calculator/main.h b/kspread/plugins/calculator/main.h
index f44a1a01..dd4d456f 100644
--- a/kspread/plugins/calculator/main.h
+++ b/kspread/plugins/calculator/main.h
@@ -25,7 +25,7 @@
#include <tqobject.h>
#include <klibloader.h>
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
#include <koffice_export.h>
diff --git a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.h b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.h
index b8f68183..0dde5dba 100644
--- a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.h
+++ b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.h
@@ -25,7 +25,7 @@
#ifndef KSPREAD_PLUGININSERTCALENDAR_H
#define KSPREAD_PLUGININSERTCALENDAR_H
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
#include <koffice_export.h>
diff --git a/kspread/plugins/scripting/Makefile.am b/kspread/plugins/scripting/Makefile.am
index dc1e7ff2..1f490468 100644
--- a/kspread/plugins/scripting/Makefile.am
+++ b/kspread/plugins/scripting/Makefile.am
@@ -14,7 +14,7 @@ noinst_HEADERS = scripting.h
kspreadscripting_la_METASOURCES = AUTO
-kspreadscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kspreadscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
kspreadscripting_la_LIBADD = $(top_builddir)/kspread/libkspreadcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la
kde_services_DATA = kspreadscripting.desktop
diff --git a/kspread/plugins/scripting/kspreadcore/Makefile.am b/kspread/plugins/scripting/kspreadcore/Makefile.am
index c9f1f55c..fcd552f0 100644
--- a/kspread/plugins/scripting/kspreadcore/Makefile.am
+++ b/kspread/plugins/scripting/kspreadcore/Makefile.am
@@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = krosskspreadcore.la
krosskspreadcore_la_SOURCES = kspreadcoremodule.cpp krs_doc.cpp krs_sheet.cpp krs_cell.cpp
-krosskspreadcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+krosskspreadcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
krosskspreadcore_la_LIBADD = \
$(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
$(LIB_QT) \
diff --git a/kspread/plugins/scripting/scripting.h b/kspread/plugins/scripting/scripting.h
index 29fa6681..52ffadd1 100644
--- a/kspread/plugins/scripting/scripting.h
+++ b/kspread/plugins/scripting/scripting.h
@@ -22,7 +22,7 @@
#ifndef SCRIPTING_H
#define SCRIPTING_H
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
#include <kspread_view.h>
namespace Kross {
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-10 08:29:30 +0000