From 934db26c3f8efe148a5680c22f965ee10f818a61 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:18:28 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- src/newbasketdialog.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/newbasketdialog.cpp') diff --git a/src/newbasketdialog.cpp b/src/newbasketdialog.cpp index c782583..5651815 100644 --- a/src/newbasketdialog.cpp +++ b/src/newbasketdialog.cpp @@ -106,7 +106,7 @@ NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultPro connect( m_name, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(nameChanged(const TQString&)) ); enableButtonOK(false); TQToolTip::add(m_name, i18n("Name")); - m_backgroundColor = new KColorCombo2(TQColor(), KGlobalSettings::baseColor(), page); + m_backgroundColor = new KColorCombo2(TQColor(), TDEGlobalSettings::baseColor(), page); m_backgroundColor->setColor(TQColor()); m_backgroundColor->setFixedSize(m_backgroundColor->sizeHint()); m_backgroundColor->setColor(m_defaultProperties.backgroundColor); @@ -148,8 +148,8 @@ NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultPro TQPixmap icon(40, 53); TQPainter painter(&icon); - painter.fillRect(0, 0, icon.width(), icon.height(), KGlobalSettings::baseColor()); - painter.setPen(KGlobalSettings::textColor()); + painter.fillRect(0, 0, icon.width(), icon.height(), TDEGlobalSettings::baseColor()); + painter.setPen(TDEGlobalSettings::textColor()); painter.drawRect(0, 0, icon.width(), icon.height()); painter.end(); lastTemplate = new KIconViewItem(m_templates, lastTemplate, i18n("One column"), icon); @@ -158,8 +158,8 @@ NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultPro m_templates->setSelected(lastTemplate, true); painter.begin(&icon); - painter.fillRect(0, 0, icon.width(), icon.height(), KGlobalSettings::baseColor()); - painter.setPen(KGlobalSettings::textColor()); + painter.fillRect(0, 0, icon.width(), icon.height(), TDEGlobalSettings::baseColor()); + painter.setPen(TDEGlobalSettings::textColor()); painter.drawRect(0, 0, icon.width(), icon.height()); painter.drawLine(icon.width() / 2, 0, icon.width() / 2, icon.height()); painter.end(); @@ -169,8 +169,8 @@ NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultPro m_templates->setSelected(lastTemplate, true); painter.begin(&icon); - painter.fillRect(0, 0, icon.width(), icon.height(), KGlobalSettings::baseColor()); - painter.setPen(KGlobalSettings::textColor()); + painter.fillRect(0, 0, icon.width(), icon.height(), TDEGlobalSettings::baseColor()); + painter.setPen(TDEGlobalSettings::textColor()); painter.drawRect(0, 0, icon.width(), icon.height()); painter.drawLine(icon.width() / 3, 0, icon.width() / 3, icon.height()); painter.drawLine(icon.width() * 2 / 3, 0, icon.width() * 2 / 3, icon.height()); @@ -181,8 +181,8 @@ NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultPro m_templates->setSelected(lastTemplate, true); painter.begin(&icon); - painter.fillRect(0, 0, icon.width(), icon.height(), KGlobalSettings::baseColor()); - painter.setPen(KGlobalSettings::textColor()); + painter.fillRect(0, 0, icon.width(), icon.height(), TDEGlobalSettings::baseColor()); + painter.setPen(TDEGlobalSettings::textColor()); painter.drawRect(0, 0, icon.width(), icon.height()); painter.drawRect(icon.width() / 5, icon.width() / 5, icon.width() / 4, icon.height() / 8); painter.drawRect(icon.width() * 2 / 5, icon.width() * 2 / 5, icon.width() / 4, icon.height() / 8); @@ -193,8 +193,8 @@ NewBasketDialog::NewBasketDialog(Basket *parentBasket, const NewBasketDefaultPro m_templates->setSelected(lastTemplate, true); /* painter.begin(&icon); - painter.fillRect(0, 0, icon.width(), icon.height(), KGlobalSettings::baseColor()); - painter.setPen(KGlobalSettings::textColor()); + painter.fillRect(0, 0, icon.width(), icon.height(), TDEGlobalSettings::baseColor()); + painter.setPen(TDEGlobalSettings::textColor()); painter.drawRect(0, 0, icon.width(), icon.height()); painter.drawRect(icon.width() * 2 / 5, icon.height() * 3 / 7, icon.width() / 5, icon.height() / 7); painter.end(); -- cgit v1.2.1