diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:44:46 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:44:46 -0600 |
commit | cee429821aa6f1acc97fb482d325fb4eb37376ca (patch) | |
tree | 4f55e04b7f000c854fe2b8347dcdb62d97de3c73 /keduca | |
parent | ab801f72ab45e8066a8ec6c533ef13c2da67e559 (diff) | |
download | tdeedu-cee429821aa6f1acc97fb482d325fb4eb37376ca.tar.gz tdeedu-cee429821aa6f1acc97fb482d325fb4eb37376ca.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'keduca')
-rw-r--r-- | keduca/keduca/keduca.cpp | 4 | ||||
-rw-r--r-- | keduca/keduca/keducaprefs.cpp | 4 | ||||
-rw-r--r-- | keduca/keducabuilder/kcontroladdedit.cpp | 4 | ||||
-rw-r--r-- | keduca/keducabuilder/kcontrolheader.cpp | 10 | ||||
-rw-r--r-- | keduca/keducabuilder/keducabuilder.cpp | 6 | ||||
-rw-r--r-- | keduca/keducabuilder/keducaeditorstartdialog.cpp | 2 | ||||
-rw-r--r-- | keduca/libkeduca/kgallerydialog.cpp | 4 |
7 files changed, 17 insertions, 17 deletions
diff --git a/keduca/keduca/keduca.cpp b/keduca/keduca/keduca.cpp index 508a137a..63a96d27 100644 --- a/keduca/keduca/keduca.cpp +++ b/keduca/keduca/keduca.cpp @@ -97,7 +97,7 @@ bool Keduca::queryClose() void Keduca::configRead() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "keduca" ); applyMainWindowSettings( config, "keduca" ); _recentFiles->loadEntries(config); @@ -105,7 +105,7 @@ void Keduca::configRead() void Keduca::configWrite() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "keduca" ); saveMainWindowSettings( config, "keduca" ); diff --git a/keduca/keduca/keducaprefs.cpp b/keduca/keduca/keducaprefs.cpp index 16eb6ff7..3bddf2e7 100644 --- a/keduca/keduca/keducaprefs.cpp +++ b/keduca/keduca/keducaprefs.cpp @@ -82,7 +82,7 @@ void KEducaPrefs::setPageGeneral() /** Read settings */ void KEducaPrefs::configRead() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Options"); TQSize defaultSize(500,400); resize( config->readSizeEntry("Geometry", &defaultSize ) ); @@ -94,7 +94,7 @@ void KEducaPrefs::configRead() /** Write settings */ void KEducaPrefs::configWrite() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Options"); config->writeEntry("Geometry", size() ); config->writeEntry("ResultFinish", _resultAfterFinish->isChecked() ); diff --git a/keduca/keducabuilder/kcontroladdedit.cpp b/keduca/keducabuilder/kcontroladdedit.cpp index eb023a79..0e539d56 100644 --- a/keduca/keducabuilder/kcontroladdedit.cpp +++ b/keduca/keducabuilder/kcontroladdedit.cpp @@ -225,7 +225,7 @@ void KControlAddEdit::addQuestion() /** Read config settings */ void KControlAddEdit::configRead() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("AddModify Window"); TQSize defaultSize(500,400); resize( config->readSizeEntry("Geometry", &defaultSize ) ); @@ -234,7 +234,7 @@ void KControlAddEdit::configRead() /** Write config settings */ void KControlAddEdit::configWrite() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("AddModify Window"); config->writeEntry("Geometry", size() ); config->sync(); diff --git a/keduca/keducabuilder/kcontrolheader.cpp b/keduca/keducabuilder/kcontrolheader.cpp index 5c323c3c..bcd1eaa0 100644 --- a/keduca/keducabuilder/kcontrolheader.cpp +++ b/keduca/keducabuilder/kcontrolheader.cpp @@ -226,7 +226,7 @@ void KControlHeader::insertHeader() TQStringList tmpResult = _defaultCategories.grep( _headerCategory->currentText() ); if( tmpResult.count() == 0 ) { - KConfig *appconfig = KGlobal::config(); + KConfig *appconfig = TDEGlobal::config(); _defaultCategories.append( _headerCategory->currentText() ); appconfig->setGroup("General"); appconfig->writeEntry( "Categories", _defaultCategories); @@ -251,7 +251,7 @@ void KControlHeader::loadCountryList(KLanguageCombo *combo) // clear the list combo->clear(); - TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*.desktop")); + TQStringList regionlist = TDEGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*.desktop")); regionlist.sort(); for ( TQStringList::ConstIterator it = regionlist.begin(); @@ -275,7 +275,7 @@ void KControlHeader::loadCountryList(KLanguageCombo *combo) } // add all languages to the list - TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*/entry.desktop")); + TQStringList countrylist = TDEGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*/entry.desktop")); countrylist.sort(); for ( TQStringList::ConstIterator it = countrylist.begin(); @@ -307,7 +307,7 @@ void KControlHeader::slotOk() void KControlHeader::configRead() { KConfig *config = new KConfig("emaildefaults"); - KConfig *appconfig = KGlobal::config(); + KConfig *appconfig = TDEGlobal::config(); config->setGroup("UserInfo"); @@ -369,7 +369,7 @@ void KControlHeader::configRead() /** Write settings */ void KControlHeader::configWrite() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("kcontrolheader"); config->writeEntry("Geometry", size() ); config->sync(); diff --git a/keduca/keducabuilder/keducabuilder.cpp b/keduca/keducabuilder/keducabuilder.cpp index 0aeb4ba4..485a09cc 100644 --- a/keduca/keducabuilder/keducabuilder.cpp +++ b/keduca/keducabuilder/keducabuilder.cpp @@ -68,7 +68,7 @@ KEducaBuilder::KEducaBuilder(TQWidget* parent, const char *name, WFlags f ) initMenuBar(); init(); configRead(); - setIcon( KGlobal::iconLoader()->loadIcon("control.png", + setIcon( TDEGlobal::iconLoader()->loadIcon("control.png", KIcon::Small) ); _isOpenFile = false; } @@ -257,7 +257,7 @@ void KEducaBuilder::slotPreview( TQListBoxItem *item ) /** Read config data */ void KEducaBuilder::configRead() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "keducacontrol" ); applyMainWindowSettings( config, "keducacontrol" ); @@ -268,7 +268,7 @@ void KEducaBuilder::configRead() /** Write settings */ void KEducaBuilder::configWrite() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "keducacontrol" ); saveMainWindowSettings( config, "keducacontrol" ); diff --git a/keduca/keducabuilder/keducaeditorstartdialog.cpp b/keduca/keducabuilder/keducaeditorstartdialog.cpp index 22e196e7..7878e6c3 100644 --- a/keduca/keducabuilder/keducaeditorstartdialog.cpp +++ b/keduca/keducabuilder/keducaeditorstartdialog.cpp @@ -53,7 +53,7 @@ void KEducaEditorStartDialog::buildRecentFilesList() TQString key; TQString value; TQString oldGroup; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); oldGroup = config->group(); diff --git a/keduca/libkeduca/kgallerydialog.cpp b/keduca/libkeduca/kgallerydialog.cpp index b1ec43e2..10c6ce43 100644 --- a/keduca/libkeduca/kgallerydialog.cpp +++ b/keduca/libkeduca/kgallerydialog.cpp @@ -104,7 +104,7 @@ bool KGalleryDialog::loadFile( const TQString &filename ) /** Read servers */ void KGalleryDialog::configRead() { - KConfig *appconfig = KGlobal::config(); + KConfig *appconfig = TDEGlobal::config(); TQStringList servers; TQStringList ipservers; TQStringList::Iterator it_ipservers; @@ -140,7 +140,7 @@ void KGalleryDialog::configWrite() { TQStringList servers; TQStringList ipservers; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "kgallerydialog" ); config->writeEntry("Splitter_size", _split->sizes() ); |