summaryrefslogtreecommitdiffstats
path: root/konqueror/keditbookmarks
diff options
context:
space:
mode:
Diffstat (limited to 'konqueror/keditbookmarks')
-rw-r--r--konqueror/keditbookmarks/actionsimpl.cpp6
-rw-r--r--konqueror/keditbookmarks/bookmarkinfo.cpp4
-rw-r--r--konqueror/keditbookmarks/commands.cpp6
-rw-r--r--konqueror/keditbookmarks/dcop.cpp2
-rw-r--r--konqueror/keditbookmarks/listview.cpp12
-rw-r--r--konqueror/keditbookmarks/listview.h6
-rw-r--r--konqueror/keditbookmarks/main.cpp4
-rw-r--r--konqueror/keditbookmarks/toplevel.cpp16
8 files changed, 28 insertions, 28 deletions
diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index 1f03665d4..03e24d609 100644
--- a/konqueror/keditbookmarks/actionsimpl.cpp
+++ b/konqueror/keditbookmarks/actionsimpl.cpp
@@ -32,7 +32,7 @@
#include <stdlib.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqpopupmenu.h>
#include <tqpainter.h>
@@ -345,7 +345,7 @@ void ActionsImpl::slotCopy() {
TQValueList<KBookmark> bookmarks
= ListView::self()->itemsToBookmarks(ListView::self()->selectedItemsMap());
KBookmarkDrag* data = KBookmarkDrag::newDrag(bookmarks, 0 /* not this ! */);
- kapp->tqclipboard()->setData(data, TQClipboard::Clipboard);
+ kapp->clipboard()->setData(data, TQClipboard::Clipboard);
}
void ActionsImpl::slotPaste() {
@@ -353,7 +353,7 @@ void ActionsImpl::slotPaste() {
KEBMacroCommand *mcmd =
CmdGen::insertMimeSource(
i18n("Paste"),
- kapp->tqclipboard()->data(TQClipboard::Clipboard),
+ kapp->clipboard()->data(TQClipboard::Clipboard),
ListView::self()->userAddress());
CmdHistory::self()->didCommand(mcmd);
}
diff --git a/konqueror/keditbookmarks/bookmarkinfo.cpp b/konqueror/keditbookmarks/bookmarkinfo.cpp
index edc4a66bb..38e499d1d 100644
--- a/konqueror/keditbookmarks/bookmarkinfo.cpp
+++ b/konqueror/keditbookmarks/bookmarkinfo.cpp
@@ -24,9 +24,9 @@
#include <stdlib.h>
#include <tqtimer.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqsplitter.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <klocale.h>
diff --git a/konqueror/keditbookmarks/commands.cpp b/konqueror/keditbookmarks/commands.cpp
index c7c5f83a6..2ad58a682 100644
--- a/konqueror/keditbookmarks/commands.cpp
+++ b/konqueror/keditbookmarks/commands.cpp
@@ -218,7 +218,7 @@ void CreateCommand::unexecute() {
KBookmark bk = CurrentMgr::bookmarkAt(m_to);
Q_ASSERT(!bk.isNull() && !bk.parentGroup().isNull());
- ListView::self()->tqinvalidate(bk.address());
+ ListView::self()->invalidate(bk.address());
bk.parentGroup().deleteBookmark(bk);
}
@@ -643,13 +643,13 @@ KEBMacroCommand* CmdGen::insertMimeSource(
bool modified = false;
const char *format = 0;
for (int i = 0; format = data->format(i), format; i++) {
- // qt docs don't say if tqencodedData(blah) where
+ // qt docs don't say if encodedData(blah) where
// blah is not a stored mimetype should return null
// or not. so, we search. sucky...
if (strcmp(format, "GALEON_BOOKMARK") == 0) {
modified = true;
TQStoredDrag *mydrag = new TQStoredDrag("application/x-xbel");
- mydrag->setEncodedData(data->tqencodedData("GALEON_BOOKMARK"));
+ mydrag->setEncodedData(data->encodedData("GALEON_BOOKMARK"));
data = mydrag;
break;
} else if( strcmp(format, "application/x-xbel" )==0) {
diff --git a/konqueror/keditbookmarks/dcop.cpp b/konqueror/keditbookmarks/dcop.cpp
index a31af0c80..458e9090b 100644
--- a/konqueror/keditbookmarks/dcop.cpp
+++ b/konqueror/keditbookmarks/dcop.cpp
@@ -26,7 +26,7 @@
#include <stdlib.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqpopupmenu.h>
#include <tqpainter.h>
diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp
index 62702a1c3..efeb3d3a1 100644
--- a/konqueror/keditbookmarks/listview.cpp
+++ b/konqueror/keditbookmarks/listview.cpp
@@ -29,7 +29,7 @@
#include <stdlib.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqpopupmenu.h>
#include <tqpainter.h>
#include <tqheader.h>
@@ -158,12 +158,12 @@ TQValueList<KBookmark> ListView::itemsToBookmarks(const TQValueVector<KEBListVie
return bookmarks;
}
-void ListView::tqinvalidate(const TQString & address)
+void ListView::invalidate(const TQString & address)
{
- tqinvalidate(getItemAtAddress(address));
+ invalidate(getItemAtAddress(address));
}
-void ListView::tqinvalidate(TQListViewItem * item)
+void ListView::invalidate(TQListViewItem * item)
{
if(item->isSelected())
{
@@ -181,7 +181,7 @@ void ListView::tqinvalidate(TQListViewItem * item)
TQListViewItem * child = item->firstChild();
while(child)
{
- //tqinvalidate(child);
+ //invalidate(child);
child = child->nextSibling();
}
}
@@ -277,7 +277,7 @@ void ListView::deselectAllChildren(KEBListViewItem *item)
else
deselectAllChildren(child);
}
- child->tqrepaint();
+ child->repaint();
child = static_cast<KEBListViewItem *>(child->nextSibling());
}
}
diff --git a/konqueror/keditbookmarks/listview.h b/konqueror/keditbookmarks/listview.h
index c05226ff6..7ffe76c37 100644
--- a/konqueror/keditbookmarks/listview.h
+++ b/konqueror/keditbookmarks/listview.h
@@ -56,7 +56,7 @@ public:
void setTmpStatus(const TQString &);
void restoreStatus();
- void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment);
+ void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment);
void setSelected ( bool s );
virtual void setOpen(bool);
@@ -140,8 +140,8 @@ public:
// selected item stuff
void selected(KEBListViewItem * item, bool s);
- void tqinvalidate(const TQString & address);
- void tqinvalidate(TQListViewItem * item);
+ void invalidate(const TQString & address);
+ void invalidate(TQListViewItem * item);
void fixUpCurrent(const TQString & address);
KEBListViewItem * firstSelected() const;
diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp
index 2abf26401..5b238302f 100644
--- a/konqueror/keditbookmarks/main.cpp
+++ b/konqueror/keditbookmarks/main.cpp
@@ -139,8 +139,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) {
bool gotArg = (args->count() == 1);
TQString filename = gotArg
- ? TQString::tqfromLatin1(args->arg(0))
- : locateLocal("data", TQString::tqfromLatin1("konqueror/bookmarks.xml"));
+ ? TQString::fromLatin1(args->arg(0))
+ : locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml"));
if (!isGui) {
CurrentMgr::self()->createManager(filename);
diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp
index 148a8b5ca..36400c3b0 100644
--- a/konqueror/keditbookmarks/toplevel.cpp
+++ b/konqueror/keditbookmarks/toplevel.cpp
@@ -32,9 +32,9 @@
#include <stdlib.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqsplitter.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <klocale.h>
@@ -184,7 +184,7 @@ TQString CurrentMgr::makeTimeStr(int b)
{
TQDateTime dt;
dt.setTime_t(b);
- return (dt.daysTo(TQDateTime::tqcurrentDateTime()) > 31)
+ return (dt.daysTo(TQDateTime::currentDateTime()) > 31)
? KGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false)
: KGlobal::locale()->formatDateTime(dt, false);
}
@@ -233,11 +233,11 @@ KEBApp::KEBApp(
vsplitter->setOrientation(Qt::Vertical);
vsplitter->setSizes(TQValueList<int>() << h << 380
- << m_bkinfo->tqsizeHint().height() );
+ << m_bkinfo->sizeHint().height() );
setCentralWidget(vsplitter);
- resize(ListView::self()->widget()->tqsizeHint().width(),
- vsplitter->tqsizeHint().height());
+ resize(ListView::self()->widget()->sizeHint().width(),
+ vsplitter->sizeHint().height());
createActions();
if (m_browser)
@@ -247,7 +247,7 @@ KEBApp::KEBApp(
m_dcopIface = new KBookmarkEditorIface();
- connect(kapp->tqclipboard(), TQT_SIGNAL( dataChanged() ),
+ connect(kapp->clipboard(), TQT_SIGNAL( dataChanged() ),
TQT_SLOT( slotClipboardDataChanged() ));
ListView::self()->connectSignals();
@@ -319,7 +319,7 @@ void KEBApp::slotClipboardDataChanged() {
// kdDebug() << "KEBApp::slotClipboardDataChanged" << endl;
if (!m_readOnly) {
m_canPaste = KBookmarkDrag::canDecode(
- kapp->tqclipboard()->data(TQClipboard::Clipboard));
+ kapp->clipboard()->data(TQClipboard::Clipboard));
updateActions();
}
}