diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:53:25 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:53:25 -0600 |
| commit | da1941ccadffe5ae70ee111c53f0ec2b3d990869 (patch) | |
| tree | ee683f46b49e6abdbdef78ed45ca65b47538bc23 /editors/editor-chooser | |
| parent | 054f5901ab09f6ea6235bd12fbd167922fdf0f67 (diff) | |
| download | tdevelop-da1941ccadffe5ae70ee111c53f0ec2b3d990869.tar.gz tdevelop-da1941ccadffe5ae70ee111c53f0ec2b3d990869.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'editors/editor-chooser')
| -rw-r--r-- | editors/editor-chooser/editorchooser_widget.cpp | 10 | ||||
| -rw-r--r-- | editors/editor-chooser/editorchooser_widget.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/editors/editor-chooser/editorchooser_widget.cpp b/editors/editor-chooser/editorchooser_widget.cpp index 012d1a15..a8f87b00 100644 --- a/editors/editor-chooser/editorchooser_widget.cpp +++ b/editors/editor-chooser/editorchooser_widget.cpp @@ -16,10 +16,10 @@ EditorChooserWidget::EditorChooserWidget(TQWidget *parent, const char *name) : EditChooser(parent, name) { // ask the trader which editors he has to offer - m_offers = KTrader::self()->query("text/plain", "'KTextEditor/Document' in ServiceTypes"); + m_offers = TDETrader::self()->query("text/plain", "'KTextEditor/Document' in ServiceTypes"); // remove the vim-part, it's known to crash - KTrader::OfferList::Iterator it = m_offers.begin(); + TDETrader::OfferList::Iterator it = m_offers.begin(); while( it != m_offers.end() ) { if ( ((*it)->desktopEntryName() == "vimpart") @@ -46,7 +46,7 @@ void EditorChooserWidget::load() TQString editor = config->readPathEntry("EmbeddedKTextEditor"); // add the entries to the listview - KTrader::OfferList::Iterator it; + TDETrader::OfferList::Iterator it; int index=-1, current=0; for (it = m_offers.begin(); it != m_offers.end(); ++it) { @@ -81,7 +81,7 @@ void EditorChooserWidget::save() TDEConfig *config = kapp->config(); config->setGroup("Editor"); - KTrader::OfferList::Iterator it; + TDETrader::OfferList::Iterator it; for (it = m_offers.begin(); it != m_offers.end(); ++it) if ( EditorPart->currentText() == (*it)->name() ) { @@ -112,7 +112,7 @@ void EditorChooserWidget::accept() void EditorChooserWidget::slotEditPartChanged( const TQString & ) { - KTrader::OfferList::Iterator it; + TDETrader::OfferList::Iterator it; for (it = m_offers.begin(); it != m_offers.end(); ++it) { if ( EditorPart->currentText() == (*it)->name() ) diff --git a/editors/editor-chooser/editorchooser_widget.h b/editors/editor-chooser/editorchooser_widget.h index d33e7522..efe82cfd 100644 --- a/editors/editor-chooser/editorchooser_widget.h +++ b/editors/editor-chooser/editorchooser_widget.h @@ -28,7 +28,7 @@ private slots: void accept(); private: - KTrader::OfferList m_offers; + TDETrader::OfferList m_offers; }; |