diff options
Diffstat (limited to 'kicker')
| -rw-r--r-- | kicker/applets/menu/menuapplet.cpp | 4 | ||||
| -rw-r--r-- | kicker/applets/naughty/NaughtyApplet.h | 2 | ||||
| -rw-r--r-- | kicker/applets/systemtray/systemtrayapplet.cpp | 4 | ||||
| -rw-r--r-- | kicker/extensions/kasbar/kasbar.cpp | 2 | ||||
| -rw-r--r-- | kicker/extensions/kasbar/kasbar.h | 2 | ||||
| -rw-r--r-- | kicker/extensions/kasbar/kasbarextension.cpp | 2 | ||||
| -rw-r--r-- | kicker/extensions/kasbar/kasgroupitem.cpp | 4 | ||||
| -rw-r--r-- | kicker/kicker/core/container_applet.cpp | 2 | ||||
| -rw-r--r-- | kicker/kicker/core/container_applet.h | 2 | ||||
| -rw-r--r-- | kicker/kicker/core/container_base.cpp | 2 | ||||
| -rw-r--r-- | kicker/kicker/core/container_base.h | 2 | ||||
| -rw-r--r-- | kicker/kicker/core/container_extension.cpp | 10 | ||||
| -rw-r--r-- | kicker/kicker/core/container_extension.h | 2 | ||||
| -rw-r--r-- | kicker/kicker/ui/itemview.cpp | 2 | ||||
| -rw-r--r-- | kicker/kicker/ui/k_new_mnu.cpp | 8 | ||||
| -rw-r--r-- | kicker/kicker/ui/kickoff_bar.cpp | 2 | ||||
| -rw-r--r-- | kicker/taskbar/taskbar.cpp | 6 | 
17 files changed, 29 insertions, 29 deletions
| diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp index 2e0bb4311..f0c05d83c 100644 --- a/kicker/applets/menu/menuapplet.cpp +++ b/kicker/applets/menu/menuapplet.cpp @@ -487,12 +487,12 @@ void MenuEmbed::setMinimumSize( int w, int h )  void MenuEmbed::setBackground()  { -    const TQPixmap *pbg = tqparentWidget()->backgroundPixmap(); +    const TQPixmap *pbg = parentWidget()->backgroundPixmap();      if (pbg)      {          TQPixmap bg(width(), height()); -        bg.fill(tqparentWidget(), pos()); +        bg.fill(parentWidget(), pos());          setPaletteBackgroundPixmap(bg);          setBackgroundOrigin(WidgetOrigin);      } diff --git a/kicker/applets/naughty/NaughtyApplet.h b/kicker/applets/naughty/NaughtyApplet.h index 23bdf62c9..beb70552d 100644 --- a/kicker/applets/naughty/NaughtyApplet.h +++ b/kicker/applets/naughty/NaughtyApplet.h @@ -51,7 +51,7 @@ class NaughtyApplet : public KPanelApplet    signals: -    void tqlayoutChanged(); +    void layoutChanged();    protected slots: diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index 299206032..c347108cc 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -1067,12 +1067,12 @@ void TrayEmbed::getIconSize(int defaultIconSize)  void TrayEmbed::setBackground()  { -    const TQPixmap *pbg = tqparentWidget()->backgroundPixmap(); +    const TQPixmap *pbg = parentWidget()->backgroundPixmap();      if (pbg)      {          TQPixmap bg(width(), height()); -        bg.fill(tqparentWidget(), pos()); +        bg.fill(parentWidget(), pos());          setPaletteBackgroundPixmap(bg);          setBackgroundOrigin(WidgetOrigin);      } diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp index 85c65deec..482a14db1 100644 --- a/kicker/extensions/kasbar/kasbar.cpp +++ b/kicker/extensions/kasbar/kasbar.cpp @@ -622,7 +622,7 @@ void KasBar::resizeEvent(TQResizeEvent *ev)      TQPainter p( &offscreen );      paintBackground( &p, TQRect(TQPoint(0,0),size()) );      TQWidget::resizeEvent(ev); -    emit tqlayoutChanged(); +    emit layoutChanged();  } diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h index d56a592a5..507712cce 100644 --- a/kicker/extensions/kasbar/kasbar.h +++ b/kicker/extensions/kasbar/kasbar.h @@ -251,7 +251,7 @@ signals:     void directionChanged();     /** Emitted when kasbar wants to resize. This happens when a new window is added. */ -   void tqlayoutChanged(); +   void layoutChanged();     /** Emitted when the item size is changed. */     void itemSizeChanged( int ); diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp index dcb1a1ef1..c63d6e277 100644 --- a/kicker/extensions/kasbar/kasbarextension.cpp +++ b/kicker/extensions/kasbar/kasbarextension.cpp @@ -97,7 +97,7 @@ KasBarExtension::KasBarExtension( const TQString& configFile,  //    setBackgroundMode( NoBackground );      kasbar = new KasTasker( orientation(), this, name ); -    connect( kasbar, TQT_SIGNAL( tqlayoutChanged() ), this, TQT_SIGNAL( updateLayout() ) ); +    connect( kasbar, TQT_SIGNAL( layoutChanged() ), this, TQT_SIGNAL( updateLayout() ) );      connect( kasbar, TQT_SIGNAL( detachedChanged(bool) ), this, TQT_SLOT( setDetached(bool) ) );      kasbar->setConfig( config() ); diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp index 5f282db97..fe5f02ef6 100644 --- a/kicker/extensions/kasbar/kasgroupitem.cpp +++ b/kicker/extensions/kasbar/kasgroupitem.cpp @@ -83,8 +83,8 @@ KasGroupItem::KasGroupItem( KasTasker *parent )      setGroupItem( true );      setText( i18n("Group") ); -    connect( parent, TQT_SIGNAL( tqlayoutChanged() ), this, TQT_SLOT( hidePopup() ) ); -    connect( parent, TQT_SIGNAL( tqlayoutChanged() ), this, TQT_SLOT( update() ) ); +    connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( hidePopup() ) ); +    connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( update() ) );      connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(togglePopup()) );      connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showGroupMenuAt(TQMouseEvent *) ) );  } diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp index ad17182b0..a6cfc11ab 100644 --- a/kicker/kicker/core/container_applet.cpp +++ b/kicker/kicker/core/container_applet.cpp @@ -354,7 +354,7 @@ void AppletContainer::slotDelayedDestruct()      delete this;  } -void AppletContainer::tqalignmentChange(KPanelExtension::Alignment a) +void AppletContainer::alignmentChange(KPanelExtension::Alignment a)  {      if (!_applet)      { diff --git a/kicker/kicker/core/container_applet.h b/kicker/kicker/core/container_applet.h index fea4d92a1..019e52c96 100644 --- a/kicker/kicker/core/container_applet.h +++ b/kicker/kicker/core/container_applet.h @@ -84,7 +84,7 @@ public slots:  protected:      virtual void doLoadConfiguration( KConfigGroup& );      virtual void doSaveConfiguration( KConfigGroup&, bool layoutOnly ) const; -    virtual void tqalignmentChange(KPanelExtension::Alignment a); +    virtual void alignmentChange(KPanelExtension::Alignment a);      virtual TQPopupMenu* createOpMenu(); diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp index 2747905cd..2607e3608 100644 --- a/kicker/kicker/core/container_base.cpp +++ b/kicker/kicker/core/container_base.cpp @@ -118,7 +118,7 @@ void BaseContainer::tqsetAlignment(KPanelExtension::Alignment a)      }      _tqalignment = a; -    tqalignmentChange(a); +    alignmentChange(a);  }  TQPopupMenu* BaseContainer::opMenu() diff --git a/kicker/kicker/core/container_base.h b/kicker/kicker/core/container_base.h index 078926a07..f9c449b1f 100644 --- a/kicker/kicker/core/container_base.h +++ b/kicker/kicker/core/container_base.h @@ -111,7 +111,7 @@ protected:      virtual void doLoadConfiguration( KConfigGroup& ) {}      virtual void doSaveConfiguration( KConfigGroup&,                                        bool /* layoutOnly */ ) const {} -    virtual void tqalignmentChange(KPanelExtension::Alignment) {} +    virtual void alignmentChange(KPanelExtension::Alignment) {}      virtual TQPopupMenu* createOpMenu() = 0;      TQPopupMenu *appletOpMenu() const { return _appletOpMnu; } diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index 0c22245bc..c659c1002 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -293,7 +293,7 @@ void ExtensionContainer::readConfig()      }      positionChange(position()); -    tqalignmentChange(tqalignment()); +    alignmentChange(tqalignment());      setSize(static_cast<KPanelExtension::Size>(m_settings.size()),              m_settings.customSize()); @@ -471,7 +471,7 @@ void ExtensionContainer::moveMe()                                                  KPanelExtension::Right,                                                  KPanelExtension::Top,                                                  KPanelExtension::Bottom }; -    KPanelExtension::Alignment tqalignments[] = { KPanelExtension::LeftTop, +    KPanelExtension::Alignment alignments[] = { KPanelExtension::LeftTop,                                                  KPanelExtension::Center,                                                  KPanelExtension::RightBottom }; @@ -494,8 +494,8 @@ void ExtensionContainer::moveMe()                  // they don't get their "you're changing position" signals through                  // heightForWidth/widthForHeight                  rects.append(UserRectSel::PanelStrut(initialGeometry(positions[i], -                                                                     tqalignments[j], s), -                                                     s, positions[i], tqalignments[j])); +                                                                     alignments[j], s), +                                                     s, positions[i], alignments[j]));              }          }      } @@ -1368,7 +1368,7 @@ void ExtensionContainer::leaveEvent(TQEvent*)      maybeStartAutoHideTimer();  } -void ExtensionContainer::tqalignmentChange(KPanelExtension::Alignment a) +void ExtensionContainer::alignmentChange(KPanelExtension::Alignment a)  {      if (!m_extension)      { diff --git a/kicker/kicker/core/container_extension.h b/kicker/kicker/core/container_extension.h index fdb3be989..735aa2c85 100644 --- a/kicker/kicker/core/container_extension.h +++ b/kicker/kicker/core/container_extension.h @@ -159,7 +159,7 @@ private:                             int XineramaScreen, const TQSize &s, TQRect workArea,                             bool autohidden = false, UserHidden userHidden = Unhidden) const;      void positionChange(KPanelExtension::Position p); -    void tqalignmentChange(KPanelExtension::Alignment a); +    void alignmentChange(KPanelExtension::Alignment a);      void xineramaScreenChange(int /*XineramaScreen*/) {}      int arrangeHideButtons();      int setupBorderSpace(); diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp index d7df05170..f86ae537a 100644 --- a/kicker/kicker/ui/itemview.cpp +++ b/kicker/kicker/ui/itemview.cpp @@ -762,7 +762,7 @@ void ItemView::slotMoveContent()      TQListViewItemIterator it( this );      while ( it.current() ) {          if ( !dynamic_cast<KMenuSpacer*>( it.current() ) && !it.current()->tqparent() && it.current()->isVisible() )  { -            it.current()->tqinvalidateHeight(); +            it.current()->invalidateHeight();              item_height += it.current()->totalHeight();          }          ++it; diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index 931419585..542e08be9 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -495,7 +495,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)              if(raiseWidget)                  break;              if(receiver->isWidgetType()) -                receiver = TQT_TQOBJECT(TQT_TQWIDGET(receiver)->tqparentWidget(true)); +                receiver = TQT_TQOBJECT(TQT_TQWIDGET(receiver)->parentWidget(true));              else                  break;          } @@ -1556,7 +1556,7 @@ bool KMenu::runCommand()        case KURIFilterData::HELP:        {          // No need for kfmclient, KRun does it all (David) -        (void) new KRun( m_filterData->uri(), tqparentWidget()); +        (void) new KRun( m_filterData->uri(), parentWidget());          return false;        }        case KURIFilterData::EXECUTABLE: @@ -2715,7 +2715,7 @@ void KMenu::slotStartURL(const TQString& u)          }          kapp->propagateSessionManager(); -        (void) new KRun( u, tqparentWidget()); +        (void) new KRun( u, parentWidget());      }  } @@ -3280,7 +3280,7 @@ void KMenu::searchActionClicked(TQListViewItem* item)           data.setData(file.readEntry("Query").tqreplace("\\{@}", m_kcommand->currentText()));       } -     (void) new KRun( data.uri(), tqparentWidget()); +     (void) new KRun( data.uri(), parentWidget());     }  } diff --git a/kicker/kicker/ui/kickoff_bar.cpp b/kicker/kicker/ui/kickoff_bar.cpp index 6fe731933..6be19459c 100644 --- a/kicker/kicker/ui/kickoff_bar.cpp +++ b/kicker/kicker/ui/kickoff_bar.cpp @@ -130,7 +130,7 @@ TQSize KickoffTabBar::tqsizeHint() const  void KickoffTabBar::layoutTabs()  { -    TQTabBar::tqlayoutTabs(); +    TQTabBar::layoutTabs();      TQFontMetrics fm = fontMetrics();      int fh = ((KickerSettings::kickoffTabBarFormat() != KickerSettings::IconOnly) ? fm.height() : 0) + 4; diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp index c1204598a..d78ad5cf1 100644 --- a/kicker/taskbar/taskbar.cpp +++ b/kicker/taskbar/taskbar.cpp @@ -818,12 +818,12 @@ void TaskBar::reLayout()  void TaskBar::setViewportBackground()  { -    const TQPixmap *bg = tqparentWidget()->backgroundPixmap(); +    const TQPixmap *bg = parentWidget()->backgroundPixmap();      if (bg)      { -        TQPixmap pm(tqparentWidget()->size()); -        pm.fill(tqparentWidget(), pos() + viewport()->pos()); +        TQPixmap pm(parentWidget()->size()); +        pm.fill(parentWidget(), pos() + viewport()->pos());          viewport()->setPaletteBackgroundPixmap(pm);          viewport()->setBackgroundOrigin(WidgetOrigin);      } | 
