summaryrefslogtreecommitdiffstats
path: root/kwordquiz/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:32:27 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:32:27 -0600
commit9f2c757e1a1694373c11427a00502c2ff4c2d403 (patch)
tree7d90e91214976a7d23d89ec3474515cf46069704 /kwordquiz/src
parentcee429821aa6f1acc97fb482d325fb4eb37376ca (diff)
downloadtdeedu-9f2c757e1a1694373c11427a00502c2ff4c2d403.tar.gz
tdeedu-9f2c757e1a1694373c11427a00502c2ff4c2d403.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kwordquiz/src')
-rw-r--r--kwordquiz/src/kwordquiz.cpp6
-rw-r--r--kwordquiz/src/kwordquiz.h6
-rw-r--r--kwordquiz/src/kwordquizdoc.cpp4
-rw-r--r--kwordquiz/src/kwordquizprefs.cpp20
-rw-r--r--kwordquiz/src/kwordquizprefs.h6
5 files changed, 21 insertions, 21 deletions
diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp
index 10dde982..d84dc96e 100644
--- a/kwordquiz/src/kwordquiz.cpp
+++ b/kwordquiz/src/kwordquiz.cpp
@@ -407,7 +407,7 @@ void KWordQuizApp::readOptions()
fileOpenRecent->loadEntries(kapp->config(), "Recent Files");
}
-void KWordQuizApp::saveProperties(KConfig *_cfg)
+void KWordQuizApp::saveProperties(TDEConfig *_cfg)
{
if(doc->URL().fileName()!=i18n("Untitled") && !doc->isModified())
{
@@ -427,7 +427,7 @@ void KWordQuizApp::saveProperties(KConfig *_cfg)
}
-void KWordQuizApp::readProperties(KConfig* _cfg)
+void KWordQuizApp::readProperties(TDEConfig* _cfg)
{
TQString filename = _cfg->readEntry("filename", "");
KURL url(filename);
@@ -1053,7 +1053,7 @@ void KWordQuizApp::slotConfigure()
if ( KWordQuizPrefs::showDialog( "settings" ) )
return;
- //KConfigDialog didn't find an instance of this dialog, so lets create it :
+ //TDEConfigDialog didn't find an instance of this dialog, so lets create it :
KWordQuizPrefs* dialog = new KWordQuizPrefs( this, "settings", Prefs::self() );
connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotApplyPreferences()));
dialog->show();
diff --git a/kwordquiz/src/kwordquiz.h b/kwordquiz/src/kwordquiz.h
index 36cc270b..c04cd92f 100644
--- a/kwordquiz/src/kwordquiz.h
+++ b/kwordquiz/src/kwordquiz.h
@@ -52,7 +52,7 @@ class KWQNewStuff;
* full session management as well as using KActions.
* @see KMainWindow
* @see TDEApplication
- * @see KConfig
+ * @see TDEConfig
*
* @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team.
* @version KDevelop version 1.2 code generation
@@ -117,12 +117,12 @@ class KWordQuizApp : public KMainWindow
* opened file by a temporary filename provided by TDEApplication.
* @see KTMainWindow#saveProperties
*/
- virtual void saveProperties(KConfig *_cfg);
+ virtual void saveProperties(TDEConfig *_cfg);
/** reads the session config file and restores the application's state including the last opened files and documents by reading the
* temporary files saved by saveProperties()
* @see KTMainWindow#readProperties
*/
- virtual void readProperties(KConfig *_cfg);
+ virtual void readProperties(TDEConfig *_cfg);
signals:
void settingsChanged();
diff --git a/kwordquiz/src/kwordquizdoc.cpp b/kwordquiz/src/kwordquizdoc.cpp
index 333f7713..9cda99c8 100644
--- a/kwordquiz/src/kwordquizdoc.cpp
+++ b/kwordquiz/src/kwordquizdoc.cpp
@@ -157,7 +157,7 @@ bool KWordQuizDoc::newDocument()
bool KWordQuizDoc::openDocument(const KURL& url, bool append, int index)
{
TQString tmpfile;
- if (KIO::NetAccess::download( url, tmpfile, 0 ))
+ if (TDEIO::NetAccess::download( url, tmpfile, 0 ))
{
TQFile file(tmpfile);
if (!file.open(IO_ReadOnly))
@@ -302,7 +302,7 @@ bool KWordQuizDoc::openDocument(const KURL& url, bool append, int index)
}
file.close();
- KIO::NetAccess::removeTempFile( tmpfile );
+ TDEIO::NetAccess::removeTempFile( tmpfile );
//Apply word wrap to cell with text
TQTableItem* itm;
diff --git a/kwordquiz/src/kwordquizprefs.cpp b/kwordquiz/src/kwordquizprefs.cpp
index 61380e68..7487ad0c 100644
--- a/kwordquiz/src/kwordquizprefs.cpp
+++ b/kwordquiz/src/kwordquizprefs.cpp
@@ -41,8 +41,8 @@
#include "kwordquiz.h"
#include "dlgspecchar.h"
-KWordQuizPrefs::KWordQuizPrefs(TQWidget *parent, const char *name, KConfigSkeleton *config, DialogType dialogType, int /*dialogButtons*/, ButtonCode /*defaultButton*/, bool /*modal*/)
- : KConfigDialog(parent, name, config, dialogType, Default|Ok|Apply|Cancel|Help, Ok, false)
+KWordQuizPrefs::KWordQuizPrefs(TQWidget *parent, const char *name, TDEConfigSkeleton *config, DialogType dialogType, int /*dialogButtons*/, ButtonCode /*defaultButton*/, bool /*modal*/)
+ : TDEConfigDialog(parent, name, config, dialogType, Default|Ok|Apply|Cancel|Help, Ok, false)
{
m_config = config;
@@ -66,7 +66,7 @@ KWordQuizPrefs::KWordQuizPrefs(TQWidget *parent, const char *name, KConfigSkele
KWordQuizApp *win=(KWordQuizApp *) parent;
int i=0;
- KConfigSkeletonItem * item = m_config->findItem("SpecialCharacters");
+ TDEConfigSkeletonItem * item = m_config->findItem("SpecialCharacters");
TQString ds = item->property().toString();
for ( TQListViewItemIterator it = m_prefCharacter->lstCharacters; it.current(); ++it)
@@ -88,7 +88,7 @@ void KWordQuizPrefs::slotCharListSelectionChanged()
void KWordQuizPrefs::slotSelectSpecChar( )
{
- KConfigSkeletonItem * item = m_config->findItem("EditorFont");
+ TDEConfigSkeletonItem * item = m_config->findItem("EditorFont");
TQString f = item->property().toFont().family();
TQString s = m_prefCharacter->lstCharacters->currentItem()->text(2);
TQChar c = s[0];
@@ -130,11 +130,11 @@ bool KWordQuizPrefs::hasChanged()
s.append(it.current()->text(2));
}
- KConfigSkeletonItem * item = m_config->findItem("SpecialCharacters");
+ TDEConfigSkeletonItem * item = m_config->findItem("SpecialCharacters");
TQString ds = item->property().toString();
if (ds == s.stripWhiteSpace())
- result = KConfigDialog::hasChanged();
+ result = TDEConfigDialog::hasChanged();
else
result = true;
@@ -152,11 +152,11 @@ bool KWordQuizPrefs::isDefault()
s.append(it.current()->text(2));
}
- KConfigSkeletonItem * item = m_config->findItem("SpecialCharacters");
+ TDEConfigSkeletonItem * item = m_config->findItem("SpecialCharacters");
TQString ds = item->property().toString();
if (ds == s.stripWhiteSpace())
- result = KConfigDialog::isDefault();
+ result = TDEConfigDialog::isDefault();
else
result = false;
@@ -172,7 +172,7 @@ void KWordQuizPrefs::updateSettings( )
s.append(it.current()->text(2));
}
- KConfigSkeletonItem * item = m_config->findItem("SpecialCharacters");
+ TDEConfigSkeletonItem * item = m_config->findItem("SpecialCharacters");
item->setProperty(TQVariant(s));
emit settingsChanged();
@@ -188,7 +188,7 @@ void KWordQuizPrefs::updateWidgetsDefault( )
s.append(it.current()->text(2));
}
- KConfigSkeletonItem * item = m_config->findItem("SpecialCharacters");
+ TDEConfigSkeletonItem * item = m_config->findItem("SpecialCharacters");
TQString ds = item->property().toString();
int i=0;
diff --git a/kwordquiz/src/kwordquizprefs.h b/kwordquiz/src/kwordquizprefs.h
index 566604e7..41930d09 100644
--- a/kwordquiz/src/kwordquizprefs.h
+++ b/kwordquiz/src/kwordquizprefs.h
@@ -30,12 +30,12 @@ class PrefCharacter;
class PrefCardAppearance;
class DlgSpecChar;
-class KWordQuizPrefs : public KConfigDialog
+class KWordQuizPrefs : public TDEConfigDialog
{
Q_OBJECT
public:
- KWordQuizPrefs(TQWidget *parent=0, const char *name=0, KConfigSkeleton *config=0, DialogType dialogType=IconList,
+ KWordQuizPrefs(TQWidget *parent=0, const char *name=0, TDEConfigSkeleton *config=0, DialogType dialogType=IconList,
int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false);
protected slots:
@@ -58,7 +58,7 @@ private:
PrefCharacter* m_prefCharacter;
DlgSpecChar* m_dlgSpecChar;
PrefCardAppearance* m_prefCardAppearance;
- KConfigSkeleton * m_config;
+ TDEConfigSkeleton * m_config;
};
#endif