summaryrefslogtreecommitdiffstats
path: root/kpdf
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:33:36 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:33:36 -0600
commit3c5631f74d1c75204f950140331e10f739082ee9 (patch)
treea2811ff6c81d3c771745cde47734e65b1da3d806 /kpdf
parent6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef (diff)
downloadtdegraphics-3c5631f74d1c75204f950140331e10f739082ee9.tar.gz
tdegraphics-3c5631f74d1c75204f950140331e10f739082ee9.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kpdf')
-rw-r--r--kpdf/TODO2
-rw-r--r--kpdf/conf/preferencesdialog.cpp4
-rw-r--r--kpdf/conf/preferencesdialog.h6
-rw-r--r--kpdf/part.cpp16
-rw-r--r--kpdf/part.h10
-rw-r--r--kpdf/shell/shell.cpp8
-rw-r--r--kpdf/shell/shell.h10
7 files changed, 28 insertions, 28 deletions
diff --git a/kpdf/TODO b/kpdf/TODO
index 6a00e14a..d917fd1d 100644
--- a/kpdf/TODO
+++ b/kpdf/TODO
@@ -139,7 +139,7 @@ Done (newest features come first):
-> ADD: gfx capturing tool
-> ADD: composited renderer framework (in addition to a fast light one)
-> FIX: pageview repaint done internally (speed boost and reduced memory consumption)
--> ADD: KConfigXT settings framework and Accessibility config (acc. code mostly not done)
+-> ADD: TDEConfigXT settings framework and Accessibility config (acc. code mostly not done)
-> FIX: workaround for scrollview bug 1/2 (painting hidden widgets under certain circumstances)
-> ADD: zoom into a rect defined by mouse (aka zoom to window)
-> FIX: sheet rotation in landscape case
diff --git a/kpdf/conf/preferencesdialog.cpp b/kpdf/conf/preferencesdialog.cpp
index 61211008..a6e1979a 100644
--- a/kpdf/conf/preferencesdialog.cpp
+++ b/kpdf/conf/preferencesdialog.cpp
@@ -18,8 +18,8 @@
// reimplementing this
#include "preferencesdialog.h"
-PreferencesDialog::PreferencesDialog( TQWidget * parent, KConfigSkeleton * skeleton )
- : KConfigDialog( parent, "preferences", skeleton )
+PreferencesDialog::PreferencesDialog( TQWidget * parent, TDEConfigSkeleton * skeleton )
+ : TDEConfigDialog( parent, "preferences", skeleton )
{
m_general = new DlgGeneral(0);
m_performance = new DlgPerformance(0);
diff --git a/kpdf/conf/preferencesdialog.h b/kpdf/conf/preferencesdialog.h
index 36aaa909..488eb763 100644
--- a/kpdf/conf/preferencesdialog.h
+++ b/kpdf/conf/preferencesdialog.h
@@ -14,18 +14,18 @@
#include "conf/settings.h"
class TQWidget;
-class KConfigSkeleton;
+class TDEConfigSkeleton;
class DlgGeneral;
class DlgPerformance;
class DlgAccessibility;
class DlgPresentation;
-class PreferencesDialog : public KConfigDialog
+class PreferencesDialog : public TDEConfigDialog
{
public:
- PreferencesDialog( TQWidget * parent, KConfigSkeleton * config );
+ PreferencesDialog( TQWidget * parent, TDEConfigSkeleton * config );
protected:
// void updateSettings(); // Called when OK/Apply is pressed.
diff --git a/kpdf/part.cpp b/kpdf/part.cpp
index 43373047..d20498fb 100644
--- a/kpdf/part.cpp
+++ b/kpdf/part.cpp
@@ -120,7 +120,7 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
m_actionsSearched(false), m_searchStarted(false)
{
// connect the started signal to tell the job the mimetypes we like
- connect(this, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(setMimeTypes(KIO::Job *)));
+ connect(this, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(setMimeTypes(TDEIO::Job *)));
// connect the completed signal so we can put the window caption when loading remote files
connect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(emitWindowCaption()));
@@ -522,16 +522,16 @@ bool Part::openURL(const KURL &url)
return b;
}
-void Part::setMimeTypes(KIO::Job *job)
+void Part::setMimeTypes(TDEIO::Job *job)
{
if (job)
{
job->addMetaData("accept", "application/pdf, */*;q=0.5");
- connect(job, TQT_SIGNAL(mimetype(KIO::Job*,const TQString&)), this, TQT_SLOT(readMimeType(KIO::Job*,const TQString&)));
+ connect(job, TQT_SIGNAL(mimetype(TDEIO::Job*,const TQString&)), this, TQT_SLOT(readMimeType(TDEIO::Job*,const TQString&)));
}
}
-void Part::readMimeType(KIO::Job *, const TQString &mime)
+void Part::readMimeType(TDEIO::Job *, const TQString &mime)
{
m_jobMime = mime;
}
@@ -809,13 +809,13 @@ void Part::slotSaveFileAs()
KMessageBox::information( widget(), i18n("You are trying to overwrite \"%1\" with itself. This is not allowed. Please save it in another location.").arg(saveURL.filename()) );
return;
}
- if ( KIO::NetAccess::exists( saveURL, false, widget() ) )
+ if ( TDEIO::NetAccess::exists( saveURL, false, widget() ) )
{
if (KMessageBox::warningContinueCancel( widget(), i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").arg(saveURL.filename()), TQString(), i18n("Overwrite")) != KMessageBox::Continue)
return;
}
- if ( !KIO::NetAccess::file_copy( m_file, saveURL, -1, true ) )
+ if ( !TDEIO::NetAccess::file_copy( m_file, saveURL, -1, true ) )
KMessageBox::information( 0, i18n("File could not be saved in '%1'. Try to save it to another location.").arg( saveURL.prettyURL() ) );
}
}
@@ -1065,7 +1065,7 @@ void Part::doPrint(KPrinter &printer)
}
}
-void Part::restoreDocument(KConfig* config)
+void Part::restoreDocument(TDEConfig* config)
{
KURL url ( config->readPathEntry( "URL" ) );
if ( url.isValid() )
@@ -1076,7 +1076,7 @@ void Part::restoreDocument(KConfig* config)
}
}
-void Part::saveDocumentRestoreInfo(KConfig* config)
+void Part::saveDocumentRestoreInfo(TDEConfig* config)
{
config->writePathEntry( "URL", url().url() );
config->writeEntry( "Viewport", m_document->viewport().toString() );
diff --git a/kpdf/part.h b/kpdf/part.h
index eec74710..a7a65799 100644
--- a/kpdf/part.h
+++ b/kpdf/part.h
@@ -29,7 +29,7 @@ class TQToolBox;
class KURL;
class KAction;
-class KConfig;
+class TDEConfig;
class KDirWatch;
class KToggleAction;
class KSelectAction;
@@ -121,15 +121,15 @@ protected slots:
void psTransformEnded();
void cannotQuit();
void saveSplitterSize();
- void setMimeTypes(KIO::Job *job);
- void readMimeType(KIO::Job *job, const TQString &mime);
+ void setMimeTypes(TDEIO::Job *job);
+ void readMimeType(TDEIO::Job *job, const TQString &mime);
void emitWindowCaption();
public slots:
// connected to Shell action (and browserExtension), not local one
void slotPrint();
- void restoreDocument(KConfig* config);
- void saveDocumentRestoreInfo(KConfig* config);
+ void restoreDocument(TDEConfig* config);
+ void saveDocumentRestoreInfo(TDEConfig* config);
void slotFileDirty( const TQString& );
void slotDoFileDirty();
diff --git a/kpdf/shell/shell.cpp b/kpdf/shell/shell.cpp
index f89ffc65..ed0fc8fc 100644
--- a/kpdf/shell/shell.cpp
+++ b/kpdf/shell/shell.cpp
@@ -87,8 +87,8 @@ void Shell::init()
m_part = 0;
return;
}
- connect( this, TQT_SIGNAL( restoreDocument(KConfig*) ),m_part, TQT_SLOT( restoreDocument(KConfig*)));
- connect( this, TQT_SIGNAL( saveDocumentRestoreInfo(KConfig*) ), m_part, TQT_SLOT( saveDocumentRestoreInfo(KConfig*)));
+ connect( this, TQT_SIGNAL( restoreDocument(TDEConfig*) ),m_part, TQT_SLOT( restoreDocument(TDEConfig*)));
+ connect( this, TQT_SIGNAL( saveDocumentRestoreInfo(TDEConfig*) ), m_part, TQT_SLOT( saveDocumentRestoreInfo(TDEConfig*)));
connect( m_part, TQT_SIGNAL( enablePrintAction(bool) ), m_printAction, TQT_SLOT( setEnabled(bool)));
readSettings();
@@ -161,7 +161,7 @@ void Shell::setupActions()
m_fullScreenAction = KStdAction::fullScreen( TQT_TQOBJECT(this), TQT_SLOT( slotUpdateFullScreen() ), actionCollection(), this );
}
-void Shell::saveProperties(KConfig* config)
+void Shell::saveProperties(TDEConfig* config)
{
// the 'config' object points to the session managed
// config file. anything you write here will be available
@@ -169,7 +169,7 @@ void Shell::saveProperties(KConfig* config)
emit saveDocumentRestoreInfo(config);
}
-void Shell::readProperties(KConfig* config)
+void Shell::readProperties(TDEConfig* config)
{
// the 'config' object points to the session managed
// config file. this function is automatically called whenever
diff --git a/kpdf/shell/shell.h b/kpdf/shell/shell.h
index 298e1e2b..b6bbf499 100644
--- a/kpdf/shell/shell.h
+++ b/kpdf/shell/shell.h
@@ -59,14 +59,14 @@ namespace KPDF
* This method is called when it is time for the app to save its
* properties for session management purposes.
*/
- void saveProperties(KConfig*);
+ void saveProperties(TDEConfig*);
/**
- * This method is called when this app is restored. The KConfig
+ * This method is called when this app is restored. The TDEConfig
* object points to the session management config file that was saved
* with @ref saveProperties
*/
- void readProperties(KConfig*);
+ void readProperties(TDEConfig*);
void readSettings();
void writeSettings();
void setFullScreen( bool );
@@ -86,8 +86,8 @@ namespace KPDF
void delayedOpen();
signals:
- void restoreDocument(KConfig* config);
- void saveDocumentRestoreInfo(KConfig* config);
+ void restoreDocument(TDEConfig* config);
+ void saveDocumentRestoreInfo(TDEConfig* config);
private: