diff options
| -rw-r--r-- | client/config/crystalconfig.cpp | 122 | ||||
| -rw-r--r-- | client/crystalbutton.cpp | 2 | ||||
| -rw-r--r-- | client/crystalclient.cpp | 28 | ||||
| -rw-r--r-- | client/imageholder.cpp | 4 | ||||
| -rw-r--r-- | client/myrootpixmap.cpp | 8 |
5 files changed, 82 insertions, 82 deletions
diff --git a/client/config/crystalconfig.cpp b/client/config/crystalconfig.cpp index abc37c2..1a4b384 100644 --- a/client/config/crystalconfig.cpp +++ b/client/config/crystalconfig.cpp @@ -55,86 +55,86 @@ CrystalConfig::CrystalConfig(TDEConfig*, TQWidget* parent) dialog_ = new ConfigDialog(parent); dialog_->show(); - connect(dialog_->titlealign, TQT_SIGNAL(clicked(int)),this, TQT_SLOT(selectionChanged(int))); + connect(dialog_->titlealign, TQ_SIGNAL(clicked(int)),this, TQ_SLOT(selectionChanged(int))); - connect(dialog_->drawCaption, TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(selectionChanged(int))); - connect(dialog_->textshadow, TQT_SIGNAL(stateChanged(int)),this, TQT_SLOT(selectionChanged(int))); - connect(dialog_->tooltip,TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(selectionChanged(int))); - connect(dialog_->wheelTask,TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(selectionChanged(int))); + connect(dialog_->drawCaption, TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(selectionChanged(int))); + connect(dialog_->textshadow, TQ_SIGNAL(stateChanged(int)),this, TQ_SLOT(selectionChanged(int))); + connect(dialog_->tooltip,TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(selectionChanged(int))); + connect(dialog_->wheelTask,TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(selectionChanged(int))); - connect(dialog_->trackdesktop, TQT_SIGNAL(stateChanged(int)),this, TQT_SLOT(selectionChanged(int))); + connect(dialog_->trackdesktop, TQ_SIGNAL(stateChanged(int)),this, TQ_SLOT(selectionChanged(int))); - connect(dialog_->shade1, TQT_SIGNAL(valueChanged(int)),this, TQT_SLOT(selectionChanged(int))); - connect(dialog_->shade2, TQT_SIGNAL(valueChanged(int)),this, TQT_SLOT(selectionChanged(int))); + connect(dialog_->shade1, TQ_SIGNAL(valueChanged(int)),this, TQ_SLOT(selectionChanged(int))); + connect(dialog_->shade2, TQ_SIGNAL(valueChanged(int)),this, TQ_SLOT(selectionChanged(int))); - connect(dialog_->frame1, TQT_SIGNAL(activated(int)),this, TQT_SLOT(selectionChanged(int))); - connect(dialog_->frame2, TQT_SIGNAL(activated(int)),this, TQT_SLOT(selectionChanged(int))); - connect(dialog_->frameColor1, TQT_SIGNAL(changed(const TQColor&)),this,TQT_SLOT(colorChanged(const TQColor&))); - connect(dialog_->frameColor2, TQT_SIGNAL(changed(const TQColor&)),this,TQT_SLOT(colorChanged(const TQColor&))); + connect(dialog_->frame1, TQ_SIGNAL(activated(int)),this, TQ_SLOT(selectionChanged(int))); + connect(dialog_->frame2, TQ_SIGNAL(activated(int)),this, TQ_SLOT(selectionChanged(int))); + connect(dialog_->frameColor1, TQ_SIGNAL(changed(const TQColor&)),this,TQ_SLOT(colorChanged(const TQColor&))); + connect(dialog_->frameColor2, TQ_SIGNAL(changed(const TQColor&)),this,TQ_SLOT(colorChanged(const TQColor&))); - connect(dialog_->inline1, TQT_SIGNAL(activated(int)),this, TQT_SLOT(selectionChanged(int))); - connect(dialog_->inline2, TQT_SIGNAL(activated(int)),this, TQT_SLOT(selectionChanged(int))); - connect(dialog_->inlineColor1, TQT_SIGNAL(changed(const TQColor&)),this,TQT_SLOT(colorChanged(const TQColor&))); - connect(dialog_->inlineColor2, TQT_SIGNAL(changed(const TQColor&)),this,TQT_SLOT(colorChanged(const TQColor&))); + connect(dialog_->inline1, TQ_SIGNAL(activated(int)),this, TQ_SLOT(selectionChanged(int))); + connect(dialog_->inline2, TQ_SIGNAL(activated(int)),this, TQ_SLOT(selectionChanged(int))); + connect(dialog_->inlineColor1, TQ_SIGNAL(changed(const TQColor&)),this,TQ_SLOT(colorChanged(const TQColor&))); + connect(dialog_->inlineColor2, TQ_SIGNAL(changed(const TQColor&)),this,TQ_SLOT(colorChanged(const TQColor&))); - connect(dialog_->type1,TQT_SIGNAL(activated(int)),this,TQT_SLOT(selectionChanged(int))); - connect(dialog_->type2,TQT_SIGNAL(activated(int)),this,TQT_SLOT(selectionChanged(int))); + connect(dialog_->type1,TQ_SIGNAL(activated(int)),this,TQ_SLOT(selectionChanged(int))); + connect(dialog_->type2,TQ_SIGNAL(activated(int)),this,TQ_SLOT(selectionChanged(int))); - connect(dialog_->enableTransparency,TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(selectionChanged(int))); + connect(dialog_->enableTransparency,TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(selectionChanged(int))); - connect(dialog_->borderwidth, TQT_SIGNAL(valueChanged(int)),this, TQT_SLOT(selectionChanged(int))); - connect(dialog_->titlebarheight, TQT_SIGNAL(valueChanged(int)),this, TQT_SLOT(selectionChanged(int))); + connect(dialog_->borderwidth, TQ_SIGNAL(valueChanged(int)),this, TQ_SLOT(selectionChanged(int))); + connect(dialog_->titlebarheight, TQ_SIGNAL(valueChanged(int)),this, TQ_SLOT(selectionChanged(int))); - connect(dialog_->tlc, TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(selectionChanged(int))); - connect(dialog_->trc, TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(selectionChanged(int))); - connect(dialog_->blc, TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(selectionChanged(int))); - connect(dialog_->brc, TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(selectionChanged(int))); - connect(dialog_->buttonColor1, TQT_SIGNAL(changed(const TQColor&)),this,TQT_SLOT(colorChanged(const TQColor&))); - connect(dialog_->buttonColor2, TQT_SIGNAL(changed(const TQColor&)),this,TQT_SLOT(colorChanged(const TQColor&))); - connect(dialog_->buttonColor3, TQT_SIGNAL(changed(const TQColor&)),this,TQT_SLOT(colorChanged(const TQColor&))); - connect(dialog_->minColor1, TQT_SIGNAL(changed(const TQColor&)),this,TQT_SLOT(colorChanged(const TQColor&))); - connect(dialog_->minColor2, TQT_SIGNAL(changed(const TQColor&)),this,TQT_SLOT(colorChanged(const TQColor&))); - connect(dialog_->minColor3, TQT_SIGNAL(changed(const TQColor&)),this,TQT_SLOT(colorChanged(const TQColor&))); - connect(dialog_->maxColor1, TQT_SIGNAL(changed(const TQColor&)),this,TQT_SLOT(colorChanged(const TQColor&))); - connect(dialog_->maxColor2, TQT_SIGNAL(changed(const TQColor&)),this,TQT_SLOT(colorChanged(const TQColor&))); - connect(dialog_->maxColor3, TQT_SIGNAL(changed(const TQColor&)),this,TQT_SLOT(colorChanged(const TQColor&))); - connect(dialog_->closeColor1, TQT_SIGNAL(changed(const TQColor&)),this,TQT_SLOT(colorChanged(const TQColor&))); - connect(dialog_->closeColor2, TQT_SIGNAL(changed(const TQColor&)),this,TQT_SLOT(colorChanged(const TQColor&))); - connect(dialog_->closeColor3, TQT_SIGNAL(changed(const TQColor&)),this,TQT_SLOT(colorChanged(const TQColor&))); + connect(dialog_->tlc, TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(selectionChanged(int))); + connect(dialog_->trc, TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(selectionChanged(int))); + connect(dialog_->blc, TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(selectionChanged(int))); + connect(dialog_->brc, TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(selectionChanged(int))); + connect(dialog_->buttonColor1, TQ_SIGNAL(changed(const TQColor&)),this,TQ_SLOT(colorChanged(const TQColor&))); + connect(dialog_->buttonColor2, TQ_SIGNAL(changed(const TQColor&)),this,TQ_SLOT(colorChanged(const TQColor&))); + connect(dialog_->buttonColor3, TQ_SIGNAL(changed(const TQColor&)),this,TQ_SLOT(colorChanged(const TQColor&))); + connect(dialog_->minColor1, TQ_SIGNAL(changed(const TQColor&)),this,TQ_SLOT(colorChanged(const TQColor&))); + connect(dialog_->minColor2, TQ_SIGNAL(changed(const TQColor&)),this,TQ_SLOT(colorChanged(const TQColor&))); + connect(dialog_->minColor3, TQ_SIGNAL(changed(const TQColor&)),this,TQ_SLOT(colorChanged(const TQColor&))); + connect(dialog_->maxColor1, TQ_SIGNAL(changed(const TQColor&)),this,TQ_SLOT(colorChanged(const TQColor&))); + connect(dialog_->maxColor2, TQ_SIGNAL(changed(const TQColor&)),this,TQ_SLOT(colorChanged(const TQColor&))); + connect(dialog_->maxColor3, TQ_SIGNAL(changed(const TQColor&)),this,TQ_SLOT(colorChanged(const TQColor&))); + connect(dialog_->closeColor1, TQ_SIGNAL(changed(const TQColor&)),this,TQ_SLOT(colorChanged(const TQColor&))); + connect(dialog_->closeColor2, TQ_SIGNAL(changed(const TQColor&)),this,TQ_SLOT(colorChanged(const TQColor&))); + connect(dialog_->closeColor3, TQ_SIGNAL(changed(const TQColor&)),this,TQ_SLOT(colorChanged(const TQColor&))); - connect(dialog_->hover, TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(selectionChanged(int))); - connect(dialog_->animateHover, TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(selectionChanged(int))); - connect(dialog_->buttonTheme, TQT_SIGNAL(activated(int)),this,TQT_SLOT(selectionChanged(int))); - connect(dialog_->tintButtons, TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(boolChanged(bool))); - connect(dialog_->menuimage, TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(selectionChanged(int))); + connect(dialog_->hover, TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(selectionChanged(int))); + connect(dialog_->animateHover, TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(selectionChanged(int))); + connect(dialog_->buttonTheme, TQ_SIGNAL(activated(int)),this,TQ_SLOT(selectionChanged(int))); + connect(dialog_->tintButtons, TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(boolChanged(bool))); + connect(dialog_->menuimage, TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(selectionChanged(int))); - connect(dialog_->repaintMode, TQT_SIGNAL(clicked(int)),this, TQT_SLOT(selectionChanged(int))); + connect(dialog_->repaintMode, TQ_SIGNAL(clicked(int)),this, TQ_SLOT(selectionChanged(int))); - connect(dialog_->updateTime, TQT_SIGNAL(valueChanged(int)),this, TQT_SLOT(selectionChanged(int))); + connect(dialog_->updateTime, TQ_SIGNAL(valueChanged(int)),this, TQ_SLOT(selectionChanged(int))); - connect(dialog_->infoButton, TQT_SIGNAL(clicked(void)),this,TQT_SLOT(infoDialog(void))); + connect(dialog_->infoButton, TQ_SIGNAL(clicked(void)),this,TQ_SLOT(infoDialog(void))); - connect(dialog_->active_blur, TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(selectionChanged(int))); - connect(dialog_->inactive_blur, TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(selectionChanged(int))); + connect(dialog_->active_blur, TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(selectionChanged(int))); + connect(dialog_->inactive_blur, TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(selectionChanged(int))); - connect(dialog_->userPicture1, TQT_SIGNAL(stateChanged(int)),this, TQT_SLOT(selectionChanged(int))); - connect(dialog_->userPicture2, TQT_SIGNAL(stateChanged(int)),this, TQT_SLOT(selectionChanged(int))); - connect(dialog_->activeFile,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(textChanged( const TQString& ))); - connect(dialog_->inactiveFile,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(textChanged( const TQString& ))); + connect(dialog_->userPicture1, TQ_SIGNAL(stateChanged(int)),this, TQ_SLOT(selectionChanged(int))); + connect(dialog_->userPicture2, TQ_SIGNAL(stateChanged(int)),this, TQ_SLOT(selectionChanged(int))); + connect(dialog_->activeFile,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(textChanged( const TQString& ))); + connect(dialog_->inactiveFile,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(textChanged( const TQString& ))); - connect(dialog_->overlay_active, TQT_SIGNAL(activated(int)),this, TQT_SLOT(overlay_active_changed(int))); - connect(dialog_->overlay_inactive, TQT_SIGNAL(activated(int)),this, TQT_SLOT(overlay_inactive_changed(int))); + connect(dialog_->overlay_active, TQ_SIGNAL(activated(int)),this, TQ_SLOT(overlay_active_changed(int))); + connect(dialog_->overlay_inactive, TQ_SIGNAL(activated(int)),this, TQ_SLOT(overlay_inactive_changed(int))); - connect(dialog_->overlay_active_file,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(textChanged(const TQString &))); - connect(dialog_->overlay_inactive_file,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(textChanged(const TQString &))); + connect(dialog_->overlay_active_file,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(textChanged(const TQString &))); + connect(dialog_->overlay_inactive_file,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(textChanged(const TQString &))); - connect(dialog_->logoEnabled, TQT_SIGNAL(clicked(int)),this, TQT_SLOT(selectionChanged(int))); - connect(dialog_->logoFile, TQT_SIGNAL(textChanged(const TQString &)),this, TQT_SLOT(logoTextChanged(const TQString&))); - connect(dialog_->logoStretch, TQT_SIGNAL(activated(int)),this, TQT_SLOT(selectionChanged(int))); - connect(dialog_->logoActive, TQT_SIGNAL(stateChanged(int)),this, TQT_SLOT(selectionChanged(int))); - connect(dialog_->logoDistance,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(selectionChanged(int))); + connect(dialog_->logoEnabled, TQ_SIGNAL(clicked(int)),this, TQ_SLOT(selectionChanged(int))); + connect(dialog_->logoFile, TQ_SIGNAL(textChanged(const TQString &)),this, TQ_SLOT(logoTextChanged(const TQString&))); + connect(dialog_->logoStretch, TQ_SIGNAL(activated(int)),this, TQ_SLOT(selectionChanged(int))); + connect(dialog_->logoActive, TQ_SIGNAL(stateChanged(int)),this, TQ_SLOT(selectionChanged(int))); + connect(dialog_->logoDistance,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(selectionChanged(int))); load(config_); } @@ -338,7 +338,7 @@ void CrystalConfig::save(TDEConfig*) void CrystalConfig::infoDialog() { InfoDialog d(dialog_); - connect((TQLabel*)(d.kURLLabel1),TQT_SIGNAL(leftClickedURL(const TQString&)),TDEApplication::kApplication(),TQT_SLOT(invokeBrowser(const TQString &))); + connect((TQLabel*)(d.kURLLabel1),TQ_SIGNAL(leftClickedURL(const TQString&)),TDEApplication::kApplication(),TQ_SLOT(invokeBrowser(const TQString &))); d.exec(); } diff --git a/client/crystalbutton.cpp b/client/crystalbutton.cpp index c714e99..6c5c6a3 100644 --- a/client/crystalbutton.cpp +++ b/client/crystalbutton.cpp @@ -41,7 +41,7 @@ CrystalButton::CrystalButton(CrystalClient *parent, const char *name, hover=first=last=false; animation=0.0; TQToolTip::add(this, tip); - connect ( &animation_timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(animate())); + connect ( &animation_timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(animate())); } CrystalButton::~CrystalButton() diff --git a/client/crystalclient.cpp b/client/crystalclient.cpp index 8199478..6fb5cf8 100644 --- a/client/crystalclient.cpp +++ b/client/crystalclient.cpp @@ -807,11 +807,11 @@ void CrystalClient::init() if (::factory->captiontooltip) new CCrystalTooltip(widget(),this); - connect( this, TQT_SIGNAL( keepAboveChanged( bool )), TQT_SLOT( keepAboveChange( bool ))); - connect( this, TQT_SIGNAL( keepBelowChanged( bool )), TQT_SLOT( keepBelowChange( bool ))); + connect( this, TQ_SIGNAL( keepAboveChanged( bool )), TQ_SLOT( keepAboveChange( bool ))); + connect( this, TQ_SIGNAL( keepBelowChanged( bool )), TQ_SLOT( keepBelowChange( bool ))); - if (::factory->transparency)connect ( ::factory->image_holder,TQT_SIGNAL(repaintNeeded()),this,TQT_SLOT(Repaint())); - if (::factory->transparency)connect ( &timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(Repaint())); + if (::factory->transparency)connect ( ::factory->image_holder,TQ_SIGNAL(repaintNeeded()),this,TQ_SLOT(Repaint())); + if (::factory->transparency)connect ( &timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(Repaint())); updateLayout(); } @@ -895,7 +895,7 @@ CrystalButton* CrystalClient::addButtons(TQBoxLayout *layout, const TQString& s) if (!isModalSystemNotification()) { if (!button[ButtonMenu]) { button[ButtonMenu] = current = new CrystalButton(this, "menu", i18n("Menu"), ButtonMenu, ::factory->buttonImages[ButtonImageMenu]); - connect(button[ButtonMenu], TQT_SIGNAL(pressed()), this, TQT_SLOT(menuButtonPressed())); + connect(button[ButtonMenu], TQ_SIGNAL(pressed()), this, TQ_SLOT(menuButtonPressed())); } } break; @@ -911,7 +911,7 @@ CrystalButton* CrystalClient::addButtons(TQBoxLayout *layout, const TQString& s) tip = i18n("On All Desktops"); } button[ButtonSticky] =current=new CrystalButton(this, "sticky", tip,ButtonSticky, bitmap); - connect(button[ButtonSticky], TQT_SIGNAL(clicked()),this, TQT_SLOT(toggleOnAllDesktops())); + connect(button[ButtonSticky], TQ_SIGNAL(clicked()),this, TQ_SLOT(toggleOnAllDesktops())); } } break; @@ -920,7 +920,7 @@ CrystalButton* CrystalClient::addButtons(TQBoxLayout *layout, const TQString& s) if (providesContextHelp()) { button[ButtonHelp] =current= new CrystalButton(this, "help", i18n("Help"),ButtonHelp, ::factory->buttonImages[ButtonImageHelp]); - connect(button[ButtonHelp], TQT_SIGNAL(clicked()),this, TQT_SLOT(showContextHelp())); + connect(button[ButtonHelp], TQ_SIGNAL(clicked()),this, TQ_SLOT(showContextHelp())); } break; @@ -928,7 +928,7 @@ CrystalButton* CrystalClient::addButtons(TQBoxLayout *layout, const TQString& s) if ((!button[ButtonMin]) && isMinimizable()) { button[ButtonMin] =current= new CrystalButton(this, "iconify", i18n("Minimize"),ButtonMin, ::factory->buttonImages[ButtonImageMin]); - connect(button[ButtonMin], TQT_SIGNAL(clicked()),this, TQT_SLOT(minButtonPressed())); + connect(button[ButtonMin], TQ_SIGNAL(clicked()),this, TQ_SLOT(minButtonPressed())); } break; @@ -936,7 +936,7 @@ CrystalButton* CrystalClient::addButtons(TQBoxLayout *layout, const TQString& s) if (!button[ButtonAbove]) { button[ButtonAbove] =current= new CrystalButton(this, "above", i18n("Keep Above Others"),ButtonAbove, ::factory->buttonImages[keepAbove()?ButtonImageUnAbove:ButtonImageAbove]); - connect(button[ButtonAbove], TQT_SIGNAL(clicked()),this, TQT_SLOT(aboveButtonPressed())); + connect(button[ButtonAbove], TQ_SIGNAL(clicked()),this, TQ_SLOT(aboveButtonPressed())); } break; @@ -944,7 +944,7 @@ CrystalButton* CrystalClient::addButtons(TQBoxLayout *layout, const TQString& s) if ((!button[ButtonBelow])) { button[ButtonBelow] =current= new CrystalButton(this, "below", i18n("Keep Below Others"),ButtonBelow, ::factory->buttonImages[keepBelow()?ButtonImageUnBelow:ButtonImageBelow]); - connect(button[ButtonBelow], TQT_SIGNAL(clicked()),this, TQT_SLOT(belowButtonPressed())); + connect(button[ButtonBelow], TQ_SIGNAL(clicked()),this, TQ_SLOT(belowButtonPressed())); } break; @@ -952,7 +952,7 @@ CrystalButton* CrystalClient::addButtons(TQBoxLayout *layout, const TQString& s) if ((!button[ButtonShade]) && isShadeable()) { button[ButtonShade] =current= new CrystalButton(this, "shade", i18n("Shade"),ButtonShade, ::factory->buttonImages[ButtonImageShade]); - connect(button[ButtonShade], TQT_SIGNAL(clicked()),this, TQT_SLOT(shadeButtonPressed())); + connect(button[ButtonShade], TQ_SIGNAL(clicked()),this, TQ_SLOT(shadeButtonPressed())); } break; @@ -969,7 +969,7 @@ CrystalButton* CrystalClient::addButtons(TQBoxLayout *layout, const TQString& s) } button[ButtonMax] =current= new CrystalButton(this, "maximize", tip,ButtonMax, bitmap); - connect(button[ButtonMax], TQT_SIGNAL(clicked()),this, TQT_SLOT(maxButtonPressed())); + connect(button[ButtonMax], TQ_SIGNAL(clicked()),this, TQ_SLOT(maxButtonPressed())); } break; @@ -977,7 +977,7 @@ CrystalButton* CrystalClient::addButtons(TQBoxLayout *layout, const TQString& s) if (isCloseable()) { button[ButtonClose] =current= new CrystalButton(this, "close", i18n("Close"),ButtonClose, ::factory->buttonImages[ButtonImageClose]); - connect(button[ButtonClose], TQT_SIGNAL(clicked()),this, TQT_SLOT(closeButtonPressed())); + connect(button[ButtonClose], TQ_SIGNAL(clicked()),this, TQ_SLOT(closeButtonPressed())); } break; @@ -1412,7 +1412,7 @@ void CrystalClient::paintEvent(TQPaintEvent*) // And notify image_holder that we need an update asap if (::factory)if (::factory->image_holder) // UnInit image_holder, on next Repaint it will be Init'ed again. - TQTimer::singleShot(500,::factory->image_holder,TQT_SLOT(CheckSanity())); + TQTimer::singleShot(500,::factory->image_holder,TQ_SLOT(CheckSanity())); } if (drawFrame) diff --git a/client/imageholder.cpp b/client/imageholder.cpp index b3c2a50..adcc81f 100644 --- a/client/imageholder.cpp +++ b/client/imageholder.cpp @@ -84,8 +84,8 @@ void QImageHolder::Init() rootpixmap=new KMyRootPixmap(NULL/*,this*/); rootpixmap->start(); rootpixmap->repaint(true); - connect( rootpixmap,TQT_SIGNAL(backgroundUpdated(const TQImage*)),this, TQT_SLOT(BackgroundUpdated(const TQImage*))); - connect(kapp, TQT_SIGNAL(backgroundChanged(int)),TQT_SLOT(handleDesktopChanged(int))); + connect( rootpixmap,TQ_SIGNAL(backgroundUpdated(const TQImage*)),this, TQ_SLOT(BackgroundUpdated(const TQImage*))); + connect(kapp, TQ_SIGNAL(backgroundChanged(int)),TQ_SLOT(handleDesktopChanged(int))); initialized=true; } diff --git a/client/myrootpixmap.cpp b/client/myrootpixmap.cpp index ca3a260..6fc6033 100644 --- a/client/myrootpixmap.cpp +++ b/client/myrootpixmap.cpp @@ -95,13 +95,13 @@ void KMyRootPixmap::init() m_Desk=-1; // m_bCustomPaint = false; -// connect(kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int))); - connect(m_pPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool))); -// connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(repaint())); +// connect(kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int))); + connect(m_pPixmap, TQ_SIGNAL(done(bool)), TQ_SLOT(slotDone(bool))); +// connect(m_pTimer, TQ_SIGNAL(timeout()), TQ_SLOT(repaint())); #ifdef Q_WS_X11 d->twin = new DesktopWallpaperWatcher(); - connect(d->twin, TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(desktopChanged(int))); + connect(d->twin, TQ_SIGNAL(currentDesktopChanged(int)), TQ_SLOT(desktopChanged(int))); #endif // d->toplevel = m_pWidget->topLevelWidget(); |