diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:56 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:56 -0600 |
commit | e6aaa3624cc6179b82a9bfff1760e742a669064c (patch) | |
tree | 3fed4deb0540d34f85dfb53b02bea7519e66cc6f /kbabel/kbabel | |
parent | 4071ae43ea213cd0f7d5c344c939ebd97d097051 (diff) | |
download | tdesdk-e6aaa3624cc6179b82a9bfff1760e742a669064c.tar.gz tdesdk-e6aaa3624cc6179b82a9bfff1760e742a669064c.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kbabel/kbabel')
-rw-r--r-- | kbabel/kbabel/headereditor.cpp | 4 | ||||
-rw-r--r-- | kbabel/kbabel/kbabel.cpp | 8 | ||||
-rw-r--r-- | kbabel/kbabel/kbabel.kcfg | 2 | ||||
-rw-r--r-- | kbabel/kbabel/kbabelview.cpp | 6 | ||||
-rw-r--r-- | kbabel/kbabel/kbcataloglistview.cpp | 2 | ||||
-rw-r--r-- | kbabel/kbabel/kbhighlighting.cpp | 4 | ||||
-rw-r--r-- | kbabel/kbabel/mymultilineedit.cpp | 4 | ||||
-rw-r--r-- | kbabel/kbabel/spelldlg.cpp | 4 |
8 files changed, 17 insertions, 17 deletions
diff --git a/kbabel/kbabel/headereditor.cpp b/kbabel/kbabel/headereditor.cpp index 62275cdd..cc692bbd 100644 --- a/kbabel/kbabel/headereditor.cpp +++ b/kbabel/kbabel/headereditor.cpp @@ -84,7 +84,7 @@ HeaderEditor::~HeaderEditor() void HeaderEditor::saveSettings() { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); KConfigGroupSaver saver(config, "HeaderEditor" ); @@ -93,7 +93,7 @@ void HeaderEditor::saveSettings() void HeaderEditor::restoreSettings() { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); KConfigGroupSaver saver(config, "HeaderEditor" ); diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp index 91e591fb..0abd5eca 100644 --- a/kbabel/kbabel/kbabel.cpp +++ b/kbabel/kbabel/kbabel.cpp @@ -785,7 +785,7 @@ void KBabelMW::setupDynamicActions() // query available tools TQValueList<KDataToolInfo> allTools = KDataToolInfo::query - ("CatalogItem", "application/x-kbabel-catalogitem", KGlobal::instance()); + ("CatalogItem", "application/x-kbabel-catalogitem", TDEGlobal::instance()); // skip read-only tools for single items TQValueList<KDataToolInfo> modifyTools; @@ -819,7 +819,7 @@ void KBabelMW::setupDynamicActions() // query available tools for whole catalog allTools = KDataToolInfo::query - ("Catalog", "application/x-kbabel-catalog", KGlobal::instance()); + ("Catalog", "application/x-kbabel-catalog", TDEGlobal::instance()); // skip read-only tools entry = allTools.begin(); @@ -1179,7 +1179,7 @@ void KBabelMW::optionsShowStatusbar(bool on) void KBabelMW::optionsEditToolbars() { - saveMainWindowSettings( KGlobal::config(), "View" ); + saveMainWindowSettings( TDEGlobal::config(), "View" ); KEditToolbar dlg(actionCollection()); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_TQOBJECT(this), TQT_SLOT(newToolbarConfig())); dlg.exec(); @@ -1188,7 +1188,7 @@ void KBabelMW::optionsEditToolbars() void KBabelMW::newToolbarConfig() { createGUI(0); - applyMainWindowSettings( KGlobal::config(), "View" ); + applyMainWindowSettings( TDEGlobal::config(), "View" ); } void KBabelMW::optionsPreferences() diff --git a/kbabel/kbabel/kbabel.kcfg b/kbabel/kbabel/kbabel.kcfg index 0da6949c..eba3f4a6 100644 --- a/kbabel/kbabel/kbabel.kcfg +++ b/kbabel/kbabel/kbabel.kcfg @@ -109,7 +109,7 @@ </entry> <entry name="MsgFont" type="Font"> <label>Font for Messages</label> - <default code="true">KGlobalSettings::generalFont()</default> + <default code="true">TDEGlobalSettings::generalFont()</default> </entry> <entry name="OnFlySpellCheck" type="Bool"> <label> diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp index 6ad9dc42..37b9d3d6 100644 --- a/kbabel/kbabel/kbabelview.cpp +++ b/kbabel/kbabel/kbabelview.cpp @@ -2700,7 +2700,7 @@ void KBabelView::findInFile(TQCString fileSource, FindOptions options) _showTryLaterBox=true; // delete dontDisplayAgain from configuration - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); KConfigGroupSaver saver(config,"Notification Messages"); config->writeEntry("waitForNextFile",true); @@ -2729,7 +2729,7 @@ void KBabelView::replaceInFile(TQCString fileSource, KBabel::ReplaceOptions opti _showTryLaterBox=true; // delete dontDisplayAgain from configuration - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); KConfigGroupSaver saver(config,"Notification Messages"); config->writeEntry("waitForNextFile",true); @@ -3590,7 +3590,7 @@ void KBabelView::autoCheck(bool onlyWhenChanged) TQString msg = ""; // ### TODO: whynot use i18n("context",text) directly? - KLocale* locale=KGlobal::locale(); + KLocale* locale=TDEGlobal::locale(); for( TQStringList::iterator it=status.begin() ; it != status.end() ; ++it ) { diff --git a/kbabel/kbabel/kbcataloglistview.cpp b/kbabel/kbabel/kbcataloglistview.cpp index e04da3c2..aace2c10 100644 --- a/kbabel/kbabel/kbcataloglistview.cpp +++ b/kbabel/kbabel/kbcataloglistview.cpp @@ -44,7 +44,7 @@ KBCatalogListView::KBCatalogListView(KBCatalog* catalog, TQWidget *parent, KBabe m_listview->addColumn(i18n("Id")); m_listview->addColumn(i18n("Original String")); m_listview->addColumn(i18n("Translated String")); - m_listview->setAlternateBackground(KGlobalSettings::alternateBackgroundColor()); + m_listview->setAlternateBackground(TDEGlobalSettings::alternateBackgroundColor()); m_listview->setFullWidth(true); m_listview->setAllColumnsShowFocus(true); m_listview->resize(this->size()); diff --git a/kbabel/kbabel/kbhighlighting.cpp b/kbabel/kbabel/kbhighlighting.cpp index 621fb654..3b494302 100644 --- a/kbabel/kbabel/kbhighlighting.cpp +++ b/kbabel/kbabel/kbhighlighting.cpp @@ -60,7 +60,7 @@ KBabelHighlighter::KBabelHighlighter( TQTextEdit * edit, KSpell *spell ) : TQObj regexps << "(\\\\[abfnrtv'\"\?\\\\])|(\\\\\\d+)|(\\\\x[\\dabcdef]+)"; colors.resize( 8 ); - colors[Normal] = KGlobalSettings::textColor(); + colors[Normal] = TDEGlobalSettings::textColor(); colors[Tag] = KBabelSettings::tagColor (); colors[Entity] = KBabelSettings::tagColor (); colors[CFormat] = KBabelSettings::cformatColor (); @@ -193,7 +193,7 @@ void KBabelHighlighter::setHasErrors( bool err ) void KBabelHighlighter::readSettings( ) { // FIXME: does not care about different projects yet - KConfig * config = KGlobal::config( ); + KConfig * config = TDEGlobal::config( ); config->setGroup( "Misc" ); TQString temp = config->readEntry( "AccelMarker", "&" ); accelMarker = temp[0]; diff --git a/kbabel/kbabel/mymultilineedit.cpp b/kbabel/kbabel/mymultilineedit.cpp index d4fb9591..6edcbbc5 100644 --- a/kbabel/kbabel/mymultilineedit.cpp +++ b/kbabel/kbabel/mymultilineedit.cpp @@ -599,9 +599,9 @@ MsgMultiLineEdit::MsgMultiLineEdit(int ID, KSpell* spell, TQWidget* parent,const _highlightBg(false), _spacePoints(false), _bgColor(colorGroup().base().dark(110)), - _textColor(KGlobalSettings::textColor()), + _textColor(TDEGlobalSettings::textColor()), _errorColor(TQt::red), - _currentColor(KGlobalSettings::textColor()), + _currentColor(TDEGlobalSettings::textColor()), _whitespace(0), _hlSyntax(true), _quoteColor(TQt::darkGreen), diff --git a/kbabel/kbabel/spelldlg.cpp b/kbabel/kbabel/spelldlg.cpp index fab8c606..798467bf 100644 --- a/kbabel/kbabel/spelldlg.cpp +++ b/kbabel/kbabel/spelldlg.cpp @@ -59,7 +59,7 @@ SpellDlg::SpellDlg(bool haveMarkedText,TQWidget *parent,const char *name) { _mainWidget->markedBtn->setEnabled(false); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver cs(config,"SpellDlg"); TQString what=config->readEntry("Default","All"); @@ -82,7 +82,7 @@ SpellDlg::~SpellDlg() { if(_mainWidget->defaultBtn->isChecked()) { - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); KConfigGroupSaver cs(config,"SpellDlg"); TQString what="All"; |