summaryrefslogtreecommitdiffstats
path: root/kbabel/kbabel
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:35:10 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:35:10 -0600
commit1dd83e5f38d1c16d3e6da18d0caca0ee093ab58f (patch)
tree11037eed53e1cd90dad4e194f9dea542ad28607f /kbabel/kbabel
parent3b34e5cf56262c9f54a3bcf02ee5ad93ca0fb05b (diff)
downloadtdesdk-1dd83e5f38d1c16d3e6da18d0caca0ee093ab58f.tar.gz
tdesdk-1dd83e5f38d1c16d3e6da18d0caca0ee093ab58f.zip
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'kbabel/kbabel')
-rw-r--r--kbabel/kbabel/colorpreferences.ui2
-rw-r--r--kbabel/kbabel/editordiffpreferences.ui2
-rw-r--r--kbabel/kbabel/editorpreferences.ui10
-rw-r--r--kbabel/kbabel/errorlistview.cpp2
-rw-r--r--kbabel/kbabel/kbabel.cpp14
-rw-r--r--kbabel/kbabel/kbabelsplash.cpp2
-rw-r--r--kbabel/kbabel/kbabelview.cpp60
-rw-r--r--kbabel/kbabel/kbabelview.h4
-rw-r--r--kbabel/kbabel/kbabelview2.cpp6
-rw-r--r--kbabel/kbabel/kbhighlighting.cpp2
-rw-r--r--kbabel/kbabel/main.cpp18
-rw-r--r--kbabel/kbabel/mymultilineedit.cpp10
-rw-r--r--kbabel/kbabel/searchpreferences.ui2
13 files changed, 67 insertions, 67 deletions
diff --git a/kbabel/kbabel/colorpreferences.ui b/kbabel/kbabel/colorpreferences.ui
index ae8e57fe..63a0dcf1 100644
--- a/kbabel/kbabel/colorpreferences.ui
+++ b/kbabel/kbabel/colorpreferences.ui
@@ -164,7 +164,7 @@ phrases.&lt;/qt&gt;</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>50</height>
diff --git a/kbabel/kbabel/editordiffpreferences.ui b/kbabel/kbabel/editordiffpreferences.ui
index 33460635..56c6848b 100644
--- a/kbabel/kbabel/editordiffpreferences.ui
+++ b/kbabel/kbabel/editordiffpreferences.ui
@@ -170,7 +170,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
diff --git a/kbabel/kbabel/editorpreferences.ui b/kbabel/kbabel/editorpreferences.ui
index 15498f32..77c64683 100644
--- a/kbabel/kbabel/editorpreferences.ui
+++ b/kbabel/kbabel/editorpreferences.ui
@@ -133,7 +133,7 @@ activated, you will still see a message in the statusbar.
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -206,10 +206,10 @@ activated, you will still see a message in the statusbar.
<cstring>buttonGroup1</cstring>
</property>
<property name="title">
- <string>tqStatus LEDs</string>
+ <string>Status LEDs</string>
</property>
<property name="whatsThis" stdset="0">
- <string>&lt;qt&gt;&lt;p&gt;&lt;b&gt;tqStatus LEDs&lt;/b&gt;&lt;/p&gt;
+ <string>&lt;qt&gt;&lt;p&gt;&lt;b&gt;Status LEDs&lt;/b&gt;&lt;/p&gt;
&lt;p&gt;Choose here where the status LEDs are displayed and what color they have.&lt;/p&gt;&lt;/qt&gt;</string>
</property>
<hbox>
@@ -245,7 +245,7 @@ activated, you will still see a message in the statusbar.
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -283,7 +283,7 @@ activated, you will still see a message in the statusbar.
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>29</height>
diff --git a/kbabel/kbabel/errorlistview.cpp b/kbabel/kbabel/errorlistview.cpp
index 719798d3..33b1f7e9 100644
--- a/kbabel/kbabel/errorlistview.cpp
+++ b/kbabel/kbabel/errorlistview.cpp
@@ -70,7 +70,7 @@ void ErrorListView::updateView()
if( _catalog->numberOfEntries() == 0 )
return;
- _textview->setText( _catalog->itemtqStatus( _currentIndex ).join( "\n---\n" ) );
+ _textview->setText( _catalog->itemStatus( _currentIndex ).join( "\n---\n" ) );
}
#include "errorlistview.moc"
diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp
index 24c3eae9..c12a8e41 100644
--- a/kbabel/kbabel/kbabel.cpp
+++ b/kbabel/kbabel/kbabel.cpp
@@ -115,9 +115,9 @@ class MyKProgress: public KProgress
public:
MyKProgress( TQWidget *parent, const char *name ) : KProgress( parent, name )
{
- tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
+ setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
}
- TQSize tqsizeHint() const { return TQSize( 1, 1);}
+ TQSize sizeHint() const { return TQSize( 1, 1);}
};
KBabelMW::KBabelMW(TQString projectFile)
@@ -455,7 +455,7 @@ void KBabelMW::setupActions()
,TQT_SLOT(emitChar()), actionCollection(), "char2msgstr");
a_unsetFuzzy = new KAction(i18n("To&ggle Fuzzy Status"), "togglefuzzy", CTRL+Key_U, TQT_TQOBJECT(m_view)
- , TQT_SLOT(removeFuzzytqStatus()), actionCollection(), "edit_toggle_fuzzy");
+ , TQT_SLOT(removeFuzzyStatus()), actionCollection(), "edit_toggle_fuzzy");
action = new KAction(i18n("&Edit Header..."), 0, TQT_TQOBJECT(m_view), TQT_SLOT(editHeader()),
actionCollection(), "edit_edit_header");
@@ -724,7 +724,7 @@ void KBabelMW::setupStatusBar()
_errorLed->setFixedSize(15,12);
new TQLabel(i18n("faulty")+" ",statusBox);
- statusBox->setFixedWidth(statusBox->tqsizeHint().width());
+ statusBox->setFixedWidth(statusBox->sizeHint().width());
statusBar()->addWidget(statusBox);
}
@@ -743,7 +743,7 @@ void KBabelMW::setupStatusBar()
progressBox->setStretchFactor(_progressBar,1);
statusBar()->addWidget(progressBox,1);
- statusBar()->setMinimumHeight(progressBox->tqsizeHint().height());
+ statusBar()->setMinimumHeight(progressBox->sizeHint().height());
TQWhatsThis::add(statusBar(),
i18n("<qt><p><b>Statusbar</b></p>\n\
@@ -999,7 +999,7 @@ void KBabelMW::openRecent(const KURL& url)
KBabelView *view = KBabelView::viewForURL(url,TQString());
if(view)
{
- KWin::activateWindow(view->tqtopLevelWidget()->winId());
+ KWin::activateWindow(view->topLevelWidget()->winId());
return;
}
@@ -1019,7 +1019,7 @@ void KBabelMW::open(const KURL& url, const TQString package, bool newWindow)
if(view)
{
kdDebug(KBABEL) << "there is a such view" << endl;
- KWin::activateWindow(view->tqtopLevelWidget()->winId());
+ KWin::activateWindow(view->topLevelWidget()->winId());
return;
}
diff --git a/kbabel/kbabel/kbabelsplash.cpp b/kbabel/kbabel/kbabelsplash.cpp
index 785943d8..143aff02 100644
--- a/kbabel/kbabel/kbabelsplash.cpp
+++ b/kbabel/kbabel/kbabelsplash.cpp
@@ -55,7 +55,7 @@ KBabelSplash::KBabelSplash( TQWidget* parent, const char* name )
// Set tqgeometry, with support for Xinerama systems
TQRect r;
- r.setSize(tqsizeHint());
+ r.setSize(sizeHint());
int ps = TQApplication::desktop()->primaryScreen();
r.moveCenter( TQApplication::desktop()->screenGeometry(ps).center() );
setGeometry(r);
diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp
index 4c50a7e9..b4bba709 100644
--- a/kbabel/kbabel/kbabelview.cpp
+++ b/kbabel/kbabel/kbabelview.cpp
@@ -685,7 +685,7 @@ void KBabelView::readSettings(KConfig* config)
if(KBabelSettings::autoUnsetFuzzy())
{
connect(msgstrEdit,TQT_SIGNAL(textChanged())
- ,this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+ ,this,TQT_SLOT(autoRemoveFuzzyStatus()));
}
setupAutoCheckTools();
@@ -854,12 +854,12 @@ void KBabelView::updateSettings()
}
disconnect(msgstrEdit,TQT_SIGNAL(textChanged())
- ,this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+ ,this,TQT_SLOT(autoRemoveFuzzyStatus()));
if(KBabelSettings::autoUnsetFuzzy())
{
connect(msgstrEdit,TQT_SIGNAL(textChanged())
- ,this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+ ,this,TQT_SLOT(autoRemoveFuzzyStatus()));
}
msgstrEdit->setCleverEditing(KBabelSettings::cleverEditing());
@@ -1116,7 +1116,7 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo
cu.cleanPath();
if(checkIfModified && !url.isEmpty() && cu==url)
{
- KWin::activateWindow(tqtopLevelWidget()->winId());
+ KWin::activateWindow(topLevelWidget()->winId());
return;
}
@@ -1155,12 +1155,12 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo
return;
}
else {
- KWin::activateWindow(v->tqtopLevelWidget()->winId());
+ KWin::activateWindow(v->topLevelWidget()->winId());
return;
}
}
- ConversiontqStatus stat=_catalog->openURL(url, package);
+ ConversionStatus stat=_catalog->openURL(url, package);
switch(stat)
{
@@ -1282,7 +1282,7 @@ void KBabelView::openTemplate(const KURL& openURL, const KURL& saveURL)
setCursor(KCursor::waitCursor());*/
- ConversiontqStatus stat=_catalog->openURL(openURL,saveURL);
+ ConversionStatus stat=_catalog->openURL(openURL,saveURL);
switch(stat)
{
@@ -1368,7 +1368,7 @@ bool KBabelView::saveFile(bool syntaxCheck)
}
else
{
- ConversiontqStatus stat=_catalog->saveFile();
+ ConversionStatus stat=_catalog->saveFile();
int whatToDo = -1;
@@ -1458,7 +1458,7 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck)
bool wasReadOnly=_catalog->isReadOnly();
- ConversiontqStatus stat=_catalog->saveFileAs(url,true);
+ ConversionStatus stat=_catalog->saveFileAs(url,true);
// if the file was not saved sucessfully ask for saving to another file
@@ -1625,7 +1625,7 @@ bool KBabelView::checkSyntax(bool msgOnlyAtError,bool question)
bool returnCode=true;
TQString output;
- Msgfmt::tqStatus result=_catalog->checkSyntax( output );
+ Msgfmt::Status result=_catalog->checkSyntax( output );
const TQStringList outputLines = TQStringList::split("\n",output);
@@ -1831,7 +1831,7 @@ void KBabelView::updateEditor(int form, bool delay)
if(KBabelSettings::autoUnsetFuzzy() && !msgstrEdit->isModified())
{
- disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+ disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus()));
}
msgidLabel->setText(_catalog->msgid(_currentIndex), _catalog->msgctxt(_currentIndex));
@@ -1844,7 +1844,7 @@ void KBabelView::updateEditor(int form, bool delay)
if(KBabelSettings::autoUnsetFuzzy() && _catalog->isFuzzy(_currentIndex))
{
- connect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+ connect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus()));
}
msgstrEdit->blockSignals(false);
@@ -2615,7 +2615,7 @@ void KBabelView::replaceAll()
while(success)
{
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
_replacesTotal++;
@@ -3159,7 +3159,7 @@ void KBabelView::forwardHistory()
}
}
-void KBabelView::removeFuzzytqStatus()
+void KBabelView::removeFuzzyStatus()
{
bool newState = !_catalog->isFuzzy(_currentIndex);
_catalog->setFuzzy(_currentIndex,newState);
@@ -3302,12 +3302,12 @@ void KBabelView::emitEntryState()
TQPalette palette=msgstrEdit->palette();
palette.setColor( TQColorGroup::Text, red );
- if( _catalog->itemtqStatus(_currentIndex).contains("syntax error"))
+ if( _catalog->itemStatus(_currentIndex).contains("syntax error"))
{
msgstrEdit->setCurrentColor( MsgMultiLineEdit::ErrorColor );
}
else
- if( !_catalog->itemtqStatus(_currentIndex).isEmpty() && KBabelSettings::autoCheckColorError())
+ if( !_catalog->itemStatus(_currentIndex).isEmpty() && KBabelSettings::autoCheckColorError())
{
msgstrEdit->setCurrentColor( MsgMultiLineEdit::ErrorColor );
}
@@ -3332,12 +3332,12 @@ void KBabelView::checkUntranslated()
emit signalUntranslatedInFront(_catalog->hasUntranslatedInFront(_currentIndex));
}
-void KBabelView::autoRemoveFuzzytqStatus()
+void KBabelView::autoRemoveFuzzyStatus()
{
// only at first text change remove fuzzy status
- disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+ disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus()));
- //removeFuzzytqStatus();
+ //removeFuzzyStatus();
}
void KBabelView::toggleFuzzyLed(bool on)
@@ -3541,7 +3541,7 @@ void KBabelView::forwardMsgstrEditCmd(EditCommand* cmd)
_catalog->applyBeginCommand(_currentIndex,Msgstr,this);
- removeFuzzytqStatus();
+ removeFuzzyStatus();
}
cmd->setPart(Msgstr);
@@ -3576,13 +3576,13 @@ void KBabelView::autoCheck(bool onlyWhenChanged)
{
if( !_autocheckTools.isEmpty() )
{
- TQStringList oldtqStatus = _catalog->itemtqStatus(_currentIndex);
+ TQStringList oldStatus = _catalog->itemStatus(_currentIndex);
- TQStringList status = _catalog->itemtqStatus( _currentIndex,true, _autocheckTools );
+ TQStringList status = _catalog->itemStatus( _currentIndex,true, _autocheckTools );
// if there is more than one view, the status changes only in
// one view, so we have to update always.
- if(_catalog->isLastView() && onlyWhenChanged && oldtqStatus == status)
+ if(_catalog->isLastView() && onlyWhenChanged && oldStatus == status)
return;
if( !status.isEmpty() )
@@ -3598,7 +3598,7 @@ void KBabelView::autoCheck(bool onlyWhenChanged)
else msg += ", "+locale->translate("what check found errors",(*it).utf8());
}
- //i18n: translators: tqStatus bar text that automatic checks have found some errors
+ //i18n: translators: Status bar text that automatic checks have found some errors
emit signalChangeStatusbar(i18n("1 error: %1", "%n errors: %1", status.size ()).tqarg(msg));
emit signalFaultyDisplayed(true);
@@ -3611,7 +3611,7 @@ void KBabelView::autoCheck(bool onlyWhenChanged)
{
if(onlyWhenChanged)
{
- if(oldtqStatus != status && oldtqStatus.isEmpty() )
+ if(oldStatus != status && oldStatus.isEmpty() )
{
KNotifyClient::beep();
}
@@ -3622,7 +3622,7 @@ void KBabelView::autoCheck(bool onlyWhenChanged)
}
}
}
- else if( _catalog->itemtqStatus(_currentIndex).isEmpty() )
+ else if( _catalog->itemStatus(_currentIndex).isEmpty() )
{
_catalog->removeFromErrorList(_currentIndex);
@@ -3888,7 +3888,7 @@ void KBabelView::spellcheck()
if(emitProgress)
{
emit signalResetProgressBar(i18n("Preparing spell check"),100);
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
}
uint total=last-first+1;
@@ -3900,7 +3900,7 @@ void KBabelView::spellcheck()
lastPercent++;
emit signalProgress(lastPercent);
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
}
TQStringList msgs=_catalog->msgstr(i);
@@ -4018,7 +4018,7 @@ void KBabelView::spellStart(KSpell *)
if(spell.ignoreList.count() > 0)
{
emit signalResetProgressBar(i18n("Preparing spell check"),100);
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
uint total = spell.ignoreList.count();
uint oldPercent=0;
@@ -4031,7 +4031,7 @@ void KBabelView::spellStart(KSpell *)
{
oldPercent++;
emit signalProgress(oldPercent);
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
}
spell.kspell->ignore(*it);
diff --git a/kbabel/kbabel/kbabelview.h b/kbabel/kbabel/kbabelview.h
index 3398457d..af7fff86 100644
--- a/kbabel/kbabel/kbabelview.h
+++ b/kbabel/kbabel/kbabelview.h
@@ -268,7 +268,7 @@ public slots:
void skipToTagFromTool(int index);
void wordCount();
- void removeFuzzytqStatus();
+ void removeFuzzyStatus();
/** opens the header editor for the po-file */
void editHeader();
@@ -451,7 +451,7 @@ protected slots:
private slots:
void msgstrPluralFormChanged (uint index);
- void autoRemoveFuzzytqStatus();
+ void autoRemoveFuzzyStatus();
/** connected to the catalog. it is called when a new file is opened*/
void newFileOpened(bool readOnly);
diff --git a/kbabel/kbabel/kbabelview2.cpp b/kbabel/kbabel/kbabelview2.cpp
index c70b42e7..a5ba1df4 100644
--- a/kbabel/kbabel/kbabelview2.cpp
+++ b/kbabel/kbabel/kbabelview2.cpp
@@ -709,7 +709,7 @@ bool KBabelView::openDiffFile(bool autoDiff)
connect(&cat,TQT_SIGNAL(signalProgress(int)),this,TQT_SIGNAL(signalProgress(int)));
emit signalResetProgressBar(i18n("loading file for diff"),100);
- ConversiontqStatus stat = cat.openURL(url);
+ ConversionStatus stat = cat.openURL(url);
emit signalClearProgressBar();
@@ -802,8 +802,8 @@ void KBabelView::showTryLaterMessageBox()
"However, the string might be found "
"in the files being searched at the moment.\n"
"Please try later."), contents);
- label2->tqsetAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::ExpandTabs | TQt::WordBreak );
- label2->setMinimumSize(label2->tqsizeHint());
+ label2->setAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::ExpandTabs | TQt::WordBreak );
+ label2->setMinimumSize(label2->sizeHint());
lay->add( label2 );
lay->addStretch(1);
diff --git a/kbabel/kbabel/kbhighlighting.cpp b/kbabel/kbabel/kbhighlighting.cpp
index c67d56a7..621fb654 100644
--- a/kbabel/kbabel/kbhighlighting.cpp
+++ b/kbabel/kbabel/kbhighlighting.cpp
@@ -300,7 +300,7 @@ void KBabelHighlighter::setSpellChecker( KSpell* spell )
this, TQT_SLOT(slotMisspelling(const TQString &, const TQStringList &, unsigned int)));
// wait for KSpell to startup correctly
- kapp->tqprocessEvents(500);
+ kapp->processEvents(500);
}
highlight();
diff --git a/kbabel/kbabel/main.cpp b/kbabel/kbabel/main.cpp
index f36a0b94..85158efa 100644
--- a/kbabel/kbabel/main.cpp
+++ b/kbabel/kbabel/main.cpp
@@ -242,7 +242,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
KBabelMW *kb = KBabelMW::winForURL(u,project);
if(kb)
{
- KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+ KWin::activateWindow(kb->topLevelWidget()->winId());
}
else
{
@@ -255,7 +255,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
if( mw->inherits("KBabelMW") && mw->winId() == window)
{
kb = static_cast<KBabelMW*>(mw);
- KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+ KWin::activateWindow(kb->topLevelWidget()->winId());
kb->open(u, TQString::fromUtf8(package),newWindow);
kdDebug () << "Resuming DCOP" << endl;
@@ -272,7 +272,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
{
// here, we don't care about "open in new window", because
// it's empty
- KWin::setActiveWindow(kb->tqtopLevelWidget()->winId());
+ KWin::setActiveWindow(kb->topLevelWidget()->winId());
kb->projectOpen(projectFile);
kb->open(u,TQString::fromUtf8(package),false);
@@ -289,7 +289,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
if( mw->inherits("KBabelMW") && static_cast<KBabelMW*>(mw)->project()==project)
{
kb = static_cast<KBabelMW*>(mw);
- KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+ KWin::activateWindow(kb->topLevelWidget()->winId());
kb->open(u, TQString::fromUtf8(package),newWindow);
kdDebug () << "Resuming DCOP" << endl;
@@ -305,7 +305,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
kb = new KBabelMW(project);
kb->show();
} else kb = static_cast<KBabelMW*>(mw);
- KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+ KWin::activateWindow(kb->topLevelWidget()->winId());
kb->open(u,TQString::fromUtf8(package),newWindow);
}
@@ -331,7 +331,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam
KBabelMW *kb = KBabelMW::winForURL(u, project);
if(kb)
{
- KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+ KWin::activateWindow(kb->topLevelWidget()->winId());
}
else
{
@@ -342,7 +342,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam
if(mw && mw->inherits("KBabelMW") && static_cast<KBabelMW*>(mw)->project()==project)
{
kb = static_cast<KBabelMW*>(mw);
- KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+ KWin::activateWindow(kb->topLevelWidget()->winId());
kb->projectOpen(projectFile);
kb->openTemplate(t,u,TQString::fromUtf8(package),newWindow);
}
@@ -350,7 +350,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam
{
kb = new KBabelMW(project);
kb->show();
- KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+ KWin::activateWindow(kb->topLevelWidget()->winId());
kb->openTemplate(t,u,TQString::fromUtf8(package));
}
}
@@ -505,7 +505,7 @@ KBabelMW* KBabelInterface::findInstance( const KURL& url, const TQString& projec
if(kb)
{
- KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+ KWin::activateWindow(kb->topLevelWidget()->winId());
}
}
diff --git a/kbabel/kbabel/mymultilineedit.cpp b/kbabel/kbabel/mymultilineedit.cpp
index af824fdd..7b2155eb 100644
--- a/kbabel/kbabel/mymultilineedit.cpp
+++ b/kbabel/kbabel/mymultilineedit.cpp
@@ -120,7 +120,7 @@ void MyMultiLineEdit::processCommand(EditCommand* cmd, bool undo)
TQPalette _visibleHighlight( palette() );
TQPalette _invisibleHighlight( palette() );
- TQColorGroup newcg( tqcolorGroup() );
+ TQColorGroup newcg( colorGroup() );
newcg.setColor( TQColorGroup::HighlightedText, newcg.text() );
newcg.setColor( TQColorGroup::Highlight, newcg.base() );
if( hasFocus() ) _invisibleHighlight.setActive( newcg );
@@ -362,7 +362,7 @@ void MyMultiLineEdit::insert( const TQString & text, bool indent, bool checkNewL
TQPalette _visibleHighlight( palette() );
TQPalette _invisibleHighlight( palette() );
- TQColorGroup newcg( tqcolorGroup() );
+ TQColorGroup newcg( colorGroup() );
newcg.setColor( TQColorGroup::HighlightedText, newcg.text() );
newcg.setColor( TQColorGroup::Highlight, newcg.base() );
if( hasFocus() ) _invisibleHighlight.setActive( newcg );
@@ -598,7 +598,7 @@ MsgMultiLineEdit::MsgMultiLineEdit(int ID, KSpell* spell, TQWidget* parent,const
_cleverEditing(false),
_highlightBg(false),
_spacePoints(false),
- _bgColor(tqcolorGroup().base().dark(110)),
+ _bgColor(colorGroup().base().dark(110)),
_textColor(KGlobalSettings::textColor()),
_errorColor(TQt::red),
_currentColor(KGlobalSettings::textColor()),
@@ -910,7 +910,7 @@ void MsgMultiLineEdit::setDiffColors(const TQColor& addColor
void MsgMultiLineEdit::setTextColor(const TQColor &color )
{
TQPalette p( palette() );
- TQColorGroup newcg( tqcolorGroup() );
+ TQColorGroup newcg( colorGroup() );
newcg.setColor( TQColorGroup::Text, color );
if( hasFocus() ) p.setActive( newcg );
else p.setInactive( newcg );
@@ -1167,7 +1167,7 @@ void MsgMultiLineEdit::highlight()
TQColor bg;
if( _highlightBg ) bg = _bgColor;
- else bg = tqcolorGroup().base();
+ else bg = colorGroup().base();
for( int i = 0 ; i < paragraphs() ; i++ )
setParagraphBackgroundColor( i, bg );
diff --git a/kbabel/kbabel/searchpreferences.ui b/kbabel/kbabel/searchpreferences.ui
index c00e537f..10ce1a89 100644
--- a/kbabel/kbabel/searchpreferences.ui
+++ b/kbabel/kbabel/searchpreferences.ui
@@ -96,7 +96,7 @@ the desired dictionary from &lt;b&gt;Settings-&gt;Configure Dictionary&lt;/b&gt;
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>91</height>