summaryrefslogtreecommitdiffstats
path: root/filters/kword
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:23:24 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:23:24 -0600
commit5b8ab149469c8e186ee8b05d90c0103ae722dd85 (patch)
treefb31321c80b12ee8e2237bdcf8c228fe44e67772 /filters/kword
parentfe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff)
downloadkoffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz
koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'filters/kword')
-rw-r--r--filters/kword/abiword/ImportStyle.cc2
-rw-r--r--filters/kword/abiword/abiwordexport.cc2
-rw-r--r--filters/kword/abiword/abiwordimport.cc2
-rw-r--r--filters/kword/ascii/ExportDialog.cc6
-rw-r--r--filters/kword/ascii/ImportDialog.cc6
-rw-r--r--filters/kword/ascii/asciiexport.cc2
-rw-r--r--filters/kword/ascii/asciiimport.cc2
-rw-r--r--filters/kword/html/export/ExportDialog.cc6
-rw-r--r--filters/kword/mswrite/ImportDialog.cc6
-rw-r--r--filters/kword/mswrite/mswriteexport.cc2
-rw-r--r--filters/kword/mswrite/mswriteimport.cc2
-rw-r--r--filters/kword/pdf/pdfimport.cpp2
-rw-r--r--filters/kword/rtf/export/ExportFilter.cc14
13 files changed, 27 insertions, 27 deletions
diff --git a/filters/kword/abiword/ImportStyle.cc b/filters/kword/abiword/ImportStyle.cc
index 5a08cf0d..ac432855 100644
--- a/filters/kword/abiword/ImportStyle.cc
+++ b/filters/kword/abiword/ImportStyle.cc
@@ -119,7 +119,7 @@ void StyleDataMap::defineDefaultStyles(void)
defineNewStyle("Heading 2",2,strHeading+"font-size: 14pt");
defineNewStyle("Heading 3",3,strHeading+"font-size: 12pt");
defineNewStyle("Block Text",-1,"margin-left: 1in; margin-right: 1in; margin-bottom: 6pt");
- TQFontInfo fixedInfo(KGlobalSettings::fixedFont());
+ TQFontInfo fixedInfo(TDEGlobalSettings::fixedFont());
TQString strPlainText=TQString("font-family: %1")
.arg(fixedInfo.family()); // TODO: should be "Courier New"
kdDebug(30506) << "Plain Text: " << strPlainText << endl;
diff --git a/filters/kword/abiword/abiwordexport.cc b/filters/kword/abiword/abiwordexport.cc
index cacfcea7..11f5d2dd 100644
--- a/filters/kword/abiword/abiwordexport.cc
+++ b/filters/kword/abiword/abiwordexport.cc
@@ -61,7 +61,7 @@ public:
protected:
virtual void setupTranslations( void )
{
- KGlobal::locale()->insertCatalogue( "kofficefilters" );
+ TDEGlobal::locale()->insertCatalogue( "kofficefilters" );
}
};
diff --git a/filters/kword/abiword/abiwordimport.cc b/filters/kword/abiword/abiwordimport.cc
index 2c7e4d3f..aec3373f 100644
--- a/filters/kword/abiword/abiwordimport.cc
+++ b/filters/kword/abiword/abiwordimport.cc
@@ -55,7 +55,7 @@ public:
protected:
virtual void setupTranslations( void )
{
- KGlobal::locale()->insertCatalogue( "kofficefilters" );
+ TDEGlobal::locale()->insertCatalogue( "kofficefilters" );
}
};
diff --git a/filters/kword/ascii/ExportDialog.cc b/filters/kword/ascii/ExportDialog.cc
index d5e581e3..e77f58c7 100644
--- a/filters/kword/ascii/ExportDialog.cc
+++ b/filters/kword/ascii/ExportDialog.cc
@@ -43,7 +43,7 @@ AsciiExportDialog :: AsciiExportDialog(TQWidget* parent)
TQStringList encodings;
encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
- encodings += KGlobal::charsets()->descriptiveEncodingNames();
+ encodings += TDEGlobal::charsets()->descriptiveEncodingNames();
// Add a few non-standard encodings, which might be useful for text files
const TQString description(i18n("Descriptive encoding name","Other ( %1 )"));
encodings << description.arg("Apple Roman"); // Apple
@@ -63,7 +63,7 @@ AsciiExportDialog :: ~AsciiExportDialog(void)
TQTextCodec* AsciiExportDialog::getCodec(void) const
{
- const TQString strCodec( KGlobal::charsets()->encodingForName( m_dialog->comboBoxEncoding->currentText() ) );
+ const TQString strCodec( TDEGlobal::charsets()->encodingForName( m_dialog->comboBoxEncoding->currentText() ) );
kdDebug(30502) << "Encoding: " << strCodec << endl;
bool ok = false;
@@ -76,7 +76,7 @@ TQTextCodec* AsciiExportDialog::getCodec(void) const
}
else
{
- codec = KGlobal::charsets()->codecForName( strCodec, ok );
+ codec = TDEGlobal::charsets()->codecForName( strCodec, ok );
}
// Still nothing?
diff --git a/filters/kword/ascii/ImportDialog.cc b/filters/kword/ascii/ImportDialog.cc
index 318dae0b..6f813b10 100644
--- a/filters/kword/ascii/ImportDialog.cc
+++ b/filters/kword/ascii/ImportDialog.cc
@@ -43,7 +43,7 @@ AsciiImportDialog :: AsciiImportDialog(TQWidget* parent)
TQStringList encodings;
encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
encodings << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
- encodings += KGlobal::charsets()->descriptiveEncodingNames();
+ encodings += TDEGlobal::charsets()->descriptiveEncodingNames();
// Add a few non-standard encodings, which might be useful for text files
const TQString description(i18n("Descriptive encoding name","Other ( %1 )"));
encodings << description.arg("Apple Roman"); // Apple
@@ -62,7 +62,7 @@ AsciiImportDialog :: ~AsciiImportDialog(void)
TQTextCodec* AsciiImportDialog::getCodec(void) const
{
- const TQString strCodec( KGlobal::charsets()->encodingForName( m_dialog->comboBoxEncoding->currentText() ) );
+ const TQString strCodec( TDEGlobal::charsets()->encodingForName( m_dialog->comboBoxEncoding->currentText() ) );
kdDebug(30502) << "Encoding: " << strCodec << endl;
bool ok = false;
@@ -75,7 +75,7 @@ TQTextCodec* AsciiImportDialog::getCodec(void) const
}
else
{
- codec = KGlobal::charsets()->codecForName( strCodec, ok );
+ codec = TDEGlobal::charsets()->codecForName( strCodec, ok );
}
// Still nothing?
diff --git a/filters/kword/ascii/asciiexport.cc b/filters/kword/ascii/asciiexport.cc
index f31818f9..1bea9a26 100644
--- a/filters/kword/ascii/asciiexport.cc
+++ b/filters/kword/ascii/asciiexport.cc
@@ -56,7 +56,7 @@ public:
protected:
virtual void setupTranslations(void)
{
- KGlobal::locale()->insertCatalogue("kofficefilters");
+ TDEGlobal::locale()->insertCatalogue("kofficefilters");
}
};
diff --git a/filters/kword/ascii/asciiimport.cc b/filters/kword/ascii/asciiimport.cc
index 450c938f..c3d17203 100644
--- a/filters/kword/ascii/asciiimport.cc
+++ b/filters/kword/ascii/asciiimport.cc
@@ -56,7 +56,7 @@ public:
protected:
virtual void setupTranslations( void )
{
- KGlobal::locale()->insertCatalogue( "kofficefilters" );
+ TDEGlobal::locale()->insertCatalogue( "kofficefilters" );
}
};
diff --git a/filters/kword/html/export/ExportDialog.cc b/filters/kword/html/export/ExportDialog.cc
index ff81c956..70243ca5 100644
--- a/filters/kword/html/export/ExportDialog.cc
+++ b/filters/kword/html/export/ExportDialog.cc
@@ -48,7 +48,7 @@ HtmlExportDialog :: HtmlExportDialog(TQWidget* parent)
encodingList += i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
encodingList += i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->name() );
- encodingList += KGlobal::charsets()->descriptiveEncodingNames();
+ encodingList += TDEGlobal::charsets()->descriptiveEncodingNames();
m_dialog->comboBoxEncoding->insertStringList( encodingList );
@@ -84,7 +84,7 @@ bool HtmlExportDialog::isXHtml(void) const
TQTextCodec* HtmlExportDialog::getCodec(void) const
{
- const TQString strCodec( KGlobal::charsets()->encodingForName( m_dialog->comboBoxEncoding->currentText() ) );
+ const TQString strCodec( TDEGlobal::charsets()->encodingForName( m_dialog->comboBoxEncoding->currentText() ) );
kdDebug(30503) << "Encoding: " << strCodec << endl;
bool ok = false;
@@ -97,7 +97,7 @@ TQTextCodec* HtmlExportDialog::getCodec(void) const
}
else
{
- codec = KGlobal::charsets()->codecForName( strCodec, ok );
+ codec = TDEGlobal::charsets()->codecForName( strCodec, ok );
}
// Still nothing?
diff --git a/filters/kword/mswrite/ImportDialog.cc b/filters/kword/mswrite/ImportDialog.cc
index 460677cb..d26087fe 100644
--- a/filters/kword/mswrite/ImportDialog.cc
+++ b/filters/kword/mswrite/ImportDialog.cc
@@ -41,8 +41,8 @@ MSWriteImportDialog :: MSWriteImportDialog(TQWidget* parent)
{
kapp->restoreOverrideCursor();
- m_dialog->comboBoxEncoding->insertStringList(KGlobal::charsets()->availableEncodingNames());
- //m_dialog->comboBoxEncoding->insertStringList(KGlobal::charsets()->descriptiveEncodingNames());
+ m_dialog->comboBoxEncoding->insertStringList(TDEGlobal::charsets()->availableEncodingNames());
+ //m_dialog->comboBoxEncoding->insertStringList(TDEGlobal::charsets()->descriptiveEncodingNames());
resize(size()); // Is this right?
@@ -83,7 +83,7 @@ TQTextCodec* MSWriteImportDialog::getCodec(void) const
{
// We do not use TQTextCodec::codecForName here
// because we fear subtle problems
- codec=KGlobal::charsets()->codecForName(strCodec);
+ codec=TDEGlobal::charsets()->codecForName(strCodec);
}
}
diff --git a/filters/kword/mswrite/mswriteexport.cc b/filters/kword/mswrite/mswriteexport.cc
index a65cd330..abf007f8 100644
--- a/filters/kword/mswrite/mswriteexport.cc
+++ b/filters/kword/mswrite/mswriteexport.cc
@@ -55,7 +55,7 @@ public:
protected:
virtual void setupTranslations (void)
{
- KGlobal::locale()->insertCatalogue ("kofficefilters");
+ TDEGlobal::locale()->insertCatalogue ("kofficefilters");
}
};
diff --git a/filters/kword/mswrite/mswriteimport.cc b/filters/kword/mswrite/mswriteimport.cc
index c28c9d62..7fd3b63e 100644
--- a/filters/kword/mswrite/mswriteimport.cc
+++ b/filters/kword/mswrite/mswriteimport.cc
@@ -53,7 +53,7 @@ public:
protected:
virtual void setupTranslations (void)
{
- KGlobal::locale()->insertCatalogue ("kofficefilters");
+ TDEGlobal::locale()->insertCatalogue ("kofficefilters");
}
};
diff --git a/filters/kword/pdf/pdfimport.cpp b/filters/kword/pdf/pdfimport.cpp
index dfc56703..62c4d2a8 100644
--- a/filters/kword/pdf/pdfimport.cpp
+++ b/filters/kword/pdf/pdfimport.cpp
@@ -45,7 +45,7 @@ class PdfImportFactory : KGenericFactory<PdfImport, KoFilter>
protected:
virtual void setupTranslations() {
- KGlobal::locale()->insertCatalogue("kofficefilters");
+ TDEGlobal::locale()->insertCatalogue("kofficefilters");
}
};
diff --git a/filters/kword/rtf/export/ExportFilter.cc b/filters/kword/rtf/export/ExportFilter.cc
index f4f8d894..14f0f2a0 100644
--- a/filters/kword/rtf/export/ExportFilter.cc
+++ b/filters/kword/rtf/export/ExportFilter.cc
@@ -585,23 +585,23 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
if (key == "locale" )
{
if (0==(*paraFormatDataIt).variable.m_type)
- key = KGlobal::locale()->dateFormat();
+ key = TDEGlobal::locale()->dateFormat();
else
- key = KGlobal::locale()->timeFormat();
+ key = TDEGlobal::locale()->timeFormat();
}
else if ( key == "localeshort" )
- key = KGlobal::locale()->dateFormatShort();
+ key = TDEGlobal::locale()->dateFormatShort();
else if ( key == "localedatetime" )
{
- key = KGlobal::locale()->dateFormat();
+ key = TDEGlobal::locale()->dateFormat();
key += ' ';
- key += KGlobal::locale()->timeFormat();
+ key += TDEGlobal::locale()->timeFormat();
}
else if ( key == "localedatetimeshort" )
{
- key = KGlobal::locale()->dateFormat();
+ key = TDEGlobal::locale()->dateFormat();
key += ' ';
- key += KGlobal::locale()->timeFormat();
+ key += TDEGlobal::locale()->timeFormat();
}
kdDebug(30515) << "Locale date in KLocale format: " << key << endl;