diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
| commit | 7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch) | |
| tree | c76702a7f6310fbe9d437e347535422e836e94e9 /tdeui/kpanelapplet.cpp | |
| parent | a2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff) | |
| parent | 27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff) | |
| download | tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdeui/kpanelapplet.cpp')
| -rw-r--r-- | tdeui/kpanelapplet.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tdeui/kpanelapplet.cpp b/tdeui/kpanelapplet.cpp index 7ca2999f1..f88cb5a8a 100644 --- a/tdeui/kpanelapplet.cpp +++ b/tdeui/kpanelapplet.cpp @@ -25,8 +25,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "kpanelapplet.h" #include "kpanelapplet.moc" -#include <kapplication.h> -#include <kconfig.h> +#include <tdeapplication.h> +#include <tdeconfig.h> class KPanelApplet::KPanelAppletPrivate { @@ -37,7 +37,7 @@ public: {} const TQPopupMenu* customMenu; - KSharedConfig::Ptr sharedConfig; + TDESharedConfig::Ptr sharedConfig; TQPtrList<TQObject> watchedForFocus; bool hasFocus; }; @@ -60,7 +60,7 @@ KPanelApplet::KPanelApplet(const TQString& configFile, Type type, } setBackgroundOrigin( AncestorOrigin ); - d->sharedConfig = KSharedConfig::openConfig(configFile, kapp && kapp->config()->isImmutable()); + d->sharedConfig = TDESharedConfig::openConfig(configFile, kapp && kapp->config()->isImmutable()); _config = d->sharedConfig; } @@ -188,7 +188,7 @@ bool KPanelApplet::eventFilter(TQObject *o, TQEvent * e) return TQFrame::eventFilter(o, e); } -KSharedConfig::Ptr KPanelApplet::sharedConfig() const +TDESharedConfig::Ptr KPanelApplet::sharedConfig() const { return d->sharedConfig; } |