summaryrefslogtreecommitdiffstats
path: root/kviewshell/kviewshell.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-19 19:03:33 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-19 19:03:33 +0000
commite69e8b1d09fb579316595b4e6a850e717358a8b1 (patch)
treea24fc20865f65772f530d16177520190594ffdd2 /kviewshell/kviewshell.cpp
parenteecec9afb81fdebb0f22e9da22635874c403f854 (diff)
downloadtdegraphics-e69e8b1d09fb579316595b4e6a850e717358a8b1.tar.gz
tdegraphics-e69e8b1d09fb579316595b4e6a850e717358a8b1.zip
TQt4 port kdegraphics
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kviewshell/kviewshell.cpp')
-rw-r--r--kviewshell/kviewshell.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/kviewshell/kviewshell.cpp b/kviewshell/kviewshell.cpp
index 968fd365..e3bde285 100644
--- a/kviewshell/kviewshell.cpp
+++ b/kviewshell/kviewshell.cpp
@@ -53,15 +53,15 @@ KViewShell::KViewShell(const TQString& defaultMimeType)
// Try to load
KLibFactory *factory = KLibLoader::self()->factory("kviewerpart");
if (factory) {
- if (defaultMimeType == TQString::null)
+ if (defaultMimeType == TQString())
{
- view = (KViewPart_Iface*) factory->create(this, "kviewerpart", "KViewPart");
+ view = (KViewPart_Iface*) factory->create(TQT_TQOBJECT(this), "kviewerpart", "KViewPart");
}
else
{
TQStringList args;
args << defaultMimeType;
- view = (KViewPart_Iface*) factory->create(this, "kviewerpart", "KViewPart", args);
+ view = (KViewPart_Iface*) factory->create(TQT_TQOBJECT(this), "kviewerpart", "KViewPart", args);
}
if (!view)
::exit(-1);
@@ -73,24 +73,24 @@ KViewShell::KViewShell(const TQString& defaultMimeType)
setCentralWidget(view->widget());
// file menu
- KStdAction::open(view, TQT_SLOT(slotFileOpen()), actionCollection());
- recent = KStdAction::openRecent (this, TQT_SLOT(openURL(const KURL &)), actionCollection());
+ KStdAction::open(TQT_TQOBJECT(view), TQT_SLOT(slotFileOpen()), actionCollection());
+ recent = KStdAction::openRecent (TQT_TQOBJECT(this), TQT_SLOT(openURL(const KURL &)), actionCollection());
reloadAction = new KAction(i18n("Reload"), "reload", CTRL + Key_R, view, TQT_SLOT(reload()), actionCollection(), "reload");
- closeAction = KStdAction::close(this, TQT_SLOT(slotFileClose()), actionCollection());
- KStdAction::quit (this, TQT_SLOT(slotQuit()), actionCollection());
+ closeAction = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection());
+ KStdAction::quit (TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection());
connect(view, TQT_SIGNAL(fileOpened()), this, TQT_SLOT(addRecentFile()));
// view menu
- fullScreenAction = KStdAction::fullScreen(this, TQT_SLOT(slotFullScreen()), actionCollection(), this, "fullscreen" );
+ fullScreenAction = KStdAction::fullScreen(TQT_TQOBJECT(this), TQT_SLOT(slotFullScreen()), actionCollection(), this, "fullscreen" );
// settings menu
createStandardStatusBarAction();
setStandardToolBarMenuEnabled(true);
- KStdAction::keyBindings(this, TQT_SLOT(slotConfigureKeys()), actionCollection());
- KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbar()), actionCollection());
+ KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), actionCollection());
+ KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbar()), actionCollection());
// statusbar connects
connect( view, TQT_SIGNAL( zoomChanged(const TQString &) ), this,TQT_SLOT( slotChangeZoomText(const TQString &) ) );
@@ -229,7 +229,7 @@ void KViewShell::addRecentFile()
KURL actualURL = view->url();
// To store the URL in the list of recent files, we remove the
// reference part.
- actualURL.setRef(TQString::null);
+ actualURL.setRef(TQString());
recent->addURL(actualURL);
checkActions();
}
@@ -357,7 +357,7 @@ void KViewShell::keyPressEvent(TQKeyEvent *event)
{
// The Escape Key is used to return to normal mode from fullscreen
// mode
- if ((event->key() == Qt::Key_Escape) && (fullScreenAction->isChecked())) {
+ if ((event->key() == TQt::Key_Escape) && (fullScreenAction->isChecked())) {
showNormal();
return;
}