diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kicker/applets/taskbar | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kicker/applets/taskbar')
| -rw-r--r-- | kicker/applets/taskbar/taskbarapplet.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp index 083a7e597..2d72e23fe 100644 --- a/kicker/applets/taskbar/taskbarapplet.cpp +++ b/kicker/applets/taskbar/taskbarapplet.cpp @@ -41,7 +41,7 @@ extern "C" KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile ) { // FIXME: what about two taskbars? perhaps this should be inserted just once - KGlobal::locale()->insertCatalogue( "ktaskbarapplet" ); + TDEGlobal::locale()->insertCatalogue( "ktaskbarapplet" ); int options = 0; if (kapp->authorizeControlModule("tde-kcmtaskbar.desktop")) options = KPanelApplet::Preferences; @@ -67,7 +67,7 @@ TaskbarApplet::TaskbarApplet( const TQString& configFile, Type type, int actions TaskbarApplet::~TaskbarApplet() { // FIXME: what about TWO taskbars? - KGlobal::locale()->removeCatalogue( "ktaskbarapplet" ); + TDEGlobal::locale()->removeCatalogue( "ktaskbarapplet" ); } int TaskbarApplet::widthForHeight(int h) const |