summaryrefslogtreecommitdiffstats
path: root/tdeui
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:48:49 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:48:49 -0600
commit13281e2856a2ef43bbab78c5528470309c23aa77 (patch)
tree936bcf8145dc235004c73e9fb3d6b3dca9aa370b /tdeui
parente81c741bb2cf337a43524e75f22f7728ce17a343 (diff)
downloadtdelibs-13281e2856a2ef43bbab78c5528470309c23aa77.tar.gz
tdelibs-13281e2856a2ef43bbab78c5528470309c23aa77.zip
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'tdeui')
-rw-r--r--tdeui/kaboutdialog.cpp16
-rw-r--r--tdeui/kaboutdialog.h4
-rw-r--r--tdeui/kaboutkde.cpp8
-rw-r--r--tdeui/kaction.cpp4
-rw-r--r--tdeui/kactionclasses.cpp14
-rw-r--r--tdeui/kactioncollection.cpp10
-rw-r--r--tdeui/kactionselector.cpp2
-rw-r--r--tdeui/kactivelabel.cpp2
-rw-r--r--tdeui/kactivelabel.h2
-rw-r--r--tdeui/kanimwidget.cpp4
-rw-r--r--tdeui/karrowbutton.cpp8
-rw-r--r--tdeui/karrowbutton.h4
-rw-r--r--tdeui/kauthicon.cpp4
-rw-r--r--tdeui/kbugreport.cpp68
-rw-r--r--tdeui/kbuttonbox.cpp2
-rw-r--r--tdeui/kcharselect.cpp42
-rw-r--r--tdeui/kcmenumngr.cpp8
-rw-r--r--tdeui/kcmodule.cpp2
-rw-r--r--tdeui/kcolorbutton.cpp18
-rw-r--r--tdeui/kcolorcombo.cpp2
-rw-r--r--tdeui/kcolordialog.cpp8
-rw-r--r--tdeui/kcolordrag.cpp2
-rw-r--r--tdeui/kcombobox.cpp2
-rw-r--r--tdeui/kcombobox.h2
-rw-r--r--tdeui/kcompletionbox.cpp2
-rw-r--r--tdeui/kconfigdialog.cpp2
-rw-r--r--tdeui/kcursor.cpp4
-rw-r--r--tdeui/kcursor.h2
-rw-r--r--tdeui/kdatepicker.cpp20
-rw-r--r--tdeui/kdatepicker.h2
-rw-r--r--tdeui/kdatetbl.cpp32
-rw-r--r--tdeui/kdatetimewidget.cpp2
-rw-r--r--tdeui/kdatewidget.cpp2
-rw-r--r--tdeui/kdialog.cpp4
-rw-r--r--tdeui/kdialogbase.cpp30
-rw-r--r--tdeui/kdialogbase.h8
-rw-r--r--tdeui/kdockwidget.cpp44
-rw-r--r--tdeui/kdockwidget.h6
-rw-r--r--tdeui/kdockwidget_private.cpp28
-rw-r--r--tdeui/kdualcolorbutton.cpp22
-rw-r--r--tdeui/kdualcolorbutton.h2
-rw-r--r--tdeui/keditcl1.cpp16
-rw-r--r--tdeui/keditcl2.cpp2
-rw-r--r--tdeui/keditlistbox.cpp2
-rw-r--r--tdeui/kedittoolbar.cpp20
-rw-r--r--tdeui/kfontcombo.cpp2
-rw-r--r--tdeui/kfontdialog.cpp16
-rw-r--r--tdeui/kfontrequester.cpp2
-rw-r--r--tdeui/kguiitem.cpp2
-rw-r--r--tdeui/khelpmenu.cpp2
-rw-r--r--tdeui/kiconview.cpp24
-rw-r--r--tdeui/kinputdialog.cpp2
-rw-r--r--tdeui/kjanuswidget.cpp24
-rw-r--r--tdeui/kjanuswidget.h2
-rw-r--r--tdeui/kkeybutton.cpp14
-rw-r--r--tdeui/kkeydialog.cpp4
-rw-r--r--tdeui/klanguagebutton.cpp16
-rw-r--r--tdeui/kled.cpp26
-rw-r--r--tdeui/kled.h14
-rw-r--r--tdeui/klineedit.cpp18
-rw-r--r--tdeui/klineeditdlg.cpp2
-rw-r--r--tdeui/klistbox.cpp4
-rw-r--r--tdeui/klistview.cpp60
-rw-r--r--tdeui/klistview.h4
-rw-r--r--tdeui/klistviewsearchline.cpp22
-rw-r--r--tdeui/kmainwindow.cpp60
-rw-r--r--tdeui/kmainwindow.h14
-rw-r--r--tdeui/kmainwindowiface.cpp4
-rw-r--r--tdeui/kmenubar.cpp32
-rw-r--r--tdeui/kmessagebox.cpp18
-rw-r--r--tdeui/knuminput.cpp30
-rw-r--r--tdeui/knuminput.h8
-rw-r--r--tdeui/knumvalidator.cpp6
-rw-r--r--tdeui/kpanelapplet.cpp6
-rw-r--r--tdeui/kpanelapplet.h8
-rw-r--r--tdeui/kpanelextension.cpp6
-rw-r--r--tdeui/kpanelextension.h8
-rw-r--r--tdeui/kpassdlg.cpp6
-rw-r--r--tdeui/kpassivepopup.cpp2
-rw-r--r--tdeui/kpixmapregionselectorwidget.cpp2
-rw-r--r--tdeui/kpopupmenu.cpp6
-rw-r--r--tdeui/kprogress.cpp8
-rw-r--r--tdeui/kprogressbox.cpp2
-rw-r--r--tdeui/krootpixmap.cpp28
-rw-r--r--tdeui/krootpixmap.h8
-rw-r--r--tdeui/kruler.cpp20
-rw-r--r--tdeui/kruler.h8
-rw-r--r--tdeui/ksconfig.cpp6
-rw-r--r--tdeui/kselect.cpp34
-rw-r--r--tdeui/kselect.h2
-rw-r--r--tdeui/kseparator.cpp2
-rw-r--r--tdeui/ksharedpixmap.cpp2
-rw-r--r--tdeui/kshortcutdialog.cpp6
-rw-r--r--tdeui/kspell.cpp12
-rw-r--r--tdeui/kspelldlg.cpp2
-rw-r--r--tdeui/kspellui.ui2
-rw-r--r--tdeui/ksqueezedtextlabel.cpp4
-rw-r--r--tdeui/kstatusbar.cpp4
-rw-r--r--tdeui/kstatusbar.h2
-rw-r--r--tdeui/kstdaction.cpp2
-rw-r--r--tdeui/kstdguiitem.cpp56
-rw-r--r--tdeui/kswitchlanguagedialog.cpp2
-rw-r--r--tdeui/ksyntaxhighlighter.cpp10
-rw-r--r--tdeui/ksyntaxhighlighter.h2
-rw-r--r--tdeui/ksystemtray.cpp4
-rw-r--r--tdeui/ktabbar.cpp24
-rw-r--r--tdeui/ktabctl.cpp40
-rw-r--r--tdeui/ktabctl.h2
-rw-r--r--tdeui/ktabwidget.cpp14
-rw-r--r--tdeui/ktextbrowser.h2
-rw-r--r--tdeui/ktextedit.cpp6
-rw-r--r--tdeui/ktextedit.h2
-rw-r--r--tdeui/ktimewidget.cpp2
-rw-r--r--tdeui/ktip.cpp16
-rw-r--r--tdeui/ktoolbar.cpp70
-rw-r--r--tdeui/ktoolbar.h4
-rw-r--r--tdeui/ktoolbarbutton.cpp40
-rw-r--r--tdeui/ktoolbarbutton.h2
-rw-r--r--tdeui/ktoolbarhandler.cpp2
-rw-r--r--tdeui/ktoolbarlabelaction.cpp2
-rw-r--r--tdeui/kurllabel.cpp6
-rw-r--r--tdeui/kwhatsthismanager.cpp6
-rw-r--r--tdeui/kwordwrap.cpp4
-rw-r--r--tdeui/kwordwrap.h4
-rw-r--r--tdeui/kxmlguibuilder.cpp30
-rw-r--r--tdeui/kxmlguiclient.cpp12
-rw-r--r--tdeui/kxmlguifactory.cpp10
-rw-r--r--tdeui/qxembed.cpp114
-rw-r--r--tdeui/tests/itemcontainertest.cpp2
-rw-r--r--tdeui/tests/kbuttonboxtest.cpp2
-rw-r--r--tdeui/tests/kcomboboxtest.cpp2
-rw-r--r--tdeui/tests/kcompletiontest.cpp2
-rw-r--r--tdeui/tests/kdesattest.cpp2
-rw-r--r--tdeui/tests/kdialogbasetest.cpp4
-rw-r--r--tdeui/tests/kdockwidgetdemo.cpp20
-rw-r--r--tdeui/tests/kdualcolortest.cpp8
-rw-r--r--tdeui/tests/keditlistboxtest.cpp12
-rw-r--r--tdeui/tests/kledtest.cpp6
-rw-r--r--tdeui/tests/kledtest.h2
-rw-r--r--tdeui/tests/klineeditdlgtest.cpp2
-rw-r--r--tdeui/tests/klineedittest.cpp2
-rw-r--r--tdeui/tests/kmessageboxtest.cpp16
-rw-r--r--tdeui/tests/knuminputtest.cpp2
-rw-r--r--tdeui/tests/krulertest.cpp2
-rw-r--r--tdeui/tests/kseparatortest.cpp2
-rw-r--r--tdeui/tests/kspelltest.cpp2
-rw-r--r--tdeui/tests/ktabctltest.cpp2
-rw-r--r--tdeui/tests/ktabwidgettest.cpp8
-rw-r--r--tdeui/tests/kunbalancedgrdtest.cpp4
-rw-r--r--tdeui/tests/kwizardtest.cpp2
-rw-r--r--tdeui/twindowlistmenu.cpp2
151 files changed, 858 insertions, 858 deletions
diff --git a/tdeui/kaboutdialog.cpp b/tdeui/kaboutdialog.cpp
index e59d808c9..da4961ea3 100644
--- a/tdeui/kaboutdialog.cpp
+++ b/tdeui/kaboutdialog.cpp
@@ -20,10 +20,10 @@
*
*/
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqimage.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <ktextedit.h>
#include <tqobjectlist.h>
#include <tqpainter.h>
@@ -429,7 +429,7 @@ void KAboutContainerBase::show( void )
TQSize KAboutContainerBase::sizeHint( void ) const
{
- return tqminimumSize().expandedTo( TQSize( TQWidget::sizeHint().width(), 0 ) );
+ return minimumSize().expandedTo( TQSize( TQWidget::sizeHint().width(), 0 ) );
}
void KAboutContainerBase::fontChange( const TQFont &/*oldFont*/ )
@@ -828,7 +828,7 @@ TQSize KAboutContainer::sizeHint( void ) const
++numChild;
TQWidget* const w= TQT_TQWIDGET(o);
- TQSize s = w->tqminimumSize();
+ TQSize s = w->minimumSize();
if( s.isEmpty() )
{
s = w->minimumSizeHint();
@@ -890,7 +890,7 @@ void KAboutContainer::addPerson( const TQString &_name, const TQString &_email,
}
-void KAboutContainer::addTitle( const TQString &title, int tqalignment,
+void KAboutContainer::addTitle( const TQString &title, int alignment,
bool showFrame, bool showBold )
{
@@ -905,11 +905,11 @@ void KAboutContainer::addTitle( const TQString &title, int tqalignment,
{
label->setFrameStyle(TQFrame::Panel | TQFrame::Raised);
}
- label->setAlignment( tqalignment );
+ label->setAlignment( alignment );
}
-void KAboutContainer::addImage( const TQString &fileName, int tqalignment )
+void KAboutContainer::addImage( const TQString &fileName, int alignment )
{
if( fileName.isNull() )
{
@@ -924,7 +924,7 @@ void KAboutContainer::addImage( const TQString &fileName, int tqalignment )
pix = logo;
label->setPixmap( pix );
}
- label->setAlignment( tqalignment );
+ label->setAlignment( alignment );
}
#if 0
diff --git a/tdeui/kaboutdialog.h b/tdeui/kaboutdialog.h
index 01a515959..6f0d80149 100644
--- a/tdeui/kaboutdialog.h
+++ b/tdeui/kaboutdialog.h
@@ -62,9 +62,9 @@ class TDEUI_EXPORT KAboutContainer : public TQFrame
const TQString &url, const TQString &task,
bool showHeader = false, bool showframe = false,
bool showBold = false );
- void addTitle( const TQString &title, int tqalignment=AlignLeft,
+ void addTitle( const TQString &title, int alignment=AlignLeft,
bool showframe = false, bool showBold = false );
- void addImage( const TQString &fileName, int tqalignment=AlignLeft );
+ void addImage( const TQString &fileName, int alignment=AlignLeft );
virtual TQSize sizeHint( void ) const;
virtual TQSize minimumSizeHint( void ) const;
diff --git a/tdeui/kaboutkde.cpp b/tdeui/kaboutkde.cpp
index 7ac9b7193..1973c316b 100644
--- a/tdeui/kaboutkde.cpp
+++ b/tdeui/kaboutkde.cpp
@@ -27,7 +27,7 @@
KAboutKDE::KAboutKDE( TQWidget *parent, const char *name, bool modal )
- :KAboutDialog( KAboutDialog::AbtKDEStandard, TQString::tqfromLatin1("TDE"),
+ :KAboutDialog( KAboutDialog::AbtKDEStandard, TQString::fromLatin1("TDE"),
KDialogBase::Help|KDialogBase::Close, KDialogBase::Close,
parent, name, modal )
{
@@ -75,13 +75,13 @@ KAboutKDE::KAboutKDE( TQWidget *parent, const char *name, bool modal )
"donation, using one of the ways described at "
"<a href=\"http://www.trinitydesktop.org/donate.php\">http://www.trinitydesktop.org/donate.php</a>."
"<br><br>Thank you very much in advance for your support!");
- setHelp( TQString::tqfromLatin1("khelpcenter/main.html"), TQString::null );
+ setHelp( TQString::fromLatin1("khelpcenter/main.html"), TQString::null );
setTitle(i18n("Trinity Desktop Environment. Release %1").
- arg(TQString::tqfromLatin1(TDE_VERSION_STRING)) );
+ arg(TQString::fromLatin1(TDE_VERSION_STRING)) );
addTextPage( i18n("About Trinity","&About"), text1, true );
addTextPage( i18n("&Report Bugs or Wishes"), text2, true );
addTextPage( i18n("&Join the Trinity Team"), text3, true );
addTextPage( i18n("&Support Trinity"), text4, true );
- setImage( locate( "data", TQString::tqfromLatin1("tdeui/pics/aboutkde.png")) );
+ setImage( locate( "data", TQString::fromLatin1("tdeui/pics/aboutkde.png")) );
setImageBackgroundColor( white );
}
diff --git a/tdeui/kaction.cpp b/tdeui/kaction.cpp
index 6a0ad7812..270c00ec4 100644
--- a/tdeui/kaction.cpp
+++ b/tdeui/kaction.cpp
@@ -810,7 +810,7 @@ void KAction::unplugAccel()
void KAction::plugMainWindowAccel( TQWidget *w )
{
- // Note: tqtopLevelWidget() stops too early, we can't use it.
+ // Note: topLevelWidget() stops too early, we can't use it.
TQWidget * tl = w;
TQWidget * n;
while ( !tl->isDialog() && ( n = tl->parentWidget() ) ) // lookup parent and store
@@ -1039,7 +1039,7 @@ TQString KAction::whatsThisWithIcon() const
{
TQString text = whatsThis();
if (!d->iconName().isEmpty())
- return TQString::tqfromLatin1("<img source=\"small|%1\"> %2").arg(d->iconName() ).arg(text);
+ return TQString::fromLatin1("<img source=\"small|%1\"> %2").arg(d->iconName() ).arg(text);
return text;
}
diff --git a/tdeui/kactionclasses.cpp b/tdeui/kactionclasses.cpp
index f9acb0ea9..5aec6bcdb 100644
--- a/tdeui/kactionclasses.cpp
+++ b/tdeui/kactionclasses.cpp
@@ -31,7 +31,7 @@
#include <fontconfig/fontconfig.h>
#include <tqcursor.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqfontdatabase.h>
#include <tqobjectlist.h>
#include <tqwhatsthis.h>
@@ -628,7 +628,7 @@ void KSelectAction::updateItems( int id )
for( ; it != lst.end(); ++it )
cb->insertItem( *it );
// qt caches and never recalculates the sizeHint()
- // qcombobox.cpp recommends calling setFont to tqinvalidate the sizeHint
+ // qcombobox.cpp recommends calling setFont to invalidate the sizeHint
// setFont sets own_font = True, so we're a bit mean and calll
// unsetFont which calls setFont and then overwrites the own_font
cb->unsetFont();
@@ -1626,7 +1626,7 @@ void KFontSizeAction::init()
setEditable( true );
TQFontDatabase fontDB;
- TQValueList<int> sizes = fontDB.tqstandardSizes();
+ TQValueList<int> sizes = fontDB.standardSizes();
TQStringList lst;
for ( TQValueList<int>::Iterator it = sizes.begin(); it != sizes.end(); ++it )
lst.append( TQString::number( *it ) );
@@ -2021,7 +2021,7 @@ int KToggleToolBarAction::plug( TQWidget* w, int index )
return -1;
if ( !m_toolBar ) {
- // Note: tqtopLevelWidget() stops too early, we can't use it.
+ // Note: topLevelWidget() stops too early, we can't use it.
TQWidget * tl = w;
TQWidget * n;
while ( !tl->isDialog() && ( n = tl->parentWidget() ) ) // lookup parent and store
@@ -2326,7 +2326,7 @@ void KPasteTextAction::menuAboutToShow()
if (reply.isValid())
list = reply;
}
- TQString clipboardText = tqApp->tqclipboard()->text(TQClipboard::Clipboard);
+ TQString clipboardText = tqApp->clipboard()->text(TQClipboard::Clipboard);
if (list.isEmpty())
list << clipboardText;
bool found = false;
@@ -2354,7 +2354,7 @@ void KPasteTextAction::menuItemActivated( int id)
TQString clipboardText = reply;
reply = klipper.call("setClipboardContents(TQString)", clipboardText);
if (reply.isValid())
- kdDebug(129) << "Clipboard: " << TQString(tqApp->tqclipboard()->text(TQClipboard::Clipboard)) << endl;
+ kdDebug(129) << "Clipboard: " << TQString(tqApp->clipboard()->text(TQClipboard::Clipboard)) << endl;
}
TQTimer::singleShot(20, this, TQT_SLOT(slotActivated()));
}
@@ -2363,7 +2363,7 @@ void KPasteTextAction::slotActivated()
{
if (!m_mixedMode) {
TQWidget *w = tqApp->widgetAt(TQCursor::pos(), true);
- TQMimeSource *data = TQApplication::tqclipboard()->data();
+ TQMimeSource *data = TQApplication::clipboard()->data();
if (!data->provides("text/plain") && w) {
m_popup->popup(w->mapToGlobal(TQPoint(0, w->height())));
} else
diff --git a/tdeui/kactioncollection.cpp b/tdeui/kactioncollection.cpp
index 69a87eaee..ba809087c 100644
--- a/tdeui/kactioncollection.cpp
+++ b/tdeui/kactioncollection.cpp
@@ -250,8 +250,8 @@ void KActionCollection::removeWidget( TQWidget* w )
}
delete pKAccel;
- d->m_widgetList.remove( d->m_widgetList.tqat( i ) );
- d->m_kaccelList.remove( d->m_kaccelList.tqat( i ) );
+ d->m_widgetList.remove( d->m_widgetList.at( i ) );
+ d->m_kaccelList.remove( d->m_kaccelList.at( i ) );
if( d->m_iWidgetCurrent == (int)i )
d->m_iWidgetCurrent = -1;
@@ -402,7 +402,7 @@ KAction* KActionCollection::action( int index ) const
TQAsciiDictIterator<KAction> it( d->m_actionDict );
it += index;
return it.current();
-// return d->m_actions.tqat( index );
+// return d->m_actions.at( index );
}
bool KActionCollection::readShortcutSettings( const TQString& sConfigGroup, KConfigBase* pConfig )
@@ -713,8 +713,8 @@ bool KActionShortcutList::save() const
if( m_actions.xmlFile().isEmpty() )
return writeSettings();
- TQString attrShortcut = TQString::tqfromLatin1("shortcut");
- TQString attrAccel = TQString::tqfromLatin1("accel"); // Depricated attribute
+ TQString attrShortcut = TQString::fromLatin1("shortcut");
+ TQString attrAccel = TQString::fromLatin1("accel"); // Depricated attribute
// Read XML file
TQString sXml( KXMLGUIFactory::readConfigFile( xmlFile, false, instance() ) );
diff --git a/tdeui/kactionselector.cpp b/tdeui/kactionselector.cpp
index 8923cbd4f..73f573ead 100644
--- a/tdeui/kactionselector.cpp
+++ b/tdeui/kactionselector.cpp
@@ -27,7 +27,7 @@
#include <tqlistbox.h>
#include <tqtoolbutton.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqevent.h>
#include <tqwhatsthis.h>
diff --git a/tdeui/kactivelabel.cpp b/tdeui/kactivelabel.cpp
index f0398c1b7..72e72b677 100644
--- a/tdeui/kactivelabel.cpp
+++ b/tdeui/kactivelabel.cpp
@@ -113,7 +113,7 @@ void KActiveLabel::keyPressEvent( TQKeyEvent *e )
TQSize KActiveLabel::minimumSizeHint() const
{
- TQSize ms = tqminimumSize();
+ TQSize ms = minimumSize();
if ((ms.width() > 0) && (ms.height() > 0))
return ms;
diff --git a/tdeui/kactivelabel.h b/tdeui/kactivelabel.h
index 5832a4fa1..d398ac37f 100644
--- a/tdeui/kactivelabel.h
+++ b/tdeui/kactivelabel.h
@@ -19,7 +19,7 @@
#ifndef _KACTIVELABEL_H_
#define _KACTIVELABEL_H_
-#include <tqtextbrowser.h>
+#include <textbrowser.h>
#include <tdelibs_export.h>
diff --git a/tdeui/kanimwidget.cpp b/tdeui/kanimwidget.cpp
index d538bea20..899ba7bd3 100644
--- a/tdeui/kanimwidget.cpp
+++ b/tdeui/kanimwidget.cpp
@@ -74,7 +74,7 @@ void KAnimWidget::stop()
{
d->current_frame = 0;
d->timer.stop();
- tqrepaint();
+ repaint();
}
void KAnimWidget::setSize( int size )
@@ -162,7 +162,7 @@ void KAnimWidget::slotTimerUpdate()
// We have to clear the widget when repainting a transparent image
// By doing it like this we get a bit of flicker though. A better
// way might be to merge it with the background in drawContents.
- tqrepaint(d->transparent);
+ repaint(d->transparent);
}
void KAnimWidget::drawContents( TQPainter *p )
diff --git a/tdeui/karrowbutton.cpp b/tdeui/karrowbutton.cpp
index 4d166b7b3..4808bcd54 100644
--- a/tdeui/karrowbutton.cpp
+++ b/tdeui/karrowbutton.cpp
@@ -49,7 +49,7 @@ void KArrowButton::setArrowType(Qt::ArrowType a)
{
if (d->arrow != a) {
d->arrow = a;
- tqrepaint();
+ repaint();
}
}
Qt::ArrowType KArrowButton::arrowType() const
@@ -62,9 +62,9 @@ void KArrowButton::drawButton(TQPainter *p)
const unsigned int arrowSize = 8;
const unsigned int margin = 2;
- p->fillRect( rect(), tqcolorGroup().brush( TQColorGroup::Background ) );
+ p->fillRect( rect(), colorGroup().brush( TQColorGroup::Background ) );
tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, p, TQRect( 0, 0, width(), height() ),
- tqcolorGroup(),
+ colorGroup(),
isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Default,
TQStyleOption( 2, 0 ) );
@@ -104,7 +104,7 @@ void KArrowButton::drawButton(TQPainter *p)
if ( isDown() )
flags |= TQStyle::Style_Down;
tqstyle().tqdrawPrimitive( e, p, TQRect( TQPoint( x, y ), TQSize( arrowSize, arrowSize ) ),
- tqcolorGroup(), flags );
+ colorGroup(), flags );
}
void KArrowButton::virtual_hook( int, void* )
diff --git a/tdeui/karrowbutton.h b/tdeui/karrowbutton.h
index 90f56d9bb..0719f8bc1 100644
--- a/tdeui/karrowbutton.h
+++ b/tdeui/karrowbutton.h
@@ -28,7 +28,7 @@ class KArrowButtonPrivate;
* @short Draws a button with an arrow.
*
* Draws a button which shows an arrow pointing into a certain direction. The
- * arrow's tqalignment on the button depends on the direction it's pointing to,
+ * arrow's alignment on the button depends on the direction it's pointing to,
* e.g. a left arrow is aligned at the left border, a upwards arrow at the top
* border. This class honors the currently configured KStyle when drawing
* the arrow.
@@ -72,7 +72,7 @@ class TDEUI_EXPORT KArrowButton : public TQPushButton
void setArrowTp( int tp ) { setArrowType( (Qt::ArrowType) tp ); }
public slots:
/**
- * Defines in what direction the arrow is pointing to. Will tqrepaint the
+ * Defines in what direction the arrow is pointing to. Will repaint the
* button if necessary.
*
* @param a The direction this arrow should be pointing in
diff --git a/tdeui/kauthicon.cpp b/tdeui/kauthicon.cpp
index 647009f25..e266dca77 100644
--- a/tdeui/kauthicon.cpp
+++ b/tdeui/kauthicon.cpp
@@ -21,7 +21,7 @@
#include <unistd.h> // For getuid
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqtimer.h>
@@ -134,7 +134,7 @@ KAuthIcon::~KAuthIcon()
TQSize KAuthIcon::sizeHint() const
{
- return layout->tqminimumSize();
+ return layout->minimumSize();
}
diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp
index d122d2e02..93cdf0456 100644
--- a/tdeui/kbugreport.cpp
+++ b/tdeui/kbugreport.cpp
@@ -20,7 +20,7 @@
#include <tqhbuttongroup.h>
#include <tqpushbutton.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqmultilineedit.h>
#include <tqradiobutton.h>
#include <tqwhatsthis.h>
@@ -51,7 +51,7 @@
#include <kcombobox.h>
#include <config.h>
#include <ktempfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqfile.h>
class KBugReportPrivate {
@@ -88,7 +88,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD
TQWidget * parent = plainPage();
d->submitBugButton = 0;
- //if ( m_aboutData->bugAddress() == TQString::tqfromLatin1("submit@bugs.pearsoncomputing.net") )
+ //if ( m_aboutData->bugAddress() == TQString::fromLatin1("submit@bugs.pearsoncomputing.net") )
//{
// // This is a core KDE application -> redirect to the web form
// Always redirect to the Web form for Trinity
@@ -153,7 +153,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD
TQWhatsThis::add( d->appcombo, qwtstr );
d->appcombo->insertStrList((const char**)packages);
connect(d->appcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(appChanged(int)));
- d->appname = TQString::tqfromLatin1( m_aboutData
+ d->appname = TQString::fromLatin1( m_aboutData
? m_aboutData->productName()
: tqApp->name() );
glay->addWidget( d->appcombo, row, 1 );
@@ -179,8 +179,8 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD
m_strVersion = m_aboutData->version();
else
m_strVersion = i18n("no version set (programmer error!)");
- d->kde_version = TQString::tqfromLatin1( TDE_VERSION_STRING );
- d->kde_version += ", " + TQString::tqfromLatin1( KDE_DISTRIBUTION_TEXT );
+ d->kde_version = TQString::fromLatin1( TDE_VERSION_STRING );
+ d->kde_version += ", " + TQString::fromLatin1( KDE_DISTRIBUTION_TEXT );
if ( !d->submitBugButton )
m_strVersion += " " + d->kde_version;
m_version = new TQLabel( m_strVersion, parent );
@@ -193,16 +193,16 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD
struct utsname unameBuf;
uname( &unameBuf );
- d->os = TQString::tqfromLatin1( unameBuf.sysname ) +
- " (" + TQString::tqfromLatin1( unameBuf.machine ) + ") "
- "release " + TQString::tqfromLatin1( unameBuf.release );
+ d->os = TQString::fromLatin1( unameBuf.sysname ) +
+ " (" + TQString::fromLatin1( unameBuf.machine ) + ") "
+ "release " + TQString::fromLatin1( unameBuf.release );
tmpLabel = new TQLabel(d->os, parent);
glay->addMultiCellWidget( tmpLabel, row, row, 1, 2 );
tmpLabel = new TQLabel(i18n("Compiler:"), parent);
glay->addWidget( tmpLabel, ++row, 0 );
- tmpLabel = new TQLabel(TQString::tqfromLatin1(KDE_COMPILER_VERSION), parent);
+ tmpLabel = new TQLabel(TQString::fromLatin1(KDE_COMPILER_VERSION), parent);
glay->addMultiCellWidget( tmpLabel, row, row, 1, 2 );
if ( !d->submitBugButton )
@@ -311,7 +311,7 @@ void KBugReport::slotConfigureEmail()
{
if (m_process) return;
m_process = new KProcess;
- *m_process << TQString::tqfromLatin1("kcmshell") << TQString::tqfromLatin1("kcm_useraccount");
+ *m_process << TQString::fromLatin1("kcmshell") << TQString::fromLatin1("kcm_useraccount");
connect(m_process, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(slotSetFrom()));
if (!m_process->start())
{
@@ -330,24 +330,24 @@ void KBugReport::slotSetFrom()
m_configureEmail->setEnabled(true);
// ### KDE4: why oh why is KEmailSettings in kio?
- KConfig emailConf( TQString::tqfromLatin1("emaildefaults") );
+ KConfig emailConf( TQString::fromLatin1("emaildefaults") );
// find out the default profile
- emailConf.setGroup( TQString::tqfromLatin1("Defaults") );
- TQString profile = TQString::tqfromLatin1("PROFILE_");
- profile += emailConf.readEntry( TQString::tqfromLatin1("Profile"),
- TQString::tqfromLatin1("Default") );
+ emailConf.setGroup( TQString::fromLatin1("Defaults") );
+ TQString profile = TQString::fromLatin1("PROFILE_");
+ profile += emailConf.readEntry( TQString::fromLatin1("Profile"),
+ TQString::fromLatin1("Default") );
emailConf.setGroup( profile );
- TQString fromaddr = emailConf.readEntry( TQString::tqfromLatin1("EmailAddress") );
+ TQString fromaddr = emailConf.readEntry( TQString::fromLatin1("EmailAddress") );
if (fromaddr.isEmpty()) {
struct passwd *p;
p = getpwuid(getuid());
- fromaddr = TQString::tqfromLatin1(p->pw_name);
+ fromaddr = TQString::fromLatin1(p->pw_name);
} else {
- TQString name = emailConf.readEntry( TQString::tqfromLatin1("FullName"));
+ TQString name = emailConf.readEntry( TQString::fromLatin1("FullName"));
if (!name.isEmpty())
- fromaddr = name + TQString::tqfromLatin1(" <") + fromaddr + TQString::tqfromLatin1(">");
+ fromaddr = name + TQString::fromLatin1(" <") + fromaddr + TQString::fromLatin1(">");
}
m_from->setText( fromaddr );
}
@@ -438,9 +438,9 @@ TQString KBugReport::text() const
{
kdDebug() << m_bgSeverity->selected()->name() << endl;
// Prepend the pseudo-headers to the contents of the mail
- TQString severity = TQString::tqfromLatin1(m_bgSeverity->selected()->name());
+ TQString severity = TQString::fromLatin1(m_bgSeverity->selected()->name());
TQString appname = d->appcombo->currentText();
- TQString os = TQString::tqfromLatin1("OS: %1 (%2)\n").
+ TQString os = TQString::fromLatin1("OS: %1 (%2)\n").
arg(KDE_COMPILING_OS).
arg(KDE_DISTRIBUTION_TEXT);
TQString bodyText;
@@ -452,25 +452,25 @@ TQString KBugReport::text() const
bodyText += line;
}
- if (severity == TQString::tqfromLatin1("i18n") && KGlobal::locale()->language() != KLocale::defaultLanguage()) {
+ if (severity == TQString::fromLatin1("i18n") && KGlobal::locale()->language() != KLocale::defaultLanguage()) {
// Case 1 : i18n bug
- TQString package = TQString::tqfromLatin1("i18n_%1").arg(KGlobal::locale()->language());
- package = package.replace(TQString::tqfromLatin1("_"), TQString::tqfromLatin1("-"));
- return TQString::tqfromLatin1("Package: %1").arg(package) +
- TQString::tqfromLatin1("\n"
+ TQString package = TQString::fromLatin1("i18n_%1").arg(KGlobal::locale()->language());
+ package = package.replace(TQString::fromLatin1("_"), TQString::fromLatin1("-"));
+ return TQString::fromLatin1("Package: %1").arg(package) +
+ TQString::fromLatin1("\n"
"Application: %1\n"
// not really i18n's version, so better here IMHO
"Version: %2\n").arg(appname).arg(m_strVersion)+
- os+TQString::tqfromLatin1("\n")+bodyText;
+ os+TQString::fromLatin1("\n")+bodyText;
} else {
- appname = appname.replace(TQString::tqfromLatin1("_"), TQString::tqfromLatin1("-"));
+ appname = appname.replace(TQString::fromLatin1("_"), TQString::fromLatin1("-"));
// Case 2 : normal bug
- return TQString::tqfromLatin1("Package: %1\n"
+ return TQString::fromLatin1("Package: %1\n"
"Version: %2\n"
"Severity: %3\n")
.arg(appname).arg(m_strVersion).arg(severity)+
- TQString::tqfromLatin1("Compiler: %1\n").arg(KDE_COMPILER_VERSION)+
- os+TQString::tqfromLatin1("\n")+bodyText;
+ TQString::fromLatin1("Compiler: %1\n").arg(KDE_COMPILER_VERSION)+
+ os+TQString::fromLatin1("\n")+bodyText;
}
}
@@ -478,12 +478,12 @@ bool KBugReport::sendBugReport()
{
TQString recipient ( m_aboutData ?
m_aboutData->bugAddress() :
- TQString::tqfromLatin1("submit@bugs.pearsoncomputing.net") );
+ TQString::fromLatin1("submit@bugs.pearsoncomputing.net") );
TQString command;
command = locate("exe", "ksendbugmail");
if (command.isEmpty())
- command = KStandardDirs::findExe( TQString::tqfromLatin1("ksendbugmail") );
+ command = KStandardDirs::findExe( TQString::fromLatin1("ksendbugmail") );
KTempFile outputfile;
outputfile.close();
diff --git a/tdeui/kbuttonbox.cpp b/tdeui/kbuttonbox.cpp
index 11a8e2818..6351c512d 100644
--- a/tdeui/kbuttonbox.cpp
+++ b/tdeui/kbuttonbox.cpp
@@ -356,7 +356,7 @@ TQSizePolicy KButtonBox::sizePolicy() const
*/
TQSize KButtonBox::buttonSizeHint(TQPushButton *b) const {
TQSize s = b->sizeHint();
- const TQSize ms = b->tqminimumSize();
+ const TQSize ms = b->minimumSize();
if(s.width() < minButtonWidth)
s.setWidth(minButtonWidth);
diff --git a/tdeui/kcharselect.cpp b/tdeui/kcharselect.cpp
index 3a5ababce..8ac6801a8 100644
--- a/tdeui/kcharselect.cpp
+++ b/tdeui/kcharselect.cpp
@@ -21,7 +21,7 @@
#include "kcharselect.h"
#include "kcharselect.moc"
-#include <tqbrush.h>
+#include <brush.h>
#include <tqcolor.h>
#include <tqevent.h>
#include <tqfont.h>
@@ -45,7 +45,7 @@
class KCharSelect::KCharSelectPrivate
{
public:
- TQLineEdit *tqunicodeLine;
+ TQLineEdit *unicodeLine;
};
TQFontDatabase * KCharSelect::fontDataBase = 0;
@@ -66,7 +66,7 @@ KCharSelectTable::KCharSelectTable( TQWidget *parent, const char *name, const TQ
: TQGridView( parent, name ), vFont( _font ), vChr( _chr ),
vTableNum( _tableNum ), vPos( 0, 0 ), focusItem( _chr ), focusPos( 0, 0 ), d(0)
{
- setBackgroundColor( tqcolorGroup().base() );
+ setBackgroundColor( colorGroup().base() );
setCellWidth( 20 );
setCellHeight( 25 );
@@ -155,26 +155,26 @@ void KCharSelectTable::paintCell( class TQPainter* p, int row, int col )
c += row * numCols();
c += col;
- if ( c == vChr.tqunicode() ) {
- p->setBrush( TQBrush( tqcolorGroup().highlight() ) );
+ if ( c == vChr.unicode() ) {
+ p->setBrush( TQBrush( colorGroup().highlight() ) );
p->setPen( NoPen );
p->drawRect( 0, 0, w, h );
- p->setPen( tqcolorGroup().highlightedText() );
+ p->setPen( colorGroup().highlightedText() );
vPos = TQPoint( col, row );
} else {
TQFontMetrics fm = TQFontMetrics( font );
if( fm.inFont( c ) )
- p->setBrush( TQBrush( tqcolorGroup().base() ) );
+ p->setBrush( TQBrush( colorGroup().base() ) );
else
- p->setBrush( TQBrush( tqcolorGroup().button() ) );
+ p->setBrush( TQBrush( colorGroup().button() ) );
p->setPen( NoPen );
p->drawRect( 0, 0, w, h );
- p->setPen( tqcolorGroup().text() );
+ p->setPen( colorGroup().text() );
}
- if ( c == focusItem.tqunicode() && hasFocus() ) {
+ if ( c == focusItem.unicode() && hasFocus() ) {
tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, TQRect( 2, 2, w - 4, h - 4 ),
- tqcolorGroup() );
+ colorGroup() );
focusPos = TQPoint( col, row );
}
@@ -182,7 +182,7 @@ void KCharSelectTable::paintCell( class TQPainter* p, int row, int col )
p->drawText( 0, 0, x2, y2, AlignHCenter | AlignVCenter, TQString( TQChar( c ) ) );
- p->setPen( tqcolorGroup().text() );
+ p->setPen( colorGroup().text() );
p->drawLine( x2, 0, x2, y2 );
p->drawLine( 0, y2, x2, y2 );
@@ -409,13 +409,13 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f
const TQRegExp rx( "[a-fA-F0-9]{1,4}" );
TQValidator* const validator = new TQRegExpValidator( rx, TQT_TQOBJECT(this) );
- d->tqunicodeLine = new KLineEdit( bar );
- d->tqunicodeLine->setValidator(validator);
- lUnicode->setBuddy(d->tqunicodeLine);
- d->tqunicodeLine->resize( d->tqunicodeLine->sizeHint() );
+ d->unicodeLine = new KLineEdit( bar );
+ d->unicodeLine->setValidator(validator);
+ lUnicode->setBuddy(d->unicodeLine);
+ d->unicodeLine->resize( d->unicodeLine->sizeHint() );
slotUpdateUnicode(_chr);
- connect( d->tqunicodeLine, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotUnicodeEntered() ) );
+ connect( d->unicodeLine, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotUnicodeEntered() ) );
charTable = new KCharSelectTable( this, name, _font.isEmpty() ? TQString(TQVBox::font().family()) : _font, _chr, _tableNum );
const TQSize sz( charTable->contentsWidth() + 4 ,
@@ -493,7 +493,7 @@ void KCharSelect::fillFontCombo()
fontDataBase = new TQFontDatabase();
qAddPostRoutine( cleanupFontDatabase );
}
- fontList=fontDataBase->tqfamilies();
+ fontList=fontDataBase->families();
fontCombo->insertStringList( fontList );
}
@@ -513,7 +513,7 @@ void KCharSelect::tableChanged( int _value )
//==================================================================
void KCharSelect::slotUnicodeEntered( )
{
- const TQString s = d->tqunicodeLine->text();
+ const TQString s = d->unicodeLine->text();
if (s.isEmpty())
return;
@@ -532,10 +532,10 @@ void KCharSelect::slotUnicodeEntered( )
void KCharSelect::slotUpdateUnicode( const TQChar &c )
{
- const int uc = c.tqunicode();
+ const int uc = c.unicode();
TQString s;
s.sprintf("%04X", uc);
- d->tqunicodeLine->setText(s);
+ d->unicodeLine->setText(s);
}
void KCharSelectTable::virtual_hook( int, void*)
diff --git a/tdeui/kcmenumngr.cpp b/tdeui/kcmenumngr.cpp
index d985c8e91..640b9c7ac 100644
--- a/tdeui/kcmenumngr.cpp
+++ b/tdeui/kcmenumngr.cpp
@@ -35,10 +35,10 @@ KContextMenuManager* KContextMenuManager::manager = 0;
KContextMenuManager::KContextMenuManager( TQObject* parent, const char* name )
: TQObject( parent, name)
{
- KConfigGroupSaver saver ( KGlobal::config(), TQString::tqfromLatin1("Shortcuts") ) ;
- menuKey = KShortcut( saver.config()->readEntry(TQString::tqfromLatin1("PopupContextMenu"), TQString::tqfromLatin1("Menu") ) ).keyCodeQt();
- saver.config()->setGroup( TQString::tqfromLatin1("ContextMenus") ) ;
- showOnPress = saver.config()->readBoolEntry(TQString::tqfromLatin1("ShowOnPress"), true );
+ KConfigGroupSaver saver ( KGlobal::config(), TQString::fromLatin1("Shortcuts") ) ;
+ menuKey = KShortcut( saver.config()->readEntry(TQString::fromLatin1("PopupContextMenu"), TQString::fromLatin1("Menu") ) ).keyCodeQt();
+ saver.config()->setGroup( TQString::fromLatin1("ContextMenus") ) ;
+ showOnPress = saver.config()->readBoolEntry(TQString::fromLatin1("ShowOnPress"), true );
}
KContextMenuManager::~KContextMenuManager()
diff --git a/tdeui/kcmodule.cpp b/tdeui/kcmodule.cpp
index 7d82d2957..9d2197362 100644
--- a/tdeui/kcmodule.cpp
+++ b/tdeui/kcmodule.cpp
@@ -21,7 +21,7 @@
*/
-#include <tqlayout.h>
+#include <layout.h>
#include <kaboutdata.h>
#include <kconfigskeleton.h>
diff --git a/tdeui/kcolorbutton.cpp b/tdeui/kcolorbutton.cpp
index 34227a8fb..e18885254 100644
--- a/tdeui/kcolorbutton.cpp
+++ b/tdeui/kcolorbutton.cpp
@@ -23,7 +23,7 @@
#include <tqpainter.h>
#include <tqdrawutil.h>
#include <tqapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqstyle.h>
#include <kglobalsettings.h>
#include <kstdaccel.h>
@@ -85,7 +85,7 @@ void KColorButton::setColor( const TQColor &c )
{
if ( col != c ) {
col = c;
- tqrepaint( false );
+ repaint( false );
emit changed( col );
}
}
@@ -108,25 +108,25 @@ void KColorButton::drawButtonLabel( TQPainter *painter )
TQRect r = tqstyle().subRect( TQStyle::SR_PushButtonContents, this );
r.rect(&x, &y, &w, &h);
- int margin = tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin, this );
+ int margin = tqstyle().pixelMetric( TQStyle::PM_ButtonMargin, this );
x += margin;
y += margin;
w -= 2*margin;
h -= 2*margin;
if (isOn() || isDown()) {
- x += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
- y += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical, this );
+ x += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
+ y += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical, this );
}
TQColor fillCol = isEnabled() ? col : backgroundColor();
- qDrawShadePanel( painter, x, y, w, h, tqcolorGroup(), true, 1, NULL);
+ qDrawShadePanel( painter, x, y, w, h, colorGroup(), true, 1, NULL);
if ( fillCol.isValid() )
painter->fillRect( x+1, y+1, w-2, h-2, fillCol );
if ( hasFocus() ) {
TQRect focusRect = tqstyle().subRect( TQStyle::SR_PushButtonFocusRect, this );
- tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, tqcolorGroup() );
+ tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() );
}
}
@@ -155,11 +155,11 @@ void KColorButton::keyPressEvent( TQKeyEvent *e )
if ( KStdAccel::copy().contains( key ) ) {
TQMimeSource* mime = new KColorDrag( color() );
- TQApplication::tqclipboard()->setData( mime, TQClipboard::Clipboard );
+ TQApplication::clipboard()->setData( mime, TQClipboard::Clipboard );
}
else if ( KStdAccel::paste().contains( key ) ) {
TQColor color;
- KColorDrag::decode( TQApplication::tqclipboard()->data( TQClipboard::Clipboard ), color );
+ KColorDrag::decode( TQApplication::clipboard()->data( TQClipboard::Clipboard ), color );
setColor( color );
}
else
diff --git a/tdeui/kcolorcombo.cpp b/tdeui/kcolorcombo.cpp
index a7dd90ac7..2a8ee6f98 100644
--- a/tdeui/kcolorcombo.cpp
+++ b/tdeui/kcolorcombo.cpp
@@ -37,7 +37,7 @@
#include <tqfile.h>
#include <tqimage.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqvalidator.h>
#include <tqpainter.h>
diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp
index a7a8540ce..eb0dbf540 100644
--- a/tdeui/kcolordialog.cpp
+++ b/tdeui/kcolordialog.cpp
@@ -38,7 +38,7 @@
#include <tqfile.h>
#include <tqimage.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqvalidator.h>
#include <tqpainter.h>
#include <tqpushbutton.h>
@@ -376,7 +376,7 @@ void KColorCells::paintCell( TQPainter *painter, int row, int col )
if (shade)
{
qDrawShadePanel( painter, 1, 1, cellWidth()-2,
- cellHeight()-2, tqcolorGroup(), true, 1, &brush );
+ cellHeight()-2, colorGroup(), true, 1, &brush );
w = 2;
}
TQColor color = colors[ row * numCols() + col ];
@@ -1143,7 +1143,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
d->htmlName = new KLineEdit( page );
d->htmlName->setMaxLength( 13 ); // Qt's TQColor allows 12 hexa-digits
d->htmlName->setText("#FFFFFF"); // But HTML uses only 6, so do not worry about the size
- w = d->htmlName->fontMetrics().width(TQString::tqfromLatin1("#DDDDDDD"));
+ w = d->htmlName->fontMetrics().width(TQString::fromLatin1("#DDDDDDD"));
d->htmlName->setFixedWidth(w);
l_grid->addWidget(TQT_TQWIDGET(d->htmlName), 1, 2, Qt::AlignLeft);
@@ -1479,7 +1479,7 @@ void KColorDialog::showColor( const KColor &color, const TQString &name )
d->valuePal->setValue( v );
d->valuePal->updateContents();
d->valuePal->blockSignals(false);
- d->valuePal->tqrepaint( false );
+ d->valuePal->repaint( false );
d->bRecursion = false;
}
diff --git a/tdeui/kcolordrag.cpp b/tdeui/kcolordrag.cpp
index 3beed82ca..be1e93aec 100644
--- a/tdeui/kcolordrag.cpp
+++ b/tdeui/kcolordrag.cpp
@@ -92,7 +92,7 @@ KColorDrag::decode( TQMimeSource *e, TQColor &color)
return true;
TQByteArray data = e->encodedData( text_mime_string);
- TQString colorName = TQString::tqfromLatin1(data.data(), data.size());
+ TQString colorName = TQString::fromLatin1(data.data(), data.size());
if ((colorName.length() < 4) || (colorName[0] != '#'))
return false;
color.setNamedColor(colorName);
diff --git a/tdeui/kcombobox.cpp b/tdeui/kcombobox.cpp
index df84d0032..39af5164d 100644
--- a/tdeui/kcombobox.cpp
+++ b/tdeui/kcombobox.cpp
@@ -20,7 +20,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqlistbox.h>
#include <tqpopupmenu.h>
#include <tqapplication.h>
diff --git a/tdeui/kcombobox.h b/tdeui/kcombobox.h
index 93ae6535e..12d6d065b 100644
--- a/tdeui/kcombobox.h
+++ b/tdeui/kcombobox.h
@@ -26,7 +26,7 @@
#include <tqcombobox.h>
#include <tqvbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtoolbutton.h>
#include <tqheader.h>
diff --git a/tdeui/kcompletionbox.cpp b/tdeui/kcompletionbox.cpp
index 988c1f1cc..069a1733f 100644
--- a/tdeui/kcompletionbox.cpp
+++ b/tdeui/kcompletionbox.cpp
@@ -485,7 +485,7 @@ void KCompletionBox::setItems( const TQStringList& items )
}
else {
//Keep track of whether we need to change anything,
- //so we can avoid a tqrepaint for identical updates,
+ //so we can avoid a repaint for identical updates,
//to reduce flicker
bool dirty = false;
diff --git a/tdeui/kconfigdialog.cpp b/tdeui/kconfigdialog.cpp
index ccbba1cf0..54a152b5b 100644
--- a/tdeui/kconfigdialog.cpp
+++ b/tdeui/kconfigdialog.cpp
@@ -27,7 +27,7 @@
#include <kiconloader.h>
#include <kdebug.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqvbox.h>
#include <tqmap.h>
diff --git a/tdeui/kcursor.cpp b/tdeui/kcursor.cpp
index 5907c4ba0..094e581be 100644
--- a/tdeui/kcursor.cpp
+++ b/tdeui/kcursor.cpp
@@ -370,9 +370,9 @@ KCursorPrivate::KCursorPrivate()
hideCursorDelay = 5000; // 5s default value
KConfig *kc = KGlobal::config();
- KConfigGroupSaver ks( kc, TQString::tqfromLatin1("KDE") );
+ KConfigGroupSaver ks( kc, TQString::fromLatin1("KDE") );
enabled = kc->readBoolEntry(
- TQString::tqfromLatin1("Autohiding cursor enabled"), true );
+ TQString::fromLatin1("Autohiding cursor enabled"), true );
}
KCursorPrivate::~KCursorPrivate()
diff --git a/tdeui/kcursor.h b/tdeui/kcursor.h
index 7be14601b..538cdcd72 100644
--- a/tdeui/kcursor.h
+++ b/tdeui/kcursor.h
@@ -33,7 +33,7 @@ class TQWidget;
*
* A wrapper around TQCursor that allows for "themed" cursors.
*
- * Currently, the only themed cursor is a hand tqshaped cursor.
+ * Currently, the only themed cursor is a hand shaped cursor.
*
* A typical usage would be
* \code
diff --git a/tdeui/kdatepicker.cpp b/tdeui/kdatepicker.cpp
index 77ff907d7..224587c4d 100644
--- a/tdeui/kdatepicker.cpp
+++ b/tdeui/kdatepicker.cpp
@@ -18,7 +18,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqframe.h>
#include <tqpainter.h>
#include <tqdialog.h>
@@ -175,17 +175,17 @@ void KDatePicker::init( const TQDate &dt )
line->installEventFilter( this );
if ( TQApplication::reverseLayout() )
{
- yearForward->setIconSet(BarIconSet(TQString::tqfromLatin1("2leftarrow")));
- yearBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("2rightarrow")));
- monthForward->setIconSet(BarIconSet(TQString::tqfromLatin1("1leftarrow")));
- monthBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("1rightarrow")));
+ yearForward->setIconSet(BarIconSet(TQString::fromLatin1("2leftarrow")));
+ yearBackward->setIconSet(BarIconSet(TQString::fromLatin1("2rightarrow")));
+ monthForward->setIconSet(BarIconSet(TQString::fromLatin1("1leftarrow")));
+ monthBackward->setIconSet(BarIconSet(TQString::fromLatin1("1rightarrow")));
}
else
{
- yearForward->setIconSet(BarIconSet(TQString::tqfromLatin1("2rightarrow")));
- yearBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("2leftarrow")));
- monthForward->setIconSet(BarIconSet(TQString::tqfromLatin1("1rightarrow")));
- monthBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("1leftarrow")));
+ yearForward->setIconSet(BarIconSet(TQString::fromLatin1("2rightarrow")));
+ yearBackward->setIconSet(BarIconSet(TQString::fromLatin1("2leftarrow")));
+ monthForward->setIconSet(BarIconSet(TQString::fromLatin1("1rightarrow")));
+ monthBackward->setIconSet(BarIconSet(TQString::fromLatin1("1leftarrow")));
}
connect(table, TQT_SIGNAL(dateChanged(TQDate)), TQT_SLOT(dateChangedSlot(TQDate)));
connect(table, TQT_SIGNAL(tableClicked()), TQT_SLOT(tableClickedSlot()));
@@ -529,7 +529,7 @@ KDatePicker::setCloseButton( bool enable )
TQToolTip::add(d->closeButton, i18n("Close"));
d->closeButton->setPixmap( SmallIcon("remove") );
connect( d->closeButton, TQT_SIGNAL( clicked() ),
- tqtopLevelWidget(), TQT_SLOT( close() ) );
+ topLevelWidget(), TQT_SLOT( close() ) );
}
else {
delete d->closeButton;
diff --git a/tdeui/kdatepicker.h b/tdeui/kdatepicker.h
index 381095c49..f1a5fd9a6 100644
--- a/tdeui/kdatepicker.h
+++ b/tdeui/kdatepicker.h
@@ -136,7 +136,7 @@ public:
/**
* By calling this method with @p enable = true, KDatePicker will show
* a little close-button in the upper button-row. Clicking the
- * close-button will cause the KDatePicker's tqtopLevelWidget()'s close()
+ * close-button will cause the KDatePicker's topLevelWidget()'s close()
* method being called. This is mostly useful for toplevel datepickers
* without a window manager decoration.
* @see hasCloseButton
diff --git a/tdeui/kdatetbl.cpp b/tdeui/kdatetbl.cpp
index e139ffd90..9387a6322 100644
--- a/tdeui/kdatetbl.cpp
+++ b/tdeui/kdatetbl.cpp
@@ -233,7 +233,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col)
( daynum == 6 && calendar->calendarName() == "gregorian" ) )
normalday=false;
- TQBrush brushInvertTitle(tqcolorGroup().base());
+ TQBrush brushInvertTitle(colorGroup().base());
TQColor titleColor(isEnabled()?( KGlobalSettings::activeTitleColor() ):( KGlobalSettings::inactiveTitleColor() ) );
TQColor textColor(isEnabled()?( KGlobalSettings::activeTextColor() ):( KGlobalSettings::inactiveTextColor() ) );
if (!normalday)
@@ -250,7 +250,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col)
}
painter->drawText(0, 0, w, h-1, AlignCenter,
calendar->weekDayName(daynum, true), -1, &rect);
- painter->setPen(tqcolorGroup().text());
+ painter->setPen(colorGroup().text());
painter->moveTo(0, h-1);
painter->lineTo(w-1, h-1);
// ----- draw the weekday:
@@ -267,7 +267,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col)
// ° painting a day of the previous month or
// ° painting a day of the following month
// TODO: don't hardcode gray here! Use a color with less contrast to the background than normal text.
- painter->setPen( tqcolorGroup().mid() );
+ painter->setPen( colorGroup().mid() );
// painter->setPen(gray);
} else { // paint a day of the current month
if ( d->useCustomColors )
@@ -292,9 +292,9 @@ KDateTable::paintCell(TQPainter *painter, int row, int col)
}
painter->setPen( mode->fgColor );
} else
- painter->setPen(tqcolorGroup().text());
+ painter->setPen(colorGroup().text());
} else //if ( firstWeekDay < 4 ) // <- this doesn' make sense at all!
- painter->setPen(tqcolorGroup().text());
+ painter->setPen(colorGroup().text());
}
pen=painter->pen();
@@ -308,25 +308,25 @@ KDateTable::paintCell(TQPainter *painter, int row, int col)
// draw the currently selected date
if (isEnabled())
{
- painter->setPen(tqcolorGroup().highlight());
- painter->setBrush(tqcolorGroup().highlight());
+ painter->setPen(colorGroup().highlight());
+ painter->setBrush(colorGroup().highlight());
}
else
{
- painter->setPen(tqcolorGroup().text());
- painter->setBrush(tqcolorGroup().text());
+ painter->setPen(colorGroup().text());
+ painter->setBrush(colorGroup().text());
}
- pen=TQPen(tqcolorGroup().highlightedText());
+ pen=TQPen(colorGroup().highlightedText());
} else {
painter->setBrush(paletteBackgroundColor());
painter->setPen(paletteBackgroundColor());
-// painter->setBrush(tqcolorGroup().base());
-// painter->setPen(tqcolorGroup().base());
+// painter->setBrush(colorGroup().base());
+// painter->setPen(colorGroup().base());
}
if ( pCellDate == TQDate::currentDate() )
{
- painter->setPen(tqcolorGroup().text());
+ painter->setPen(colorGroup().text());
}
if ( paintRect ) painter->drawRect(0, 0, w, h);
@@ -439,7 +439,7 @@ KDateTable::setFontSize(int size)
maxCell.setHeight(QMAX(maxCell.height(), rect.height()));
}
// ----- compare with a real wide number and add some space:
- rect=metrics.boundingRect(TQString::tqfromLatin1("88"));
+ rect=metrics.boundingRect(TQString::fromLatin1("88"));
maxCell.setWidth(QMAX(maxCell.width()+2, rect.width()));
maxCell.setHeight(QMAX(maxCell.height()+4, rect.height()));
}
@@ -815,7 +815,7 @@ KDateInternalMonthPicker::contentsMouseMoveEvent(TQMouseEvent *e)
updateCell( row, col /*, false */ ); // mark the new active cell
}
}
- if ( tmpRow > -1 ) // tqrepaint the former active cell
+ if ( tmpRow > -1 ) // repaint the former active cell
updateCell( tmpRow, tmpCol /*, true */ );
}
}
@@ -1006,7 +1006,7 @@ int
KPopupFrame::exec(TQPoint pos)
{
popup(pos);
- tqrepaint();
+ repaint();
d->exec = true;
const TQGuardedPtr<TQObject> that = TQT_TQOBJECT(this);
tqApp->enter_loop();
diff --git a/tdeui/kdatetimewidget.cpp b/tdeui/kdatetimewidget.cpp
index d7b677af9..5db18cab2 100644
--- a/tdeui/kdatetimewidget.cpp
+++ b/tdeui/kdatetimewidget.cpp
@@ -1,4 +1,4 @@
-#include <tqlayout.h>
+#include <layout.h>
#include "kdatewidget.h"
#include "kdebug.h"
diff --git a/tdeui/kdatewidget.cpp b/tdeui/kdatewidget.cpp
index ba46a599b..0c11890dc 100644
--- a/tdeui/kdatewidget.cpp
+++ b/tdeui/kdatewidget.cpp
@@ -19,7 +19,7 @@
#include <tqpopupmenu.h>
#include <tqcombobox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include "knuminput.h"
diff --git a/tdeui/kdialog.cpp b/tdeui/kdialog.cpp
index 959de3cc1..bcea71e49 100644
--- a/tdeui/kdialog.cpp
+++ b/tdeui/kdialog.cpp
@@ -28,7 +28,7 @@
#include <kglobalsettings.h>
#include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqobjectlist.h>
#include <tqguardedptr.h>
#include <tqlineedit.h>
@@ -405,7 +405,7 @@ KSMModalDialog::KSMModalDialog(TQWidget* parent)
TQFrame* frame = new TQFrame( this );
frame->setFrameStyle( TQFrame::NoFrame );
- frame->setLineWidth( tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, frame ) );
+ frame->setLineWidth( tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, frame ) );
// we need to set the minimum size for the window
frame->setMinimumWidth(400);
vbox->addWidget( frame );
diff --git a/tdeui/kdialogbase.cpp b/tdeui/kdialogbase.cpp
index 93d1cb58e..a757d02a3 100644
--- a/tdeui/kdialogbase.cpp
+++ b/tdeui/kdialogbase.cpp
@@ -26,7 +26,7 @@
#include <tqgrid.h>
#include <tqhbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqvbox.h>
#include <tqwhatsthis.h>
@@ -454,7 +454,7 @@ TQSize KDialogBase::minimumSizeHint() const
//
if( mUrlHelp )
{
- s2 = mUrlHelp->tqminimumSize() + zeroByS;
+ s2 = mUrlHelp->minimumSize() + zeroByS;
}
s1.rwidth() = QMAX( s1.rwidth(), s2.rwidth() );
s1.rheight() += s2.rheight();
@@ -469,7 +469,7 @@ TQSize KDialogBase::minimumSizeHint() const
else if( mMainWidget )
{
s2 = mMainWidget->sizeHint() + zeroByS;
- s2 = s2.expandedTo( mMainWidget->tqminimumSize() );
+ s2 = s2.expandedTo( mMainWidget->minimumSize() );
s2 = s2.expandedTo( mMainWidget->minimumSizeHint() );
if( s2.isEmpty() )
{
@@ -486,7 +486,7 @@ TQSize KDialogBase::minimumSizeHint() const
if (d->detailsWidget && d->bDetails)
{
s2 = d->detailsWidget->sizeHint() + zeroByS;
- s2 = s2.expandedTo( d->detailsWidget->tqminimumSize() );
+ s2 = s2.expandedTo( d->detailsWidget->minimumSize() );
s2 = s2.expandedTo( d->detailsWidget->minimumSizeHint() );
s1.rwidth() = QMAX( s1.rwidth(), s2.rwidth() );
s1.rheight() += s2.rheight();
@@ -497,7 +497,7 @@ TQSize KDialogBase::minimumSizeHint() const
//
if( mActionSep )
{
- s1.rheight() += mActionSep->tqminimumSize().height() + s;
+ s1.rheight() += mActionSep->minimumSize().height() + s;
}
//
@@ -505,7 +505,7 @@ TQSize KDialogBase::minimumSizeHint() const
//
if( d->mButton.box )
{
- s2 = d->mButton.box->tqminimumSize();
+ s2 = d->mButton.box->minimumSize();
if( mButtonOrientation == Qt::Horizontal )
{
s1.rwidth() = QMAX( s1.rwidth(), s2.rwidth() );
@@ -1492,10 +1492,10 @@ TQRect KDialogBase::getContentsRect() const
r.setLeft( marginHint() );
r.setTop( marginHint() + (mUrlHelp ? mUrlHelp->height() : 0) );
r.setRight( width() - marginHint() );
- int h = (!mActionSep ? 0 : mActionSep->tqminimumSize().height()+marginHint());
+ int h = (!mActionSep ? 0 : mActionSep->minimumSize().height()+marginHint());
if( d->mButton.box )
{
- r.setBottom( height() - d->mButton.box->tqminimumSize().height() - h );
+ r.setBottom( height() - d->mButton.box->minimumSize().height() - h );
}
else
{
@@ -1513,14 +1513,14 @@ void KDialogBase::getBorderWidths(int& ulx, int& uly, int& lrx, int& lry) const
uly = marginHint();
if( mUrlHelp )
{
- uly += mUrlHelp->tqminimumSize().height();
+ uly += mUrlHelp->minimumSize().height();
}
lrx = marginHint();
- lry = d->mButton.box ? d->mButton.box->tqminimumSize().height() : 0;
+ lry = d->mButton.box ? d->mButton.box->minimumSize().height() : 0;
if( mActionSep )
{
- lry += mActionSep->tqminimumSize().height() + marginHint();
+ lry += mActionSep->minimumSize().height() + marginHint();
}
}
@@ -1755,8 +1755,8 @@ TQSize KDialogBase::configDialogSize( KConfig& config,
h = sizeHint().height();
KConfigGroupSaver cs(&config, groupName);
- w = config.readNumEntry( TQString::tqfromLatin1("Width %1").arg( desk.width()), w );
- h = config.readNumEntry( TQString::tqfromLatin1("Height %1").arg( desk.height()), h );
+ w = config.readNumEntry( TQString::fromLatin1("Width %1").arg( desk.width()), w );
+ h = config.readNumEntry( TQString::fromLatin1("Height %1").arg( desk.height()), h );
return TQSize( w, h );
}
@@ -1777,9 +1777,9 @@ void KDialogBase::saveDialogSize( KConfig& config, const TQString& groupName,
KConfigGroupSaver cs(&config, groupName);
TQSize sizeToSave = size();
- config.writeEntry( TQString::tqfromLatin1("Width %1").arg( desk.width()),
+ config.writeEntry( TQString::fromLatin1("Width %1").arg( desk.width()),
TQString::number( sizeToSave.width()), true, global);
- config.writeEntry( TQString::tqfromLatin1("Height %1").arg( desk.height()),
+ config.writeEntry( TQString::fromLatin1("Height %1").arg( desk.height()),
TQString::number( sizeToSave.height()), true, global);
}
diff --git a/tdeui/kdialogbase.h b/tdeui/kdialogbase.h
index d89b8c67e..f0da150b6 100644
--- a/tdeui/kdialogbase.h
+++ b/tdeui/kdialogbase.h
@@ -100,7 +100,7 @@ class KDialogBaseTile;
* signals that are related to the standard action buttons will be used
* when you don't use these buttons.
*
- * <b>Dialog tqshapes:</b>\n
+ * <b>Dialog shapes:</b>\n
*
* You can either use one of the prebuilt, easy to use, faces or
* define your own main widget. The dialog provides ready to use
@@ -733,7 +733,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog
* Sets the page with @p index to be displayed.
*
* This method will only
- * work when the dialog is using the predefined tqshape of TreeList,
+ * work when the dialog is using the predefined shape of TreeList,
* IconList or Tabbed.
*
* @param index Index of the page to be shown.
@@ -745,7 +745,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog
* Returns the index of the active page.
*
* This method will only work when the dialog is using the
- * predefined tqshape of Tabbed, TreeList or IconList.
+ * predefined shape of Tabbed, TreeList or IconList.
*
* @return The page index or -1 if there is no active page.
*/
@@ -1167,7 +1167,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog
* set it as a minimum size for the resulting dialog.
*
* You should not need to use this method and never if you use one of
- * the predefined tqshapes.
+ * the predefined shapes.
*
* @param w The width of you special widget.
* @param h The height of you special widget.
diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp
index 005f76b4b..f1e4d44e7 100644
--- a/tdeui/kdockwidget.cpp
+++ b/tdeui/kdockwidget.cpp
@@ -22,7 +22,7 @@
#include "kdockwidget_p.h"
#include <tqapplication.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpainter.h>
#include <tqobjectlist.h>
#include <tqstrlist.h>
@@ -203,7 +203,7 @@ void KDockWidgetHeaderDrag::paintEvent( TQPaintEvent* )
paint.begin( this );
- tqstyle().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), tqcolorGroup());
+ tqstyle().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup());
paint.end();
}
@@ -266,7 +266,7 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name )
layout->addWidget( closeButton );
layout->activate();
d->dummy->hide();
- drag->setFixedHeight( layout->tqminimumSize().height() );
+ drag->setFixedHeight( layout->minimumSize().height() );
}
void KDockWidgetHeader::setTopLevel( bool isTopLevel )
@@ -343,7 +343,7 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd )
if (dontShowDummy) d->dummy->hide(); else d->dummy->show();
layout->addWidget( closeButton );
layout->activate();
- kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<<layout->tqminimumSize().height()<<endl;
+ kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<<layout->minimumSize().height()<<endl;
//FIXME somebody left this here, but we don't know what the hell it's for.
drag->setFixedHeight( closeButton->height()); // /*layout->minimumS*/sizeHint().height() );
}
@@ -378,7 +378,7 @@ void KDockWidgetHeader::addButton(KDockButton_Private* btn) {
if (dontShowDummy) d->dummy->hide(); else d->dummy->show();
layout->addWidget( closeButton );
layout->activate();
- drag->setFixedHeight( layout->tqminimumSize().height() );
+ drag->setFixedHeight( layout->minimumSize().height() );
}
void KDockWidgetHeader::removeButton(KDockButton_Private* btn) {
@@ -574,7 +574,7 @@ void KDockWidget::paintEvent(TQPaintEvent* pe)
TQWidget::paintEvent(pe);
TQPainter paint;
paint.begin( this );
- tqstyle().tqdrawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), tqcolorGroup());
+ tqstyle().tqdrawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup());
paint.end();
}
@@ -601,7 +601,7 @@ void KDockWidget::mousePressEvent(TQMouseEvent* mme)
int styleheight;
TQPoint mp;
mp=mme->pos();
- styleheight=2*tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth,this);
+ styleheight=2*tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth,this);
bbottom=mp.y()>=height()-styleheight;
btop=mp.y()<=styleheight;
bleft=mp.x()<=styleheight;
@@ -689,7 +689,7 @@ void KDockWidget::mouseMoveEvent(TQMouseEvent* mme)
int styleheight;
TQPoint mp;
mp=mme->pos();
- styleheight=2*tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth,this);
+ styleheight=2*tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth,this);
bbottom=mp.y()>=height()-styleheight;
btop=mp.y()<=styleheight;
bleft=mp.x()<=styleheight;
@@ -791,7 +791,7 @@ void KDockWidget::updateHeader()
header->setTopLevel( true );
header->show();
#ifdef BORDERLESS_WINDOWS
- layout->setMargin(2*tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth,this));
+ layout->setMargin(2*tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth,this));
setMouseTracking(true);
#endif
}
@@ -1497,7 +1497,7 @@ void KDockWidget::setDockTabName( KDockTabGroup* tab )
tab->parentWidget()->setName( listOfName.utf8() );
tab->parentWidget()->setCaption( listOfCaption );
- tab->parentWidget()->tqrepaint( false ); // KDockWidget->tqrepaint
+ tab->parentWidget()->repaint( false ); // KDockWidget->repaint
if ( tab->parentWidget()->parent() )
if ( tab->parentWidget()->parent()->inherits("KDockSplitter") )
((KDockSplitter*)(tab->parentWidget()->parent()))->updateName();
@@ -1570,7 +1570,7 @@ void KDockWidget::loseFormerBrotherDockWidget()
TQObject::disconnect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()),
this, TQT_SLOT(loseFormerBrotherDockWidget()) );
formerBrotherDockWidget = 0L;
- tqrepaint();
+ repaint();
}
void KDockWidget::dockBack()
@@ -1850,7 +1850,7 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos )
return 0L;
}
#if defined(_OS_WIN32_) || defined(Q_OS_WIN32)
- p = p->tqtopLevelWidget();
+ p = p->topLevelWidget();
#endif
TQWidget* w = 0L;
findChildDockWidget( w, p, p->mapFromGlobal(pos) );
@@ -1910,7 +1910,7 @@ void KDockManager::findChildDockWidget( TQWidget*& ww, const TQWidget* p, const
while ( it.current() ) {
if ( it.current()->isWidgetType() ) {
w = (TQWidget*)it.current();
- if ( w->isVisible() && w->tqgeometry().contains(pos) ) {
+ if ( w->isVisible() && w->geometry().contains(pos) ) {
if ( w->inherits("KDockWidget") ) ww = w;
findChildDockWidget( ww, w, w->mapFromParent(pos) );
return;
@@ -2105,7 +2105,7 @@ static TQDomElement createStringEntry(TQDomDocument &doc, const TQString &tagNam
static TQDomElement createBoolEntry(TQDomDocument &doc, const TQString &tagName, bool b)
{
- return createStringEntry(doc, tagName, TQString::tqfromLatin1(b? "true" : "false"));
+ return createStringEntry(doc, tagName, TQString::fromLatin1(b? "true" : "false"));
}
@@ -2144,7 +2144,7 @@ static TQDomElement createListEntry(TQDomDocument &doc, const TQString &tagName,
TQStrListIterator it(list);
for (; it.current(); ++it) {
TQDomElement subel = doc.createElement(subTagName);
- subel.appendChild(doc.createTextNode(TQString::tqfromLatin1(it.current())));
+ subel.appendChild(doc.createTextNode(TQString::fromLatin1(it.current())));
el.appendChild(subel);
}
@@ -2214,7 +2214,7 @@ void KDockManager::writeConfig(TQDomElement &base)
KDockWidget *obj1;
while ( (obj1=(KDockWidget*)it.current()) ) {
if ( TQT_BASE_OBJECT(obj1->parent()) == TQT_BASE_OBJECT(main) )
- mainWidgetStr = TQString::tqfromLatin1(obj1->name());
+ mainWidgetStr = TQString::fromLatin1(obj1->name());
nList.append(obj1->name());
++it;
}
@@ -2279,7 +2279,7 @@ void KDockManager::writeConfig(TQDomElement &base)
}
}
- groupEl.appendChild(createStringEntry(doc, "name", TQString::tqfromLatin1(obj->name())));
+ groupEl.appendChild(createStringEntry(doc, "name", TQString::fromLatin1(obj->name())));
groupEl.appendChild(createBoolEntry(doc, "hasParent", obj->parent()));
if ( !obj->parent() ) {
groupEl.appendChild(createRectEntry(doc, "geometry", TQRect(main->frameGeometry().topLeft(), main->size())));
@@ -2950,7 +2950,7 @@ void KDockManager::slotMenuPopup()
void KDockManager::slotMenuActivated( int id )
{
- MenuDockData* data = menuData->tqat( id );
+ MenuDockData* data = menuData->at( id );
data->dock->changeHideShowState();
}
@@ -2994,14 +2994,14 @@ void KDockManager::drawDragRectangle()
KDockMainWindow* pMain = 0L;
KDockWidget* pTLDockWdg = 0L;
TQWidget* topWdg;
- if (pDockWdgAtRect->tqtopLevelWidget() == main) {
+ if (pDockWdgAtRect->topLevelWidget() == main) {
isOverMainWdg = true;
topWdg = pMain = (KDockMainWindow*) main;
unclipped = pMain->testWFlags( WPaintUnclipped );
pMain->setWFlags( WPaintUnclipped );
}
else {
- topWdg = pTLDockWdg = (KDockWidget*) pDockWdgAtRect->tqtopLevelWidget();
+ topWdg = pTLDockWdg = (KDockWidget*) pDockWdgAtRect->topLevelWidget();
unclipped = pTLDockWdg->testWFlags( WPaintUnclipped );
pTLDockWdg->setWFlags( WPaintUnclipped );
}
@@ -3121,7 +3121,7 @@ void KDockArea::resizeEvent(TQResizeEvent *rsize)
// for (unsigned int i=0;i<children()->count();i++)
{
// TQPtrList<TQObject> list(children());
-// TQObject *obj=((TQPtrList<TQObject*>)children())->tqat(i);
+// TQObject *obj=((TQPtrList<TQObject*>)children())->at(i);
TQObject *obj=children()->getFirst();
if (split = tqt_dynamic_cast<KDockSplitter*>(obj))
{
@@ -3272,7 +3272,7 @@ void KDockContainer::prepareSave(TQStringList &names)
names.remove(tmp->data);
// for (uint i=0;i<m_children.count();i++)
// {
-// names.remove(m_children.tqat(i));
+// names.remove(m_children.at(i));
// }
}
diff --git a/tdeui/kdockwidget.h b/tdeui/kdockwidget.h
index c084dff5b..b2b740ca6 100644
--- a/tdeui/kdockwidget.h
+++ b/tdeui/kdockwidget.h
@@ -452,7 +452,7 @@ public:
*/
KDockWidget( KDockManager* dockManager, const char* name,
const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = TQString::null,
- const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ), WFlags f = 0);
+ const TQString& strTabPageLabel = TQString::fromLatin1( " " ), WFlags f = 0);
/**
* Destructs a dockwidget.
@@ -1377,7 +1377,7 @@ public:
* @return a pointer to the new created dockwidget
*/
KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L,
- const TQString& strCaption = TQString::null, const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ) );
+ const TQString& strCaption = TQString::null, const TQString& strTabPageLabel = TQString::fromLatin1( " " ) );
/**
* Saves the current dock window layout into a DOM tree below the given element.
@@ -1503,7 +1503,7 @@ public:
KDockWidget* getMainDockWidget(){ return mainDockWidget; }
KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L,
- const TQString& strCaption = TQString::null, const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ) );
+ const TQString& strCaption = TQString::null, const TQString& strTabPageLabel = TQString::fromLatin1( " " ) );
void writeDockConfig(TQDomElement &base);
void readDockConfig(TQDomElement &base);
diff --git a/tdeui/kdockwidget_private.cpp b/tdeui/kdockwidget_private.cpp
index 55ffc6229..41372fdf6 100644
--- a/tdeui/kdockwidget_private.cpp
+++ b/tdeui/kdockwidget_private.cpp
@@ -497,8 +497,8 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
switch (e->type()) {
case TQEvent::MouseMove:
mev= (TQMouseEvent*)e;
- child0->tqsetUpdatesEnabled(mOpaqueResize);
- child1->tqsetUpdatesEnabled(mOpaqueResize);
+ child0->setUpdatesEnabled(mOpaqueResize);
+ child1->setUpdatesEnabled(mOpaqueResize);
if (m_orientation == Qt::Horizontal) {
if ((fixedHeight0!=-1) || (fixedHeight1!=-1))
{
@@ -513,7 +513,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
if (tmp_xpos != xpos) {
xpos = tmp_xpos;
resizeEvent(0);
- divider->tqrepaint(true);
+ divider->repaint(true);
}
}
} else {
@@ -529,15 +529,15 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
if (tmp_xpos != xpos) {
xpos = tmp_xpos;
resizeEvent(0);
- divider->tqrepaint(true);
+ divider->repaint(true);
}
}
}
handled= true;
break;
case TQEvent::MouseButtonRelease:
- child0->tqsetUpdatesEnabled(true);
- child1->tqsetUpdatesEnabled(true);
+ child0->setUpdatesEnabled(true);
+ child1->setUpdatesEnabled(true);
mev= (TQMouseEvent*)e;
if (m_orientation == Qt::Horizontal){
if ((fixedHeight0!=-1) || (fixedHeight1!=-1))
@@ -546,7 +546,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
}
xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).y() ) / height();
resizeEvent(0);
- divider->tqrepaint(true);
+ divider->repaint(true);
} else {
if ((fixedWidth0!=-1) || (fixedWidth1!=-1))
{
@@ -554,7 +554,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
}
xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).x() ) / width();
resizeEvent(0);
- divider->tqrepaint(true);
+ divider->repaint(true);
}
handled= true;
break;
@@ -587,7 +587,7 @@ void KDockSplitter::updateName()
TQString new_name = TQString( child0->name() ) + "," + child1->name();
parentWidget()->setName( new_name.latin1() );
parentWidget()->setCaption( child0->caption() + "," + child1->caption() );
- parentWidget()->tqrepaint( false );
+ parentWidget()->repaint( false );
((KDockWidget*)parentWidget())->firstName = child0->name();
((KDockWidget*)parentWidget())->lastName = child1->name();
@@ -634,7 +634,7 @@ KDockButton_Private::~KDockButton_Private()
void KDockButton_Private::drawButton( TQPainter* p )
{
- p->fillRect( 0,0, width(), height(), TQBrush(tqcolorGroup().brush(TQColorGroup::Background)) );
+ p->fillRect( 0,0, width(), height(), TQBrush(colorGroup().brush(TQColorGroup::Background)) );
p->drawPixmap( (width() - pixmap()->width()) / 2, (height() - pixmap()->height()) / 2, *pixmap() );
if ( moveMouse && !isDown() ){
p->setPen( white );
@@ -642,12 +642,12 @@ void KDockButton_Private::drawButton( TQPainter* p )
p->lineTo( 0, 0 );
p->lineTo( width() - 1, 0 );
- p->setPen( tqcolorGroup().dark() );
+ p->setPen( colorGroup().dark() );
p->lineTo( width() - 1, height() - 1 );
p->lineTo( 0, height() - 1 );
}
if ( isOn() || isDown() ){
- p->setPen( tqcolorGroup().dark() );
+ p->setPen( colorGroup().dark() );
p->moveTo( 0, height() - 1 );
p->lineTo( 0, 0 );
p->lineTo( width() - 1, 0 );
@@ -661,13 +661,13 @@ void KDockButton_Private::drawButton( TQPainter* p )
void KDockButton_Private::enterEvent( TQEvent * )
{
moveMouse = true;
- tqrepaint();
+ repaint();
}
void KDockButton_Private::leaveEvent( TQEvent * )
{
moveMouse = false;
- tqrepaint();
+ repaint();
}
/*************************************************************************/
diff --git a/tdeui/kdualcolorbutton.cpp b/tdeui/kdualcolorbutton.cpp
index 64624df82..f6d49a97e 100644
--- a/tdeui/kdualcolorbutton.cpp
+++ b/tdeui/kdualcolorbutton.cpp
@@ -112,7 +112,7 @@ TQSize KDualColorButton::sizeHint() const
void KDualColorButton::setForeground(const TQColor &c)
{
fg = TQBrush(c, Qt::SolidPattern);
- tqrepaint(false);
+ repaint(false);
emit fgChanged(fg.color());
}
@@ -120,7 +120,7 @@ void KDualColorButton::setForeground(const TQColor &c)
void KDualColorButton::setBackground(const TQColor &c)
{
bg = TQBrush(c, Qt::SolidPattern);
- tqrepaint(false);
+ repaint(false);
emit bgChanged(bg.color());
}
@@ -131,13 +131,13 @@ void KDualColorButton::setCurrentColor(const TQColor &c)
bg = TQBrush(c, Qt::SolidPattern);
else
fg = TQBrush(c, Qt::SolidPattern);
- tqrepaint(false);
+ repaint(false);
}
void KDualColorButton::setCurrent(DualColor s)
{
curColor = s;
- tqrepaint(false);
+ repaint(false);
}
void KDualColorButton::metrics(TQRect &fgRect, TQRect &bgRect)
@@ -152,13 +152,13 @@ void KDualColorButton::paintEvent(TQPaintEvent *)
TQPainter p(this);
metrics(fgRect, bgRect);
- TQBrush defBrush = tqcolorGroup().brush(TQColorGroup::Button);
+ TQBrush defBrush = colorGroup().brush(TQColorGroup::Button);
- qDrawShadeRect(&p, bgRect, tqcolorGroup(), curColor == Background, 2, 0,
+ qDrawShadeRect(&p, bgRect, colorGroup(), curColor == Background, 2, 0,
isEnabled() ? &bg : &defBrush);
- qDrawShadeRect(&p, fgRect, tqcolorGroup(), curColor == Foreground, 2, 0,
+ qDrawShadeRect(&p, fgRect, colorGroup(), curColor == Foreground, 2, 0,
isEnabled() ? &fg : &defBrush);
- p.setPen(tqcolorGroup().shadow());
+ p.setPen(colorGroup().shadow());
p.drawPixmap(fgRect.right()+2, 0, *arrowBitmap);
p.drawPixmap(0, fgRect.bottom()+2, *resetPixmap);
@@ -181,7 +181,7 @@ void KDualColorButton::dropEvent(TQDropEvent *ev)
bg.setColor(c);
emit(bgChanged(c));
}
- tqrepaint(false);
+ repaint(false);
}
}
@@ -217,7 +217,7 @@ void KDualColorButton::mousePressEvent(TQMouseEvent *ev)
emit bgChanged(bg.color());
miniCtlFlag = true;
}
- tqrepaint(false);
+ repaint(false);
}
@@ -270,7 +270,7 @@ void KDualColorButton::mouseReleaseEvent(TQMouseEvent *ev)
}
}
}
- tqrepaint(false);
+ repaint(false);
dragFlag = false;
}
else
diff --git a/tdeui/kdualcolorbutton.h b/tdeui/kdualcolorbutton.h
index 5b49be30e..39112bca8 100644
--- a/tdeui/kdualcolorbutton.h
+++ b/tdeui/kdualcolorbutton.h
@@ -19,7 +19,7 @@
#define __KDUALCOLORBTN_H
class TQBitmap;
-#include <tqbrush.h>
+#include <brush.h>
#include <tqwidget.h>
#include <tdelibs_export.h>
diff --git a/tdeui/keditcl1.cpp b/tdeui/keditcl1.cpp
index fe886f434..b39a3ee10 100644
--- a/tdeui/keditcl1.cpp
+++ b/tdeui/keditcl1.cpp
@@ -21,7 +21,7 @@
#include <tqdragobject.h>
#include <tqpopupmenu.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqtimer.h>
#include <kapplication.h>
@@ -104,7 +104,7 @@ KEdit::insertText(TQTextStream *stream)
// MS: read everything at once if file <= 1MB,
// else read in 5000-line chunks to keep memory usage acceptable.
- TQIODevice *dev=stream->tqdevice();
+ TQIODevice *dev=stream->device();
if (dev && dev->size()>(1024*1024)) {
while(1) {
int i;
@@ -128,7 +128,7 @@ KEdit::insertText(TQTextStream *stream)
setCursorPosition(saveline, savecol);
// setAutoUpdate(true);
-// tqrepaint();
+// repaint();
setModified(true);
setFocus();
@@ -140,7 +140,7 @@ KEdit::insertText(TQTextStream *stream)
// TQString str = text();
// for (int i = 0; i < (int) str.length(); i++)
- // printf("KEdit: U+%04X\n", str[i].tqunicode());
+ // printf("KEdit: U+%04X\n", str[i].unicode());
}
@@ -164,7 +164,7 @@ KEdit::cleanWhiteSpace()
if (line.isEmpty())
{
if (addSpace)
- newText += TQString::tqfromLatin1("\n\n");
+ newText += TQString::fromLatin1("\n\n");
if (firstLine)
{
if (firstChar.isSpace())
@@ -200,7 +200,7 @@ KEdit::cleanWhiteSpace()
{
deselect();
d->autoUpdate = true;
- tqrepaint();
+ repaint();
return;
}
if (wordWrap() == NoWrap)
@@ -225,7 +225,7 @@ KEdit::cleanWhiteSpace()
insert(newText);
d->autoUpdate = true;
- tqrepaint();
+ repaint();
setModified(true);
setFocus();
@@ -471,7 +471,7 @@ void KEdit::keyPressEvent ( TQKeyEvent *e)
else if ( isReadOnly() )
TQMultiLineEdit::keyPressEvent( e );
// If this is an unmodified printable key, send it directly to TQMultiLineEdit.
- else if ( !(key.keyCodeQt() & (CTRL | ALT)) && !e->text().isEmpty() && TQString(e->text()).tqunicode()->isPrint() )
+ else if ( !(key.keyCodeQt() & (CTRL | ALT)) && !e->text().isEmpty() && TQString(e->text()).unicode()->isPrint() )
TQMultiLineEdit::keyPressEvent( e );
else if ( KStdAccel::paste().contains( key ) ) {
paste();
diff --git a/tdeui/keditcl2.cpp b/tdeui/keditcl2.cpp
index 4bbc12c30..30c5ce616 100644
--- a/tdeui/keditcl2.cpp
+++ b/tdeui/keditcl2.cpp
@@ -26,7 +26,7 @@
#include <tqlineedit.h>
#include <tqvbuttongroup.h>
#include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqhbox.h>
#include <tqpopupmenu.h>
diff --git a/tdeui/keditlistbox.cpp b/tdeui/keditlistbox.cpp
index 040e77c70..b6809e319 100644
--- a/tdeui/keditlistbox.cpp
+++ b/tdeui/keditlistbox.cpp
@@ -20,7 +20,7 @@
#include <tqstringlist.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqgroupbox.h>
#include <tqlistbox.h>
#include <tqwhatsthis.h>
diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp
index 664e206bd..4847c3c52 100644
--- a/tdeui/kedittoolbar.cpp
+++ b/tdeui/kedittoolbar.cpp
@@ -19,7 +19,7 @@
#include <kedittoolbar.h>
#include <tqdom.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqdir.h>
#include <tqfile.h>
#include <tqheader.h>
@@ -29,7 +29,7 @@
#include <tqlabel.h>
#include <tqvaluelist.h>
#include <tqapplication.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <kaction.h>
#include <kstandarddirs.h>
@@ -378,7 +378,7 @@ const char *KEditToolbar::s_defaultToolbar = 0L;
KEditToolbar::KEditToolbar(KActionCollection *collection, const TQString& file,
bool global, TQWidget* parent, const char* name)
: KDialogBase(Swallow, i18n("Configure Toolbars"), Default|Ok|Apply|Cancel, Ok, parent, name),
- m_widget(new KEditToolbarWidget(TQString::tqfromLatin1(s_defaultToolbar), collection, file, global, this))
+ m_widget(new KEditToolbarWidget(TQString::fromLatin1(s_defaultToolbar), collection, file, global, this))
{
init();
d->m_global = global;
@@ -400,7 +400,7 @@ KEditToolbar::KEditToolbar(const TQString& defaultToolbar, KActionCollection *co
KEditToolbar::KEditToolbar(KXMLGUIFactory* factory, TQWidget* parent, const char* name)
: KDialogBase(Swallow, i18n("Configure Toolbars"), Default|Ok|Apply|Cancel, Ok, parent, name),
- m_widget(new KEditToolbarWidget(TQString::tqfromLatin1(s_defaultToolbar), factory, this))
+ m_widget(new KEditToolbarWidget(TQString::fromLatin1(s_defaultToolbar), factory, this))
{
init();
d->m_factory = factory;
@@ -467,7 +467,7 @@ void KEditToolbar::slotDefault()
if (TQDir::isRelativePath(file))
{
const KInstance *instance = client->instance() ? client->instance() : KGlobal::instance();
- file = locateLocal("data", TQString::tqfromLatin1( instance->instanceName() + '/' ) + file);
+ file = locateLocal("data", TQString::fromLatin1( instance->instanceName() + '/' ) + file);
}
else
{
@@ -488,7 +488,7 @@ void KEditToolbar::slotDefault()
int slash = d->m_file.findRev('/')+1;
if (slash)
d->m_file = d->m_file.mid(slash);
- TQString xml_file = locateLocal("data", TQString::tqfromLatin1( KGlobal::instance()->instanceName() + '/' ) + d->m_file);
+ TQString xml_file = locateLocal("data", TQString::fromLatin1( KGlobal::instance()->instanceName() + '/' ) + d->m_file);
if ( TQFile::exists( xml_file ) )
if ( !TQFile::remove( xml_file ) )
@@ -816,7 +816,7 @@ void KEditToolbarWidget::setupLayout()
// "change icon" button
d->m_changeIcon = new KPushButton( i18n( "Change &Icon..." ), this );
- TQString kdialogExe = KStandardDirs::findExe(TQString::tqfromLatin1("kdialog"));
+ TQString kdialogExe = KStandardDirs::findExe(TQString::fromLatin1("kdialog"));
d->m_hasKDialog = !kdialogExe.isEmpty();
d->m_changeIcon->setEnabled( d->m_hasKDialog );
@@ -975,7 +975,7 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem)
if (it.tagName() == tagSeparator)
{
ToolbarItem *act = new ToolbarItem(m_activeList, tagSeparator, sep_name.arg(sep_num++), TQString::null);
- bool isLineSep = ( it.attribute(attrLineSeparator, "true").lower() == TQString::tqfromLatin1("true") );
+ bool isLineSep = ( it.attribute(attrLineSeparator, "true").lower() == TQString::fromLatin1("true") );
if(isLineSep)
act->setText(1, LINESEPARATORSTRING);
else
@@ -1382,10 +1382,10 @@ void KEditToolbarWidget::slotChangeIcon()
return;
d->m_kdialogProcess = new KProcIO;
- TQString kdialogExe = KStandardDirs::findExe(TQString::tqfromLatin1("kdialog"));
+ TQString kdialogExe = KStandardDirs::findExe(TQString::fromLatin1("kdialog"));
(*d->m_kdialogProcess) << kdialogExe;
(*d->m_kdialogProcess) << "--embed";
- (*d->m_kdialogProcess) << TQString::number( (ulong)tqtopLevelWidget()->winId() );
+ (*d->m_kdialogProcess) << TQString::number( (ulong)topLevelWidget()->winId() );
(*d->m_kdialogProcess) << "--geticon";
(*d->m_kdialogProcess) << "Toolbar";
(*d->m_kdialogProcess) << "Actions";
diff --git a/tdeui/kfontcombo.cpp b/tdeui/kfontcombo.cpp
index e62360521..9ef3af912 100644
--- a/tdeui/kfontcombo.cpp
+++ b/tdeui/kfontcombo.cpp
@@ -132,7 +132,7 @@ void KFontListItem::paint(TQPainter *p)
if (m_canPaintName)
p->setFont(*m_font);
else
- t = TQString::tqfromLatin1("(%1)").arg(m_fontName);
+ t = TQString::fromLatin1("(%1)").arg(m_fontName);
}
TQFontMetrics fm(p->fontMetrics());
p->drawText(3, (m_combo->d->lineSpacing + fm.ascent() + fm.leading() / 2) / 2, t);
diff --git a/tdeui/kfontdialog.cpp b/tdeui/kfontdialog.cpp
index a5609a81e..7801f4422 100644
--- a/tdeui/kfontdialog.cpp
+++ b/tdeui/kfontdialog.cpp
@@ -34,7 +34,7 @@
#include <tqfont.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqscrollbar.h>
#include <tqstringlist.h>
#include <tqfontdatabase.h>
@@ -331,8 +331,8 @@ KFontChooser::KFontChooser(TQWidget *parent, const char *name,
setSizeIsRelative( *sizeIsRelativeState );
KConfig *config = KGlobal::config();
- KConfigGroupSaver saver(config, TQString::tqfromLatin1("General"));
- showXLFDArea(config->readBoolEntry(TQString::tqfromLatin1("fontSelectorShowXLFD"), false));
+ KConfigGroupSaver saver(config, TQString::fromLatin1("General"));
+ showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false));
}
KFontChooser::~KFontChooser()
@@ -464,7 +464,7 @@ void KFontChooser::toggled_checkbox()
void KFontChooser::family_chosen_slot(const TQString& family)
{
TQFontDatabase dbase;
- TQStringList styles = TQStringList(dbase.tqstyles(family));
+ TQStringList styles = TQStringList(dbase.styles(family));
styleListBox->clear();
currentStyles.clear();
for ( TQStringList::Iterator it = styles.begin(); it != styles.end(); ++it ) {
@@ -526,7 +526,7 @@ void KFontChooser::style_chosen_slot(const TQString& style)
fillSizeList();
} else { // is bitmap font.
//sampleEdit->setPaletteBackgroundPixmap( BitmapPixmap ); // TODO
- TQValueList<int> sizes = dbase.tqsmoothSizes(familyListBox->currentText(), currentStyles[currentStyle]);
+ TQValueList<int> sizes = dbase.smoothSizes(familyListBox->currentText(), currentStyles[currentStyle]);
if(sizes.count() > 0) {
TQValueList<int>::iterator it;
diff=1000;
@@ -641,7 +641,7 @@ void KFontChooser::setupDisplay()
void KFontChooser::getFontList( TQStringList &list, uint fontListCriteria)
{
TQFontDatabase dbase;
- TQStringList lstSys(dbase.tqfamilies());
+ TQStringList lstSys(dbase.families());
// if we have criteria; then check fonts before adding
if (fontListCriteria)
@@ -681,13 +681,13 @@ void KFontChooser::addFont( TQStringList &list, const char *xfont )
if ( !ptr )
return;
- TQString font = TQString::tqfromLatin1(ptr + 1);
+ TQString font = TQString::fromLatin1(ptr + 1);
int pos;
if ( ( pos = font.find( '-' ) ) > 0 ) {
font.truncate( pos );
- if ( font.find( TQString::tqfromLatin1("open look"), 0, false ) >= 0 )
+ if ( font.find( TQString::fromLatin1("open look"), 0, false ) >= 0 )
return;
TQStringList::Iterator it = list.begin();
diff --git a/tdeui/kfontrequester.cpp b/tdeui/kfontrequester.cpp
index 293f9d546..ca3dabf88 100644
--- a/tdeui/kfontrequester.cpp
+++ b/tdeui/kfontrequester.cpp
@@ -21,7 +21,7 @@
#include <tqlabel.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
diff --git a/tdeui/kguiitem.cpp b/tdeui/kguiitem.cpp
index abcc3868a..7b73c7401 100644
--- a/tdeui/kguiitem.cpp
+++ b/tdeui/kguiitem.cpp
@@ -135,7 +135,7 @@ TQString KGuiItem::plainText() const
int resultLength = 0;
stripped.setLength(len);
- const TQChar* data = d->m_text.tqunicode();
+ const TQChar* data = d->m_text.unicode();
for ( int pos = 0; pos < len; ++pos )
{
if ( data[ pos ] != '&' )
diff --git a/tdeui/khelpmenu.cpp b/tdeui/khelpmenu.cpp
index 663838fa8..330362d45 100644
--- a/tdeui/khelpmenu.cpp
+++ b/tdeui/khelpmenu.cpp
@@ -119,7 +119,7 @@ KPopupMenu* KHelpMenu::menu()
// compatible.
//
const KAboutData *aboutData = d->mAboutData ? d->mAboutData : KGlobal::instance()->aboutData();
- TQString appName = (aboutData)? aboutData->programName() : TQString::tqfromLatin1(tqApp->name());
+ TQString appName = (aboutData)? aboutData->programName() : TQString::fromLatin1(tqApp->name());
mMenu = new KPopupMenu();
connect( mMenu, TQT_SIGNAL(destroyed()), this, TQT_SLOT(menuDestroyed()));
diff --git a/tdeui/kiconview.cpp b/tdeui/kiconview.cpp
index 6d3f51a2b..a26519729 100644
--- a/tdeui/kiconview.cpp
+++ b/tdeui/kiconview.cpp
@@ -184,7 +184,7 @@ void KIconView::slotAutoSelect()
bool select = !m_pCurrentItem->isSelected();
bool update = viewport()->isUpdatesEnabled();
- viewport()->tqsetUpdatesEnabled( false );
+ viewport()->setUpdatesEnabled( false );
//Calculate the smallest rectangle that contains the current Item
//and the one that got the autoselect event
@@ -216,7 +216,7 @@ void KIconView::slotAutoSelect()
}
blockSignals( block );
- viewport()->tqsetUpdatesEnabled( update );
+ viewport()->setUpdatesEnabled( update );
repaintContents( redraw, false );
emit selectionChanged();
@@ -485,7 +485,7 @@ void KIconViewItem::calcRect( const TQString& text_ )
KIconView *view = static_cast<KIconView *>(iconView());
TQRect itemIconRect = pixmapRect();
TQRect itemTextRect = textRect();
- TQRect tqitemRect = rect();
+ TQRect itemRect = rect();
int pw = 0;
int ph = 0;
@@ -507,9 +507,9 @@ void KIconViewItem::calcRect( const TQString& text_ )
itemIconRect.setWidth( pw );
#if 1 // FIXME
// There is a bug in Qt which prevents the item from being placed
- // properly when the pixmapRect is not at the top of the tqitemRect, so we
+ // properly when the pixmapRect is not at the top of the itemRect, so we
// have to increase the height of the pixmapRect and leave it at the top
- // of the tqitemRect...
+ // of the itemRect...
if ( d && !d->m_pixmapSize.isNull() )
itemIconRect.setHeight( d->m_pixmapSize.height() + 2 );
else
@@ -574,8 +574,8 @@ void KIconViewItem::calcRect( const TQString& text_ )
h = itemTextRect.height() + itemIconRect.height() + 1;
}
- tqitemRect.setWidth( w );
- tqitemRect.setHeight( h );
+ itemRect.setWidth( w );
+ itemRect.setHeight( h );
int width = QMAX( w, TQApplication::globalStrut().width() ); // see TQIconViewItem::width()
int height = QMAX( h, TQApplication::globalStrut().height() ); // see TQIconViewItem::height()
itemTextRect = TQRect( ( width - itemTextRect.width() ) / 2, height - itemTextRect.height(),
@@ -597,8 +597,8 @@ void KIconViewItem::calcRect( const TQString& text_ )
h = QMAX( itemTextRect.height(), itemIconRect.height() );
w = itemTextRect.width() + itemIconRect.width() + 1;
- tqitemRect.setWidth( w );
- tqitemRect.setHeight( h );
+ itemRect.setWidth( w );
+ itemRect.setHeight( h );
int width = QMAX( w, TQApplication::globalStrut().width() ); // see TQIconViewItem::width()
int height = QMAX( h, TQApplication::globalStrut().height() ); // see TQIconViewItem::height()
@@ -621,8 +621,8 @@ void KIconViewItem::calcRect( const TQString& text_ )
setPixmapRect( itemIconRect );
if ( itemTextRect != textRect() )
setTextRect( itemTextRect );
- if ( tqitemRect != rect() )
- setItemRect( tqitemRect );
+ if ( itemRect != rect() )
+ setItemRect( itemRect );
// Done by setPixmapRect, setTextRect and setItemRect ! [and useless if no rect changed]
//view->updateItemContainer( this );
@@ -680,7 +680,7 @@ void KIconViewItem::paintPixmap( TQPainter *p, const TQColorGroup &cg )
#if 1 // FIXME
// Move the pixmap manually because the pixmapRect is at the
- // top of the tqitemRect
+ // top of the itemRect
// (won't be needed anymore in future versions of qt)
if ( d && !d->m_pixmapSize.isNull() )
{
diff --git a/tdeui/kinputdialog.cpp b/tdeui/kinputdialog.cpp
index 61b30cce1..31f384d2c 100644
--- a/tdeui/kinputdialog.cpp
+++ b/tdeui/kinputdialog.cpp
@@ -21,7 +21,7 @@
#undef Status
#endif // USE_QT4
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqvalidator.h>
#include <tqwhatsthis.h>
diff --git a/tdeui/kjanuswidget.cpp b/tdeui/kjanuswidget.cpp
index 584780c8e..e982330b8 100644
--- a/tdeui/kjanuswidget.cpp
+++ b/tdeui/kjanuswidget.cpp
@@ -23,7 +23,7 @@
#include <tqhbox.h>
#include <tqheader.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqobjectlist.h>
#include <tqpixmap.h>
#include <tqsplitter.h>
@@ -518,7 +518,7 @@ bool KJanusWidget::setSwallowedWidget( TQWidget *widget )
TQObjectList l = mSwallowPage->childrenListObject(); // silence please
for( uint i=0; i < l.count(); i++ )
{
- TQObject *o = l.tqat(i);
+ TQObject *o = l.at(i);
if( o->isWidgetType() )
{
((TQWidget*)o)->hide();
@@ -542,7 +542,7 @@ bool KJanusWidget::setSwallowedWidget( TQWidget *widget )
}
gbox->addWidget(widget, 0, 0 );
gbox->activate();
- mSwallowPage->setMinimumSize( widget->tqminimumSize() );
+ mSwallowPage->setMinimumSize( widget->minimumSize() );
}
return true;
@@ -769,20 +769,20 @@ TQSize KJanusWidget::minimumSizeHint() const
if( mFace == TreeList )
{
- s1.rwidth() += tqstyle().tqpixelMetric( TQStyle::PM_SplitterWidth );
- s2 = mTreeList->tqminimumSize();
+ s1.rwidth() += tqstyle().pixelMetric( TQStyle::PM_SplitterWidth );
+ s2 = mTreeList->minimumSize();
}
else
{
mIconList->updateMinimumHeight();
mIconList->updateWidth();
- s2 = mIconList->tqminimumSize();
+ s2 = mIconList->minimumSize();
}
if( mTitleLabel->isVisible() )
{
s3 += mTitleLabel->sizeHint();
- s3.rheight() += mTitleSep->tqminimumSize().height();
+ s3.rheight() += mTitleSep->minimumSize().height();
}
//
@@ -799,7 +799,7 @@ TQSize KJanusWidget::minimumSizeHint() const
}
else if( mFace == Swallow )
{
- return mSwallowPage->tqminimumSize();
+ return mSwallowPage->minimumSize();
}
else if( mFace == Plain )
{
@@ -1074,13 +1074,13 @@ void KJanusWidget::IconListItem::highlight( bool erase )
// For now, always disable highlighting
erase = true;
- TQRect r = listBox()->tqitemRect( this );
+ TQRect r = listBox()->itemRect( this );
r.addCoords( 1, 1, -1, -1 );
TQPainter p( listBox()->viewport() );
p.setClipRegion( r );
- const TQColorGroup &cg = listBox()->tqcolorGroup();
+ const TQColorGroup &cg = listBox()->colorGroup();
if ( erase )
{
p.setPen( cg.base() );
@@ -1129,7 +1129,7 @@ const TQPixmap &KJanusWidget::IconListItem::defaultPixmap()
void KJanusWidget::IconListItem::paint( TQPainter *painter )
{
- TQRect itemPaintRegion( listBox()->tqitemRect( this ) );
+ TQRect itemPaintRegion( listBox()->itemRect( this ) );
TQRect r( 1, 1, itemPaintRegion.width() - 2, itemPaintRegion.height() - 2);
if ( isSelected() )
@@ -1137,7 +1137,7 @@ void KJanusWidget::IconListItem::paint( TQPainter *painter )
painter->eraseRect( r );
painter->save();
- painter->setPen( listBox()->tqcolorGroup().highlight().dark( 160 ) );
+ painter->setPen( listBox()->colorGroup().highlight().dark( 160 ) );
painter->drawRect( r );
painter->restore();
}
diff --git a/tdeui/kjanuswidget.h b/tdeui/kjanuswidget.h
index 4ddc8be17..8cc0c667c 100644
--- a/tdeui/kjanuswidget.h
+++ b/tdeui/kjanuswidget.h
@@ -50,7 +50,7 @@ class KGuiItem;
* This class provides KJanusWidget::TreeList, KJanusWidget::IconList,
* KJanusWidget::Tabbed, KJanusWidget::Plain and KJanusWidget::Swallow layouts.
*
- * For all modes it is important that you specify the TQWidget::tqminimumSize()
+ * For all modes it is important that you specify the TQWidget::minimumSize()
* on the page, plain widget or the swallowed widget. If you use a QLayout
* on the page, plain widget or the swallowed widget this will be taken care
* of automatically. The size is used when the KJanusWidget determines its
diff --git a/tdeui/kkeybutton.cpp b/tdeui/kkeybutton.cpp
index ee26cc6de..6626a9a46 100644
--- a/tdeui/kkeybutton.cpp
+++ b/tdeui/kkeybutton.cpp
@@ -85,7 +85,7 @@ void KKeyButton::setShortcut( const KShortcut& cut, bool bQtShortcut )
d->bQtShortcut = bQtShortcut;
m_cut = cut;
TQString keyStr = m_cut.toString();
- keyStr.replace('&', TQString::tqfromLatin1("&&"));
+ keyStr.replace('&', TQString::fromLatin1("&&"));
setText( keyStr.isEmpty() ? i18n("None") : keyStr );
}
@@ -106,7 +106,7 @@ void KKeyButton::captureShortcut()
KShortcut cut;
m_bEditing = true;
- tqrepaint();
+ repaint();
{
KShortcutDialog dlg( m_cut, d->bQtShortcut, this );
@@ -117,7 +117,7 @@ void KKeyButton::captureShortcut()
emit capturedShortcut( cut );
m_bEditing = false;
- tqrepaint();
+ repaint();
}
void KKeyButton::drawButton( TQPainter *painter )
@@ -146,11 +146,11 @@ void KKeyButton::drawButton( TQPainter *painter )
painter->setClipping( false );
if( width() > 12 && height() > 8 )
qDrawShadePanel( painter, 6, 4, width() - 12, height() - 8,
- tqcolorGroup(), true, 1, 0L );
+ colorGroup(), true, 1, 0L );
if ( m_bEditing )
{
- painter->setPen( tqcolorGroup().base() );
- painter->setBrush( tqcolorGroup().base() );
+ painter->setPen( colorGroup().base() );
+ painter->setBrush( colorGroup().base() );
}
else
{
@@ -162,7 +162,7 @@ void KKeyButton::drawButton( TQPainter *painter )
drawButtonLabel( painter );
- painter->setPen( tqcolorGroup().text() );
+ painter->setPen( colorGroup().text() );
painter->setBrush( NoBrush );
if( hasFocus() || m_bEditing )
{
diff --git a/tdeui/kkeydialog.cpp b/tdeui/kkeydialog.cpp
index 84d367a65..5a38658ff 100644
--- a/tdeui/kkeydialog.cpp
+++ b/tdeui/kkeydialog.cpp
@@ -27,7 +27,7 @@
#include <tqbuttongroup.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqdrawutil.h>
#include <tqpainter.h>
#include <tqradiobutton.h>
@@ -532,7 +532,7 @@ void KKeyChooser::updateButtons()
d->pbtnShortcut->setShortcut( pItem->shortcut(), bQtShortcut );
//item->setText( 1, keyStrCfg );
- pItem->tqrepaint();
+ pItem->repaint();
d->lInfo->setText( i18n("Default key:") + TQString(" %1").arg(keyStrDef.isEmpty() ? i18n("None") : keyStrDef) );
// Select the appropriate radio button.
diff --git a/tdeui/klanguagebutton.cpp b/tdeui/klanguagebutton.cpp
index bfc160c8e..a834be61a 100644
--- a/tdeui/klanguagebutton.cpp
+++ b/tdeui/klanguagebutton.cpp
@@ -23,7 +23,7 @@
#define INCLUDE_MENUITEM_DEF
#include <tqpopupmenu.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include "klanguagebutton.h"
@@ -131,12 +131,12 @@ KLanguageButton::~KLanguageButton()
void KLanguageButton::insertLanguage( const TQString& path, const TQString& name,
const TQString&, const TQString &submenu, int index )
{
- TQString output = name + TQString::tqfromLatin1( " (" ) + path +
- TQString::tqfromLatin1( ")" );
+ TQString output = name + TQString::fromLatin1( " (" ) + path +
+ TQString::fromLatin1( ")" );
#if 0
// Nooooo ! Country != language
TQPixmap flag( locate( "locale", sub + path +
- TQString::tqfromLatin1( "/flag.png" ) ) );
+ TQString::fromLatin1( "/flag.png" ) ) );
#endif
insertItem( output, path, submenu, index );
}
@@ -191,7 +191,7 @@ void KLanguageButton::slotActivated( int index )
setCurrentItem( index );
// Forward event from popup menu as if it was emitted from this widget:
- TQString id = *m_ids->tqat( index );
+ TQString id = *m_ids->at( index );
emit activated( id );
}
@@ -199,7 +199,7 @@ void KLanguageButton::slotHighlighted( int index )
{
//kdDebug() << "slotHighlighted" << index << endl;
- TQString id = *m_ids->tqat( index );
+ TQString id = *m_ids->at( index );
emit ( highlighted(id) );
}
@@ -237,7 +237,7 @@ bool KLanguageButton::contains( const TQString & id ) const
TQString KLanguageButton::current() const
{
- return *m_ids->tqat( currentItem() );
+ return *m_ids->at( currentItem() );
}
@@ -248,7 +248,7 @@ TQString KLanguageButton::id( int i ) const
kdDebug() << "KLanguageButton::tag(), unknown tag " << i << endl;
return TQString::null;
}
- return *m_ids->tqat( i );
+ return *m_ids->at( i );
}
diff --git a/tdeui/kled.cpp b/tdeui/kled.cpp
index b78b06a38..7dd45f107 100644
--- a/tdeui/kled.cpp
+++ b/tdeui/kled.cpp
@@ -51,7 +51,7 @@ KLed::KLed(TQWidget *parent, const char *name)
: TQWidget( parent, name),
led_state(On),
led_look(Raised),
- led_tqshape(Circular)
+ led_shape(Circular)
{
TQColor col(green);
d = new KLed::KLedPrivate;
@@ -68,7 +68,7 @@ KLed::KLed(const TQColor& col, TQWidget *parent, const char *name)
: TQWidget( parent, name),
led_state(On),
led_look(Raised),
- led_tqshape(Circular)
+ led_shape(Circular)
{
d = new KLed::KLedPrivate;
d->dark_factor = 300;
@@ -81,11 +81,11 @@ KLed::KLed(const TQColor& col, TQWidget *parent, const char *name)
}
KLed::KLed(const TQColor& col, KLed::State state,
- KLed::Look look, KLed::Shape tqshape, TQWidget *parent, const char *name )
+ KLed::Look look, KLed::Shape shape, TQWidget *parent, const char *name )
: TQWidget(parent, name),
led_state(state),
led_look(look),
- led_tqshape(tqshape)
+ led_shape(shape)
{
d = new KLed::KLedPrivate;
d->dark_factor = 300;
@@ -93,7 +93,7 @@ KLed::KLed(const TQColor& col, KLed::State state,
d->off_map = 0;
d->on_map = 0;
- //setShape(tqshape);
+ //setShape(shape);
setColor(col);
}
@@ -114,7 +114,7 @@ KLed::paintEvent(TQPaintEvent *)
t.start();
for (int i=0; i<rounds; i++) {
#endif
- switch(led_tqshape)
+ switch(led_shape)
{
case Rectangular:
switch (led_look)
@@ -229,7 +229,7 @@ KLed::paintFlat() // paint a ROUND FLAT led lamp
brush.setColor( color );
pen.setWidth( scale );
- color = tqcolorGroup().dark();
+ color = colorGroup().dark();
pen.setColor( color ); // Set the pen accordingly
paint.setPen( pen ); // Select pen for drawing
@@ -325,7 +325,7 @@ KLed::paintRound() // paint a ROUND RAISED led lamp
// avoid that the border can be erased by the bright spot of the LED
pen.setWidth( 2 * scale + 1 );
- color = tqcolorGroup().dark();
+ color = colorGroup().dark();
pen.setColor( color ); // Set the pen accordingly
paint.setPen( pen ); // Select pen for drawing
brush.setStyle( Qt::NoBrush ); // Switch off the brush
@@ -428,7 +428,7 @@ KLed::paintSunken() // paint a ROUND SUNKEN led lamp
// drawing the shadow border at 45° (45*16 = 720).
int angle = -720;
- color = tqcolorGroup().light();
+ color = colorGroup().light();
for ( int arc = 120; arc < 2880; arc += 240 ) {
pen.setColor( color );
@@ -525,9 +525,9 @@ KLed::state() const
}
KLed::Shape
-KLed::tqshape() const
+KLed::shape() const
{
- return led_tqshape;
+ return led_shape;
}
TQColor
@@ -561,9 +561,9 @@ KLed::toggleState()
void
KLed::setShape(KLed::Shape s)
{
- if(led_tqshape!=s)
+ if(led_shape!=s)
{
- led_tqshape = s;
+ led_shape = s;
update();
}
}
diff --git a/tdeui/kled.h b/tdeui/kled.h
index 7ae03e196..7b9f327fa 100644
--- a/tdeui/kled.h
+++ b/tdeui/kled.h
@@ -47,7 +47,7 @@ class TDEUI_EXPORT KLed : public TQWidget
Q_OBJECT
Q_ENUMS( State Shape Look )
Q_PROPERTY( State state READ state WRITE setState )
- Q_PROPERTY( Shape tqshape READ tqshape WRITE setShape )
+ Q_PROPERTY( Shape shape READ shape WRITE setShape )
Q_PROPERTY( Look look READ look WRITE setLook )
Q_PROPERTY( TQColor color READ color WRITE setColor )
Q_PROPERTY( int darkFactor READ darkFactor WRITE setDarkFactor )
@@ -62,7 +62,7 @@ public:
/**
* Shades of the lamp.
- * @short LED tqshape
+ * @short LED shape
*/
enum Shape { Rectangular, Circular };
@@ -114,12 +114,12 @@ public:
* @param col Initial color of the LED.
* @param state Sets the State.
* @param look Sets the Look.
- * @param tqshape Sets the Shape (rectangular or circular)
+ * @param shape Sets the Shape (rectangular or circular)
* @param parent Will be handed over to TQWidget.
* @param name Will be handed over to TQWidget.
* @short Constructor
*/
- KLed(const TQColor& col, KLed::State state, KLed::Look look, KLed::Shape tqshape,
+ KLed(const TQColor& col, KLed::State state, KLed::Look look, KLed::Shape shape,
TQWidget *parent=0, const char *name=0);
@@ -137,7 +137,7 @@ public:
*/
State state() const;
- Shape tqshape() const;
+ Shape shape() const;
/**
* Returns the color of the widget
@@ -175,7 +175,7 @@ public:
void setState( State state );
/**
- * Set the tqshape of the LED to @p s.
+ * Set the shape of the LED to @p s.
*/
void setShape(Shape s);
/**
@@ -317,7 +317,7 @@ private:
State led_state;
TQColor led_color;
Look led_look;
- Shape led_tqshape;
+ Shape led_shape;
protected:
virtual void virtual_hook( int id, void* data );
diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp
index 87fc29d83..16c117c26 100644
--- a/tdeui/klineedit.cpp
+++ b/tdeui/klineedit.cpp
@@ -25,7 +25,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqpainter.h>
#include <tqtimer.h>
@@ -420,9 +420,9 @@ bool KLineEdit::copySqueezedText(bool clipboard) const
return false;
TQString t = d->squeezedText;
t = t.mid(start, end - start);
- disconnect( TQApplication::tqclipboard(), TQT_SIGNAL(selectionChanged()), this, 0);
- TQApplication::tqclipboard()->setText( t, clipboard ? TQClipboard::Clipboard : TQClipboard::Selection );
- connect( TQApplication::tqclipboard(), TQT_SIGNAL(selectionChanged()), this,
+ disconnect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, 0);
+ TQApplication::clipboard()->setText( t, clipboard ? TQClipboard::Clipboard : TQClipboard::Selection );
+ connect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this,
TQT_SLOT(clipboardChanged()) );
return true;
}
@@ -453,7 +453,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
}
else if ( KStdAccel::pasteSelection().contains( key ) )
{
- TQString text = TQApplication::tqclipboard()->text( TQClipboard::Selection);
+ TQString text = TQApplication::clipboard()->text( TQClipboard::Selection);
insert( text );
deselect();
return;
@@ -575,7 +575,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
mode == KGlobalSettings::CompletionMan) && noModifier )
{
TQString keycode = e->text();
- if ( !keycode.isEmpty() && (keycode.tqunicode()->isPrint() ||
+ if ( !keycode.isEmpty() && (keycode.unicode()->isPrint() ||
e->key() == Key_Backspace || e->key() == Key_Delete ) )
{
bool hasUserSelection=d->userSelection;
@@ -658,7 +658,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
// as if there was no selection. After processing the key event, we
// can set the new autocompletion again.
if (hadSelection && !hasUserSelection && start>cPos &&
- ( (!keycode.isEmpty() && keycode.tqunicode()->isPrint()) ||
+ ( (!keycode.isEmpty() && keycode.unicode()->isPrint()) ||
e->key() == Key_Backspace || e->key() == Key_Delete ) )
{
del();
@@ -679,7 +679,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
int len = txt.length();
if ( txt != old_txt && len/* && ( cursorPosition() == len || force )*/ &&
- ( (!keycode.isEmpty() && keycode.tqunicode()->isPrint()) ||
+ ( (!keycode.isEmpty() && keycode.unicode()->isPrint()) ||
e->key() == Key_Backspace || e->key() == Key_Delete) )
{
if ( e->key() == Key_Backspace )
@@ -840,7 +840,7 @@ void KLineEdit::mousePressEvent( TQMouseEvent* e )
void KLineEdit::mouseReleaseEvent( TQMouseEvent* e )
{
TQLineEdit::mouseReleaseEvent( e );
- if (TQApplication::tqclipboard()->supportsSelection() ) {
+ if (TQApplication::clipboard()->supportsSelection() ) {
if ( e->button() == Qt::LeftButton ) {
// Fix copying of squeezed text if needed
copySqueezedText( false );
diff --git a/tdeui/klineeditdlg.cpp b/tdeui/klineeditdlg.cpp
index 9551fc1f6..f4081198c 100644
--- a/tdeui/klineeditdlg.cpp
+++ b/tdeui/klineeditdlg.cpp
@@ -22,7 +22,7 @@
#include <tqpushbutton.h>
#include <tqlineedit.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#undef Unsorted // Required for --enable-final (tqdir.h)
#include <tqfiledialog.h>
diff --git a/tdeui/klistbox.cpp b/tdeui/klistbox.cpp
index 30d418daf..13c5ab325 100644
--- a/tdeui/klistbox.cpp
+++ b/tdeui/klistbox.cpp
@@ -133,7 +133,7 @@ void KListBox::slotAutoSelect()
bool select = !m_pCurrentItem->isSelected();
bool update = viewport()->isUpdatesEnabled();
- viewport()->tqsetUpdatesEnabled( false );
+ viewport()->setUpdatesEnabled( false );
bool down = index( previousItem ) < index( m_pCurrentItem );
TQListBoxItem* it = down ? previousItem : m_pCurrentItem;
@@ -150,7 +150,7 @@ void KListBox::slotAutoSelect()
}
blockSignals( block );
- viewport()->tqsetUpdatesEnabled( update );
+ viewport()->setUpdatesEnabled( update );
triggerUpdate( false );
emit selectionChanged();
diff --git a/tdeui/klistview.cpp b/tdeui/klistview.cpp
index e7b13325d..fd5a6c51c 100644
--- a/tdeui/klistview.cpp
+++ b/tdeui/klistview.cpp
@@ -197,7 +197,7 @@ void KListViewLineEdit::load(TQListViewItem *i, int c)
item=i;
col=c;
- TQRect rect(p->tqitemRect(i));
+ TQRect rect(p->itemRect(i));
setText(item->text(c));
home( true );
@@ -621,7 +621,7 @@ void KListView::slotAutoSelect()
bool select = !d->pCurrentItem->isSelected();
bool update = viewport()->isUpdatesEnabled();
- viewport()->tqsetUpdatesEnabled( false );
+ viewport()->setUpdatesEnabled( false );
bool down = previousItem->itemPos() < d->pCurrentItem->itemPos();
TQListViewItemIterator lit( down ? previousItem : d->pCurrentItem );
@@ -638,7 +638,7 @@ void KListView::slotAutoSelect()
}
blockSignals( block );
- viewport()->tqsetUpdatesEnabled( update );
+ viewport()->setUpdatesEnabled( update );
triggerUpdate();
emit selectionChanged();
@@ -716,7 +716,7 @@ void KListView::focusInEvent( TQFocusEvent *fe )
&& (currentItem()))
{
currentItem()->setSelected(true);
- currentItem()->tqrepaint();
+ currentItem()->repaint();
emit selectionChanged();
};
}
@@ -736,7 +736,7 @@ void KListView::focusOutEvent( TQFocusEvent *fe )
&& (!d->editor->isVisible()))
{
currentItem()->setSelected(false);
- currentItem()->tqrepaint();
+ currentItem()->repaint();
emit selectionChanged();
};
@@ -776,7 +776,7 @@ void KListView::contentsMousePressEvent( TQMouseEvent *e )
if (currentItem())
{
currentItem()->setSelected(false);
- currentItem()->tqrepaint();
+ currentItem()->repaint();
// emit selectionChanged();
}
}
@@ -1008,7 +1008,7 @@ void KListView::contentsDragMoveEvent(TQDragMoveEvent *event)
{
cleanDropVisualizer();
d->mOldDropVisualizer=tmpRect;
- viewport()->tqrepaint(tmpRect);
+ viewport()->repaint(tmpRect);
}
}
if (dropHighlighter())
@@ -1018,7 +1018,7 @@ void KListView::contentsDragMoveEvent(TQDragMoveEvent *event)
{
cleanItemHighlighter();
d->mOldDropHighlighter=tmpRect;
- viewport()->tqrepaint(tmpRect);
+ viewport()->repaint(tmpRect);
}
}
}
@@ -1045,7 +1045,7 @@ void KListView::cleanDropVisualizer()
{
TQRect rect=d->mOldDropVisualizer;
d->mOldDropVisualizer = TQRect();
- viewport()->tqrepaint(rect, true);
+ viewport()->repaint(rect, true);
}
}
@@ -1067,7 +1067,7 @@ void KListView::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListView
else
{
// Get the closest item before us ('atpos' or the one above, if any)
- if (p.y() - tqitemRect(atpos).topLeft().y() < (atpos->height()/2))
+ if (p.y() - itemRect(atpos).topLeft().y() < (atpos->height()/2))
above = atpos->itemAbove();
else
above = atpos;
@@ -1327,12 +1327,12 @@ TQRect KListView::drawDropVisualizer(TQPainter *p, TQListViewItem *parent,
it = it->firstChild();
}
- insertmarker = tqitemRect (it ? it : after);
+ insertmarker = itemRect (it ? it : after);
level = after->depth();
}
else if (parent)
{
- insertmarker = tqitemRect (parent);
+ insertmarker = itemRect (parent);
level = parent->depth() + 1;
}
insertmarker.setLeft( treeStepSize() * ( level + (rootIsDecorated() ? 1 : 0) ) + itemMargin() );
@@ -1355,11 +1355,11 @@ TQRect KListView::drawItemHighlighter(TQPainter *painter, TQListViewItem *item)
if (item)
{
- r = tqitemRect(item);
+ r = itemRect(item);
r.setLeft(r.left()+(item->depth()+(rootIsDecorated() ? 1 : 0))*treeStepSize());
if (painter)
- tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, r, tqcolorGroup(),
- TQStyle::Style_FocusAtBorder, tqcolorGroup().highlight());
+ tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, r, colorGroup(),
+ TQStyle::Style_FocusAtBorder, colorGroup().highlight());
}
return r;
@@ -1371,7 +1371,7 @@ void KListView::cleanItemHighlighter ()
{
TQRect rect=d->mOldDropHighlighter;
d->mOldDropHighlighter = TQRect();
- viewport()->tqrepaint(rect, true);
+ viewport()->repaint(rect, true);
}
}
@@ -1482,7 +1482,7 @@ void KListView::activateAutomaticSelection()
if (currentItem())
{
currentItem()->setSelected(true);
- currentItem()->tqrepaint();
+ currentItem()->repaint();
emit selectionChanged();
};
}
@@ -1808,20 +1808,20 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e)
TQRect ir;
if (repaintItem1)
- ir = ir.unite( tqitemRect(repaintItem1) );
+ ir = ir.unite( itemRect(repaintItem1) );
if (repaintItem2)
- ir = ir.unite( tqitemRect(repaintItem2) );
+ ir = ir.unite( itemRect(repaintItem2) );
if ( !ir.isEmpty() )
{ // rectangle to be repainted
if ( ir.x() < 0 )
ir.moveBy( -ir.x(), 0 );
- viewport()->tqrepaint( ir, false );
+ viewport()->repaint( ir, false );
}
/*if (repaintItem1)
- repaintItem1->tqrepaint();
+ repaintItem1->repaint();
if (repaintItem2)
- repaintItem2->tqrepaint();*/
+ repaintItem2->repaint();*/
update();
if (emitSelectionChanged)
emit selectionChanged();
@@ -1895,7 +1895,7 @@ void KListView::emitContextMenu (KListView*, TQListViewItem* i)
TQPoint p;
if (i)
- p = viewport()->mapToGlobal(tqitemRect(i).center());
+ p = viewport()->mapToGlobal(itemRect(i).center());
else
p = mapToGlobal(rect().center());
@@ -1940,7 +1940,7 @@ void KListView::viewportPaintEvent(TQPaintEvent *e)
TQPainter painter(viewport());
// This is where we actually draw the drop-highlighter
- tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, d->mOldDropHighlighter, tqcolorGroup(),
+ tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, d->mOldDropHighlighter, colorGroup(),
TQStyle::Style_FocusAtBorder);
}
d->painting = false;
@@ -2001,13 +2001,13 @@ const TQColor &KListView::alternateBackground() const
void KListView::setAlternateBackground(const TQColor &c)
{
d->alternateBackground = c;
- tqrepaint();
+ repaint();
}
void KListView::setShadeSortColumn(bool shadeSortColumn)
{
d->shadeSortColumn = shadeSortColumn;
- tqrepaint();
+ repaint();
}
bool KListView::shadeSortColumn() const
@@ -2231,7 +2231,7 @@ const TQColor &KListViewItem::backgroundColor()
{
if (isAlternate())
return static_cast< KListView* >(listView())->alternateBackground();
- return listView()->viewport()->tqcolorGroup().base();
+ return listView()->viewport()->colorGroup().base();
}
TQColor KListViewItem::backgroundColor(int column)
@@ -2239,7 +2239,7 @@ TQColor KListViewItem::backgroundColor(int column)
KListView* view = static_cast< KListView* >(listView());
TQColor color = isAlternate() ?
view->alternateBackground() :
- view->viewport()->tqcolorGroup().base();
+ view->viewport()->colorGroup().base();
// calculate a different color if the current column is sorted (only if more than 1 column)
if ( (view->columns() > 1) && view->shadeSortColumn() && (column == view->columnSorted()) )
@@ -2335,7 +2335,7 @@ bool KListViewItem::isAlternate()
return false;
}
-void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
+void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
{
TQColorGroup _cg = cg;
TQListView* lv = listView();
@@ -2353,7 +2353,7 @@ void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column,
TQColorGroup::Background : TQColorGroup::Base,
backgroundColor(column));
}
- TQListViewItem::paintCell(p, _cg, column, width, tqalignment);
+ TQListViewItem::paintCell(p, _cg, column, width, alignment);
}
void KListView::virtual_hook( int, void* )
diff --git a/tdeui/klistview.h b/tdeui/klistview.h
index 07b514457..ed101927f 100644
--- a/tdeui/klistview.h
+++ b/tdeui/klistview.h
@@ -685,7 +685,7 @@ protected:
*/
inline bool below (TQListViewItem* i, const TQPoint& p)
{
- return below (tqitemRect(i), contentsToViewport(p));
+ return below (itemRect(i), contentsToViewport(p));
}
/**
@@ -1070,7 +1070,7 @@ public:
TQColor backgroundColor(int column);
virtual void paintCell(TQPainter *p, const TQColorGroup &cg,
- int column, int width, int tqalignment);
+ int column, int width, int alignment);
private:
void init();
diff --git a/tdeui/klistviewsearchline.cpp b/tdeui/klistviewsearchline.cpp
index fb02a8259..7f96ed94d 100644
--- a/tdeui/klistviewsearchline.cpp
+++ b/tdeui/klistviewsearchline.cpp
@@ -145,7 +145,7 @@ void KListViewSearchLine::updateSearch(const TQString &s)
it.current() && !currentItem;
++it)
{
- if(d->listView->tqitemRect(it.current()).isValid())
+ if(d->listView->itemRect(it.current()).isValid())
currentItem = it.current();
}
}
@@ -302,7 +302,7 @@ void KListViewSearchLine::activateSearch()
void KListViewSearchLine::itemAdded(TQListViewItem *item) const
{
- item->tqsetVisible(itemMatches(item, text()));
+ item->setVisible(itemMatches(item, text()));
}
void KListViewSearchLine::listViewDeleted()
@@ -347,9 +347,9 @@ void KListViewSearchLine::checkItemParentsNotVisible()
{
TQListViewItem *item = it.current();
if(itemMatches(item, d->search))
- item->tqsetVisible(true);
+ item->setVisible(true);
else
- item->tqsetVisible(false);
+ item->setVisible(false);
}
}
@@ -381,23 +381,23 @@ bool KListViewSearchLine::checkItemParentsVisible(TQListViewItem *item, TQListVi
visible = true;
if (highestHiddenParent)
{
- highestHiddenParent->tqsetVisible(true);
- // Calling tqsetVisible on our ancestor will unhide all its descendents. Hide the ones
+ highestHiddenParent->setVisible(true);
+ // Calling setVisible on our ancestor will unhide all its descendents. Hide the ones
// before us that should not be shown.
for(TQListViewItem *hide = first; hide != item; hide = hide->nextSibling())
- hide->tqsetVisible(false);
+ hide->setVisible(false);
highestHiddenParent = 0;
- // If we matched, than none of our children matched, yet the tqsetVisible() call on our
+ // If we matched, than none of our children matched, yet the setVisible() call on our
// ancestor unhid them, undo the damage:
if(!childMatch)
for(TQListViewItem *hide = item->firstChild(); hide; hide = hide->nextSibling())
- hide->tqsetVisible(false);
+ hide->setVisible(false);
}
else
- item->tqsetVisible(true);
+ item->setVisible(true);
}
else
- item->tqsetVisible(false);
+ item->setVisible(false);
}
return visible;
}
diff --git a/tdeui/kmainwindow.cpp b/tdeui/kmainwindow.cpp
index e7d5469dc..67e314fa0 100644
--- a/tdeui/kmainwindow.cpp
+++ b/tdeui/kmainwindow.cpp
@@ -30,7 +30,7 @@
#include <tqsessionmanager.h>
#include <tqobjectlist.h>
#include <tqstyle.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqwidgetlist.h>
#include <tqtimer.h>
@@ -105,8 +105,8 @@ public:
n++;
it.current()->savePropertiesInternal(config, n);
}
- config->setGroup(TQString::tqfromLatin1("Number"));
- config->writeEntry(TQString::tqfromLatin1("NumberOfWindows"), n );
+ config->setGroup(TQString::fromLatin1("Number"));
+ config->writeEntry(TQString::fromLatin1("NumberOfWindows"), n );
return true;
}
@@ -212,7 +212,7 @@ void KMainWindow::initKMainWindow(const char *name, int cflags)
unusedNumber = 0; // add numbers only when needed
}
for(;;) {
- TQWidgetList* list = kapp->tqtopLevelWidgets();
+ TQWidgetList* list = kapp->topLevelWidgets();
TQWidgetListIt it( *list );
bool found = false;
for( TQWidget* w = it.current();
@@ -286,8 +286,8 @@ void KMainWindow::parseGeometry(bool parsewidth)
int w, h;
int m = XParseGeometry( kapp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h);
if (parsewidth) {
- TQSize minSize = tqminimumSize();
- TQSize maxSize = tqmaximumSize();
+ TQSize minSize = minimumSize();
+ TQSize maxSize = maximumSize();
if ( !(m & WidthValue) )
w = width();
if ( !(m & HeightValue) )
@@ -356,8 +356,8 @@ bool KMainWindow::canBeRestored( int number )
KConfig *config = kapp->sessionConfig();
if ( !config )
return false;
- config->setGroup( TQString::tqfromLatin1("Number") );
- int n = config->readNumEntry( TQString::tqfromLatin1("NumberOfWindows") , 1 );
+ config->setGroup( TQString::fromLatin1("Number") );
+ int n = config->readNumEntry( TQString::fromLatin1("NumberOfWindows") , 1 );
return number >= 1 && number <= n;
}
@@ -370,12 +370,12 @@ const TQString KMainWindow::classNameOfToplevel( int number )
return TQString::null;
TQString s;
s.setNum( number );
- s.prepend( TQString::tqfromLatin1("WindowProperties") );
+ s.prepend( TQString::fromLatin1("WindowProperties") );
config->setGroup( s );
- if ( !config->hasKey( TQString::tqfromLatin1("ClassName") ) )
+ if ( !config->hasKey( TQString::fromLatin1("ClassName") ) )
return TQString::null;
else
- return config->readEntry( TQString::tqfromLatin1("ClassName") );
+ return config->readEntry( TQString::fromLatin1("ClassName") );
}
void KMainWindow::show()
@@ -491,7 +491,7 @@ void KMainWindow::setupGUI( TQSize defaultSize, int options, const TQString & xm
void KMainWindow::createGUI( const TQString &xmlfile, bool _conserveMemory )
{
// disabling the updates prevents unnecessary redraws
- tqsetUpdatesEnabled( false );
+ setUpdatesEnabled( false );
// just in case we are rebuilding, let's remove our old client
guiFactory()->removeClient( this );
@@ -564,7 +564,7 @@ void KMainWindow::createGUI( const TQString &xmlfile, bool _conserveMemory )
conserveMemory();
}
- tqsetUpdatesEnabled( true );
+ setUpdatesEnabled( true );
updateGeometry();
}
@@ -696,13 +696,13 @@ void KMainWindow::savePropertiesInternal( KConfig *config, int number )
TQString s;
s.setNum(number);
- s.prepend(TQString::tqfromLatin1("WindowProperties"));
+ s.prepend(TQString::fromLatin1("WindowProperties"));
config->setGroup(s);
// store objectName, className, Width and Height for later restoring
// (Only useful for session management)
- config->writeEntry(TQString::tqfromLatin1("ObjectName"), name());
- config->writeEntry(TQString::tqfromLatin1("ClassName"), className());
+ config->writeEntry(TQString::fromLatin1("ObjectName"), name());
+ config->writeEntry(TQString::fromLatin1("ClassName"), className());
saveMainWindowSettings(config); // Menubar, statusbar and Toolbar settings.
@@ -738,7 +738,7 @@ void KMainWindow::saveMainWindowSettings(KConfig *config, const TQString &config
TQMenuBar* mb = internalMenuBar();
if (mb) {
- TQString MenuBar = TQString::tqfromLatin1("MenuBar");
+ TQString MenuBar = TQString::fromLatin1("MenuBar");
if(!config->hasDefault("MenuBar") && !mb->isHidden() )
config->revertToDefault("MenuBar");
else
@@ -810,13 +810,13 @@ bool KMainWindow::readPropertiesInternal( KConfig *config, int number )
// in order they are in toolbar list
TQString s;
s.setNum(number);
- s.prepend(TQString::tqfromLatin1("WindowProperties"));
+ s.prepend(TQString::fromLatin1("WindowProperties"));
config->setGroup(s);
// restore the object name (window role)
- if ( config->hasKey(TQString::tqfromLatin1("ObjectName" )) )
- setName( config->readEntry(TQString::tqfromLatin1("ObjectName")).latin1()); // latin1 is right here
+ if ( config->hasKey(TQString::fromLatin1("ObjectName" )) )
+ setName( config->readEntry(TQString::fromLatin1("ObjectName")).latin1()); // latin1 is right here
applyMainWindowSettings(config); // Menubar, statusbar and toolbar settings.
@@ -918,8 +918,8 @@ void KMainWindow::saveWindowSize( KConfig * config ) const
#endif
TQRect size( desk.width(), w, desk.height(), h );
bool defaultSize = (size == d->defaultWindowSize);
- TQString widthString = TQString::tqfromLatin1("Width %1").arg(desk.width());
- TQString heightString = TQString::tqfromLatin1("Height %1").arg(desk.height());
+ TQString widthString = TQString::fromLatin1("Width %1").arg(desk.width());
+ TQString heightString = TQString::fromLatin1("Height %1").arg(desk.height());
if (!config->hasDefault(widthString) && defaultSize)
config->revertToDefault(widthString);
else
@@ -941,16 +941,16 @@ void KMainWindow::restoreWindowSize( KConfig * config )
TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
if ( d->defaultWindowSize.isNull() ) // only once
d->defaultWindowSize = TQRect(desk.width(), width(), desk.height(), height()); // store default values
- TQSize size( config->readNumEntry( TQString::tqfromLatin1("Width %1").arg(desk.width()), 0 ),
- config->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 ) );
+ TQSize size( config->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 ),
+ config->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 ) );
if (size.isEmpty()) {
// try the KDE 2.0 way
- size = TQSize( config->readNumEntry( TQString::tqfromLatin1("Width"), 0 ),
- config->readNumEntry( TQString::tqfromLatin1("Height"), 0 ) );
+ size = TQSize( config->readNumEntry( TQString::fromLatin1("Width"), 0 ),
+ config->readNumEntry( TQString::fromLatin1("Height"), 0 ) );
if (!size.isEmpty()) {
// make sure the other resolutions don't get old settings
- config->writeEntry( TQString::tqfromLatin1("Width"), 0 );
- config->writeEntry( TQString::tqfromLatin1("Height"), 0 );
+ config->writeEntry( TQString::fromLatin1("Width"), 0 );
+ config->writeEntry( TQString::fromLatin1("Height"), 0 );
}
}
if ( !size.isEmpty() ) {
@@ -1197,7 +1197,7 @@ TQSize KMainWindow::sizeForCentralWidgetSize(TQSize size)
break;
case KToolBar::Flat:
- size += TQSize(0, 3+kapp->tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent ));
+ size += TQSize(0, 3+kapp->tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent ));
break;
default:
@@ -1207,7 +1207,7 @@ TQSize KMainWindow::sizeForCentralWidgetSize(TQSize size)
KMenuBar *mb = internalMenuBar();
if (mb && !mb->isHidden()) {
size += TQSize(0,mb->heightForWidth(size.width()));
- if (tqstyle().tqstyleHint(TQStyle::SH_MainWindow_SpaceBelowMenuBar, this))
+ if (tqstyle().styleHint(TQStyle::SH_MainWindow_SpaceBelowMenuBar, this))
size += TQSize( 0, dockWindowsMovable() ? 1 : 2);
}
TQStatusBar *sb = internalStatusBar();
diff --git a/tdeui/kmainwindow.h b/tdeui/kmainwindow.h
index 8fb99fb2e..8aba596f1 100644
--- a/tdeui/kmainwindow.h
+++ b/tdeui/kmainwindow.h
@@ -455,7 +455,7 @@ public:
* "virtual TQSize sizeHint() const;" to specify a default size rather
* than letting TQWidget::adjust use the default size of 0x0.
*/
- void setAutoSaveSettings( const TQString & groupName = TQString::tqfromLatin1("MainWindow"),
+ void setAutoSaveSettings( const TQString & groupName = TQString::fromLatin1("MainWindow"),
bool saveWindowSize = true );
/**
@@ -1036,7 +1036,7 @@ template <typename T>
inline void kRestoreMainWindows() {
for ( int n = 1 ; KMainWindow::canBeRestored( n ) ; ++n ) {
const TQString className = KMainWindow::classNameOfToplevel( n );
- if ( className == TQString::tqfromLatin1( T::staticMetaObject()->className() ) )
+ if ( className == TQString::fromLatin1( T::staticMetaObject()->className() ) )
(new T)->restore( n );
}
}
@@ -1048,9 +1048,9 @@ inline void kRestoreMainWindows() {
classNames[1] = T1::staticMetaObject()->className();
for ( int n = 1 ; KMainWindow::canBeRestored( n ) ; ++n ) {
const TQString className = KMainWindow::classNameOfToplevel( n );
- if ( className == TQString::tqfromLatin1( classNames[0] ) )
+ if ( className == TQString::fromLatin1( classNames[0] ) )
(new T0)->restore( n );
- else if ( className == TQString::tqfromLatin1( classNames[1] ) )
+ else if ( className == TQString::fromLatin1( classNames[1] ) )
(new T1)->restore( n );
}
}
@@ -1063,11 +1063,11 @@ inline void kRestoreMainWindows() {
classNames[2] = T2::staticMetaObject()->className();
for ( int n = 1 ; KMainWindow::canBeRestored( n ) ; ++n ) {
const TQString className = KMainWindow::classNameOfToplevel( n );
- if ( className == TQString::tqfromLatin1( classNames[0] ) )
+ if ( className == TQString::fromLatin1( classNames[0] ) )
(new T0)->restore( n );
- else if ( className == TQString::tqfromLatin1( classNames[1] ) )
+ else if ( className == TQString::fromLatin1( classNames[1] ) )
(new T1)->restore( n );
- else if ( className == TQString::tqfromLatin1( classNames[2] ) )
+ else if ( className == TQString::fromLatin1( classNames[2] ) )
(new T2)->restore( n );
}
}
diff --git a/tdeui/kmainwindowiface.cpp b/tdeui/kmainwindowiface.cpp
index 9394d27bb..966d22320 100644
--- a/tdeui/kmainwindowiface.cpp
+++ b/tdeui/kmainwindowiface.cpp
@@ -25,7 +25,7 @@
#include <kdcoppropertyproxy.h>
#include <kmainwindow.h>
#include <kaction.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
KMainWindowInterface::KMainWindowInterface(KMainWindow * mainWindow)
@@ -135,7 +135,7 @@ int KMainWindowInterface::getWinID()
}
void KMainWindowInterface::grabWindowToClipBoard()
{
- TQClipboard *clipboard = TQApplication::tqclipboard();
+ TQClipboard *clipboard = TQApplication::clipboard();
clipboard->setPixmap(TQPixmap::grabWidget(m_MainWindow));
}
void KMainWindowInterface::hide()
diff --git a/tdeui/kmenubar.cpp b/tdeui/kmenubar.cpp
index b8f0f3326..4aab91980 100644
--- a/tdeui/kmenubar.cpp
+++ b/tdeui/kmenubar.cpp
@@ -168,7 +168,7 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level)
d->wasTopLevel = top_level;
if( parentWidget()
- && parentWidget()->tqtopLevelWidget()->isFullScreen())
+ && parentWidget()->topLevelWidget()->isFullScreen())
top_level = false;
if ( isTopLevelMenu() == top_level )
@@ -193,7 +193,7 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level)
#ifdef Q_WS_X11
KWin::setType( winId(), NET::TopMenu );
if( parentWidget())
- XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->tqtopLevelWidget()->winId());
+ XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId());
#endif
TQMenuBar::setFrameStyle( NoFrame );
TQMenuBar::setLineWidth( 0 );
@@ -244,13 +244,13 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev)
{
if ( d->topLevel )
{
- if ( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()->tqtopLevelWidget()) )
+ if ( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()->topLevelWidget()) )
{
if( ev->type() == TQEvent::Resize )
return false; // ignore resizing of parent, TQMenuBar would try to adjust size
if ( ev->type() == TQEvent::Accel || ev->type() == TQEvent::AccelAvailable )
{
- if ( TQApplication::sendEvent( tqtopLevelWidget(), ev ) )
+ if ( TQApplication::sendEvent( topLevelWidget(), ev ) )
return true;
}
if(ev->type() == TQEvent::ShowFullScreen )
@@ -260,7 +260,7 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev)
if( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()) && ev->type() == TQEvent::Reparent )
{
#ifdef Q_WS_X11
- XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->tqtopLevelWidget()->winId());
+ XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId());
#else
//TODO: WIN32?
#endif
@@ -271,7 +271,7 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev)
if( ev->type() == TQEvent::Show )
{
#ifdef Q_WS_X11
- XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->tqtopLevelWidget()->winId());
+ XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId());
#else
//TODO: WIN32?
#endif
@@ -283,10 +283,10 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev)
}
else
{
- if( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()->tqtopLevelWidget()))
+ if( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()->topLevelWidget()))
{
if( ev->type() == TQEvent::WindowStateChange
- && !parentWidget()->tqtopLevelWidget()->isFullScreen() )
+ && !parentWidget()->topLevelWidget()->isFullScreen() )
setTopLevelMenuInternal( d->wasTopLevel );
}
}
@@ -506,14 +506,14 @@ void KMenuBar::drawContents( TQPainter* p )
BackgroundMode bg_mode = backgroundMode();
BackgroundOrigin bg_origin = backgroundOrigin();
- tqsetUpdatesEnabled(false);
+ setUpdatesEnabled(false);
setBackgroundMode(X11ParentRelative);
setBackgroundOrigin(WindowOrigin);
p->eraseRect( rect() );
erase();
- TQColorGroup g = tqcolorGroup();
+ TQColorGroup g = colorGroup();
bool e;
for ( int i=0; i<(int)count(); i++ )
@@ -522,16 +522,16 @@ void KMenuBar::drawContents( TQPainter* p )
if ( !mi->text().isNull() || mi->pixmap() )
{
- TQRect r = tqitemRect(i);
+ TQRect r = itemRect(i);
if(r.isEmpty() || !mi->isVisible())
continue;
e = mi->isEnabledAndVisible();
if ( e )
- g = isEnabled() ? ( isActiveWindow() ? tqpalette().active() :
- tqpalette().inactive() ) : tqpalette().disabled();
+ g = isEnabled() ? ( isActiveWindow() ? palette().active() :
+ palette().inactive() ) : palette().disabled();
else
- g = tqpalette().disabled();
+ g = palette().disabled();
bool item_active = ( actItem == i );
@@ -548,7 +548,7 @@ void KMenuBar::drawContents( TQPainter* p )
flags |= TQStyle::Style_Down;
flags |= TQStyle::Style_HasFocus;
- tqstyle().tqdrawControl(TQStyle::CE_MenuBarItem, p, this,
+ tqstyle().drawControl(TQStyle::CE_MenuBarItem, p, this,
r, g, flags, TQStyleOption(mi));
}
else
@@ -561,7 +561,7 @@ void KMenuBar::drawContents( TQPainter* p )
setBackgroundOrigin(bg_origin);
setBackgroundMode(bg_mode);
- tqsetUpdatesEnabled(up_enabled);
+ setUpdatesEnabled(up_enabled);
}
}
diff --git a/tdeui/kmessagebox.cpp b/tdeui/kmessagebox.cpp
index 43284076c..a6fc740d0 100644
--- a/tdeui/kmessagebox.cpp
+++ b/tdeui/kmessagebox.cpp
@@ -26,10 +26,10 @@
#include <tqstringlist.h>
#include <tqvbox.h>
#include <tqvgroupbox.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
#include <tqsimplerichtext.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kapplication.h>
#include <kconfig.h>
@@ -288,7 +288,7 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon,
btn->setFocus();
if ( (options & KMessageBox::Notify) )
- sendNotification( text, strlist, notifyType, dialog->tqtopLevelWidget()->winId());
+ sendNotification( text, strlist, notifyType, dialog->topLevelWidget()->winId());
if (KMessageBox_queue)
{
@@ -342,7 +342,7 @@ KMessageBox::shouldBeShownYesNo(const TQString &dontShowAgainName,
ButtonCode &result)
{
if ( dontShowAgainName.isEmpty() ) return true;
- TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages");
+ TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
KConfig *config = againConfig ? againConfig : KGlobal::config();
KConfigGroupSaver saver( config, grpNotifMsgs );
TQString dontAsk = config->readEntry(dontShowAgainName).lower();
@@ -361,7 +361,7 @@ bool
KMessageBox::shouldBeShownContinue(const TQString &dontShowAgainName)
{
if ( dontShowAgainName.isEmpty() ) return true;
- TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages");
+ TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
KConfig *config = againConfig ? againConfig : KGlobal::config();
KConfigGroupSaver saver( config, grpNotifMsgs );
return config->readBoolEntry(dontShowAgainName, true);
@@ -372,7 +372,7 @@ KMessageBox::saveDontShowAgainYesNo(const TQString &dontShowAgainName,
ButtonCode result)
{
if ( dontShowAgainName.isEmpty() ) return;
- TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages");
+ TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
KConfig *config = againConfig ? againConfig : KGlobal::config();
KConfigGroupSaver saver( config, grpNotifMsgs );
config->writeEntry( dontShowAgainName, result==Yes ? "yes" : "no", true, (dontShowAgainName[0] == ':'));
@@ -383,7 +383,7 @@ void
KMessageBox::saveDontShowAgainContinue(const TQString &dontShowAgainName)
{
if ( dontShowAgainName.isEmpty() ) return;
- TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages");
+ TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
KConfig *config = againConfig ? againConfig : KGlobal::config();
KConfigGroupSaver saver( config, grpNotifMsgs );
config->writeEntry( dontShowAgainName, false, true, (dontShowAgainName[0] == ':'));
@@ -936,7 +936,7 @@ void
KMessageBox::enableAllMessages()
{
KConfig *config = againConfig ? againConfig : KGlobal::config();
- TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages");
+ TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
if (!config->hasGroup(grpNotifMsgs))
return;
@@ -956,7 +956,7 @@ void
KMessageBox::enableMessage(const TQString &dontShowAgainName)
{
KConfig *config = againConfig ? againConfig : KGlobal::config();
- TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages");
+ TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
if (!config->hasGroup(grpNotifMsgs))
return;
diff --git a/tdeui/knuminput.cpp b/tdeui/knuminput.cpp
index 19c3268af..27b86f98e 100644
--- a/tdeui/knuminput.cpp
+++ b/tdeui/knuminput.cpp
@@ -86,7 +86,7 @@ void KNumInput::init()
m_label = 0;
m_slider = 0;
- m_tqalignment = 0;
+ m_alignment = 0;
}
KNumInput::~KNumInput()
@@ -103,17 +103,17 @@ void KNumInput::setLabel(const TQString & label, int a)
if(label.isEmpty()) {
delete m_label;
m_label = 0;
- m_tqalignment = 0;
+ m_alignment = 0;
}
else {
if (m_label) m_label->setText(label);
else m_label = new TQLabel(label, this, "KNumInput::TQLabel");
m_label->setAlignment((a & (~(AlignTop|AlignBottom|AlignVCenter)))
| AlignVCenter);
- // if no vertical tqalignment set, use Top tqalignment
+ // if no vertical alignment set, use Top alignment
if(!(a & (AlignTop|AlignBottom|AlignVCenter)))
a |= AlignTop;
- m_tqalignment = a;
+ m_alignment = a;
}
layout(true);
@@ -133,7 +133,7 @@ void KNumInput::layout(bool deep)
// label sizeHint
m_sizeLabel = (m_label ? m_label->sizeHint() : TQSize(0,0));
- if(m_label && (m_tqalignment & AlignVCenter))
+ if(m_label && (m_alignment & AlignVCenter))
m_colw1 = m_sizeLabel.width() + 4;
else
m_colw1 = 0;
@@ -422,7 +422,7 @@ TQSize KIntNumInput::minimumSizeHint() const
h = 2 + QMAX(m_sizeSpin.height(), m_sizeSlider.height());
// if in extra row, then count it here
- if(m_label && (m_tqalignment & (AlignBottom|AlignTop)))
+ if(m_label && (m_alignment & (AlignBottom|AlignTop)))
h += 4 + m_sizeLabel.height();
else
// label is in the same row as the other widgets
@@ -431,7 +431,7 @@ TQSize KIntNumInput::minimumSizeHint() const
w = m_slider ? m_slider->sizeHint().width() + 8 : 0;
w += m_colw1 + m_colw2;
- if(m_tqalignment & (AlignTop|AlignBottom))
+ if(m_alignment & (AlignTop|AlignBottom))
w = QMAX(w, m_sizeLabel.width() + 4);
return TQSize(w, h);
@@ -451,12 +451,12 @@ void KIntNumInput::resizeEvent(TQResizeEvent* e)
int w = m_colw1;
int h = 0;
- if(m_label && (m_tqalignment & AlignTop)) {
+ if(m_label && (m_alignment & AlignTop)) {
m_label->setGeometry(0, 0, e->size().width(), m_sizeLabel.height());
h += m_sizeLabel.height() + KDialog::spacingHint();
}
- if(m_label && (m_tqalignment & AlignVCenter))
+ if(m_label && (m_alignment & AlignVCenter))
m_label->setGeometry(0, 0, w, m_sizeSpin.height());
if (tqApp->reverseLayout())
@@ -477,7 +477,7 @@ void KIntNumInput::resizeEvent(TQResizeEvent* e)
h += m_sizeSpin.height() + 2;
- if(m_label && (m_tqalignment & AlignBottom))
+ if(m_label && (m_alignment & AlignBottom))
m_label->setGeometry(0, h, m_sizeLabel.width(), m_sizeLabel.height());
}
@@ -663,7 +663,7 @@ TQSize KDoubleNumInput::minimumSizeHint() const
h = 2 + QMAX(m_sizeEdit.height(), m_sizeSlider.height());
// if in extra row, then count it here
- if(m_label && (m_tqalignment & (AlignBottom|AlignTop)))
+ if(m_label && (m_alignment & (AlignBottom|AlignTop)))
h += 4 + m_sizeLabel.height();
else
// label is in the same row as the other widgets
@@ -672,7 +672,7 @@ TQSize KDoubleNumInput::minimumSizeHint() const
w = m_slider ? m_slider->sizeHint().width() + 8 : 0;
w += m_colw1 + m_colw2;
- if(m_tqalignment & (AlignTop|AlignBottom))
+ if(m_alignment & (AlignTop|AlignBottom))
w = QMAX(w, m_sizeLabel.width() + 4);
return TQSize(w, h);
@@ -683,12 +683,12 @@ void KDoubleNumInput::resizeEvent(TQResizeEvent* e)
int w = m_colw1;
int h = 0;
- if(m_label && (m_tqalignment & AlignTop)) {
+ if(m_label && (m_alignment & AlignTop)) {
m_label->setGeometry(0, 0, e->size().width(), m_sizeLabel.height());
h += m_sizeLabel.height() + 4;
}
- if(m_label && (m_tqalignment & AlignVCenter))
+ if(m_label && (m_alignment & AlignVCenter))
m_label->setGeometry(0, 0, w, m_sizeEdit.height());
if (tqApp->reverseLayout())
@@ -713,7 +713,7 @@ void KDoubleNumInput::resizeEvent(TQResizeEvent* e)
h += m_sizeEdit.height() + 2;
- if(m_label && (m_tqalignment & AlignBottom))
+ if(m_label && (m_alignment & AlignBottom))
m_label->setGeometry(0, h, m_sizeLabel.width(), m_sizeLabel.height());
}
diff --git a/tdeui/knuminput.h b/tdeui/knuminput.h
index c0a6d1847..5f0127cda 100644
--- a/tdeui/knuminput.h
+++ b/tdeui/knuminput.h
@@ -68,7 +68,7 @@ public:
~KNumInput();
/**
- * Sets the text and tqalignment of the main description label.
+ * Sets the text and alignment of the main description label.
*
* @param label The text of the label.
* Use TQString::null to remove an existing one.
@@ -77,7 +77,7 @@ public:
* @p AlignTop, @p AlignVCenter, @p AlignBottom.
* default is @p AlignLeft | @p AlignTop.
*
- * The vertical tqalignment flags have special meaning with this
+ * The vertical alignment flags have special meaning with this
* widget:
*
* @li @p AlignTop The label is placed above the edit/slider
@@ -144,7 +144,7 @@ protected:
TQSlider* m_slider;
TQSize m_sizeSlider, m_sizeLabel;
- int m_tqalignment;
+ int m_alignment;
private:
void init();
@@ -314,7 +314,7 @@ public:
/**
* This method returns the minimum size necessary to display the
* control. The minimum size is enough to show all the labels
- * in the current font (font change may tqinvalidate the return value).
+ * in the current font (font change may invalidate the return value).
*
* @return the minimum size necessary to show the control
*/
diff --git a/tdeui/knumvalidator.cpp b/tdeui/knumvalidator.cpp
index 5ab97e840..fdc51022c 100644
--- a/tdeui/knumvalidator.cpp
+++ b/tdeui/knumvalidator.cpp
@@ -67,7 +67,7 @@ TQValidator::State KIntValidator::validate ( TQString &str, int & ) const
if (_base > 10)
newStr = newStr.upper();
- if (newStr == TQString::tqfromLatin1("-")) // a special case
+ if (newStr == TQString::fromLatin1("-")) // a special case
if ((_min || _max) && _min >= 0)
ok = false;
else
@@ -209,12 +209,12 @@ TQValidator::State KFloatValidator::validate ( TQString &str, int & ) const
TQString newStr;
newStr = str.stripWhiteSpace();
- if (newStr == TQString::tqfromLatin1("-")) // a special case
+ if (newStr == TQString::fromLatin1("-")) // a special case
if ((_min || _max) && _min >= 0)
ok = false;
else
return TQValidator::Acceptable;
- else if (newStr == TQString::tqfromLatin1(".") || (d->acceptLocalizedNumbers && newStr==KGlobal::locale()->decimalSymbol())) // another special case
+ else if (newStr == TQString::fromLatin1(".") || (d->acceptLocalizedNumbers && newStr==KGlobal::locale()->decimalSymbol())) // another special case
return TQValidator::Acceptable;
else if (newStr.length())
{
diff --git a/tdeui/kpanelapplet.cpp b/tdeui/kpanelapplet.cpp
index f04cd2177..7ca2999f1 100644
--- a/tdeui/kpanelapplet.cpp
+++ b/tdeui/kpanelapplet.cpp
@@ -47,7 +47,7 @@ KPanelApplet::KPanelApplet(const TQString& configFile, Type type,
: TQFrame(parent, name, f)
, _type(type)
, _position( pBottom )
- , _tqalignment( LeftTop )
+ , _alignment( LeftTop )
, _config(0)
, _actions(actions)
, d(new KPanelApplet::KPanelAppletPrivate())
@@ -80,8 +80,8 @@ void KPanelApplet::setPosition( Position p )
void KPanelApplet::setAlignment( Alignment a )
{
- if( _tqalignment == a ) return;
- _tqalignment = a;
+ if( _alignment == a ) return;
+ _alignment = a;
alignmentChange( a );
}
diff --git a/tdeui/kpanelapplet.h b/tdeui/kpanelapplet.h
index a51f16fda..0d3ac430f 100644
--- a/tdeui/kpanelapplet.h
+++ b/tdeui/kpanelapplet.h
@@ -308,9 +308,9 @@ protected:
**/
Position position() const { return _position; }
/**
- * @return the applet's tqalignment. (top/left, center, or bottom/right)
+ * @return the applet's alignment. (top/left, center, or bottom/right)
**/
- Alignment tqalignment() const { return _tqalignment; }
+ Alignment alignment() const { return _alignment; }
/**
* The panel on which this applet resides has changed its position.
@@ -320,7 +320,7 @@ protected:
virtual void positionChange( Position p );
/**
- * The panel on which this applet resides has changed its tqalignment.
+ * The panel on which this applet resides has changed its alignment.
* Reimplement this change handler in order to adjust the look of your
* applet.
**/
@@ -383,7 +383,7 @@ protected:
private:
Type _type;
Position _position;
- Alignment _tqalignment;
+ Alignment _alignment;
KConfig* _config;
int _actions;
protected:
diff --git a/tdeui/kpanelextension.cpp b/tdeui/kpanelextension.cpp
index e9cd564bd..47ddd7d95 100644
--- a/tdeui/kpanelextension.cpp
+++ b/tdeui/kpanelextension.cpp
@@ -49,7 +49,7 @@ KPanelExtension::KPanelExtension(const TQString& configFile, Type type,
: TQFrame(parent, name)
, _type(type)
, _position( Top )
- , _tqalignment( LeftTop )
+ , _alignment( LeftTop )
, _config(0)
, _actions(actions)
{
@@ -73,8 +73,8 @@ void KPanelExtension::setPosition( Position p )
void KPanelExtension::setAlignment( Alignment a )
{
- if( _tqalignment == a ) return;
- _tqalignment = a;
+ if( _alignment == a ) return;
+ _alignment = a;
alignmentChange( a );
}
diff --git a/tdeui/kpanelextension.h b/tdeui/kpanelextension.h
index 5045d5205..cdc97d14c 100644
--- a/tdeui/kpanelextension.h
+++ b/tdeui/kpanelextension.h
@@ -282,9 +282,9 @@ protected:
Position position() const { return _position; }
/**
- * @return the extension's tqalignment. (left/top, center, or right/bottom)
+ * @return the extension's alignment. (left/top, center, or right/bottom)
**/
- Alignment tqalignment() const { return _tqalignment; }
+ Alignment alignment() const { return _alignment; }
/**
* @return the extensions orientation. (horizontal or vertical)
@@ -305,7 +305,7 @@ protected:
virtual void positionChange( Position ) {}
/**
- * This extension has changed its tqalignment.
+ * This extension has changed its alignment.
* Reimplement this change handler in order to adjust the look of your
* applet.
**/
@@ -333,7 +333,7 @@ protected:
private:
Type _type;
Position _position;
- Alignment _tqalignment;
+ Alignment _alignment;
KConfig* _config;
int _actions;
protected:
diff --git a/tdeui/kpassdlg.cpp b/tdeui/kpassdlg.cpp
index 8d024ac32..42c374998 100644
--- a/tdeui/kpassdlg.cpp
+++ b/tdeui/kpassdlg.cpp
@@ -23,7 +23,7 @@
#include <tqwidget.h>
#include <tqlineedit.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqsize.h>
#include <tqevent.h>
#include <tqkeycode.h>
@@ -187,9 +187,9 @@ void KPasswordEdit::erase()
void KPasswordEdit::focusInEvent(TQFocusEvent *e)
{
const TQString txt = text();
- tqsetUpdatesEnabled(false);
+ setUpdatesEnabled(false);
TQLineEdit::focusInEvent(e);
- tqsetUpdatesEnabled(true);
+ setUpdatesEnabled(true);
setText(txt);
}
diff --git a/tdeui/kpassivepopup.cpp b/tdeui/kpassivepopup.cpp
index b348e1040..b91ab20a6 100644
--- a/tdeui/kpassivepopup.cpp
+++ b/tdeui/kpassivepopup.cpp
@@ -10,7 +10,7 @@
#include <tqapplication.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtimer.h>
#include <tqvbox.h>
#include <tqpainter.h>
diff --git a/tdeui/kpixmapregionselectorwidget.cpp b/tdeui/kpixmapregionselectorwidget.cpp
index 615b50a23..5bc953979 100644
--- a/tdeui/kpixmapregionselectorwidget.cpp
+++ b/tdeui/kpixmapregionselectorwidget.cpp
@@ -27,7 +27,7 @@
#include <tqpainter.h>
#include <tqcolor.h>
#include <tqimage.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kimageeffect.h>
#include <kdebug.h>
#include <klocale.h>
diff --git a/tdeui/kpopupmenu.cpp b/tdeui/kpopupmenu.cpp
index 7ca5ea21f..3b56dc873 100644
--- a/tdeui/kpopupmenu.cpp
+++ b/tdeui/kpopupmenu.cpp
@@ -90,14 +90,14 @@ void KPopupTitle::paintEvent(TQPaintEvent *)
{
TQRect r(rect());
TQPainter p(this);
- kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_HeaderSectionMenu, &p, r, tqpalette().active());
+ kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_HeaderSectionMenu, &p, r, palette().active());
if (!miniicon.isNull())
p.drawPixmap(4, (r.height()-miniicon.height())/2, miniicon);
if (!titleStr.isNull())
{
- p.setPen(tqpalette().active().text());
+ p.setPen(palette().active().text());
TQFont f = p.font();
f.setBold(true);
p.setFont(f);
@@ -117,7 +117,7 @@ void KPopupTitle::paintEvent(TQPaintEvent *)
TQSize KPopupTitle::sizeHint() const
{
- return tqminimumSize();
+ return minimumSize();
}
class KPopupMenu::KPopupMenuPrivate
diff --git a/tdeui/kprogress.cpp b/tdeui/kprogress.cpp
index 34bc211d4..307689aba 100644
--- a/tdeui/kprogress.cpp
+++ b/tdeui/kprogress.cpp
@@ -25,7 +25,7 @@
#include <tqpainter.h>
#include <tqpixmap.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqstring.h>
#include <tqregexp.h>
@@ -132,9 +132,9 @@ bool KProgress::setIndicator(TQString &indicator, int progress, int totalSteps)
if (!totalSteps)
return false;
TQString newString(mFormat);
- newString.replace(TQString::tqfromLatin1("%v"),
+ newString.replace(TQString::fromLatin1("%v"),
TQString::number(progress));
- newString.replace(TQString::tqfromLatin1("%m"),
+ newString.replace(TQString::fromLatin1("%m"),
TQString::number(totalSteps));
if (totalSteps > INT_MAX / 1000) {
@@ -142,7 +142,7 @@ bool KProgress::setIndicator(TQString &indicator, int progress, int totalSteps)
totalSteps /= 1000;
}
- newString.replace(TQString::tqfromLatin1("%p"),
+ newString.replace(TQString::fromLatin1("%p"),
TQString::number((progress * 100) / totalSteps));
if (newString != indicator)
diff --git a/tdeui/kprogressbox.cpp b/tdeui/kprogressbox.cpp
index 4638f78fb..ab8c96d0a 100644
--- a/tdeui/kprogressbox.cpp
+++ b/tdeui/kprogressbox.cpp
@@ -26,7 +26,7 @@
#include <tqpainter.h>
#include <tqpixmap.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqstring.h>
#include <tqregexp.h>
diff --git a/tdeui/krootpixmap.cpp b/tdeui/krootpixmap.cpp
index b87e887d7..8b188c480 100644
--- a/tdeui/krootpixmap.cpp
+++ b/tdeui/krootpixmap.cpp
@@ -68,7 +68,7 @@ void KRootPixmap::init()
m_bCustomPaint = false;
connect(kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int)));
- connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(tqrepaint()));
+ connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(repaint()));
#ifdef Q_WS_X11
connect(m_pPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool)));
@@ -77,7 +77,7 @@ void KRootPixmap::init()
connect(d->twin, TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(desktopChanged(int)));
#endif
- d->toplevel = m_pWidget->tqtopLevelWidget();
+ d->toplevel = m_pWidget->topLevelWidget();
d->toplevel->installEventFilter(this);
m_pWidget->installEventFilter(this);
}
@@ -115,7 +115,7 @@ void KRootPixmap::start()
return;
}
if (m_bInit)
- tqrepaint(true);
+ repaint(true);
}
@@ -136,7 +136,7 @@ void KRootPixmap::setFadeEffect(double fade, const TQColor &color)
m_Fade = fade;
m_FadeColor = color;
- if ( m_bActive && m_bInit ) tqrepaint(true);
+ if ( m_bActive && m_bInit ) repaint(true);
}
void KRootPixmap::setBlurEffect(double radius, double sigma)
@@ -170,7 +170,7 @@ bool KRootPixmap::eventFilter(TQObject *, TQEvent *event)
case TQEvent::Reparent:
d->toplevel->removeEventFilter(this);
- d->toplevel = m_pWidget->tqtopLevelWidget();
+ d->toplevel = m_pWidget->topLevelWidget();
d->toplevel->installEventFilter(this);
break;
@@ -188,31 +188,31 @@ void KRootPixmap::desktopChanged(int desktop)
return;
#ifdef Q_WS_X11
- if (KWin::windowInfo(m_pWidget->tqtopLevelWidget()->winId()).desktop() == NET::OnAllDesktops &&
+ if (KWin::windowInfo(m_pWidget->topLevelWidget()->winId()).desktop() == NET::OnAllDesktops &&
pixmapName(m_Desk) != pixmapName(desktop))
#endif
- tqrepaint(true);
+ repaint(true);
}
void KRootPixmap::desktopChanged( WId window, unsigned int properties )
{
#ifdef Q_WS_X11
if( !(properties & NET::WMDesktop) ||
- (window != m_pWidget->tqtopLevelWidget()->winId()))
+ (window != m_pWidget->topLevelWidget()->winId()))
return;
#endif
kdDebug() << k_funcinfo << endl;
- tqrepaint(true);
+ repaint(true);
}
-void KRootPixmap::tqrepaint()
+void KRootPixmap::repaint()
{
- tqrepaint(false);
+ repaint(false);
}
-void KRootPixmap::tqrepaint(bool force)
+void KRootPixmap::repaint(bool force)
{
TQPoint p1 = m_pWidget->mapToGlobal(m_pWidget->rect().topLeft());
TQPoint p2 = m_pWidget->mapToGlobal(m_pWidget->rect().bottomRight());
@@ -233,7 +233,7 @@ void KRootPixmap::tqrepaint(bool force)
}
m_Rect = TQRect(p1, p2);
#ifdef Q_WS_X11
- m_Desk = KWin::windowInfo(m_pWidget->tqtopLevelWidget()->winId()).desktop();
+ m_Desk = KWin::windowInfo(m_pWidget->topLevelWidget()->winId()).desktop();
if (m_Desk == NET::OnAllDesktops)
m_Desk = currentDesktop();
@@ -341,7 +341,7 @@ void KRootPixmap::slotBackgroundChanged(int desk)
return;
if (desk == m_Desk)
- tqrepaint(true);
+ repaint(true);
}
#include "krootpixmap.moc"
diff --git a/tdeui/krootpixmap.h b/tdeui/krootpixmap.h
index 8ca135e1f..776863c46 100644
--- a/tdeui/krootpixmap.h
+++ b/tdeui/krootpixmap.h
@@ -159,16 +159,16 @@ public slots:
* Repaints the widget background. Normally, you shouldn't need this
* as it is handled automatically.
*
- * @param force Force a tqrepaint, even if the contents did not change.
+ * @param force Force a repaint, even if the contents did not change.
*/
- void tqrepaint( bool force );
+ void repaint( bool force );
/**
* Repaints the widget background. Normally, you shouldn't need this
* as it is handled automatically. This is equivalent to calling
- * tqrepaint( false ).
+ * repaint( false ).
*/
- void tqrepaint();
+ void repaint();
/**
* Enables custom handling of the background painting. If custom
diff --git a/tdeui/kruler.cpp b/tdeui/kruler.cpp
index 56d3703d8..fed264981 100644
--- a/tdeui/kruler.cpp
+++ b/tdeui/kruler.cpp
@@ -432,19 +432,19 @@ KRuler::setRulerMetricStyle(KRuler::MetricStyle style)
}
switch (style) {
case Pixel:
- setEndLabel(TQString::tqfromLatin1("pixel"));
+ setEndLabel(TQString::fromLatin1("pixel"));
break;
case Inch:
- setEndLabel(TQString::tqfromLatin1("inch"));
+ setEndLabel(TQString::fromLatin1("inch"));
break;
case Millimetres:
- setEndLabel(TQString::tqfromLatin1("mm"));
+ setEndLabel(TQString::fromLatin1("mm"));
break;
case Centimetres:
- setEndLabel(TQString::tqfromLatin1("cm"));
+ setEndLabel(TQString::fromLatin1("cm"));
break;
case Metres:
- setEndLabel(TQString::tqfromLatin1("m"));
+ setEndLabel(TQString::fromLatin1("m"));
default: /* never reached, see above switch */
/* empty command */;
}
@@ -550,16 +550,16 @@ KRuler::slotNewValue(int _value)
return;
}
// get the rectangular of the old and the new ruler pointer
- // and tqrepaint only him
+ // and repaint only him
if (dir == Qt::Horizontal) {
TQRect oldrec(-5+oldvalue,10, 11,6);
TQRect newrec(-5+_value,10, 11,6);
- tqrepaint( oldrec.unite(newrec) );
+ repaint( oldrec.unite(newrec) );
}
else {
TQRect oldrec(10,-5+oldvalue, 6,11);
TQRect newrec(10,-5+_value, 6,11);
- tqrepaint( oldrec.unite(newrec) );
+ repaint( oldrec.unite(newrec) );
}
}
@@ -569,7 +569,7 @@ KRuler::slotNewOffset(int _offset)
if (offset_ != _offset) {
//setOffset(_offset);
offset_ = _offset;
- tqrepaint(contentsRect());
+ repaint(contentsRect());
}
}
@@ -586,7 +586,7 @@ KRuler::slotEndOffset(int offset)
}
if (d->endOffset_length != tmp) {
d->endOffset_length = tmp;
- tqrepaint(contentsRect());
+ repaint(contentsRect());
}
}
diff --git a/tdeui/kruler.h b/tdeui/kruler.h
index 1c48a36dc..ecfcd7b3d 100644
--- a/tdeui/kruler.h
+++ b/tdeui/kruler.h
@@ -55,12 +55,12 @@
* To receive mouse clicks or mouse moves,
* the class has to be overloaded.
*
- * For performance reasons, the public methods don't call TQWidget::tqrepaint().
+ * For performance reasons, the public methods don't call TQWidget::repaint().
* (Slots do, see documentation below.)
* All the changed settings will be painted once after leaving
* to the main event loop.
* For performance painting the slot methods should be used,
- * they do a fast TQWidget::tqrepaint() call after changing the values.
+ * they do a fast TQWidget::repaint() call after changing the values.
* For setting multiple values like minValue(), maxValue(), offset() etc.
* using the public methods is recommended
* so the widget will be painted only once when entering the main event loop.
@@ -428,7 +428,7 @@ public slots:
* Sets the pointer to a new position.
*
* The offset is NOT updated.
- * TQWidget::tqrepaint() is called afterwards.
+ * TQWidget::repaint() is called afterwards.
**/
void slotNewValue(int);
@@ -436,7 +436,7 @@ public slots:
* Sets the ruler marks to a new position.
*
* The pointer is NOT updated.
- * TQWidget::tqrepaint() is called afterwards.
+ * TQWidget::repaint() is called afterwards.
**/
void slotNewOffset(int);
diff --git a/tdeui/ksconfig.cpp b/tdeui/ksconfig.cpp
index aa2b62d49..a2f13e473 100644
--- a/tdeui/ksconfig.cpp
+++ b/tdeui/ksconfig.cpp
@@ -22,7 +22,7 @@
#include <tqcheckbox.h>
#include <tqcombobox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtimer.h>
#include <kapplication.h>
@@ -363,8 +363,8 @@ KSpellConfig::interpret( TQString &fname, TQString &lname,
}
//We have explicitly chosen English as the default here.
- if ( ( KGlobal::locale()->language() == TQString::tqfromLatin1("C") &&
- lname==TQString::tqfromLatin1("en") ) ||
+ if ( ( KGlobal::locale()->language() == TQString::fromLatin1("C") &&
+ lname==TQString::fromLatin1("en") ) ||
KGlobal::locale()->language() == lname )
return true;
diff --git a/tdeui/kselect.cpp b/tdeui/kselect.cpp
index 8801f5570..cda0c2685 100644
--- a/tdeui/kselect.cpp
+++ b/tdeui/kselect.cpp
@@ -53,7 +53,7 @@ KXYSelector::~KXYSelector()
void KXYSelector::setRange( int _minX, int _minY, int _maxX, int _maxY )
{
- int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
px = w;
py = w;
minX = _minX;
@@ -74,7 +74,7 @@ void KXYSelector::setYValue( int _yPos )
void KXYSelector::setValues( int _xPos, int _yPos )
{
- int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
if (w < 5) w = 5;
xPos = _xPos;
@@ -98,7 +98,7 @@ void KXYSelector::setValues( int _xPos, int _yPos )
TQRect KXYSelector::contentsRect() const
{
- int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
if (w < 5) {
w = 5;
}
@@ -113,7 +113,7 @@ void KXYSelector::paintEvent( TQPaintEvent *ev )
TQRect paintRect = ev->rect();
TQRect borderRect = rect();
- int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
if (w < 5) {
w = 5 - w;
}
@@ -123,7 +123,7 @@ void KXYSelector::paintEvent( TQPaintEvent *ev )
painter.begin( this );
tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, &painter,
- borderRect, tqcolorGroup(),
+ borderRect, colorGroup(),
TQStyle::Style_Sunken);
drawContents( &painter );
@@ -135,7 +135,7 @@ void KXYSelector::paintEvent( TQPaintEvent *ev )
}
else if (paintRect.intersects(cursorRect))
{
- tqrepaint( cursorRect, false);
+ repaint( cursorRect, false);
}
painter.end();
@@ -150,7 +150,7 @@ void KXYSelector::mouseMoveEvent( TQMouseEvent *e )
{
int xVal, yVal;
- int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
valuesFromPosition( e->pos().x() - w, e->pos().y() - w, xVal, yVal );
setValues( xVal, yVal );
@@ -170,7 +170,7 @@ void KXYSelector::wheelEvent( TQWheelEvent *e )
void KXYSelector::valuesFromPosition( int x, int y, int &xVal, int &yVal ) const
{
- int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
if (w < 5) w = 5;
xVal = ( (maxX-minX) * (x-w) ) / ( width()-2*w );
yVal = maxY - ( ( (maxY-minY) * (y-w) ) / ( height()-2*w ) );
@@ -188,7 +188,7 @@ void KXYSelector::valuesFromPosition( int x, int y, int &xVal, int &yVal ) const
void KXYSelector::setPosition( int xp, int yp )
{
- int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
if (w < 5) w = 5;
if ( xp < w )
xp = w;
@@ -256,7 +256,7 @@ KSelector::~KSelector()
TQRect KSelector::contentsRect() const
{
- int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
int iw = (w < 5) ? 5 : w;
if ( orientation() == Qt::Vertical )
return TQRect( w, iw, width() - w * 2 - 5, height() - 2 * iw );
@@ -267,7 +267,7 @@ TQRect KSelector::contentsRect() const
void KSelector::paintEvent( TQPaintEvent * )
{
TQPainter painter;
- int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
int iw = (w < 5) ? 5 : w;
painter.begin( this );
@@ -282,7 +282,7 @@ void KSelector::paintEvent( TQPaintEvent * )
else
r.addCoords(iw - w, 0, w - iw, -iw);
tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, &painter,
- r, tqcolorGroup(),
+ r, colorGroup(),
TQStyle::Style_Sunken);
}
@@ -329,7 +329,7 @@ void KSelector::valueChange()
void KSelector::moveArrow( const TQPoint &pos )
{
int val;
- int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
int iw = (w < 5) ? 5 : w;
if ( orientation() == Qt::Vertical )
@@ -346,7 +346,7 @@ TQPoint KSelector::calcArrowPos( int val )
{
TQPoint p;
- int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
int iw = (w < 5) ? 5 : w;
if ( orientation() == Qt::Vertical )
{
@@ -374,7 +374,7 @@ void KSelector::drawArrow( TQPainter *painter, bool show, const TQPoint &pos )
TQPointArray array(3);
painter->setPen( TQPen() );
- painter->setBrush( TQBrush( tqcolorGroup().buttonText() ) );
+ painter->setBrush( TQBrush( colorGroup().buttonText() ) );
array.setPoint( 0, pos.x()+0, pos.y()+0 );
array.setPoint( 1, pos.x()+5, pos.y()+5 );
if ( orientation() == Qt::Vertical )
@@ -392,11 +392,11 @@ void KSelector::drawArrow( TQPainter *painter, bool show, const TQPoint &pos )
{
if ( orientation() == Qt::Vertical )
{
- tqrepaint(pos.x(), pos.y()-5, 6, 11, true);
+ repaint(pos.x(), pos.y()-5, 6, 11, true);
}
else
{
- tqrepaint(pos.x()-5, pos.y(), 11, 6, true);
+ repaint(pos.x()-5, pos.y(), 11, 6, true);
}
}
}
diff --git a/tdeui/kselect.h b/tdeui/kselect.h
index cc011dcfe..58efab293 100644
--- a/tdeui/kselect.h
+++ b/tdeui/kselect.h
@@ -351,7 +351,7 @@ public:
protected:
virtual void drawContents( TQPainter * );
- virtual TQSize tqminimumSize() const
+ virtual TQSize minimumSize() const
{ return sizeHint(); }
private:
diff --git a/tdeui/kseparator.cpp b/tdeui/kseparator.cpp
index 07d143266..2f3a1cde8 100644
--- a/tdeui/kseparator.cpp
+++ b/tdeui/kseparator.cpp
@@ -83,7 +83,7 @@ void KSeparator::drawFrame(TQPainter *p)
{
TQPoint p1, p2;
TQRect r = frameRect();
- const TQColorGroup & g = tqcolorGroup();
+ const TQColorGroup & g = colorGroup();
if ( frameStyle() & HLine ) {
p1 = TQPoint( r.x(), r.height()/2 );
diff --git a/tdeui/ksharedpixmap.cpp b/tdeui/ksharedpixmap.cpp
index d0a74f223..29c670265 100644
--- a/tdeui/ksharedpixmap.cpp
+++ b/tdeui/ksharedpixmap.cpp
@@ -102,7 +102,7 @@ bool KSharedPixmap::loadFromShared(const TQString & name, const TQRect & rect)
// already active
return false;
- TQPixmap::resize(0, 0); // tqinvalidate
+ TQPixmap::resize(0, 0); // invalidate
TQString str = TQString("KDESHPIXMAP:%1").arg(name);
d->selection = XInternAtom(qt_xdisplay(), str.latin1(), true);
diff --git a/tdeui/kshortcutdialog.cpp b/tdeui/kshortcutdialog.cpp
index fbdd46519..812833dee 100644
--- a/tdeui/kshortcutdialog.cpp
+++ b/tdeui/kshortcutdialog.cpp
@@ -47,7 +47,7 @@
#include <tqbuttongroup.h>
#include <tqcheckbox.h>
#include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqradiobutton.h>
#include <tqtimer.h>
#include <tqvbox.h>
@@ -169,8 +169,8 @@ void KShortcutDialog::updateShortcutDisplay()
this->setFocus();
}
- s[0].replace('&', TQString::tqfromLatin1("&&"));
- s[1].replace('&', TQString::tqfromLatin1("&&"));
+ s[0].replace('&', TQString::fromLatin1("&&"));
+ s[1].replace('&', TQString::fromLatin1("&&"));
m_simple->m_txtShortcut->setText( s[0] );
m_adv->m_txtPrimary->setText( s[0] );
diff --git a/tdeui/kspell.cpp b/tdeui/kspell.cpp
index 9ca882962..0eb2b5b93 100644
--- a/tdeui/kspell.cpp
+++ b/tdeui/kspell.cpp
@@ -34,7 +34,7 @@
#endif
#include <tqregexp.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <tqtimer.h>
#include <kapplication.h>
@@ -995,7 +995,7 @@ bool KSpell::check( const TQString &_buffer, bool _usedialog )
// origbuffer since I got errors otherwise
if ( !origbuffer.endsWith("\n\n" ) )
{
- if (origbuffer.tqat(origbuffer.length()-1)!='\n')
+ if (origbuffer.at(origbuffer.length()-1)!='\n')
{
origbuffer+='\n';
origbuffer+='\n'; //shouldn't these be removed at some point?
@@ -1220,10 +1220,10 @@ void KSpell::dialog( const TQString & word, TQStringList & sugg, const char *_sl
TQString marker( "_MARKER_" );
tmpBuf.replace( lastpos, word.length(), marker );
TQString context = tmpBuf.mid(QMAX(lastpos-18,0), 2*18+marker.length());
- context.replace( '\n',TQString::tqfromLatin1(" "));
- context.replace( '<', TQString::tqfromLatin1("&lt;") );
- context.replace( '>', TQString::tqfromLatin1("&gt;") );
- context.replace( marker, TQString::tqfromLatin1("<b>%1</b>").arg( word ) );
+ context.replace( '\n',TQString::fromLatin1(" "));
+ context.replace( '<', TQString::fromLatin1("&lt;") );
+ context.replace( '>', TQString::fromLatin1("&gt;") );
+ context.replace( marker, TQString::fromLatin1("<b>%1</b>").arg( word ) );
context = "<qt>" + context + "</qt>";
ksdlg->init( word, &sugg, context );
diff --git a/tdeui/kspelldlg.cpp b/tdeui/kspelldlg.cpp
index d21b6975e..4bad2c3ff 100644
--- a/tdeui/kspelldlg.cpp
+++ b/tdeui/kspelldlg.cpp
@@ -22,7 +22,7 @@
#include <tqstringlist.h>
#include <tqpushbutton.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kapplication.h>
#include <klocale.h>
diff --git a/tdeui/kspellui.ui b/tdeui/kspellui.ui
index 18b755117..ac1deecd7 100644
--- a/tdeui/kspellui.ui
+++ b/tdeui/kspellui.ui
@@ -87,7 +87,7 @@
<property name="text">
<string>... the &lt;b&gt;misspelled&lt;/b&gt; word shown in context ...</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
<property name="toolTip" stdset="0">
diff --git a/tdeui/ksqueezedtextlabel.cpp b/tdeui/ksqueezedtextlabel.cpp
index 63d85ab8f..f44b38916 100644
--- a/tdeui/ksqueezedtextlabel.cpp
+++ b/tdeui/ksqueezedtextlabel.cpp
@@ -73,11 +73,11 @@ void KSqueezedTextLabel::squeezeTextToLabel() {
}
}
-void KSqueezedTextLabel::setAlignment( int tqalignment )
+void KSqueezedTextLabel::setAlignment( int alignment )
{
// save fullText and restore it
TQString tmpFull(fullText);
- TQLabel::setAlignment(tqalignment);
+ TQLabel::setAlignment(alignment);
fullText = tmpFull;
}
diff --git a/tdeui/kstatusbar.cpp b/tdeui/kstatusbar.cpp
index 696f1294c..b70c8ae9c 100644
--- a/tdeui/kstatusbar.cpp
+++ b/tdeui/kstatusbar.cpp
@@ -65,8 +65,8 @@ KStatusBar::KStatusBar( TQWidget *parent, const char *name )
// ...but off by default (sven)
KConfig *config = KGlobal::config();
TQString group(config->group());
- config->setGroup(TQString::tqfromLatin1("StatusBar style"));
- bool grip_enabled = config->readBoolEntry(TQString::tqfromLatin1("SizeGripEnabled"), false);
+ config->setGroup(TQString::fromLatin1("StatusBar style"));
+ bool grip_enabled = config->readBoolEntry(TQString::fromLatin1("SizeGripEnabled"), false);
setSizeGripEnabled(grip_enabled);
config->setGroup(group);
}
diff --git a/tdeui/kstatusbar.h b/tdeui/kstatusbar.h
index c481a551a..a1b89d0a7 100644
--- a/tdeui/kstatusbar.h
+++ b/tdeui/kstatusbar.h
@@ -167,7 +167,7 @@ public:
void changeItem( const TQString& text, int id );
/**
- * Sets the tqalignment of item @p id. By default all fields are aligned
+ * Sets the alignment of item @p id. By default all fields are aligned
* @p AlignHCenter | @p AlignVCenter. See TQLabel::setAlignment for details.
*
*/
diff --git a/tdeui/kstdaction.cpp b/tdeui/kstdaction.cpp
index e9a87d71d..e1adac16a 100644
--- a/tdeui/kstdaction.cpp
+++ b/tdeui/kstdaction.cpp
@@ -72,7 +72,7 @@ KAction* create( StdAction id, const char *name, const TQObject *recvr, const ch
else
aboutData = KGlobal::instance()->aboutData();
*/
- TQString appName = (aboutData) ? aboutData->programName() : TQString::tqfromLatin1(tqApp->name());
+ TQString appName = (aboutData) ? aboutData->programName() : TQString::fromLatin1(tqApp->name());
sLabel = i18n(pInfo->psLabel).arg(appName);
}
break;
diff --git a/tdeui/kstdguiitem.cpp b/tdeui/kstdguiitem.cpp
index fa9d99341..2367804a8 100644
--- a/tdeui/kstdguiitem.cpp
+++ b/tdeui/kstdguiitem.cpp
@@ -62,34 +62,34 @@ KGuiItem KStdGuiItem::guiItem ( StdItem ui_enum )
TQString KStdGuiItem::stdItem( StdItem ui_enum )
{
switch (ui_enum ) {
- case Ok : return TQString::tqfromLatin1("ok");
- case Cancel : return TQString::tqfromLatin1("cancel");
- case Yes : return TQString::tqfromLatin1("yes");
- case No : return TQString::tqfromLatin1("no");
- case Discard : return TQString::tqfromLatin1("discard");
- case Save : return TQString::tqfromLatin1("save");
- case DontSave : return TQString::tqfromLatin1("dontSave");
- case SaveAs : return TQString::tqfromLatin1("saveAs");
- case Apply : return TQString::tqfromLatin1("apply");
- case Help : return TQString::tqfromLatin1("help");
- case Close : return TQString::tqfromLatin1("close");
- case Defaults : return TQString::tqfromLatin1("defaults");
- case Back : return TQString::tqfromLatin1("back");
- case Forward : return TQString::tqfromLatin1("forward");
- case Print : return TQString::tqfromLatin1("print");
- case Continue : return TQString::tqfromLatin1("continue");
- case Open : return TQString::tqfromLatin1("open");
- case Quit : return TQString::tqfromLatin1("quit");
- case AdminMode: return TQString::tqfromLatin1("adminMode");
- case Delete : return TQString::tqfromLatin1("delete");
- case Insert : return TQString::tqfromLatin1("insert");
- case Find : return TQString::tqfromLatin1("find");
- case Stop : return TQString::tqfromLatin1("stop");
- case Add : return TQString::tqfromLatin1("add");
- case Remove : return TQString::tqfromLatin1("remove");
- case Test : return TQString::tqfromLatin1("test");
- case Properties : return TQString::tqfromLatin1("properties");
- case Overwrite : return TQString::tqfromLatin1("overwrite");
+ case Ok : return TQString::fromLatin1("ok");
+ case Cancel : return TQString::fromLatin1("cancel");
+ case Yes : return TQString::fromLatin1("yes");
+ case No : return TQString::fromLatin1("no");
+ case Discard : return TQString::fromLatin1("discard");
+ case Save : return TQString::fromLatin1("save");
+ case DontSave : return TQString::fromLatin1("dontSave");
+ case SaveAs : return TQString::fromLatin1("saveAs");
+ case Apply : return TQString::fromLatin1("apply");
+ case Help : return TQString::fromLatin1("help");
+ case Close : return TQString::fromLatin1("close");
+ case Defaults : return TQString::fromLatin1("defaults");
+ case Back : return TQString::fromLatin1("back");
+ case Forward : return TQString::fromLatin1("forward");
+ case Print : return TQString::fromLatin1("print");
+ case Continue : return TQString::fromLatin1("continue");
+ case Open : return TQString::fromLatin1("open");
+ case Quit : return TQString::fromLatin1("quit");
+ case AdminMode: return TQString::fromLatin1("adminMode");
+ case Delete : return TQString::fromLatin1("delete");
+ case Insert : return TQString::fromLatin1("insert");
+ case Find : return TQString::fromLatin1("find");
+ case Stop : return TQString::fromLatin1("stop");
+ case Add : return TQString::fromLatin1("add");
+ case Remove : return TQString::fromLatin1("remove");
+ case Test : return TQString::fromLatin1("test");
+ case Properties : return TQString::fromLatin1("properties");
+ case Overwrite : return TQString::fromLatin1("overwrite");
default : return TQString::null;
};
}
diff --git a/tdeui/kswitchlanguagedialog.cpp b/tdeui/kswitchlanguagedialog.cpp
index fa43dcaf2..20098d5e3 100644
--- a/tdeui/kswitchlanguagedialog.cpp
+++ b/tdeui/kswitchlanguagedialog.cpp
@@ -21,7 +21,7 @@
#include "kswitchlanguagedialog.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqlabel.h>
#include <tqmap.h>
diff --git a/tdeui/ksyntaxhighlighter.cpp b/tdeui/ksyntaxhighlighter.cpp
index 5e334ac11..e118fcd74 100644
--- a/tdeui/ksyntaxhighlighter.cpp
+++ b/tdeui/ksyntaxhighlighter.cpp
@@ -148,14 +148,14 @@ int KSyntaxHighlighter::highlightParagraph( const TQString &text, int )
}
TQString simplified = text;
- simplified = TQString(simplified.replace( TQRegExp( "\\s" ), TQString() )).replace( '|', TQString::tqfromLatin1(">") );
- while ( simplified.startsWith( TQString::tqfromLatin1(">>>>") ) )
+ simplified = TQString(simplified.replace( TQRegExp( "\\s" ), TQString() )).replace( '|', TQString::fromLatin1(">") );
+ while ( simplified.startsWith( TQString::fromLatin1(">>>>") ) )
simplified = simplified.mid(3);
- if ( simplified.startsWith( TQString::tqfromLatin1(">>>") ) || simplified.startsWith( TQString::tqfromLatin1("> > >") ) )
+ if ( simplified.startsWith( TQString::fromLatin1(">>>") ) || simplified.startsWith( TQString::fromLatin1("> > >") ) )
setFormat( 0, text.length(), d->col2 );
- else if ( simplified.startsWith( TQString::tqfromLatin1(">>") ) || simplified.startsWith( TQString::tqfromLatin1("> >") ) )
+ else if ( simplified.startsWith( TQString::fromLatin1(">>") ) || simplified.startsWith( TQString::fromLatin1("> >") ) )
setFormat( 0, text.length(), d->col3 );
- else if ( simplified.startsWith( TQString::tqfromLatin1(">") ) )
+ else if ( simplified.startsWith( TQString::fromLatin1(">") ) )
setFormat( 0, text.length(), d->col4 );
else
setFormat( 0, text.length(), d->col5 );
diff --git a/tdeui/ksyntaxhighlighter.h b/tdeui/ksyntaxhighlighter.h
index 6ac4264ab..ba33c245c 100644
--- a/tdeui/ksyntaxhighlighter.h
+++ b/tdeui/ksyntaxhighlighter.h
@@ -24,7 +24,7 @@
#ifndef KSYNTAXHIGHLIGHTER_H
#define KSYNTAXHIGHLIGHTER_H
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqsyntaxhighlighter.h>
#include <tqcolor.h>
#include <tqstringlist.h>
diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp
index dec85b7e8..100f86df8 100644
--- a/tdeui/ksystemtray.cpp
+++ b/tdeui/ksystemtray.cpp
@@ -69,7 +69,7 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name )
d->actionCollection = new KActionCollection(this);
#ifdef Q_WS_X11
- KWin::setSystemTrayWindowFor( winId(), parent?parent->tqtopLevelWidget()->winId(): qt_xrootwin() );
+ KWin::setSystemTrayWindowFor( winId(), parent?parent->topLevelWidget()->winId(): qt_xrootwin() );
#endif
setBackgroundMode(X11ParentRelative);
setBackgroundOrigin(WindowOrigin);
@@ -96,7 +96,7 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name )
d->on_all_desktops = false;
}
setCaption( KGlobal::instance()->aboutData()->programName());
- setAlignment( tqalignment() | Qt::AlignVCenter | Qt::AlignHCenter );
+ setAlignment( alignment() | Qt::AlignVCenter | Qt::AlignHCenter );
// Handle the possibility that the requested system tray size is something other than 22x22 pixels, per the Free Desktop specifications
setScaledContents(true);
diff --git a/tdeui/ktabbar.cpp b/tdeui/ktabbar.cpp
index eed23ebfe..e88c1f81e 100644
--- a/tdeui/ktabbar.cpp
+++ b/tdeui/ktabbar.cpp
@@ -67,7 +67,7 @@ void KTabBar::setTabEnabled( int id, bool enabled )
if ( !enabled && id == currentTab() && count()>1 ) {
TQPtrList<TQTab> *tablist = tabList();
if ( mTabCloseActivatePrevious )
- t = tablist->tqat( count()-2 );
+ t = tablist->at( count()-2 );
else {
int index = indexOf( id );
index += ( index+1 == count() ) ? -1 : 1;
@@ -80,7 +80,7 @@ void KTabBar::setTabEnabled( int id, bool enabled )
emit selected( t->identifier() );
}
}
- tqrepaint( r );
+ repaint( r );
}
}
}
@@ -172,8 +172,8 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e )
int xoff = 0, yoff = 0;
// The additional offsets were found by try and error, TODO: find the rational behind them
if ( t == tab( currentTab() ) ) {
- xoff = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ) + 3;
- yoff = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ) - 4;
+ xoff = tqstyle().pixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ) + 3;
+ yoff = tqstyle().pixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ) - 4;
}
else {
xoff = 7;
@@ -253,7 +253,7 @@ void KTabBar::dragMoveEvent( TQDragMoveEvent *e )
TQTab *tab = selectTab( e->pos() );
if( tab ) {
bool accept = false;
- // The tqreceivers of the testCanDecode() signal has to adjust
+ // The receivers of the testCanDecode() signal has to adjust
// 'accept' accordingly.
emit testCanDecode( e, accept);
if ( accept && tab != TQTabBar::tab( currentTab() ) ) {
@@ -294,7 +294,7 @@ void KTabBar::setTabColor( int id, const TQColor& color )
TQTab *t = tab( id );
if ( t ) {
mTabColors.insert( id, color );
- tqrepaint( t->rect(), false );
+ repaint( t->rect(), false );
}
}
@@ -303,7 +303,7 @@ const TQColor &KTabBar::tabColor( int id ) const
if ( mTabColors.contains( id ) )
return mTabColors[id];
- return tqcolorGroup().foreground();
+ return colorGroup().foreground();
}
int KTabBar::insertTab( TQTab *t, int index )
@@ -341,8 +341,8 @@ void KTabBar::paintLabel( TQPainter *p, const TQRect& br,
r.setLeft( r.left() + pixw + 4 );
r.setRight( r.right() + 2 );
- int inactiveXShift = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this );
- int inactiveYShift = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftVertical, this );
+ int inactiveXShift = tqstyle().pixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this );
+ int inactiveYShift = tqstyle().pixelMetric( TQStyle::PM_TabBarTabShiftVertical, this );
int right = t->text().isEmpty() ? br.right() - pixw : br.left() + 2;
@@ -358,12 +358,12 @@ void KTabBar::paintLabel( TQPainter *p, const TQRect& br,
if ( has_focus )
flags |= TQStyle::Style_HasFocus;
- TQColorGroup cg( tqcolorGroup() );
+ TQColorGroup cg( colorGroup() );
if ( mTabColors.contains( t->identifier() ) )
cg.setColor( TQColorGroup::Foreground, mTabColors[t->identifier()] );
- tqstyle().tqdrawControl( TQStyle::CE_TabBarLabel, p, this, r,
- t->isEnabled() ? cg : tqpalette().disabled(),
+ tqstyle().drawControl( TQStyle::CE_TabBarLabel, p, this, r,
+ t->isEnabled() ? cg : palette().disabled(),
flags, TQStyleOption(t) );
}
diff --git a/tdeui/ktabctl.cpp b/tdeui/ktabctl.cpp
index 204a0979e..0ff9f64e4 100644
--- a/tdeui/ktabctl.cpp
+++ b/tdeui/ktabctl.cpp
@@ -56,8 +56,8 @@ void KTabCtl::resizeEvent(TQResizeEvent *)
for (i=0; i<(int)pages.size(); i++) {
pages[i]->setGeometry(r);
}
- if( ( tabs->tqshape() == TQTabBar::RoundedBelow ) ||
- ( tabs->tqshape() == TQTabBar::TriangularBelow ) ) {
+ if( ( tabs->shape() == TQTabBar::RoundedBelow ) ||
+ ( tabs->shape() == TQTabBar::TriangularBelow ) ) {
tabs->move( 0, height()-tabs->height()-4 );
}
}
@@ -104,7 +104,7 @@ bool KTabCtl::isTabEnabled(const TQString& name)
unsigned int i;
for(i = 0; i < pages.size(); i++)
- if (TQString::tqfromLatin1(pages[i]->name()) == name)
+ if (TQString::fromLatin1(pages[i]->name()) == name)
return tabs->isTabEnabled(i); /* return the enabled status */
return false; /* tab does not exist */
}
@@ -117,7 +117,7 @@ void KTabCtl::setTabEnabled(const TQString& name, bool state)
return;
for (i = 0; i < pages.size(); i++)
- if (TQString::tqfromLatin1(pages[i]->name()) == name)
+ if (TQString::fromLatin1(pages[i]->name()) == name)
tabs->setTabEnabled(i, state);
}
@@ -138,14 +138,14 @@ void KTabCtl::setSizes()
* check the actual minimum and maximum sizes
*/
- if (pages[i]->tqmaximumSize().height() < max.height())
- max.setHeight(pages[i]->tqmaximumSize().height());
- if (pages[i]->tqmaximumSize().width() < max.width())
- max.setWidth( pages[i]->tqmaximumSize().width());
- if ( pages[i]->tqminimumSize().height() > min.height())
- min.setHeight( pages[i]->tqminimumSize().height());
- if ( pages[i]->tqminimumSize().width() > min.width())
- min.setWidth( pages[i]->tqminimumSize().width());
+ if (pages[i]->maximumSize().height() < max.height())
+ max.setHeight(pages[i]->maximumSize().height());
+ if (pages[i]->maximumSize().width() < max.width())
+ max.setWidth( pages[i]->maximumSize().width());
+ if ( pages[i]->minimumSize().height() > min.height())
+ min.setHeight( pages[i]->minimumSize().height());
+ if ( pages[i]->minimumSize().width() > min.width())
+ min.setWidth( pages[i]->minimumSize().width());
}
// BL: min and max are sizes of children, not tabcontrol
@@ -184,9 +184,9 @@ void KTabCtl::setBorder( bool state )
blBorder = state;
}
-void KTabCtl::setShape( TQTabBar::Shape tqshape )
+void KTabCtl::setShape( TQTabBar::Shape shape )
{
- tabs->setShape( tqshape );
+ tabs->setShape( shape );
}
TQSize
@@ -251,16 +251,16 @@ void KTabCtl::paintEvent(TQPaintEvent *)
int x1 = getChildRect().right() + 2;
int x0 = getChildRect().left() - 1;
- p.setPen(tqcolorGroup().light());
+ p.setPen(colorGroup().light());
p.drawLine(x0, y0 - 1, x1 - 1, y0 - 1); /* 1st top line */
- p.setPen(tqcolorGroup().midlight());
+ p.setPen(colorGroup().midlight());
p.drawLine(x0, y0, x1 - 1, y0); /* 2nd top line */
- p.setPen(tqcolorGroup().light());
+ p.setPen(colorGroup().light());
p.drawLine(x0, y0 + 1, x0, y1); /* left line */
p.setPen(black);
p.drawLine(x1, y1, x0, y1); /* bottom line */
p.drawLine(x1, y1 - 1, x1, y0);
- p.setPen(tqcolorGroup().dark());
+ p.setPen(colorGroup().dark());
p.drawLine(x0 + 1, y1 - 1, x1 - 1, y1 - 1); /* bottom */
p.drawLine(x1 - 1, y1 - 2, x1 - 1, y0 + 1);
p.end();
@@ -273,8 +273,8 @@ void KTabCtl::paintEvent(TQPaintEvent *)
TQRect KTabCtl::getChildRect() const
{
- if( ( tabs->tqshape() == TQTabBar::RoundedBelow ) ||
- ( tabs->tqshape() == TQTabBar::TriangularBelow ) ) {
+ if( ( tabs->shape() == TQTabBar::RoundedBelow ) ||
+ ( tabs->shape() == TQTabBar::TriangularBelow ) ) {
return TQRect(2, 1, width() - 4,
height() - tabs->height() - 4);
} else {
diff --git a/tdeui/ktabctl.h b/tdeui/ktabctl.h
index d18da9750..28de4805b 100644
--- a/tdeui/ktabctl.h
+++ b/tdeui/ktabctl.h
@@ -61,7 +61,7 @@ public:
bool isTabEnabled(const TQString& );
void setTabEnabled(const TQString&, bool);
void setBorder(bool);
- void setShape( TQTabBar::Shape tqshape );
+ void setShape( TQTabBar::Shape shape );
virtual TQSize sizeHint() const;
protected:
diff --git a/tdeui/ktabwidget.cpp b/tdeui/ktabwidget.cpp
index 36410921e..b0b721c3d 100644
--- a/tdeui/ktabwidget.cpp
+++ b/tdeui/ktabwidget.cpp
@@ -20,7 +20,7 @@
#include <tqapplication.h>
#include <tqstyle.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
#include <kconfig.h>
#include <kiconloader.h>
@@ -95,7 +95,7 @@ void KTabWidget::insertTab( TQWidget *child, TQTab *tab, int index )
resizeTabs( d->m_tabNames.count()-1 );
}
else {
- d->m_tabNames.insert( d->m_tabNames.tqat( index ), tab->text() );
+ d->m_tabNames.insert( d->m_tabNames.at( index ), tab->text() );
resizeTabs( index );
}
}
@@ -163,8 +163,8 @@ bool KTabWidget::tabCloseActivatePrevious() const
unsigned int KTabWidget::tabBarWidthForMaxChars( uint maxLength )
{
int hframe, overlap;
- hframe = tabBar()->tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, tabBar() );
- overlap = tabBar()->tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, tabBar() );
+ hframe = tabBar()->tqstyle().pixelMetric( TQStyle::PM_TabBarTabHSpace, tabBar() );
+ overlap = tabBar()->tqstyle().pixelMetric( TQStyle::PM_TabBarTabOverlap, tabBar() );
TQFontMetrics fm = tabBar()->fontMetrics();
int x = 0;
@@ -301,7 +301,7 @@ void KTabWidget::dragMoveEvent( TQDragMoveEvent *e )
{
if ( isEmptyTabbarSpace( e->pos() ) ) {
bool accept = false;
- // The tqreceivers of the testCanDecode() signal has to adjust
+ // The receivers of the testCanDecode() signal has to adjust
// 'accept' accordingly.
emit testCanDecode( e, accept);
e->accept( accept );
@@ -422,7 +422,7 @@ void KTabWidget::moveTab( int from, int to )
if ( to < 0 || to >= count() )
d->m_tabNames.append( TQString::null );
else
- d->m_tabNames.insert( d->m_tabNames.tqat( to ), TQString::null );
+ d->m_tabNames.insert( d->m_tabNames.at( to ), TQString::null );
}
w = page( to );
@@ -441,7 +441,7 @@ void KTabWidget::removePage( TQWidget * w ) {
if ( d->m_automaticResizeTabs ) {
int index = indexOf( w );
if ( index != -1 )
- d->m_tabNames.remove( d->m_tabNames.tqat( index ) );
+ d->m_tabNames.remove( d->m_tabNames.at( index ) );
}
TQTabWidget::removePage( w );
if ( d->m_automaticResizeTabs )
diff --git a/tdeui/ktextbrowser.h b/tdeui/ktextbrowser.h
index 32c81bd47..609a33b3f 100644
--- a/tdeui/ktextbrowser.h
+++ b/tdeui/ktextbrowser.h
@@ -20,7 +20,7 @@
#ifndef _KTEXT_BROWSER_H_
#define _KTEXT_BROWSER_H_
-#include <tqtextbrowser.h>
+#include <textbrowser.h>
#include <tdelibs_export.h>
diff --git a/tdeui/ktextedit.cpp b/tdeui/ktextedit.cpp
index 73bbf3c5f..07b847e0f 100644
--- a/tdeui/ktextedit.cpp
+++ b/tdeui/ktextedit.cpp
@@ -20,7 +20,7 @@
#include "ktextedit.h"
#include <tqapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqpopupmenu.h>
#include <ksyntaxhighlighter.h>
@@ -172,7 +172,7 @@ void KTextEdit::keyPressEvent( TQKeyEvent *e )
}
else if ( KStdAccel::pasteSelection().contains( key ) )
{
- TQString text = TQApplication::tqclipboard()->text( TQClipboard::Selection);
+ TQString text = TQApplication::clipboard()->text( TQClipboard::Selection);
if ( !text.isEmpty() )
insert( text );
e->accept();
@@ -182,7 +182,7 @@ void KTextEdit::keyPressEvent( TQKeyEvent *e )
// ignore Ctrl-Return so that KDialogs can close the dialog
else if ( e->state() == ControlButton &&
(e->key() == Key_Return || e->key() == Key_Enter) &&
- tqtopLevelWidget()->inherits( "KDialog" ) )
+ topLevelWidget()->inherits( "KDialog" ) )
{
e->ignore();
return;
diff --git a/tdeui/ktextedit.h b/tdeui/ktextedit.h
index 930409b04..30a0ca480 100644
--- a/tdeui/ktextedit.h
+++ b/tdeui/ktextedit.h
@@ -20,7 +20,7 @@
#ifndef KTEXTEDIT_H
#define KTEXTEDIT_H
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tdelibs_export.h>
diff --git a/tdeui/ktimewidget.cpp b/tdeui/ktimewidget.cpp
index 4d48b2129..a822c31ee 100644
--- a/tdeui/ktimewidget.cpp
+++ b/tdeui/ktimewidget.cpp
@@ -1,5 +1,5 @@
#include <tqdatetimeedit.h>
-#include <tqlayout.h>
+#include <layout.h>
#include "kdebug.h"
#include "kdialog.h"
diff --git a/tdeui/ktip.cpp b/tdeui/ktip.cpp
index 70290f62c..fba5174fc 100644
--- a/tdeui/ktip.cpp
+++ b/tdeui/ktip.cpp
@@ -27,10 +27,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqfile.h>
#include <tqhbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqimage.h>
#include <kaboutdata.h>
@@ -59,7 +59,7 @@ KTipDatabase::KTipDatabase(const TQString &_tipFile)
{
TQString tipFile = _tipFile;
if (tipFile.isEmpty())
- tipFile = TQString::tqfromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips";
+ tipFile = TQString::fromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips";
loadTips(tipFile);
@@ -72,7 +72,7 @@ KTipDatabase::KTipDatabase( const TQStringList& tipsFiles )
{
if ( tipsFiles.isEmpty() || ( ( tipsFiles.count() == 1 ) && tipsFiles.first().isEmpty() ) )
{
- addTips(TQString::tqfromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips");
+ addTips(TQString::fromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips");
}
else
{
@@ -347,10 +347,10 @@ void KTipDialog::showMultiTip(TQWidget *parent, const TQStringList &tipFiles, bo
const int oneDay = 24*60*60;
TQDateTime lastShown = configGroup.readDateTimeEntry("TipLastShown");
// Show tip roughly once a week
- if (lastShown.secsTo(TQDateTime::tqcurrentDateTime()) < (oneDay + (kapp->random() % (10*oneDay))))
+ if (lastShown.secsTo(TQDateTime::currentDateTime()) < (oneDay + (kapp->random() % (10*oneDay))))
return;
}
- configGroup.writeEntry("TipLastShown", TQDateTime::tqcurrentDateTime());
+ configGroup.writeEntry("TipLastShown", TQDateTime::currentDateTime());
kapp->config()->sync();
if (!hasLastShown)
return; // Don't show tip on first start
@@ -384,7 +384,7 @@ static TQString fixTip(TQString tip)
void KTipDialog::prevTip()
{
mDatabase->prevTip();
- TQString currentTip = TQString::tqfromLatin1(
+ TQString currentTip = TQString::fromLatin1(
"<qt text=\"%1\" bgcolor=\"%2\">%3</qt>")
.arg(mTextColor.name())
.arg(mBaseColor.name())
@@ -399,7 +399,7 @@ static TQString fixTip(TQString tip)
void KTipDialog::nextTip()
{
mDatabase->nextTip();
- TQString currentTip = TQString::tqfromLatin1(
+ TQString currentTip = TQString::fromLatin1(
"<qt text=\"%1\" bgcolor=\"%2\">%3</qt>")
.arg(mTextColor.name())
.arg(mBaseColor.name())
diff --git a/tdeui/ktoolbar.cpp b/tdeui/ktoolbar.cpp
index ee531e102..f474064dd 100644
--- a/tdeui/ktoolbar.cpp
+++ b/tdeui/ktoolbar.cpp
@@ -40,7 +40,7 @@
#include <tqobjectlist.h>
#include <tqtimer.h>
#include <tqstyle.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <ktoolbar.h>
#include <kmainwindow.h>
@@ -170,7 +170,7 @@ void KToolBarSeparator::drawContents( TQPainter* p )
flags = flags | TQStyle::Style_Horizontal;
tqstyle().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator, p,
- contentsRect(), tqcolorGroup(), flags);
+ contentsRect(), colorGroup(), flags);
} else {
TQFrame::drawContents(p);
}
@@ -183,7 +183,7 @@ void KToolBarSeparator::styleChange( TQStyle& )
TQSize KToolBarSeparator::sizeHint() const
{
- int dim = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this );
+ int dim = tqstyle().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this );
return orientation() == Qt::Vertical ? TQSize( 0, dim ) : TQSize( dim, 0 );
}
@@ -193,7 +193,7 @@ TQSizePolicy KToolBarSeparator::sizePolicy() const
}
KToolBar::KToolBar( TQWidget *parent, const char *name, bool honorStyle, bool readConfig )
- : TQToolBar( TQString::tqfromLatin1( name ),
+ : TQToolBar( TQString::fromLatin1( name ),
tqt_dynamic_cast<TQMainWindow*>(parent),
parent, false,
name ? name : "mainToolBar")
@@ -202,7 +202,7 @@ KToolBar::KToolBar( TQWidget *parent, const char *name, bool honorStyle, bool re
}
KToolBar::KToolBar( TQMainWindow *parentWindow, TQMainWindow::ToolBarDock dock, bool newLine, const char *name, bool honorStyle, bool readConfig )
- : TQToolBar( TQString::tqfromLatin1( name ),
+ : TQToolBar( TQString::fromLatin1( name ),
parentWindow, dock, newLine,
name ? name : "mainToolBar")
{
@@ -210,7 +210,7 @@ KToolBar::KToolBar( TQMainWindow *parentWindow, TQMainWindow::ToolBarDock dock,
}
KToolBar::KToolBar( TQMainWindow *parentWindow, TQWidget *dock, bool newLine, const char *name, bool honorStyle, bool readConfig )
- : TQToolBar( TQString::tqfromLatin1( name ),
+ : TQToolBar( TQString::fromLatin1( name ),
parentWindow, dock, newLine,
name ? name : "mainToolBar")
{
@@ -734,7 +734,7 @@ int KToolBar::itemIndex (int id)
int KToolBar::idAt (int index)
{
- TQWidget *w = widgets.tqat(index);
+ TQWidget *w = widgets.at(index);
return widget2id[w];
}
@@ -856,11 +856,11 @@ void KToolBar::setIconText(IconText icontext, bool update)
// ugly hack to force a TQMainWindow::triggerLayout( true )
TQMainWindow *mw = mainWindow();
if ( mw ) {
- mw->tqsetUpdatesEnabled( false );
+ mw->setUpdatesEnabled( false );
// mw->setToolBarsMovable( !mw->toolBarsMovable() ); // Old way
// mw->setToolBarsMovable( !mw->toolBarsMovable() );
mw->setCentralWidget(mw->centralWidget()); // This is a faster hack
- mw->tqsetUpdatesEnabled( true );
+ mw->setUpdatesEnabled( true );
}
}
@@ -894,11 +894,11 @@ void KToolBar::setIconSize(int size, bool update)
// ugly hack to force a TQMainWindow::triggerLayout( true )
if ( mainWindow() ) {
TQMainWindow *mw = mainWindow();
- mw->tqsetUpdatesEnabled( false );
+ mw->setUpdatesEnabled( false );
// mw->setToolBarsMovable( !mw->toolBarsMovable() ); // Old way
// mw->setToolBarsMovable( !mw->toolBarsMovable() );
mw->setCentralWidget(mw->centralWidget()); // This is a faster hack
- mw->tqsetUpdatesEnabled( true );
+ mw->setUpdatesEnabled( true );
}
}
@@ -1263,7 +1263,7 @@ void KToolBar::rebuildLayout()
if ( stretchableWidget )
l->setStretchFactor( stretchableWidget, 10 );
}
- l->tqinvalidate();
+ l->invalidate();
TQApplication::postEvent( this, new TQEvent( TQEvent::LayoutHint ) );
}
@@ -1358,12 +1358,12 @@ TQSize KToolBar::sizeHint() const
for ( TQWidget *w = ncThis->widgets.first(); w; w = ncThis->widgets.next() )
{
TQSize sh = w->sizeHint();
- if ( w->tqsizePolicy().horData() == TQSizePolicy::Ignored )
+ if ( w->sizePolicy().horData() == TQSizePolicy::Ignored )
sh.setWidth( 1 );
- if ( w->tqsizePolicy().verData() == TQSizePolicy::Ignored )
+ if ( w->sizePolicy().verData() == TQSizePolicy::Ignored )
sh.setHeight( 1 );
- sh = sh.boundedTo( w->tqmaximumSize() )
- .expandedTo( w->tqminimumSize() ).expandedTo( TQSize(1, 1) );
+ sh = sh.boundedTo( w->maximumSize() )
+ .expandedTo( w->minimumSize() ).expandedTo( TQSize(1, 1) );
minSize = minSize.expandedTo(TQSize(0, sh.height()));
minSize += TQSize(sh.width()+1, 0);
@@ -1371,7 +1371,7 @@ TQSize KToolBar::sizeHint() const
minSize += TQSize(2, 0); // A little bit extra spacing behind it.
}
- minSize += TQSize(TQApplication::tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent ), 0);
+ minSize += TQSize(TQApplication::tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent ), 0);
minSize += TQSize(margin*2, margin*2);
break;
@@ -1380,17 +1380,17 @@ TQSize KToolBar::sizeHint() const
for ( TQWidget *w = ncThis->widgets.first(); w; w = ncThis->widgets.next() )
{
TQSize sh = w->sizeHint();
- if ( w->tqsizePolicy().horData() == TQSizePolicy::Ignored )
+ if ( w->sizePolicy().horData() == TQSizePolicy::Ignored )
sh.setWidth( 1 );
- if ( w->tqsizePolicy().verData() == TQSizePolicy::Ignored )
+ if ( w->sizePolicy().verData() == TQSizePolicy::Ignored )
sh.setHeight( 1 );
- sh = sh.boundedTo( w->tqmaximumSize() )
- .expandedTo( w->tqminimumSize() ).expandedTo( TQSize(1, 1) );
+ sh = sh.boundedTo( w->maximumSize() )
+ .expandedTo( w->minimumSize() ).expandedTo( TQSize(1, 1) );
minSize = minSize.expandedTo(TQSize(sh.width(), 0));
minSize += TQSize(0, sh.height()+1);
}
- minSize += TQSize(0, TQApplication::tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent ));
+ minSize += TQSize(0, TQApplication::tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent ));
minSize += TQSize(margin*2, margin*2);
break;
@@ -1401,7 +1401,7 @@ TQSize KToolBar::sizeHint() const
return minSize;
}
-TQSize KToolBar::tqminimumSize() const
+TQSize KToolBar::minimumSize() const
{
return minimumSizeHint();
}
@@ -1429,7 +1429,7 @@ void KToolBar::show()
void KToolBar::resizeEvent( TQResizeEvent *e )
{
bool b = isUpdatesEnabled();
- tqsetUpdatesEnabled( false );
+ setUpdatesEnabled( false );
TQToolBar::resizeEvent( e );
if (b)
{
@@ -1446,7 +1446,7 @@ void KToolBar::resizeEvent( TQResizeEvent *e )
}
// else {
// printf("[WARNING] In KToolBar::resizeEvent, but this code block should not be executing. Preventing toolbar lockup. [Code 0045]\n\r");
-// tqsetUpdatesEnabled( true );
+// setUpdatesEnabled( true );
// }
}
@@ -1486,25 +1486,25 @@ void KToolBar::slotAppearanceChanged()
//static
bool KToolBar::highlightSetting()
{
- TQString grpToolbar(TQString::tqfromLatin1("Toolbar style"));
+ TQString grpToolbar(TQString::fromLatin1("Toolbar style"));
KConfigGroupSaver saver(KGlobal::config(), grpToolbar);
- return KGlobal::config()->readBoolEntry(TQString::tqfromLatin1("Highlighting"),true);
+ return KGlobal::config()->readBoolEntry(TQString::fromLatin1("Highlighting"),true);
}
//static
bool KToolBar::transparentSetting()
{
- TQString grpToolbar(TQString::tqfromLatin1("Toolbar style"));
+ TQString grpToolbar(TQString::fromLatin1("Toolbar style"));
KConfigGroupSaver saver(KGlobal::config(), grpToolbar);
- return KGlobal::config()->readBoolEntry(TQString::tqfromLatin1("TransparentMoving"),true);
+ return KGlobal::config()->readBoolEntry(TQString::fromLatin1("TransparentMoving"),true);
}
//static
KToolBar::IconText KToolBar::iconTextSetting()
{
- TQString grpToolbar(TQString::tqfromLatin1("Toolbar style"));
+ TQString grpToolbar(TQString::fromLatin1("Toolbar style"));
KConfigGroupSaver saver(KGlobal::config(), grpToolbar);
- TQString icontext = KGlobal::config()->readEntry(TQString::tqfromLatin1("IconText"),TQString::tqfromLatin1("IconOnly"));
+ TQString icontext = KGlobal::config()->readEntry(TQString::fromLatin1("IconText"),TQString::fromLatin1("IconOnly"));
if ( icontext == "IconTextRight" )
return IconTextRight;
else if ( icontext == "IconTextBottom" )
@@ -1546,7 +1546,7 @@ void KToolBar::applyAppearanceSettings(KConfig *config, const TQString &_configG
TQString iconText = d->IconTextDefault;
// this is the first iteration
- TQString grpToolbar(TQString::tqfromLatin1("Toolbar style"));
+ TQString grpToolbar(TQString::fromLatin1("Toolbar style"));
{ // start block for KConfigGroupSaver
KConfigGroupSaver saver(gconfig, grpToolbar);
@@ -1732,15 +1732,15 @@ bool KToolBar::event( TQEvent *e )
void KToolBar::slotRepaint()
{
- tqsetUpdatesEnabled( false );
+ setUpdatesEnabled( false );
// Send a resizeEvent to update the "toolbar extension arrow"
// (The button you get when your toolbar-items don't fit in
// the available space)
TQResizeEvent ev(size(), size());
resizeEvent(&ev);
TQApplication::sendPostedEvents( this, TQEvent::LayoutHint );
- tqsetUpdatesEnabled( true );
- tqrepaint( true );
+ setUpdatesEnabled( true );
+ repaint( true );
}
void KToolBar::toolBarPosChanged( TQToolBar *tb )
diff --git a/tdeui/ktoolbar.h b/tdeui/ktoolbar.h
index 96d0872bc..947fd3bab 100644
--- a/tdeui/ktoolbar.h
+++ b/tdeui/ktoolbar.h
@@ -91,7 +91,7 @@ private:
* Once you have a KToolBar object, you can insert items into it with the
* insert... methods, or remove them with the removeItem() method. This
* can be done at any time; the toolbar will be automatically updated.
- * There are also many methods to set per-child properties like tqalignment
+ * There are also many methods to set per-child properties like alignment
* and toggle behavior.
*
* KToolBar uses a global config group to load toolbar settings on
@@ -947,7 +947,7 @@ public:
bool highlight() const;
TQSize sizeHint() const;
TQSize minimumSizeHint() const;
- TQSize tqminimumSize() const;
+ TQSize minimumSize() const;
void hide();
void show();
diff --git a/tdeui/ktoolbarbutton.cpp b/tdeui/ktoolbarbutton.cpp
index b7801a2f8..91bc5d253 100644
--- a/tdeui/ktoolbarbutton.cpp
+++ b/tdeui/ktoolbarbutton.cpp
@@ -36,7 +36,7 @@
#include <tqpopupmenu.h>
#include <tqcursor.h>
#include <tqpainter.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kapplication.h>
#include <kdebug.h>
@@ -263,7 +263,7 @@ void KToolBarButton::setTextLabel( const TQString& text, bool tipToo)
return;
TQString txt(text);
- if (txt.endsWith(TQString::tqfromLatin1("...")))
+ if (txt.endsWith(TQString::fromLatin1("...")))
txt.truncate(txt.length() - 3);
TQToolButton::setTextLabel(txt, tipToo);
@@ -376,7 +376,7 @@ void KToolBarButton::leaveEvent(TQEvent *)
{
d->m_isRaised = false;
d->m_isActive = false;
- tqrepaint(false);
+ repaint(false);
}
emit highlighted(d->m_id, false);
@@ -398,7 +398,7 @@ void KToolBarButton::enterEvent(TQEvent *)
d->m_isActive = false;
}
- tqrepaint(false);
+ repaint(false);
}
emit highlighted(d->m_id, true);
}
@@ -494,8 +494,8 @@ void KToolBarButton::drawButton( TQPainter *_painter )
if (hasFocus()) flags |= TQStyle::Style_HasFocus;
// Draw a styled toolbutton
- tqstyle().tqdrawComplexControl(TQStyle::CC_ToolButton, _painter, this, rect(),
- tqcolorGroup(), flags, TQStyle::SC_ToolButton, active, TQStyleOption());
+ tqstyle().drawComplexControl(TQStyle::CC_ToolButton, _painter, this, rect(),
+ colorGroup(), flags, TQStyle::SC_ToolButton, active, TQStyleOption());
int dx, dy;
TQFont tmp_font(KGlobalSettings::toolBarFont());
@@ -513,7 +513,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
{
dx = ( width() - pixmap.width() ) / 2;
dy = ( height() - pixmap.height() ) / 2;
- if ( isDown() && tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+ if ( isDown() && tqstyle().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
{
++dx;
++dy;
@@ -531,7 +531,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
{
dx = 4;
dy = ( height() - pixmap.height() ) / 2;
- if ( isDown() && tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+ if ( isDown() && tqstyle().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
{
++dx;
++dy;
@@ -547,7 +547,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
else
dx = 4;
dy = 0;
- if ( isDown() && tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+ if ( isDown() && tqstyle().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
{
++dx;
++dy;
@@ -562,7 +562,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
textFlags = AlignVCenter|AlignLeft;
dx = (width() - fm.width(textLabel())) / 2;
dy = (height() - fm.lineSpacing()) / 2;
- if ( isDown() && tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+ if ( isDown() && tqstyle().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
{
++dx;
++dy;
@@ -580,7 +580,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
{
dx = (width() - pixmap.width()) / 2;
dy = (height() - fm.lineSpacing() - pixmap.height()) / 2;
- if ( isDown() && tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+ if ( isDown() && tqstyle().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
{
++dx;
++dy;
@@ -594,7 +594,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
dx = (width() - fm.width(textLabel())) / 2;
dy = height() - fm.lineSpacing() - 4;
- if ( isDown() && tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+ if ( isDown() && tqstyle().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
{
++dx;
++dy;
@@ -608,11 +608,11 @@ void KToolBarButton::drawButton( TQPainter *_painter )
{
_painter->setFont(KGlobalSettings::toolBarFont());
if (!isEnabled())
- _painter->setPen(tqpalette().disabled().dark());
+ _painter->setPen(palette().disabled().dark());
else if(d->m_isRaised)
_painter->setPen(KGlobalSettings::toolBarHighlightColor());
else
- _painter->setPen( tqcolorGroup().buttonText() );
+ _painter->setPen( colorGroup().buttonText() );
_painter->drawText(textRect, textFlags, textLabel());
}
@@ -624,7 +624,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
if (isEnabled()) arrowFlags |= TQStyle::Style_Enabled;
tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, _painter,
- TQRect(width()-7, height()-7, 7, 7), tqcolorGroup(),
+ TQRect(width()-7, height()-7, 7, 7), colorGroup(),
arrowFlags, TQStyleOption() );
}
}
@@ -634,7 +634,7 @@ void KToolBarButton::paletteChange(const TQPalette &)
if(!d->m_isSeparator)
{
modeChange();
- tqrepaint(false); // no need to delete it first therefore only false
+ repaint(false); // no need to delete it first therefore only false
}
}
@@ -698,7 +698,7 @@ void KToolBarButton::setNoStyle(bool no_style)
modeChange();
d->m_iconText = KToolBar::IconTextRight;
- tqrepaint(false);
+ repaint(false);
}
void KToolBarButton::setRadio (bool f)
@@ -716,13 +716,13 @@ void KToolBarButton::on(bool flag)
setDown(flag);
leaveEvent((TQEvent *) 0);
}
- tqrepaint();
+ repaint();
}
void KToolBarButton::toggle()
{
setOn(!isOn());
- tqrepaint();
+ repaint();
}
void KToolBarButton::setToggle(bool flag)
@@ -744,7 +744,7 @@ TQSize KToolBarButton::minimumSizeHint() const
return d->size;
}
-TQSize KToolBarButton::tqminimumSize() const
+TQSize KToolBarButton::minimumSize() const
{
return d->size;
}
diff --git a/tdeui/ktoolbarbutton.h b/tdeui/ktoolbarbutton.h
index 9f02a1f6b..e1da25ae8 100644
--- a/tdeui/ktoolbarbutton.h
+++ b/tdeui/ktoolbarbutton.h
@@ -294,7 +294,7 @@ protected:
void showMenu();
TQSize sizeHint() const;
TQSize minimumSizeHint() const;
- TQSize tqminimumSize() const;
+ TQSize minimumSize() const;
/// @since 3.1
bool isRaised() const;
diff --git a/tdeui/ktoolbarhandler.cpp b/tdeui/ktoolbarhandler.cpp
index 34bfe7046..bdeba7281 100644
--- a/tdeui/ktoolbarhandler.cpp
+++ b/tdeui/ktoolbarhandler.cpp
@@ -209,7 +209,7 @@ void ToolBarHandler::init( KMainWindow *mainWindow )
if ( domDocument().documentElement().isNull() ) {
- TQString completeDescription = TQString::tqfromLatin1( guiDescription )
+ TQString completeDescription = TQString::fromLatin1( guiDescription )
.arg( actionListName );
setXML( completeDescription, false /*merge*/ );
diff --git a/tdeui/ktoolbarlabelaction.cpp b/tdeui/ktoolbarlabelaction.cpp
index 8fb5a1341..b86906e57 100644
--- a/tdeui/ktoolbarlabelaction.cpp
+++ b/tdeui/ktoolbarlabelaction.cpp
@@ -68,7 +68,7 @@ KToolBarLabelAction::KToolBarLabelAction(TQLabel* label,
: KWidgetAction(label, label->text(), cut, receiver, slot, parent, name),
d(new KToolBarLabelActionPrivate)
{
- Q_ASSERT(TQString::tqfromLatin1("kde toolbar widget") == label->name());
+ Q_ASSERT(TQString::fromLatin1("kde toolbar widget") == label->name());
init();
}
diff --git a/tdeui/kurllabel.cpp b/tdeui/kurllabel.cpp
index f9f5591ce..e2b11d935 100644
--- a/tdeui/kurllabel.cpp
+++ b/tdeui/kurllabel.cpp
@@ -356,7 +356,7 @@ bool KURLLabel::event (TQEvent *e)
// use parentWidget() unless you are a toplevel widget, then try qAapp
TQPalette p = parentWidget() ? parentWidget()->palette() : tqApp->palette();
p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Normal, TQColorGroup::Background));
- p.setColor(TQColorGroup::Foreground, tqpalette().active().foreground());
+ p.setColor(TQColorGroup::Foreground, palette().active().foreground());
setPalette(p);
d->LinkColor = KGlobalSettings::linkColor();
setLinkColor(d->LinkColor);
@@ -367,7 +367,7 @@ bool KURLLabel::event (TQEvent *e)
if (result && hasFocus()) {
TQPainter p(this);
TQRect r( activeRect() );
- tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, r, tqcolorGroup() );
+ tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, r, colorGroup() );
}
return result;
}
@@ -407,7 +407,7 @@ TQRect KURLLabel::activeRect() const
TQRect r( contentsRect() );
if (text().isEmpty() || (!d->MarginAltered && sizePolicy() == TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)))
return r; //fixed size is sometimes used with pixmap
- int hAlign = TQApplication::horizontalAlignment( tqalignment() );
+ int hAlign = TQApplication::horizontalAlignment( alignment() );
int indentX = (hAlign && indent()>0) ? indent() : 0;
TQFontMetrics fm(font());
r.setWidth( QMIN(fm.width(text()), r.width()));
diff --git a/tdeui/kwhatsthismanager.cpp b/tdeui/kwhatsthismanager.cpp
index b7873ed0e..56a25a4db 100644
--- a/tdeui/kwhatsthismanager.cpp
+++ b/tdeui/kwhatsthismanager.cpp
@@ -20,7 +20,7 @@
#include "tqwhatsthis.h"
#include <tqvariant.h>
#include <kdebug.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <klocale.h>
#include <kapplication.h>
@@ -68,11 +68,11 @@ bool KWhatsThisUndefined::clicked (const TQString& href)
body . append ("Widget text: '" + (m_widget -> property ("text") . toString ()) + "'\n");
TQString dsc = TQString ("current --> ") + m_widget -> name ();
dsc . append (TQString (" (") + m_widget -> className () + ")\n");
- for (w = m_widget; w && w != m_widget -> tqtopLevelWidget (); w = w -> parentWidget ()) {
+ for (w = m_widget; w && w != m_widget -> topLevelWidget (); w = w -> parentWidget ()) {
dsc . append (w -> name ());
dsc . append (TQString (" (") + w -> className () + ")\n");
}
- w = m_widget -> tqtopLevelWidget ();
+ w = m_widget -> topLevelWidget ();
if (w) {
dsc . append ("toplevel --> ");
dsc . append (w -> name ());
diff --git a/tdeui/kwordwrap.cpp b/tdeui/kwordwrap.cpp
index b7eeaff7c..d104b421a 100644
--- a/tdeui/kwordwrap.cpp
+++ b/tdeui/kwordwrap.cpp
@@ -35,7 +35,7 @@ KWordWrap* KWordWrap::formatText( TQFontMetrics &fm, const TQRect & r, int /*fla
{
KWordWrap* kw = new KWordWrap( r );
// The wordwrap algorithm
- // The variable names and the global tqshape of the algorithm are inspired
+ // The variable names and the global shape of the algorithm are inspired
// from QTextFormatterBreakWords::format().
//kdDebug() << "KWordWrap::formatText " << str << " r=" << r.x() << "," << r.y() << " " << r.width() << "x" << r.height() << endl;
int height = fm.height();
@@ -201,7 +201,7 @@ void KWordWrap::drawFadeoutText(TQPainter *p, int x, int y, int maxW,
int n = TQMIN( tl, 3);
for (int i = 0; i < n; i++) {
p->setPen( mixColors( 0.70 - i * 0.25, textColor, bgColor ) );
- TQString s( t.tqat( tl - n + i ) );
+ TQString s( t.at( tl - n + i ) );
p->drawText( x, y, s );
x += fm.width( s );
}
diff --git a/tdeui/kwordwrap.h b/tdeui/kwordwrap.h
index 50d90e1e7..3fb48acd9 100644
--- a/tdeui/kwordwrap.h
+++ b/tdeui/kwordwrap.h
@@ -91,12 +91,12 @@ public:
/**
* Draw the text that has been previously wrapped, at position x,y.
- * Flags are for tqalignment, e.g. Qt::AlignHCenter. Default is
+ * Flags are for alignment, e.g. Qt::AlignHCenter. Default is
* Qt::AlignAuto.
* @param painter the TQPainter to use.
* @param x the horizontal position of the text
* @param y the vertical position of the text
- * @param flags the ORed text tqalignment flags from the Qt namespace,
+ * @param flags the ORed text alignment flags from the Qt namespace,
* ORed with FadeOut if you want the text to fade out if it
* does not fit (the @p painter's background must be set
* accordingly)
diff --git a/tdeui/kxmlguibuilder.cpp b/tdeui/kxmlguibuilder.cpp
index 123d85b2c..c31242ff1 100644
--- a/tdeui/kxmlguibuilder.cpp
+++ b/tdeui/kxmlguibuilder.cpp
@@ -70,24 +70,24 @@ KXMLGUIBuilder::KXMLGUIBuilder( TQWidget *widget )
d = new KXMLGUIBuilderPrivate;
d->m_widget = widget;
- d->tagMainWindow = TQString::tqfromLatin1( "mainwindow" );
- d->tagMenuBar = TQString::tqfromLatin1( "menubar" );
- d->tagMenu = TQString::tqfromLatin1( "menu" );
- d->tagToolBar = TQString::tqfromLatin1( "toolbar" );
- d->tagStatusBar = TQString::tqfromLatin1( "statusbar" );
+ d->tagMainWindow = TQString::fromLatin1( "mainwindow" );
+ d->tagMenuBar = TQString::fromLatin1( "menubar" );
+ d->tagMenu = TQString::fromLatin1( "menu" );
+ d->tagToolBar = TQString::fromLatin1( "toolbar" );
+ d->tagStatusBar = TQString::fromLatin1( "statusbar" );
- d->tagSeparator = TQString::tqfromLatin1( "separator" );
- d->tagTearOffHandle = TQString::tqfromLatin1( "tearoffhandle" );
- d->tagMenuTitle = TQString::tqfromLatin1( "title" );
+ d->tagSeparator = TQString::fromLatin1( "separator" );
+ d->tagTearOffHandle = TQString::fromLatin1( "tearoffhandle" );
+ d->tagMenuTitle = TQString::fromLatin1( "title" );
- d->attrName = TQString::tqfromLatin1( "name" );
- d->attrLineSeparator = TQString::tqfromLatin1( "lineseparator" );
+ d->attrName = TQString::fromLatin1( "name" );
+ d->attrLineSeparator = TQString::fromLatin1( "lineseparator" );
- d->attrText1 = TQString::tqfromLatin1( "text" );
- d->attrText2 = TQString::tqfromLatin1( "Text" );
- d->attrContext = TQString::tqfromLatin1( "context" );
+ d->attrText1 = TQString::fromLatin1( "text" );
+ d->attrText2 = TQString::fromLatin1( "Text" );
+ d->attrContext = TQString::fromLatin1( "context" );
- d->attrIcon = TQString::tqfromLatin1( "icon" );
+ d->attrIcon = TQString::fromLatin1( "icon" );
d->m_instance = 0;
d->m_client = 0;
@@ -332,7 +332,7 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo
TQDomAttr attr = attributes.item( i ).toAttr();
if ( attr.name().lower() == d->attrLineSeparator &&
- attr.value().lower() == TQString::tqfromLatin1("false") )
+ attr.value().lower() == TQString::fromLatin1("false") )
{
isLineSep = false;
break;
diff --git a/tdeui/kxmlguiclient.cpp b/tdeui/kxmlguiclient.cpp
index dd7458ede..8ca9fd97a 100644
--- a/tdeui/kxmlguiclient.cpp
+++ b/tdeui/kxmlguiclient.cpp
@@ -24,7 +24,7 @@
#include <tqdir.h>
#include <tqfile.h>
#include <tqdom.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqregexp.h>
#include <tqguardedptr.h>
@@ -143,7 +143,7 @@ TQString KXMLGUIClient::localXMLFile() const
if ( !TQDir::isRelativePath(d->m_xmlFile) )
return TQString::null; // can't save anything here
- return locateLocal( "data", TQString::tqfromLatin1( instance()->instanceName() + '/' ) + d->m_xmlFile );
+ return locateLocal( "data", TQString::fromLatin1( instance()->instanceName() + '/' ) + d->m_xmlFile );
}
@@ -178,7 +178,7 @@ void KXMLGUIClient::setXMLFile( const TQString& _file, bool merge, bool setXMLDo
{
TQString doc;
- TQString filter = TQString::tqfromLatin1( instance()->instanceName() + '/' ) + _file;
+ TQString filter = TQString::fromLatin1( instance()->instanceName() + '/' ) + _file;
TQStringList allFiles = instance()->dirs()->findAllResources( "data", filter ) + instance()->dirs()->findAllResources( "data", _file );
@@ -699,7 +699,7 @@ TQString KXMLGUIClient::findMostRecentXMLFile( const TQStringList &files, TQStri
else
{
TQString f = (*local).file;
- TQString backup = f + TQString::tqfromLatin1( ".backup" );
+ TQString backup = f + TQString::fromLatin1( ".backup" );
TQDir dir;
dir.rename( f, backup );
}
@@ -760,9 +760,9 @@ TQString KXMLGUIClient::findVersionNumber( const TQString &xml )
unsigned int endpos;
for (endpos = pos; endpos < xml.length(); endpos++)
{
- if (xml[endpos].tqunicode() >= '0' && xml[endpos].tqunicode() <= '9')
+ if (xml[endpos].unicode() >= '0' && xml[endpos].unicode() <= '9')
continue; //Number..
- if (xml[endpos].tqunicode() == '"') //End of parameter
+ if (xml[endpos].unicode() == '"') //End of parameter
break;
else //This shouldn't be here..
{
diff --git a/tdeui/kxmlguifactory.cpp b/tdeui/kxmlguifactory.cpp
index 2714b1207..11a08fb95 100644
--- a/tdeui/kxmlguifactory.cpp
+++ b/tdeui/kxmlguifactory.cpp
@@ -27,7 +27,7 @@
#include <tqdir.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqwidget.h>
#include <tqdatetime.h>
#include <tqvariant.h>
@@ -110,7 +110,7 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_nu
xml_file = filename;
else
{
- xml_file = locate("data", TQString::tqfromLatin1(instance->instanceName() + '/' ) + filename);
+ xml_file = locate("data", TQString::fromLatin1(instance->instanceName() + '/' ) + filename);
if ( !TQFile::exists( xml_file ) )
xml_file = locate( "data", filename );
}
@@ -120,7 +120,7 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_nu
{
kdError(240) << "No such XML file " << filename << endl;
if ( never_null )
- return TQString::tqfromLatin1( "<!DOCTYPE kpartgui>\n<kpartgui name=\"empty\">\n</kpartgui>" );
+ return TQString::fromLatin1( "<!DOCTYPE kpartgui>\n<kpartgui name=\"empty\">\n</kpartgui>" );
else
return TQString::null;
}
@@ -146,7 +146,7 @@ bool KXMLGUIFactory::saveConfigFile( const TQDomDocument& doc,
TQString xml_file(filename);
if (TQDir::isRelativePath(xml_file))
- xml_file = locateLocal("data", TQString::tqfromLatin1( instance->instanceName() + '/' )
+ xml_file = locateLocal("data", TQString::fromLatin1( instance->instanceName() + '/' )
+ filename);
TQFile file( xml_file );
@@ -566,7 +566,7 @@ int KXMLGUIFactory::configureShortcuts(bool bAllowLetterShortcuts , bool bSaveSe
TQDomElement KXMLGUIFactory::actionPropertiesElement( TQDomDocument& doc )
{
- const TQString tagActionProp = TQString::tqfromLatin1("ActionProperties");
+ const TQString tagActionProp = TQString::fromLatin1("ActionProperties");
// first, lets see if we have existing properties
TQDomElement elem;
TQDomNode it = doc.documentElement().firstChild();
diff --git a/tdeui/qxembed.cpp b/tdeui/qxembed.cpp
index e0ce2166b..95bd1bc9b 100644
--- a/tdeui/qxembed.cpp
+++ b/tdeui/qxembed.cpp
@@ -310,8 +310,8 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e)
// active and has just been given the Qt focus (L0614) or
// because the widget already had the Qt focus and just became
// active (L0615).
- if ( TQT_BASE_OBJECT(tqApp->tqfocusWidget()) == TQT_BASE_OBJECT(o) &&
- ((QPublicWidget*)tqApp->tqfocusWidget()->tqtopLevelWidget())->topData()->embedded ) {
+ if ( TQT_BASE_OBJECT(tqApp->focusWidget()) == TQT_BASE_OBJECT(o) &&
+ ((QPublicWidget*)tqApp->focusWidget()->topLevelWidget())->topData()->embedded ) {
TQFocusEvent* fe = (TQFocusEvent*) e;
if ( obeyFocus || fe->reason() != TQFocusEvent::ActiveWindow /*|| fe->reason() == TQFocusEvent::Mouse ||
fe->reason() == TQFocusEvent::Shortcut*/ ) {
@@ -320,11 +320,11 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e)
// activity in the client. The XEMBED_REQUEST_FOCUS message causes
// the embedding widget to take the Qt focus (L2085).
#ifdef USE_QT4
- WId window = ((QPublicWidget*)tqApp->tqfocusWidget()->tqtopLevelWidget())->effectiveWinId();
+ WId window = ((QPublicWidget*)tqApp->focusWidget()->topLevelWidget())->effectiveWinId();
#else // USE_QT4
- WId window = ((QPublicWidget*)tqApp->tqfocusWidget()->tqtopLevelWidget())->topData()->parentWinId;
+ WId window = ((QPublicWidget*)tqApp->focusWidget()->topLevelWidget())->topData()->parentWinId;
#endif // USE_QT4
- focusMap->remove( tqApp->tqfocusWidget()->tqtopLevelWidget() );
+ focusMap->remove( tqApp->focusWidget()->topLevelWidget() );
sendXEmbedMessage( window, XEMBED_REQUEST_FOCUS );
} else if ( fe->reason() == TQFocusEvent::ActiveWindow ) {
// L0615: Both the embedder and the embedded client became active.
@@ -332,20 +332,20 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e)
// So we clear the Qt focus for now. If indeed the QXEmbed widget
// has the focus, it will receive a FocusIn message (L1530) and
// tell us to restore the focus (L0680, L0683).
- focusMap->remove( tqApp->tqfocusWidget()->tqtopLevelWidget() );
- focusMap->insert( tqApp->tqfocusWidget()->tqtopLevelWidget(),
- new TQGuardedPtr<TQWidget>(tqApp->tqfocusWidget()->tqtopLevelWidget()->tqfocusWidget() ) );
- // L0616: tqApp->tqfocusWidget() might belong to a modal dialog and not be
- // equal to tqApp->tqfocusWidget()->tqtopLevelWidget()->tqfocusWidget() !
- tqApp->tqfocusWidget()->clearFocus();
+ focusMap->remove( tqApp->focusWidget()->topLevelWidget() );
+ focusMap->insert( tqApp->focusWidget()->topLevelWidget(),
+ new TQGuardedPtr<TQWidget>(tqApp->focusWidget()->topLevelWidget()->focusWidget() ) );
+ // L0616: tqApp->focusWidget() might belong to a modal dialog and not be
+ // equal to tqApp->focusWidget()->topLevelWidget()->focusWidget() !
+ tqApp->focusWidget()->clearFocus();
// L0617: ??? [why not {obeyFocus=false; return true;} here?]
}
obeyFocus = false;
}
break;
case TQEvent::KeyPress:
- if (TQT_BASE_OBJECT(tqApp->tqfocusWidget()) == TQT_BASE_OBJECT(o) &&
- ((QPublicWidget*)tqApp->tqfocusWidget()->tqtopLevelWidget())->topData()->embedded ) {
+ if (TQT_BASE_OBJECT(tqApp->focusWidget()) == TQT_BASE_OBJECT(o) &&
+ ((QPublicWidget*)tqApp->focusWidget()->topLevelWidget())->topData()->embedded ) {
// L0620: The following code replaces the Qt code that
// handles focus focus changes with the tab key. See the
// XEMBED specification for details. The keypress event
@@ -359,7 +359,7 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e)
// (L0653, L0654) which then performs tab navigation
// (L2081).
TQKeyEvent *k = (TQKeyEvent *)e;
- TQWidget *w = tqApp->tqfocusWidget();
+ TQWidget *w = tqApp->focusWidget();
// L0621: The following tests are copied from TQWidget::event().
bool res = false;
bool tabForward = true;
@@ -387,19 +387,19 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e)
// Now check whether we have been looping around.
TQFocusData *fd = ((QPublicWidget*)w)->focusData();
#ifdef USE_QT4
- WId window = ((QPublicWidget*)w->tqtopLevelWidget())->effectiveWinId();
+ WId window = ((QPublicWidget*)w->topLevelWidget())->effectiveWinId();
#else // USE_QT4
- WId window = ((QPublicWidget*)w->tqtopLevelWidget())->topData()->parentWinId;
+ WId window = ((QPublicWidget*)w->topLevelWidget())->topData()->parentWinId;
#endif // USE_QT4
TQWidget *cw = 0;
TQWidget *fw = fd->home();
if (tabForward && window) {
- while (cw != w && cw != fw && cw != w->tqtopLevelWidget())
+ while (cw != w && cw != fw && cw != w->topLevelWidget())
cw = fd->prev();
if (cw != w)
sendXEmbedMessage( window, XEMBED_FOCUS_NEXT );
} else if (window) {
- while (cw != w && cw != fw && cw != w->tqtopLevelWidget())
+ while (cw != w && cw != fw && cw != w->topLevelWidget())
cw = fd->next();
if (cw != w)
sendXEmbedMessage( window, XEMBED_FOCUS_PREV );
@@ -443,7 +443,7 @@ static int qxembed_x11_event_filter( XEvent* e)
switch ( message) {
case XEMBED_EMBEDDED_NOTIFY: {
// L0675: We just have been embedded into a XEMBED aware widget.
- TQTLWExtra *extra = ((QPublicWidget*)w->tqtopLevelWidget())->topData();
+ TQTLWExtra *extra = ((QPublicWidget*)w->topLevelWidget())->topData();
extra->embedded = 1;
#ifdef USE_QT4
// [FIXME]
@@ -451,7 +451,7 @@ static int qxembed_x11_event_filter( XEvent* e)
#else // USE_QT4
extra->parentWinId = e->xclient.data.l[3];
#endif // USE_QT4
- w->tqtopLevelWidget()->show();
+ w->topLevelWidget()->show();
break;
}
case XEMBED_WINDOW_ACTIVATE: {
@@ -464,7 +464,7 @@ static int qxembed_x11_event_filter( XEvent* e)
memset(&ev, 0, sizeof(ev));
ev.xfocus.display = qt_xdisplay();
ev.xfocus.type = XFocusIn;
- ev.xfocus.window = w->tqtopLevelWidget()->winId();
+ ev.xfocus.window = w->topLevelWidget()->winId();
ev.xfocus.mode = NotifyNormal;
ev.xfocus.detail = NotifyAncestor;
tqApp->x11ProcessEvent( &ev );
@@ -478,7 +478,7 @@ static int qxembed_x11_event_filter( XEvent* e)
memset(&ev, 0, sizeof(ev));
ev.xfocus.display = qt_xdisplay();
ev.xfocus.type = XFocusOut;
- ev.xfocus.window = w->tqtopLevelWidget()->winId();
+ ev.xfocus.window = w->topLevelWidget()->winId();
ev.xfocus.mode = NotifyNormal;
ev.xfocus.detail = NotifyAncestor;
tqApp->x11ProcessEvent( &ev );
@@ -489,11 +489,11 @@ static int qxembed_x11_event_filter( XEvent* e)
{
// L0681: Search saved focus widget.
TQWidget* focusCurrent = 0;
- TQGuardedPtr<TQWidget>* fw = focusMap->find( w->tqtopLevelWidget() );
+ TQGuardedPtr<TQWidget>* fw = focusMap->find( w->topLevelWidget() );
if ( fw ) {
focusCurrent = *fw;
// L0682: Remove it from the map
- focusMap->remove( w->tqtopLevelWidget() );
+ focusMap->remove( w->topLevelWidget() );
}
switch ( detail ) {
case XEMBED_FOCUS_CURRENT:
@@ -503,19 +503,19 @@ static int qxembed_x11_event_filter( XEvent* e)
if( QXEmbed* emb = tqt_dynamic_cast< QXEmbed* >( focusCurrent ))
emb->updateEmbeddedFocus( true );
}
- else if ( !w->tqtopLevelWidget()->tqfocusWidget() )
- w->tqtopLevelWidget()->setFocus();
+ else if ( !w->topLevelWidget()->focusWidget() )
+ w->topLevelWidget()->setFocus();
break;
case XEMBED_FOCUS_FIRST:
{
// L0684: Search first widget in tab chain
#ifdef USE_QT4
- w->tqtopLevelWidget()->setFocus();
- ((QPublicWidget*)w->tqtopLevelWidget())->focusNextPrev(true);
+ w->topLevelWidget()->setFocus();
+ ((QPublicWidget*)w->topLevelWidget())->focusNextPrev(true);
#else // USE_QT4
TQFocusEvent::setReason( TQFocusEvent::Tab );
- w->tqtopLevelWidget()->setFocus();
- ((QPublicWidget*)w->tqtopLevelWidget())->focusNextPrev(true);
+ w->topLevelWidget()->setFocus();
+ ((QPublicWidget*)w->topLevelWidget())->focusNextPrev(true);
TQFocusEvent::resetReason();
#endif // USE_QT4
}
@@ -524,12 +524,12 @@ static int qxembed_x11_event_filter( XEvent* e)
{
// L0686: Search last widget in tab chain
#ifdef USE_QT4
- w->tqtopLevelWidget()->setFocus();
- ((QPublicWidget*)w->tqtopLevelWidget())->focusNextPrev(false);
+ w->topLevelWidget()->setFocus();
+ ((QPublicWidget*)w->topLevelWidget())->focusNextPrev(false);
#else // USE_QT4
TQFocusEvent::setReason( TQFocusEvent::Backtab );
- w->tqtopLevelWidget()->setFocus();
- ((QPublicWidget*)w->tqtopLevelWidget())->focusNextPrev(false);
+ w->topLevelWidget()->setFocus();
+ ((QPublicWidget*)w->topLevelWidget())->focusNextPrev(false);
TQFocusEvent::resetReason();
#endif // USE_QT4
}
@@ -543,12 +543,12 @@ static int qxembed_x11_event_filter( XEvent* e)
// L0688: Embedding application takes the focus away
// We first record what the focus widget was
// and clear the Qt focus.
- if ( w->tqtopLevelWidget()->tqfocusWidget() ) {
- if( QXEmbed* emb = tqt_dynamic_cast< QXEmbed* >( w->tqtopLevelWidget()->tqfocusWidget()))
+ if ( w->topLevelWidget()->focusWidget() ) {
+ if( QXEmbed* emb = tqt_dynamic_cast< QXEmbed* >( w->topLevelWidget()->focusWidget()))
emb->updateEmbeddedFocus( false );
- focusMap->insert( w->tqtopLevelWidget(),
- new TQGuardedPtr<TQWidget>(w->tqtopLevelWidget()->tqfocusWidget() ) );
- w->tqtopLevelWidget()->tqfocusWidget()->clearFocus();
+ focusMap->insert( w->topLevelWidget(),
+ new TQGuardedPtr<TQWidget>(w->topLevelWidget()->focusWidget() ) );
+ w->topLevelWidget()->focusWidget()->clearFocus();
}
break;
default:
@@ -651,7 +651,7 @@ QXEmbed::QXEmbed(TQWidget *parent, const char *name, WFlags f)
// whole embedding application. They compete between themselves and
// against Qt (L0690, L0914, L1040, L1310, L1510, L1580).
// This would be much simpler if implemented within Qt.
- d->focusProxy = new TQWidget( tqtopLevelWidget(), "xembed_focus" );
+ d->focusProxy = new TQWidget( topLevelWidget(), "xembed_focus" );
d->focusProxy->setGeometry( -1, -1, 1, 1 );
d->focusProxy->show();
// make sure it's shown - for XSetInputFocus
@@ -686,13 +686,13 @@ QXEmbed::QXEmbed(TQWidget *parent, const char *name, WFlags f)
// L0913: all application events pass through eventFilter().
// This is mostly used to force the X11 focus on the
// proxy focus window. See L1300.
- tqtopLevelWidget()->installEventFilter( this );
+ topLevelWidget()->installEventFilter( this );
tqApp->installEventFilter( this );
// L0914: Start moving the X11 focus on the focus proxy window.
// See L1581 to know why we do not use isActiveWindow().
- if ( tqApp->activeWindow() == tqtopLevelWidget() )
- if ( !((QPublicWidget*) tqtopLevelWidget())->topData()->embedded )
+ if ( tqApp->activeWindow() == topLevelWidget() )
+ if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded )
XSetInputFocus( qt_xdisplay(), d->focusProxy->winId(),
RevertToParent, GET_QT_X_TIME() );
// L0915: ??? [drag&drop?]
@@ -746,7 +746,7 @@ QXEmbed::~QXEmbed()
int revert;
XGetInputFocus( qt_xdisplay(), &focus, &revert );
if( focus == d->focusProxy->winId())
- XSetInputFocus( qt_xdisplay(), tqtopLevelWidget()->winId(), RevertToParent, GET_QT_X_TIME() );
+ XSetInputFocus( qt_xdisplay(), topLevelWidget()->winId(), RevertToParent, GET_QT_X_TIME() );
// L01045: Delete our private data.
delete d;
}
@@ -810,10 +810,10 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e)
switch ( e->type() ) {
case TQEvent::WindowActivate:
- if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(tqtopLevelWidget()) ) {
+ if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(topLevelWidget()) ) {
// L1310: Qt thinks the application window has just been activated.
// Make sure the X11 focus is on the focus proxy window. See L0686.
- if ( !((QPublicWidget*) tqtopLevelWidget())->topData()->embedded )
+ if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded )
if (! hasFocus() )
XSetInputFocus( qt_xdisplay(), d->focusProxy->winId(),
RevertToParent, GET_QT_X_TIME() );
@@ -826,7 +826,7 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e)
}
break;
case TQEvent::WindowDeactivate:
- if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(tqtopLevelWidget()) ) {
+ if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(topLevelWidget()) ) {
if (d->xplain)
// L1321: Activation has changed. Grab state might change. See L2800.
checkGrab();
@@ -838,7 +838,7 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e)
case TQEvent::Move:
{
TQWidget* pos = this;
- while( TQT_BASE_OBJECT(pos) != TQT_BASE_OBJECT(o) && TQT_BASE_OBJECT(pos) != TQT_BASE_OBJECT(tqtopLevelWidget()))
+ while( TQT_BASE_OBJECT(pos) != TQT_BASE_OBJECT(o) && TQT_BASE_OBJECT(pos) != TQT_BASE_OBJECT(topLevelWidget()))
pos = pos->parentWidget();
if( TQT_BASE_OBJECT(pos) == TQT_BASE_OBJECT(o) ) {
// L1390: Send fake configure notify events whenever the
@@ -894,8 +894,8 @@ void QXEmbed::focusInEvent( TQFocusEvent * e ){
return;
// L1510: This is a good time to set the X11 focus on the focus proxy window.
// Except if the the embedding application itself is embedded into another.
- if ( !((QPublicWidget*) tqtopLevelWidget())->topData()->embedded )
- if ( tqApp->activeWindow() == tqtopLevelWidget() )
+ if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded )
+ if ( tqApp->activeWindow() == topLevelWidget() )
// L1511: Alter X focus only when window is active.
// This is dual safety here because FocusIn implies this.
// But see L1581 for an example where this really matters.
@@ -943,8 +943,8 @@ void QXEmbed::focusOutEvent( TQFocusEvent * ){
// is properly set to the X11 focus widget. We do this because
// the client application might have moved the X11 focus after
// receiving the fake focus messages.
- if ( !((QPublicWidget*) tqtopLevelWidget())->topData()->embedded )
- if ( tqApp->activeWindow() == tqtopLevelWidget() )
+ if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded )
+ if ( tqApp->activeWindow() == topLevelWidget() )
// L1581: Alter X focus only when window is active.
// The test above is not the same as isActiveWindow().
// Function isActiveWindow() also returns true when a modal
@@ -1210,13 +1210,13 @@ bool QXEmbed::x11Event( XEvent* e)
break;
// L2085: The client asks for the focus.
case XEMBED_REQUEST_FOCUS:
- if( ((QPublicWidget*)tqtopLevelWidget())->topData()->embedded ) {
- focusMap->remove( tqtopLevelWidget() );
- focusMap->insert( tqtopLevelWidget(), new TQGuardedPtr<TQWidget>( this ));
+ if( ((QPublicWidget*)topLevelWidget())->topData()->embedded ) {
+ focusMap->remove( topLevelWidget() );
+ focusMap->insert( topLevelWidget(), new TQGuardedPtr<TQWidget>( this ));
#ifdef USE_QT4
- WId window = ((QPublicWidget*)tqtopLevelWidget())->effectiveWinId();
+ WId window = ((QPublicWidget*)topLevelWidget())->effectiveWinId();
#else // USE_QT4
- WId window = ((QPublicWidget*)tqtopLevelWidget())->topData()->parentWinId;
+ WId window = ((QPublicWidget*)topLevelWidget())->topData()->parentWinId;
#endif // USE_QT4
sendXEmbedMessage( window, XEMBED_REQUEST_FOCUS );
} else {
diff --git a/tdeui/tests/itemcontainertest.cpp b/tdeui/tests/itemcontainertest.cpp
index 1767bec5f..5ed7264ee 100644
--- a/tdeui/tests/itemcontainertest.cpp
+++ b/tdeui/tests/itemcontainertest.cpp
@@ -8,7 +8,7 @@
*
*/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqvbox.h>
#include <tqhbox.h>
#include <tqbuttongroup.h>
diff --git a/tdeui/tests/kbuttonboxtest.cpp b/tdeui/tests/kbuttonboxtest.cpp
index 1773c47f9..167d8b41e 100644
--- a/tdeui/tests/kbuttonboxtest.cpp
+++ b/tdeui/tests/kbuttonboxtest.cpp
@@ -18,7 +18,7 @@
*/
#include <kapplication.h>
#include "kbuttonbox.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqdialog.h>
#include <tqpushbutton.h>
diff --git a/tdeui/tests/kcomboboxtest.cpp b/tdeui/tests/kcomboboxtest.cpp
index 44b849b44..50aa0995d 100644
--- a/tdeui/tests/kcomboboxtest.cpp
+++ b/tdeui/tests/kcomboboxtest.cpp
@@ -14,7 +14,7 @@
#include <ksimpleconfig.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpixmap.h>
#include <tqlabel.h>
#include <tqhbox.h>
diff --git a/tdeui/tests/kcompletiontest.cpp b/tdeui/tests/kcompletiontest.cpp
index bdd47ab48..916944063 100644
--- a/tdeui/tests/kcompletiontest.cpp
+++ b/tdeui/tests/kcompletiontest.cpp
@@ -13,7 +13,7 @@
#include <tqlabel.h>
#include <tqlistbox.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqvariant.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
diff --git a/tdeui/tests/kdesattest.cpp b/tdeui/tests/kdesattest.cpp
index e75b320a7..28f7d4cf2 100644
--- a/tdeui/tests/kdesattest.cpp
+++ b/tdeui/tests/kdesattest.cpp
@@ -23,7 +23,7 @@ KDesatWidget::KDesatWidget(TQWidget *parent, const char *name)
void KDesatWidget::change(double) {
desat_value = slide->value();
- tqrepaint(false);
+ repaint(false);
}
void KDesatWidget::paintEvent(TQPaintEvent */*ev*/)
diff --git a/tdeui/tests/kdialogbasetest.cpp b/tdeui/tests/kdialogbasetest.cpp
index 35da840a1..35b9da4fe 100644
--- a/tdeui/tests/kdialogbasetest.cpp
+++ b/tdeui/tests/kdialogbasetest.cpp
@@ -2,7 +2,7 @@
#include <kdialogbase.h>
#include <tqstring.h>
-#include <tqtextview.h>
+#include <textview.h>
int main(int argc, char** argv)
{
@@ -64,7 +64,7 @@ int main(int argc, char** argv)
widget may change before the dialog is shown. Additionally, setting a
help chapter may cause a need for adjustment since it modifies the height
of the upper frame. */
- dialog.resize(dialog.tqminimumSize());
+ dialog.resize(dialog.minimumSize());
/* The dialog object is used just as any other TQDialog: */
if(dialog.exec())
{
diff --git a/tdeui/tests/kdockwidgetdemo.cpp b/tdeui/tests/kdockwidgetdemo.cpp
index 9b65db594..a08cb78ba 100644
--- a/tdeui/tests/kdockwidgetdemo.cpp
+++ b/tdeui/tests/kdockwidgetdemo.cpp
@@ -3,10 +3,10 @@
#include <tqheader.h>
#include <tqtoolbutton.h>
#include <tqtooltip.h>
-#include <tqtextview.h>
+#include <textview.h>
#include <tqfileinfo.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqhbox.h>
#include <tqlabel.h>
#include <tqmultilineedit.h>
@@ -82,7 +82,7 @@ SFileDialog::SFileDialog( TQString initially, const TQStringList& filter, const
:TQDialog(0L,name,true)
{
KConfig* config = kapp->config();
- config->setGroup( TQString::tqfromLatin1("SFileDialogData:") + name );
+ config->setGroup( TQString::fromLatin1("SFileDialogData:") + name );
if ( initially.isNull() ){
initially = config->readPathEntry( "InitiallyDir", TQDir::currentDirPath() );
}
@@ -242,7 +242,7 @@ void PixmapView::setPixmap( const TQPixmap &pix )
{
pixmap = pix;
resizeContents( pixmap.size().width(), pixmap.size().height() );
- viewport()->tqrepaint( true );
+ viewport()->repaint( true );
}
void PixmapView::drawContents( TQPainter *p, int, int, int, int )
@@ -643,7 +643,7 @@ void Directory::setOpen( bool o )
return;
}
- listView()->tqsetUpdatesEnabled( false );
+ listView()->setUpdatesEnabled( false );
const QFileInfoList * files = thisDir.entryInfoList();
if ( files ){
QFileInfoListIterator it( *files );
@@ -654,7 +654,7 @@ void Directory::setOpen( bool o )
(void)new Directory( this, f->fileName() );
}
}
- listView()->tqsetUpdatesEnabled( true );
+ listView()->setUpdatesEnabled( true );
}
TQListViewItem::setOpen( o );
}
@@ -777,13 +777,13 @@ int main(int argc, char* argv[]) {
#endif
#if 0
- qDebug ( SFileDialog::getOpenFileName( TQString::null, TQString::tqfromLatin1("All (*)"),
- TQString::tqfromLatin1("DockWidget Demo"), "dialog1" ) );
+ qDebug ( SFileDialog::getOpenFileName( TQString::null, TQString::fromLatin1("All (*)"),
+ TQString::fromLatin1("DockWidget Demo"), "dialog1" ) );
#endif
#if 1
- TQStringList s = SFileDialog::getOpenFileNames( TQString::null, TQString::tqfromLatin1("All (*)"),
- TQString::tqfromLatin1("DockWidget Demo"), "dialog1" );
+ TQStringList s = SFileDialog::getOpenFileNames( TQString::null, TQString::fromLatin1("All (*)"),
+ TQString::fromLatin1("DockWidget Demo"), "dialog1" );
TQStringList::Iterator it = s.begin();
for ( ; it != s.end(); ++it ){
qDebug( "%s", (*it).local8Bit().data() );
diff --git a/tdeui/tests/kdualcolortest.cpp b/tdeui/tests/kdualcolortest.cpp
index 942d52f8d..6ed2715a0 100644
--- a/tdeui/tests/kdualcolortest.cpp
+++ b/tdeui/tests/kdualcolortest.cpp
@@ -2,16 +2,16 @@
#include <kdualcolorbutton.h>
#include <kapplication.h>
#include <klocale.h>
-#include <tqlayout.h>
-#include <tqpalette.h>
+#include <layout.h>
+#include <palette.h>
KDualColorWidget::KDualColorWidget(TQWidget *parent, const char *name)
: TQWidget(parent, name)
{
lbl = new TQLabel("Testing, testing, 1, 2, 3...", this);
KDualColorButton *colorBtn =
- new KDualColorButton(lbl->tqcolorGroup().text(),
- lbl->tqcolorGroup().background(), this);
+ new KDualColorButton(lbl->colorGroup().text(),
+ lbl->colorGroup().background(), this);
connect(colorBtn, TQT_SIGNAL(fgChanged(const TQColor &)),
TQT_SLOT(slotFgChanged(const TQColor &)));
connect(colorBtn, TQT_SIGNAL(bgChanged(const TQColor &)),
diff --git a/tdeui/tests/keditlistboxtest.cpp b/tdeui/tests/keditlistboxtest.cpp
index fdc90a742..90dbb74d0 100644
--- a/tdeui/tests/keditlistboxtest.cpp
+++ b/tdeui/tests/keditlistboxtest.cpp
@@ -7,14 +7,14 @@ int main( int argc, char **argv )
KApplication app( argc, argv, "keditlistboxtest" );
KEditListBox::CustomEditor editor( new KComboBox( true, 0L, "test" ) );
- KEditListBox *box = new KEditListBox( TQString::tqfromLatin1("KEditListBox"),
+ KEditListBox *box = new KEditListBox( TQString::fromLatin1("KEditListBox"),
editor );
- box->insertItem( TQString::tqfromLatin1("Test") );
- box->insertItem( TQString::tqfromLatin1("for") );
- box->insertItem( TQString::tqfromLatin1("this") );
- box->insertItem( TQString::tqfromLatin1("KEditListBox") );
- box->insertItem( TQString::tqfromLatin1("Widget") );
+ box->insertItem( TQString::fromLatin1("Test") );
+ box->insertItem( TQString::fromLatin1("for") );
+ box->insertItem( TQString::fromLatin1("this") );
+ box->insertItem( TQString::fromLatin1("KEditListBox") );
+ box->insertItem( TQString::fromLatin1("Widget") );
box->show();
return app.exec();
diff --git a/tdeui/tests/kledtest.cpp b/tdeui/tests/kledtest.cpp
index f8d031530..d68f1e366 100644
--- a/tdeui/tests/kledtest.cpp
+++ b/tdeui/tests/kledtest.cpp
@@ -50,14 +50,14 @@ KLedTest::KLedTest(TQWidget* parent)
}
else {
y=Grid; index=0;
- for( int tqshape=0; (int)tqshape<2; tqshape=(KLed::Shape)(tqshape+1)) {
+ for( int shape=0; (int)shape<2; shape=(KLed::Shape)(shape+1)) {
x=Grid;
for( int look=0; (int)look<3; look=(KLed::Look)(look+1)) {
for(state=KLed::Off; (int)state<2; state=(KLed::State)(state+1))
{
leds[index]=new KLed(Qt::yellow, state,
(KLed::Look)(look+1),
- (KLed::Shape)(tqshape+1), this);
+ (KLed::Shape)(shape+1), this);
leds[index]->setGeometry(x, y, LedWidth, LedHeight);
++index;
x+=Grid+LedWidth;
@@ -108,7 +108,7 @@ KLedTest::nextLook() {
ledlook = static_cast<KLed::Look>(tmp);
l->setLook(ledlook);
//qDebug("painting look %i", ledlook);
- //l->tqrepaint();
+ //l->repaint();
}
diff --git a/tdeui/tests/kledtest.h b/tdeui/tests/kledtest.h
index 5d660f5a3..5652e306e 100644
--- a/tdeui/tests/kledtest.h
+++ b/tdeui/tests/kledtest.h
@@ -15,7 +15,7 @@ protected:
const int LedWidth;
const int LedHeight;
const int Grid;
- KLed::Shape tqshape;
+ KLed::Shape shape;
KLed::Look look;
KLed::State state;
int x, y, index;
diff --git a/tdeui/tests/klineeditdlgtest.cpp b/tdeui/tests/klineeditdlgtest.cpp
index e43085c0c..be7decb82 100644
--- a/tdeui/tests/klineeditdlgtest.cpp
+++ b/tdeui/tests/klineeditdlgtest.cpp
@@ -2,7 +2,7 @@
#include <klineeditdlg.h>
#include <tqstring.h>
-#include <tqtextview.h>
+#include <textview.h>
int main(int argc, char** argv)
{
diff --git a/tdeui/tests/klineedittest.cpp b/tdeui/tests/klineedittest.cpp
index 3508982fa..7ddab8182 100644
--- a/tdeui/tests/klineedittest.cpp
+++ b/tdeui/tests/klineedittest.cpp
@@ -1,6 +1,6 @@
#include <tqstring.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqhbox.h>
#include <tqtimer.h>
diff --git a/tdeui/tests/kmessageboxtest.cpp b/tdeui/tests/kmessageboxtest.cpp
index 31f8f1735..d5b84095a 100644
--- a/tdeui/tests/kmessageboxtest.cpp
+++ b/tdeui/tests/kmessageboxtest.cpp
@@ -1,7 +1,7 @@
#include "kmessagebox.h"
#include <tqdialog.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <stdlib.h>
@@ -79,11 +79,11 @@ case 1:
i = KMessageBox::warningContinueCancel(w,
"You are about to <Print>.\n"
"Are you sure?",
- "Print", TQString::tqfromLatin1("&Print"), "dontask", false);
+ "Print", TQString::fromLatin1("&Print"), "dontask", false);
i = KMessageBox::warningContinueCancel(0,
"You are about to <Print>.\n"
"Are you sure?",
- "Print", TQString::tqfromLatin1("&Print"), "dontask", KMessageBox::AllowLink);
+ "Print", TQString::fromLatin1("&Print"), "dontask", KMessageBox::AllowLink);
i = KMessageBox::questionYesNo(0, "<p>Do you have a printer? thisisaverylongdkldhklghklghklashgkllasghkdlsghkldfghklsabla bla bbla bla. It also has <a href=http://www.kde.org>this URL</a>.</p>",
TQString("Bla"), TQString("Yes"), TQString("No"), "bla", KMessageBox::AllowLink);
break;
@@ -96,7 +96,7 @@ case 2:
case 3:
i = KMessageBox::questionYesNo(0,
"Does your printer support color or only black and white?",
- "Printer setup", TQString::tqfromLatin1("&Color"), TQString::tqfromLatin1("&Black & White"));
+ "Printer setup", TQString::fromLatin1("&Color"), TQString::fromLatin1("&Black & White"));
break;
case 4:
@@ -123,13 +123,13 @@ case 6:
i = KMessageBox::warningContinueCancel(0,
"You are about to print.\n"
"Are you sure?",
- "Print", TQString::tqfromLatin1("&Print"));
+ "Print", TQString::fromLatin1("&Print"));
break;
case 7:
i = KMessageBox::warningContinueCancel(0,
"You are about to <Print>.\n"
"Are you sure?",
- "Print", TQString::tqfromLatin1("&Print"), "dontask", false);
+ "Print", TQString::fromLatin1("&Print"), "dontask", false);
break;
case 8:
@@ -142,14 +142,14 @@ case 9:
i = KMessageBox::warningYesNoCancel(0,
"Your document contains unsaved changes.\n"
"Do you want to save your changes?\n",
- TQString::tqfromLatin1("Close"));
+ TQString::fromLatin1("Close"));
break;
case 10:
i = KMessageBox::warningYesNoCancel(0,
"Your document contains unsaved changes.\n"
"Do you want to save or discard your changes?\n",
- "Close", TQString::tqfromLatin1("&Save"), TQString::tqfromLatin1("&Discard") );
+ "Close", TQString::fromLatin1("&Save"), TQString::fromLatin1("&Discard") );
break;
case 11:
diff --git a/tdeui/tests/knuminputtest.cpp b/tdeui/tests/knuminputtest.cpp
index fdf8697e9..4a3dece9f 100644
--- a/tdeui/tests/knuminputtest.cpp
+++ b/tdeui/tests/knuminputtest.cpp
@@ -8,7 +8,7 @@
*
*/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqvgroupbox.h>
#include <kapplication.h>
diff --git a/tdeui/tests/krulertest.cpp b/tdeui/tests/krulertest.cpp
index ad2f5630a..bd7fcb2f5 100644
--- a/tdeui/tests/krulertest.cpp
+++ b/tdeui/tests/krulertest.cpp
@@ -3,7 +3,7 @@
#include "krulertest.h"
#include "kruler.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqgroupbox.h>
diff --git a/tdeui/tests/kseparatortest.cpp b/tdeui/tests/kseparatortest.cpp
index 17e965ca8..181722f8e 100644
--- a/tdeui/tests/kseparatortest.cpp
+++ b/tdeui/tests/kseparatortest.cpp
@@ -19,7 +19,7 @@
#include <kapplication.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqwidget.h>
#include "kseparator.h"
diff --git a/tdeui/tests/kspelltest.cpp b/tdeui/tests/kspelltest.cpp
index 9180ed376..5d7c4852c 100644
--- a/tdeui/tests/kspelltest.cpp
+++ b/tdeui/tests/kspelltest.cpp
@@ -22,7 +22,7 @@
#include <tqstring.h>
#include <tqlabel.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
int main(int argc, char **argv)
{
diff --git a/tdeui/tests/ktabctltest.cpp b/tdeui/tests/ktabctltest.cpp
index 33e7fc5b7..b8fc19104 100644
--- a/tdeui/tests/ktabctltest.cpp
+++ b/tdeui/tests/ktabctltest.cpp
@@ -17,7 +17,7 @@
#include <tqtooltip.h>
#include <tqmessagebox.h>
#include <tqtabbar.h>
-#include <tqpalette.h>
+#include <palette.h>
#include <tqmultilineedit.h>
#include <stdio.h>
diff --git a/tdeui/tests/ktabwidgettest.cpp b/tdeui/tests/ktabwidgettest.cpp
index 5f9fb3dcc..be7b1cd26 100644
--- a/tdeui/tests/ktabwidgettest.cpp
+++ b/tdeui/tests/ktabwidgettest.cpp
@@ -1,5 +1,5 @@
#include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqdragobject.h>
#include <kapplication.h>
@@ -73,9 +73,9 @@ Test::Test( TQWidget* parent, const char *name )
gridlayout->addWidget( mTabsBottom, 3, 0 );
connect( mTabsBottom, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabPosition(bool) ) );
- TQCheckBox * tabtqshape = new TQCheckBox( "Triangular tab tqshape", grid );
- gridlayout->addWidget( tabtqshape, 3, 1 );
- connect( tabtqshape, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabShape(bool) ) );
+ TQCheckBox * tabshape = new TQCheckBox( "Triangular tab shape", grid );
+ gridlayout->addWidget( tabshape, 3, 1 );
+ connect( tabshape, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabShape(bool) ) );
TQCheckBox *tabClose = new TQCheckBox( "Close button on icon hover", grid );
gridlayout->addWidget( tabClose, 4, 0 );
diff --git a/tdeui/tests/kunbalancedgrdtest.cpp b/tdeui/tests/kunbalancedgrdtest.cpp
index 9f616496d..1297d1ac8 100644
--- a/tdeui/tests/kunbalancedgrdtest.cpp
+++ b/tdeui/tests/kunbalancedgrdtest.cpp
@@ -3,7 +3,7 @@
#include <kpixmapeffect.h>
#include <tqpainter.h>
#include <tqstring.h>
-#include <tqlayout.h>
+#include <layout.h>
int cols = 3, rows = 3; // how many
@@ -159,7 +159,7 @@ void myTopWidget::rebalance()
if ((otime - itime )> 500)
{
- grds->tqrepaint(false);
+ grds->repaint(false);
itime = time.elapsed();
}
}
diff --git a/tdeui/tests/kwizardtest.cpp b/tdeui/tests/kwizardtest.cpp
index 91974263e..0f10fed89 100644
--- a/tdeui/tests/kwizardtest.cpp
+++ b/tdeui/tests/kwizardtest.cpp
@@ -19,7 +19,7 @@
*/
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kapplication.h>
#include <kwizard.h>
diff --git a/tdeui/twindowlistmenu.cpp b/tdeui/twindowlistmenu.cpp
index 1334abd6e..5058695a3 100644
--- a/tdeui/twindowlistmenu.cpp
+++ b/tdeui/twindowlistmenu.cpp
@@ -186,7 +186,7 @@ void KWindowListMenu::init()
}
// Avoid creating unwanted accelerators.
- itemText.replace('&', TQString::tqfromLatin1("&&"));
+ itemText.replace('&', TQString::fromLatin1("&&"));
insertItem( pm, itemText, i);
map.insert(i, info->win());
if (info->win() == active_window)