diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/kcontrol/proxywidget.cpp | |
| parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
| download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/kcontrol/proxywidget.cpp')
| -rw-r--r-- | kcontrol/kcontrol/proxywidget.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp index 7e3f30de4..5d540d2c6 100644 --- a/kcontrol/kcontrol/proxywidget.cpp +++ b/kcontrol/kcontrol/proxywidget.cpp @@ -103,13 +103,13 @@ RootInfoWidget::RootInfoWidget(TQWidget *parent, const char *name = 0) class ProxyView : public TQScrollView { public: - ProxyView(KCModule *client, const TQString& title, TQWidget *parent, bool run_as_root, const char *name); + ProxyView(TDECModule *client, const TQString& title, TQWidget *parent, bool run_as_root, const char *name); private: virtual void resizeEvent(TQResizeEvent *); TQWidget *contentWidget; - KCModule *client; + TDECModule *client; bool scroll; }; @@ -124,7 +124,7 @@ public: }; -ProxyView::ProxyView(KCModule *_client, const TQString&, TQWidget *parent, bool run_as_root, const char *name) +ProxyView::ProxyView(TDECModule *_client, const TQString&, TQWidget *parent, bool run_as_root, const char *name) : TQScrollView(parent, name), client(_client) { setResizePolicy(TQScrollView::AutoOneFit); @@ -157,7 +157,7 @@ void ProxyView::resizeEvent(TQResizeEvent *e) //////////////////////////////////////////////////////////////////////////////////////////////////////// -ProxyWidget::ProxyWidget(KCModule *client, TQString title, const char *name, +ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name, bool run_as_root) : TQWidget(0, name) , _client(client) @@ -215,10 +215,10 @@ ProxyWidget::ProxyWidget(KCModule *client, TQString title, const char *name, // only enable the requested buttons int b = _client->buttons(); - trinity_setVisible(_handbook, (b & KCModule::Help)); - trinity_setVisible(_default, mayModify && (b & KCModule::Default)); - trinity_setVisible(_apply, mayModify && (b & KCModule::Apply)); - trinity_setVisible(_reset, mayModify && (b & KCModule::Apply)); + trinity_setVisible(_handbook, (b & TDECModule::Help)); + trinity_setVisible(_default, mayModify && (b & TDECModule::Default)); + trinity_setVisible(_apply, mayModify && (b & TDECModule::Apply)); + trinity_setVisible(_reset, mayModify && (b & TDECModule::Apply)); trinity_setVisible(_root, run_as_root); // disable initial buttons |