summaryrefslogtreecommitdiffstats
path: root/kate
diff options
context:
space:
mode:
Diffstat (limited to 'kate')
-rw-r--r--kate/part/kateconfig.cpp16
-rw-r--r--kate/part/katedialogs.cpp18
-rw-r--r--kate/part/katedialogs.h4
-rw-r--r--kate/part/katedocument.cpp2
-rw-r--r--kate/part/katefont.cpp8
-rw-r--r--kate/part/katehighlight.cpp2
-rw-r--r--kate/part/katejscript.cpp4
-rw-r--r--kate/part/kateluaindentscript.cpp2
-rw-r--r--kate/part/kateprinter.cpp10
-rw-r--r--kate/part/kateschema.cpp22
-rw-r--r--kate/part/katesyntaxdocument.cpp2
-rw-r--r--kate/part/kateview.cpp4
-rw-r--r--kate/part/kateviewhelpers.cpp8
-rw-r--r--kate/part/kateviewinternal.cpp2
-rw-r--r--kate/part/test_regression.cpp2
15 files changed, 53 insertions, 53 deletions
diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp
index 4b3c2f52b..ef6da69c1 100644
--- a/kate/part/kateconfig.cpp
+++ b/kate/part/kateconfig.cpp
@@ -422,11 +422,11 @@ TQTextCodec *KateDocumentConfig::codec ()
if (m_encodingSet || isGlobal())
{
if (m_encoding.isEmpty() && isGlobal())
- return KGlobal::charsets()->codecForName (TQString::fromLatin1(KGlobal::locale()->encoding()));
+ return TDEGlobal::charsets()->codecForName (TQString::fromLatin1(TDEGlobal::locale()->encoding()));
else if (m_encoding.isEmpty())
return s_global->codec ();
else
- return KGlobal::charsets()->codecForName (m_encoding);
+ return TDEGlobal::charsets()->codecForName (m_encoding);
}
return s_global->codec ();
@@ -439,7 +439,7 @@ void KateDocumentConfig::setEncoding (const TQString &encoding)
if (!enc.isEmpty())
{
bool found = false;
- TQTextCodec *codec = KGlobal::charsets()->codecForName (encoding, found);
+ TQTextCodec *codec = TDEGlobal::charsets()->codecForName (encoding, found);
if (!found || !codec)
return;
@@ -1127,12 +1127,12 @@ void KateRendererConfig::setSchemaInternal( int schema )
KConfig *config (KateFactory::self()->schemaManager()->schema(schema));
- TQColor tmp0 (KGlobalSettings::baseColor());
- TQColor tmp1 (KGlobalSettings::highlightColor());
- TQColor tmp2 (KGlobalSettings::alternateBackgroundColor());
+ TQColor tmp0 (TDEGlobalSettings::baseColor());
+ TQColor tmp1 (TDEGlobalSettings::highlightColor());
+ TQColor tmp2 (TDEGlobalSettings::alternateBackgroundColor());
TQColor tmp3 ( "#FFFF99" );
TQColor tmp4 (tmp2.dark());
- TQColor tmp5 ( KGlobalSettings::textColor() );
+ TQColor tmp5 ( TDEGlobalSettings::textColor() );
TQColor tmp6 ( "#EAE9E8" );
TQColor tmp7 ( "#000000" );
@@ -1170,7 +1170,7 @@ void KateRendererConfig::setSchemaInternal( int schema )
m_lineMarkerColor[index] = col;
}
- TQFont f (KGlobalSettings::fixedFont());
+ TQFont f (TDEGlobalSettings::fixedFont());
if (!m_fontSet)
{
diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp
index 5a5a73b70..1ae416264 100644
--- a/kate/part/katedialogs.cpp
+++ b/kate/part/katedialogs.cpp
@@ -999,7 +999,7 @@ void KateSaveConfigTab::apply()
KateDocumentConfig::global()->setConfigFlags(configFlags);
- KateDocumentConfig::global()->setEncoding((m_encoding->currentItem() == 0) ? "" : KGlobal::charsets()->encodingForName(m_encoding->currentText()));
+ KateDocumentConfig::global()->setEncoding((m_encoding->currentItem() == 0) ? "" : TDEGlobal::charsets()->encodingForName(m_encoding->currentText()));
KateDocumentConfig::global()->setEol(m_eol->currentItem());
KateDocumentConfig::global()->setAllowEolDetection(allowEolDetection->isChecked());
@@ -1013,12 +1013,12 @@ void KateSaveConfigTab::reload()
m_encoding->clear ();
m_encoding->insertItem (i18n("TDE Default"));
m_encoding->setCurrentItem(0);
- TQStringList encodings (KGlobal::charsets()->descriptiveEncodingNames());
+ TQStringList encodings (TDEGlobal::charsets()->descriptiveEncodingNames());
int insert = 1;
for (uint i=0; i < encodings.count(); i++)
{
bool found = false;
- TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(KGlobal::charsets()->encodingForName(encodings[i]), found);
+ TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(TDEGlobal::charsets()->encodingForName(encodings[i]), found);
if (found)
{
@@ -1529,7 +1529,7 @@ void KateHlDownloadDialog::listDataReceived(KIO::Job *, const TQByteArray &data)
void KateHlDownloadDialog::slotUser1()
{
- TQString destdir=KGlobal::dirs()->saveLocation("data","katepart/syntax/");
+ TQString destdir=TDEGlobal::dirs()->saveLocation("data","katepart/syntax/");
for (TQListViewItem *it=list->firstChild();it;it=it->nextSibling())
{
if (list->isSelected(it))
@@ -1640,16 +1640,16 @@ KateModOnHdPrompt::~KateModOnHdPrompt()
void KateModOnHdPrompt::slotDiff()
{
- // Start a KProcess that creates a diff
+ // Start a TDEProcess that creates a diff
KProcIO *p = new KProcIO();
- p->setComm( KProcess::All );
+ p->setComm( TDEProcess::All );
*p << "diff" << "-u" << "-" << m_doc->url().path();
- connect( p, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotPDone(KProcess*)) );
+ connect( p, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotPDone(TDEProcess*)) );
connect( p, TQT_SIGNAL(readReady(KProcIO*)), this, TQT_SLOT(slotPRead(KProcIO*)) );
setCursor( WaitCursor );
- p->start( KProcess::NotifyOnExit, true );
+ p->start( TDEProcess::NotifyOnExit, true );
uint lastln = m_doc->numLines();
for ( uint l = 0; l < lastln; l++ )
@@ -1678,7 +1678,7 @@ void KateModOnHdPrompt::slotPRead( KProcIO *p)
p->ackRead();
}
-void KateModOnHdPrompt::slotPDone( KProcess *p )
+void KateModOnHdPrompt::slotPDone( TDEProcess *p )
{
setCursor( ArrowCursor );
if( ! m_tmpfile )
diff --git a/kate/part/katedialogs.h b/kate/part/katedialogs.h
index aa6f21f6d..169ffaffc 100644
--- a/kate/part/katedialogs.h
+++ b/kate/part/katedialogs.h
@@ -360,7 +360,7 @@ class KateHlDownloadDialog: public KDialogBase
};
class KProcIO;
-class KProcess;
+class TDEProcess;
/**
* This dialog will prompt the user for what do with a file that is
* modified on disk.
@@ -394,7 +394,7 @@ class KateModOnHdPrompt : public KDialogBase
private slots:
void slotPRead(KProcIO*); ///< Read from the diff process
- void slotPDone(KProcess*); ///< Runs the diff file when done
+ void slotPDone(TDEProcess*); ///< Runs the diff file when done
private:
KateDocument *m_doc;
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index 603388479..b264e6533 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -1955,7 +1955,7 @@ void KateDocument::readSessionConfig(KConfig *kconfig)
void KateDocument::writeSessionConfig(KConfig *kconfig)
{
- if ( m_url.isLocalFile() && !KGlobal::dirs()->relativeLocation("tmp", m_url.path()).startsWith("/"))
+ if ( m_url.isLocalFile() && !TDEGlobal::dirs()->relativeLocation("tmp", m_url.path()).startsWith("/"))
return;
// save url
kconfig->writeEntry("URL", m_url.prettyURL() );
diff --git a/kate/part/katefont.cpp b/kate/part/katefont.cpp
index 89bfd0025..29955d7e2 100644
--- a/kate/part/katefont.cpp
+++ b/kate/part/katefont.cpp
@@ -68,10 +68,10 @@ int KateFontMetrics::width(TQChar c)
//
KateFontStruct::KateFontStruct()
-: myFont(KGlobalSettings::fixedFont()),
- myFontBold(KGlobalSettings::fixedFont()),
- myFontItalic(KGlobalSettings::fixedFont()),
- myFontBI(KGlobalSettings::fixedFont()),
+: myFont(TDEGlobalSettings::fixedFont()),
+ myFontBold(TDEGlobalSettings::fixedFont()),
+ myFontItalic(TDEGlobalSettings::fixedFont()),
+ myFontBI(TDEGlobalSettings::fixedFont()),
myFontMetrics(myFont),
myFontMetricsBold(myFontBold),
myFontMetricsItalic(myFontItalic),
diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp
index d5eec4c27..ca1276a6b 100644
--- a/kate/part/katehighlight.cpp
+++ b/kate/part/katehighlight.cpp
@@ -2094,7 +2094,7 @@ bool KateHighlighting::isInWord( TQChar c, int attrib ) const
bool KateHighlighting::canBreakAt( TQChar c, int attrib ) const
{
- static const TQString& sq = KGlobal::staticQString("\"'");
+ static const TQString& sq = TDEGlobal::staticQString("\"'");
return (m_additionalData[ hlKeyForAttrib( attrib ) ]->wordWrapDeliminator.find(c) != -1) && (sq.find(c) == -1);
}
diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp
index 58b4dd163..d33f26947 100644
--- a/kate/part/katejscript.cpp
+++ b/kate/part/katejscript.cpp
@@ -653,7 +653,7 @@ void KateJScriptManager::collectScripts (bool force)
}
// Let's get a list of all the .js files
- TQStringList list = KGlobal::dirs()->findAllResources("data","katepart/scripts/*.js",false,true);
+ TQStringList list = TDEGlobal::dirs()->findAllResources("data","katepart/scripts/*.js",false,true);
// Let's iterate through the list and build the Mode List
for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
@@ -1028,7 +1028,7 @@ void KateIndentJScriptManager::collectScripts (bool force)
#endif
// Let's get a list of all the .js files
- TQStringList list = KGlobal::dirs()->findAllResources("data","katepart/scripts/indent/*.js",false,true);
+ TQStringList list = TDEGlobal::dirs()->findAllResources("data","katepart/scripts/indent/*.js",false,true);
// Let's iterate through the list and build the Mode List
for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
diff --git a/kate/part/kateluaindentscript.cpp b/kate/part/kateluaindentscript.cpp
index dbc7d1fa4..178831f69 100644
--- a/kate/part/kateluaindentscript.cpp
+++ b/kate/part/kateluaindentscript.cpp
@@ -383,7 +383,7 @@ void KateLUAIndentScriptManager::collectScripts (bool force)
#endif
// Let's get a list of all the .js files
- TQStringList list = KGlobal::dirs()->findAllResources("data","katepart/scripts/indent/*.lua",false,true);
+ TQStringList list = TDEGlobal::dirs()->findAllResources("data","katepart/scripts/indent/*.lua",false,true);
// Let's iterate through the list and build the Mode List
for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp
index e9a74c50e..7f4481722 100644
--- a/kate/part/kateprinter.cpp
+++ b/kate/part/kateprinter.cpp
@@ -190,11 +190,11 @@ bool KatePrinter::print (KateDocument *doc)
KUser u (KUser::UseRealUserID);
tags["u"] = u.loginName();
- tags["d"] = KGlobal::locale()->formatDateTime(dt, true, false);
- tags["D"] = KGlobal::locale()->formatDateTime(dt, false, false);
- tags["h"] = KGlobal::locale()->formatTime(TQT_TQTIME_OBJECT(dt.time()), false);
- tags["y"] = KGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), true);
- tags["Y"] = KGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false);
+ tags["d"] = TDEGlobal::locale()->formatDateTime(dt, true, false);
+ tags["D"] = TDEGlobal::locale()->formatDateTime(dt, false, false);
+ tags["h"] = TDEGlobal::locale()->formatTime(TQT_TQTIME_OBJECT(dt.time()), false);
+ tags["y"] = TDEGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), true);
+ tags["Y"] = TDEGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false);
tags["f"] = doc->url().fileName();
tags["U"] = doc->url().prettyURL();
if ( selectionOnly )
diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp
index 1978c867c..bb3aa2866 100644
--- a/kate/part/kateschema.cpp
+++ b/kate/part/kateschema.cpp
@@ -209,7 +209,7 @@ KConfig *KateSchemaManager::schema (uint number)
void KateSchemaManager::addSchema (const TQString &t)
{
m_config.setGroup (t);
- m_config.writeEntry("Color Background", KGlobalSettings::baseColor());
+ m_config.writeEntry("Color Background", TDEGlobalSettings::baseColor());
update (false);
}
@@ -419,12 +419,12 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema )
if ( ! m_schemas.contains( newSchema ) )
{
// fallback defaults
- TQColor tmp0 (KGlobalSettings::baseColor());
- TQColor tmp1 (KGlobalSettings::highlightColor());
- TQColor tmp2 (KGlobalSettings::alternateBackgroundColor());
+ TQColor tmp0 (TDEGlobalSettings::baseColor());
+ TQColor tmp1 (TDEGlobalSettings::highlightColor());
+ TQColor tmp2 (TDEGlobalSettings::alternateBackgroundColor());
TQColor tmp3 ( "#FFFF99" );
TQColor tmp4 (tmp2.dark());
- TQColor tmp5 ( KGlobalSettings::textColor() );
+ TQColor tmp5 ( TDEGlobalSettings::textColor() );
TQColor tmp6 ( "#EAE9E8" );
TQColor tmp7 ( "#000000" );
@@ -578,7 +578,7 @@ void KateSchemaConfigFontTab::schemaChanged( int newSchema )
m_schema = newSchema;
- TQFont f (KGlobalSettings::fixedFont());
+ TQFont f (TDEGlobalSettings::fixedFont());
m_fontchooser->disconnect ( this );
m_fontchooser->setFont ( KateFactory::self()->schemaManager()->schema( newSchema )->readFontEntry("Font", &f) );
@@ -635,11 +635,11 @@ void KateSchemaConfigFontColorTab::schemaChanged (uint schema)
// set colors
TQPalette p ( m_defaultStyles->palette() );
- TQColor _c ( KGlobalSettings::baseColor() );
+ TQColor _c ( TDEGlobalSettings::baseColor() );
p.setColor( TQColorGroup::Base,
KateFactory::self()->schemaManager()->schema(schema)->
readColorEntry( "Color Background", &_c ) );
- _c = KGlobalSettings::highlightColor();
+ _c = TDEGlobalSettings::highlightColor();
p.setColor( TQColorGroup::Highlight,
KateFactory::self()->schemaManager()->schema(schema)->
readColorEntry( "Color Selection", &_c ) );
@@ -762,11 +762,11 @@ void KateSchemaConfigHighlightTab::schemaChanged (uint schema)
// TODO this reads of the KConfig object, which should be changed when
// the color tab is fixed.
TQPalette p ( m_styles->palette() );
- TQColor _c ( KGlobalSettings::baseColor() );
+ TQColor _c ( TDEGlobalSettings::baseColor() );
p.setColor( TQColorGroup::Base,
KateFactory::self()->schemaManager()->schema(m_schema)->
readColorEntry( "Color Background", &_c ) );
- _c = KGlobalSettings::highlightColor();
+ _c = TDEGlobalSettings::highlightColor();
p.setColor( TQColorGroup::Highlight,
KateFactory::self()->schemaManager()->schema(m_schema)->
readColorEntry( "Color Selection", &_c ) );
@@ -1066,7 +1066,7 @@ KateStyleListView::KateStyleListView( TQWidget *parent, bool showUseDefaults )
connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&, int)),
this, TQT_SLOT(showPopupMenu(TQListViewItem*, const TQPoint&)) );
// grap the bg color, selected color and default font
- normalcol = KGlobalSettings::textColor();
+ normalcol = TDEGlobalSettings::textColor();
bgcol = KateRendererConfig::global()->backgroundColor();
selcol = KateRendererConfig::global()->selectionColor();
docfont = *KateRendererConfig::global()->font();
diff --git a/kate/part/katesyntaxdocument.cpp b/kate/part/katesyntaxdocument.cpp
index 8e391b620..34f44bf66 100644
--- a/kate/part/katesyntaxdocument.cpp
+++ b/kate/part/katesyntaxdocument.cpp
@@ -346,7 +346,7 @@ void KateSyntaxDocument::setupModeList (bool force)
}
// Let's get a list of all the xml files for hl
- TQStringList list = KGlobal::dirs()->findAllResources("data","katepart/syntax/*.xml",false,true);
+ TQStringList list = TDEGlobal::dirs()->findAllResources("data","katepart/syntax/*.xml",false,true);
// Let's iterate through the list and build the Mode List
for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp
index ab4c2f54e..50f186c8c 100644
--- a/kate/part/kateview.cpp
+++ b/kate/part/kateview.cpp
@@ -709,8 +709,8 @@ void KateView::slotStatusMsg ()
uint r = cursorLine() + 1;
uint c = cursorColumn() + 1;
- TQString s1 = i18n(" Line: %1").arg(KGlobal::locale()->formatNumber(r, 0));
- TQString s2 = i18n(" Col: %1").arg(KGlobal::locale()->formatNumber(c, 0));
+ TQString s1 = i18n(" Line: %1").arg(TDEGlobal::locale()->formatNumber(r, 0));
+ TQString s2 = i18n(" Col: %1").arg(TDEGlobal::locale()->formatNumber(c, 0));
TQString modstr = m_doc->isModified() ? TQString (" * ") : TQString (" ");
TQString blockstr = blockSelectionMode() ? i18n(" BLK ") : i18n(" NORM ");
diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp
index f858ae908..a7a88b945 100644
--- a/kate/part/kateviewhelpers.cpp
+++ b/kate/part/kateviewhelpers.cpp
@@ -1175,7 +1175,7 @@ KateViewEncodingAction::KateViewEncodingAction(KateDocument *_doc, KateView *_vi
void KateViewEncodingAction::slotAboutToShow()
{
- TQStringList modes (KGlobal::charsets()->descriptiveEncodingNames());
+ TQStringList modes (TDEGlobal::charsets()->descriptiveEncodingNames());
popupMenu()->clear ();
for (uint z=0; z<modes.size(); ++z)
@@ -1183,7 +1183,7 @@ void KateViewEncodingAction::slotAboutToShow()
popupMenu()->insertItem ( modes[z], this, TQT_SLOT(setMode(int)), 0, z);
bool found = false;
- TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(KGlobal::charsets()->encodingForName(modes[z]), found);
+ TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(TDEGlobal::charsets()->encodingForName(modes[z]), found);
if (found && codecForEnc)
{
@@ -1195,8 +1195,8 @@ void KateViewEncodingAction::slotAboutToShow()
void KateViewEncodingAction::setMode (int mode)
{
- TQStringList modes (KGlobal::charsets()->descriptiveEncodingNames());
- doc->config()->setEncoding( KGlobal::charsets()->encodingForName( modes[mode] ) );
+ TQStringList modes (TDEGlobal::charsets()->descriptiveEncodingNames());
+ doc->config()->setEncoding( TDEGlobal::charsets()->encodingForName( modes[mode] ) );
// now we don't want the encoding changed again unless the user does so using the menu.
doc->setEncodingSticky( true );
doc->reloadFile();
diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp
index 7f916c6e9..bea6ba3bc 100644
--- a/kate/part/kateviewinternal.cpp
+++ b/kate/part/kateviewinternal.cpp
@@ -2986,7 +2986,7 @@ void KateViewInternal::mouseMoveEvent( TQMouseEvent* e )
TQPoint p( e->pos() - dragInfo.start );
// we've left the drag square, we can start a real drag operation now
- if( p.manhattanLength() > KGlobalSettings::dndEventDelay() )
+ if( p.manhattanLength() > TDEGlobalSettings::dndEventDelay() )
doDrag();
return;
diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index da3d96da9..c996b216e 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -928,7 +928,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )
TQString relOutputDir = makeRelativePath(m_baseDir, m_outputDir);
- // are blocking reads possible with KProcess?
+ // are blocking reads possible with TDEProcess?
char pwd[PATH_MAX];
(void) getcwd( pwd, PATH_MAX );
chdir( TQFile::encodeName( m_baseDir ) );
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-17 11:49:06 +0000