diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:26:46 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:26:46 -0600 |
| commit | e722dbcb9f9763c062336bf3762d2acf72b7bb25 (patch) | |
| tree | 15409a4dfacbb5f6d42ebe821b9010b1aa8d3769 /smb4k/configdlg | |
| parent | 37bfaf4493bf35892747b0e8259843f084ec23b5 (diff) | |
| download | smb4k-e722dbcb9f9763c062336bf3762d2acf72b7bb25.tar.gz smb4k-e722dbcb9f9763c062336bf3762d2acf72b7bb25.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'smb4k/configdlg')
| -rw-r--r-- | smb4k/configdlg/smb4kconfigdialog.cpp | 4 | ||||
| -rw-r--r-- | smb4k/configdlg/smb4ksambaoptions.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/smb4k/configdlg/smb4kconfigdialog.cpp b/smb4k/configdlg/smb4kconfigdialog.cpp index a98ca7a..8ac95a4 100644 --- a/smb4k/configdlg/smb4kconfigdialog.cpp +++ b/smb4k/configdlg/smb4kconfigdialog.cpp @@ -55,7 +55,7 @@ #include "../core/smb4kauthinfo.h" #include "../core/smb4kpasswordhandler.h" -using namespace Smb4KGlobal; +using namespace Smb4TDEGlobal; TDEInstance *Smb4KConfigDialogFactory::m_instance = 0L; TDEAboutData *Smb4KConfigDialogFactory::m_about = 0L; @@ -1214,7 +1214,7 @@ extern "C" { void *init_libsmb4kconfigdialog() { - KGlobal::locale()->insertCatalogue( "smb4k" ); + TDEGlobal::locale()->insertCatalogue( "smb4k" ); return new Smb4KConfigDialogFactory; } } diff --git a/smb4k/configdlg/smb4ksambaoptions.cpp b/smb4k/configdlg/smb4ksambaoptions.cpp index db83aa8..e066d3f 100644 --- a/smb4k/configdlg/smb4ksambaoptions.cpp +++ b/smb4k/configdlg/smb4ksambaoptions.cpp @@ -51,7 +51,7 @@ #include "../core/smb4kglobal.h" #include "../core/smb4ksettings.h" -using namespace Smb4KGlobal; +using namespace Smb4TDEGlobal; Smb4KSambaOptions::Smb4KSambaOptions( TQWidget *parent, const char *name ) |