summaryrefslogtreecommitdiffstats
path: root/lib/kofficecore
diff options
context:
space:
mode:
Diffstat (limited to 'lib/kofficecore')
-rw-r--r--lib/kofficecore/KoApplication.cpp6
-rw-r--r--lib/kofficecore/KoDocument.cpp6
-rw-r--r--lib/kofficecore/KoDocumentInfo.cpp4
-rw-r--r--lib/kofficecore/KoDocumentInfoDlg.cpp12
-rw-r--r--lib/kofficecore/KoGlobal.cpp10
-rw-r--r--lib/kofficecore/KoGlobal.h2
-rw-r--r--lib/kofficecore/KoMainWindow.cpp24
-rw-r--r--lib/kofficecore/KoPageLayout.cpp2
-rw-r--r--lib/kofficecore/KoPictureBase.cpp2
-rw-r--r--lib/kofficecore/KoPictureEps.cpp2
-rw-r--r--lib/kofficecore/KoSpeaker.cpp4
-rw-r--r--lib/kofficecore/KoTemplates.cpp2
-rw-r--r--lib/kofficecore/KoUnit.cpp4
-rw-r--r--lib/kofficecore/KoView.cpp2
14 files changed, 41 insertions, 41 deletions
diff --git a/lib/kofficecore/KoApplication.cpp b/lib/kofficecore/KoApplication.cpp
index 47861558..d594e0a0 100644
--- a/lib/kofficecore/KoApplication.cpp
+++ b/lib/kofficecore/KoApplication.cpp
@@ -173,11 +173,11 @@ bool KoApplication::start()
kdDebug(30003) << "using full path..." << endl;
} else {
TQString desktopName(args->arg(i));
- TQString appName = KGlobal::instance()->instanceName();
+ TQString appName = TDEGlobal::instance()->instanceName();
- paths = KGlobal::dirs()->findAllResources("data", appName +"/templates/*/" + desktopName );
+ paths = TDEGlobal::dirs()->findAllResources("data", appName +"/templates/*/" + desktopName );
if ( paths.isEmpty()) {
- paths = KGlobal::dirs()->findAllResources("data", appName +"/templates/" + desktopName );
+ paths = TDEGlobal::dirs()->findAllResources("data", appName +"/templates/" + desktopName );
}
if ( paths.isEmpty()) {
KMessageBox::error(0L, i18n("No template found for: %1 ").arg(desktopName) );
diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp
index 7eebcbca..beb0b266 100644
--- a/lib/kofficecore/KoDocument.cpp
+++ b/lib/kofficecore/KoDocument.cpp
@@ -112,7 +112,7 @@ public:
{
m_confirmNonNativeSave[0] = true;
m_confirmNonNativeSave[1] = true;
- if ( KGlobal::locale()->measureSystem() == KLocale::Imperial ) {
+ if ( TDEGlobal::locale()->measureSystem() == KLocale::Imperial ) {
m_unit = KoUnit::U_INCH;
} else {
m_unit = KoUnit::U_CM;
@@ -168,9 +168,9 @@ public:
KoViewWrapperWidget( TQWidget *parent, const char *name )
: TQWidget( parent, name )
{
- KGlobal::locale()->insertCatalogue("koffice");
+ TDEGlobal::locale()->insertCatalogue("koffice");
// Tell the iconloader about share/apps/koffice/icons
- KGlobal::iconLoader()->addAppDir("koffice");
+ TDEGlobal::iconLoader()->addAppDir("koffice");
m_view = 0L;
// Avoid warning from KParts - we'll have the KoView as focus proxy anyway
setFocusPolicy( TQ_ClickFocus );
diff --git a/lib/kofficecore/KoDocumentInfo.cpp b/lib/kofficecore/KoDocumentInfo.cpp
index 1c9400c6..871c81fd 100644
--- a/lib/kofficecore/KoDocumentInfo.cpp
+++ b/lib/kofficecore/KoDocumentInfo.cpp
@@ -831,7 +831,7 @@ TQString KoDocumentInfoAbout::editingCycles() const
TQString KoDocumentInfoAbout::creationDate() const
{
if ( m_creationDate.isValid() )
- return KGlobal::locale()->formatDateTime( m_creationDate );
+ return TDEGlobal::locale()->formatDateTime( m_creationDate );
else
return TQString();
}
@@ -839,7 +839,7 @@ TQString KoDocumentInfoAbout::creationDate() const
TQString KoDocumentInfoAbout::modificationDate() const
{
if ( m_modificationDate.isValid() )
- return KGlobal::locale()->formatDateTime( m_modificationDate );
+ return TDEGlobal::locale()->formatDateTime( m_modificationDate );
else
return TQString();
}
diff --git a/lib/kofficecore/KoDocumentInfoDlg.cpp b/lib/kofficecore/KoDocumentInfoDlg.cpp
index 8fd35ea9..7918fab2 100644
--- a/lib/kofficecore/KoDocumentInfoDlg.cpp
+++ b/lib/kofficecore/KoDocumentInfoDlg.cpp
@@ -191,7 +191,7 @@ void KoDocumentInfoDlg::deleteInfo()
void KoDocumentInfoDlg::resetMetaData()
{
- TQString s = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() );
+ TQString s = TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() );
d->m_aboutWidget->labelCreated->setText( s + ", " + d->m_info->creator() );
d->m_aboutWidget->labelModified->setText( "" );
d->m_aboutWidget->labelRevision->setText( "0" );
@@ -202,9 +202,9 @@ void KoDocumentInfoDlg::addAuthorPage( KoDocumentInfoAuthor *authorInfo )
{
TQVBox *page = d->m_dialog->addVBoxPage( i18n( "Author" ) );
d->m_authorWidget = new KoDocumentInfoAuthorWidget( page );
- d->m_authorWidget->labelAuthor->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, 48 ) );
- d->m_authorWidget->pbLoadKABC->setIconSet( TQIconSet( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Small ) ) );
- d->m_authorWidget->pbDelete->setIconSet( TQIconSet( KGlobal::iconLoader()->loadIcon( "eraser", KIcon::Small ) ) );
+ d->m_authorWidget->labelAuthor->setPixmap( TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, 48 ) );
+ d->m_authorWidget->pbLoadKABC->setIconSet( TQIconSet( TDEGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Small ) ) );
+ d->m_authorWidget->pbDelete->setIconSet( TQIconSet( TDEGlobal::iconLoader()->loadIcon( "eraser", KIcon::Small ) ) );
d->m_authorWidget->leFullName->setText( authorInfo->fullName() );
d->m_authorWidget->leInitial->setText( authorInfo->initial() );
@@ -256,7 +256,7 @@ void KoDocumentInfoDlg::addAboutPage( KoDocumentInfoAbout *aboutInfo )
{
TQVBox *page = d->m_dialog->addVBoxPage( i18n( "General" ) );
d->m_aboutWidget = new KoDocumentInfoAboutWidget( page );
- d->m_aboutWidget->pbReset->setIconSet( TQIconSet( KGlobal::iconLoader()->loadIcon( "reload", KIcon::Small ) ) );
+ d->m_aboutWidget->pbReset->setIconSet( TQIconSet( TDEGlobal::iconLoader()->loadIcon( "reload", KIcon::Small ) ) );
KoDocument* doc = dynamic_cast< KoDocument* >( d->m_info->parent() );
if ( doc )
{
@@ -302,7 +302,7 @@ void KoDocumentInfoDlg::addUserMetadataPage( KoDocumentInfoUserMetadata *userMet
TQString name = it.key();
TQString value = it.data();
KListViewItem* it = new KListViewItem( d->m_metaWidget->metaListView, name, value );
- it->setPixmap( 0, KGlobal::iconLoader()->loadIcon( "text", KIcon::Small ) );
+ it->setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "text", KIcon::Small ) );
}
}
diff --git a/lib/kofficecore/KoGlobal.cpp b/lib/kofficecore/KoGlobal.cpp
index 3c979f93..10ee5bd9 100644
--- a/lib/kofficecore/KoGlobal.cpp
+++ b/lib/kofficecore/KoGlobal.cpp
@@ -51,15 +51,15 @@ KoGlobal::KoGlobal()
setlocale( LC_NUMERIC, "C" );
// Install the libkoffice* translations
- KGlobal::locale()->insertCatalogue("koffice");
+ TDEGlobal::locale()->insertCatalogue("koffice");
KImageIO::registerFormats();
// Tell KStandardDirs about the koffice prefix
- KGlobal::dirs()->addPrefix(PREFIX);
+ TDEGlobal::dirs()->addPrefix(PREFIX);
// Tell the iconloader about share/apps/koffice/icons
- KGlobal::iconLoader()->addAppDir("koffice");
+ TDEGlobal::iconLoader()->addAppDir("koffice");
// Another way to get the DPI of the display would be TQPaintDeviceMetrics,
// but we have no widget here (and moving this to KoView wouldn't allow
@@ -80,7 +80,7 @@ KoGlobal::~KoGlobal()
TQFont KoGlobal::_defaultFont()
{
- TQFont font = KGlobalSettings::generalFont();
+ TQFont font = TDEGlobalSettings::generalFont();
// we have to use TQFontInfo, in case the font was specified with a pixel size
if ( font.pointSize() == -1 )
{
@@ -135,7 +135,7 @@ void KoGlobal::createListOfLanguages()
// Many of them are already in all_languages but all_languages doesn't
// currently have en_GB or en_US etc.
- const TQStringList translationList = KGlobal::dirs()->findAllResources("locale",
+ const TQStringList translationList = TDEGlobal::dirs()->findAllResources("locale",
TQString::fromLatin1("*/entry.desktop"));
for ( TQStringList::ConstIterator it = translationList.begin();
it != translationList.end(); ++it )
diff --git a/lib/kofficecore/KoGlobal.h b/lib/kofficecore/KoGlobal.h
index 367a150b..cad645b4 100644
--- a/lib/kofficecore/KoGlobal.h
+++ b/lib/kofficecore/KoGlobal.h
@@ -33,7 +33,7 @@ class KOFFICECORE_EXPORT KoGlobal
public:
/// For KoApplication
static void initialize() {
- (void)self(); // I don't want to make KGlobal instances public, so self() is private
+ (void)self(); // I don't want to make TDEGlobal instances public, so self() is private
}
/**
* Return the default font for KOffice programs.
diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp
index 2487993a..70275b6e 100644
--- a/lib/kofficecore/KoMainWindow.cpp
+++ b/lib/kofficecore/KoMainWindow.cpp
@@ -201,7 +201,7 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name )
// part's instance! (Simon)
TQString doc;
- TQStringList allFiles = KGlobal::dirs()->findAllResources( "data", "koffice/koffice_shell.rc" );
+ TQStringList allFiles = TDEGlobal::dirs()->findAllResources( "data", "koffice/koffice_shell.rc" );
setXMLFile( findMostRecentXMLFile( allFiles, doc ) );
setLocalXMLFile( locateLocal( "data", "koffice/koffice_shell.rc" ) );
@@ -284,7 +284,7 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name )
d->m_splitViewActionList.append(new KActionSeparator(TQT_TQOBJECT(this)));
// Load list of recent files
- KConfig * config = instance ? instance->config() : KGlobal::config();
+ KConfig * config = instance ? instance->config() : TDEGlobal::config();
m_recent->loadEntries( config );
createShellGUI();
@@ -293,7 +293,7 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name )
if ( !initialGeometrySet() )
{
// Default size
- const int deskWidth = KGlobalSettings::desktopGeometry(this).width();
+ const int deskWidth = TDEGlobalSettings::desktopGeometry(this).width();
if (deskWidth > 1100) // very big desktop ?
resize( 1000, 800 );
if (deskWidth > 850) // big desktop ?
@@ -443,7 +443,7 @@ void KoMainWindow::addRecentURL( const KURL& url )
if ( url.isLocalFile() )
{
TQString path = url.path( -1 );
- TQStringList tmpDirs = KGlobal::dirs()->resourceDirs( "tmp" );
+ TQStringList tmpDirs = TDEGlobal::dirs()->resourceDirs( "tmp" );
for ( TQStringList::Iterator it = tmpDirs.begin() ; ok && it != tmpDirs.end() ; ++it )
if ( path.contains( *it ) )
ok = false; // it's in the tmp resource
@@ -462,7 +462,7 @@ void KoMainWindow::addRecentURL( const KURL& url )
void KoMainWindow::saveRecentFiles()
{
// Save list of recent files
- KConfig * config = instance() ? instance()->config() : KGlobal::config();
+ KConfig * config = instance() ? instance()->config() : TDEGlobal::config();
kdDebug(30003) << this << " Saving recent files list into config. instance()=" << instance() << endl;
m_recent->saveEntries( config );
config->sync();
@@ -478,7 +478,7 @@ void KoMainWindow::saveRecentFiles()
void KoMainWindow::reloadRecentFileList()
{
- KConfig * config = instance() ? instance()->config() : KGlobal::config();
+ KConfig * config = instance() ? instance()->config() : TDEGlobal::config();
m_recent->loadEntries( config );
}
@@ -998,8 +998,8 @@ void KoMainWindow::saveWindowSettings()
d->m_windowSizeDirty = false;
// Save toolbar position into the config file of the app, under the doc's instance name
//kdDebug(30003) << "KoMainWindow::closeEvent -> saveMainWindowSettings rootdoc's instance=" << rootDocument()->instance()->instanceName() << endl;
- saveMainWindowSettings( KGlobal::config(), rootDocument()->instance()->instanceName() );
- KGlobal::config()->sync();
+ saveMainWindowSettings( TDEGlobal::config(), rootDocument()->instance()->instanceName() );
+ TDEGlobal::config()->sync();
resetAutoSaveSettings(); // Don't let KMainWindow override the good stuff we wrote down
}
}
@@ -1212,7 +1212,7 @@ void KoMainWindow::print(bool quick) {
if ( title.isEmpty() ) {
// #139905 - breaks message freeze though
//const TQString programName = instance()->aboutData() ? instance()->aboutData()->programName() : instance()->instanceName();
- //title = i18n("%1 unsaved document (%2)").arg(programName).arg(KGlobal::locale()->formatDate(TQDate::currentDate(), true/*short*/));
+ //title = i18n("%1 unsaved document (%2)").arg(programName).arg(TDEGlobal::locale()->formatDate(TQDate::currentDate(), true/*short*/));
}
printer.setDocName( title );
printer.setDocFileName( fileName );
@@ -1275,7 +1275,7 @@ void KoMainWindow::slotConfigureKeys()
void KoMainWindow::slotConfigureToolbars()
{
if (rootDocument())
- saveMainWindowSettings( KGlobal::config(), rootDocument()->instance()->instanceName() );
+ saveMainWindowSettings( TDEGlobal::config(), rootDocument()->instance()->instanceName() );
KEditToolbar edit(factory(), this);
connect(&edit,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig()));
(void) edit.exec();
@@ -1284,7 +1284,7 @@ void KoMainWindow::slotConfigureToolbars()
void KoMainWindow::slotNewToolbarConfig()
{
if (rootDocument())
- applyMainWindowSettings( KGlobal::config(), rootDocument()->instance()->instanceName() );
+ applyMainWindowSettings( TDEGlobal::config(), rootDocument()->instance()->instanceName() );
KXMLGUIFactory *factory = guiFactory();
// Check if there's an active view
@@ -1315,7 +1315,7 @@ void KoMainWindow::slotToolbarToggled( bool toggle )
bar->hide();
if (rootDocument())
- saveMainWindowSettings( KGlobal::config(), rootDocument()->instance()->instanceName() );
+ saveMainWindowSettings( TDEGlobal::config(), rootDocument()->instance()->instanceName() );
}
else
kdWarning(30003) << "slotToolbarToggled : Toolbar " << TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() << " not found!" << endl;
diff --git a/lib/kofficecore/KoPageLayout.cpp b/lib/kofficecore/KoPageLayout.cpp
index c3965d45..62d81b32 100644
--- a/lib/kofficecore/KoPageLayout.cpp
+++ b/lib/kofficecore/KoPageLayout.cpp
@@ -215,7 +215,7 @@ KoFormat KoPageFormat::formatFromString( const TQString & string )
KoFormat KoPageFormat::defaultFormat()
{
- int kprinter = KGlobal::locale()->pageSize();
+ int kprinter = TDEGlobal::locale()->pageSize();
for ( int i = 0 ; i <= PG_LAST_FORMAT ; ++i )
{
if ( pageFormatInfo[ i ].kprinter == kprinter )
diff --git a/lib/kofficecore/KoPictureBase.cpp b/lib/kofficecore/KoPictureBase.cpp
index 29ec51b9..5f81efde 100644
--- a/lib/kofficecore/KoPictureBase.cpp
+++ b/lib/kofficecore/KoPictureBase.cpp
@@ -39,7 +39,7 @@ KoPictureBase::KoPictureBase(void)
// Slow mode can be very slow, especially at high zoom levels -> configurable
if ( s_useSlowResizeMode == -1 )
{
- KConfigGroup group( KGlobal::config(), "KOfficeImage" );
+ KConfigGroup group( TDEGlobal::config(), "KOfficeImage" );
s_useSlowResizeMode = group.readNumEntry( "HighResolution", 1 );
kdDebug(30003) << "HighResolution = " << s_useSlowResizeMode << endl;
}
diff --git a/lib/kofficecore/KoPictureEps.cpp b/lib/kofficecore/KoPictureEps.cpp
index 87547bdf..b6a05c8a 100644
--- a/lib/kofficecore/KoPictureEps.cpp
+++ b/lib/kofficecore/KoPictureEps.cpp
@@ -125,7 +125,7 @@ int KoPictureEps::tryScaleWithGhostScript(TQImage &image, const TQSize& size, co
// create GS command line
TQString cmdBuf ( "gs -sOutputFile=" );
- cmdBuf += KProcess::quote(tmpFile.name());
+ cmdBuf += TDEProcess::quote(tmpFile.name());
cmdBuf += " -q -g";
cmdBuf += TQString::number( wantedWidth );
cmdBuf += "x";
diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp
index 4728c7a8..0f0bea62 100644
--- a/lib/kofficecore/KoSpeaker.cpp
+++ b/lib/kofficecore/KoSpeaker.cpp
@@ -113,7 +113,7 @@ KoSpeaker::KoSpeaker()
Q_ASSERT(!KSpkr);
KSpkr = this;
d = new KoSpeakerPrivate();
- readConfig(KGlobal::config());
+ readConfig(TDEGlobal::config());
}
KoSpeaker::~KoSpeaker()
@@ -170,7 +170,7 @@ void KoSpeaker::queueSpeech(const TQString& msg, const TQString& langCode /*= TQ
// If no language code given, assume desktop setting.
TQString languageCode = langCode;
if (langCode.isEmpty())
- languageCode = KGlobal::locale()->language();
+ languageCode = TDEGlobal::locale()->language();
// kdDebug() << "KoSpeaker::queueSpeech:languageCode = " << languageCode << endl;
// If KTTSD version is 0.3.5 or later, we can use the appendText method to submit a
// single, multi-part text job. Otherwise, must submit separate text jobs.
diff --git a/lib/kofficecore/KoTemplates.cpp b/lib/kofficecore/KoTemplates.cpp
index e020213e..4b0cfe5b 100644
--- a/lib/kofficecore/KoTemplates.cpp
+++ b/lib/kofficecore/KoTemplates.cpp
@@ -244,7 +244,7 @@ void KoTemplateTree::readGroups() {
void KoTemplateTree::readTemplates() {
TQString dontShow = "imperial";
- if(KGlobal::locale()->pageSize() == TQPrinter::Letter) {
+ if(TDEGlobal::locale()->pageSize() == TQPrinter::Letter) {
dontShow = "metric";
}
diff --git a/lib/kofficecore/KoUnit.cpp b/lib/kofficecore/KoUnit.cpp
index 3ba89f24..9068fc94 100644
--- a/lib/kofficecore/KoUnit.cpp
+++ b/lib/kofficecore/KoUnit.cpp
@@ -114,7 +114,7 @@ double KoUnit::ptToUnit( const double ptValue, const Unit unit )
TQString KoUnit::toUserStringValue( double ptValue, Unit unit )
{
- return KGlobal::locale()->formatNumber( toUserValue( ptValue, unit ) );
+ return TDEGlobal::locale()->formatNumber( toUserValue( ptValue, unit ) );
}
double KoUnit::fromUserValue( double value, Unit unit )
@@ -142,7 +142,7 @@ double KoUnit::fromUserValue( double value, Unit unit )
double KoUnit::fromUserValue( const TQString& value, Unit unit, bool* ok )
{
- return fromUserValue( KGlobal::locale()->readNumber( value, ok ), unit );
+ return fromUserValue( TDEGlobal::locale()->readNumber( value, ok ), unit );
}
double KoUnit::parseValue( TQString value, double defaultVal )
diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp
index 634a1393..3688de4e 100644
--- a/lib/kofficecore/KoView.cpp
+++ b/lib/kofficecore/KoView.cpp
@@ -219,7 +219,7 @@ KParts::PartManager *KoView::partManager() const
KAction *KoView::action( const TQDomElement &element ) const
{
- static const TQString &attrName = KGlobal::staticQString( "name" );
+ static const TQString &attrName = TDEGlobal::staticQString( "name" );
TQString name = element.attribute( attrName );
KAction *act = KXMLGUIClient::action( name.utf8() );
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-15 15:16:33 +0000