diff options
Diffstat (limited to 'kicker/applets/taskbar')
| -rw-r--r-- | kicker/applets/taskbar/taskbarapplet.cpp | 14 | ||||
| -rw-r--r-- | kicker/applets/taskbar/taskbarapplet.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp index 5673cb563..a34db8b73 100644 --- a/kicker/applets/taskbar/taskbarapplet.cpp +++ b/kicker/applets/taskbar/taskbarapplet.cpp @@ -38,12 +38,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile ) + TDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile ) { // FIXME: what about two taskbars? perhaps this should be inserted just once TDEGlobal::locale()->insertCatalogue( "ktaskbarapplet" ); int options = 0; - if (kapp->authorizeControlModule("tde-kcmtaskbar.desktop")) + if (tdeApp->authorizeControlModule("tde-kcmtaskbar.desktop")) options = KPanelApplet::Preferences; TaskbarApplet *taskbar = new TaskbarApplet( configFile, KPanelApplet::Stretch, options, parent, "ktaskbarapplet" ); @@ -59,7 +59,7 @@ TaskbarApplet::TaskbarApplet( const TQString& configFile, Type type, int actions TQHBoxLayout* layout = new TQHBoxLayout( this ); container = new TaskBarContainer( false, configFile, this ); container->setBackgroundOrigin( AncestorOrigin ); - connect(container, TQT_SIGNAL(containerCountChanged()), this, TQT_SIGNAL(updateLayout())); + connect(container, TQ_SIGNAL(containerCountChanged()), this, TQ_SIGNAL(updateLayout())); layout->addWidget( container, 1 ); container->popupDirectionChange(popupDirection()); } @@ -72,14 +72,14 @@ TaskbarApplet::~TaskbarApplet() int TaskbarApplet::widthForHeight(int h) const { - if (orientation() == Qt::Vertical) + if (orientation() == TQt::Vertical) { return width(); } // FIXME KDE4: when either TaskBarContainer or Applet smartens up // simplify this - KPanelExtension::Position d = orientation() == Qt::Horizontal ? + KPanelExtension::Position d = orientation() == TQt::Horizontal ? KPanelExtension::Top : KPanelExtension::Left; return container->sizeHint(d, TQSize(200, h)).width(); @@ -87,14 +87,14 @@ int TaskbarApplet::widthForHeight(int h) const int TaskbarApplet::heightForWidth(int w) const { - if (orientation() == Qt::Horizontal) + if (orientation() == TQt::Horizontal) { return height(); } // FIXME KDE4: when either TaskBarContainer or Applet smartens up // simplify this - KPanelExtension::Position d = orientation() == Qt::Horizontal ? + KPanelExtension::Position d = orientation() == TQt::Horizontal ? KPanelExtension::Top : KPanelExtension::Left; return container->sizeHint(d, TQSize(w, 200)).height(); diff --git a/kicker/applets/taskbar/taskbarapplet.h b/kicker/applets/taskbar/taskbarapplet.h index 9685b436b..6204e94f5 100644 --- a/kicker/applets/taskbar/taskbarapplet.h +++ b/kicker/applets/taskbar/taskbarapplet.h @@ -31,7 +31,7 @@ class TQPalette; class TaskbarApplet : public KPanelApplet { - Q_OBJECT + TQ_OBJECT public: TaskbarApplet( const TQString& configFile, Type t = Normal, int actions = 0, |