From d2b1a22452871a84b2fdf2b3dbf7df5db8548068 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:10:00 -0600 Subject: [PATCH] Rename old tq methods that no longer need a unique name --- src/kile/configcheckerdlg.cpp | 2 +- src/kile/configcheckerwidget.ui | 4 +- src/kile/configcodecompletion.cpp | 2 +- src/kile/configstructure.cpp | 4 +- src/kile/configtester.h | 2 +- src/kile/docpart.cpp | 6 +- src/kile/docpart.h | 2 +- src/kile/envconfigwidget.ui | 6 +- src/kile/floatdialog.cpp | 4 +- src/kile/generalconfigwidget.ui | 2 +- src/kile/includegraphicsdialog.cpp | 4 +- src/kile/kile.cpp | 26 ++++---- src/kile/kile.h | 6 +- src/kile/kileactions.cpp | 2 +- src/kile/kileconfigdialog.cpp | 2 +- src/kile/kiledocmanager.cpp | 24 ++++---- src/kile/kiledocmanager.h | 4 +- src/kile/kilefileselect.cpp | 2 +- src/kile/kilegrepdialog.cpp | 38 ++++++------ src/kile/kileinfo.cpp | 2 +- src/kile/kilelauncher.cpp | 2 +- src/kile/kilelistselector.cpp | 2 +- src/kile/kilemultitabbar.cpp | 94 ++++++++++++++--------------- src/kile/kilemultitabbar.h | 2 +- src/kile/kileprojectdlgs.cpp | 8 +-- src/kile/kilesidebar.cpp | 4 +- src/kile/kilestatswidget.cpp | 16 ++--- src/kile/kilestdtools.h | 2 +- src/kile/kilestructurewidget.cpp | 6 +- src/kile/kiletool.cpp | 2 +- src/kile/kiletoolconfigwidget.cpp | 4 +- src/kile/kileviewmanager.cpp | 10 +-- src/kile/kileviewmanager.h | 2 +- src/kile/latexcmddialog.cpp | 2 +- src/kile/latexconfigwidget.ui | 2 +- src/kile/latexconfigwidget.ui.h | 6 +- src/kile/librarytoolconfigwidget.ui | 4 +- src/kile/mathenvdialog.cpp | 2 +- src/kile/newdocumentwidget.ui | 2 +- src/kile/newtoolwizard.ui | 8 +-- src/kile/postscriptdialog.cpp | 6 +- src/kile/previewconfigwidget.cpp | 12 ++-- src/kile/processtoolconfigwidget.ui | 2 +- src/kile/quickdocumentdialog.cpp | 24 ++++---- src/kile/quicktoolconfigwidget.ui | 6 +- src/kile/scriptingconfigwidget.ui | 6 +- src/kile/structureconfigwidget.ui | 6 +- src/kile/symbolview.cpp | 6 +- src/kile/symbolviewconfig.ui | 2 +- src/kile/tabulardialog.cpp | 30 ++++----- src/kile/tabulardialog.h | 2 +- src/kile/texdocdialog.cpp | 4 +- src/kile/toolconfigwidget.ui | 14 ++--- src/kile/userhelpdialog.cpp | 20 +++--- 54 files changed, 232 insertions(+), 232 deletions(-) diff --git a/src/kile/configcheckerdlg.cpp b/src/kile/configcheckerdlg.cpp index a9b0d83..484d21f 100644 --- a/src/kile/configcheckerdlg.cpp +++ b/src/kile/configcheckerdlg.cpp @@ -67,7 +67,7 @@ ResultItem::ResultItem(KListBox *lb, const TQString &tool, int status, const TQV void ResultItem::paint(TQPainter *p) { - m_richText->draw(p, 0, 0, TQRect(), listBox()->tqcolorGroup()); + m_richText->draw(p, 0, 0, TQRect(), listBox()->colorGroup()); } ConfigChecker::ConfigChecker(TQWidget* parent) : diff --git a/src/kile/configcheckerwidget.ui b/src/kile/configcheckerwidget.ui index 72f5bf3..91842f3 100644 --- a/src/kile/configcheckerwidget.ui +++ b/src/kile/configcheckerwidget.ui @@ -20,7 +20,7 @@ 1 - + 580 480 @@ -85,7 +85,7 @@ 1 - + 480 0 diff --git a/src/kile/configcodecompletion.cpp b/src/kile/configcodecompletion.cpp index 0bfd1db..758b3ff 100644 --- a/src/kile/configcodecompletion.cpp +++ b/src/kile/configcodecompletion.cpp @@ -73,7 +73,7 @@ ConfigCodeCompletion::ConfigCodeCompletion(KConfig *config, KileWidget::LogMsg * bg_options->tqlayout()->setSpacing( 6 ); bg_options->tqlayout()->setMargin( 11 ); TQGridLayout *bg_optionsLayout = new TQGridLayout( bg_options->tqlayout() ); - bg_optionsLayout->tqsetAlignment( TQt::AlignTop ); + bg_optionsLayout->setAlignment( TQt::AlignTop ); cb_setcursor = new TQCheckBox(i18n("Place cursor"),bg_options); cb_setbullets = new TQCheckBox(i18n("Insert bullets"),bg_options); diff --git a/src/kile/configstructure.cpp b/src/kile/configstructure.cpp index 39376e0..d7bc94d 100644 --- a/src/kile/configstructure.cpp +++ b/src/kile/configstructure.cpp @@ -212,13 +212,13 @@ void ConfigStructure::polish() { // TQWidget::polish(); - uint w = m_entriestable->tqsizeHint().width(); + uint w = m_entriestable->sizeHint().width(); m_entriestable->setColumnWidth(0,3*w/7); m_entriestable->setColumnWidth(1,2*w/7); m_entriestable->setColumnWidth(2,2*w/7+1); m_entriestable->setColumnStretchable(2,true); - w = m_sectioningtable->tqsizeHint().width(); + w = m_sectioningtable->sizeHint().width(); m_sectioningtable->setColumnWidth(0,w/6); m_sectioningtable->setColumnWidth(1,3*w/6); m_sectioningtable->setColumnWidth(2,2*w/6+1); diff --git a/src/kile/configtester.h b/src/kile/configtester.h index 471fcc4..919c7e4 100644 --- a/src/kile/configtester.h +++ b/src/kile/configtester.h @@ -30,7 +30,7 @@ class KURL; class ConfigTest { public: - enum tqStatus { Success = 3, Failure = 2, Critical = 1 }; + enum Status { Success = 3, Failure = 2, Critical = 1 }; ConfigTest(); ConfigTest(const TQString &name, bool mustpass, const TQString &arg, const TQString &altarg = TQString()); diff --git a/src/kile/docpart.cpp b/src/kile/docpart.cpp index 25ca1e9..5ef5f1a 100644 --- a/src/kile/docpart.cpp +++ b/src/kile/docpart.cpp @@ -78,7 +78,7 @@ void DocumentationViewer::forward() { ++m_hpos; openURL( KURL( m_history[m_hpos]) ); - emit updatetqStatus( backEnable() , forwardEnable() ); + emit updateStatus( backEnable() , forwardEnable() ); } } @@ -88,7 +88,7 @@ void DocumentationViewer::back() if ( backEnable() ) { --m_hpos; openURL( KURL(m_history[m_hpos]) ); - emit updatetqStatus( backEnable() , forwardEnable() ); + emit updateStatus( backEnable() , forwardEnable() ); } } @@ -106,7 +106,7 @@ void DocumentationViewer::addToHistory( const TQString & url ) m_history.append(url); m_hpos = m_history.count()-1; - emit updatetqStatus( backEnable() , forwardEnable() ); + emit updateStatus( backEnable() , forwardEnable() ); } diff --git a/src/kile/docpart.h b/src/kile/docpart.h index 045e35f..8835f55 100644 --- a/src/kile/docpart.h +++ b/src/kile/docpart.h @@ -37,7 +37,7 @@ public slots: void addToHistory( const TQString & url ); signals: - void updatetqStatus( bool back, bool forward ); + void updateStatus( bool back, bool forward ); protected: virtual void urlSelected( const TQString &url, int button=0, int state=0,const TQString &_target= TQString(), KParts::URLArgs args = KParts::URLArgs()); diff --git a/src/kile/envconfigwidget.ui b/src/kile/envconfigwidget.ui index c04e09b..b480939 100644 --- a/src/kile/envconfigwidget.ui +++ b/src/kile/envconfigwidget.ui @@ -110,7 +110,7 @@ Fixed - + 20 20 @@ -129,7 +129,7 @@ 0 - + 0 0 @@ -155,7 +155,7 @@ Expanding - + 300 20 diff --git a/src/kile/floatdialog.cpp b/src/kile/floatdialog.cpp index 318b990..f715f46 100644 --- a/src/kile/floatdialog.cpp +++ b/src/kile/floatdialog.cpp @@ -42,7 +42,7 @@ FloatEnvironmentDialog::FloatEnvironmentDialog(KConfig *config, KileInfo *ki, TQ egroup->tqlayout()->setSpacing( 6 ); egroup->tqlayout()->setMargin( 11 ); TQGridLayout *egrouptqlayout = new TQGridLayout( egroup->tqlayout() ); - egrouptqlayout->tqsetAlignment( TQt::AlignTop ); + egrouptqlayout->setAlignment( TQt::AlignTop ); m_rbFigure = new TQRadioButton(i18n("&Figure"), egroup); m_rbTable = new TQRadioButton(i18n("T&able"), egroup); @@ -56,7 +56,7 @@ FloatEnvironmentDialog::FloatEnvironmentDialog(KConfig *config, KileInfo *ki, TQ pgroup->tqlayout()->setSpacing( 6 ); pgroup->tqlayout()->setMargin( 11 ); TQGridLayout *pgrouptqlayout = new TQGridLayout( pgroup->tqlayout() ); - pgrouptqlayout->tqsetAlignment( TQt::AlignTop ); + pgrouptqlayout->setAlignment( TQt::AlignTop ); TQLabel *label1 = new TQLabel(i18n("Here exact:"), pgroup); TQLabel *label2 = new TQLabel(i18n("Top of page:"), pgroup); diff --git a/src/kile/generalconfigwidget.ui b/src/kile/generalconfigwidget.ui index 1d74db9..946c3a8 100644 --- a/src/kile/generalconfigwidget.ui +++ b/src/kile/generalconfigwidget.ui @@ -20,7 +20,7 @@ 0 - + 32767 32767 diff --git a/src/kile/includegraphicsdialog.cpp b/src/kile/includegraphicsdialog.cpp index e30e7ad..8b25947 100644 --- a/src/kile/includegraphicsdialog.cpp +++ b/src/kile/includegraphicsdialog.cpp @@ -74,8 +74,8 @@ IncludeGraphics::IncludeGraphics(TQWidget *parent, const TQString &startdir, Kil KPushButton *pb_choose = new KPushButton("", widget, "filechooser_button" ); pb_choose->setPixmap( SmallIcon("fileopen") ); - pb_choose->setFixedWidth(pb_choose->tqsizeHint().width()); // set width - grid->addRowSpacing( 0, pb_choose->tqsizeHint().height()+5 ); // update height of line + pb_choose->setFixedWidth(pb_choose->sizeHint().width()); // set width + grid->addRowSpacing( 0, pb_choose->sizeHint().height()+5 ); // update height of line grid->addWidget(pb_choose,0,2); // line 2: some (more or less useful) information diff --git a/src/kile/kile.cpp b/src/kile/kile.cpp index 0149cb6..efaa208 100644 --- a/src/kile/kile.cpp +++ b/src/kile/kile.cpp @@ -90,7 +90,7 @@ Kile::Kile( bool allowRestore, TQWidget *parent, const char *name ) : KileInfo(this), m_paPrint(0L) { - m_tqfocusWidget = this; + m_focusWidget = this; m_config = KGlobal::config(); readUserSettings(); @@ -187,7 +187,7 @@ Kile::Kile( bool allowRestore, TQWidget *parent, const char *name ) : m_manager->setFactory(m_toolFactory); m_help->setUserhelp(m_manager,menuBar()); // kile user help (dani) - connect(docManager(), TQT_SIGNAL(updateModetqStatus()), TQT_TQOBJECT(this), TQT_SLOT(updateModetqStatus())); + connect(docManager(), TQT_SIGNAL(updateModeStatus()), TQT_TQOBJECT(this), TQT_SLOT(updateModeStatus())); connect(docManager(), TQT_SIGNAL(updateStructure(bool, KileDocument::Info*)), viewManager(), TQT_SLOT(updateStructure(bool, KileDocument::Info*))); connect(docManager(), TQT_SIGNAL(closingDocument(KileDocument::Info* )), m_kwStructure, TQT_SLOT(closeDocumentInfo(KileDocument::Info *))); connect(docManager(), TQT_SIGNAL(documentInfoCreated(KileDocument::Info* )), m_kwStructure, TQT_SLOT(addDocumentInfo(KileDocument::Info* ))); @@ -210,7 +210,7 @@ Kile::Kile( bool allowRestore, TQWidget *parent, const char *name ) : restoreFilesAndProjects(allowRestore); initMenu(); - updateModetqStatus(); + updateModeStatus(); actionCollection()->readShortcutSettings("Shortcuts", m_config); } @@ -232,12 +232,12 @@ Kile::~Kile() void Kile::showEvent(TQShowEvent *) { - m_tqfocusWidget->setFocus(); + m_focusWidget->setFocus(); } void Kile::hideEvent(TQHideEvent *) { - m_tqfocusWidget = tqfocusWidget(); + m_focusWidget = focusWidget(); } void Kile::setupStatusBar() @@ -801,7 +801,7 @@ void Kile::restoreFilesAndProjects(bool allowRestore) } if (ModeAction) ModeAction->setChecked(!m_singlemode); - updateModetqStatus(); + updateModeStatus(); m_listProjectsOpenOnStart.clear(); m_listDocsOpenOnStart.clear(); @@ -836,7 +836,7 @@ void Kile::setLine( const TQString &line ) view->gotoLineNumber(l-1); showEditorWidget(); - newtqStatus(); + newStatus(); } } @@ -907,7 +907,7 @@ void Kile::activateView(TQWidget* w, bool updateStruct /* = true */ ) //Needs t if (updateStruct) viewManager()->updateStructure(); } -void Kile::updateModetqStatus() +void Kile::updateModeStatus() { KILE_DEBUG() << "==Kile::updateModeStatus()==========" << endl; KileProject *project = docManager()->activeProject(); @@ -1118,7 +1118,7 @@ void Kile::convertToEnc(Kate::Document *doc) } ////////////////// GENERAL SLOTS ////////////// -void Kile::newtqStatus(const TQString & msg) +void Kile::newStatus(const TQString & msg) { statusBar()->changeItem(msg,ID_LINE_COLUMN); } @@ -1212,7 +1212,7 @@ void Kile::showEditorWidget() if (view) view->setFocus(); setupStatusBar(); - updateModetqStatus(); + updateModeStatus(); newCaption(); } @@ -1238,7 +1238,7 @@ bool Kile::resetPart() } setupStatusBar(); - updateModetqStatus(); + updateModeStatus(); newCaption(); m_currentState = "Editor"; @@ -1266,7 +1266,7 @@ void Kile::activePartGUI(KParts::Part * part) //kghostview (which has the print action defined in //a KParts::BrowserExtension) KParts::BrowserExtension *ext = KParts::BrowserExtension::childObject(part); - if (ext && ext->tqmetaObject()->slotNames().contains( "print()" ) ) //part is a BrowserExtension, connect printAction() + if (ext && ext->metaObject()->slotNames().contains( "print()" ) ) //part is a BrowserExtension, connect printAction() { connect(m_paPrint, TQT_SIGNAL(activated()), ext, TQT_SLOT(print())); m_paPrint->plug(toolBar("mainToolBar"),3); //plug this action into its default location @@ -2033,7 +2033,7 @@ void Kile::toggleMode() else ModeAction->setChecked(false); - updateModetqStatus(); + updateModeStatus(); KILE_DEBUG() << "SETTING master to " << m_masterName << " singlemode = " << m_singlemode << endl; } diff --git a/src/kile/kile.h b/src/kile/kile.h index 69da596..7445d2d 100644 --- a/src/kile/kile.h +++ b/src/kile/kile.h @@ -121,7 +121,7 @@ public slots: private: void showEvent(TQShowEvent *e); void hideEvent(TQHideEvent *e); - TQWidget *m_tqfocusWidget; + TQWidget *m_focusWidget; void setupStatusBar(); void setupSideBar(); @@ -243,8 +243,8 @@ public slots: void changeInputEncoding(); - void newtqStatus(const TQString& = TQString()); - void updateModetqStatus(); + void newStatus(const TQString& = TQString()); + void updateModeStatus(); void newCaption(); void citeViewBib(); diff --git a/src/kile/kileactions.cpp b/src/kile/kileactions.cpp index 02a1a82..d16b3e3 100644 --- a/src/kile/kileactions.cpp +++ b/src/kile/kileactions.cpp @@ -272,7 +272,7 @@ InputDialog::InputDialog(const TQString &caption, uint options, const TQStringLi pbutton->setPixmap( SmallIcon("fileopen") ); gbox->addWidget(pbutton,1,2); gbox->setColSpacing(1,8); - gbox->setColSpacing(2, pbutton->tqsizeHint().width()+5 ); + gbox->setColSpacing(2, pbutton->sizeHint().width()+5 ); connect(pbutton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBrowse())); } diff --git a/src/kile/kileconfigdialog.cpp b/src/kile/kileconfigdialog.cpp index 49c745f..207d6f2 100644 --- a/src/kile/kileconfigdialog.cpp +++ b/src/kile/kileconfigdialog.cpp @@ -300,7 +300,7 @@ namespace KileDialog { TQString enc = readKateEncoding(); if ( enc.isEmpty() ) - enc = TQString::tqfromLatin1(TQTextCodec::codecForLocale()->name()); + enc = TQString::fromLatin1(TQTextCodec::codecForLocale()->name()); KileConfig::setDefaultEncoding( enc ); } //////////////////// slots //////////////////// diff --git a/src/kile/kiledocmanager.cpp b/src/kile/kiledocmanager.cpp index 4a59e5c..642e8e9 100644 --- a/src/kile/kiledocmanager.cpp +++ b/src/kile/kiledocmanager.cpp @@ -84,7 +84,7 @@ Manager::Manager(KileInfo *info, TQObject *parent, const char *name) : Kate::Document::setFileChangedDialogsActivated (true); if ( KileConfig::defaultEncoding() == "invalid" ) - KileConfig::setDefaultEncoding(TQString::tqfromLatin1(TQTextCodec::codecForLocale()->name())); + KileConfig::setDefaultEncoding(TQString::fromLatin1(TQTextCodec::codecForLocale()->name())); TQWidget *par = m_ki ? m_ki->parentWidget() : 0; m_kpd = new KProgressDialog(par, 0, i18n("Open Project..."), TQString(), true); @@ -485,7 +485,7 @@ Kate::Document* Manager::createDocument(const TQString& name, const KURL& url, T //handle changes of the document connect(doc, TQT_SIGNAL(nameChanged(Kate::Document *)), m_ki->parentWidget(), TQT_SLOT(newCaption())); connect(doc, TQT_SIGNAL(fileNameChanged()), m_ki->parentWidget(), TQT_SLOT(newCaption())); - connect(doc, TQT_SIGNAL(modStateChanged(Kate::Document*)), this, TQT_SLOT(newDocumenttqStatus(Kate::Document*))); + connect(doc, TQT_SIGNAL(modStateChanged(Kate::Document*)), this, TQT_SLOT(newDocumentStatus(Kate::Document*))); connect(doc, TQT_SIGNAL(modifiedOnDisc(Kate::Document*, bool, unsigned char)), this, TQT_SIGNAL(documentStatusChanged(Kate::Document*, bool, unsigned char))); docinfo->setDoc(doc); @@ -592,7 +592,7 @@ Kate::View* Manager::createDocumentWithText(const TQString& text, KileDocument:: { //FIXME this shouldn't be necessary!!! view->getDoc()->setModified(true); - newDocumenttqStatus(view->getDoc()); + newDocumentStatus(view->getDoc()); } return view; @@ -602,7 +602,7 @@ Kate::View* Manager::createNewJScript() { Kate::View *view = createDocumentWithText(TQString(), Script, "js", m_ki->scriptManager()->getLocalJScriptDirectory()); emit(updateStructure(false, 0L)); - emit(updateModetqStatus()); + emit(updateModeStatus()); return view; } @@ -610,7 +610,7 @@ Kate::View* Manager::createNewLaTeXDocument() { Kate::View *view = createDocumentWithText(TQString(), LaTeX); emit(updateStructure(false, 0L)); - emit(updateModetqStatus()); + emit(updateModeStatus()); return view; } @@ -666,7 +666,7 @@ void Manager::fileNew() loadTemplate(nfw->getSelection()); if ( nfw->useWizard() ) emit ( startWizard() ); emit(updateStructure(false, 0L)); - emit(updateModetqStatus()); + emit(updateModeStatus()); } delete nfw; } @@ -730,7 +730,7 @@ void Manager::saveURL(const KURL & url) if (doc) doc->save(); } -void Manager::newDocumenttqStatus(Kate::Document *doc) +void Manager::newDocumentStatus(Kate::Document *doc) { KILE_DEBUG() << "void Manager::newDocumentStatus(Kate::Document)" << endl; if (doc == 0L) return; @@ -864,7 +864,7 @@ void Manager::fileOpen(const KURL & url, const TQString & encoding, int index) } emit(updateStructure(true, 0L)); - emit(updateModetqStatus()); + emit(updateModeStatus()); // update undefined references in this file emit(updateReferences(textInfoFor(realurl.path())) ); m_ki->fileSelector()->blockSignals(false); @@ -1077,7 +1077,7 @@ bool Manager::fileClose(Kate::Document *doc /* = 0L*/, bool closingproject /*= f removeTextDocumentInfo(docinfo, closingproject); emit removeFromProjectView(url); - emit updateModetqStatus(); + emit updateModeStatus(); } else return false; @@ -1160,7 +1160,7 @@ void Manager::projectNew() project->buildProjectTree(); //project->save(); addProject(project); - emit(updateModetqStatus()); + emit(updateModeStatus()); emit(addToRecentProjects(project->url())); } } @@ -1376,7 +1376,7 @@ KileProject* Manager::projectOpen(const KURL & url, int step, int max, bool open addProject(kp); emit(updateStructure(false, 0L)); - emit(updateModetqStatus()); + emit(updateModeStatus()); // update undefined references in all project files updateProjectReferences(kp); @@ -1640,7 +1640,7 @@ bool Manager::projectClose(const KURL & url) m_projects.remove(project); emit removeFromProjectView(project); delete project; - emit(updateModetqStatus()); + emit(updateModeStatus()); return true; } else diff --git a/src/kile/kiledocmanager.h b/src/kile/kiledocmanager.h index bd6cb4b..877c3b9 100644 --- a/src/kile/kiledocmanager.h +++ b/src/kile/kiledocmanager.h @@ -59,7 +59,7 @@ public slots: Kate::View* createNewLaTeXDocument(); //files - void newDocumenttqStatus(Kate::Document *doc); + void newDocumentStatus(Kate::Document *doc); /** * Creates a new file on disk. @@ -145,7 +145,7 @@ signals: void documentInfoCreated(KileDocument::Info *); void updateStructure(bool needToParse, KileDocument::Info*); - void updateModetqStatus(); + void updateModeStatus(); void updateReferences(KileDocument::Info *); void documentStatusChanged(Kate::Document *, bool, unsigned char reason); diff --git a/src/kile/kilefileselect.cpp b/src/kile/kilefileselect.cpp index 42f8df1..154e75d 100644 --- a/src/kile/kilefileselect.cpp +++ b/src/kile/kilefileselect.cpp @@ -46,7 +46,7 @@ KileFileSelect::KileFileSelect(KileDocument::Extensions *extensions, TQWidget *p lo->addWidget(toolbar); cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" ); - cmbPath->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); cmpl = new KURLCompletion(KURLCompletion::DirCompletion); cmbPath->setCompletionObject( cmpl ); lo->addWidget(cmbPath); diff --git a/src/kile/kilegrepdialog.cpp b/src/kile/kilegrepdialog.cpp index 7f5c89f..9eec12f 100644 --- a/src/kile/kilegrepdialog.cpp +++ b/src/kile/kilegrepdialog.cpp @@ -91,14 +91,14 @@ KileGrepDialog::KileGrepDialog(TQWidget *parent, KileInfo *ki, KileGrep::Mode mo projectgroup->tqlayout()->setSpacing( 6 ); projectgroup->tqlayout()->setMargin( 11 ); TQGridLayout *projectgrouptqlayout = new TQGridLayout( projectgroup->tqlayout() ); - projectgrouptqlayout->tqsetAlignment( TQt::AlignTop ); + projectgrouptqlayout->setAlignment( TQt::AlignTop ); TQLabel *project_label = new TQLabel(i18n("Name:"), projectgroup); - int labelwidth = project_label->tqsizeHint().width(); + int labelwidth = project_label->sizeHint().width(); TQLabel *projectdir_label = new TQLabel(i18n("Directory:"), projectgroup); - if ( projectdir_label->tqsizeHint().width() > labelwidth ) - labelwidth = projectdir_label->tqsizeHint().width(); + if ( projectdir_label->sizeHint().width() > labelwidth ) + labelwidth = projectdir_label->sizeHint().width(); projectname_label = new TQLabel(projectgroup); projectdirname_label = new TQLabel(projectgroup); @@ -115,21 +115,21 @@ KileGrepDialog::KileGrepDialog(TQWidget *parent, KileInfo *ki, KileGrep::Mode mo searchgroup->tqlayout()->setSpacing( 6 ); searchgroup->tqlayout()->setMargin( 11 ); TQGridLayout *searchgrouptqlayout = new TQGridLayout( searchgroup->tqlayout() ); - searchgrouptqlayout->tqsetAlignment( TQt::AlignTop ); + searchgrouptqlayout->setAlignment( TQt::AlignTop ); TQLabel *pattern_label = new TQLabel(i18n("Pattern:"), searchgroup); - if ( pattern_label->tqsizeHint().width() > labelwidth ) - labelwidth = pattern_label->tqsizeHint().width(); + if ( pattern_label->sizeHint().width() > labelwidth ) + labelwidth = pattern_label->sizeHint().width(); pattern_combo = new KComboBox(true, searchgroup); pattern_combo->setInsertionPolicy(KComboBox::NoInsertion); pattern_combo->setFocus(); - pattern_combo->setMinimumSize(pattern_combo->tqsizeHint()); + pattern_combo->setMinimumSize(pattern_combo->sizeHint()); pattern_label->setBuddy(pattern_combo); TQLabel *template_label = new TQLabel(i18n("Template:"), searchgroup); - if ( template_label->tqsizeHint().width() > labelwidth ) - labelwidth = template_label->tqsizeHint().width(); + if ( template_label->sizeHint().width() > labelwidth ) + labelwidth = template_label->sizeHint().width(); TQStringList templatemode_list; templatemode_list << i18n("Normal") @@ -152,7 +152,7 @@ KileGrepDialog::KileGrepDialog(TQWidget *parent, KileInfo *ki, KileGrep::Mode mo template_edit = new KLineEdit(searchgroup); template_edit->setText("%s"); - template_edit->setMinimumSize(template_edit->tqsizeHint()); + template_edit->setMinimumSize(template_edit->sizeHint()); template_label->setBuddy(template_edit); template_layout->addWidget(template_edit); @@ -167,19 +167,19 @@ KileGrepDialog::KileGrepDialog(TQWidget *parent, KileInfo *ki, KileGrep::Mode mo filtergroup->tqlayout()->setSpacing( 6 ); filtergroup->tqlayout()->setMargin( 11 ); TQGridLayout *filtergrouptqlayout = new TQGridLayout( filtergroup->tqlayout() ); - filtergrouptqlayout->tqsetAlignment( TQt::AlignTop ); + filtergrouptqlayout->setAlignment( TQt::AlignTop ); TQLabel *files_label = new TQLabel(i18n("Filter:"), filtergroup); - if ( files_label->tqsizeHint().width() > labelwidth ) - labelwidth = files_label->tqsizeHint().width(); + if ( files_label->sizeHint().width() > labelwidth ) + labelwidth = files_label->sizeHint().width(); filter_combo = new KComboBox(true, filtergroup); - filter_combo->setMinimumSize(filter_combo->tqsizeHint()); + filter_combo->setMinimumSize(filter_combo->sizeHint()); files_label->setBuddy(TQT_TQWIDGET(filter_combo->focusProxy())); TQLabel *dir_label = new TQLabel(i18n("Directory:"), filtergroup); - if ( dir_label->tqsizeHint().width() > labelwidth ) - labelwidth = dir_label->tqsizeHint().width(); + if ( dir_label->sizeHint().width() > labelwidth ) + labelwidth = dir_label->sizeHint().width(); TQBoxLayout *dir_layout = new TQHBoxLayout(3); dir_combo = new KURLRequester( new KComboBox(true, filtergroup), filtergroup, "dir combo" ); @@ -189,7 +189,7 @@ KileGrepDialog::KileGrepDialog(TQWidget *parent, KileInfo *ki, KileGrep::Mode mo dir_layout->addWidget(dir_combo); recursive_box = new TQCheckBox(i18n("Scan directories recursively"), filtergroup); - recursive_box->setMinimumWidth(recursive_box->tqsizeHint().width()); + recursive_box->setMinimumWidth(recursive_box->sizeHint().width()); filtergrouptqlayout->addWidget(files_label, 2,0, AlignLeft | AlignVCenter); filtergrouptqlayout->addWidget(filter_combo, 2, 1); @@ -326,7 +326,7 @@ KileGrepDialog::KileGrepDialog(TQWidget *parent, KileInfo *ki, KileGrep::Mode mo connect( this, TQT_SIGNAL(closeClicked()), TQT_SLOT(slotClose()) ); connect( this, TQT_SIGNAL(finished()), TQT_SLOT(slotFinished()) ); - resize(450,tqsizeHint().height()); + resize(450,sizeHint().height()); KILE_DEBUG() << "==KileGrepDialog (create dialog)=============================" << endl; } diff --git a/src/kile/kileinfo.cpp b/src/kile/kileinfo.cpp index 13e0c13..c2da7e2 100644 --- a/src/kile/kileinfo.cpp +++ b/src/kile/kileinfo.cpp @@ -54,7 +54,7 @@ KileInfo::KileInfo(TQWidget *parent) : m_viewManager= new KileView::Manager(this, TQT_TQOBJECT(parent), "KileView::Manager"); m_templateManager = new KileTemplate::Manager(this, TQT_TQOBJECT(parent), "KileTemplate::Manager"); m_editorKeySequenceManager = new KileEditorKeySequence::Manager(this, TQT_TQOBJECT(parent), "KileEditorKeySequence::Manager"); - TQObject::connect(m_docManager, TQT_SIGNAL(documentStatusChanged(Kate::Document*, bool, unsigned char)), m_viewManager, TQT_SLOT(reflectDocumenttqStatus(Kate::Document*, bool, unsigned char))); + TQObject::connect(m_docManager, TQT_SIGNAL(documentStatusChanged(Kate::Document*, bool, unsigned char)), m_viewManager, TQT_SLOT(reflectDocumentStatus(Kate::Document*, bool, unsigned char))); } KileInfo::~KileInfo() diff --git a/src/kile/kilelauncher.cpp b/src/kile/kilelauncher.cpp index fec6c92..507ee70 100644 --- a/src/kile/kilelauncher.cpp +++ b/src/kile/kilelauncher.cpp @@ -348,7 +348,7 @@ DocumentationViewer *htmlpart = new DocumentationViewer(stack,"help"); m_part = static_cast(htmlpart); - connect(htmlpart, TQT_SIGNAL(updatetqStatus(bool, bool)), tool(), TQT_SIGNAL(updatetqStatus(bool, bool))); + connect(htmlpart, TQT_SIGNAL(updateStatus(bool, bool)), tool(), TQT_SIGNAL(updateStatus(bool, bool))); tool()->manager()->wantGUIState(m_state); diff --git a/src/kile/kilelistselector.cpp b/src/kile/kilelistselector.cpp index 3e1c149..217e194 100644 --- a/src/kile/kilelistselector.cpp +++ b/src/kile/kilelistselector.cpp @@ -59,7 +59,7 @@ KileListSelectorBase::KileListSelectorBase(const TQStringList &list, const TQStr int h = ( list.count() > 0 ) ? m_listview->header()->height()+12*m_listview->firstChild()->height() : 224; m_listview->setMinimumSize(w,h); - resize(tqsizeHint().width(),tqsizeHint().height()+4); + resize(sizeHint().width(),sizeHint().height()+4); connect(m_listview, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint &,int)), this, TQT_SLOT(accept())); } diff --git a/src/kile/kilemultitabbar.cpp b/src/kile/kilemultitabbar.cpp index 6e435bb..3a40d3c 100644 --- a/src/kile/kilemultitabbar.cpp +++ b/src/kile/kilemultitabbar.cpp @@ -125,9 +125,9 @@ void KileMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int c if (m_position==KileMultiTabBar::Right) { - paint->setPen(tqcolorGroup().shadow()); + paint->setPen(colorGroup().shadow()); paint->drawLine(0,0,0,viewport()->height()); - paint->setPen(tqcolorGroup().background().dark(120)); + paint->setPen(colorGroup().background().dark(120)); paint->drawLine(1,0,1,viewport()->height()); @@ -135,28 +135,28 @@ void KileMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int c else if (m_position==KileMultiTabBar::Left) { - paint->setPen(tqcolorGroup().light()); + paint->setPen(colorGroup().light()); paint->drawLine(23,0,23,viewport()->height()); paint->drawLine(22,0,22,viewport()->height()); - paint->setPen(tqcolorGroup().shadow()); + paint->setPen(colorGroup().shadow()); paint->drawLine(0,0,0,viewport()->height()); } else if (m_position==KileMultiTabBar::Bottom) { - paint->setPen(tqcolorGroup().shadow()); + paint->setPen(colorGroup().shadow()); paint->drawLine(0,0,viewport()->width(),0); - paint->setPen(tqcolorGroup().background().dark(120)); + paint->setPen(colorGroup().background().dark(120)); paint->drawLine(0,1,viewport()->width(),1); } else { - paint->setPen(tqcolorGroup().light()); + paint->setPen(colorGroup().light()); paint->drawLine(0,23,viewport()->width(),23); paint->drawLine(0,22,viewport()->width(),22); -/* paint->setPen(tqcolorGroup().shadow()); +/* paint->setPen(colorGroup().shadow()); paint->drawLine(0,0,0,viewport()->height());*/ } @@ -475,7 +475,7 @@ void KileMultiTabBarButton::showEvent( TQShowEvent* he) { } -TQSize KileMultiTabBarButton::tqsizeHint() const +TQSize KileMultiTabBarButton::sizeHint() const { constPolish(); @@ -491,7 +491,7 @@ TQSize KileMultiTabBarButton::tqsizeHint() const } #endif if ( isMenuButton() ) - w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this); + w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this); if ( pixmap() ) { TQPixmap *pm = (TQPixmap *)pixmap(); @@ -501,7 +501,7 @@ TQSize KileMultiTabBarButton::tqsizeHint() const TQString s( text() ); bool empty = s.isEmpty(); if ( empty ) - s = TQString::tqfromLatin1("XXXX"); + s = TQString::fromLatin1("XXXX"); TQFontMetrics fm = fontMetrics(); TQSize sz = fm.size( ShowPrefix, s ); if(!empty || !w) @@ -595,12 +595,12 @@ void KileMultiTabBarTab::updateState() if ((m_position==KileMultiTabBar::Right || m_position==KileMultiTabBar::Left)) { setFixedWidth(24); if ((m_style==KileMultiTabBar::KDEV3) || (m_style==KileMultiTabBar::KDEV3ICON) || (isOn())) { - setFixedHeight(KileMultiTabBarButton::tqsizeHint().width()); + setFixedHeight(KileMultiTabBarButton::sizeHint().width()); } else setFixedHeight(36); } else { setFixedHeight(24); if ((m_style==KileMultiTabBar::KDEV3) || (m_style==KileMultiTabBar::KDEV3ICON) || (isOn())) { - setFixedWidth(KileMultiTabBarButton::tqsizeHint().width()); + setFixedWidth(KileMultiTabBarButton::sizeHint().width()); } else setFixedWidth(36); } } else { @@ -655,7 +655,7 @@ void KileMultiTabBarTab::drawButtonStyled(TQPainter *paint) { const int height = 24; if ((m_style==KileMultiTabBar::KDEV3) || (m_style==KileMultiTabBar::KDEV3ICON) || (isOn())) { if ((m_position==KileMultiTabBar::Left) || (m_position==KileMultiTabBar::Right)) - sh=TQSize(this->height(),this->width());//KileMultiTabBarButton::tqsizeHint(); + sh=TQSize(this->height(),this->width());//KileMultiTabBarButton::sizeHint(); else sh=TQSize(this->width(),this->height()); } else @@ -672,8 +672,8 @@ void KileMultiTabBarTab::drawButtonStyled(TQPainter *paint) { if (isOn()) st|=TQStyle::Style_On; - tqstyle().tqdrawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), tqcolorGroup(),st); - tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), tqcolorGroup(),st); + tqstyle().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st); + tqstyle().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st); switch (m_position) { case KileMultiTabBar::Left: @@ -689,8 +689,8 @@ void KileMultiTabBarTab::drawButtonStyled(TQPainter *paint) { paint->drawPixmap(0,0,pixmap); break; } -// tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), -// tqcolorGroup(),TQStyle::Style_Enabled); +// tqstyle().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), +// colorGroup(),TQStyle::Style_Enabled); } @@ -700,58 +700,58 @@ void KileMultiTabBarTab::drawButtonClassic(TQPainter *paint) TQPixmap pixmap; if ( iconSet()) pixmap = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ); - paint->fillRect(0, 0, 24, 24, tqcolorGroup().background()); + paint->fillRect(0, 0, 24, 24, colorGroup().background()); if (!isOn()) { if (m_position==KileMultiTabBar::Right) { - paint->fillRect(0,0,21,21,TQBrush(tqcolorGroup().background())); + paint->fillRect(0,0,21,21,TQBrush(colorGroup().background())); - paint->setPen(tqcolorGroup().background().dark(150)); + paint->setPen(colorGroup().background().dark(150)); paint->drawLine(0,22,23,22); paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap); - paint->setPen(tqcolorGroup().shadow()); + paint->setPen(colorGroup().shadow()); paint->drawLine(0,0,0,23); - paint->setPen(tqcolorGroup().background().dark(120)); + paint->setPen(colorGroup().background().dark(120)); paint->drawLine(1,0,1,23); } else if ((m_position==KileMultiTabBar::Bottom) || (m_position==KileMultiTabBar::Top)) { - paint->fillRect(0,1,23,22,TQBrush(tqcolorGroup().background())); + paint->fillRect(0,1,23,22,TQBrush(colorGroup().background())); paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap); - paint->setPen(tqcolorGroup().background().dark(120)); + paint->setPen(colorGroup().background().dark(120)); paint->drawLine(23,0,23,23); - paint->setPen(tqcolorGroup().light()); + paint->setPen(colorGroup().light()); paint->drawLine(0,22,23,22); paint->drawLine(0,23,23,23); - paint->setPen(tqcolorGroup().shadow()); + paint->setPen(colorGroup().shadow()); paint->drawLine(0,0,23,0); - paint->setPen(tqcolorGroup().background().dark(120)); + paint->setPen(colorGroup().background().dark(120)); paint->drawLine(0,1,23,1); } else { - paint->setPen(tqcolorGroup().background().dark(120)); + paint->setPen(colorGroup().background().dark(120)); paint->drawLine(0,23,23,23); - paint->fillRect(0,0,23,21,TQBrush(tqcolorGroup().background())); + paint->fillRect(0,0,23,21,TQBrush(colorGroup().background())); paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap); - paint->setPen(tqcolorGroup().light()); + paint->setPen(colorGroup().light()); paint->drawLine(23,0,23,23); paint->drawLine(22,0,22,23); - paint->setPen(tqcolorGroup().shadow()); + paint->setPen(colorGroup().shadow()); paint->drawLine(0,0,0,23); } @@ -762,12 +762,12 @@ void KileMultiTabBarTab::drawButtonClassic(TQPainter *paint) { if (m_position==KileMultiTabBar::Right) { - paint->setPen(tqcolorGroup().shadow()); + paint->setPen(colorGroup().shadow()); paint->drawLine(0,height()-1,23,height()-1); paint->drawLine(0,height()-2,23,height()-2); paint->drawLine(23,0,23,height()-1); paint->drawLine(22,0,22,height()-1); - paint->fillRect(0,0,21,height()-3,TQBrush(tqcolorGroup().light())); + paint->fillRect(0,0,21,height()-3,TQBrush(colorGroup().light())); paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap); if (m_showActiveTabText) @@ -777,9 +777,9 @@ void KileMultiTabBarTab::drawButtonClassic(TQPainter *paint) TQPixmap tpixmap(height()-25-3, width()-2); TQPainter painter(&tpixmap); - painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light())); + painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light())); - painter.setPen(tqcolorGroup().text()); + painter.setPen(colorGroup().text()); painter.drawText(0,+width()/2+TQFontMetrics(TQFont()).height()/2,m_text); paint->rotate(90); @@ -791,25 +791,25 @@ void KileMultiTabBarTab::drawButtonClassic(TQPainter *paint) else if (m_position==KileMultiTabBar::Top) { - paint->fillRect(0,0,width()-1,23,TQBrush(tqcolorGroup().light())); + paint->fillRect(0,0,width()-1,23,TQBrush(colorGroup().light())); paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap); if (m_showActiveTabText) { - paint->setPen(tqcolorGroup().text()); + paint->setPen(colorGroup().text()); paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text); } } else if (m_position==KileMultiTabBar::Bottom) { - paint->setPen(tqcolorGroup().shadow()); + paint->setPen(colorGroup().shadow()); paint->drawLine(0,23,width()-1,23); paint->drawLine(0,22,width()-1,22); - paint->fillRect(0,0,width()-1,21,TQBrush(tqcolorGroup().light())); + paint->fillRect(0,0,width()-1,21,TQBrush(colorGroup().light())); paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap); if (m_showActiveTabText) { - paint->setPen(tqcolorGroup().text()); + paint->setPen(colorGroup().text()); paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text); } @@ -818,10 +818,10 @@ void KileMultiTabBarTab::drawButtonClassic(TQPainter *paint) { - paint->setPen(tqcolorGroup().shadow()); + paint->setPen(colorGroup().shadow()); paint->drawLine(0,height()-1,23,height()-1); paint->drawLine(0,height()-2,23,height()-2); - paint->fillRect(0,0,23,height()-3,TQBrush(tqcolorGroup().light())); + paint->fillRect(0,0,23,height()-3,TQBrush(colorGroup().light())); paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap); if (m_showActiveTabText) { @@ -831,9 +831,9 @@ void KileMultiTabBarTab::drawButtonClassic(TQPainter *paint) TQPixmap tpixmap(height()-25-3, width()-2); TQPainter painter(&tpixmap); - painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light())); + painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light())); - painter.setPen(tqcolorGroup().text()); + painter.setPen(colorGroup().text()); painter.drawText(tpixmap.width()-TQFontMetrics(TQFont()).width(m_text),+width()/2+TQFontMetrics(TQFont()).height()/2,m_text); paint->rotate(-90); @@ -860,13 +860,13 @@ KileMultiTabBar::KileMultiTabBar(KileMultiTabBarMode bm, TQWidget *parent,const if (bm==Vertical) { m_l=new TQVBoxLayout(this); - tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding, true); + setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding, true); // setFixedWidth(24); } else { m_l=new TQHBoxLayout(this); - tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, true); + setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, true); // setFixedHeight(24); } m_l->setMargin(0); diff --git a/src/kile/kilemultitabbar.h b/src/kile/kilemultitabbar.h index e023364..7cc89b6 100644 --- a/src/kile/kilemultitabbar.h +++ b/src/kile/kilemultitabbar.h @@ -241,7 +241,7 @@ public slots: */ void setText(const TQString &); - TQSize tqsizeHint() const; + TQSize sizeHint() const; protected: KileMultiTabBar::KileMultiTabBarPosition m_position; diff --git a/src/kile/kileprojectdlgs.cpp b/src/kile/kileprojectdlgs.cpp index e21ae76..dbc5446 100644 --- a/src/kile/kileprojectdlgs.cpp +++ b/src/kile/kileprojectdlgs.cpp @@ -65,7 +65,7 @@ KileProjectDlgBase::KileProjectDlgBase(const TQString &caption, KileDocument::Ex m_pgroup->tqlayout()->setSpacing( 6 ); m_pgroup->tqlayout()->setMargin( 11 ); m_pgrid = new TQGridLayout( m_pgroup->tqlayout() ); - m_pgrid->tqsetAlignment( TQt::AlignTop ); + m_pgrid->setAlignment( TQt::AlignTop ); m_title = new KLineEdit(m_pgroup, "le_projectname"); TQWhatsThis::add(m_title, whatsthisName); @@ -79,7 +79,7 @@ KileProjectDlgBase::KileProjectDlgBase(const TQString &caption, KileDocument::Ex m_egroup->tqlayout()->setSpacing( 6 ); m_egroup->tqlayout()->setMargin( 11 ); m_egrid = new TQGridLayout( m_egroup->tqlayout() ); - m_egrid->tqsetAlignment( TQt::AlignTop ); + m_egrid->setAlignment( TQt::AlignTop ); m_extensions = new KLineEdit(m_egroup, "le_ext"); TQRegExp reg("[\\. a-zA-Z0-9]+"); @@ -495,13 +495,13 @@ KileProjectOptionsDlg::KileProjectOptionsDlg(KileProject *project, KileDocument: group3->tqlayout()->setSpacing( 6 ); group3->tqlayout()->setMargin( 11 ); TQGridLayout *grid3 = new TQGridLayout( group3->tqlayout() ); - grid3->tqsetAlignment( TQt::AlignTop ); + grid3->setAlignment( TQt::AlignTop ); m_master = new KComboBox(false, group3, "master"); //m_master->setDisabled(true); TQLabel *lb1 = new TQLabel(i18n("&Master document:"), group3); lb1->setBuddy(m_master); - lb1->setMinimumWidth( m_sel_extensions->tqsizeHint().width() ); + lb1->setMinimumWidth( m_sel_extensions->sizeHint().width() ); TQWhatsThis::add(m_master, whatsthisMaster); TQWhatsThis::add(lb1,whatsthisMaster); diff --git a/src/kile/kilesidebar.cpp b/src/kile/kilesidebar.cpp index a2774d6..9bbc5b9 100644 --- a/src/kile/kilesidebar.cpp +++ b/src/kile/kilesidebar.cpp @@ -36,12 +36,12 @@ KileSideBar::KileSideBar(int size, TQWidget *parent, const char *name, Qt::Orien m_nSize(size) { setLineWidth(0); - tqsetSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored); + setSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored); TQLayout *tqlayout; m_tabStack = new TQWidgetStack(this); - m_tabStack->tqsetSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored); + m_tabStack->setSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored); KileMultiTabBar::KileMultiTabBarMode tabbarori = KileMultiTabBar::Horizontal; KileMultiTabBar::KileMultiTabBarPosition tabbarpos = KileMultiTabBar::Top; diff --git a/src/kile/kilestatswidget.cpp b/src/kile/kilestatswidget.cpp index 7d41987..601f508 100644 --- a/src/kile/kilestatswidget.cpp +++ b/src/kile/kilestatswidget.cpp @@ -37,7 +37,7 @@ KileWidgetStatistics::KileWidgetStatistics( TQWidget* parent, const char* name, chargroup->tqlayout()->setSpacing( 6 ); chargroup->tqlayout()->setMargin( 11 ); chargrouptqlayout = new TQGridLayout( chargroup->tqlayout() ); - chargrouptqlayout->tqsetAlignment( TQt::AlignTop ); + chargrouptqlayout->setAlignment( TQt::AlignTop ); m_wordCharText = new TQLabel(i18n("Words and numbers:"), chargroup); m_commandCharText = new TQLabel(i18n("LaTeX commands and environments:"), chargroup); @@ -71,7 +71,7 @@ KileWidgetStatistics::KileWidgetStatistics( TQWidget* parent, const char* name, stringgroup->tqlayout()->setSpacing( 6 ); stringgroup->tqlayout()->setMargin( 11 ); stringgrouptqlayout = new TQGridLayout( stringgroup->tqlayout() ); - stringgrouptqlayout->tqsetAlignment( TQt::AlignTop ); + stringgrouptqlayout->setAlignment( TQt::AlignTop ); m_wordStringText = new TQLabel(i18n("Words:"), stringgroup); m_commandStringText = new TQLabel(i18n("LaTeX commands:"), stringgroup); @@ -109,9 +109,9 @@ KileWidgetStatistics::KileWidgetStatistics( TQWidget* parent, const char* name, vbox->addWidget(m_warning); vbox->addStretch(1); - int w = m_commandCharText->tqsizeHint().width(); - if ( m_whitespaceCharText->tqsizeHint().width() > w ) - w = m_whitespaceCharText->tqsizeHint().width(); + int w = m_commandCharText->sizeHint().width(); + if ( m_whitespaceCharText->sizeHint().width() > w ) + w = m_whitespaceCharText->sizeHint().width(); stringgrouptqlayout->setColSpacing(0,w); } @@ -122,9 +122,9 @@ KileWidgetStatistics::~KileWidgetStatistics() void KileWidgetStatistics::updateColumns() { - int w = m_totalChar->tqsizeHint().width(); - if ( m_totalString->tqsizeHint().width() > w ) - w = m_totalString->tqsizeHint().width(); + int w = m_totalChar->sizeHint().width(); + if ( m_totalString->sizeHint().width() > w ) + w = m_totalString->sizeHint().width(); chargrouptqlayout->setColSpacing(2,w); stringgrouptqlayout->setColSpacing(2,w); } diff --git a/src/kile/kilestdtools.h b/src/kile/kilestdtools.h index ca5e6b2..336a4f4 100644 --- a/src/kile/kilestdtools.h +++ b/src/kile/kilestdtools.h @@ -125,7 +125,7 @@ namespace KileTool bool determineTarget(); signals: - void updatetqStatus(bool, bool); + void updateStatus(bool, bool); }; } diff --git a/src/kile/kilestructurewidget.cpp b/src/kile/kilestructurewidget.cpp index 2ff7212..9f4eb6a 100644 --- a/src/kile/kilestructurewidget.cpp +++ b/src/kile/kilestructurewidget.cpp @@ -125,7 +125,7 @@ void KileListViewToolTip::maybeTip(const TQPoint &p) if ( !item ) return; - const TQRect rect = m_listview->tqitemRect(item); + const TQRect rect = m_listview->itemRect(item); if ( ! rect.isValid() ) return; @@ -154,7 +154,7 @@ namespace KileWidget setSorting(-1,true); setAllColumnsShowFocus(true); setFullWidth(true); - tqsetSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored); + setSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored); TQToolTip::remove(this); new KileListViewToolTip(this); @@ -606,7 +606,7 @@ namespace KileWidget setLineWidth(0); setMidLineWidth(0); setMargin(0); - tqsetSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored); + setSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored); m_default = new StructureList(this, 0L); m_default->activate(); diff --git a/src/kile/kiletool.cpp b/src/kile/kiletool.cpp index c3d6551..2ef8afe 100644 --- a/src/kile/kiletool.cpp +++ b/src/kile/kiletool.cpp @@ -492,7 +492,7 @@ namespace KileTool KILE_DEBUG() << "==Base::needsUpdate(" << target << "," << source << endl; TQFileInfo targetinfo(target); TQFileInfo sourceinfo(source); - TQDateTime currDateTime = TQDateTime::tqcurrentDateTime(); + TQDateTime currDateTime = TQDateTime::currentDateTime(); if ( !(sourceinfo.exists() && sourceinfo.isReadable()) ) { diff --git a/src/kile/kiletoolconfigwidget.cpp b/src/kile/kiletoolconfigwidget.cpp index 30064fb..1600491 100644 --- a/src/kile/kiletoolconfigwidget.cpp +++ b/src/kile/kiletoolconfigwidget.cpp @@ -226,13 +226,13 @@ namespace KileWidget if ( m_configWidget->m_stackBasic->widget(basicPage) ) { - TQSize szHint = m_configWidget->m_stackBasic->widget(basicPage)->tqsizeHint(); + TQSize szHint = m_configWidget->m_stackBasic->widget(basicPage)->sizeHint(); if (szHint.height() > 0) m_configWidget->m_stackBasic->setMaximumHeight(szHint.height()); } if ( m_configWidget->m_stackExtra->widget(extraPage) ) { - TQSize szHint = m_configWidget->m_stackExtra->widget(extraPage)->tqsizeHint(); + TQSize szHint = m_configWidget->m_stackExtra->widget(extraPage)->sizeHint(); if (szHint.height() > 0) m_configWidget->m_stackExtra->setMaximumHeight(szHint.height()); } diff --git a/src/kile/kileviewmanager.cpp b/src/kile/kileviewmanager.cpp index 47634ac..606b4a0 100644 --- a/src/kile/kileviewmanager.cpp +++ b/src/kile/kileviewmanager.cpp @@ -100,7 +100,7 @@ void Manager::createTabs(TQWidget *parent) m_tabs->setFocus(); connect( m_tabs, TQT_SIGNAL( currentChanged( TQWidget * ) ), m_receiver, TQT_SLOT(newCaption()) ); connect( m_tabs, TQT_SIGNAL( currentChanged( TQWidget * ) ), m_receiver, TQT_SLOT(activateView( TQWidget * )) ); - connect( m_tabs, TQT_SIGNAL( currentChanged( TQWidget * ) ), m_receiver, TQT_SLOT(updateModetqStatus()) ); + connect( m_tabs, TQT_SIGNAL( currentChanged( TQWidget * ) ), m_receiver, TQT_SLOT(updateModeStatus()) ); connect( m_tabs, TQT_SIGNAL( closeRequest(TQWidget *) ), this, TQT_SLOT(closeWidget(TQWidget *))); connect( m_tabs, TQT_SIGNAL( testCanDecode( const TQDragMoveEvent *, bool & ) ), this, TQT_SLOT(testCanDecodeURLs( const TQDragMoveEvent *, bool & )) ); connect( m_tabs, TQT_SIGNAL( receivedDropEvent( TQDropEvent * ) ), m_ki->docManager(), TQT_SLOT(openDroppedURLs( TQDropEvent * )) ); @@ -142,8 +142,8 @@ Kate::View* Manager::createTextView(KileDocument::TextInfo *info, int index) m_tabs->showPage( view ); m_textViewList.insert((index < 0 || (uint)index >= m_textViewList.count()) ? m_textViewList.count() : index, view); - connect(view, TQT_SIGNAL(viewStatusMsg(const TQString&)), m_receiver, TQT_SLOT(newtqStatus(const TQString&))); - connect(view, TQT_SIGNAL(newtqStatus()), m_receiver, TQT_SLOT(newCaption())); + connect(view, TQT_SIGNAL(viewStatusMsg(const TQString&)), m_receiver, TQT_SLOT(newStatus(const TQString&))); + connect(view, TQT_SIGNAL(newStatus()), m_receiver, TQT_SLOT(newCaption())); connect(view, TQT_SIGNAL(dropEventPass(TQDropEvent *)), m_ki->docManager(), TQT_SLOT(openDroppedURLs(TQDropEvent *))); connect(info, TQT_SIGNAL(urlChanged(KileDocument::Info*, const KURL&)), this, TQT_SLOT(urlChanged(KileDocument::Info*, const KURL&))); @@ -163,7 +163,7 @@ Kate::View* Manager::createTextView(KileDocument::TextInfo *info, int index) emit(activateView(view, false)); TQTimer::singleShot(0, m_receiver, TQT_SLOT(newCaption())); //make sure the caption gets updated - reflectDocumenttqStatus(view->getDoc(), false, 0); + reflectDocumentStatus(view->getDoc(), false, 0); view->setFocusPolicy(TQ_StrongFocus); view->setFocus(); @@ -304,7 +304,7 @@ void Manager::gotoPrevView() m_tabs->setCurrentPage( cPage ); } -void Manager::reflectDocumenttqStatus(Kate::Document *doc, bool isModified, unsigned char reason) +void Manager::reflectDocumentStatus(Kate::Document *doc, bool isModified, unsigned char reason) { TQPixmap icon; if ( reason == 0 && isModified ) //nothing diff --git a/src/kile/kileviewmanager.h b/src/kile/kileviewmanager.h index 2050a2c..2932ca4 100644 --- a/src/kile/kileviewmanager.h +++ b/src/kile/kileviewmanager.h @@ -91,7 +91,7 @@ public slots: void gotoNextView(); void gotoPrevView(); - void reflectDocumenttqStatus(Kate::Document*, bool, unsigned char); + void reflectDocumentStatus(Kate::Document*, bool, unsigned char); void onKatePopupMenuRequest(void); void convertSelectionToLaTeX(void); diff --git a/src/kile/latexcmddialog.cpp b/src/kile/latexcmddialog.cpp index f824d07..3e90d07 100644 --- a/src/kile/latexcmddialog.cpp +++ b/src/kile/latexcmddialog.cpp @@ -398,7 +398,7 @@ LatexCommandsDialog::LatexCommandsDialog(KConfig *config, KileDocument::LatexCom resetListviews(); slotEnableButtons(); - resize(tqsizeHint().width()+20,tqsizeHint().height()+50); + resize(sizeHint().width()+20,sizeHint().height()+50); } ////////////////////////////// listview ////////////////////////////// diff --git a/src/kile/latexconfigwidget.ui b/src/kile/latexconfigwidget.ui index a162c66..c409952 100644 --- a/src/kile/latexconfigwidget.ui +++ b/src/kile/latexconfigwidget.ui @@ -117,7 +117,7 @@ Expanding - + 280 20 diff --git a/src/kile/latexconfigwidget.ui.h b/src/kile/latexconfigwidget.ui.h index d152918..fcc8bf5 100644 --- a/src/kile/latexconfigwidget.ui.h +++ b/src/kile/latexconfigwidget.ui.h @@ -13,12 +13,12 @@ void KileWidgetLatexConfig::init() { - int w = m_tlType->tqsizeHint().width(); + int w = m_tlType->sizeHint().width(); - int wi = m_tlPath->tqsizeHint().width(); + int wi = m_tlPath->sizeHint().width(); if ( wi > w ) w = wi; - wi = m_pbCommands->tqsizeHint().width(); + wi = m_pbCommands->sizeHint().width(); if ( wi > w ) w = wi; w += 8; diff --git a/src/kile/librarytoolconfigwidget.ui b/src/kile/librarytoolconfigwidget.ui index 8c5ba70..9605c6b 100644 --- a/src/kile/librarytoolconfigwidget.ui +++ b/src/kile/librarytoolconfigwidget.ui @@ -20,7 +20,7 @@ 0 - + 32767 32767 @@ -91,7 +91,7 @@ Expanding - + 20 20 diff --git a/src/kile/mathenvdialog.cpp b/src/kile/mathenvdialog.cpp index e3b5dce..b1b7068 100644 --- a/src/kile/mathenvdialog.cpp +++ b/src/kile/mathenvdialog.cpp @@ -71,7 +71,7 @@ MathEnvironmentDialog::MathEnvironmentDialog(TQWidget *parent, KConfig *config, m_cbBullets = new TQCheckBox(envgroup); TQGridLayout *envtqlayout = new TQGridLayout( envgroup->tqlayout() ); - envtqlayout->tqsetAlignment( TQt::AlignTop ); + envtqlayout->setAlignment( TQt::AlignTop ); envtqlayout->addWidget( m_lbEnvironment, 0,0 ); envtqlayout->addWidget( m_lbStarred, 1,0 ); envtqlayout->addWidget( m_lbRows, 2,0 ); diff --git a/src/kile/newdocumentwidget.ui b/src/kile/newdocumentwidget.ui index ce4cea1..005f83f 100644 --- a/src/kile/newdocumentwidget.ui +++ b/src/kile/newdocumentwidget.ui @@ -58,7 +58,7 @@ Expanding - + 20 20 diff --git a/src/kile/newtoolwizard.ui b/src/kile/newtoolwizard.ui index 52eb717..42cc560 100644 --- a/src/kile/newtoolwizard.ui +++ b/src/kile/newtoolwizard.ui @@ -49,7 +49,7 @@ 0 - + 100 0 @@ -69,7 +69,7 @@ Expanding - + 20 70 @@ -112,7 +112,7 @@ Expanding - + 20 111 @@ -146,7 +146,7 @@ the standard "LaTeX" tool. Expanding - + 20 71 diff --git a/src/kile/postscriptdialog.cpp b/src/kile/postscriptdialog.cpp index f5d39bc..407c47c 100644 --- a/src/kile/postscriptdialog.cpp +++ b/src/kile/postscriptdialog.cpp @@ -103,7 +103,7 @@ PostscriptDialog::PostscriptDialog(TQWidget *parent, } TQLabel *label1 = new TQLabel(title,widget); - label1->tqsetAlignment(TQt::AlignHCenter); + label1->setAlignment(TQt::AlignHCenter); grid->addMultiCellWidget( label1, 0,0, 0,2, TQt::AlignCenter ); // empty line @@ -122,7 +122,7 @@ PostscriptDialog::PostscriptDialog(TQWidget *parent, // line 1: Choose-Box TQPushButton *choose_in = new TQPushButton("", widget, "infilechooser" ); choose_in->setPixmap( SmallIcon("fileopen") ); - choose_in->setFixedWidth(choose_in->tqsizeHint().width()); + choose_in->setFixedWidth(choose_in->sizeHint().width()); grid->addWidget(choose_in,2,2); // line 2: TQLabel @@ -137,7 +137,7 @@ PostscriptDialog::PostscriptDialog(TQWidget *parent, // line 3: choose box TQPushButton *choose_out = new TQPushButton("", widget, "outfilechooser" ); choose_out->setPixmap( SmallIcon("fileopen") ); - choose_out->setFixedWidth(choose_out->tqsizeHint().width()); + choose_out->setFixedWidth(choose_out->sizeHint().width()); grid->addWidget(choose_out,3,2); // line 3: task selection diff --git a/src/kile/previewconfigwidget.cpp b/src/kile/previewconfigwidget.cpp index 3ad0e06..afc2283 100644 --- a/src/kile/previewconfigwidget.cpp +++ b/src/kile/previewconfigwidget.cpp @@ -37,12 +37,12 @@ KileWidgetPreviewConfig::KileWidgetPreviewConfig(KConfig *config, KileTool::Quic TQVBoxLayout *vbox = new TQVBoxLayout(this, 5,5 ); TQGroupBox *groupbox = new TQGroupBox( i18n("Quick Preview in a separate window"), this, "groupbox" ); - groupbox->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, groupbox->sizePolicy().hasHeightForWidth() ) ); + groupbox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, groupbox->sizePolicy().hasHeightForWidth() ) ); groupbox->setColumnLayout(0, Qt::Vertical ); groupbox->tqlayout()->setSpacing( 6 ); groupbox->tqlayout()->setMargin( 11 ); TQGridLayout *groupboxLayout = new TQGridLayout( groupbox->tqlayout() ); - groupboxLayout->tqsetAlignment( TQt::AlignTop ); + groupboxLayout->setAlignment( TQt::AlignTop ); TQLabel *label = new TQLabel( i18n("Select a configuration:"), groupbox, "label"); m_combobox = new KComboBox(false,groupbox,"combobox" ); @@ -57,7 +57,7 @@ KileWidgetPreviewConfig::KileWidgetPreviewConfig(KConfig *config, KileTool::Quic gbResolution->tqlayout()->setSpacing( 6 ); gbResolution->tqlayout()->setMargin( 11 ); TQGridLayout *resLayout = new TQGridLayout( gbResolution->tqlayout() ); - resLayout->tqsetAlignment( TQt::AlignTop ); + resLayout->setAlignment( TQt::AlignTop ); TQLabel *resLabel = new TQLabel( i18n("&Resolution:"), gbResolution ); m_leDvipngResolution = new KLineEdit( gbResolution, "DvipngResolution" ); @@ -100,7 +100,7 @@ KileWidgetPreviewConfig::KileWidgetPreviewConfig(KConfig *config, KileTool::Quic m_gbPreview->tqlayout()->setSpacing( 6 ); m_gbPreview->tqlayout()->setMargin( 11 ); TQGridLayout *previewLayout = new TQGridLayout( m_gbPreview->tqlayout() ); - previewLayout->tqsetAlignment( TQt::AlignTop ); + previewLayout->setAlignment( TQt::AlignTop ); TQLabel *labelPreviewWidget = new TQLabel(i18n("Show preview in bottom bar:"), m_gbPreview); TQLabel *labelPreviewType = new TQLabel(i18n("Conversion to image:"), m_gbPreview); @@ -129,8 +129,8 @@ KileWidgetPreviewConfig::KileWidgetPreviewConfig(KConfig *config, KileTool::Quic previewLayout->addMultiCellWidget(m_lbMathgroup,3,3,4,5,TQt::AlignLeft); previewLayout->addWidget(labelSubdocument1,4,0); previewLayout->addMultiCellWidget(labelSubdocument2,4,4,2,5,TQt::AlignLeft); - previewLayout->setRowSpacing(0,3*labelPreviewWidget->tqsizeHint().height()/2); - previewLayout->setRowSpacing(3,m_coEnvironment->tqsizeHint().height()); + previewLayout->setRowSpacing(0,3*labelPreviewWidget->sizeHint().height()/2); + previewLayout->setRowSpacing(3,m_coEnvironment->sizeHint().height()); previewLayout->setColSpacing(1,12); previewLayout->setColSpacing(3,40); previewLayout->setColStretch(5,1); diff --git a/src/kile/processtoolconfigwidget.ui b/src/kile/processtoolconfigwidget.ui index 02595c7..261970f 100644 --- a/src/kile/processtoolconfigwidget.ui +++ b/src/kile/processtoolconfigwidget.ui @@ -85,7 +85,7 @@ Expanding - + 20 16 diff --git a/src/kile/quickdocumentdialog.cpp b/src/kile/quickdocumentdialog.cpp index 763b8fe..66648f4 100644 --- a/src/kile/quickdocumentdialog.cpp +++ b/src/kile/quickdocumentdialog.cpp @@ -160,7 +160,7 @@ TQWidget *QuickDocument::setupClassOptions(TQTabWidget *tab) // Document classes m_cbDocumentClass = new KComboBox(classOptions); - m_cbDocumentClass->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum); + m_cbDocumentClass->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum); m_cbDocumentClass->setDuplicatesEnabled(false); // m_cbDocumentClass->listBox()->setVariableHeight(true); gl->addWidget(m_cbDocumentClass,0,1); @@ -168,7 +168,7 @@ TQWidget *QuickDocument::setupClassOptions(TQTabWidget *tab) label = new TQLabel(i18n("Doc&ument class:"), classOptions); gl->addWidget(label,0,0); - label->setBuddy(m_cbDocumentClass); label->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Maximum); + label->setBuddy(m_cbDocumentClass); label->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Maximum); m_btnDocumentClassAdd = new KPushButton(SmallIcon("edit_add"), "", classOptions); TQWhatsThis::add(m_btnDocumentClassAdd, i18n("Add current text to this list")); @@ -187,7 +187,7 @@ TQWidget *QuickDocument::setupClassOptions(TQTabWidget *tab) label = new TQLabel(i18n("&Typeface size:"), classOptions); label->setBuddy(m_cbTypefaceSize); - label->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Maximum); + label->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Maximum); gl->addWidget(label,1,0); m_btnTypefaceSizeAdd = new KPushButton(SmallIcon("edit_add"), "", classOptions); @@ -202,13 +202,13 @@ TQWidget *QuickDocument::setupClassOptions(TQTabWidget *tab) // Papersize m_cbPaperSize = new KComboBox(classOptions); - m_cbPaperSize->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum); + m_cbPaperSize->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum); m_cbPaperSize->setDuplicatesEnabled(false); gl->addWidget(m_cbPaperSize,2,1); m_lbPaperSize = new TQLabel(i18n("Paper si&ze:"), classOptions); m_lbPaperSize->setBuddy(m_cbPaperSize); - m_lbPaperSize->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Maximum); + m_lbPaperSize->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Maximum); gl->addWidget(m_lbPaperSize,2,0); m_btnPaperSizeAdd = new KPushButton(SmallIcon("edit_add"), "", classOptions); @@ -223,13 +223,13 @@ TQWidget *QuickDocument::setupClassOptions(TQTabWidget *tab) // Encoding m_cbEncoding = new KComboBox(classOptions); - m_cbEncoding->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum); + m_cbEncoding->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum); m_cbEncoding->setDuplicatesEnabled(false); gl->addWidget(m_cbEncoding,3,1); label = new TQLabel(i18n("E&ncoding:"), classOptions); label->setBuddy(m_cbEncoding); - label->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Maximum); + label->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Maximum); gl->addWidget(label,3,0); // Class Options @@ -245,8 +245,8 @@ TQWidget *QuickDocument::setupClassOptions(TQTabWidget *tab) label = new TQLabel(i18n("Cl&ass options:"), classOptions); label->setBuddy(m_lvClassOptions); - label->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); - label->tqsetAlignment(TQt::AlignTop); + label->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding); + label->setAlignment(TQt::AlignTop); gl->addWidget(label,4,0); // button @@ -357,9 +357,9 @@ TQWidget *QuickDocument::setupProperties(TQTabWidget *tab) label->setBuddy(m_leDate); // set current date - m_leDate->setText( KGlobal::locale()->formatDate(TQDate::tqcurrentDate(), true) ); + m_leDate->setText( KGlobal::locale()->formatDate(TQDate::currentDate(), true) ); // For KDE4: - //m_leDate->setText( KGlobal::locale()->formatDate(TQDate::tqcurrentDate(), KLocale::ShortDate) ); + //m_leDate->setText( KGlobal::locale()->formatDate(TQDate::currentDate(), KLocale::ShortDate) ); return personalInfo; } @@ -2187,7 +2187,7 @@ QuickDocumentInputDialog::QuickDocumentInputDialog(const TQStringList &list,int m_objectlist.append( new TQCheckBox(list[i+2],page) ); } else if ( m_description[i]=="combobox" ) { KComboBox *combobox = new KComboBox(page); - combobox->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum); + combobox->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum); combobox->setDuplicatesEnabled(false); combobox->insertStringList( TQStringList::split(",",list[i+2],true) ); if ( i>0 && m_description[i-1]=="label" ) diff --git a/src/kile/quicktoolconfigwidget.ui b/src/kile/quicktoolconfigwidget.ui index a3de889..8bc276b 100644 --- a/src/kile/quicktoolconfigwidget.ui +++ b/src/kile/quicktoolconfigwidget.ui @@ -36,7 +36,7 @@ 0 - + 100 0 @@ -71,7 +71,7 @@ 0 - + 150 0 @@ -152,7 +152,7 @@ Expanding - + 20 16 diff --git a/src/kile/scriptingconfigwidget.ui b/src/kile/scriptingconfigwidget.ui index 70874c4..699a035 100644 --- a/src/kile/scriptingconfigwidget.ui +++ b/src/kile/scriptingconfigwidget.ui @@ -125,7 +125,7 @@ Fixed - + 16 20 @@ -158,7 +158,7 @@ Expanding - + 40 20 @@ -179,7 +179,7 @@ Expanding - + 20 40 diff --git a/src/kile/structureconfigwidget.ui b/src/kile/structureconfigwidget.ui index a5d8474..d0fd69b 100644 --- a/src/kile/structureconfigwidget.ui +++ b/src/kile/structureconfigwidget.ui @@ -20,7 +20,7 @@ 0 - + 32767 32767 @@ -87,7 +87,7 @@ Expanding - + 200 20 @@ -104,7 +104,7 @@ Expanding - + 60 20 diff --git a/src/kile/symbolview.cpp b/src/kile/symbolview.cpp index 1df13fc..eee1e93 100644 --- a/src/kile/symbolview.cpp +++ b/src/kile/symbolview.cpp @@ -138,7 +138,7 @@ void SymbolView::showToolTip( TQIconViewItem *item ) WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM ); m_toolTip->setFrameStyle( TQFrame::Plain | TQFrame::Box ); m_toolTip->setLineWidth( 1 ); - m_toolTip->tqsetAlignment( AlignLeft | AlignTop ); + m_toolTip->setAlignment( AlignLeft | AlignTop ); m_toolTip->move( TQCursor::pos() + TQPoint( 14, 14 ) ); m_toolTip->adjustSize(); TQRect screen = TQApplication::desktop()->screenGeometry( @@ -150,7 +150,7 @@ void SymbolView::showToolTip( TQIconViewItem *item ) m_toolTip->move(m_toolTip->x(), screen.bottom()-m_toolTip->y()-m_toolTip->height()+m_toolTip->y()); } m_toolTip->setFont( TQToolTip::font() ); - m_toolTip->tqsetPalette( TQToolTip::palette(), true ); + m_toolTip->setPalette( TQToolTip::palette(), true ); m_toolTip->show(); } @@ -289,7 +289,7 @@ void SymbolView::fillWidget(const TQString& prefix) item = new KIconViewItem(this); item->setPixmap(image); item->setKey( refCnts[i] + '%' + image.text("Command") + '%' + image.text("Packages") + '%' + paths[i] ); - image = KImageEffect::blend(tqcolorGroup().text(), image, 1); // destroys our png comments, so we do it after reading the comments + image = KImageEffect::blend(colorGroup().text(), image, 1); // destroys our png comments, so we do it after reading the comments } else KILE_DEBUG() << "Loading file " << paths[i] << " failed" << endl; diff --git a/src/kile/symbolviewconfig.ui b/src/kile/symbolviewconfig.ui index 4f785cd..ffb9788 100644 --- a/src/kile/symbolviewconfig.ui +++ b/src/kile/symbolviewconfig.ui @@ -72,7 +72,7 @@ Expanding - + 40 20 diff --git a/src/kile/tabulardialog.cpp b/src/kile/tabulardialog.cpp index 4bb76c0..27a936c 100644 --- a/src/kile/tabulardialog.cpp +++ b/src/kile/tabulardialog.cpp @@ -268,7 +268,7 @@ TabCellDialog::TabCellDialog(TQWidget *parent, TabularCell::Data *data, m_cbItalic = new TQCheckBox(i18n("Italic"),fontgroup); TQVBoxLayout *fontgrouptqlayout = new TQVBoxLayout( fontgroup->tqlayout() ); - fontgrouptqlayout->tqsetAlignment( TQt::AlignTop ); + fontgrouptqlayout->setAlignment( TQt::AlignTop ); fontgrouptqlayout->addWidget( m_cbBold ); fontgrouptqlayout->addWidget( m_cbItalic ); @@ -284,7 +284,7 @@ TabCellDialog::TabCellDialog(TQWidget *parent, TabularCell::Data *data, m_ccTextcolor = new KColorCombo(colorgroup); TQGridLayout *colorgrouptqlayout = new TQGridLayout( colorgroup->tqlayout() ); - colorgrouptqlayout->tqsetAlignment( TQt::AlignTop ); + colorgrouptqlayout->setAlignment( TQt::AlignTop ); colorgrouptqlayout->addWidget( label1,0,0 ); colorgrouptqlayout->addWidget( label2,1,0 ); colorgrouptqlayout->addWidget( m_ccBgcolor,0,1 ); @@ -301,7 +301,7 @@ TabCellDialog::TabCellDialog(TQWidget *parent, TabularCell::Data *data, m_rbAlignright = new TQRadioButton(i18n("Right"),aligngroup); TQVBoxLayout *aligngrouptqlayout = new TQVBoxLayout( aligngroup->tqlayout() ); - aligngrouptqlayout->tqsetAlignment( TQt::AlignTop ); + aligngrouptqlayout->setAlignment( TQt::AlignTop ); aligngrouptqlayout->addWidget( m_rbAlignleft ); aligngrouptqlayout->addWidget( m_rbAligncenter ); aligngrouptqlayout->addWidget( m_rbAlignright ); @@ -340,7 +340,7 @@ TabCellDialog::TabCellDialog(TQWidget *parent, TabularCell::Data *data, borderbox->addStretch(1); TQVBoxLayout *framegrouptqlayout = new TQVBoxLayout( framegroup->tqlayout() ); - framegrouptqlayout->tqsetAlignment( TQt::AlignTop ); + framegrouptqlayout->setAlignment( TQt::AlignTop ); framegrouptqlayout->addWidget( label3 ); framegrouptqlayout->addWidget( lineframe ); framegrouptqlayout->addSpacing( 10 ); @@ -359,7 +359,7 @@ TabCellDialog::TabCellDialog(TQWidget *parent, TabularCell::Data *data, m_cbSep = new TQCheckBox(i18n("!{decl}: do not suppress space"),preamblegroup,"cb_sep"); TQVBoxLayout *preamblegrouptqlayout = new TQVBoxLayout( preamblegroup->tqlayout() ); - preamblegrouptqlayout->tqsetAlignment( TQt::AlignTop ); + preamblegrouptqlayout->setAlignment( TQt::AlignTop ); preamblegrouptqlayout->addWidget( m_cbPre ); preamblegrouptqlayout->addWidget( m_cbPost ); preamblegrouptqlayout->addWidget( m_cbAt ); @@ -374,7 +374,7 @@ TabCellDialog::TabCellDialog(TQWidget *parent, TabularCell::Data *data, m_coHeader = new TQComboBox(headergroup); TQVBoxLayout *headergrouptqlayout = new TQVBoxLayout( headergroup->tqlayout() ); - headergrouptqlayout->tqsetAlignment( TQt::AlignTop ); + headergrouptqlayout->setAlignment( TQt::AlignTop ); headergrouptqlayout->addStretch(1); headergrouptqlayout->addWidget(m_coHeader); headergrouptqlayout->addStretch(1); @@ -401,7 +401,7 @@ TabCellDialog::TabCellDialog(TQWidget *parent, TabularCell::Data *data, grid->setRowStretch(3,1); // init some special widgets - int buttonheight = m_pbFrame1->tqsizeHint().height(); + int buttonheight = m_pbFrame1->sizeHint().height(); m_pbFrame1->setFixedSize(buttonheight,buttonheight); m_pbFrame2->setFixedSize(buttonheight,buttonheight); m_pbFrame3->setFixedSize(buttonheight,buttonheight); @@ -412,7 +412,7 @@ TabCellDialog::TabCellDialog(TQWidget *parent, TabularCell::Data *data, m_pbFrame3->setPixmap( TQPixmap(const_cast(tb_border_xpm)) ); m_pbFrame4->setPixmap( TQPixmap(const_cast(all_border_xpm)) ); - borderframe->setFixedWidth(lineframe->tqsizeHint().width()); + borderframe->setFixedWidth(lineframe->sizeHint().width()); setButtonText(User1,"Re&set"); if ( m_header ) @@ -824,7 +824,7 @@ void TabularTable::setText(int row,int col,const TQString &text) updateCell(row,col); } -void TabularTable::tqsetAlignment(int row,int col,int align) +void TabularTable::setAlignment(int row,int col,int align) { TabularItem *cellitem = cellItem(row,col); cellitem->m_data.align = align; @@ -980,7 +980,7 @@ void TabularTable::setCellrangeAlignment(int x1,int y1,int x2,int y2,int align) for (int row=y1; row<=y2; ++row ) { if ( singlecell || !isMulticolumn(row,col) ) - tqsetAlignment(row,col,align); + setAlignment(row,col,align); } } } @@ -1045,11 +1045,11 @@ void TabularTable::paintCell( TQPainter *p, int row, int col, TQPen pen( p->pen() ); TQColor gridlinecolor; - int gridColor = tqstyle().tqstyleHint( TQStyle::SH_Table_GridLineColor, this ); + int gridColor = tqstyle().styleHint( TQStyle::SH_Table_GridLineColor, this ); if (gridColor != -1) { const TQPalette &pal = palette(); - if ( cg != tqcolorGroup() && cg != pal.disabled() && cg != pal.inactive() ) + if ( cg != colorGroup() && cg != pal.disabled() && cg != pal.inactive() ) gridlinecolor = cg.mid(); // p->setPen(cg.mid()); else gridlinecolor = (TQRgb)gridColor; // p->setPen((TQRgb)gridColor); @@ -1868,7 +1868,7 @@ TabularDialog::TabularDialog(TQWidget *parent, KConfig *config, KileDocument::La m_cbBullets = new TQCheckBox(i18n("Insert &bullets"),group); TQGridLayout *grouptqlayout = new TQGridLayout( group->tqlayout() ); - grouptqlayout->tqsetAlignment( TQt::AlignTop ); + grouptqlayout->setAlignment( TQt::AlignTop ); grouptqlayout->setColStretch(5,1); grouptqlayout->addWidget( label1, 0,0 ); grouptqlayout->addWidget( label2, 1,0 ); @@ -1901,7 +1901,7 @@ TabularDialog::TabularDialog(TQWidget *parent, KConfig *config, KileDocument::La label4->setBuddy(m_spCols); // init widgets - m_table->setMinimumHeight( m_table->tqsizeHint().height()-3 ); + m_table->setMinimumHeight( m_table->sizeHint().height()-3 ); m_spRows->setValue(3); m_spCols->setValue(3); m_cbCenter->setChecked(true); @@ -1915,7 +1915,7 @@ TabularDialog::TabularDialog(TQWidget *parent, KConfig *config, KileDocument::La m_cols = m_spCols->value(); m_table->setFocus(); - resize(tqsizeHint().width(),tqsizeHint().height()+50); + resize(sizeHint().width(),sizeHint().height()+50); // signals and slots connect( m_coEnvironment, TQT_SIGNAL(activated(const TQString &)), diff --git a/src/kile/tabulardialog.h b/src/kile/tabulardialog.h index 2d1465e..4fd1da8 100644 --- a/src/kile/tabulardialog.h +++ b/src/kile/tabulardialog.h @@ -167,7 +167,7 @@ public: TabularTable(int numRows,int numCols,TQWidget* parent, TabularDialog *tabdialog); void setText(int row,int col,const TQString &text); - void tqsetAlignment(int row,int col,int align); + void setAlignment(int row,int col,int align); TabularCell::Data defaultAttributes(); bool isMulticolumn(int row,int col); diff --git a/src/kile/texdocdialog.cpp b/src/kile/texdocdialog.cpp index 9f11293..a9d8090 100644 --- a/src/kile/texdocdialog.cpp +++ b/src/kile/texdocdialog.cpp @@ -69,12 +69,12 @@ TexDocDialog::TexDocDialog(TQWidget *parent, const char *name) // groupbox TQGroupBox *groupbox = new TQGroupBox( i18n("Search"), page, "groupbox" ); - groupbox->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, groupbox->sizePolicy().hasHeightForWidth() ) ); + groupbox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, groupbox->sizePolicy().hasHeightForWidth() ) ); groupbox->setColumnLayout(0, Qt::Vertical ); groupbox->tqlayout()->setSpacing( 6 ); groupbox->tqlayout()->setMargin( 11 ); TQGridLayout *groupboxLayout = new TQGridLayout( groupbox->tqlayout() ); - groupboxLayout->tqsetAlignment( TQt::AlignTop ); + groupboxLayout->setAlignment( TQt::AlignTop ); TQLabel *label = new TQLabel( i18n("&Keyword:"), groupbox, "label"); m_leKeywords = new KLineEdit("",groupbox); diff --git a/src/kile/toolconfigwidget.ui b/src/kile/toolconfigwidget.ui index 0bb1cf2..152ca8b 100644 --- a/src/kile/toolconfigwidget.ui +++ b/src/kile/toolconfigwidget.ui @@ -20,7 +20,7 @@ 0 - + 0 0 @@ -81,7 +81,7 @@ 0 - + 150 0 @@ -160,7 +160,7 @@ 0 - + 150 0 @@ -214,7 +214,7 @@ 0 - + 400 0 @@ -283,7 +283,7 @@ Expanding - + 20 240 @@ -471,7 +471,7 @@ Expanding - + 20 40 @@ -552,7 +552,7 @@ Expanding - + 20 100 diff --git a/src/kile/userhelpdialog.cpp b/src/kile/userhelpdialog.cpp index 4275f43..7f3a7c7 100644 --- a/src/kile/userhelpdialog.cpp +++ b/src/kile/userhelpdialog.cpp @@ -77,14 +77,14 @@ UserHelpDialog::UserHelpDialog(TQWidget *parent, const char *name) m_up = new KPushButton(i18n("Move &Up"),actionwidget); m_down = new KPushButton(i18n("Move &Down"),actionwidget); - int wmax = m_add->tqsizeHint().width(); - int w = m_remove->tqsizeHint().width(); + int wmax = m_add->sizeHint().width(); + int w = m_remove->sizeHint().width(); if ( w > wmax ) wmax = w; - w = m_addsep->tqsizeHint().width(); + w = m_addsep->sizeHint().width(); if ( w > wmax ) wmax = w; - w = m_up->tqsizeHint().width(); + w = m_up->sizeHint().width(); if ( w > wmax ) wmax = w; - w = m_down->tqsizeHint().width(); + w = m_down->sizeHint().width(); if ( w > wmax ) wmax = w; m_add->setFixedWidth(wmax); @@ -123,7 +123,7 @@ UserHelpDialog::UserHelpDialog(TQWidget *parent, const char *name) connect( m_up, TQT_SIGNAL(clicked()), TQT_SLOT(slotUp()) ); connect( m_down, TQT_SIGNAL(clicked()), TQT_SLOT(slotDown()) ); - resize(400,tqsizeHint().height()); + resize(400,sizeHint().height()); updateButton(); } @@ -373,13 +373,13 @@ UserHelpAddDialog::UserHelpAddDialog(KListBox *menulistbox, TQWidget *parent, co grid->addWidget( m_leHelpFile, 1,1 ); m_pbChooseFile = new KPushButton("", widget, "filechooser_button" ); m_pbChooseFile->setPixmap( SmallIcon("fileopen") ); - grid->addRowSpacing( 1, m_pbChooseFile->tqsizeHint().height()+5 ); + grid->addRowSpacing( 1, m_pbChooseFile->sizeHint().height()+5 ); grid->addWidget(m_pbChooseFile,1,3); m_pbChooseHtml = new KPushButton("", widget, "htmlchooser_button" ); m_pbChooseHtml->setPixmap( SmallIcon("viewhtml") ); grid->addWidget(m_pbChooseHtml,1,5); - grid->setColSpacing(3, m_pbChooseFile->tqsizeHint().width()+5 ); - grid->setColSpacing(5, m_pbChooseHtml->tqsizeHint().width()+5 ); + grid->setColSpacing(3, m_pbChooseFile->sizeHint().width()+5 ); + grid->setColSpacing(5, m_pbChooseHtml->sizeHint().width()+5 ); label2->setBuddy(m_pbChooseFile); @@ -396,7 +396,7 @@ UserHelpAddDialog::UserHelpAddDialog(KListBox *menulistbox, TQWidget *parent, co connect( m_pbChooseHtml, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChooseHtml() ) ); setFocusProxy( m_leMenuEntry ); - resize(500,tqsizeHint().height()); + resize(500,sizeHint().height()); } void UserHelpAddDialog::slotChooseFile()