summaryrefslogtreecommitdiffstats
path: root/akregator/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-21 14:23:13 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-21 14:23:13 -0600
commitba2a3ce341c0c71bbbcf350fcbcd60c552220b31 (patch)
tree08ba9504290f461f1244dded6b37fc4db00847ab /akregator/src
parentd5b298be14c173d62e8fbc6a3803ba8f657f3dcb (diff)
downloadtdepim-ba2a3ce341c0c71bbbcf350fcbcd60c552220b31.tar.gz
tdepim-ba2a3ce341c0c71bbbcf350fcbcd60c552220b31.zip
Rename obsolete tq methods to standard names
Diffstat (limited to 'akregator/src')
-rw-r--r--akregator/src/addfeedwidgetbase.ui4
-rw-r--r--akregator/src/akregator_view.cpp2
-rw-r--r--akregator/src/articleviewer.cpp4
-rw-r--r--akregator/src/listtabwidget.cpp10
-rw-r--r--akregator/src/mk4storage/metakit/CHANGES14
-rw-r--r--akregator/src/mk4storage/metakit/tests/regress.cpp2
-rw-r--r--akregator/src/mk4storage/mk4confwidgetbase.ui6
-rw-r--r--akregator/src/propertieswidgetbase.ui6
-rw-r--r--akregator/src/settings_archive.ui2
-rw-r--r--akregator/src/settings_browser.ui2
-rw-r--r--akregator/src/simplenodeselector.cpp4
-rw-r--r--akregator/src/tabwidget.cpp10
-rw-r--r--akregator/src/tag.h2
-rw-r--r--akregator/src/tagpropertieswidgetbase.ui4
-rw-r--r--akregator/src/trayicon.cpp2
-rw-r--r--akregator/src/treenodeitem.cpp2
-rw-r--r--akregator/src/viewer.cpp4
17 files changed, 40 insertions, 40 deletions
diff --git a/akregator/src/addfeedwidgetbase.ui b/akregator/src/addfeedwidgetbase.ui
index 9ab8644b9..8ee0614dc 100644
--- a/akregator/src/addfeedwidgetbase.ui
+++ b/akregator/src/addfeedwidgetbase.ui
@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout16</cstring>
+ <cstring>layout16</cstring>
</property>
<hbox>
<property name="name">
@@ -65,7 +65,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout15</cstring>
+ <cstring>layout15</cstring>
</property>
<grid>
<property name="name">
diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp
index 4a20008d1..a4c1b26b4 100644
--- a/akregator/src/akregator_view.cpp
+++ b/akregator/src/akregator_view.cpp
@@ -1266,7 +1266,7 @@ void View::slotCopyLinkAddress()
link = article.link().url();
else
link = article.guid();
- TQClipboard *cb = TQApplication::tqclipboard();
+ TQClipboard *cb = TQApplication::clipboard();
cb->setText(link, TQClipboard::Clipboard);
cb->setText(link, TQClipboard::Selection);
}
diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp
index 5f1870f97..401950694 100644
--- a/akregator/src/articleviewer.cpp
+++ b/akregator/src/articleviewer.cpp
@@ -188,7 +188,7 @@ ArticleViewer::~ArticleViewer()
void ArticleViewer::generateNormalModeCSS()
{
- const TQColorGroup & cg = TQApplication::tqpalette().active();
+ const TQColorGroup & cg = TQApplication::palette().active();
// from kmail::headerstyle.cpp
m_normalModeCSS = TQString(
@@ -267,7 +267,7 @@ void ArticleViewer::generateNormalModeCSS()
void ArticleViewer::generateCombinedModeCSS()
{
- const TQColorGroup & cg = TQApplication::tqpalette().active();
+ const TQColorGroup & cg = TQApplication::palette().active();
// from kmail::headerstyle.cpp
m_combinedModeCSS = TQString (
diff --git a/akregator/src/listtabwidget.cpp b/akregator/src/listtabwidget.cpp
index 77957ac69..f071cd955 100644
--- a/akregator/src/listtabwidget.cpp
+++ b/akregator/src/listtabwidget.cpp
@@ -52,7 +52,7 @@ public:
int currentID;
TQValueList<NodeListView*> views;
TQMap<int, NodeListView*> idToView;
- TQHBoxLayout* tqlayout;
+ TQHBoxLayout* layout;
ViewMode viewMode;
TQMap<TQWidget*, TQString> captions;
};
@@ -158,17 +158,17 @@ ListTabWidget::ListTabWidget(TQWidget* parent, const char* name) : TQWidget(pare
d->current = 0;
d->currentID = -1;
d->viewMode = verticalTabs;
- d->tqlayout = new TQHBoxLayout(this);
- //d->tqlayout = new TQGridLayout(this, 1, 2);
+ d->layout = new TQHBoxLayout(this);
+ //d->layout = new TQGridLayout(this, 1, 2);
d->tabBar = new KMultiTabBar(KMultiTabBar::Vertical, this);
d->tabBar->setStyle(KMultiTabBar::KDEV3ICON);
//d->tabBar->setStyle(KMultiTabBar::KDEV3);
d->tabBar->showActiveTabTexts(true);
d->tabBar->setPosition(KMultiTabBar::Left);
- d->tqlayout->addWidget(d->tabBar/*, 0, 0*/);
+ d->layout->addWidget(d->tabBar/*, 0, 0*/);
d->stack = new TQWidgetStack(this);
- d->tqlayout->addWidget(d->stack/*, 0, 1*/);
+ d->layout->addWidget(d->stack/*, 0, 1*/);
// connect(d->tabBar, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(slotCurrentChanged(TQWidget*)));
}
diff --git a/akregator/src/mk4storage/metakit/CHANGES b/akregator/src/mk4storage/metakit/CHANGES
index 20cd91d39..160c4bad9 100644
--- a/akregator/src/mk4storage/metakit/CHANGES
+++ b/akregator/src/mk4storage/metakit/CHANGES
@@ -211,9 +211,9 @@
One was in SCXX, PWONumber.h - ouch and apologies (jcw). Changed
comparison logic in mk4too.cpp (64-bit ints, new code).
-2003-02-28 Fixed relaxed tqlayout in Mk4tcl, several Mk4py fixes
+2003-02-28 Fixed relaxed layout in Mk4tcl, several Mk4py fixes
- Use list operators to convert a Tcl tqlayout to MK format. This used
+ Use list operators to convert a Tcl layout to MK format. This used
to crash, Tcl test 6.7 added to verify the fix. Changed test 3.1 to
use a different notation for nested defs (^).
@@ -605,13 +605,13 @@
c4_Storage::SaveTo function, memo's would sometimes not be written,
leading to a *damaged* datafile (and incorrect free-space tracking).
-2002-03-15 Better configure logic, "mk::view tqlayout" fix
+2002-03-15 Better configure logic, "mk::view layout" fix
Many tweaks to configures, makes, and libtool setup. Get rid of the
library version numbers and the special Mk4*.so targets. Instead of
Mk4tcl.so use libmk4tcl.so (likewise Mk4py.so is now libmk4py.so).
- Fixed "mk::view tqlayout", it was broken by the 10-2-2002 change.
+ Fixed "mk::view layout", it was broken by the 10-2-2002 change.
2002-03-13 Extend partial access 'B' usage
@@ -658,9 +658,9 @@
causing it to detach empty top-level views, even when in use. Fixed,
added s39 to test for this case.
-2002-02-10 Improve Mk4tcl's "mk::view tqlayout"
+2002-02-10 Improve Mk4tcl's "mk::view layout"
- Avoid crash when asking for the tqlayout of a non-existent view. Now
+ Avoid crash when asking for the layout of a non-existent view. Now
returns an error instead.
2002-02-07 Fast commit with many empty subviews
@@ -1614,7 +1614,7 @@
new version in c4_Sequence allocate the c4_Bytes object lazily.
Faster, and decreases sequence object size (for lots of subviews).
- Mk4tcl, mk::tqlayout now returns the proper tqlayout even if the views
+ Mk4tcl, mk::layout now returns the proper layout even if the views
are empty. Solved by adding extra arg to c4_Storage::Description,
to return structure of a single top-level view. Fixes "mk8basic.1",
and the returned string now has one bogus list layer stripped off.
diff --git a/akregator/src/mk4storage/metakit/tests/regress.cpp b/akregator/src/mk4storage/metakit/tests/regress.cpp
index 2cd5f0841..0725f57f5 100644
--- a/akregator/src/mk4storage/metakit/tests/regress.cpp
+++ b/akregator/src/mk4storage/metakit/tests/regress.cpp
@@ -100,7 +100,7 @@ main()
}
// Recursively display the entire view contents. The results shown do not
-// depend on file tqlayout (free space, file positions, flat vs. on-demand).
+// depend on file layout (free space, file positions, flat vs. on-demand).
static void ViewDisplay(const c4_View& v_, FILE* fp, int l_ =0)
{
diff --git a/akregator/src/mk4storage/mk4confwidgetbase.ui b/akregator/src/mk4storage/mk4confwidgetbase.ui
index 9063bf0fe..c5c837a5b 100644
--- a/akregator/src/mk4storage/mk4confwidgetbase.ui
+++ b/akregator/src/mk4storage/mk4confwidgetbase.ui
@@ -27,7 +27,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@@ -46,7 +46,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -74,7 +74,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
diff --git a/akregator/src/propertieswidgetbase.ui b/akregator/src/propertieswidgetbase.ui
index de9f28ec6..4ab1ea910 100644
--- a/akregator/src/propertieswidgetbase.ui
+++ b/akregator/src/propertieswidgetbase.ui
@@ -39,7 +39,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<grid>
<property name="name">
@@ -100,7 +100,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@@ -362,7 +362,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
diff --git a/akregator/src/settings_archive.ui b/akregator/src/settings_archive.ui
index a068a9f51..68107e398 100644
--- a/akregator/src/settings_archive.ui
+++ b/akregator/src/settings_archive.ui
@@ -25,7 +25,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<vbox>
<property name="name">
diff --git a/akregator/src/settings_browser.ui b/akregator/src/settings_browser.ui
index e9982eddb..b40d1c27a 100644
--- a/akregator/src/settings_browser.ui
+++ b/akregator/src/settings_browser.ui
@@ -96,7 +96,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<grid>
<property name="name">
diff --git a/akregator/src/simplenodeselector.cpp b/akregator/src/simplenodeselector.cpp
index bb55e24c0..cb296beeb 100644
--- a/akregator/src/simplenodeselector.cpp
+++ b/akregator/src/simplenodeselector.cpp
@@ -142,8 +142,8 @@ SimpleNodeSelector::SimpleNodeSelector(FeedList* feedList, TQWidget* parent, con
connect(d->view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotItemSelected(TQListViewItem*)));
- TQGridLayout* tqlayout = new TQGridLayout(this, 1, 1);
- tqlayout->addWidget(d->view, 0, 0);
+ TQGridLayout* layout = new TQGridLayout(this, 1, 1);
+ layout->addWidget(d->view, 0, 0);
d->visitor = new NodeVisitor(this);
diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp
index 6d733d475..eeeb3cbd9 100644
--- a/akregator/src/tabwidget.cpp
+++ b/akregator/src/tabwidget.cpp
@@ -166,8 +166,8 @@ void TabWidget::removeFrame(Frame *f)
uint TabWidget::tabBarWidthForMaxChars( uint maxLength )
{
int hframe, overlap;
- hframe = tabBar()->tqstyle().pixelMetric( TQStyle::PM_TabBarTabHSpace, this );
- overlap = tabBar()->tqstyle().pixelMetric( TQStyle::PM_TabBarTabOverlap, this );
+ hframe = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabHSpace, this );
+ overlap = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabOverlap, this );
TQFontMetrics fm = tabBar()->fontMetrics();
int x = 0;
@@ -183,7 +183,7 @@ uint TabWidget::tabBarWidthForMaxChars( uint maxLength )
if ( tab->iconSet() )
iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4;
- x += ( tabBar()->tqstyle().tqsizeFromContents( TQStyle::CT_TabBarTab, this, TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width();
+ x += ( tabBar()->style().tqsizeFromContents( TQStyle::CT_TabBarTab, this, TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width();
}
return x;
}
@@ -288,8 +288,8 @@ void TabWidget::slotCopyLinkAddress()
url = view->part()->url();
- kapp->tqclipboard()->setText(url.prettyURL(), TQClipboard::Selection);
- kapp->tqclipboard()->setText(url.prettyURL(), TQClipboard::Clipboard);
+ kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Selection);
+ kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Clipboard);
}
void TabWidget::slotCloseTab()
diff --git a/akregator/src/tag.h b/akregator/src/tag.h
index d215eb8f2..4e1e02228 100644
--- a/akregator/src/tag.h
+++ b/akregator/src/tag.h
@@ -81,7 +81,7 @@ class Tag
bool isNull() const;
- /** tag identifier, used as key throughout the app and archive. Must be unique in the tag set. Can be an arbitrary tqunicode string, an URI etc. */
+ /** tag identifier, used as key throughout the app and archive. Must be unique in the tag set. Can be an arbitrary unicode string, an URI etc. */
TQString id() const;
/** user-visible name of the tag */
diff --git a/akregator/src/tagpropertieswidgetbase.ui b/akregator/src/tagpropertieswidgetbase.ui
index 45571a736..e6b4c34be 100644
--- a/akregator/src/tagpropertieswidgetbase.ui
+++ b/akregator/src/tagpropertieswidgetbase.ui
@@ -22,7 +22,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -62,7 +62,7 @@
</spacer>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
diff --git a/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp
index 8bfb78958..31ced17a8 100644
--- a/akregator/src/trayicon.cpp
+++ b/akregator/src/trayicon.cpp
@@ -116,7 +116,7 @@ TQPixmap TrayIcon::takeScreenshot() const
// Paint the border
const int BORDER = 1;
TQPixmap finalShot(w + 2*BORDER, h + 2*BORDER);
- finalShot.fill(KApplication::tqpalette().active().foreground());
+ finalShot.fill(KApplication::palette().active().foreground());
painter.begin(&finalShot);
painter.drawPixmap(BORDER, BORDER, shot);
painter.end();
diff --git a/akregator/src/treenodeitem.cpp b/akregator/src/treenodeitem.cpp
index 32b12c9c5..3299e2783 100644
--- a/akregator/src/treenodeitem.cpp
+++ b/akregator/src/treenodeitem.cpp
@@ -105,7 +105,7 @@ FolderItem* TreeNodeItem::parent() const
}
-// TODO: reverse for reverse tqlayout
+// TODO: reverse for reverse layout
void TreeNodeItem::paintCell( TQPainter * p, const TQColorGroup & cg,
int column, int width, int align )
diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp
index d24e715f8..b1932b466 100644
--- a/akregator/src/viewer.cpp
+++ b/akregator/src/viewer.cpp
@@ -203,7 +203,7 @@ void Viewer::slotCopy()
{
TQString text = selectedText();
text.replace( TQChar( 0xa0 ), ' ' );
- TQClipboard *cb = TQApplication::tqclipboard();
+ TQClipboard *cb = TQApplication::clipboard();
disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
cb->setText(text);
connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
@@ -212,7 +212,7 @@ void Viewer::slotCopy()
void Viewer::slotCopyLinkAddress()
{
if(m_url.isEmpty()) return;
- TQClipboard *cb = TQApplication::tqclipboard();
+ TQClipboard *cb = TQApplication::clipboard();
cb->setText(m_url.prettyURL(), TQClipboard::Clipboard);
cb->setText(m_url.prettyURL(), TQClipboard::Selection);
}