diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kcontrol/kio/smbrodlg.cpp | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/kio/smbrodlg.cpp')
| -rw-r--r-- | kcontrol/kio/smbrodlg.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kcontrol/kio/smbrodlg.cpp b/kcontrol/kio/smbrodlg.cpp index 90dfd9170..1b0a4fea8 100644 --- a/kcontrol/kio/smbrodlg.cpp +++ b/kcontrol/kio/smbrodlg.cpp @@ -63,7 +63,7 @@ SMBRoOptions::SMBRoOptions(TQWidget *parent) layout->addMultiCellWidget(m_showHiddenShares,4,4,0,1); m_encodingList = new KComboBox( false, this ); - TQStringList _strList = KGlobal::charsets()->availableEncodingNames(); + TQStringList _strList = TDEGlobal::charsets()->availableEncodingNames(); m_encodingList->insertStringList( _strList ); label = new TQLabel( m_encodingList, i18n( "MS Windows encoding:" ), this ); @@ -99,7 +99,7 @@ void SMBRoOptions::load() // m_workgroupLe->setText(cfg->readEntry("Workgroup")); // m_showHiddenShares->setChecked(cfg->readBoolEntry("ShowHiddenShares",false)); -// TQStringList _strList = KGlobal::charsets()->availableEncodingNames(); +// TQStringList _strList = TDEGlobal::charsets()->availableEncodingNames(); // TQString m_encoding = TQTextCodec::codecForLocale()->name(); // m_encodingList->setCurrentItem( _strList.findIndex( cfg->readEntry( "Encoding", m_encoding.lower() ) ) ); |